chore(dice-admin)：update framework

Author: bihell

dice-admin/src/components/Form/src/hooks/useLabelWidth.ts

@@ -1,7 +1,7 @@
 import type { Ref } from 'vue';
 import { computed, unref } from 'vue';
 import type { FormProps, FormSchemaInner as FormSchema } from '../types/form';
-import { isNumber } from '@/utils/is';
+import { isDef, isNumber } from '@/utils/is';
 
 export function useItemLabelWidth(schemaItemRef: Ref<FormSchema>, propsRef: Ref<FormProps>) {
   return computed(() => {
@@ -23,11 +23,11 @@ export function useItemLabelWidth(schemaItemRef: Ref<FormSchema>, propsRef: Ref<
       };
       return { labelCol, wrapperCol };
     }
-    let width = labelWidth || globalLabelWidth;
+    let width = labelWidth ?? globalLabelWidth;
     const col = { ...globalLabelCol, ...labelCol };
     const wrapCol = { ...globWrapperCol, ...wrapperCol };
 
-    if (width) {
+    if (isDef(width)) {
       width = isNumber(width) ? `${width}px` : width;
     }
 

dice-admin/src/router/helper/menuHelper.ts

@@ -1,5 +1,5 @@
 import { AppRouteModule } from '@/router/types';
-import type { MenuModule, Menu, AppRouteRecordRaw } from '@/router/types';
+import type { Menu, AppRouteRecordRaw } from '@/router/types';
 import { findPath, treeMap } from '@/utils/helper/treeHelper';
 import { cloneDeep } from 'lodash-es';
 import { isHttpUrl } from '@/utils/is';
@@ -30,13 +30,12 @@ function joinParentPath(menus: Menu[], parentPath = '') {
     }
   }
 }
-
-// Parsing the menu module
-export function transformMenuModule(menuModule: MenuModule): Menu {
-  const menuList = [menuModule];
-
-  joinParentPath(menuList);
-  return menuList[0];
+// 菜单路径处理
+export function transformMenuModules(routeModList: Menu[]) {
+  const cloneMenuModules = cloneDeep(routeModList);
+  // 路径处理
+  joinParentPath(cloneMenuModules);
+  return cloneMenuModules;
 }
 
 // 将路由转换成菜单

dice-admin/src/router/menus/index.ts

@@ -3,7 +3,7 @@ import type { RouteRecordNormalized } from 'vue-router';
 
 import { useAppStoreWithOut } from '@/store/modules/app';
 import { usePermissionStore } from '@/store/modules/permission';
-import { transformMenuModule, getAllParentPath } from '@/router/helper/menuHelper';
+import { getAllParentPath } from '@/router/helper/menuHelper';
 import { filter } from '@/utils/helper/treeHelper';
 import { isHttpUrl } from '@/utils/is';
 import { router } from '@/router';
@@ -12,7 +12,7 @@ import { pathToRegexp } from 'path-to-regexp';
 
 const modules = import.meta.glob('../routes/modules/**/*.ts', { eager: true });
 
-const menuModules: MenuModule[] = [];
+export const menuModules: MenuModule[] = [];
 
 Object.keys(modules).forEach((key) => {
   const mod = (modules as Recordable)[key].default || {};
@@ -40,17 +40,6 @@ const isRoleMode = () => {
   return getPermissionMode() === PermissionModeEnum.ROLE;
 };
 
-const staticMenus: Menu[] = [];
-(() => {
-  menuModules.sort((a, b) => {
-    return (a.orderNo || 0) - (b.orderNo || 0);
-  });
-
-  for (const menu of menuModules) {
-    staticMenus.push(transformMenuModule(menu));
-  }
-})();
-
 async function getAsyncMenus() {
   const permissionStore = usePermissionStore();
   //递归过滤所有隐藏的菜单
@@ -69,7 +58,7 @@ async function getAsyncMenus() {
   if (isRouteMappingMode()) {
     return menuFilter(permissionStore.getFrontMenuList);
   }
-  return staticMenus;
+  return permissionStore.getStaticMenuList;
 }
 
 export const getMenus = async (): Promise<Menu[]> => {

dice-admin/src/store/modules/app.ts

@@ -16,6 +16,7 @@ import { Persistent } from '@/utils/cache/persistent';
 import { darkMode } from '@/settings/designSetting';
 import { resetRouter } from '@/router';
 import { deepMerge } from '@/utils';
+import setting from '@/settings/projectSetting';
 
 interface AppState {
   darkMode?: ThemeEnum;
@@ -40,7 +41,12 @@ export const useAppStore = defineStore({
       return state.pageLoading;
     },
     getDarkMode(state): 'light' | 'dark' | string {
-      return state.darkMode || localStorage.getItem(APP_DARK_MODE_KEY) || darkMode;
+      return (
+        state.darkMode ||
+        localStorage.getItem(APP_DARK_MODE_KEY) ||
+        setting.menuSetting.theme ||
+        darkMode
+      );
     },
 
     getBeforeMiniInfo(state): BeforeMiniState {

dice-admin/src/store/modules/permission.ts

@@ -7,13 +7,14 @@ import { useUserStore } from './user';
 import { useAppStoreWithOut } from './app';
 import { toRaw } from 'vue';
 import { transformObjToRoute, flatMultiLevelRoutes } from '@/router/helper/routeHelper';
-import { transformRouteToMenu } from '@/router/helper/menuHelper';
+import { transformRouteToMenu, transformMenuModules } from '@/router/helper/menuHelper';
 
 import projectSetting from '@/settings/projectSetting';
 
 import { PermissionModeEnum } from '@/enums/appEnum';
 
 import { asyncRoutes } from '@/router/routes';
+import { menuModules } from '@/router/menus';
 import { ERROR_LOG_ROUTE, PAGE_NOT_FOUND_ROUTE } from '@/router/routes/basic';
 
 import { filter } from '@/utils/helper/treeHelper';
@@ -39,6 +40,7 @@ interface PermissionState {
   backMenuList: Menu[];
   // 菜单列表
   frontMenuList: Menu[];
+  staticMenuList: Menu[];
 }
 
 export const usePermissionStore = defineStore({
@@ -58,6 +60,7 @@ export const usePermissionStore = defineStore({
     // menu List
     // 菜单列表
     frontMenuList: [],
+    staticMenuList: [],
   }),
   getters: {
     getPermCodeList(state): string[] | number[] {
@@ -69,6 +72,9 @@ export const usePermissionStore = defineStore({
     getFrontMenuList(state): Menu[] {
       return state.frontMenuList;
     },
+    getStaticMenuList(state): Menu[] {
+      return state.staticMenuList;
+    },
     getLastBuildMenuTime(state): number {
       return state.lastBuildMenuTime;
     },
@@ -90,6 +96,10 @@ export const usePermissionStore = defineStore({
       this.frontMenuList = list;
     },
 
+    setStaticMenuList(list: Menu[]) {
+      this.staticMenuList = list;
+    },
+
     setLastBuildMenuTime() {
       this.lastBuildMenuTime = new Date().getTime();
     },
@@ -171,6 +181,12 @@ export const usePermissionStore = defineStore({
       switch (permissionMode) {
         // 角色权限
         case PermissionModeEnum.ROLE:
+          const staticMenuList = transformMenuModules(menuModules);
+          staticMenuList.sort((a, b) => {
+            return (a.orderNo || 0) - (b.orderNo || 0);
+          });
+          // 设置菜单列表
+          this.setStaticMenuList(staticMenuList);
           // 对非一级路由进行过滤
           routes = filter(asyncRoutes, routeFilter);
           // 对一级路由根据角色权限过滤