@utogether/udp-core 1.0.1-beta.2 → 1.0.1-beta.20

package/src/store/modules/app.ts

@@ -14,9 +14,7 @@ import { responsiveStorageNameSpace, getConfig } from '../../config';
 export const useAppStore = defineStore('udp-app', {
   state: (): appType => ({
     sidebar: {
-      opened:
-        storageLocal.getItem(`${responsiveStorageNameSpace()}layout`)?.sidebarStatus ??
-        getConfig().SidebarStatus,
+      opened: storageLocal.getItem(`${responsiveStorageNameSpace()}layout`)?.sidebarStatus ?? getConfig().SidebarStatus,
       withoutAnimation: false,
       isClickCollapse: false
     },

package/src/store/modules/multiTags.ts

@@ -1,109 +1,110 @@
-/*
- * @Author: wei.li
- * @Date: 2021-12-23 17:33:20
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-03 10:27:36
- * @Description: file content
- */
-import { defineStore } from 'pinia';
-import { isEqual, isBoolean } from 'xe-utils';
-import { storageLocal, isUrl } from '@utogether/utils';
-import { store } from '../index';
-import { routerArrays } from '../../layout/types';
-import { usePermissionStoreHook } from './permission';
-import { responsiveStorageNameSpace } from '../../config';
-import type { multiType, positionType } from './types';
-
-export const useMultiTagsStore = defineStore('udp-multiTags', {
-  state: () => ({
-    // 存储标签页信息（路由信息）
-    multiTags: storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.multiTagsCache
-      ? storageLocal.getItem(`${responsiveStorageNameSpace()}tags`)
-      : [...routerArrays, ...usePermissionStoreHook().flatteningRoutes.filter(v => v?.meta?.fixedTag)],
-    multiTagsCache: storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.multiTagsCache
-  }),
-  getters: {
-    getMultiTagsCache(state) {
-      return state.multiTagsCache;
-    }
-  },
-  actions: {
-    multiTagsCacheChange(multiTagsCache: boolean) {
-      this.multiTagsCache = multiTagsCache;
-      if (multiTagsCache) {
-        storageLocal.setItem(`${responsiveStorageNameSpace()}tags`, this.multiTags);
-      } else {
-        storageLocal.removeItem(`${responsiveStorageNameSpace()}tags`);
-      }
-    },
-    tagsCache(multiTags) {
-      this.getMultiTagsCache && storageLocal.setItem(`${responsiveStorageNameSpace()}tags`, multiTags);
-    },
-    handleTags<T>(mode: string, value?: T | multiType, position?: positionType): T {
-      switch (mode) {
-        case 'equal':
-          this.multiTags = value;
-          this.tagsCache(this.multiTags);
-          break;
-        case 'push':
-          {
-            const tagVal = value as multiType;
-            // 不添加到标签页
-            if (tagVal?.meta?.hiddenTag) return;
-            // 如果是外链无需添加信息到标签页
-            if (isUrl(tagVal?.name)) return;
-            // 如果title为空拒绝添加空信息到标签页
-            if (tagVal?.meta?.title?.length === 0) return;
-            // showLink:false 不添加到标签页
-            if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
-            const tagPath = tagVal.path;
-            // 判断tag是否已存在
-            const tagHasExits = this.multiTags.some(tag => {
-              return tag.path === tagPath;
-            });
-
-            // 判断tag中的query键值是否相等
-            const tagQueryHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.query, tagVal?.query);
-            });
-
-            // 判断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) {
-              if (this.multiTags.filter(e => e?.path === tagPath).length >= dynamicLevel) {
-                // 如果当前已打开的动态路由数大于dynamicLevel，替换第一个动态路由标签
-                const index = this.multiTags.findIndex(item => item?.path === tagPath);
-                index !== -1 && this.multiTags.splice(index, 1);
-              }
-            }
-            this.multiTags.push(value);
-            this.tagsCache(this.multiTags);
-          }
-          break;
-        case 'splice':
-          if (!position) {
-            const index = this.multiTags.findIndex(v => v.path === value);
-            if (index === -1) return;
-            this.multiTags.splice(index, 1);
-          } else {
-            this.multiTags.splice(position?.startIndex, position?.length);
-          }
-          this.tagsCache(this.multiTags);
-          return this.multiTags;
-        case 'slice':
-          return this.multiTags.slice(-1);
-      }
-    }
-  }
-});
-
-export function useMultiTagsStoreHook() {
-  return useMultiTagsStore(store);
-}
+/*
+ * @Author: wei.li
+ * @Date: 2021-12-23 17:33:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-10-19 12:01:05
+ * @Description: file content
+ */
+import { defineStore } from 'pinia';
+import { isEqual, isBoolean } from 'xe-utils';
+import { storageLocal, isUrl } from '@utogether/utils';
+import { store } from '../index';
+import { routerArrays } from '../../layout/types';
+import { usePermissionStoreHook } from './permission';
+import { responsiveStorageNameSpace } from '../../config';
+import type { multiType, positionType } from './types';
+
+export const useMultiTagsStore = defineStore('udp-multiTags', {
+  state: () => ({
+    // 存储标签页信息（路由信息）
+    multiTags: storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.multiTagsCache
+      ? storageLocal.getItem(`${responsiveStorageNameSpace()}tags`)
+      : [...routerArrays, ...usePermissionStoreHook().flatteningRoutes.filter(v => v?.meta?.fixedTag)],
+    multiTagsCache: storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.multiTagsCache
+  }),
+  getters: {
+    getMultiTagsCache(state) {
+      return state.multiTagsCache;
+    }
+  },
+  actions: {
+    multiTagsCacheChange(multiTagsCache: boolean) {
+      this.multiTagsCache = multiTagsCache;
+      if (multiTagsCache) {
+        storageLocal.setItem(`${responsiveStorageNameSpace()}tags`, this.multiTags);
+      } else {
+        storageLocal.removeItem(`${responsiveStorageNameSpace()}tags`);
+      }
+    },
+    tagsCache(multiTags) {
+      this.getMultiTagsCache && storageLocal.setItem(`${responsiveStorageNameSpace()}tags`, multiTags);
+    },
+    handleTags<T>(mode: string, value?: T | multiType, position?: positionType): T {
+      switch (mode) {
+        case 'equal':
+          this.multiTags = value;
+          this.tagsCache(this.multiTags);
+          break;
+        case 'push':
+          {
+            const tagVal = value as multiType;
+            // 不添加到标签页
+            if (tagVal?.meta?.hiddenTag) return;
+            // 如果是外链无需添加信息到标签页
+            if (isUrl(tagVal?.name)) return;
+            // 如果title为空拒绝添加空信息到标签页
+            if (tagVal?.meta?.title?.length === 0) return;
+            // showLink:false 不添加到标签页
+            if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
+            const tagPath = tagVal.path;
+            // 判断tag是否已存在
+            const tagHasExits = this.multiTags.some(tag => {
+              return tag.path === tagPath && isEqual(tag?.query, tagVal?.query) && isEqual(tag?.params, tagVal?.params);
+            });
+
+            // 判断tag中的query键值是否相等
+            // const tagQueryHasExits = this.multiTags.some(tag => {
+            //   return isEqual(tag?.query, tagVal?.query);
+            // });
+
+            // // 判断tag中的params键值是否相等
+            // const tagParamsHasExits = this.multiTags.some(tag => {
+            //   return isEqual(tag?.params, tagVal?.params);
+            // });
+
+            // if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
+            if (tagHasExits) return;
+
+            // 动态路由可打开的最大数量
+            const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1;
+            if (dynamicLevel > 0) {
+              if (this.multiTags.filter(e => e?.path === tagPath).length >= dynamicLevel) {
+                // 如果当前已打开的动态路由数大于dynamicLevel，替换第一个动态路由标签
+                const index = this.multiTags.findIndex(item => item?.path === tagPath);
+                index !== -1 && this.multiTags.splice(index, 1);
+              }
+            }
+            this.multiTags.push(value);
+            this.tagsCache(this.multiTags);
+          }
+          break;
+        case 'splice':
+          if (!position) {
+            const index = this.multiTags.findIndex(v => v.path === value);
+            if (index === -1) return;
+            this.multiTags.splice(index, 1);
+          } else {
+            this.multiTags.splice(position?.startIndex, position?.length);
+          }
+          this.tagsCache(this.multiTags);
+          return this.multiTags;
+        case 'slice':
+          return this.multiTags.slice(-1);
+      }
+    }
+  }
+});
+
+export function useMultiTagsStoreHook() {
+  return useMultiTagsStore(store);
+}

