cloud-web-corejs 1.0.54-dev.770 → 1.0.54-dev.772

package/src/views/user/login/indexMixin.js

@@ -1,9 +1,9 @@
 import { encode } from "js-base64";
 import settingConfig from "@/settings";
-import { preloadBusinessFeatures } from "@base/bootstrap/business";
-
-function getUrlParams(url) {
-  let result = {};
+import QRcode from "qrcode";
+
+function getUrlParams(url) {
+  let result = {};
   if (url) {
     let urlStr = url.split("?")[1];
     const urlSearchParams = new URLSearchParams(urlStr);
@@ -89,14 +89,12 @@ export default {
       immediate: true,
     },
   },
-  beforeDestroy() {
-    this.clearQrLoginTimer();
-    this.clearSmsTimer();
-    // 注意：这里不能关跳转期 loading。组件销毁发生在导航确认时，而首页真正渲染上屏
-    // 还在其后，遮罩要撑过这段时间，由 closeRedirectLoading 收口
-  },
-  created() {
-    this.init();
+  beforeDestroy() {
+    this.clearQrLoginTimer();
+    this.clearSmsTimer();
+  },
+  created() {
+    this.init();
   },
   mounted() {
     // if (this.loginForm.username === '') {
@@ -242,25 +240,23 @@ export default {
         }
       }
 
-      // 登录接口、部署前缀、用户信息和菜单请求期间并行下载业务模块，
-      // 路由守卫会复用同一个 Promise，不增加登录结果等待链路。
-      preloadBusinessFeatures();
-
       this.$store
-        .dispatch("user/login2", reqData)
-        .then((res) => {
-          if (res.type == "success") {
-            localStorage.removeItem("currentMenuId");
-            this.rememberPassword();
-            window.removeEventListener("keydown", this.keyDown, false);
-            // 登录成功后的跳转链路（getWebPrefix → 路由守卫拉用户信息/生成动态路由 →
-            // 首页渲染上屏）耗时较长，换成挂在 body 上的全屏遮罩顶住这段时间，
-            // 防止登录页被再次操作；由 closeRedirectLoading 统一收口
-            loadingObj.close();
-            this.openRedirectLoading();
-            this.handleRedirectUrl();
-          } else {
-            setTimeout(function () {
+        .dispatch("user/login2", reqData)
+        .then((res) => {
+          setTimeout(function () {
+            loadingObj.close();
+          }, 200);
+          if (res.type == "success") {
+            localStorage.removeItem("currentMenuId");
+            this.rememberPassword();
+            /*this.$router.push({
+              path: '/'
+            });*/
+            this.loading = false;
+            window.removeEventListener("keydown", this.keyDown, false);
+            this.handleRedirectUrl();
+          } else {
+            setTimeout(function () {
               loadingObj.close();
             }, 200);
           }
@@ -453,41 +449,33 @@ export default {
         clearInterval(this.smsTimer);
         this.smsTimer = null;
       }
-    },
-    mobileLogin() {},
+    },
+    mobileLogin() {},
     handleRedirectUrl(redirect) {
-      // SSO、扫码等非账号密码入口也在跳转前启动预加载。
-      preloadBusinessFeatures();
       redirect = redirect || this.$route.query.redirect;
-      let path = null;
-      if (redirect && redirect.startsWith("/outLinkView")) {
+      let path = null;
+      if (redirect && redirect.startsWith("/outLinkView")) {
         path = this.addParamToUrl(redirect, "hasToken", "true");
       } else {
         path = "/";
       }
       this.getWebPrefix((webPrefix) => {
         let prefix = webPrefix ? "/" + webPrefix : "";
-        let ssotoken = this.searchParam.gatewayToken;
-        let xtoken = this.searchParam.xtoken;
-        if (prefix && prefix !== window.WEB_PREFIX) {
-          // 整页跳转，loading 随页面卸载消失
-          location.href = prefix + "/index.html" + path;
-        } else if (!!ssotoken || !!xtoken) {
-          prefix = prefix || window.WEB_PREFIX;
-          location.href = prefix + "/index.html" + path;
-        } else {
-          // 遮罩不在 push 的回调里收口：守卫内的重定向会让原始导航走 onAbort，
-          // 而真正的导航仍在继续，统一交给 openRedirectLoading 里注册的 afterEach
-          this.$router.push({
-            path: path,
-          });
-        }
-      }, () => {
-        // getWebPrefix 请求失败：恢复登录页可操作，避免 loading 永久卡死
-        this.closeRedirectLoading(true);
-      });
-      /*if (redirect && redirect.startsWith("/outLinkView")) {
-        let path = this.addParamToUrl(redirect, "hasToken", "true");
+        let ssotoken = this.searchParam.gatewayToken;
+        let xtoken = this.searchParam.xtoken;
+        if (prefix && prefix !== window.WEB_PREFIX) {
+          location.href = prefix + "/index.html" + path;
+        } else if (!!ssotoken || !!xtoken) {
+          prefix = prefix || window.WEB_PREFIX;
+          location.href = prefix + "/index.html" + path;
+        } else {
+          this.$router.push({
+            path: path,
+          });
+        }
+      });
+      /*if (redirect && redirect.startsWith("/outLinkView")) {
+        let path = this.addParamToUrl(redirect, "hasToken", "true");
         this.$router.push({
           path: path
         });
@@ -504,104 +492,23 @@ export default {
       } else {
         url +=
           (url.indexOf("?") === -1 ? "?" : "&") + paramKey + "=" + paramValue;
-      }
-      return url;
-    },
-    getWebPrefix(callback, errorCallback) {
-      this.$http({
-        url: USER_PREFIX + "/auth/getWebPrefix",
-        method: `post`,
+      }
+      return url;
+    },
+    getWebPrefix(callback) {
+      this.$http({
+        url: USER_PREFIX + "/auth/getWebPrefix",
+        method: `post`,
         data: {},
         isLoading: true,
         success: (res) => {
-          let webPrefix = res.objx;
-          callback && callback(webPrefix);
-        },
-        fail: () => {
-          errorCallback && errorCallback();
-        },
-        error: () => {
-          errorCallback && errorCallback();
-        },
-      });
-    },
-    /**
-     * 打开登录跳转期的全屏遮罩。
-     * 不能用 fullscreen:true —— element 的全屏 loading 是全局单例（fullscreenLoading），
-     * request.js 里 isLoading 的请求（getWebPrefix 就是）用的正是这个单例，请求结束会把
-     * 它一起 close 掉。这里传 target:body + fullscreen:false 拿独立实例，遮罩挂在 body 上
-     * 不随登录组件销毁而消失，全屏样式手动补。
-     */
-    openRedirectLoading() {
-      this.closeRedirectLoading();
-      let loading = this.$baseLoading({
-        target: document.body,
-        fullscreen: false,
-        lock: true,
-      });
-      let el = loading && loading.$el;
-      if (el) {
-        el.style.position = "fixed";
-        el.style.top = "0";
-        el.style.left = "0";
-        el.style.width = "100%";
-        el.style.height = "100%";
-        el.style.zIndex = 9999;
-      }
-      this.redirectLoadingObj = loading;
-      // 收口挂在 afterEach 上：路由守卫里的重定向会让原始 push 走 onAbort，但新导航
-      // 其实还在继续（实测 onAbort 在 +211ms 触发，首页 +577ms 才绘制完成），所以不能
-      // 用 push 的回调收口。afterEach 只在导航真正确认后触发一次，且带最终目标路由
-      this.redirectAfterEachOff = this.$router.afterEach((to) => {
-        if (String((to && to.path) || "").indexOf("/login") >= 0) {
-          // 兜了一圈又回到登录页（如守卫拉用户信息失败），恢复登录页可操作
-          this.closeRedirectLoading(true);
-        } else {
-          this.closeRedirectLoadingAfterPaint();
-        }
-      });
-      // 兜底：跳转链路既不 complete 也不 abort 时不至于永久锁死
-      this.redirectLoadingTimer = setTimeout(() => {
-        this.closeRedirectLoading(true);
-      }, 20000);
-    },
-    /**
-     * 等目标页真正绘制上屏后再撤遮罩：$nextTick 等 Vue 完成 patch，
-     * 双 rAF 等浏览器完成这一帧的绘制
-     */
-    closeRedirectLoadingAfterPaint() {
-      this.$nextTick(() => {
-        requestAnimationFrame(() => {
-          requestAnimationFrame(() => {
-            this.closeRedirectLoading();
-          });
-        });
-      });
-    },
-    /**
-     * 登录跳转期 loading 统一收口：上屏完成、跳转中止、getWebPrefix 失败、超时兜底时调用。
-     * reenable=true 时恢复登录页可操作（跳转失败仍停留在登录页的场景）
-     */
-    closeRedirectLoading(reenable) {
-      if (this.redirectAfterEachOff) {
-        this.redirectAfterEachOff();
-        this.redirectAfterEachOff = null;
-      }
-      if (this.redirectLoadingTimer) {
-        clearTimeout(this.redirectLoadingTimer);
-        this.redirectLoadingTimer = null;
-      }
-      if (this.redirectLoadingObj) {
-        this.redirectLoadingObj.close();
-        this.redirectLoadingObj = null;
-      }
-      if (reenable) {
-        this.loading = false;
-        window.addEventListener("keydown", this.keyDown, false);
-      }
-    },
-    handleGatewayTokenLogin() {
-      let ssotoken = this.searchParam.gatewayToken;
+          let webPrefix = res.objx;
+          callback && callback(webPrefix);
+        },
+      });
+    },
+    handleGatewayTokenLogin() {
+      let ssotoken = this.searchParam.gatewayToken;
       let companycode = this.searchParam.entCode;
       this.$store
         .dispatch("user/login2", { ssotoken, companycode })
@@ -643,17 +550,18 @@ export default {
         this.qrExpired = false;
         this.qrBase64 = url;
         this.createQrLoginTimer();
-      });
-    },
-    // 生成二维码
-    async createQR(content, options) {
-      const { default: QRCode } = await import(
-        /* webpackChunkName: "login-qrcode" */ "qrcode"
-      );
-      return QRCode.toDataURL(content, options);
-    },
-    changeTab() {
-      // this.initQR();
+      });
+    },
+    // 生成二维码
+    createQR(content, options) {
+      return new Promise((resolve, reject) => {
+        QRcode.toDataURL(content, options).then((url) => {
+          resolve(url);
+        });
+      });
+    },
+    changeTab() {
+      // this.initQR();
       // return
       if (this.activeName == "third") {
         this.initQR();

package/src/bootstrap/business.js

@@ -1,31 +0,0 @@
-let installPromise = null;
-
-/**
- * 登录页只安装认证所需的最小能力。表格、Excel、上传和业务弹框等全局能力
- * 在第一次进入业务路由前按需安装，避免进入 /login 时下载整套后台模块。
- */
-export function ensureBusinessFeatures() {
-  if (!installPromise) {
-    installPromise = import(
-      /* webpackChunkName: "business-core" */ "./businessFeatures"
-    ).catch((error) => {
-      // 网络抖动或发布切换导致 chunk 失败时，允许下一次导航重新尝试
-      installPromise = null;
-      throw error;
-    });
-  }
-  return installPromise;
-}
-
-/**
- * 提前触发业务模块下载和安装，但不阻塞当前交互。
- * 登录提交后会与认证、用户信息和菜单请求并行；真正进入业务路由时
- * ensureBusinessFeatures 会复用同一个 Promise，失败时仍由路由守卫统一提示。
- */
-export function preloadBusinessFeatures() {
-  const promise = ensureBusinessFeatures();
-  promise.catch((error) => {
-    console.warn("[bootstrap] 业务模块预加载失败，将在导航时重试", error);
-  });
-  return promise;
-}

package/src/bootstrap/businessFeatures.js

@@ -1,108 +0,0 @@
-import Vue from "vue";
-import Cookies from "js-cookie";
-import Element from "element-ui";
-
-import BaseKeepAlive from "@base/utils/keepAlive.js";
-import VXETable from "vxe-table";
-import "vxe-table/lib/style.css";
-import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js";
-import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css";
-import "@base/components/table/index.js";
-import Vab from "@base/utils/vab";
-import drag from "@base/directive/el-drag-dialog/index.js";
-import elDialogCenter from "@base/directive/el-dialog-center/index.js";
-import ErroreBox from "@base/components/errorMsg/index.js";
-import ExcelExport from "@base/components/excelExport/index.js";
-import ExcelImport from "@base/components/excelImport/index.js";
-import ConfirmDialog from "@base/components/confirmDialog/index.js";
-import baseAlert from "@base/components/baseAlert/index.js";
-import FormDialog from "@base/components/formDialog/index.js";
-import permission from "@base/directive/permission";
-import VabUpload from "@base/components/VabUpload/index.js";
-import baseAttachment from "@base/components/baseAttachment/install";
-import vxeFilter from "@base/components/table/vxeFilter/index.js";
-import baseTableExport from "@base/components/excelExport/button.vue";
-import LimitNumber from "@base/directive/LimitNumber/index.js";
-import baseInputNumber from "@base/components/baseInputNumber/index.vue";
-import elReadonly from "@base/directive/el-readonly/index.js";
-import oplogTable from "@base/components/oplogTable/index.vue";
-import baseInputBatch from "@base/components/baseInputBatch/index.vue";
-import baseArea from "@base/components/baseArea/index.vue";
-import baseTabs from "@base/components/baseTabs/index.vue";
-import baseTabPane from "@base/components/baseTabs/baseTabPane.vue";
-import vbTabs from "@base/components/vb-tabs/index.vue";
-import vbTabPane from "@base/components/vb-tabs/tab-pane.vue";
-import xTabs from "@base/components/vb-tabs/x-tabs.vue";
-import baseTextarea from "@base/components/base-textarea/index.vue";
-import jsonImport from "@base/components/jsonImport/index.js";
-import langImport from "@base/components/langImport/index.js";
-import * as filters from "@base/filters";
-import {
-  getPublicAssetUrl,
-  loadStyle,
-} from "@base/utils/externalAssets";
-
-Vue.component("BaseKeepAlive", BaseKeepAlive);
-Vue.use(Element, { size: Cookies.get("size") || "medium" });
-Vue.use(Vab);
-Vue.use(VXETable);
-Vue.use(drag.install);
-Vue.use(elDialogCenter.install);
-Vue.use(ErroreBox);
-Vue.use(ExcelExport);
-Vue.use(ExcelImport);
-Vue.use(ConfirmDialog);
-Vue.use(baseAlert);
-Vue.use(FormDialog);
-Vue.use(permission);
-Vue.use(VabUpload);
-Vue.use(baseAttachment);
-Vue.use(vxeFilter);
-Vue.use(LimitNumber);
-Vue.use(elReadonly);
-Vue.use(jsonImport);
-Vue.use(langImport);
-
-Vue.component("baseUpload", () =>
-  import("@base/components/VabUpload/view.vue")
-);
-Vue.component("attachmentShowList", () =>
-  import("@base/components/baseAttachment/showList")
-);
-Vue.component(baseTableExport.name, baseTableExport);
-Vue.component(baseInputNumber.name, baseInputNumber);
-Vue.component(oplogTable.name, oplogTable);
-Vue.component(baseInputBatch.name, baseInputBatch);
-Vue.component(baseArea.name, baseArea);
-Vue.component("baseInputExport", () =>
-  import("@base/components/baseInputExport/index.vue")
-);
-Vue.component("advancedSearchDialog", () =>
-  import("@base/components/advancedSearchDialog/index.vue")
-);
-Vue.component(baseTabs.name, baseTabs);
-Vue.component(baseTabPane.name, baseTabPane);
-Vue.component(vbTabs.name, vbTabs);
-Vue.component(vbTabPane.name, vbTabPane);
-Vue.component(xTabs.name, xTabs);
-Vue.component("status-tag", () =>
-  import("@base/components/statusTag/index.vue")
-);
-Vue.component("CodeEditor", () =>
-  import("@base/components/code-editor/index.vue")
-);
-Vue.component("scriptDescriptionButton", () =>
-  import("@base/components/scriptDescription/button")
-);
-Vue.component("scriptTestButton", () =>
-  import("@base/components/scriptTest/button")
-);
-Vue.component(baseTextarea.name, baseTextarea);
-
-Object.keys(filters).forEach((key) => {
-  Vue.filter(key, filters[key]);
-});
-
-loadStyle(getPublicAssetUrl("css/print-lock.css"), { media: "print" }).catch(
-  (error) => console.warn("[bootstrap] 打印样式加载失败", error)
-);

package/src/utils/externalAssets.js

@@ -1,62 +0,0 @@
-const assetPromises = Object.create(null);
-
-export function getPublicAssetUrl(path) {
-  const baseUrl = (process.env.BASE_URL || "/").replace(/\/?$/, "/");
-  return baseUrl + String(path || "").replace(/^\//, "");
-}
-
-function findAsset(tagName, attribute, url) {
-  return Array.from(document.getElementsByTagName(tagName)).find(
-    (element) => element.getAttribute(attribute) === url
-  );
-}
-
-export function loadStyle(href, attributes = {}) {
-  const key = "style:" + href;
-  if (assetPromises[key]) return assetPromises[key];
-  const existing = findAsset("link", "href", href);
-  if (existing) return Promise.resolve(existing);
-
-  assetPromises[key] = new Promise((resolve, reject) => {
-    const link = document.createElement("link");
-    link.rel = "stylesheet";
-    link.href = href;
-    Object.keys(attributes).forEach((name) => {
-      link.setAttribute(name, attributes[name]);
-    });
-    link.onload = () => resolve(link);
-    link.onerror = () => {
-      delete assetPromises[key];
-      link.remove();
-      reject(new Error("样式加载失败：" + href));
-    };
-    document.head.appendChild(link);
-  });
-  return assetPromises[key];
-}
-
-export function loadStyles(hrefs) {
-  return Promise.all(hrefs.map((href) => loadStyle(href)));
-}
-
-export function loadScript(src) {
-  const key = "script:" + src;
-  if (assetPromises[key]) return assetPromises[key];
-  const existing = findAsset("script", "src", src);
-  if (existing) return Promise.resolve(existing);
-
-  assetPromises[key] = new Promise((resolve, reject) => {
-    const script = document.createElement("script");
-    script.src = src;
-    script.async = true;
-    script.onload = () => resolve(script);
-    script.onerror = () => {
-      delete assetPromises[key];
-      script.remove();
-      reject(new Error("脚本加载失败：" + src));
-    };
-    document.head.appendChild(script);
-  });
-  return assetPromises[key];
-}
-

package/src/utils/loginVab.js

@@ -1,68 +0,0 @@
-// API 模块沿用 USER_PREFIX 等全局常量；完整 Vab 延迟加载后，登录阶段需先恢复
-// 这项原本由 vab.js 模块初始化完成的副作用。
-import "@base/utils/prefixGlobals";
-import Loading from "element-ui/lib/loading";
-import MessageBox from "element-ui/lib/message-box";
-import request from "@base/utils/request";
-
-/**
- * 登录阶段需要的最小 Vab 能力。完整 Vab 会连带 lodash、moment、XEUtils、
- * 图片预览等后台依赖，改为进入业务路由后再覆盖安装。
- */
-export default function installLoginVab(Vue) {
-  Vue.prototype.$baseEventBus = new Vue();
-  const $http = async function (option = {}) {
-    if (!option.loadingTarget && this.$el) {
-      option.loadingTarget = this.$el;
-    }
-    if (!option.vueTarget) {
-      option.vueTarget = this;
-    }
-    return option.sync === false ? await request(option) : request(option);
-  };
-  Object.assign($http, request);
-  $http.prototype = request.prototype;
-  Vue.prototype.$http = $http;
-
-  Vue.prototype.$baseLoading = function (option = {}) {
-    const opts = {
-      lock: true,
-      background: "hsla(0,0%,100%,.8)",
-      target: this.$el,
-      ...option,
-    };
-    if (option.index) {
-      opts.spinner = "vab-loading-type" + option.index;
-    }
-    return Loading.service(opts);
-  };
-
-  Vue.prototype.$baseAlert = function (content, title, callback) {
-    return MessageBox.alert(content, title || "提示", {
-      confirmButtonText: "确定",
-      dangerouslyUseHTMLString: true,
-      target: this.$el,
-      confirmButtonClass: "icondui",
-      customClass: "dialog-style",
-      callback,
-    });
-  };
-
-  Vue.prototype.$t1 = function (path, values) {
-    const root = this.$root || window.$vueRoot;
-    if (!root || !root._i18n) return path;
-    const i18n = root.$i18n;
-    if (i18n.locale === "zh" || !i18n.te(path)) {
-      return i18n._t(path, i18n.locale, { zh: { [path]: path } }, null, values);
-    }
-    return i18n.t(path, values) || path;
-  };
-
-  Vue.prototype.$t2 = function (defaultValue, path, values) {
-    const root = this.$root || window.$vueRoot;
-    if (!root || !root._i18n) return defaultValue;
-    const i18n = root.$i18n;
-    const key = path || defaultValue;
-    return i18n.te(key) ? i18n.t(key, values) : defaultValue;
-  };
-}

package/src/utils/prefixGlobals.js

@@ -1,11 +0,0 @@
-import prefixConfig from "@/prefixConfig.js";
-
-export function installPrefixGlobals(target) {
-  if (target) {
-    Object.assign(target, prefixConfig);
-  }
-}
-
-if (typeof window !== "undefined") {
-  installPrefixGlobals(window);
-}