From 4f8330a4faf6cc98a9bac17bd3e1719ae1b30c81 Mon Sep 17 00:00:00 2001
From: kailong321200875 <321200875@qq.com>
Date: Sun, 25 Jun 2023 14:20:51 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=94=81=E5=B1=8F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/{types.ts => types/index.ts}            |  0
 .../src/{types.ts => types/index.ts}            |  0
 .../src/{types.ts => types/index.ts}            |  0
 .../src/{types.ts => types/index.ts}            |  0
 .../UserInfo/src/components/LockDialog.vue      | 17 ++++++++---------
 .../UserInfo/src/components/LockPage.vue        |  2 +-
 .../src/components => hooks/web}/useNow.ts      |  2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)
 rename src/components/ConfigGlobal/src/{types.ts => types/index.ts} (100%)
 rename src/components/ContextMenu/src/{types.ts => types/index.ts} (100%)
 rename src/components/Descriptions/src/{types.ts => types/index.ts} (100%)
 rename src/components/ImageViewer/src/{types.ts => types/index.ts} (100%)
 rename src/{components/UserInfo/src/components => hooks/web}/useNow.ts (95%)

diff --git a/src/components/ConfigGlobal/src/types.ts b/src/components/ConfigGlobal/src/types/index.ts
similarity index 100%
rename from src/components/ConfigGlobal/src/types.ts
rename to src/components/ConfigGlobal/src/types/index.ts
diff --git a/src/components/ContextMenu/src/types.ts b/src/components/ContextMenu/src/types/index.ts
similarity index 100%
rename from src/components/ContextMenu/src/types.ts
rename to src/components/ContextMenu/src/types/index.ts
diff --git a/src/components/Descriptions/src/types.ts b/src/components/Descriptions/src/types/index.ts
similarity index 100%
rename from src/components/Descriptions/src/types.ts
rename to src/components/Descriptions/src/types/index.ts
diff --git a/src/components/ImageViewer/src/types.ts b/src/components/ImageViewer/src/types/index.ts
similarity index 100%
rename from src/components/ImageViewer/src/types.ts
rename to src/components/ImageViewer/src/types/index.ts
diff --git a/src/components/UserInfo/src/components/LockDialog.vue b/src/components/UserInfo/src/components/LockDialog.vue
index e7355a7..f8bc0b4 100644
--- a/src/components/UserInfo/src/components/LockDialog.vue
+++ b/src/components/UserInfo/src/components/LockDialog.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { useI18n } from '@/hooks/web/useI18n'
-import { ref, unref } from 'vue'
+import { ref } from 'vue'
 import { Dialog } from '@/components/Dialog'
 import { Form } from '@/components/Form'
 import { useForm } from '@/hooks/web/useForm'
 import { reactive, computed } from 'vue'
 import { useValidator } from '@/hooks/web/useValidator'
-import { FormSchema } from '@/types/form'
+import { FormSchema } from '@/components/Form'
 import { ElButton } from 'element-plus'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useLockStore } from '@/store/modules/lock'
@@ -54,14 +54,13 @@ const schema: FormSchema[] = reactive([
   }
 ])
 
-const { register, formRef, methods } = useForm({
-  schema
-})
+const { formRegister, formMethods } = useForm()
 
-const { getFormData } = methods
+const { getFormData, getElFormExpose } = formMethods
 
-const handleLock = () => {
-  unref(formRef)?.validate(async (valid) => {
+const handleLock = async () => {
+  const formExpose = await getElFormExpose()
+  formExpose?.validate(async (valid) => {
     if (valid) {
       dialogVisible.value = false
       const formData = await getFormData()
@@ -86,7 +85,7 @@ const handleLock = () => {
       <img src="@/assets/imgs/avatar.jpg" alt="" class="w-70px h-70px rounded-[50%]" />
       <span class="text-14px my-10px text-[var(--top-header-text-color)]">Archer</span>
     </div>
-    <Form :is-col="false" :rules="rules" @register="register" />
+    <Form :is-col="false" :schema="schema" :rules="rules" @register="formRegister" />
     <template #footer>
       <ElButton type="primary" @click="handleLock">{{ t('lock.lock') }}</ElButton>
     </template>
diff --git a/src/components/UserInfo/src/components/LockPage.vue b/src/components/UserInfo/src/components/LockPage.vue
index 9a191d1..57ad179 100644
--- a/src/components/UserInfo/src/components/LockPage.vue
+++ b/src/components/UserInfo/src/components/LockPage.vue
@@ -6,7 +6,7 @@ import { useRouter } from 'vue-router'
 import { useCache } from '@/hooks/web/useCache'
 import { useLockStore } from '@/store/modules/lock'
 import { useI18n } from '@/hooks/web/useI18n'
-import { useNow } from './useNow'
+import { useNow } from '@/hooks/web/useNow'
 import { useDesign } from '@/hooks/web/useDesign'
 import { Icon } from '@/components/Icon'
 import { loginOutApi } from '@/api/login'
diff --git a/src/components/UserInfo/src/components/useNow.ts b/src/hooks/web/useNow.ts
similarity index 95%
rename from src/components/UserInfo/src/components/useNow.ts
rename to src/hooks/web/useNow.ts
index 1079596..09d3176 100644
--- a/src/components/UserInfo/src/components/useNow.ts
+++ b/src/hooks/web/useNow.ts
@@ -2,7 +2,7 @@ import { dateUtil } from '@/utils/dateUtil'
 import { reactive, toRefs } from 'vue'
 import { tryOnMounted, tryOnUnmounted } from '@vueuse/core'
 
-export function useNow(immediate = true) {
+export const useNow = (immediate = true) => {
   let timer: IntervalHandle
 
   const state = reactive({