release: update 3.4.5

src/store/modules/app.ts

@@ -2,22 +2,23 @@ import { store } from "/@/store";
 import { appType } from "./types";
 import { defineStore } from "pinia";
 import { getConfig } from "/@/config";
-import { storageLocal } from "/@/utils/storage";
-import { deviceDetection } from "/@/utils/deviceDetection";
+import type { StorageConfigs } from "/#/index";
+import { deviceDetection, storageLocal } from "@pureadmin/utils";
 
 export const useAppStore = defineStore({
   id: "pure-app",
   state: (): appType => ({
     sidebar: {
       opened:
-        storageLocal.getItem("responsive-layout")?.sidebarStatus ??
-        getConfig().SidebarStatus,
+        storageLocal.getItem<StorageConfigs>("responsive-layout")
+          ?.sidebarStatus ?? getConfig().SidebarStatus,
       withoutAnimation: false,
-      isClickHamburger: false
+      isClickCollapse: false
     },
     // 这里的layout用于监听容器拖拉后恢复对应的导航模式
     layout:
-      storageLocal.getItem("responsive-layout")?.layout ?? getConfig().Layout,
+      storageLocal.getItem<StorageConfigs>("responsive-layout")?.layout ??
+      getConfig().Layout,
     device: deviceDetection() ? "mobile" : "desktop"
   }),
   getters: {
@@ -30,7 +31,7 @@ export const useAppStore = defineStore({
   },
   actions: {
     TOGGLE_SIDEBAR(opened?: boolean, resize?: string) {
-      const layout = storageLocal.getItem("responsive-layout");
+      const layout = storageLocal.getItem<StorageConfigs>("responsive-layout");
       if (opened && resize) {
         this.sidebar.withoutAnimation = true;
         this.sidebar.opened = true;
@@ -42,19 +43,16 @@ export const useAppStore = defineStore({
       } else if (!opened && !resize) {
         this.sidebar.withoutAnimation = false;
         this.sidebar.opened = !this.sidebar.opened;
-        this.sidebar.isClickHamburger = !this.sidebar.opened;
+        this.sidebar.isClickCollapse = !this.sidebar.opened;
         layout.sidebarStatus = this.sidebar.opened;
       }
       storageLocal.setItem("responsive-layout", layout);
     },
-    TOGGLE_DEVICE(device: string) {
-      this.device = device;
-    },
     async toggleSideBar(opened?: boolean, resize?: string) {
       await this.TOGGLE_SIDEBAR(opened, resize);
     },
-    toggleDevice(device) {
-      this.TOGGLE_DEVICE(device);
+    toggleDevice(device: string) {
+      this.device = device;
     },
     setLayout(layout) {
       this.layout = layout;

src/store/modules/epTheme.ts

@@ -1,16 +1,18 @@
 import { store } from "/@/store";
 import { defineStore } from "pinia";
 import { getConfig } from "/@/config";
-import { storageLocal } from "/@/utils/storage";
+import type { StorageConfigs } from "/#/index";
+import { storageLocal } from "@pureadmin/utils";
 
 export const useEpThemeStore = defineStore({
   id: "pure-epTheme",
   state: () => ({
     epThemeColor:
-      storageLocal.getItem("responsive-layout")?.epThemeColor ??
+      storageLocal.getItem<StorageConfigs>("responsive-layout")?.epThemeColor ??
       getConfig().EpThemeColor,
     epTheme:
-      storageLocal.getItem("responsive-layout")?.theme ?? getConfig().Theme
+      storageLocal.getItem<StorageConfigs>("responsive-layout")?.theme ??
+      getConfig().Theme
   }),
   getters: {
     getEpThemeColor() {
@@ -28,8 +30,8 @@ export const useEpThemeStore = defineStore({
     }
   },
   actions: {
-    setEpThemeColor(newColor) {
-      const layout = storageLocal.getItem("responsive-layout");
+    setEpThemeColor(newColor: string): void {
+      const layout = storageLocal.getItem<StorageConfigs>("responsive-layout");
       this.epTheme = layout?.theme;
       this.epThemeColor = newColor;
       layout.epThemeColor = newColor;

src/store/modules/multiTags.ts

@@ -1,27 +1,21 @@
 import { defineStore } from "pinia";
 import { store } from "/@/store";
-import { isUrl } from "/@/utils/is";
 import { isEqual } from "lodash-unified";
-import { storageLocal } from "/@/utils/storage";
+import type { StorageConfigs } from "/#/index";
+import { routerArrays } from "/@/layout/types";
 import { multiType, positionType } from "./types";
+import { isUrl, storageLocal } from "@pureadmin/utils";
 
 export const useMultiTagsStore = defineStore({
   id: "pure-multiTags",
   state: () => ({
     // 存储标签页信息（路由信息）
-    multiTags: storageLocal.getItem("responsive-configure").multiTagsCache
-      ? storageLocal.getItem("responsive-tags")
-      : [
-          {
-            path: "/welcome",
-            parentPath: "/",
-            meta: {
-              title: "menus.hshome",
-              icon: "home-filled"
-            }
-          }
-        ],
-    multiTagsCache: storageLocal.getItem("responsive-configure").multiTagsCache
+    multiTags: storageLocal.getItem<StorageConfigs>("responsive-configure")
+      .multiTagsCache
+      ? storageLocal.getItem<StorageConfigs>("responsive-tags")
+      : [...routerArrays],
+    multiTagsCache: storageLocal.getItem<StorageConfigs>("responsive-configure")
+      .multiTagsCache
   }),
   getters: {
     getMultiTagsCache() {
@@ -54,8 +48,13 @@ export const useMultiTagsStore = defineStore({
         case "push":
           {
             const tagVal = value as multiType;
+            // 不添加到标签页
+            if (tagVal?.meta?.hiddenTag) return;
+            // 如果是外链无需添加信息到标签页
             if (isUrl(tagVal?.name)) return;
-            const tagPath = tagVal?.path;
+            // 如果title为空拒绝添加空信息到标签页
+            if (tagVal?.meta?.title.length === 0) return;
+            const tagPath = tagVal.path;
             // 判断tag是否已存在
             const tagHasExits = this.multiTags.some(tag => {
               return tag.path === tagPath;
@@ -63,20 +62,24 @@ export const useMultiTagsStore = defineStore({
 
             // 判断tag中的query键值是否相等
             const tagQueryHasExits = this.multiTags.some(tag => {
-              return isEqual(tag.query, tagVal?.query);
+              return isEqual(tag?.query, tagVal?.query);
             });
 
-            if (tagHasExits && tagQueryHasExits) return;
+            // 判断tag中的params键值是否相等
+            const tagParamsHasExits = this.multiTags.some(tag => {
+              return isEqual(tag?.params, tagVal?.params);
+            });
 
+            if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
+
+            // 动态路由可打开的最大数量
             const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1;
             if (dynamicLevel > 0) {
-              // dynamicLevel动态路由可打开的数量
-              // 获取到已经打开的动态路由数, 判断是否大于dynamicLevel
               if (
                 this.multiTags.filter(e => e?.path === tagPath).length >=
                 dynamicLevel
               ) {
-                // 关闭第一个
+                // 如果当前已打开的动态路由数大于dynamicLevel，替换第一个动态路由标签
                 const index = this.multiTags.findIndex(
                   item => item?.path === tagPath
                 );

src/store/modules/types.ts

@@ -14,8 +14,8 @@ export type appType = {
   sidebar: {
     opened: boolean;
     withoutAnimation: boolean;
-    // 判断是否手动点击Hamburger
-    isClickHamburger: boolean;
+    // 判断是否手动点击Collapse
+    isClickCollapse: boolean;
   };
   layout: string;
   device: string;
@@ -27,6 +27,7 @@ export type multiType = {
   name: string;
   meta: any;
   query?: object;
+  params?: object;
 };
 
 export type setType = {

src/store/modules/user.ts

@@ -2,7 +2,8 @@ import { defineStore } from "pinia";
 import { store } from "/@/store";
 import { userType } from "./types";
 import { router } from "/@/router";
-import { storageSession } from "/@/utils/storage";
+import { routerArrays } from "/@/layout/types";
+import { storageSession } from "@pureadmin/utils";
 import { getLogin, refreshToken } from "/@/api/user";
 import { getToken, setToken, removeToken } from "/@/utils/auth";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
@@ -25,7 +26,7 @@ export const useUserStore = defineStore({
     name,
     // 前端生成的验证码（按实际需求替换）
     verifyCode: "",
-    // 登陆显示组件判断 0：登陆 1：手机登陆 2：二维码登陆 3：注册 4：忘记密码，默认0：登陆
+    // 登录显示组件判断 0：登录 1：手机登录 2：二维码登录 3：注册 4：忘记密码，默认0：登录
     currentPage: 0
   }),
   actions: {
@@ -62,16 +63,7 @@ export const useUserStore = defineStore({
       this.name = "";
       removeToken();
       storageSession.clear();
-      useMultiTagsStoreHook().handleTags("equal", [
-        {
-          path: "/welcome",
-          parentPath: "/",
-          meta: {
-            title: "menus.hshome",
-            icon: "home-filled"
-          }
-        }
-      ]);
+      useMultiTagsStoreHook().handleTags("equal", routerArrays);
       router.push("/login");
     },
     // 刷新token