From 1999f30b0e363d63bf1f1a8c0fda7bdc80c9b8b7 Mon Sep 17 00:00:00 2001
From: nongyehong <2439646234@qq.com>
Date: Mon, 21 Oct 2024 00:12:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(layout):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=A1=B6=E9=83=A8=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E5=9D=97=E9=A2=9C=E8=89=B2=E5=92=8C=E6=97=A0=E6=B3=95=E7=BC=A9?=
 =?UTF-8?q?=E5=B0=8F=E4=B8=BB=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/index.ts                            |  2 +-
 src/layout/left/components/ActionList.vue     | 27 +------------------
 .../left/components/definePlugins/Card.vue    |  1 -
 .../left/components/definePlugins/List.vue    |  1 -
 src/layout/left/config.tsx                    |  1 -
 src/layout/left/hook.ts                       |  1 -
 src/layout/left/index.vue                     |  2 +-
 src/stores/menuTop.ts                         |  1 -
 src/stores/onlineStatus.ts                    |  1 -
 src/stores/plugins.ts                         |  9 +++----
 src/stores/setting.ts                         |  1 -
 src/typings/stores.d.ts                       |  3 +--
 src/views/loginWindow/Login.vue               |  1 -
 13 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/src/enums/index.ts b/src/enums/index.ts
