vue2-client 1.6.49 → 1.6.51-single

package/package.json

@@ -1,81 +1,81 @@
-{
-  "name": "vue2-client",
-  "version": "1.6.49",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.29",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.30.1",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "2.6.14",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.21.4",
-    "@vue/cli-plugin-babel": "^4.5.19",
-    "@vue/cli-plugin-eslint": "^4.5.19",
-    "@vue/cli-service": "^4.5.19",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vuepress/plugin-back-to-top": "^1.9.9",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^4.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "fast-deep-equal": "^3.1.3",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-template-compiler": "2.6.14",
-    "vuepress": "^1.9.9",
-    "webpack": "^4.46.0",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.2"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.6.51-single",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.29",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.30.1",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "2.6.14",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.21.4",
+    "@vue/cli-plugin-babel": "^4.5.19",
+    "@vue/cli-plugin-eslint": "^4.5.19",
+    "@vue/cli-service": "^4.5.19",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vuepress/plugin-back-to-top": "^1.9.9",
+    "babel-eslint": "^10.1.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^4.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "fast-deep-equal": "^3.1.3",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-template-compiler": "2.6.14",
+    "vuepress": "^1.9.9",
+    "webpack": "^4.46.0",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.2"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

package/src/router/async/router.map.js

@@ -1,68 +1,74 @@
-const { homePage } = require('../../config')
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import('@vue2-client/pages/system/queryParams')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
-// 系统设置
-routerResource.settings = () => import('@vue2-client/pages/system/settings')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: homePage,
-    component: view.tabs
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+const { homePage } = require("../../config");
+// 视图组件
+const view = {
+  tabs: () => import("@vue2-client/layouts/tabs"),
+  blank: () => import("@vue2-client/layouts/BlankView"),
+  page: () => import("@vue2-client/layouts/PageView"),
+};
+// 动态路由对象定义
+const routerResource = {};
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank;
+// 单页面视图
+routerResource.singlePage = view.blank;
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank;
+// 工作台
+routerResource.workplace = () =>
+  import("@vue2-client/pages/dashboard/workplace");
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank;
+// 字典管理
+routerResource.dictionaryManage = () =>
+  import("@vue2-client/pages/system/dictionary");
+// 查询配置管理
+routerResource.queryParamsManage = () =>
+  import("@vue2-client/pages/system/queryParams");
+// 文件管理
+routerResource.fileManager = () => import("@vue2-client/pages/system/file");
+// 登录日志
+routerResource.loginInfor = () =>
+  import("@vue2-client/pages/system/monitor/loginInfor");
+// 操作日志
+routerResource.operLog = () =>
+  import("@vue2-client/pages/system/monitor/operLog");
+// 系统问题反馈工单
+routerResource.submitTicket = () => import("@vue2-client/pages/system/ticket");
+// 系统设置
+routerResource.settings = () => import("@vue2-client/pages/system/settings");
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: "*",
+    path: "/login",
+    component: () => import("@vue2-client/pages/login"),
+  },
+  root: {
+    path: "/",
+    name: "首页",
+    redirect: homePage,
+    component:
+      process.env.VUE_APP_SINGLE_PAPER === "TRUE" ? view.blank : view.tabs,
+  },
+  exp403: {
+    authority: "*",
+    name: "exp403",
+    path: "403",
+    component: () => import("@vue2-client/pages/exception/403"),
+  },
+  exp404: {
+    name: "exp404",
+    path: "404",
+    component: () => import("@vue2-client/pages/exception/404"),
+  },
+  exp500: {
+    name: "exp500",
+    path: "500",
+    component: () => import("@vue2-client/pages/exception/500"),
+  },
+};
+Object.assign(routerMap, routerResource);
+export default routerMap;

package/src/router/guards.js

