From 0444f4c56e37e1336103dfcfa802392a4f289fe3 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Sun, 24 Sep 2023 21:52:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=BF=E6=8D=A2Input=E3=80=81Mes?=
 =?UTF-8?q?sage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Input.vue                      | 32 +++++++++++++++++--
 src/components/NumberInput.vue                | 21 ++++++++++--
 src/plugins/directive/message.ts              |  0
 src/utils/message.ts                          |  2 +-
 src/views/Editor/Canvas/LinkDialog.vue        |  2 +-
 src/views/Editor/CanvasTool/MediaInput.vue    |  8 ++---
 .../Editor/CanvasTool/TableGenerator.vue      |  2 +-
 src/views/Editor/EditorHeader/index.vue       |  8 ++---
 src/views/Editor/SearchPanel.vue              |  9 +++---
 .../ElementStylePanel/TextStylePanel.vue      | 14 ++++----
 .../Editor/Toolbar/SlideAnimationPanel.vue    |  3 +-
 11 files changed, 72 insertions(+), 29 deletions(-)
 delete mode 100644 src/plugins/directive/message.ts

diff --git a/src/components/Input.vue b/src/components/Input.vue
index afaf89ac..5a583de5 100644
--- a/src/components/Input.vue
+++ b/src/components/Input.vue
@@ -11,12 +11,15 @@
     </span>
     <input
       type="text"
+      ref="inputRef"
       :disabled="disabled"
       :value="value" 
       :placeholder="placeholder"
       @input="$event => handleInput($event)"
-      @focus="focused = true"
-      @blur="focused = false"
+      @focus="$event => handleFocus($event)"
+      @blur="$event => handleBlur($event)"
+      @change="$event => emit('change', $event)"
+      @keydown.enter="$event => emit('enter', $event)"
     />
     <span class="suffix">
       <slot name="suffix"></slot>
