mooho-base-admin-plus 0.1.48 → 0.1.49

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.1.48",
+  "version": "0.1.49",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.3.97",
   "license": "MIT",

package/src/index.js

@@ -1,7 +1,6 @@
 //import '@babel/polyfill';
 
 // Vue
-import { createApp, h, getCurrentInstance } from 'vue';
 import App from './App.vue';
 
 // 设置
@@ -20,14 +19,16 @@ import store from './store';
 // ViewUIPlus
 import ViewUIPlus from 'view-ui-plus';
 
-// 菜单和路由
-import router from './router';
+// 菜单
 import menuHeader from './menu/header';
 //import menuSider from './menu/sider';
 
 // 多语言
 import i18n from './i18n';
 
+// 路由工厂
+import createRouter from './router/routerFactory';
+
 // 方法
 //import { getHeaderName, getMenuSider, getSiderSubmenu } from './libs/system';
 
@@ -196,24 +197,4 @@ const routeChanged = to => {
 
 export default API;
 
-export {
-  pages,
-  createApp,
-  h,
-  getCurrentInstance,
-  App,
-  router,
-  store,
-  i18n,
-  setting,
-  basicLayout,
-  lodop,
-  request,
-  mixinPage,
-  modelApi,
-  dataSourceApi,
-  taskApi,
-  util,
-  created,
-  routeChanged
-};
+export { pages, App, store, i18n, setting, basicLayout, lodop, request, mixinPage, modelApi, dataSourceApi, taskApi, util, createRouter, created, routeChanged };

package/src/libs/request/index.js

@@ -29,7 +29,6 @@ function errorLog(err) {
     util.log.error('>>>>>> Error >>>>>>');
     console.log(err);
   }
-
   swal.fire({
     title: err.message,
     icon: 'error',
@@ -108,7 +107,7 @@ service.interceptors.response.use(
   },
   error => {
     if (error && error.response && error.response.status === 401) {
-      router.push('/login?redirect=' + router.history._startLocation);
+      router().push('/login?redirect=' + router().history._startLocation);
     }
 
     store.commit('admin/loader/end');

package/src/mixins/page.js

@@ -106,7 +106,7 @@ export default {
       } else {
         // 页面权限点
         //console.log('router.currentRoute', router.currentRoute.value.fullPath);
-        let url = router.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

@@ -84,7 +84,7 @@
 
           // 重定向对象不存在则返回顶层路径
           setTimeout(() => {
-            router.replace(this.$route.query.redirect || '/home');
+            router().replace(this.$route.query.redirect || '/home');
           });
         }
       },

package/src/router/dynamic.js

@@ -1,8 +1,77 @@
+import ViewUIPlus from 'view-ui-plus';
+import util from '../libs/util';
+import Setting from '../setting';
+import store from '../store/index';
+import dynamic from './dynamic';
 import permissionApi from '../api/permission';
 
+// 是否初始化
+let inited = false;
+
 // 动态路由
 export default {
   async init(router) {
+    /**
+     * 路由拦截
+     * 权限验证
+     */
+
+    router.beforeEach(async (to, from, next) => {
+      if (Setting.showProgressBar) {
+        ViewUIPlus.LoadingBar.start();
+      }
+
+      if (!inited) {
+        // 初始化动态路由
+        let dynamicRoutes = await dynamic.init(router);
+        let frameInRoutes = router.getRoutes();
+
+        // 处理路由 得到每一级的路由设置
+        store.commit('admin/page/init', [...frameInRoutes, ...dynamicRoutes]);
+        inited = true;
+        next({
+          ...to,
+          replace: true
+        });
+      } else {
+        // 判断是否需要登录才可以进入
+        if (to.matched.some(_ => _.meta.auth)) {
+          // 这里依据 token 判断是否登录，可视情况修改
+          const token = util.cookies.get('token');
+
+          if (token && token !== 'undefined') {
+            next();
+          } else {
+            // 没有登录的时候跳转到登录界面
+            // 携带上登陆成功之后需要跳转的页面完整路径
+            next({
+              name: 'login',
+              query: {
+                redirect: to.fullPath
+              }
+            });
+          }
+        } else {
+          // 不需要身份校验 直接通过
+          next();
+        }
+      }
+    });
+
+    router.afterEach(to => {
+      if (Setting.showProgressBar) ViewUIPlus.LoadingBar.finish();
+      // 多页控制 打开新的页面
+      if (!('meta' in to) || (to.meta && !('tabs' in to.meta)) || (to.meta && to.meta.tabs)) {
+        store.dispatch('admin/page/open', to);
+      }
+      // 更改标题
+      util.title({
+        title: to.meta.title
+      });
+      // 返回页面顶端
+      window.scrollTo(0, 0);
+    });
+
     let pages = router.pages;
     let layout = router.layout;
 

package/src/router/index.js

@@ -1,89 +1,3 @@
-import { createRouter, createWebHistory, createWebHashHistory, createMemoryHistory } from 'vue-router';
-import ViewUIPlus from 'view-ui-plus';
-import util from '../libs/util';
-import Setting from '../setting';
-import store from '../store/index';
-import dynamic from './dynamic';
-
-console.log('import.meta.env', import.meta.env, import.meta.env.BASE_URL);
-console.log('window.$env', window.$env);
-
-// 根目录
-let base = import.meta.env.VITE_APP_BASE_PATH;
-if (!base) {
-  base = '';
-}
-
-console.log('base', base);
-
-// 导出路由 在 main.js 里使用
-const router = createRouter({
-  history: Setting.routerMode === 'history' ? createWebHistory(base) : Setting.routerMode === 'hash' ? createWebHashHistory(base) : createMemoryHistory(base),
-  routes: []
-});
-
-// 是否初始化
-let inited = false;
-
-/**
- * 路由拦截
- * 权限验证
- */
-
-router.beforeEach(async (to, from, next) => {
-  if (Setting.showProgressBar) {
-    ViewUIPlus.LoadingBar.start();
-  }
-
-  if (!inited) {
-    // 初始化动态路由
-    let dynamicRoutes = await dynamic.init(router);
-    let frameInRoutes = router.getRoutes();
-
-    // 处理路由 得到每一级的路由设置
-    store.commit('admin/page/init', [...frameInRoutes, ...dynamicRoutes]);
-    inited = true;
-    next({
-      ...to,
-      replace: true
-    });
-  } else {
-    // 判断是否需要登录才可以进入
-    if (to.matched.some(_ => _.meta.auth)) {
-      // 这里依据 token 判断是否登录，可视情况修改
-      const token = util.cookies.get('token');
-
-      if (token && token !== 'undefined') {
-        next();
-      } else {
-        // 没有登录的时候跳转到登录界面
-        // 携带上登陆成功之后需要跳转的页面完整路径
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath
-          }
-        });
-      }
-    } else {
-      // 不需要身份校验 直接通过
-      next();
-    }
-  }
-});
-
-router.afterEach(to => {
-  if (Setting.showProgressBar) ViewUIPlus.LoadingBar.finish();
-  // 多页控制 打开新的页面
-  if (!('meta' in to) || (to.meta && !('tabs' in to.meta)) || (to.meta && to.meta.tabs)) {
-    store.dispatch('admin/page/open', to);
-  }
-  // 更改标题
-  util.title({
-    title: to.meta.title
-  });
-  // 返回页面顶端
-  window.scrollTo(0, 0);
-});
-
-export default router;
+export default () => {
+  return window.$router;
+};

package/src/router/routerFactory.js

@@ -0,0 +1,84 @@
+import { createRouter, createWebHistory, createWebHashHistory, createMemoryHistory } from 'vue-router';
+import ViewUIPlus from 'view-ui-plus';
+import util from '../libs/util';
+import Setting from '../setting';
+import store from '../store/index';
+import dynamic from './dynamic';
+
+const createMyRouter = base => {
+  const router = createRouter({
+    history: Setting.routerMode === 'history' ? createWebHistory(base) : setting.routerMode === 'hash' ? createWebHashHistory(base) : createMemoryHistory(base),
+    routes: []
+  });
+
+  // 设置资源根目录
+  Setting.rootPath = base == '' || base == null ? '/static/' : '/' + base + '/static/';
+
+  // 是否初始化
+  let inited = false;
+
+  /**
+   * 路由拦截
+   * 权限验证
+   */
+
+  router.beforeEach(async (to, from, next) => {
+    if (Setting.showProgressBar) {
+      ViewUIPlus.LoadingBar.start();
+    }
+
+    if (!inited) {
+      // 初始化动态路由
+      let dynamicRoutes = await dynamic.init(router);
+      let frameInRoutes = router.getRoutes();
+
+      // 处理路由 得到每一级的路由设置
+      store.commit('admin/page/init', [...frameInRoutes, ...dynamicRoutes]);
+      inited = true;
+      next({
+        ...to,
+        replace: true
+      });
+    } else {
+      // 判断是否需要登录才可以进入
+      if (to.matched.some(_ => _.meta.auth)) {
+        // 这里依据 token 判断是否登录，可视情况修改
+        const token = util.cookies.get('token');
+
+        if (token && token !== 'undefined') {
+          next();
+        } else {
+          // 没有登录的时候跳转到登录界面
+          // 携带上登陆成功之后需要跳转的页面完整路径
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath
+            }
+          });
+        }
+      } else {
+        // 不需要身份校验 直接通过
+        next();
+      }
+    }
+  });
+
+  router.afterEach(to => {
+    if (Setting.showProgressBar) ViewUIPlus.LoadingBar.finish();
+    // 多页控制 打开新的页面
+    if (!('meta' in to) || (to.meta && !('tabs' in to.meta)) || (to.meta && to.meta.tabs)) {
+      store.dispatch('admin/page/open', to);
+    }
+    // 更改标题
+    util.title({
+      title: to.meta.title
+    });
+    // 返回页面顶端
+    window.scrollTo(0, 0);
+  });
+
+  return router;
+};
+
+export default createMyRouter;