package/src/store/modules/permission.ts

@@ -1,103 +1,113 @@
-/*
- * @Author: wei.li
- * @Date: 2021-11-17 16:02:30
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-03 10:20:58
- * @Description: file content
- */
-import { defineStore } from 'pinia';
-import { store } from '../index';
-import type { cacheType } from './types';
-import { constantMenus } from '../../router';
-import { clone, debounce, findLastIndexOf } from 'xe-utils';
-import { getKeyList } from '../../utils';
-import { ascending, filterTree, formatFlatteningRoutes } from '../../router/utils';
-import { useMultiTagsStoreHook } from './multiTags';
-
-export const usePermissionStore = defineStore('udp-permission', {
-  state: () => ({
-    // 静态路由生成的菜单
-    constantMenus,
-    // 整体路由生成的菜单（静态、动态）
-    wholeMenus: [],
-    // 深拷贝一个菜单树，与导航菜单不冲突
-    menusTree: [],
-    // 整体路由（一维数组格式）
-    flatteningRoutes: [],
-    buttonAuth: [],
-    // 缓存页面keepAlive
-    cachePageList: []
-  }),
-  getters: {
-    getButtonAuth() {
-      return this.buttonAuth;
-    }
-  },
-  actions: {
-    asyncActionRoutes(routes = []) {
-      if (this.wholeMenus.length > 0) return;
-      const idx = findLastIndexOf(routes, item => item.menuCode === 'SysHome');
-      const constantMenus = clone(this.constantMenus, true);
-      if (idx !== -1) {
-        const homeRouter = this.constantMenus.find(f => f.name === 'home');
-        // 过滤非路由分类非菜单的数据
-        routes[idx].children && homeRouter.children.push(...routes[idx].children);
-        routes.splice(idx, 1);
-      }
-      this.wholeMenus = filterTree(ascending(this.constantMenus.concat(routes)));
-      this.flatteningRoutes = formatFlatteningRoutes(this.constantMenus.concat(routes));
-      this.menusTree = clone(this.wholeMenus, true);
-      this.constantMenus = constantMenus;
-    },
-    async changeSetting(routes) {
-      await this.asyncActionRoutes(routes);
-    },
-    setAuthButton(buttonAuth) {
-      this.buttonAuth = buttonAuth;
-    },
-    setWholeMenus(wholeMenus) {
-      this.wholeMenus = wholeMenus;
-    },
-    cacheOperate({ mode, name }: cacheType) {
-      const delIndex = this.cachePageList.findIndex(v => v === name);
-      switch (mode) {
-        case 'refresh':
-          this.cachePageList = this.cachePageList.filter(v => v !== name);
-          break;
-        case 'add':
-          this.cachePageList.push(name);
-          break;
-        case 'delete':
-          delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
-          break;
-        case 'reset':
-          this.cachePageList = [];
-          break;
-      }
-      /** 监听缓存页面是否存在于标签页，不存在则删除 */
-      debounce(() => {
-        let cacheLength = this.cachePageList.length;
-        const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
-        while (cacheLength > 0) {
-          nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
-            this.cachePageList.splice(
-              this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]),
-              1
-            );
-          cacheLength--;
-        }
-      }, 500)();
-    },
-    /** 清空缓存页面 */
-    clearAllCachePage() {
-      this.wholeMenus = [];
-      this.menusTree = [];
-      this.buttonAuth = [];
-      this.cachePageList = [];
-    }
-  }
-});
-
-export function usePermissionStoreHook() {
-  return usePermissionStore(store);
-}
+/*
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:02:30
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-10-19 11:58:29
+ * @Description: file content
+ */
+import { defineStore } from 'pinia';
+import { store } from '../index';
+import type { cacheType } from './types';
+import { constantMenus } from '../../router';
+import { clone, findLastIndexOf } from 'xe-utils';
+import { getKeyList } from '../../utils';
+import { ascending, filterTree, formatFlatteningRoutes } from '../../router/utils';
+import { useMultiTagsStoreHook } from './multiTags';
+
+export const usePermissionStore = defineStore('udp-permission', {
+  state: () => ({
+    // 静态路由生成的菜单
+    constantMenus,
+    // 整体路由生成的菜单（静态、动态）
+    wholeMenus: [],
+    // 深拷贝一个菜单树，与导航菜单不冲突
+    menusTree: [],
+    // 整体路由（一维数组格式）
+    flatteningRoutes: [],
+    buttonAuth: [],
+    // 缓存页面keepAlive
+    cachePageList: []
+  }),
+  getters: {
+    getButtonAuth() {
+      return this.buttonAuth;
+    }
+  },
+  actions: {
+    asyncActionRoutes(routes = []) {
+      if (this.wholeMenus.length > 0) return;
+      const idx = findLastIndexOf(routes, item => item.menuCode === 'SysHome');
+      const constantMenus = clone(this.constantMenus, true);
+      if (idx !== -1) {
+        const homeRouter = this.constantMenus.find(f => f.name === 'home');
+        // 过滤非路由分类非菜单的数据
+        routes[idx].children && homeRouter.children.push(...routes[idx].children);
+        routes.splice(idx, 1);
+      }
+      this.wholeMenus = filterTree(ascending(this.constantMenus.concat(routes)));
+      this.flatteningRoutes = formatFlatteningRoutes(this.constantMenus.concat(routes));
+      this.menusTree = clone(this.wholeMenus, true);
+      this.constantMenus = constantMenus;
+    },
+    async changeSetting(routes) {
+      await this.asyncActionRoutes(routes);
+    },
+    setAuthButton(buttonAuth) {
+      this.buttonAuth = buttonAuth;
+    },
+    setWholeMenus(wholeMenus) {
+      this.wholeMenus = wholeMenus;
+    },
+
+    /** 监听缓存页面是否存在于标签页，不存在则删除 */
+    clearCache() {
+      let cacheLength = this.cachePageList.length;
+      const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
+      while (cacheLength > 0) {
+        nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
+          this.cachePageList.splice(this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]), 1);
+        cacheLength--;
+      }
+    },
+    cacheOperate({ mode, name }: cacheType) {
+      const delIndex = this.cachePageList.findIndex(v => v === name);
+      switch (mode) {
+        case 'refresh':
+          this.cachePageList = this.cachePageList.filter(v => v !== name);
+          this.clearCache();
+          break;
+        case 'add':
+          this.cachePageList.push(name);
+          break;
+        case 'delete':
+          delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
+          this.clearCache();
+          break;
+        case 'reset':
+          this.cachePageList = [];
+          break;
+      }
+      /** 监听缓存页面是否存在于标签页，不存在则删除 */
+      // debounce(() => {
+      //   let cacheLength = this.cachePageList.length;
+      //   const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
+      //   while (cacheLength > 0) {
+      //     nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
+      //       this.cachePageList.splice(this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]), 1);
+      //     cacheLength--;
+      //   }
+      // }, 500)();
+    },
+    /** 清空缓存页面 */
+    clearAllCachePage() {
+      this.wholeMenus = [];
+      this.menusTree = [];
+      this.buttonAuth = [];
+      this.cachePageList = [];
+    }
+  }
+});
+
+export function usePermissionStoreHook() {
+  return usePermissionStore(store);
+}

