From 08f9b9410b3452994951dc18c84af2dcce4e153c Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 14 Sep 2023 12:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menu/selector/menu-selector-tree.vue      |  2 +-
 orion-ops-ui/src/store/modules/cache/index.ts | 34 ++++---------------
 orion-ops-ui/src/store/modules/cache/types.ts |  8 ++---
 .../system/menu/components/menu-table.vue     |  7 +---
 orion-ops-ui/src/views/system/menu/index.vue  |  9 ++++-
 .../role/components/role-menu-bind-modal.vue  |  2 +-
 orion-ops-ui/src/views/user/role/index.vue    |  2 +-
 .../user-update-roles-form-modal.vue          |  2 +-
 orion-ops-ui/src/views/user/user/index.vue    |  2 +-
 9 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/orion-ops-ui/src/components/menu/selector/menu-selector-tree.vue b/orion-ops-ui/src/components/menu/selector/menu-selector-tree.vue
index 34e68972..8887eb02 100644
--- a/orion-ops-ui/src/components/menu/selector/menu-selector-tree.vue
+++ b/orion-ops-ui/src/components/menu/selector/menu-selector-tree.vue
@@ -104,7 +104,7 @@
     // 加载所有展开的key
     eachAllExpandKeys(treeData.value);
   };
-  init();
+  init([]);
 
   // 获取值
   const getValue = () => {
diff --git a/orion-ops-ui/src/store/modules/cache/index.ts b/orion-ops-ui/src/store/modules/cache/index.ts
index d16fcd04..2e4ec18e 100644
--- a/orion-ops-ui/src/store/modules/cache/index.ts
+++ b/orion-ops-ui/src/store/modules/cache/index.ts
@@ -1,44 +1,24 @@
 import { defineStore } from 'pinia';
 import { CacheState } from './types';
-import { MenuQueryResponse } from '@/api/system/menu';
-import { RoleQueryResponse } from '@/api/user/role';
+
+export type CacheType = 'menus' | 'roles' | 'tags'
 
 const useCacheStore = defineStore('cache', {
   state: (): CacheState => ({
     menus: [],
     roles: [],
+    tags: []
   }),
 
   getters: {},
 
   actions: {
     /**
-     * 更新菜单
+     * 设置
      */
-    updateMenus(menus: MenuQueryResponse[]) {
-      this.menus = menus;
-    },
-
-    /**
-     * 清空菜单
-     */
-    resetMenus() {
-      this.menus = [];
-    },
-
-    /**
-     * 更新角色
-     */
-    updateRoles(roles: RoleQueryResponse[]) {
-      this.roles = roles;
-    },
-
-    /**
-     * 清空角色
-     */
-    resetRoles() {
-      this.roles = [];
-    },
+    set(name: CacheType, value: any) {
+      this[name] = value;
+    }
   },
 });
 
diff --git a/orion-ops-ui/src/store/modules/cache/types.ts b/orion-ops-ui/src/store/modules/cache/types.ts
index 7b14e402..9cb4e509 100644
--- a/orion-ops-ui/src/store/modules/cache/types.ts
+++ b/orion-ops-ui/src/store/modules/cache/types.ts
@@ -1,9 +1,9 @@
 import { MenuQueryResponse } from '@/api/system/menu';
 import { RoleQueryResponse } from '@/api/user/role';
+import { TagResponse } from '@/api/meta/tag';
 
 export interface CacheState {
-  menus: MenuQueryResponse[],
-  roles: RoleQueryResponse[],
-
-  [key: string]: unknown;
+  menus: MenuQueryResponse[];
+  roles: RoleQueryResponse[];
+  tags: TagResponse[];
 }
diff --git a/orion-ops-ui/src/views/system/menu/components/menu-table.vue b/orion-ops-ui/src/views/system/menu/components/menu-table.vue
index 54e702ce..5f1ba5d3 100644
--- a/orion-ops-ui/src/views/system/menu/components/menu-table.vue
+++ b/orion-ops-ui/src/views/system/menu/components/menu-table.vue
@@ -260,7 +260,7 @@
       setFetchLoading(true);
       const { data } = await getMenuList(formModel);
       tableRenderData.value = data as MenuQueryResponse[];
-      cacheStore.updateMenus(tableRenderData.value);
+      cacheStore.set('menus', tableRenderData.value);
     } finally {
       setFetchLoading(false);
     }
