mooho-base-admin-plus 0.1.47 → 0.1.50

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

@@ -2,7 +2,7 @@
  * 注册、登录、注销
  * */
 import util from '../../../../libs/util';
-import router from '../../../../router';
+import { getRouter } from '../../../../router';
 import userApi from '../../../../api/user';
 import swal from 'sweetalert2';
 
@@ -59,7 +59,7 @@ export default {
         // 清空 vuex 用户信息
         await dispatch('admin/user/set', {}, { root: true });
         // 跳转路由
-        router.push({
+        getRouter().push({
           name: 'login'
         });
       }

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

@@ -3,7 +3,7 @@
  * 一般情况下，您无需修改此文件
  * */
 import util from '../../../../libs/util';
-import router from '../../../../router';
+import { getRouter } from '../../../../router';
 import { cloneDeep } from 'lodash';
 
 /**
@@ -130,7 +130,7 @@ export default {
           util.db.get(
             pathInit({
               dbName: 'database',
-              path: `$page.${router.app.$route[basis]}`,
+              path: `$page.${getRouter().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.${getRouter().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.${getRouter().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.${getRouter().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.${getRouter().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 router from '../../../../router';
+import { getRouter } from '../../../../router';
 import permissionApi from '../../../../api/permission';
 
 // 根据 menu 配置的权限，过滤菜单
@@ -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 ? getRouter().currentRoute.value : loadMenu;
               dispatch('setMenuList', to);
             }
 

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

@@ -2,7 +2,7 @@
  * 多标签页
  * */
 import { cloneDeep, get } from 'lodash';
-import router from '../../../../router';
+import { getRouter } from '../../../../router';
 import Setting from '../../../../setting';
 import menuSider from '../../../../menu/sider';
 import { getAllSiderMenu, includeArray } from '../../../../libs/system';
@@ -264,7 +264,7 @@ export default {
             params,
             query
           };
-          router.push(routerObj, () => {});
+          getRouter().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 (getRouter().currentRoute.value.fullPath !== pageAim) {
+          getRouter().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 (getRouter().currentRoute.value.fullPath !== pageAim) {
+          getRouter().push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -345,8 +345,8 @@ export default {
         }
         // 设置新的页面
         state.current = pageAim;
-        if (router.currentRoute.value.fullPath !== pageAim) {
-          router.push(pageAim);
+        if (getRouter().currentRoute.value.fullPath !== pageAim) {
+          getRouter().push(pageAim);
         }
         // 持久化
         await dispatch('opened2db');
@@ -365,8 +365,8 @@ export default {
         // 持久化
         await dispatch('opened2db');
         // 关闭所有的标签页后需要判断一次现在是不是在首页
-        if (router.currentRoute.value.name !== 'index') {
-          router.push(
+        if (getRouter().currentRoute.value.name !== 'index') {
+          getRouter().push(
             {
               name: 'index'
             },

package/src/styles/common.less

@@ -1,47 +1,47 @@
-#app, body, html{
-    height: 100%;
-}
-body{
-    background-color: @background-color-base;
-    font-size: 14px;
-}
-
-// 隐藏滚动条样式
-.i-scrollbar-hide{
-    &::-webkit-scrollbar{
-        width: 0;
-    }
-    &::-webkit-scrollbar-track{
-        background-color: transparent;
-    }
-    &::-webkit-scrollbar-thumb{
-        background: #e8eaec;
-    }
-}
-
-// 极简滚动条样式
-.i-scrollbar{
-    &::-webkit-scrollbar{
-        width: 6px;
-    }
-    &::-webkit-scrollbar-track{
-        background-color: transparent;
-    }
-    &::-webkit-scrollbar-thumb{
-        background: #808695;
-        border-radius: 4px;
-    }
-}
-
-// 去除 Table 的左右边框，更精简
-.i-table-no-border{
-    .ivu-table th{
-        background-color: #fff;
-    }
-    .ivu-table-wrapper, .ivu-table tr:last-child td{
-        border: none;
-    }
-    .ivu-table:before, .ivu-table:after{
-        display: none;
-    }
-}
+#app, body, html{
+    height: 100%;
+}
+body{
+    background-color: @background-color-base;
+    font-size: 14px;
+}
+
+// 隐藏滚动条样式
+.i-scrollbar-hide{
+    &::-webkit-scrollbar{
+        width: 0;
+    }
+    &::-webkit-scrollbar-track{
+        background-color: transparent;
+    }
+    &::-webkit-scrollbar-thumb{
+        background: #e8eaec;
+    }
+}
+
+// 极简滚动条样式
+.i-scrollbar{
+    &::-webkit-scrollbar{
+        width: 6px;
+    }
+    &::-webkit-scrollbar-track{
+        background-color: transparent;
+    }
+    &::-webkit-scrollbar-thumb{
+        background: #808695;
+        border-radius: 4px;
+    }
+}
+
+// 去除 Table 的左右边框，更精简
+.i-table-no-border{
+    .ivu-table th{
+        background-color: #fff;
+    }
+    .ivu-table-wrapper, .ivu-table tr:last-child td{
+        border: none;
+    }
+    .ivu-table:before, .ivu-table:after{
+        display: none;
+    }
+}

package/src/styles/default/index.less

@@ -1,6 +1,6 @@
-// 自定义主题
-// 详见 https://www.iviewui.com/docs/guide/theme
-@import 'view-ui-plus/src/styles/index.less';
-
-@menu-dark-title: #191a23;
-@menu-dark-active-bg: #101117;
+// 自定义主题
+// 详见 https://www.iviewui.com/docs/guide/theme
+@import 'view-ui-plus/src/styles/index.less';
+
+@menu-dark-title: #191a23;
+@menu-dark-active-bg: #101117;