package/src/store/modules/system.ts

@@ -166,9 +166,7 @@ export const useSystemStore = defineStore('udp-system', {
         organizationId: systemInfo.organizationId
       };
       cookies.set('kCookies_param', JSON.stringify(query));
-      this.isAdminRole = this.employee.sysRoles.some(
-        s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName)
-      );
+      this.isAdminRole = this.employee.sysRoles.some(s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName));
       // 缓存按钮数据权限
       usePermissionStoreHook().setAuthButton(systemInfo.dataMenus);
     }

package/src/style/button.scss

@@ -44,10 +44,17 @@
 }
 
 .vxe-button.type--button:not(.is--disabled):hover {
-  color: #fff !important;
+  color: inherit;
 
-  .vxe-button--icon {
-    color: #4169e1;
+  .vxe-button--icon,
+  .vxe-button--item {
+    color: inherit;
+  }
+}
+
+.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
+  .vxe-button--item {
+    color: var(--udp-theme-vxeColor);
   }
 }
 

package/src/style/login.css

@@ -11,7 +11,7 @@
   height: 100vh;
   display: flex;
   justify-content: flex-end;
-  background-color: #36419d;
+  background-color: #2a5f97;
   /* background: url('../assets/login/default-bg.png') no-repeat center; */
   background-repeat: no-repeat;
   background-position: center;