@@ -1,113 +1,148 @@
-import { hasAuthority } from '@vue2-client/utils/authority-utils'
-import { loginIgnore } from '@vue2-client/router/index'
-import { checkAuthorization } from '@vue2-client/utils/request'
-import NProgress from 'nprogress'
-import { logout } from '@vue2-client/services/user'
-
-NProgress.configure({ showSpinner: false })
-
-/**
- * 进度条开始
- * @param to
- * @param form
- * @param next
- */
-const progressStart = (to, from, next) => {
-  // start progress bar
-  if (!NProgress.isStarted()) {
-    NProgress.start()
-  }
-  next()
-}
-
-/**
- * 登录守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const loginGuard = (to, from, next, options) => {
-  const { store, message } = options
-  if ((!loginIgnore.includes(to) || to.name === '404') && !checkAuthorization()) {
-    message.warning('登录已失效，请重新登录')
-    next({ path: '/login' })
-  } else {
-    const roles = store.getters['account/roles']
-    if (roles.length === 0 && !loginIgnore.includes(to)) {
-      message.warning('登录已失效，请重新登录')
-      logout().finally(res => {
-        next({ path: '/login' })
-      })
-    } else {
-      next()
-    }
-  }
-}
-
-/**
- * 权限守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const authorityGuard = (to, from, next, options) => {
-  const { store, message } = options
-  const permissions = store.getters['account/permissions']
-  const roles = store.getters['account/roles']
-  if (!hasAuthority(to, permissions, roles)) {
-    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
-    next({ path: '/403' })
-    // NProgress.done()
-  } else {
-    next()
-  }
-}
-
-/**
- * 混合导航模式下一级菜单跳转重定向
- * @param to
- * @param from
- * @param next
- * @param options
- * @returns {*}
- */
-const redirectGuard = (to, from, next, options) => {
-  const { store } = options
-  const getFirstChild = (routes) => {
-    const route = routes[0]
-    if (!route.children || route.children.length === 0) {
-      return route
-    }
-    return getFirstChild(route.children)
-  }
-  if (store.state.setting.layout === 'mix') {
-    const firstMenu = store.getters['setting/firstMenu']
-    if (firstMenu.find(item => item.fullPath === to.fullPath)) {
-      store.commit('setting/setActivatedFirst', to.fullPath)
-      const subMenu = store.getters['setting/subMenu']
-      if (subMenu.length > 0) {
-        const redirect = getFirstChild(subMenu)
-        return next({ path: redirect.fullPath })
-      }
-    }
-  }
-  next()
-}
-
-/**
- * 进度条结束
- * @param to
- * @param form
- * @param options
- */
-const progressDone = () => {
-  // finish progress bar
-  NProgress.done()
-}
-
-export default {
-  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
-  afterEach: [progressDone]
-}
+import { hasAuthority } from "@vue2-client/utils/authority-utils";
+import { loginIgnore } from "@vue2-client/router/index";
+import { checkAuthorization } from "@vue2-client/utils/request";
+import NProgress from "nprogress";
+import { logout } from "@vue2-client/services/user";
+import { startLogin } from "vue2-client/src/utils/login";
+import AES from "vue2-client/src/utils/EncryptUtil";
+NProgress.configure({ showSpinner: false });
+
+/**
+ * 进度条开始
+ * @param to
+ * @param form
+ * @param next
+ */
+const progressStart = (to, from, next) => {
+  // start progress bar
+  if (!NProgress.isStarted()) {
+    NProgress.start();
+  }
+  next();
+};
+
+/**
+ * 登录守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const loginGuard = (to, from, next, options) => {
+  const urlParams = new URLSearchParams(window.location.search);
+  const token = urlParams.get("token");
+  if (token) {
+    const { AESDecrypt } = AES;
+    const info = AESDecrypt(token, "3KMKqvgwR8ULbR8Z");
+    const { store, message, router } = options;
+    if (
+      (!loginIgnore.includes(to) || to.name === "404") &&
+      !checkAuthorization()
+    ) {
+      startLogin({
+        ...info,
+        store,
+        router,
+      });
+    } else {
+      const roles = store.getters["account/roles"];
+      const user = localStorage.getItem(process.env.VUE_APP_USER_KEY);
+      const setUser = store._mutations["account/setUser"][0];
+      setUser(user);
+      if (roles.length === 0 && !loginIgnore.includes(to)) {
+        message.warning("登录已失效，请重新登录");
+        logout().finally((res) => {
+          next({ path: "/login" });
+        });
+      } else {
+        next();
+      }
+    }
+  } else {
+    const { store, message } = options;
+    if (
+      (!loginIgnore.includes(to) || to.name === "404") &&
+      !checkAuthorization()
+    ) {
+      message.warning("登录已失效，请重新登录");
+      next({ path: "/login" });
+    } else {
+      const roles = store.getters["account/roles"];
+      if (roles.length === 0 && !loginIgnore.includes(to)) {
+        message.warning("登录已失效，请重新登录");
+        logout().finally((res) => {
+          next({ path: "/login" });
+        });
+      } else {
+        next();
+      }
+    }
+  }
+};
+
+/**
+ * 权限守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const authorityGuard = (to, from, next, options) => {
+  const { store, message } = options;
+  const permissions = store.getters["account/permissions"];
+  const roles = store.getters["account/roles"];
+  if (!hasAuthority(to, permissions, roles)) {
+    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`);
+    next({ path: "/403" });
+    // NProgress.done()
+  } else {
+    next();
+  }
+};
+
+/**
+ * 混合导航模式下一级菜单跳转重定向
+ * @param to
+ * @param from
+ * @param next
+ * @param options
+ * @returns {*}
+ */
+const redirectGuard = (to, from, next, options) => {
+  const { store } = options;
+  const getFirstChild = (routes) => {
+    const route = routes[0];
+    if (!route.children || route.children.length === 0) {
+      return route;
+    }
+    return getFirstChild(route.children);
+  };
+  if (store.state.setting.layout === "mix") {
+    const firstMenu = store.getters["setting/firstMenu"];
+    if (firstMenu.find((item) => item.fullPath === to.fullPath)) {
+      store.commit("setting/setActivatedFirst", to.fullPath);
+      const subMenu = store.getters["setting/subMenu"];
+      if (subMenu.length > 0) {
+        const redirect = getFirstChild(subMenu);
+        return next({ path: redirect.fullPath });
+      }
+    }
+  }
+  next();
+};
+
+/**
+ * 进度条结束
+ * @param to
+ * @param form
+ * @param options
+ */
+const progressDone = () => {
+  // finish progress bar
+  NProgress.done();
+};
+
+export default {
+  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
+  afterEach: [progressDone],
+};

