From d884f71d5701bd3b9242d5a5076bbfd783ee9ba9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 29 Feb 2024 19:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=202023-06-25=EF=BC=9Aperf:=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=81=E5=B1=8F=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/src/Editor.vue          |  2 +-
 .../UserInfo/src/components/LockPage.vue      |  2 +-
 .../UserInfo/src/components/useNow.ts         | 60 -------------------
 3 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 src/layout/components/UserInfo/src/components/useNow.ts

diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue
index fd31bcd2..eff82745 100644
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -180,7 +180,7 @@ defineExpose({
 </script>
 
 <template>
-  <div class="z-99 border-1 border-[var(--el-border-color)] border-solid">
+  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-10">
     <!-- 工具栏 -->
     <Toolbar
       :editor="editorRef"
diff --git a/src/layout/components/UserInfo/src/components/LockPage.vue b/src/layout/components/UserInfo/src/components/LockPage.vue
index 0e153e7e..1de18fe6 100644
--- a/src/layout/components/UserInfo/src/components/LockPage.vue
+++ b/src/layout/components/UserInfo/src/components/LockPage.vue
@@ -2,7 +2,7 @@
 import { resetRouter } from '@/router'
 import { useCache } from '@/hooks/web/useCache'
 import { useLockStore } from '@/store/modules/lock'
-import { useNow } from './useNow'
+import { useNow } from '@/hooks/web/useNow'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useUserStore } from '@/store/modules/user'
diff --git a/src/layout/components/UserInfo/src/components/useNow.ts b/src/layout/components/UserInfo/src/components/useNow.ts
deleted file mode 100644
index 10795965..00000000
--- a/src/layout/components/UserInfo/src/components/useNow.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { dateUtil } from '@/utils/dateUtil'
-import { reactive, toRefs } from 'vue'
-import { tryOnMounted, tryOnUnmounted } from '@vueuse/core'
-
-export function useNow(immediate = true) {
-  let timer: IntervalHandle
-
-  const state = reactive({
-    year: 0,
-    month: 0,
-    week: '',
-    day: 0,
-    hour: '',
-    minute: '',
-    second: 0,
-    meridiem: ''
-  })
-
-  const update = () => {
-    const now = dateUtil()
-
-    const h = now.format('HH')
-    const m = now.format('mm')
-    const s = now.get('s')
-
-    state.year = now.get('y')
-    state.month = now.get('M') + 1
-    state.week = '星期' + ['日', '一', '二', '三', '四', '五', '六'][now.day()]
-    state.day = now.get('date')
-    state.hour = h
-    state.minute = m
-    state.second = s
-
-    state.meridiem = now.format('A')
-  }
-
-  function start() {
-    update()
-    clearInterval(timer)
-    timer = setInterval(() => update(), 1000)
-  }
-
-  function stop() {
-    clearInterval(timer)
-  }
-
-  tryOnMounted(() => {
-    immediate && start()
-  })
-
-  tryOnUnmounted(() => {
-    stop()
-  })
-
-  return {
-    ...toRefs(state),
-    start,
-    stop
-  }
-}