index 91f1db4..3974d13 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -281,7 +281,7 @@ export enum PluginEnum {
 /** 菜单显示模式 */
 export enum ShowModeEnum {
   /** 图标方式 */
-  ICON = 0,
+  ICON,
   /** 文字方式 */
   TEXT
 }
diff --git a/src/layout/left/components/ActionList.vue b/src/layout/left/components/ActionList.vue
index 6c61fe0..e307961 100644
--- a/src/layout/left/components/ActionList.vue
+++ b/src/layout/left/components/ActionList.vue
@@ -311,6 +311,7 @@ const handleResize = async (e: Event) => {
 
 const initWindowHeight = async () => {
   let homeWindow = await WebviewWindow.getByLabel('home')
+  await homeWindow?.setResizable(true)
   let size = await homeWindow?.size()
   let sf = await homeWindow?.scaleFactor()
   if (homeWindow && size && sf) {
@@ -350,32 +351,6 @@ onMounted(() => {
   setTimeout(() => {
     tipShow.value = false
   }, 5000)
-
-  // // 创建 ResizeObserver 实例并监听 headerRef
-  // const resizeObserver = new ResizeObserver((entries) => {
-  //   for (let entry of entries) {
-  //     console.log(entry.contentRect.height)
-  //     // if (entry.contentRect.height > 220) {
-  //     //   // 计算需要移动的项数量
-  //     //   const itemsToMove = Math.floor(itemsTop.value.length / 2) // 例如：移动一半
-  //     //   excessItems.value = itemsTop.value.splice(-itemsToMove, itemsToMove)
-  //     // }
-  //   }
-  // })
-  //
-  // // 观察 headerRef 的大小变化
-  // if (headerRef.value) {
-  //   resizeObserver.observe(headerRef.value)
-  // }
-  //
-  // if (actionListRef.value) {
-  //   resizeObserver.observe(actionListRef.value)
-  // }
-  //
-  // // 在组件卸载时停止观察
-  // onUnmounted(() => {
-  //   resizeObserver.disconnect()
-  // })
 })
 </script>
 <style lang="scss" scoped>
diff --git a/src/layout/left/components/definePlugins/Card.vue b/src/layout/left/components/definePlugins/Card.vue
index 6d26ace..3c29121 100644
--- a/src/layout/left/components/definePlugins/Card.vue
+++ b/src/layout/left/components/definePlugins/Card.vue
@@ -146,7 +146,6 @@ import { MittEnum, PluginEnum } from '@/enums'
 import { pluginsList } from '@/layout/left/config.tsx'
 import { useSettingStore } from '@/stores/setting.ts'
 import { usePluginsStore } from '@/stores/plugins.ts'
-import { STO } from '@/typings/stores'
 import Mitt from '@/utils/Bus'
 
 const settingStore = useSettingStore()
diff --git a/src/layout/left/components/definePlugins/List.vue b/src/layout/left/components/definePlugins/List.vue
index 6599c09..43a33f1 100644
--- a/src/layout/left/components/definePlugins/List.vue
+++ b/src/layout/left/components/definePlugins/List.vue
@@ -127,7 +127,6 @@
 import { MittEnum, PluginEnum } from '@/enums'
 import { pluginsList } from '@/layout/left/config.tsx'
 import { usePluginsStore } from '@/stores/plugins.ts'
-import { STO } from '@/typings/stores'
 import Mitt from '@/utils/Bus'
 
 const pluginsStore = usePluginsStore()
diff --git a/src/layout/left/config.tsx b/src/layout/left/config.tsx
index 0062ab5..c0ccb59 100644
--- a/src/layout/left/config.tsx
+++ b/src/layout/left/config.tsx
@@ -2,7 +2,6 @@ import { useWindow } from '@/hooks/useWindow.ts'
 import { MittEnum, ModalEnum, PluginEnum } from '@/enums'
 import Mitt from '@/utils/Bus.ts'
 import { useLogin } from '@/hooks/useLogin.ts'
-import { STO } from '@/typings/stores'
 
 const { createWebviewWindow } = useWindow()
 const { logout } = useLogin()
diff --git a/src/layout/left/hook.ts b/src/layout/left/hook.ts
index ffd885a..3694945 100644
--- a/src/layout/left/hook.ts
+++ b/src/layout/left/hook.ts
@@ -16,7 +16,6 @@ import { delay } from 'lodash-es'
 import router from '@/router'
 import { listen } from '@tauri-apps/api/event'
 import { useMenuTopStore } from '@/stores/menuTop.ts'
-import { STO } from '@/typings/stores'
 
 export const leftHook = () => {
   const prefers = matchMedia('(prefers-color-scheme: dark)')
diff --git a/src/layout/left/index.vue b/src/layout/left/index.vue
index e792674..28a52b3 100644
--- a/src/layout/left/index.vue
+++ b/src/layout/left/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="background: var(--left-bg-color)">
-    <div class="h-30px"></div>
+    <div style="background: var(--left-bg-color)" class="h-30px"></div>
     <main class="left min-w-64px h-full p-[0_6px_40px] box-border flex-col-center select-none" data-tauri-drag-region>
       <p class="text-(16px [--left-text-color]) cursor-default select-none m-[4px_0_16px_0]">HuLa</p>
       <!-- 头像模块 -->
diff --git a/src/stores/menuTop.ts b/src/stores/menuTop.ts
index d7a55eb..da562f1 100644
--- a/src/stores/menuTop.ts
+++ b/src/stores/menuTop.ts
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia'
 import { PluginEnum, StoresEnum } from '@/enums'
-import { STO } from '../typings/stores'
 
 export const useMenuTopStore = defineStore(
   StoresEnum.MENUTOP,
diff --git a/src/stores/onlineStatus.ts b/src/stores/onlineStatus.ts
index 8c744f2..9344a2a 100644
--- a/src/stores/onlineStatus.ts
+++ b/src/stores/onlineStatus.ts
@@ -2,7 +2,6 @@ import { defineStore } from 'pinia'
 import { StoresEnum } from '@/enums'
 import { statusItem } from '@/views/homeWindow/onlineStatus/config.ts'
 import Colorthief from 'colorthief'
-import { STO } from '../typings/stores'
 
 const colorthief = new Colorthief()
 export const onlineStatus = defineStore(StoresEnum.ONLINE_STATUS, {
diff --git a/src/stores/plugins.ts b/src/stores/plugins.ts
index 570657c..e4525ef 100644
--- a/src/stores/plugins.ts
+++ b/src/stores/plugins.ts
@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 import { PluginEnum, StoresEnum } from '@/enums'
 import { pluginsList } from '@/layout/left/config.tsx'
-import { STO } from '../typings/stores'
 
 export const usePluginsStore = defineStore(
   StoresEnum.PLUGINS,
@@ -13,7 +12,7 @@ export const usePluginsStore = defineStore(
 
     /**
      * 设置插件
-     * @param newPlugins 插件数据
+     * @param newPlugin 插件数据
      */
     const addPlugin = (newPlugin: STO.Plugins<PluginEnum>) => {
       plugins.value.push(newPlugin)
@@ -21,10 +20,10 @@ export const usePluginsStore = defineStore(
 
     /**
      * 删除插件
-     * @param newPlugins 插件数据
+     * @param p 插件数据
      */
     const removePlugin = (p: STO.Plugins<PluginEnum>) => {
-      const index = plugins.value.findIndex((i) => i.title === p.title)
+      const index = plugins.value.findIndex((i: STO.Plugins<PluginEnum>) => i.title === p.title)
       plugins.value.splice(index, 1)
     }
 
@@ -33,7 +32,7 @@ export const usePluginsStore = defineStore(
      * @param p 插件
      */
     const updatePlugin = (p: STO.Plugins<PluginEnum>) => {
-      const index = plugins.value.findIndex((i) => i.title === p.title)
+      const index = plugins.value.findIndex((i: STO.Plugins<PluginEnum>) => i.title === p.title)
       if (index !== -1) {
         plugins.value[index] = p
       }
diff --git a/src/stores/setting.ts b/src/stores/setting.ts
index 9662582..92520d9 100644
--- a/src/stores/setting.ts
+++ b/src/stores/setting.ts
@@ -3,7 +3,6 @@ import { CloseBxEnum, StoresEnum, ShowModeEnum, ThemeEnum } from '@/enums'
 import apis from '@/services/apis.ts'
 import { isDiffNow10Min } from '@/utils/ComputedTime.ts'
 import type { CacheBadgeItem } from '@/services/types.ts'
-import { STO } from '../typings/stores'
 
 const badgeCachedList = reactive<Record<number, Partial<CacheBadgeItem>>>({})
 // TODO 使用indexDB或sqlite缓存数据，还需要根据每个账号来进行配置 (nyh -> 2024-03-26 01:22:12)
diff --git a/src/typings/stores.d.ts b/src/typings/stores.d.ts
index aeeb5a2..ea73a87 100644
--- a/src/typings/stores.d.ts
+++ b/src/typings/stores.d.ts
@@ -1,7 +1,6 @@
-import { ShowModeEnum } from '../enums'
-
 /** pinia的store的命名空间 */
 declare namespace STO {
+  import { ShowModeEnum } from '@/enums'
   /**
    * 设置
    * @param themes 主题设置
diff --git a/src/views/loginWindow/Login.vue b/src/views/loginWindow/Login.vue
index 0571ea4..9cccee9 100644
--- a/src/views/loginWindow/Login.vue
+++ b/src/views/loginWindow/Login.vue
@@ -153,7 +153,6 @@ import { lightTheme } from 'naive-ui'
 import { useSettingStore } from '@/stores/setting.ts'
 import { useLogin } from '@/hooks/useLogin.ts'
 import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow'
-import { STO } from '@/typings/stores'
 
 const settingStore = useSettingStore()
 const { login } = storeToRefs(settingStore)