diff --git a/core/store/modules/user.js b/core/store/modules/user.js index 4fea215..bb4f48c 100644 --- a/core/store/modules/user.js +++ b/core/store/modules/user.js @@ -9,6 +9,22 @@ import { } from '@/core/utils/auth' import { router } from '../../router' import { goLogin } from '@/core/utils/auth-guard' + +const normalizeMenus = (user = {}) => { + const sourceMenus = Array.isArray(user.menus) + ? user.menus + : (Array.isArray(user.permissions) ? user.permissions : []); + + const allChildren = sourceMenus.flatMap(item => item.children || []); + return allChildren.filter(menu => + menu && + menu.component && + menu.component !== 'Layout' && + menu.meta && + menu.meta.title + ); +} + const state = { token: uni.getStorageSync("token") || "", isLogin: uni.getStorageSync("isLogin") || false, // 是否登陆 @@ -74,6 +90,8 @@ const actions = { } const user = data + const menuList = normalizeMenus(user); + console.log('用户信息接口菜单列表:', menuList); commit('SET_PERMISSIONS', user.permissions) commit('SET_USER', user) @@ -266,19 +284,7 @@ const mutations = { }, SET_USER: (state, user) => { state.user = user; - const allChildren = user.menus.flatMap(item => - item.children || [] // 确保 children 存在,否则返回空数组 - ); - - // 2. 过滤有效菜单并限制数量 - const validMenus = allChildren.filter(menu => - menu && - menu.component && - menu.component !== 'Layout' && - menu.meta && - menu.meta.title - ) - state.menus = validMenus; + state.menus = normalizeMenus(user); }, SET_ROLEID: (state, roleId) => { state.roleId = roleId diff --git a/package.json b/package.json index 3616c16..9b0ba15 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ }, "dependencies": { "html2canvas": "^1.4.1", + "pinyin-pro": "^3.28.0", "qrcode": "^1.5.4", "uni-read-pages": "^1.0.5", "uqrcodejs": "^4.0.7" diff --git a/pages.json b/pages.json index 6483049..1ef84eb 100644 --- a/pages.json +++ b/pages.json @@ -122,6 +122,13 @@ { "titleNView": false } + }, + { + "path" : "pages/home/edit-quick-actions", + "style" : + { + "titleNView": false + } } ], diff --git a/pages/home/edit-quick-actions.vue b/pages/home/edit-quick-actions.vue new file mode 100644 index 0000000..e4bfe45 --- /dev/null +++ b/pages/home/edit-quick-actions.vue @@ -0,0 +1,609 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 80807fd..c01743f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -161,40 +161,36 @@ if (userData) { this.isLoading = false; this.userInfo = userData; - this.refreshQuickActions(); + await this.refreshQuickActions(); } }, // 刷新快捷入口 - refreshQuickActions() { + async refreshQuickActions() { this.isLoading = true; try { // 1. 获取用户当前可用的菜单 const userMenus = this.getUserMenus(); + const latestActions = this.processMenus(userMenus, null); // 2. 从Vuex获取已固定的菜单 - const savedFixedMenus = this.$store.getters[`setting/${this.FIXED_MENU_KEY}`] || []; + const savedFixedMenus = await this.$store.dispatch('setting/getValue', this.FIXED_MENU_KEY) || []; + const hasSavedConfig = Array.isArray(savedFixedMenus); - // 3. 如果有保存的固定菜单 - if (savedFixedMenus && Array.isArray(savedFixedMenus) && savedFixedMenus.length > 0) { - // 验证用户是否还有这些菜单的权限 - const validFixedMenus = this.validateAndFilterMenus(savedFixedMenus, userMenus); - - if (validFixedMenus.length > 0) { - // 使用有效的固定菜单(不更新存储) - console.log('使用有效的固定菜单:', validFixedMenus); - this.quickActions = validFixedMenus; - return; - } - // 如果固定菜单全部失效,继续执行下面的逻辑 + // 3. 如果存在已保存的常用配置(包括空数组),优先按配置展示 + if (hasSavedConfig) { + const validFixedMenus = this.validateAndFilterMenus(savedFixedMenus, latestActions); + console.log('按已保存常用菜单展示:', validFixedMenus); + this.quickActions = validFixedMenus; + return; } // 4. 如果没有有效的固定菜单,检查用户菜单 if (userMenus && userMenus.length > 0) { console.log('从用户菜单生成快捷入口:', userMenus); // 根据用户菜单生成快捷入口 - this.quickActions = this.processMenus(userMenus); + this.quickActions = this.processMenus(userMenus, 24); } else { // 5. 如果还是没有菜单,返回空数组 console.log('用户没有可用菜单'); @@ -210,30 +206,40 @@ }, // 辅助方法:验证和过滤菜单权限 - validateAndFilterMenus(fixedMenus, userMenus) { - if (!fixedMenus || !userMenus) return []; + validateAndFilterMenus(fixedMenus, latestActions) { + if (!Array.isArray(fixedMenus) || !Array.isArray(latestActions)) return []; - // 根据你的数据结构调整验证逻辑 - // 假设菜单项有 id 或 code 作为唯一标识 - return fixedMenus.filter(fixedMenu => { - // 检查用户菜单中是否包含这个固定菜单 - return userMenus.some(userMenu => { - // 根据你的实际数据结构调整比对逻辑 - // 示例1:如果有 id - if (fixedMenu.id && userMenu.id) { - return fixedMenu.id === userMenu.id; - } - // 示例2:如果有 menuCode - if (fixedMenu.menuCode && userMenu.menuCode) { - return fixedMenu.menuCode === userMenu.menuCode; - } - // 示例3:如果有 path - if (fixedMenu.path && userMenu.path) { - return fixedMenu.path === userMenu.path; - } - return false; - }); + const actionMap = new Map(); + latestActions.forEach(action => { + actionMap.set(this.getMenuKey(action), action); }); + + return fixedMenus + .map(fixedMenu => { + const matched = actionMap.get(this.getMenuKey(fixedMenu)); + if (!matched) return null; + return { + ...matched, + ...fixedMenu, + name: matched.name, + path: matched.path, + component: matched.component, + icon: matched.icon || fixedMenu.icon, + id: matched.id || fixedMenu.id + }; + }) + .filter(Boolean); + }, + + getMenuKey(menu) { + return String( + menu?.component || + menu?.path || + menu?.id || + menu?.menuId || + menu?.name || + '' + ); }, // 获取用户菜单 @@ -246,20 +252,24 @@ }, // 处理菜单数据 - processMenus(menus) { + processMenus(menus, limit = 24) { // 1. 展平所有子菜单(使用 flatMap 替代 map + filter) const allChildren = menus.flatMap(item => item.children || [] // 确保 children 存在,否则返回空数组 ); // 2. 过滤有效菜单并限制数量 - const validMenus = allChildren.filter(menu => + let validMenus = allChildren.filter(menu => menu && menu.component && menu.component !== 'Layout' && menu.meta && menu.meta.title - ).slice(0, 24); // 最多显示24个 + ); + + if (typeof limit === 'number' && limit > 0) { + validMenus = validMenus.slice(0, limit); // 默认最多显示24个 + } // 3. 生成随机颜色的函数 const generateRandomColor = () => { @@ -274,7 +284,7 @@ // 4. 转换为目标格式 return validMenus.map(menu => { return { - id: menu.id || menu.menuId || Math.random().toString(36).substr(2, 9), + id: menu.id || menu.menuId || menu.component || menu.path || menu.meta?.title || '', name: menu.meta?.title || '未命名菜单', path: menu.path || '', component: menu.component || '',