package/src/setting.js

@@ -2,7 +2,7 @@
  * Admin Plus 业务配置
  * */
 
-const basePath = import.meta.env.VITE_APP_BASE_PATH;
+//const basePath = import.meta.env.VITE_APP_BASE_PATH;
 
 const Setting = {
   /**
@@ -13,7 +13,7 @@ const Setting = {
   // 项目的 ID
   appID: 'app',
   // 根目录
-  rootPath: basePath == '' || basePath == null ? '/static/' : '/' + basePath + '/static/',
+  //rootPath: basePath == '' || basePath == null ? '/static/' : '/' + basePath + '/static/',
   // 网页标题的后缀，不需要设置为 false 或空
   titleSuffix: 'Admin Plus',
   // 路由模式，可选值为 history 或 hash

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

@@ -59,7 +59,7 @@ export default {
         // 清空 vuex 用户信息
         await dispatch('admin/user/set', {}, { root: true });
         // 跳转路由
-        router.push({
+        router().push({
           name: 'login'
         });
       }

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

@@ -130,7 +130,7 @@ export default {
           util.db.get(
             pathInit({
               dbName: 'database',
-              path: `$page.${router.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.${router.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.${router.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.${router.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.${router.app.$route[basis]}.$data`,
+              path: `$page.${router().app.$route[basis]}.$data`,
               user,
               validator: () => false,
               defaultValue: {}

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

@@ -317,7 +317,7 @@ export default {
             //setNativeMenuHeader(res.header);
             setNativeMenuSider(menu);
             if (loadMenu) {
-              const to = loadMenu === true ? router.currentRoute.value : loadMenu;
+              const to = loadMenu === true ? router().currentRoute.value : loadMenu;
               dispatch('setMenuList', to);
             }
 

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

@@ -264,7 +264,7 @@ export default {
             params,
             query
           };
-          router.push(routerObj, () => {});
+          router().push(routerObj, () => {});
         }
         // end
         resolve();
@@ -288,8 +288,8 @@ export default {
           state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name));
         }
         state.current = pageAim;
-        if (router.currentRoute.value.fullPath !== pageAim) {
-          router.push(pageAim);
+        if (router().currentRoute.value.fullPath !== pageAim) {
+          router().push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -314,8 +314,8 @@ export default {
         state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name));
         // 设置当前的页面
         state.current = pageAim;
-        if (router.currentRoute.value.fullPath !== pageAim) {
-          router.push(pageAim);
+        if (router().currentRoute.value.fullPath !== pageAim) {
+          router().push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -345,8 +345,8 @@ export default {
         }
         // 设置新的页面
         state.current = pageAim;
-        if (router.currentRoute.value.fullPath !== pageAim) {
-          router.push(pageAim);
+        if (router().currentRoute.value.fullPath !== pageAim) {
+          router().push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -365,8 +365,8 @@ export default {
         // 持久化
         await dispatch('opened2db');
         // 关闭所有的标签页后需要判断一次现在是不是在首页
-        if (router.currentRoute.value.name !== 'index') {
-          router.push(
+        if (router().currentRoute.value.name !== 'index') {
+          router().push(
             {
               name: 'index'
             },

package/test/main.js

@@ -2,8 +2,14 @@ if (!!window.ActiveXObject || 'ActiveXObject' in window) {
   alert('本系统不支持ie，请使用Chrome、Firefox、Edge等现代浏览器访问！');
 }
 
+import { createApp, h, getCurrentInstance } from 'vue';
+
 // 基础框架
-import moohoBaseAdminPlus, { pages, createApp, h, getCurrentInstance, App, router, store, i18n, basicLayout, created, routeChanged } from '../src';
+import moohoBaseAdminPlus, { pages, App, store, i18n, basicLayout, createRouter, created, routeChanged } from '../src';
+
+// 创建路由
+const router = createRouter(import.meta.env.VITE_APP_BASE_PATH);
+window.$router = router;
 
 // 固定路由
 import routes from './router/routes';

package/.envpr

@@ -1,4 +0,0 @@
-# 所有环境默认
-
-# 页面 title
-VITE_APP_BASE_PATH=Admin