mooho-base-admin-plus 2.0.24 → 2.0.26

package/package.json

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

package/src/index.js

@@ -33,7 +33,7 @@ import menuHeader from './menu/header';
 import i18n from './i18n';
 
 // 路由工厂
-import { createRouter } from './router';
+import router, { initRouter } from './router';
 
 // 方法
 //import { getHeaderName, getMenuSider, getSiderSubmenu } from './libs/system';
@@ -165,10 +165,7 @@ Object.keys(files).forEach(key => {
   pages[key.replace(/(\.\/pages\/)/g, '')] = files[key].default;
 });
 
-// 第一次进入时，取菜单数据用于更新
-let isFirstRouteChange = true;
-
-const created = async app => {
+const created = async (app, pages, routes, layout = basicLayout) => {
   if (window) {
     // 将根实例存全局，可在特殊场景下调用
     window.$app = getCurrentInstance();
@@ -177,12 +174,10 @@ const created = async app => {
     window.$app.$Notice = app.config.globalProperties.$Notice;
   }
 
+  // 初始化路由
+  initRouter(pages, layout, routes);
   // 加载多语言
   store.dispatch('admin/i18n/load', app);
-  // 初始化动态路由
-  //let dynamicRoutes = await dynamicRouter.init(router, pages, layout);
-  // 处理路由 得到每一级的路由设置
-  //store.commit('admin/page/init', [...frameInRoutes, ...dynamicRoutes]);
   // 设置顶栏菜单
   store.commit('admin/menu/setHeader', menuHeader);
   // 加载用户登录的数据
@@ -194,21 +189,12 @@ const created = async app => {
 
   // 所有页面
   app.config.globalProperties.$pages = pages;
-
-  // // 加载远程 i18n
-  // if (Setting.i18n.remote) loadRemoteLocaleMessages(i18n);
 };
 
 const routeChanged = to => {
   // 监听路由 控制侧边栏显示 标记当前顶栏菜单（如需要）
   store.dispatch('admin/menu/setMenuList', to);
 
-  if (isFirstRouteChange) {
-    isFirstRouteChange = false;
-    // 每次进入 app 时，获取一次菜单
-    //store.dispatch('admin/menu/getMenuList', to);
-  }
-
   // TODO 权限判断
   //this.appRouteChange(to, from);
 };
@@ -231,7 +217,8 @@ export {
   taskApi,
   applicationApi,
   util,
-  createRouter,
+  router,
+  initRouter,
   created,
   routeChanged
 };

package/src/libs/request/index.js

@@ -1,7 +1,6 @@
 import store from '../../store';
 import axios from 'axios';
 import util from '../util';
-import { getRouter } from '../../router';
 import swal from 'sweetalert2';
 import Setting from '../../setting';
 
@@ -26,7 +25,7 @@ function errorLog(err) {
   });
   // 打印到控制台
   if (window.$mode === 'development') {
-    util.log.error('>>>>>> Error >>>>>>');
+    //util.log.error('>>>>>> Error >>>>>>');
     console.log(err);
   }
 
@@ -153,10 +152,7 @@ service.interceptors.response.use(
     store.commit('admin/loader/end');
 
     if (error && error.response && error.response.status === 401) {
-      if (getRouter().currentRoute.value.path != '/login') {
-        getRouter().push('/login?redirect=' + getRouter().options.history.location);
-      }
-
+      store.dispatch('admin/account/authFailed');
       return;
     }
 

package/src/libs/util.js

@@ -1,12 +1,12 @@
 import cookies from './util.cookies';
-import log from './util.log';
+//import log from './util.log';
 import db from './util.db';
 
 import Setting from '../setting';
 
 const util = {
   cookies,
-  log,
+  //log,
   db
 };
 

package/src/mixins/page.js

@@ -1,5 +1,5 @@
 import util from '../libs/util';
-import { getRouter } from '../router';
+import router from '../router';
 import { mapState, mapActions } from 'vuex';
 import dateFormat from 'date-fns/format';
 import Setting from '../setting';
@@ -72,9 +72,6 @@ export default {
     ...mapState('admin/user', ['info']),
     ...mapState('admin/cache', ['userNames', 'enums', 'dicts', 'caches']),
     ...mapState('admin/menu', ['userPermissions']),
-    router() {
-      return getRouter();
-    },
     rootPath() {
       return Setting.rootPath;
     },
@@ -109,7 +106,7 @@ export default {
       } else {
         // 页面权限点
         //console.log('router.currentRoute', router.currentRoute.value.fullPath);
-        let url = getRouter().currentRoute.value.fullPath.substr(1);
+        let url = router.currentRoute.value.fullPath.substr(1);
 
         if (this.userPermissions[url + '$' + key] == true) {
           return true;

package/src/pages/account/login.vue

@@ -26,6 +26,7 @@
 <script>
   import { mapActions } from 'vuex';
   import mixinPage from '../../mixins/page';
+  import router from '../../router';
   //import permissionApi from '../../api/permission';
 
   export default {
@@ -67,7 +68,7 @@
 
           // 重定向对象不存在则返回顶层路径
           setTimeout(() => {
-            this.router.replace(this.$route.query.redirect || '/home');
+            router.replace(this.$route.query.redirect || '/home');
           });
         }
       },

package/src/plugins/index.js

@@ -3,7 +3,7 @@
  * */
 
 // 错误捕获
-import pluginError from './error';
+//import pluginError from './error';
 // 日志插件
 //import pluginLog from './log';
 // 鉴权指令
@@ -14,7 +14,7 @@ import sweetalert2 from './sweetalert2';
 export default {
   async install(app) {
     // 插件
-    app.use(pluginError);
+    //app.use(pluginError);
     //app.use(pluginLog);
     app.use(sweetalert2);
 

package/src/router/dynamic.js

@@ -182,7 +182,7 @@ function PermissionDeep(per, perArry) {
 
 // 获取多语言名称
 function getNameI18n(item) {
-  if (Setting.layout.showNotice) {
+  if (Setting.layout.showI18n) {
     let key = 'Permission_' + item.url.split('?')[0];
     let text = window.$app.$t(key);
     if (text == key) {
@@ -197,7 +197,7 @@ function getNameI18n(item) {
 
 // 获取多语言描述
 function getDescI18n(item) {
-  if (Setting.layout.showNotice) {
+  if (Setting.layout.showI18n) {
     let key = 'Permission_' + item.url.split('?')[0] + '_SubName';
     let text = window.$app.$t(key);
     if (text == key) {

package/src/router/index.js

@@ -5,15 +5,18 @@ import Setting from '../setting';
 import store from '../store/index';
 import dynamic from './dynamic';
 
-var router;
+const base = import.meta.env.VITE_APP_BASE_PATH;
 
-// 创建路由
-const create = (base, pages, layout, routes) => {
-  router = createRouter({
-    history: Setting.routerMode === 'history' ? createWebHistory(base) : Setting.routerMode === 'hash' ? createWebHashHistory(base) : createMemoryHistory(base),
-    routes: []
-  });
+const router = createRouter({
+  history: Setting.routerMode === 'history' ? createWebHistory(base) : Setting.routerMode === 'hash' ? createWebHashHistory(base) : createMemoryHistory(base),
+  routes: []
+});
 
+// 是否初始化
+let inited = false;
+
+// 创建路由
+const initRouter = (pages, layout, routes) => {
   // 添加静态路由
   routes.forEach(route => {
     router.addRoute(route);
@@ -22,14 +25,10 @@ const create = (base, pages, layout, routes) => {
   // 设置资源根目录
   Setting.rootPath = base == '' || base == null ? '/static/' : '/' + base + '/static/';
 
-  // 是否初始化
-  let inited = false;
-
   /**
    * 路由拦截
    * 权限验证
    */
-
   router.beforeEach(async (to, from, next) => {
     if (Setting.showProgressBar) {
       ViewUIPlus.LoadingBar.start();
@@ -85,13 +84,8 @@ const create = (base, pages, layout, routes) => {
     // 返回页面顶端
     window.scrollTo(0, 0);
   });
-
-  return router;
 };
 
-// 获取路由
-const getRouter = () => {
-  return router;
-};
+export { initRouter };
 
-export { create as createRouter, getRouter };
+export default router;

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

@@ -2,7 +2,7 @@
  * 注册、登录、注销
  * */
 import util from '../../../../libs/util';
-import { getRouter } from '../../../../router';
+import router from '../../../../router';
 import userApi from '../../../../api/user';
 import swal from 'sweetalert2';
 
@@ -46,9 +46,9 @@ export default {
         // 清空 vuex 用户信息
         await dispatch('admin/user/set', {}, { root: true });
         // 跳转路由
-        getRouter().push({
-          name: 'login'
-        });
+        if (router.currentRoute.value.path != '/login') {
+          router.push('/login?redirect=' + router.options.history.location);
+        }
       }
 
       if (confirm) {
@@ -69,6 +69,12 @@ export default {
         logout();
       }
     },
+    /**
+     * @description 身份认证失败
+     * */
+    authFailed({ dispatch }) {
+      dispatch('logout');
+    },
     /**
      * @description 用户登录后从持久化数据加载一系列的设置
      * @param {Object} state vuex state

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

@@ -3,7 +3,7 @@
  * 一般情况下，您无需修改此文件
  * */
 import util from '../../../../libs/util';
-import { getRouter } from '../../../../router';
+import router from '../../../../router';
 import { cloneDeep } from 'lodash';
 
 /**
@@ -130,7 +130,7 @@ export default {
           util.db.get(
             pathInit({
               dbName: 'database',
-              path: `$page.${getRouter().app.$route[basis]}`,
+              path: `$page.${router.app.$route[basis]}`,
               user,
               defaultValue: {}
             })
@@ -150,7 +150,7 @@ export default {
           util.db.get(
             pathInit({
               dbName: 'database',
-              path: `$page.${getRouter().app.$route[basis]}`,
+              path: `$page.${router.app.$route[basis]}`,
               user,
               validator: () => false,
               defaultValue: {}
@@ -172,7 +172,7 @@ export default {
           util.db.get(
             pathInit({
               dbName: 'database',
-              path: `$page.${getRouter().app.$route[basis]}.$data`,
+              path: `$page.${router.app.$route[basis]}.$data`,
               user,
               validator: () => false,
               defaultValue: cloneDeep(instance.$data)
@@ -196,7 +196,7 @@ export default {
               .get(
                 pathInit({
                   dbName: 'database',
-                  path: `$page.${getRouter().app.$route[basis]}.$data`,
+                  path: `$page.${router.app.$route[basis]}.$data`,
                   user,
                   defaultValue: cloneDeep(instance.$data)
                 })
@@ -218,7 +218,7 @@ export default {
           util.db.get(
             pathInit({
               dbName: 'database',
-              path: `$page.${getRouter().app.$route[basis]}.$data`,
+              path: `$page.${router.app.$route[basis]}.$data`,
               user,
               validator: () => false,
               defaultValue: {}

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

@@ -14,7 +14,7 @@ import {
   getNativeMenuHeader,
   getNativePermission
 } from '../../../../libs/system';
-import { getRouter } from '../../../../router';
+import router from '../../../../router';
 import permissionApi from '../../../../api/permission';
 
 // 根据 menu 配置的权限，过滤菜单
@@ -305,8 +305,8 @@ export default {
           .then(res => {
             // 默认包含首页
             res.menus.unshift({
-              name: '首页',
-              subName: 'Home',
+              name: window.$app.$t('Permission_home'),
+              subName: window.$app.$t('Permission_home_SubName'),
               parentID: null,
               url: 'home',
               templateUrl: '@/home',
@@ -318,7 +318,7 @@ export default {
             //setNativeMenuHeader(res.header);
             setNativeMenuSider(menu);
             if (loadMenu) {
-              const to = loadMenu === true ? getRouter().currentRoute.value : loadMenu;
+              const to = loadMenu === true ? router.currentRoute.value : loadMenu;
               dispatch('setMenuList', to);
             }
 

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

@@ -2,7 +2,7 @@
  * 多标签页
  * */
 import { cloneDeep, get } from 'lodash';
-import { getRouter } from '../../../../router';
+import router from '../../../../router';
 import Setting from '../../../../setting';
 import menuSider from '../../../../menu/sider';
 import { getAllSiderMenu, includeArray } from '../../../../libs/system';
@@ -267,7 +267,7 @@ export default {
             params,
             query
           };
-          getRouter().push(routerObj, () => {});
+          router.push(routerObj, () => {});
         }
         // end
         resolve();
@@ -291,8 +291,8 @@ export default {
           state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name));
         }
         state.current = pageAim;
-        if (getRouter().currentRoute.value.fullPath !== pageAim) {
-          getRouter().push(pageAim);
+        if (router.currentRoute.value.fullPath !== pageAim) {
+          router.push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -317,8 +317,8 @@ export default {
         state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name));
         // 设置当前的页面
         state.current = pageAim;
-        if (getRouter().currentRoute.value.fullPath !== pageAim) {
-          getRouter().push(pageAim);
+        if (router.currentRoute.value.fullPath !== pageAim) {
+          router.push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -348,8 +348,8 @@ export default {
         }
         // 设置新的页面
         state.current = pageAim;
-        if (getRouter().currentRoute.value.fullPath !== pageAim) {
-          getRouter().push(pageAim);
+        if (router.currentRoute.value.fullPath !== pageAim) {
+          router.push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -368,8 +368,8 @@ export default {
         // 持久化
         await dispatch('opened2db');
         // 关闭所有的标签页后需要判断一次现在是不是在首页
-        if (getRouter().currentRoute.value.name !== 'index') {
-          getRouter().push(
+        if (router.currentRoute.value.name !== 'index') {
+          router.push(
             {
               name: 'index'
             },

package/test/main.js

@@ -5,7 +5,7 @@ if (!!window.ActiveXObject || 'ActiveXObject' in window) {
 import { createApp, h } from 'vue';
 
 // 基础框架
-import moohoBaseAdminPlus, { pages, App, store, basicLayout, createRouter, created, routeChanged } from '../src';
+import moohoBaseAdminPlus, { pages, App, store, router, created, routeChanged } from '../src';
 
 // 固定路由
 import routes from './router/routes';
@@ -27,14 +27,11 @@ Object.keys(files).forEach(key => {
   pages[key.replace(/(\.\/pages\/)/g, '')] = files[key].default;
 });
 
-// 创建路由
-const router = createRouter(import.meta.env.VITE_APP_BASE_PATH, pages, basicLayout, routes);
-
 const app = createApp({
   // mixins: [mixinApp],
   render: () => h(App),
   created() {
-    created(app);
+    created(app, pages, routes);
   },
   watch: {
     // 监听路由 控制侧边栏显示 标记当前顶栏菜单（如需要）

package/test/pages/test/logReport.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="i-layout-page-header">
-      <PageHeader title="aaa" :content="$route.meta.description" hidden-breadcrumb />
+      <PageHeader title="ccc" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       {{ test }}

package/test/pages/test/testPage.vue

@@ -2,7 +2,7 @@
   <div>
     <view-form ref="form" :readonly="readonly" view-code="ExpenseApplicationTest">
       <template #column="{ code }">
-        <template v-if="code == 'approver'">aaa</template>
+        <template v-if="code == 'approver'">bbbb</template>
       </template>
     </view-form>
   </div>

package/vite.config.js

@@ -14,7 +14,8 @@ const build = defineConfig({
   },
   resolve: {
     alias: {
-      '@': resolve(__dirname, '.', 'src')
+      '@': resolve(__dirname, '.', 'src'),
+      'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
     }
     // extensions: ['.js', '.json', '.vue']
   }
@@ -67,7 +68,8 @@ const lib = defineConfig({
   },
   resolve: {
     alias: {
-      '@': resolve(__dirname, '.', 'src')
+      '@': resolve(__dirname, '.', 'src'),
+      'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
     }
     // extensions: ['.js', '.json', '.vue']
   }

package/src/api/customTable.js

@@ -1,24 +0,0 @@
-import request from '../libs/request';
-
-const res = 'CustomTable';
-
-export default {
-  createFormView(id) {
-    return request({
-      url: `api/${res}/createFormView`,
-      method: 'post',
-      data: {
-        id
-      }
-    });
-  },
-  createTableView(id) {
-    return request({
-      url: `api/${res}/createTableView`,
-      method: 'post',
-      data: {
-        id
-      }
-    });
-  }
-};

package/src/api/movePlan.js

@@ -1,29 +0,0 @@
-import request from '../libs/request';
-
-const res = 'MovePlan';
-
-export default {
-  save(data) {
-    return request({
-      url: `api/${res}/save`,
-      method: 'save',
-      data
-    });
-  },
-  submit(data) {
-    return request({
-      url: `api/${res}/submit`,
-      method: 'post',
-      data
-    });
-  },
-  cancel(id) {
-    return request({
-      url: `api/${res}/cancel`,
-      method: 'post',
-      data: {
-        id
-      }
-    });
-  }
-};

package/src/api/roleProperty.js

@@ -1,36 +0,0 @@
-import request from '../libs/request';
-
-const res = 'RoleProperty';
-
-export default {
-  add(data) {
-    return request({
-      url: `api/${res}/add`,
-      method: 'post',
-      data
-    });
-  },
-  update(data) {
-    return request({
-      url: `api/${res}/update`,
-      method: 'put',
-      data
-    });
-  },
-  remove(id) {
-    return request({
-      url: `api/${res}/remove`,
-      method: 'delete',
-      params: {
-        id
-      }
-    });
-  },
-  query(data) {
-    return request({
-      url: `api/${res}/query`,
-      method: 'post',
-      data
-    });
-  }
-};