ylyx-cli 1.0.15 → 1.0.16

package/templates/vue-app/files/src/router/index.js

@@ -1,156 +1,156 @@
-import router from './routers';
-import store from '@/store';
-import Config from '@/settings';
-import Cookies from 'js-cookie';
-import NProgress from 'nprogress'; // progress bar
-import 'nprogress/nprogress.css'; // progress bar style
-import { getToken } from '@/utils/auth'; // getToken from cookie
-import { buildMenus } from '@/api/system/menu';
-import { filterAsyncRouter } from '@/store/modules/permission';
-import { getUserDefaultHomePage } from '@/api/login';
-
-NProgress.configure({ showSpinner: false }); // NProgress Configuration
-const { VUE_APP_LOGIN_URL, IS_DEV, SYS_ID } = window.config;
-const { VUE_APP_PUBLIC_URL } = process.env;
-const whiteList = ['/login', '/qualityLogin', '/system/dict']; // no redirect whitelist
-
-if (IS_DEV) {
-  Cookies.set('sysId', 294);
-  Cookies.set(
-    'IU-TOKEN',
-    'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ6aGFveWkiLCJhdXRoIjoiYWRtaW4iLCJ1c2VyIjoie1wicm9sZUlkXCI6OCxcImNvbXBhbnlcIjpcIlwiLFwiZHV0eVwiOlwiXCIsXCJpZFwiOjEwMDM4LFwidXNlcm5hbWVcIjpcInpoYW95aVwiLFwibmFtZVwiOlwi6LW16Im677yI55yB5aSW5rWL6K-V546v5aKD77yJXCIsXCJwaG9uZVwiOlwiXCIsXCJwYXNzd29yZFwiOlwidjdRZmVUMjNGTC9NT1hlS2tjSEtheTlBdU9VPVwiLFwiZW5hYmxlZFwiOnRydWUsXCJpc0FkbWluXCI6dHJ1ZSxcImxvZ2luVHlwZVwiOjAsXCJyb2xlU2lnblwiOjEsXCJyb2xlVW5pcXVlTGlzdFwiOltcIkpJR1VBTl9QVVRPTkdcIixcIldZSFRfQURNSU5cIixcInN5c3RlbVJvbGVcIixcIkFJ6LSo5o6nLeeuoeeQhuWRmFwiLFwiQklMTF9BRE1JTlwiLFwiYWRtaW5cIixcInBjQWRtaW5cIixcInN5c3RlbVJvbGVcIl0sXCJkZWZhdWx0SG9tZVBhZ2VcIjpcImRpZ2l0YWxJbWFnZVwiLFwiZXhwaXJlZFRpbWVcIjoyMTQzNDY4ODAwMDAwLFwidXNlclR5cGVcIjowLFwiY3JlYXRlVGltZVwiOjE2Nzk0NzEzNDAwMDAsXCJ1cGRhdGVUaW1lXCI6MTc2NjExMzgzNDgxNX0iLCJqdGkiOiI0MDdmODk3MDk0ZTY0NGY0OTJkNDFmN2FkZmE5OTM3MCJ9.LlU6sxMEc3lyr6htNfhcqB2FsJlnjVAfpoZyqqoIoEEshtU5ASUBXmMfrux4bKV-z64vZukwQAxkivm_65h4DQ'
-  );
-}
-
-const sysId = SYS_ID || Cookies.get('sysId');
-Cookies.set('sysId', sysId);
-router.beforeEach((to, from, next) => {
-  if (to.meta.title) {
-    document.title = to.meta.title + ' - ' + Config.title;
-  }
-  NProgress.start();
-  const hasBase = to.path.includes(VUE_APP_PUBLIC_URL);
-  let path = to.path;
-  if (hasBase) {
-    const pathArr = path.split(VUE_APP_PUBLIC_URL);
-    const _length = pathArr.length;
-    if (_length) {
-      path = '/' + pathArr[_length - 1];
-    }
-  }
-  if (getToken()) {
-    // 已登录且要跳转的页面是登录页
-    if (path === '/login') {
-      next({ path: '/login' });
-      NProgress.done();
-    } else {
-      if (store.getters.roles.length === 0) {
-        // 判断当前用户是否已拉取完user_info信息
-        store
-          .dispatch('GetInfo')
-          .then(() => {
-            // 拉取user_info
-            // 动态路由，拉取菜单
-            loadMenus(next, path, to);
-          })
-          .catch(() => {
-            store.dispatch('LogOut').then(() => {
-              location.reload(); // 为了重新实例化vue-router对象 避免bug
-            });
-          });
-        // 登录时未拉取 菜单，在此处拉取
-      } else if (store.getters.loadMenus) {
-        // 修改成false，防止死循环
-        store.dispatch('updateLoadMenus');
-        loadMenus(next, path, to);
-      } else {
-        next();
-      }
-    }
-  } else {
-    next();
-    loadMenus(next, path);
-  }
-});
-
-export const loadMenus = (next, path, to) => {
-  if (sysId == null || sysId === '') {
-    Cookies.remove('homePageDefault');
-    store.dispatch('SetSidebarRouters', router.options.routes);
-    if (!IS_DEV) {
-      window.location.href = VUE_APP_LOGIN_URL;
-    }
-    return;
-  }
-  const data = {
-    sysId: sysId,
-  };
-  buildMenus(data)
-    .then(({ content }) => {
-      const routeData = []; // 判断是否菜单路由是否修改，导致默认首页为空
-      let sdata = JSON.parse(JSON.stringify(content));
-      //清理路由
-      const rdata = JSON.parse(JSON.stringify(content));
-      const sidebarRoutes = filterAsyncRouter(sdata);
-      const rewriteRoutes = filterAsyncRouter(rdata, true);
-      console.log('sidebarRoutes', sidebarRoutes);
-      // rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
-      store.dispatch('GenerateRoutes', rewriteRoutes).then(() => {
-        // 存储路由
-        router.addRoutes(rewriteRoutes); // 动态添加可访问路由表
-        next({ path, replace: true });
-      });
-      store.dispatch('SetSidebarRouters', sidebarRoutes);
-      // 默认首页
-      // 如果路由跳转 /dashboard, 开始修改默认首页
-      if (to.path == '/dashboard' || !Cookies.get('homePageDefault')) {
-        Cookies.set('homePageDefault', true);
-        getUserDefaultHomePage(data)
-          .then(res => {
-            const routes = store.state.permission.addRouters;
-            routes.forEach((tmp, index) => {
-              // 一级菜单
-              if (res.defaultHomePage) {
-                if (tmp.path == '/' + res.defaultHomePage) {
-                  routeData.push(tmp);
-                  next(res.defaultHomePage + '/' + tmp.children[0].path);
-                } else {
-                  // 二级菜单
-                  tmp.children.forEach(childrenTmp => {
-                    if (childrenTmp.path == res.defaultHomePage) {
-                      routeData.push(tmp);
-                      next(tmp.path + '/' + childrenTmp.path);
-                    }
-                  });
-                }
-              } else {
-                // 没有设置默认首页，直接路由一级第一个当作默认首页
-                if (index == 0) {
-                  routeData.push(tmp);
-                  next(tmp.path + '/' + tmp.children[0].path);
-                }
-              }
-            });
-            if (routeData.length == 0) {
-              next(routes[0].path + '/' + routes[0].children[0].path);
-            }
-          })
-          .catch(err => {
-            if (routeData.length == 0) {
-              next(routes[0].path + '/' + routes[0].children[0].path);
-            }
-          });
-      }
-    })
-    .catch(res => {
-      Cookies.remove('homePageDefault');
-      store.dispatch('SetSidebarRouters', router.options.routes);
-      if (!IS_DEV) {
-        window.location.href = VUE_APP_LOGIN_URL;
-      }
-    });
-};
-
-router.afterEach(() => {
-  NProgress.done(); // finish progress bar
-});
+import router from './routers';
+import store from '@/store';
+import Config from '@/settings';
+import Cookies from 'js-cookie';
+import NProgress from 'nprogress'; // progress bar
+import 'nprogress/nprogress.css'; // progress bar style
+import { getToken } from '@/utils/auth'; // getToken from cookie
+import { buildMenus } from '@/api/system/menu';
+import { filterAsyncRouter } from '@/store/modules/permission';
+import { getUserDefaultHomePage } from '@/api/login';
+
+NProgress.configure({ showSpinner: false }); // NProgress Configuration
+const { VUE_APP_LOGIN_URL, IS_DEV, SYS_ID } = window.config;
+const { VUE_APP_PUBLIC_URL } = process.env;
+const whiteList = ['/login', '/qualityLogin', '/system/dict']; // no redirect whitelist
+
+if (IS_DEV) {
+  Cookies.set('sysId', 294);
+  Cookies.set(
+    'IU-TOKEN',
+    'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ6aGFveWkiLCJhdXRoIjoiYWRtaW4iLCJ1c2VyIjoie1wicm9sZUlkXCI6OCxcImNvbXBhbnlcIjpcIlwiLFwiZHV0eVwiOlwiXCIsXCJpZFwiOjEwMDM4LFwidXNlcm5hbWVcIjpcInpoYW95aVwiLFwibmFtZVwiOlwi6LW16Im677yI55yB5aSW5rWL6K-V546v5aKD77yJXCIsXCJwaG9uZVwiOlwiXCIsXCJwYXNzd29yZFwiOlwidjdRZmVUMjNGTC9NT1hlS2tjSEtheTlBdU9VPVwiLFwiZW5hYmxlZFwiOnRydWUsXCJpc0FkbWluXCI6dHJ1ZSxcImxvZ2luVHlwZVwiOjAsXCJyb2xlU2lnblwiOjEsXCJyb2xlVW5pcXVlTGlzdFwiOltcIkpJR1VBTl9QVVRPTkdcIixcIldZSFRfQURNSU5cIixcInN5c3RlbVJvbGVcIixcIkFJ6LSo5o6nLeeuoeeQhuWRmFwiLFwiQklMTF9BRE1JTlwiLFwiYWRtaW5cIixcInBjQWRtaW5cIixcInN5c3RlbVJvbGVcIl0sXCJkZWZhdWx0SG9tZVBhZ2VcIjpcImRpZ2l0YWxJbWFnZVwiLFwiZXhwaXJlZFRpbWVcIjoyMTQzNDY4ODAwMDAwLFwidXNlclR5cGVcIjowLFwiY3JlYXRlVGltZVwiOjE2Nzk0NzEzNDAwMDAsXCJ1cGRhdGVUaW1lXCI6MTc2NjExMzgzNDgxNX0iLCJqdGkiOiI0MDdmODk3MDk0ZTY0NGY0OTJkNDFmN2FkZmE5OTM3MCJ9.LlU6sxMEc3lyr6htNfhcqB2FsJlnjVAfpoZyqqoIoEEshtU5ASUBXmMfrux4bKV-z64vZukwQAxkivm_65h4DQ'
+  );
+}
+
+const sysId = SYS_ID || Cookies.get('sysId');
+Cookies.set('sysId', sysId);
+router.beforeEach((to, from, next) => {
+  if (to.meta.title) {
+    document.title = to.meta.title + ' - ' + Config.title;
+  }
+  NProgress.start();
+  const hasBase = to.path.includes(VUE_APP_PUBLIC_URL);
+  let path = to.path;
+  if (hasBase) {
+    const pathArr = path.split(VUE_APP_PUBLIC_URL);
+    const _length = pathArr.length;
+    if (_length) {
+      path = '/' + pathArr[_length - 1];
+    }
+  }
+  if (getToken()) {
+    // 已登录且要跳转的页面是登录页
+    if (path === '/login') {
+      next({ path: '/login' });
+      NProgress.done();
+    } else {
+      if (store.getters.roles.length === 0) {
+        // 判断当前用户是否已拉取完user_info信息
+        store
+          .dispatch('GetInfo')
+          .then(() => {
+            // 拉取user_info
+            // 动态路由，拉取菜单
+            loadMenus(next, path, to);
+          })
+          .catch(() => {
+            store.dispatch('LogOut').then(() => {
+              location.reload(); // 为了重新实例化vue-router对象 避免bug
+            });
+          });
+        // 登录时未拉取 菜单，在此处拉取
+      } else if (store.getters.loadMenus) {
+        // 修改成false，防止死循环
+        store.dispatch('updateLoadMenus');
+        loadMenus(next, path, to);
+      } else {
+        next();
+      }
+    }
+  } else {
+    next();
+    loadMenus(next, path);
+  }
+});
+
+export const loadMenus = (next, path, to) => {
+  if (sysId == null || sysId === '') {
+    Cookies.remove('homePageDefault');
+    store.dispatch('SetSidebarRouters', router.options.routes);
+    if (!IS_DEV) {
+      window.location.href = VUE_APP_LOGIN_URL;
+    }
+    return;
+  }
+  const data = {
+    sysId: sysId,
+  };
+  buildMenus(data)
+    .then(({ content }) => {
+      const routeData = []; // 判断是否菜单路由是否修改，导致默认首页为空
+      let sdata = JSON.parse(JSON.stringify(content));
+      //清理路由
+      const rdata = JSON.parse(JSON.stringify(content));
+      const sidebarRoutes = filterAsyncRouter(sdata);
+      const rewriteRoutes = filterAsyncRouter(rdata, true);
+      console.log('sidebarRoutes', sidebarRoutes);
+      // rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
+      store.dispatch('GenerateRoutes', rewriteRoutes).then(() => {
+        // 存储路由
+        router.addRoutes(rewriteRoutes); // 动态添加可访问路由表
+        next({ path, replace: true });
+      });
+      store.dispatch('SetSidebarRouters', sidebarRoutes);
+      // 默认首页
+      // 如果路由跳转 /dashboard, 开始修改默认首页
+      if (to.path == '/dashboard' || !Cookies.get('homePageDefault')) {
+        Cookies.set('homePageDefault', true);
+        getUserDefaultHomePage(data)
+          .then(res => {
+            const routes = store.state.permission.addRouters;
+            routes.forEach((tmp, index) => {
+              // 一级菜单
+              if (res.defaultHomePage) {
+                if (tmp.path == '/' + res.defaultHomePage) {
+                  routeData.push(tmp);
+                  next(res.defaultHomePage + '/' + tmp.children[0].path);
+                } else {
+                  // 二级菜单
+                  tmp.children.forEach(childrenTmp => {
+                    if (childrenTmp.path == res.defaultHomePage) {
+                      routeData.push(tmp);
+                      next(tmp.path + '/' + childrenTmp.path);
+                    }
+                  });
+                }
+              } else {
+                // 没有设置默认首页，直接路由一级第一个当作默认首页
+                if (index == 0) {
+                  routeData.push(tmp);
+                  next(tmp.path + '/' + tmp.children[0].path);
+                }
+              }
+            });
+            if (routeData.length == 0) {
+              next(routes[0].path + '/' + routes[0].children[0].path);
+            }
+          })
+          .catch(err => {
+            if (routeData.length == 0) {
+              next(routes[0].path + '/' + routes[0].children[0].path);
+            }
+          });
+      }
+    })
+    .catch(res => {
+      Cookies.remove('homePageDefault');
+      store.dispatch('SetSidebarRouters', router.options.routes);
+      if (!IS_DEV) {
+        window.location.href = VUE_APP_LOGIN_URL;
+      }
+    });
+};
+
+router.afterEach(() => {
+  NProgress.done(); // finish progress bar
+});