package/src/style/tailwind.css

@@ -1,68 +1 @@
-/* @tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer components {
-  .flex-c {
-    @apply flex justify-center items-center;
-  }
-
-  .flex-ac {
-    @apply flex justify-around items-center;
-  }
-
-  .flex-bc {
-    @apply flex justify-between items-center;
-  }
-
-  .navbar-bg-hover {
-    @apply dark:text-white dark:hover:!bg-[#242424];
-  }
-} */
-
-@layer theme, base, components, utilities;
-@import 'tailwindcss/theme.css' layer(theme);
-@import 'tailwindcss/utilities.css' layer(utilities);
-
-@custom-variant dark (&:is(.dark *));
-
-@theme {
-  --color-bg_color: var(--el-bg-color);
-  --color-primary: var(--el-color-primary);
-  --color-text_color_primary: var(--el-text-color-primary);
-  --color-text_color_regular: var(--el-text-color-regular);
-}
-
-/*
-  The default border color has changed to `currentColor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentColor);
-  }
-}
-
-@utility flex-c {
-  @apply flex justify-center items-center;
-}
-
-@utility flex-ac {
-  @apply flex justify-around items-center;
-}
-
-@utility flex-bc {
-  @apply flex justify-between items-center;
-}
-
-@utility navbar-bg-hover {
-  @apply dark:text-white dark:hover:bg-[#242424]!;
-}
+@import 'tailwindcss';