@@ -301,11 +301,6 @@
     await loadMenuData();
   };
 
-  // 卸载时清除 menu cache
-  onUnmounted(() => {
-    cacheStore.resetMenus();
-  });
-
 </script>
 
 <style lang="less" scoped>
diff --git a/orion-ops-ui/src/views/system/menu/index.vue b/orion-ops-ui/src/views/system/menu/index.vue
index 9abe4487..1105fb45 100644
--- a/orion-ops-ui/src/views/system/menu/index.vue
+++ b/orion-ops-ui/src/views/system/menu/index.vue
@@ -21,9 +21,16 @@
   import MenuTable from '@/views/system/menu/components/menu-table.vue';
   import MenuFormModal from '@/views/system/menu/components/menu-form-modal.vue';
 
-  import { ref } from 'vue';
+  import { onUnmounted, ref } from 'vue';
+  import { useCacheStore } from '@/store';
 
   const table = ref<any>();
   const modal = ref<any>();
 
+  // 卸载时清除 menu cache
+  onUnmounted(() => {
+    const cacheStore = useCacheStore();
+    cacheStore.set('menus', []);
+  });
+
 </script>
diff --git a/orion-ops-ui/src/views/user/role/components/role-menu-bind-modal.vue b/orion-ops-ui/src/views/user/role/components/role-menu-bind-modal.vue
index 93f793c9..9ad9da6a 100644
--- a/orion-ops-ui/src/views/user/role/components/role-menu-bind-modal.vue
+++ b/orion-ops-ui/src/views/user/role/components/role-menu-bind-modal.vue
@@ -74,7 +74,7 @@
       if (!cacheStore.menus?.length) {
         // 加载菜单
         const { data: menuData } = await getMenuList({});
-        cacheStore.updateMenus(menuData);
+        cacheStore.set('menus', menuData);
       }
       // 获取角色菜单
       const { data: roleMenuIdList } = await getRoleMenuId(record.id);
diff --git a/orion-ops-ui/src/views/user/role/index.vue b/orion-ops-ui/src/views/user/role/index.vue
index 84b5d362..d40b02b4 100644
--- a/orion-ops-ui/src/views/user/role/index.vue
+++ b/orion-ops-ui/src/views/user/role/index.vue
@@ -34,7 +34,7 @@
   // 卸载时清除 menu cache
   onUnmounted(() => {
     const cacheStore = useCacheStore();
-    cacheStore.resetMenus();
+    cacheStore.set('menus', []);
   });
 
 </script>
diff --git a/orion-ops-ui/src/views/user/user/components/user-update-roles-form-modal.vue b/orion-ops-ui/src/views/user/user/components/user-update-roles-form-modal.vue
index b8d3612d..eb4dd305 100644
--- a/orion-ops-ui/src/views/user/user/components/user-update-roles-form-modal.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-update-roles-form-modal.vue
@@ -92,7 +92,7 @@
       // 获取全部角色
       if (!cacheStore.roles?.length) {
         const { data } = await getRoleList();
-        cacheStore.updateRoles(data);
+        cacheStore.set('roles', data);
       }
       // 加载用户角色
       const { data: roleIdList } = await getUserRoleIdList(formModel.id);
diff --git a/orion-ops-ui/src/views/user/user/index.vue b/orion-ops-ui/src/views/user/user/index.vue
index 59b67ddb..3ea045fe 100644
--- a/orion-ops-ui/src/views/user/user/index.vue
+++ b/orion-ops-ui/src/views/user/user/index.vue
@@ -39,7 +39,7 @@
   // 卸载时清除 role cache
   onUnmounted(() => {
     const cacheStore = useCacheStore();
-    cacheStore.resetRoles();
+    cacheStore.set('roles', []);
   });
 
 </script>