package/src/utils/login.js

@@ -0,0 +1,101 @@
+import { getRoutesConfig, login, V4Login } from "@vue2-client/services/user";
+import { loadRoutes, funcToRouter } from "@vue2-client/utils/routerUtil";
+import JSEncrypt from "jsencrypt";
+import { ACCESS_TOKEN } from "@vue2-client/store/mutation-types";
+import { positions } from "@vue2-client/mock/common";
+import { timeFix } from "@vue2-client/utils/util";
+import { indexedDB } from "@vue2-client/utils/indexedDB";
+import Vue from "vue";
+import { message } from "ant-design-vue";
+import { setAuthorization } from "@vue2-client/utils/request";
+function setAccessToken(data) {
+  if (data) {
+    localStorage.setItem(ACCESS_TOKEN, data);
+    let timestamp = new Date().getTime(); // 当前的时间戳
+    timestamp = timestamp + 12 * 60 * 60 * 1000;
+    // 格式化时间获取年月日, 登陆过期时间
+    const dateAfter = new Date(timestamp);
+    setAuthorization({ token: data, expireAt: dateAfter });
+  }
+}
+function afterGeneral(result, options) {
+  const { name, password, store } = options;
+  const user = Object.assign(
+    {
+      id: result.id,
+      username: result.ename,
+      password: password,
+      name: result.name,
+      avatar:
+        "https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png",
+      address: "西安市",
+      position: positions[0],
+    },
+    result
+  );
+  const setUser = store._mutations["account/setUser"][0];
+  const setPermissions = store._mutations["account/setPermissions"][0];
+  const setRoles = store._mutations["account/setRoles"][0];
+  setUser(user);
+  setPermissions([{ id: "queryForm", operation: ["add", "edit"] }]);
+  setRoles([{ id: "admin", operation: ["add", "edit", "delete"] }]);
+  loadRoutes(funcToRouter(user.functions));
+  // 每次重新登录时，清除indexedDB缓存
+  indexedDB.clear();
+  message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3);
+}
+function afterLogin(res, options) {
+  const { name, password, store, router } = options;
+  const setting = store.state.setting;
+  const loginRes = res.states;
+  if (loginRes === "登录成功") {
+    const encrypt = new JSEncrypt();
+    encrypt.setPublicKey(
+      "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB"
+    );
+    const data = encrypt.encrypt(
+      JSON.stringify({ username: name, password: password })
+    );
+    // 获取路由配置
+    getRoutesConfig(data, setting.routeName)
+      .then((result) => {
+        Vue.$login
+          .login(result)
+          .then(() => {
+            // V3任何情况首位加入资源管理
+            const resourceManageMain = {
+              name: "资源管理",
+              icon: "api",
+              position: 1,
+              link: "resourceManageMain",
+            };
+            result.functions.unshift(resourceManageMain);
+            afterGeneral(result, options);
+            setAccessToken(data);
+            if (result.deps === "用户工单登记") {
+              router.push(setting.ticketPage).catch(() => {});
+            } else {
+              router.push(setting.homePage).catch(() => {});
+            }
+          })
+          .finally(() => {});
+      })
+      .catch((res) => {});
+  } else {
+  }
+}
+export function startLogin(options) {
+  const { name, password, store } = options;
+  const setting = store.state.setting;
+  switch (setting.compatible) {
+    case "V2":
+    case "V3": {
+      login(name, password)
+        .then((res) => {
+          afterLogin(res, options);
+        })
+        .catch((msg) => {});
+      break;
+    }
+  }
+}