From 85853cf1dae6382ed11765c7c2457f12ee02451a Mon Sep 17 00:00:00 2001
From: jerry <kingwrcy@88.com>
Date: Sun, 21 Apr 2024 17:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ctrl+enter=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/FriendsCommentInput.vue |  2 +-
 components/MemoInput.vue           | 21 ++++-----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/components/FriendsCommentInput.vue b/components/FriendsCommentInput.vue
index 38068217..f7f96099 100644
--- a/components/FriendsCommentInput.vue
+++ b/components/FriendsCommentInput.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="p-2 rounded text-sm ">
     <div class="relative">
-      <Textarea ref="textareaRef" autocomplete="new-text" rows="3" v-model="content" class="dark:bg-slate-500 border-separate" :placeholder="placeholder" </Textarea>
+      <Textarea @keyup.ctrl.enter="saveComment" ref="textareaRef" autocomplete="new-text" rows="3" v-model="content" class="dark:bg-slate-500 border-separate" :placeholder="placeholder" </Textarea>
       <div class="absolute right-2 bottom-1 cursor-pointer text-xl" @click="toggleShowEmoji" ref="showEmojiRef">😊</div>
     </div>
     <Emoji v-if="showEmoji" class="mt-2" @emoji-selected="emojiSelected"/>
diff --git a/components/MemoInput.vue b/components/MemoInput.vue
index 608d3fd4..92f7dd3b 100644
--- a/components/MemoInput.vue
+++ b/components/MemoInput.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="p-2 sm:p-4 pb-2 border-b dark:border-white">
     <div class="flex flex-row my-2 ">
-      <div class="flex flex-1 gap-2 ">
-
+      <div class="flex flex-1 gap-2 ">       
         <Popover :open="linkOpen">
           <PopoverTrigger as="div">
             <TooltipProvider>
@@ -15,7 +14,6 @@
                 </TooltipContent>
               </Tooltip>
             </TooltipProvider>
-
           </PopoverTrigger>
           <PopoverContent as-child @interact-outside="linkOpen = false">
             <div class="flex flex-col gap-2">
@@ -134,7 +132,7 @@
 
     </div>
     <div class="relative">
-      <Textarea ref="textareaRef" @paste="pasteImg" autocomplete="new-text" v-model="content" rows="4"
+      <Textarea ref="textareaRef" @paste="pasteImg" autocomplete="new-text" v-model="content" rows="4" @keyup.ctrl.enter="submitMemo()"
         placeholder="今天发点什么呢?" class=" dark:text-[#C0BEBF]"></Textarea>
       <div class="absolute right-2 bottom-1 cursor-pointer text-xl" @click="toggleShowEmoji" ref="showEmojiRef">😊</div>
     </div>
@@ -193,19 +191,8 @@ import { toast } from 'vue-sonner'
 import { memoUpdateEvent } from '@/lib/event'
 import type { Memo } from '~/lib/types';
 import { useAnimate } from '@vueuse/core';
-import { Image, Music4, Settings, Trash2, LogOut, Youtube, Link, Loader, CircleX, Check, ShowerHead } from 'lucide-vue-next'
-
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger
-} from '@/components/ui/tooltip'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@/components/ui/popover'
+import { Image, Music4, Settings, Trash2, LogOut,  Link, Youtube, CircleX, Check } from 'lucide-vue-next'
+
 const textareaRef = ref()
 const showEmojiRef = ref<HTMLElement>()
 const keyframes = { transform: 'rotate(360deg)' }