@@ -38,13 +41,36 @@ withDefaults(defineProps<{
 
 const emit = defineEmits<{
   (event: 'update:value', payload: string): void
+  (event: 'input', payload: Event): void
+  (event: 'change', payload: Event): void
+  (event: 'blur', payload: Event): void
+  (event: 'focus', payload: Event): void
+  (event: 'enter', payload: Event): void
 }>()
 
 const focused = ref(false)
 
 const handleInput = (e: Event) => {
   emit('update:value', (e.target as HTMLInputElement).value)
+  emit('input', e)
 }
+const handleBlur = (e: Event) => {
+  focused.value = false
+  emit('blur', e)
+}
+const handleFocus = (e: Event) => {
+  focused.value = true
+  emit('focus', e)
+}
+
+const inputRef = ref<HTMLInputElement>()
+const focus = () => {
+  if (inputRef.value) inputRef.value.focus()
+}
+
+defineExpose({
+  focus,
+})
 </script>
 
 <style lang="scss" scoped>
@@ -55,7 +81,7 @@ const handleInput = (e: Event) => {
   border-radius: $borderRadius;
   transition: border-color .25s;
   font-size: 13px;
-  display: inline-flex;
+  display: flex;
 
   input {
     min-width: 0;
diff --git a/src/components/NumberInput.vue b/src/components/NumberInput.vue
index 32573cd0..75a338df 100644
--- a/src/components/NumberInput.vue
+++ b/src/components/NumberInput.vue
@@ -15,8 +15,11 @@
         :disabled="disabled"
         v-model="number" 
         :placeholder="placeholder"
-        @focus="focused = true"
-        @blur="focused = false"
+        @input="$event => emit('input', $event)"
+        @focus="$event => handleFocus($event)"
+        @blur="$event => handleBlur($event)"
+        @change="$event => emit('change', $event)"
+        @keydown.enter="$event => emit('enter', $event)"
       />
       <div class="handlers">
         <span class="handler" @click="number += step">
@@ -53,6 +56,11 @@ const props = withDefaults(defineProps<{
 
 const emit = defineEmits<{
   (event: 'update:value', payload: number): void
+  (event: 'input', payload: Event): void
+  (event: 'change', payload: Event): void
+  (event: 'blur', payload: Event): void
+  (event: 'focus', payload: Event): void
+  (event: 'enter', payload: Event): void
 }>()
 
 const number = ref(0)
@@ -73,6 +81,15 @@ watch(number, () => {
   number.value = value
   emit('update:value', number.value)
 })
+
+const handleBlur = (e: Event) => {
+  focused.value = false
+  emit('blur', e)
+}
+const handleFocus = (e: Event) => {
+  focused.value = true
+  emit('focus', e)
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/plugins/directive/message.ts b/src/plugins/directive/message.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/utils/message.ts b/src/utils/message.ts
index 3d80adf8..84a4ce38 100644
--- a/src/utils/message.ts
+++ b/src/utils/message.ts
@@ -51,7 +51,7 @@ const message: Message = (options: MessageOptions) => {
       position: fixed;
       top: 0;
       left: 0;
-      z-index: 1010;
+      z-index: 6000;
       pointer-events: none;
       display: flex;
       flex-direction: column;
diff --git a/src/views/Editor/Canvas/LinkDialog.vue b/src/views/Editor/Canvas/LinkDialog.vue
index 109d8054..bdb0314d 100644
--- a/src/views/Editor/Canvas/LinkDialog.vue
+++ b/src/views/Editor/Canvas/LinkDialog.vue
@@ -47,10 +47,10 @@ import useLink from '@/hooks/useLink'
 
 import ThumbnailSlide from '@/views/components/ThumbnailSlide/index.vue'
 import Tabs from '@/components/Tabs.vue'
+import Input from '@/components/Input.vue'
 import {
   Button,
   Select,
-  Input,
 } from 'ant-design-vue'
 const SelectOption = Select.Option
 
diff --git a/src/views/Editor/CanvasTool/MediaInput.vue b/src/views/Editor/CanvasTool/MediaInput.vue
index 3c6a90c6..8a419870 100644
--- a/src/views/Editor/CanvasTool/MediaInput.vue
+++ b/src/views/Editor/CanvasTool/MediaInput.vue
@@ -26,12 +26,10 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue'
-import {
-  Button,
-  Input,
-  message,
-} from 'ant-design-vue'
+import { Button } from 'ant-design-vue'
+import message from '@/utils/message'
 import Tabs from '@/components/Tabs.vue'
+import Input from '@/components/Input.vue'
 
 type TypeKey = 'video' | 'audio'
 interface TabItem {
diff --git a/src/views/Editor/CanvasTool/TableGenerator.vue b/src/views/Editor/CanvasTool/TableGenerator.vue
index 64fc10ba..b70f44a5 100644
--- a/src/views/Editor/CanvasTool/TableGenerator.vue
+++ b/src/views/Editor/CanvasTool/TableGenerator.vue
@@ -53,10 +53,10 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue'
+import message from '@/utils/message'
 import {
   InputNumber,
   Button,
-  message,
 } from 'ant-design-vue'
 
 interface InsertData {
diff --git a/src/views/Editor/EditorHeader/index.vue b/src/views/Editor/EditorHeader/index.vue
index 1af58810..29bb04b4 100644
--- a/src/views/Editor/EditorHeader/index.vue
+++ b/src/views/Editor/EditorHeader/index.vue
@@ -85,9 +85,9 @@ import HotkeyDoc from './HotkeyDoc.vue'
 import FileInput from '@/components/FileInput.vue'
 import FullscreenSpin from '@/components/FullscreenSpin.vue'
 import Drawer from '@/components/Drawer.vue'
+import Input from '@/components/Input.vue'
 import {
   Popover,
-  Input,
 } from 'ant-design-vue'
 
 const mainStore = useMainStore()
@@ -179,7 +179,7 @@ const setDialogForExport = (type: DialogForExportTypes) => {
   }
 }
 .title {
-  height: 30px;
+  height: 32px;
   margin-left: 2px;
   font-size: 13px;
 
@@ -193,8 +193,8 @@ const setDialogForExport = (type: DialogForExportTypes) => {
   .title-text {
     min-width: 20px;
     max-width: 400px;
-    line-height: 30px;
-    padding: 0 6px;
+    line-height: 32px;
+    padding: 0 8px;
     border-radius: $borderRadius;
     cursor: pointer;
 
diff --git a/src/views/Editor/SearchPanel.vue b/src/views/Editor/SearchPanel.vue
index 33f000f4..0306bb27 100644
--- a/src/views/Editor/SearchPanel.vue
+++ b/src/views/Editor/SearchPanel.vue
@@ -13,7 +13,7 @@
     />
 
     <div class="content" :class="type" @mousedown.stop>
-      <Input class="input" v-model:value="searchWord" placeholder="输入查找内容" @keydown.enter="searchNext()" ref="searchInpRef">
+      <Input class="input" v-model:value="searchWord" placeholder="输入查找内容" @enter="searchNext()" ref="searchInpRef">
         <template #suffix>
           <span class="count">{{searchIndex + 1}}/{{searchResults.length}}</span>
           <Divider type="vertical" />
@@ -21,7 +21,7 @@
           <IconRight class="next-btn right" @click="searchNext()" />
         </template>
       </Input>
-      <Input class="input" v-model:value="replaceWord" placeholder="输入替换内容" @keydown.enter="replace()" v-if="type === 'replace'"></Input>
+      <Input class="input" v-model:value="replaceWord" placeholder="输入替换内容" @enter="replace()" v-if="type === 'replace'"></Input>
       <div class="footer" v-if="type === 'replace'">
         <Button :disabled="!searchWord" style="margin-left: 5px;" @click="replace()">替换</Button>
         <Button :disabled="!searchWord" type="primary" style="margin-left: 5px;" @click="replaceAll()">全部替换</Button>
@@ -37,9 +37,9 @@ import useSearch from '@/hooks/useSearch'
 import MoveablePanel from '@/components/MoveablePanel.vue'
 import Tabs from '@/components/Tabs.vue'
 import Divider from '@/components/Divider.vue'
+import Input from '@/components/Input.vue'
 import {
   Button,
-  Input,
 } from 'ant-design-vue'
 
 type TypeKey = 'search' | 'replace'
@@ -97,6 +97,7 @@ watch(type, () => {
 }
 .count {
   font-size: 12px;
+  margin-right: 8px;
   user-select: none;
 }
 .next-btn {
@@ -124,7 +125,7 @@ watch(type, () => {
   height: 32px;
   position: absolute;
   top: 8px;
-  right: 0;
+  right: 3px;
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue
index 14e36eaf..0286866a 100644
--- a/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue
+++ b/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue
@@ -309,6 +309,7 @@ import emitter, { EmitterEvents, type RichTextAction } from '@/utils/emitter'
 import { WEB_FONTS } from '@/configs/font'
 import useHistorySnapshot from '@/hooks/useHistorySnapshot'
 import useTextFormatPainter from '@/hooks/useTextFormatPainter'
+import message from '@/utils/message'
 
 import ElementOpacity from '../common/ElementOpacity.vue'
 import ElementOutline from '../common/ElementOutline.vue'
@@ -319,17 +320,17 @@ import CheckboxButton from '@/components/CheckboxButton.vue'
 import CheckboxButtonGroup from '@/components/ButtonGroup.vue'
 import ColorPicker from '@/components/ColorPicker/index.vue'
 import Divider from '@/components/Divider.vue'
+import Input from '@/components/Input.vue'
 import {
   Button,
   Popover,
   Select,
   Radio,
-  Input,
-  message,
+  Input as AntInput,
 } from 'ant-design-vue'
 const { Group: RadioGroup, Button: RadioButton } = Radio
 const { OptGroup: SelectOptGroup, Option: SelectOption } = Select
-const InputGroup = Input.Group
+const InputGroup = AntInput.Group
 const ButtonGroup = Button.Group
 
 // 注意，存在一个未知原因的BUG，如果文本加粗后文本框高度增加，画布的可视区域定位会出现错误
@@ -491,10 +492,9 @@ const openLinkPopover = () => {
   linkPopoverVisible.value = true
 }
 const updateLink = (link?: string) => {
-  if (link) {
-    const linkRegExp = /^(https?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/
-    if (!linkRegExp.test(link)) return message.error('不是正确的网页链接地址')
-  }
+  const linkRegExp = /^(https?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/
+  if (!link || !linkRegExp.test(link)) return message.error('不是正确的网页链接地址')
+
   emitRichTextCommand('link', link)
   linkPopoverVisible.value = false
 }
diff --git a/src/views/Editor/Toolbar/SlideAnimationPanel.vue b/src/views/Editor/Toolbar/SlideAnimationPanel.vue
index 4454a9c9..5554153f 100644
--- a/src/views/Editor/Toolbar/SlideAnimationPanel.vue
+++ b/src/views/Editor/Toolbar/SlideAnimationPanel.vue
@@ -23,8 +23,9 @@ import { useSlidesStore } from '@/store'
 import type { TurningMode } from '@/types/slides'
 import { SLIDE_ANIMATIONS } from '@/configs/animation'
 import useHistorySnapshot from '@/hooks/useHistorySnapshot'
+import message from '@/utils/message'
 
-import { Button, message } from 'ant-design-vue'
+import { Button } from 'ant-design-vue'
 
 const slidesStore = useSlidesStore()
 const { slides, currentSlide } = storeToRefs(slidesStore)