mooho-base-admin-plus 2.0.28 → 2.0.29

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.0.28",
+  "version": "2.0.29",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/public/setting.js

@@ -19,7 +19,7 @@ window.setting = {
     // 顶栏是否置顶，开启后会覆盖侧边栏，需开启 headerFix
     headerStick: false,
     // 是否开启多 Tabs 页签
-    tabs: true,
+    tabs: false,
     // 多 Tabs 页签是否显示图标，开启 tabs 时有效
     showTabsIcon: true,
     // 是否固定多 Tabs 多页签

package/src/api/customModel.js

@@ -157,7 +157,6 @@ export default {
         data
       });
     } else {
-      console.log('4');
       result = await request({
         url: `api/${res}/query`,
         method: 'post',

package/src/components/view/view-table.vue

@@ -667,9 +667,10 @@
       }
     },
     activated() {
-      if (this.viewCode && this.autoLoad) {
-        this.loadData();
-      }
+      // 暂时去掉
+      // if (this.viewCode && this.autoLoad) {
+      //   this.loadData();
+      // }
     },
     props: {
       /**

package/src/index.js

@@ -159,7 +159,7 @@ Object.keys(files).forEach(key => {
   pages[key.replace(/(\.\/pages\/)/g, '')] = files[key].default;
 });
 
-const created = async (app, pages, routes, layout = basicLayout) => {
+const created = async (app, pages, routes) => {
   if (window) {
     // 将根实例存全局，可在特殊场景下调用
     window.$app = getCurrentInstance();
@@ -169,7 +169,7 @@ const created = async (app, pages, routes, layout = basicLayout) => {
   }
 
   // 初始化路由
-  initRouter(pages, layout, routes);
+  initRouter(pages, routes);
   // 加载多语言
   store.dispatch('admin/i18n/load', app);
   // 设置顶栏菜单

package/src/pages/template/viewPage.vue

@@ -58,7 +58,7 @@
   import { mapActions } from 'vuex';
 
   export default {
-    // name: this.$route.name,
+    name: 'template-viewPage',
     mixins: [mixinPage],
     components: {},
     data() {

package/src/router/dynamic.js

@@ -36,7 +36,7 @@ export default {
             });
         }
 
-        const child = {
+        root.children.push({
           path,
           name,
           meta: {
@@ -50,9 +50,7 @@ export default {
               resolve(pages[item.templateUrl]);
             });
           }
-        };
-
-        root.children.push(child);
+        });
       }
     });
 

package/src/router/index.js

@@ -4,6 +4,7 @@ import util from '../libs/util';
 import Setting from '../setting';
 import store from '../store/index';
 import dynamic from './dynamic';
+import { setting } from '..';
 
 const base = import.meta.env.VITE_APP_BASE_PATH;
 
@@ -16,7 +17,7 @@ const router = createRouter({
 let inited = false;
 
 // 创建路由
-const initRouter = (pages, layout, routes) => {
+const initRouter = (pages, routes) => {
   // 添加静态路由
   routes.forEach(route => {
     router.addRoute(route);
@@ -40,6 +41,9 @@ const initRouter = (pages, layout, routes) => {
 
       // 处理路由 得到每一级的路由设置
       store.commit('admin/page/init', router.getRoutes());
+      // 持久化数据加载上次退出时的多页列表
+      store.dispatch('admin/page/openedLoad', { loadOpenedTabs: true }, { root: true });
+
       inited = true;
       next({
         ...to,
@@ -73,7 +77,7 @@ const initRouter = (pages, layout, routes) => {
   router.afterEach(to => {
     if (Setting.showProgressBar) ViewUIPlus.LoadingBar.finish();
     // 多页控制 打开新的页面
-    if (!('meta' in to) || (to.meta && !('tabs' in to.meta)) || (to.meta && to.meta.tabs)) {
+    if (setting.layout.tabs) {
       store.dispatch('admin/page/open', to);
     }
 

package/src/router/routes.js

@@ -0,0 +1,89 @@
+import { pages, basicLayout } from '../../src';
+import { h } from 'vue';
+
+/**
+ * 在主框架之外显示
+ */
+const frameOut = [
+  // 登录
+  {
+    path: '/login',
+    name: 'login',
+    meta: {
+      title: 'Front_Label_Login'
+    },
+    component: () => {
+      return new Promise(resolve => {
+        resolve(pages['account/login.vue']);
+      });
+    }
+  }
+];
+
+/**
+ * 在主框架内显示
+ */
+const frameIn = [
+  {
+    path: '/',
+    name: 'root',
+    redirect: {
+      name: 'login'
+    },
+    component: basicLayout,
+    children: [
+      {
+        path: 'index',
+        name: 'index',
+        redirect: {
+          name: 'home'
+        }
+      },
+      // 首页
+      {
+        path: '/home',
+        name: 'home',
+        meta: {
+          title: 'Front_Label_Home',
+          description: 'Home',
+          closable: false
+        },
+        component: () => {
+          return new Promise(resolve => {
+            resolve(pages['common/home.vue']);
+          });
+        }
+      },
+      // 刷新页面 必须保留
+      {
+        path: 'refresh',
+        name: 'refresh',
+        hidden: true,
+        component: {
+          beforeRouteEnter(to, from, next) {
+            next(instance => instance.$router.replace(from.fullPath));
+          },
+          render: () => h()
+        }
+      },
+      // 页面重定向 必须保留
+      {
+        path: 'redirect/:route*',
+        name: 'redirect',
+        hidden: true,
+        component: {
+          beforeRouteEnter(to, from, next) {
+            next(instance => instance.$router.replace(JSON.parse(from.params.route)));
+          },
+          render: () => h()
+        }
+      }
+    ]
+  }
+];
+
+// 导出需要显示菜单的
+export const frameInRoutes = frameIn;
+
+// 重新组织后导出
+export default [...frameOut, ...frameIn];

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

@@ -81,15 +81,11 @@ export default {
      * @param {Object} dispatch vuex dispatch
      * @param {Object} loadOpenedTabs 是否加载页签信息
      */
-    load({ dispatch }, { loadOpenedTabs = true } = {}) {
-      return new Promise(async resolve => {
-        // 加载用户登录信息
-        await dispatch('admin/user/load', null, { root: true });
-        // 持久化数据加载上次退出时的多页列表
-        await dispatch('admin/page/openedLoad', { loadOpenedTabs }, { root: true });
-        // end
-        resolve();
-      });
+    async load({ dispatch }, { loadOpenedTabs = true } = {}) {
+      // 加载用户登录信息
+      await dispatch('admin/user/load', null, { root: true });
+      // 持久化数据加载上次退出时的多页列表
+      //await dispatch('admin/page/openedLoad', { loadOpenedTabs }, { root: true });
     }
   }
 };

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;
     }
   }