mooho-base-admin-plus 2.0.27 → 2.0.29

package/src/store/modules/admin/modules/cache.js

@@ -31,9 +31,9 @@ export default {
         try {
           let res = await modelApi.query(type, {});
 
-          state.caches = {
-            ...state.caches
-          };
+          // state.caches = {
+          //   ...state.caches
+          // };
 
           state.caches[type] = res.data;
         } catch (err) {
@@ -53,9 +53,9 @@ export default {
 
         try {
           let res = await modelApi.query('Dict', { type: type });
-          state.dicts = {
-            ...state.dicts
-          };
+          // state.dicts = {
+          //   ...state.dicts
+          // };
 
           res.data.forEach(item => {
             state.dicts[type][item.id] = item.displayName;
@@ -77,9 +77,9 @@ export default {
 
         try {
           let res = await enumApi.query(type);
-          state.enums = {
-            ...state.enums
-          };
+          // state.enums = {
+          //   ...state.enums
+          // };
 
           res.forEach(item => {
             state.enums[type][item.id] = item.name;
@@ -97,15 +97,15 @@ export default {
      */
     async loadUserName({ state }, id) {
       if (id && !(id in state.userNames)) {
-        state.userNames[id] = {};
+        state.userNames[id] = '-';
 
         try {
           let res = await userApi.get(id);
 
           if (res) {
-            state.userNames = {
-              ...state.userNames
-            };
+            // state.userNames = {
+            //   ...state.userNames
+            // };
 
             state.userNames[id] = res.name;
           }

package/src/store/modules/admin/modules/i18n.js

@@ -41,9 +41,7 @@ export default {
         // 设置 vue-i18n 的语言
         vm.$i18n.locale = locale;
         // 更新网页标题
-        util.title({
-          title: vm.$route.meta.title
-        });
+        window.document.title = window.$app.$t(vm.$route.meta.title) + ' - ' + Setting.info.title;
       }
     },
     /**

package/src/store/modules/admin/modules/menu.js

@@ -17,25 +17,6 @@ import {
 import router from '../../../../router';
 import permissionApi from '../../../../api/permission';
 
-// 根据 menu 配置的权限，过滤菜单
-function filterMenu(menuList, access, lastList) {
-  menuList.forEach(menu => {
-    let menuAccess = menu.auth;
-
-    if (!menuAccess || includeArray(menuAccess, access)) {
-      let newMenu = {};
-      for (let i in menu) {
-        if (i !== 'children') newMenu[i] = cloneDeep(menu[i]);
-      }
-      if (menu.children && menu.children.length) newMenu.children = [];
-
-      lastList.push(newMenu);
-      menu.children && filterMenu(menu.children, access, newMenu.children);
-    }
-  });
-  return lastList;
-}
-
 // 转换菜单
 function convertMenu(source) {
   if (!source) {
@@ -90,8 +71,8 @@ export default {
     /**
      * @description 根据 user 里登录用户权限，对侧边菜单进行鉴权过滤
      * */
-    filterSider(state, getters, rootState) {
-      return filterMenu(state.sider, [], []);
+    filterSider(state) {
+      return state.sider;
     },
     /**
      * @description 根据 user 里登录用户权限，对顶栏菜单进行鉴权过滤

package/src/store/modules/admin/modules/page.js

@@ -83,6 +83,7 @@ export default {
             }
             return state;
           });
+
         // 根据 opened 数据生成缓存设置
         commit('keepAliveRefresh');
         // end
@@ -113,13 +114,14 @@ export default {
      * @description 更新页面列表上的某一项
      * @param {Object} param { index, params, query, fullPath } 路由信息
      */
-    openedUpdate({ state, dispatch }, { index, params, query, fullPath, meta, keepMeta = false }) {
+    openedUpdate({ state, dispatch }, { index, params, query, fullPath, pageName, meta, keepMeta = false }) {
       return new Promise(async resolve => {
         // 更新页面列表某一项
         let page = state.opened[index];
         page.params = params || page.params;
         page.query = query || page.query;
         page.fullPath = fullPath || page.fullPath;
+        page.pageName = pageName || page.pageName;
         page.meta = meta || page.meta;
         page.keepMeta = keepMeta;
         state.opened.splice(index, 1, page);
@@ -133,7 +135,7 @@ export default {
      * @description 更新页面当前项
      * @param {Object} param { params, query, fullPath } 路由信息
      */
-    currentUpdate({ state, dispatch }, { params, query, fullPath, meta, keepMeta = false }) {
+    currentUpdate({ state, dispatch }, { params, query, fullPath, pageName, meta, keepMeta = false }) {
       return new Promise(async resolve => {
         setTimeout(async () => {
           // 更新当前项
@@ -142,6 +144,7 @@ export default {
           page.params = params || page.params;
           page.query = query || page.query;
           page.fullPath = fullPath || page.fullPath;
+          page.pageName = pageName || page.pageName;
           page.meta = meta || page.meta;
           page.keepMeta = keepMeta;
           state.opened.splice(index, 1, page);
@@ -156,18 +159,19 @@ export default {
      * @description 新增一个 tag (打开一个页面)
      * @param {Object} param new tag info
      */
-    add({ state, commit, dispatch }, { tag, params, query, fullPath }) {
+    add({ state, commit, dispatch }, { tag, params, query, fullPath, pageName }) {
       return new Promise(async resolve => {
         // 设置新的 tag 在新打开一个以前没打开过的页面时使用
         let newTag = tag;
         newTag.params = params || newTag.params;
         newTag.query = query || newTag.query;
         newTag.fullPath = fullPath || newTag.fullPath;
+        newTag.pageName = pageName || newTag.pageName;
         // 添加进当前显示的页面数组
         state.opened.push(newTag);
         // 如果这个页面需要缓存 将其添加到缓存设置
         if (isKeepAlive(newTag)) {
-          commit('keepAlivePush', tag.name);
+          commit('keepAliveRefresh');
         }
         // 持久化
         await dispatch('opened2db');
@@ -179,7 +183,8 @@ export default {
      * @description 打开一个新的页面
      * @param {Object} param 从路由钩子的 to 对象上获取 { name, params, query, fullPath } 路由信息
      */
-    open({ state, commit, dispatch }, { name, params, query, fullPath }) {
+    open({ state, commit, dispatch }, { name, params, query, path, fullPath }) {
+      const pageName = router.getRoutes().find(item => item.path == path).components.default.name;
       return new Promise(async resolve => {
         setTimeout(async () => {
           // 已经打开的页面
@@ -197,7 +202,8 @@ export default {
               index: pageOpenedIndex,
               params,
               query,
-              fullPath
+              fullPath,
+              pageName
             });
           } else {
             // 页面以前没有打开过
@@ -208,7 +214,8 @@ export default {
                 tag: Object.assign({}, page),
                 params,
                 query,
-                fullPath
+                fullPath,
+                pageName
               });
             }
           }
@@ -252,11 +259,13 @@ export default {
         // 找到这个页面在已经打开的数据里是第几个
         const index = state.opened.findIndex(page => page.fullPath === tagName);
         if (index >= 0) {
-          // 如果这个页面是缓存的页面 将其在缓存设置中删除
-          commit('keepAliveRemove', state.opened[index].name);
           // 更新数据 删除关闭的页面
           state.opened.splice(index, 1);
         }
+
+        // 根据 opened 数据生成缓存设置
+        commit('keepAliveRefresh');
+
         // 持久化
         await dispatch('opened2db');
         // 最后需要判断是否需要跳到首页
@@ -288,8 +297,10 @@ export default {
         });
         if (currentIndex > 0) {
           // 删除打开的页面 并在缓存设置中删除
-          state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name));
+          state.opened.splice(1, currentIndex - 1);
         }
+        // 根据 opened 数据生成缓存设置
+        commit('keepAliveRefresh');
         state.current = pageAim;
         if (router.currentRoute.value.fullPath !== pageAim) {
           router.push(pageAim);
@@ -314,7 +325,9 @@ export default {
           }
         });
         // 删除打开的页面 并在缓存设置中删除
-        state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name));
+        state.opened.splice(currentIndex + 1);
+        // 根据 opened 数据生成缓存设置
+        commit('keepAliveRefresh');
         // 设置当前的页面
         state.current = pageAim;
         if (router.currentRoute.value.fullPath !== pageAim) {
@@ -341,11 +354,13 @@ export default {
         });
         // 删除打开的页面数据 并更新缓存设置
         if (currentIndex === 0) {
-          state.opened.splice(1).forEach(({ name }) => commit('keepAliveRemove', name));
+          state.opened.splice(1);
         } else {
-          state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name));
-          state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name));
+          state.opened.splice(currentIndex + 1);
+          state.opened.splice(1, currentIndex - 1);
         }
+        // 根据 opened 数据生成缓存设置
+        commit('keepAliveRefresh');
         // 设置新的页面
         state.current = pageAim;
         if (router.currentRoute.value.fullPath !== pageAim) {
@@ -364,7 +379,9 @@ export default {
     closeAll({ state, commit, dispatch }) {
       return new Promise(async resolve => {
         // 删除打开的页面 并在缓存设置中删除
-        state.opened.splice(1).forEach(({ name }) => commit('keepAliveRemove', name));
+        state.opened.splice(1);
+        // 根据 opened 数据生成缓存设置
+        commit('keepAliveRefresh');
         // 持久化
         await dispatch('opened2db');
         // 关闭所有的标签页后需要判断一次现在是不是在首页
@@ -400,38 +417,7 @@ export default {
      * @param {Object} state vuex state
      */
     keepAliveRefresh(state) {
-      state.keepAlive = state.opened.filter(item => isKeepAlive(item)).map(e => e.name);
-    },
-    /**
-     * @description 删除一个页面的缓存设置
-     * @param {Object} state vuex state
-     * @param {String} name name
-     */
-    keepAliveRemove(state, name) {
-      const list = [...state.keepAlive];
-      const index = list.findIndex(item => item === name);
-
-      if (index !== -1) {
-        list.splice(index, 1);
-        state.keepAlive = list;
-      }
-    },
-    /**
-     * @description 增加一个页面的缓存设置
-     * @param {Object} state vuex state
-     * @param {String} name name
-     */
-    keepAlivePush(state, name) {
-      const keep = [...state.keepAlive];
-      keep.push(name);
-      state.keepAlive = keep;
-    },
-    /**
-     * @description 清空页面缓存设置
-     * @param {Object} state vuex state
-     */
-    keepAliveClean(state) {
-      state.keepAlive = [];
+      state.keepAlive = state.opened.filter(item => isKeepAlive(item)).map(e => e.pageName);
     },
     /**
      * @class current
@@ -450,19 +436,10 @@ export default {
      */
     init(state, routes) {
       const pool = [];
-      const push = function (routes) {
-        routes.forEach(route => {
-          if (route.children) {
-            push(route.children);
-          } else {
-            if (!route.hidden) {
-              const { meta, name, path } = route;
-              pool.push({ meta, name, path });
-            }
-          }
-        });
-      };
-      push(routes);
+      routes.forEach(route => {
+        const { meta, name, path } = route;
+        pool.push({ meta, name, path });
+      });
       state.pool = pool;
     }
   }

package/test/router/routes.js

@@ -10,7 +10,7 @@ const frameOut = [
     path: '/login',
     name: 'login',
     meta: {
-      title: '$t:Front_Label_Login'
+      title: 'Front_Label_Login'
     },
     component: () => {
       return new Promise(resolve => {
@@ -26,6 +26,7 @@ const frameOut = [
 const frameIn = [
   {
     path: '/',
+    name: 'root',
     redirect: {
       name: 'login'
     },
@@ -43,7 +44,7 @@ const frameIn = [
         path: '/home',
         name: 'home',
         meta: {
-          title: '$t:Front_Label_Home',
+          title: 'Front_Label_Home',
           description: 'Home',
           closable: false
         },

package/src/layouts/basic-layout/mixins/translate-title.js

@@ -1,11 +0,0 @@
-export default {
-  methods: {
-    tTitle(title) {
-      if (title && title.indexOf('$t:') === 0) {
-        return this.$t(title.split('$t:')[1]);
-      } else {
-        return title;
-      }
-    }
-  }
-};