eoss 0.1.0-alpha.22 → 0.1.0-alpha.24

package/lib/phone-login.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 209);
+/******/ 	return __webpack_require__(__webpack_require__.s = 212);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -91,32 +91,32 @@ module.exports =
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return noop; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "x", function() { return hasOwn; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return toObject; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return getValueByPath; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return getPropByPath; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return noop; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return hasOwn; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return toObject; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return getValueByPath; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "u", function() { return getPropByPath; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "r", function() { return generateId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return valueEquals; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return valueEquals; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return escapeRegexpString; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return arrayFindIndex; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return arrayFind; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return coerceTruthyValueToArray; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return isIE; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return isEdge; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return isFirefox; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return isIE; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return isEdge; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return isFirefox; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return autoprefixer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return kebabCase; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "J", function() { return kebabCase; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return capitalize; });
 /* unused harmony export looseEqual */
 /* unused harmony export arrayEquals */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return isEqual; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return rafThrottle; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return isEqual; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "O", function() { return rafThrottle; });
 /* unused harmony export objToArray */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "P", function() { return requestAnimationFrame; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Q", function() { return requestAnimationFrame; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return cancelAnimationFrame; });
 /* unused harmony export debounce */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return throttle; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return throttle; });
 /* unused harmony export guid */
 /* unused harmony export uid */
 /* unused harmony export get */
@@ -124,7 +124,7 @@ module.exports =
 /* unused harmony export cloneDeep */
 /* unused harmony export grouping */
 /* unused harmony export pager */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return getWinTop; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "x", function() { return getWinTop; });
 /* unused harmony export getFileType */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return arrUnique; });
 /* unused harmony export average */
@@ -142,53 +142,54 @@ module.exports =
 /* unused harmony export exportXls */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return extend; });
 /* unused harmony export getObjectType */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return getParams; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return getParams; });
 /* unused harmony export getScript */
 /* unused harmony export getStyle */
 /* unused harmony export getTypeName */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "u", function() { return getTypePrefix; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return getTypePrefix; });
 /* unused harmony export getValues */
 /* unused harmony export getZoom */
 /* unused harmony export getLength */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return timestampUrl; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return timestampUrl; });
 /* unused harmony export hasChars */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return identical; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return indexOfObj; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return isEmpty; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return isExist; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return identical; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return indexOfObj; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return isEmpty; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return isExist; });
 /* unused harmony export isFunction */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return isObjectEqual; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return joinUrl; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "J", function() { return layoutWaterfall; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return isObjectEqual; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return joinUrl; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return getHorizontalMargin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return layoutWaterfall; });
 /* unused harmony export loadJs */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return loading; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return loading; });
 /* unused harmony export lowerCase */
 /* unused harmony export overbrim */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return queryParams; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return queryParams; });
 /* unused harmony export receiveMessage */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "O", function() { return renderIcon; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "P", function() { return renderIcon; });
 /* unused harmony export replenish */
 /* unused harmony export rmbToCapital */
 /* unused harmony export setScale */
 /* unused harmony export sendMessage */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Q", function() { return setFavicon; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return setFavicon; });
 /* unused harmony export sum */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return startWith; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return startWith; });
 /* unused harmony export takeLeft */
 /* unused harmony export takeRight */
 /* unused harmony export trimWhitespace */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return toFixed; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return toFixed; });
 /* unused harmony export toFunction */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return updateTheme; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return updateTheme; });
 /* unused harmony export upperType */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return urlJoinParams; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return uuid; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return watermark; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return urlJoinParams; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return uuid; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return watermark; });
 /* unused harmony export winTopOpen */
 /* unused harmony export confirm */
 /* unused harmony export success */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "m", function() { return error; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return warning; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return warning; });
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _color__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
@@ -2014,13 +2015,38 @@ var joinUrl = function joinUrl(_ref8) {
   // 如果前缀类型无效，直接返回URL
   return url;
 };
+/**
+ * 解析节点 style 里的 margin，返回左右水平总占用（px）
+ * 支持 marginLeft/marginRight 分项、'20px' 单值简写、'10px 20px' 两值简写
+ **/
+var getHorizontalMargin = function getHorizontalMargin(style) {
+  if (!style) return 0;
+  var toPx = function toPx(val) {
+    return val ? parseFloat(val) || 0 : 0;
+  };
+  //  驼峰（marginLeft）和连字符（margin-left）两种键名都兼容
+  var left = toPx(style.marginLeft || style['margin-left']);
+  var right = toPx(style.marginRight || style['margin-right']);
+  if (left || right) {
+    return left + right;
+  }
+  if (style.margin) {
+    var parts = String(style.margin).trim().split(/\s+/).map(toPx);
+    if (parts.length === 1) {
+      return parts[0] * 2;
+    }
+    if (parts.length >= 2) {
+      return parts[1] * 2;
+    }
+  }
+  return 0;
+};
+
 /**
  * layoutWaterfall
- * @desc 布布流布局计算
+ * @desc 瀑布流布局计算
  * @author huangbo
  * @date 2022年5月7日
- * @param {String} url - JS文件地址
- * @param {Function} [callback] - 回调函数
  **/
 var layoutWaterfall = function layoutWaterfall(self, container, pages, columns, gap) {
   if (!container) return;
@@ -2070,7 +2096,10 @@ var layoutWaterfall = function layoutWaterfall(self, container, pages, columns,
     // 计算元素宽度和位置
     var existingWidth = item.style && item.style.width ? parseInt(item.style.width, 10) : null;
     var hasSpan = item.style && item.style.span || item.span;
-    var calculatedWidth = columnWidth * span + gap * (span - 1);
+    //  margin 在盒模型之外也要占列槽，槽内可用宽度需扣除水平 margin，
+    //  保证 width + margin 刚好填满 span 个列槽（border-box 下 border 已含在 width 里）
+    var marginH = getHorizontalMargin(item.style);
+    var calculatedWidth = columnWidth * span + gap * (span - 1) - marginH;
     var useCustomWidth = !hasSpan && existingWidth;
     var elementWidth = useCustomWidth ? existingWidth : calculatedWidth;
 
@@ -4067,7 +4096,7 @@ var getColor = function getColor($color, $n) {
 var getLightness = function getLightness($v, $i, $isLight) {
   var $value = $isLight ? $v + $brightnessStep1 * $i : $v - $brightnessStep2 * $i;
   $value = $value < 1 ? $value : 1;
-  return Object(_util__WEBPACK_IMPORTED_MODULE_0__[/* toFixed */ "U"])($value, 2);
+  return Object(_util__WEBPACK_IMPORTED_MODULE_0__[/* toFixed */ "V"])($value, 2);
 };
 
 /**
@@ -4091,7 +4120,7 @@ var getSaturation = function getSaturation($s, $i, $isLight) {
     $saturation = 0.1;
   }
   $saturation = $saturation > 0.06 ? $saturation : 0.06;
-  return Object(_util__WEBPACK_IMPORTED_MODULE_0__[/* toFixed */ "U"])($saturation, 2);
+  return Object(_util__WEBPACK_IMPORTED_MODULE_0__[/* toFixed */ "V"])($saturation, 2);
 };
 
 /**
@@ -4457,7 +4486,14 @@ module.exports = require("lodash/get");
 
 /***/ }),
 
-/***/ 209:
+/***/ 21:
+/***/ (function(module, exports) {
+
+module.exports = require("lodash/set");
+
+/***/ }),
+
+/***/ 212:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4964,13 +5000,6 @@ phone_login.install = function (Vue) {
 
 /***/ }),
 
-/***/ 21:
-/***/ (function(module, exports) {
-
-module.exports = require("lodash/set");
-
-/***/ }),
-
 /***/ 22:
 /***/ (function(module, exports) {
 
@@ -4978,7 +5007,7 @@ module.exports = require("lodash/cloneDeep");
 
 /***/ }),
 
-/***/ 23:
+/***/ 24:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5037,7 +5066,7 @@ var doDecrypt = function doDecrypt(_ref2) {
 
 /***/ }),
 
-/***/ 24:
+/***/ 25:
 /***/ (function(module, exports) {
 
 module.exports = require("fetch-request-source");
@@ -5717,6 +5746,7 @@ module.exports = require("eoss/lib/message-box");
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ajax; });
 /* unused harmony export stream */
+/* unused harmony export initAuth */
 /* unused harmony export isLogined */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return getMainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return getSysCodeList; });
@@ -5729,11 +5759,11 @@ module.exports = require("eoss/lib/message-box");
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _sm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23);
+/* harmony import */ var _sm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(32);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var _storage__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
-/* harmony import */ var fetch_request_source__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(24);
+/* harmony import */ var fetch_request_source__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25);
 /* harmony import */ var fetch_request_source__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(fetch_request_source__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(0);
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(7);
@@ -5775,7 +5805,8 @@ var statusMap = {
 };
 
 // let loginMsg;
-var initAuth = void 0;
+var preAuth = void 0; // 二次鉴权定时器
+var loginExpired = false; // 登录失效提示锁，避免多个请求同时弹出提示
 
 var FatalError = function (_Error) {
   _inherits(FatalError, _Error);
@@ -5971,7 +6002,7 @@ var ajax = function ajax(_ref) {
             delete params[key];
           }
         }
-        url = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "X"])({ url: url, param: encodedParams });
+        url = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "Y"])({ url: url, param: encodedParams });
       }
     } else {
       params = {};
@@ -6250,6 +6281,10 @@ var stream = function stream(_ref2) {
 var responses = function responses(data) {
   // 处理登录过期或账号在别处登录的情况
   if ([64, 65, 67, 69].includes(data.rCode)) {
+    // 已经处理过，直接返回
+    if (loginExpired) return;
+    loginExpired = true;
+
     // 清除存储的认证信息
     Object(_storage__WEBPACK_IMPORTED_MODULE_4__[/* removeStorage */ "b"])(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
 
@@ -6261,12 +6296,12 @@ var responses = function responses(data) {
       href = window.location.href;
     }
 
-    // 检查是否已经在登录页面
+    // 不在登录页才弹提示
     if (href.indexOf('/login.html') === -1) {
-
       eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default.a.warning({
         message: data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!',
         onClose: function onClose() {
+          loginExpired = false; // 关闭提示后重置，允许下次触发
           try {
             redirectToLogin();
           } catch (error) {
@@ -6276,11 +6311,14 @@ var responses = function responses(data) {
           }
         }
       });
+    } else {
+      // 已在登录页，直接重置
+      loginExpired = false;
     }
   } else if (data.rCode === 61) {
     // 处理二次鉴权
-    clearTimeout(initAuth);
-    initAuth = setTimeout(function () {
+    clearTimeout(preAuth);
+    preAuth = setTimeout(function () {
       eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8___default()({
         title: '请进行二次鉴权',
         closeOnClickModal: false,
@@ -6322,7 +6360,7 @@ function redirectToLogin() {
 
   if (loginPage) {
     // 处理相对路径
-    if (!Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* startWith */ "R"])(loginPage, ['http', '/'], true)) {
+    if (!Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* startWith */ "S"])(loginPage, ['http', '/'], true)) {
       var pathname = '';
       try {
         pathname = window.top.location.pathname;
@@ -6347,6 +6385,75 @@ function redirectToLogin() {
   }
 }
 
+/**
+ * initAuth
+ * @desc: 初始化认证（在 main.js 中调用，认证完成后再挂载 Vue）
+ * 检查 URL 参数是否包含 serverId 和 authType，如果有则先完成认证
+ * @returns {Promise} 认证完成后 resolve
+ */
+function initAuth() {
+  var params = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* getParams */ "t"])();
+  var token = Object(_storage__WEBPACK_IMPORTED_MODULE_4__[/* getStorage */ "a"])('token') || Object(_storage__WEBPACK_IMPORTED_MODULE_4__[/* getStorage */ "a"])('Authorization');
+
+  // 已有 token 或没有认证参数，直接返回
+  if (token || !params.serverId || !params.authType) {
+    return Promise.resolve();
+  }
+
+  var loadingInstance = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* loading */ "L"])('页面加载中...');
+
+  return ajax({
+    method: 'post',
+    url: _config_api__WEBPACK_IMPORTED_MODULE_7__[/* authCenter */ "b"],
+    data: params
+  }).then(function (res) {
+    if (res.rCode === 0) {
+      // 保存认证信息
+      var results = res.results;
+      if (results.statusCode === 0) {
+        Object(_storage__WEBPACK_IMPORTED_MODULE_4__[/* setStorage */ "c"])({
+          key: {
+            ssId: results.ssId,
+            token: results.token,
+            Authorization: results.token,
+            deviceUnique: results.deviceUnique
+          }
+        });
+        // 清理 URL 参数并刷新
+        try {
+          var url = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* delUrlParam */ "j"])({
+            url: window.top.location.href,
+            key: ['serverId', 'authType', 'code', 'sessionId']
+          });
+          window.top.location.href = url;
+        } catch (e) {
+          var _url = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* delUrlParam */ "j"])({
+            url: window.location.href,
+            key: ['serverId', 'authType', 'code', 'sessionId']
+          });
+          window.location.href = _url;
+        }
+      } else if (results.statusCode === 3) {
+        // 跳转到授权URL
+        try {
+          var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(window.top.location.href));
+          window.top.location.href = href;
+        } catch (e) {
+          var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(window.location.href));
+          window.location.href = _href;
+        }
+      }
+    } else {
+      eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default.a.error(res.msg || '认证失败');
+    }
+  }).catch(function (error) {
+    console.error('认证中心请求失败:', error);
+    eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default.a.error('认证请求失败');
+  }).finally(function () {
+    loadingInstance.close();
+  });
+}
+
 /**
  * isLogined
  * @desc:是否登录（用于路由守卫中）
@@ -6372,7 +6479,7 @@ var isLogined = function isLogined(_ref3) {
 
   // 处理cookie参数
   if (cookie === undefined) {
-    cookie = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* getParams */ "s"])({ name: 'cookie' });
+    cookie = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* getParams */ "t"])({ name: 'cookie' });
   }
 
   // 处理登录页面路径
@@ -6387,7 +6494,7 @@ var isLogined = function isLogined(_ref3) {
     sessionStorage.setItem('loginPage', loginPage);
 
     // 处理相对路径
-    if (!Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* startWith */ "R"])(loginPage, ['http', '/'], true)) {
+    if (!Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* startWith */ "S"])(loginPage, ['http', '/'], true)) {
       if (pathname !== '/') {
         var pathParts = pathname.split('/');
         pathParts.splice(pathParts.length - 1);
@@ -6407,33 +6514,12 @@ var isLogined = function isLogined(_ref3) {
   if (token || cookie === true || cookie === '1') {
     next && next();
   } else {
-    // 处理服务器ID和认证类型参数
-    if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-
-      var loadingInstance = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* loading */ "K"])('页面加载中...');
-
-      try {
-        var res = ajax({
-          method: 'post',
-          url: _config_api__WEBPACK_IMPORTED_MODULE_7__[/* authCenter */ "b"],
-          data: to.query
-        });
-
-        if (res.rCode === 0) {
-          handleAuthCenterResponse(res.results, loginPage, next);
-        } else {
-          handleAuthError(res.msg, loginPage, next);
-        }
-      } catch (error) {
-        console.error('认证中心请求失败:', error);
-      } finally {
-        loadingInstance.close();
-      }
-    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    // 认证已在 main.js 的 initAuth 中完成，这里只检查登录状态
+    if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
 
       // 处理重定向
       if (redirect && (to.path === '/main' || to.path === '/login')) {
-        window.location.replace(Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "X"])({ url: '.' + to.path + '.html', param: to.query }));
+        window.location.replace(Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "Y"])({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }
@@ -6450,83 +6536,6 @@ var isLogined = function isLogined(_ref3) {
   }
 };
 
-/**
- * 处理认证中心响应
- * @param {Object} results - 认证结果
- * @param {String} loginPage - 登录页面地址
- * @param {Function} next - 路由跳转函数
- */
-function handleAuthCenterResponse(results, loginPage, next) {
-  switch (results.statusCode) {
-    case 0:
-      // 设置认证信息
-      Object(_storage__WEBPACK_IMPORTED_MODULE_4__[/* setStorage */ "c"])({
-        key: {
-          ssId: results.ssId,
-          token: results.token,
-          Authorization: results.token,
-          deviceUnique: results.deviceUnique
-        }
-      });
-
-      // 重定向到清理参数后的URL
-      try {
-        var url = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* delUrlParam */ "j"])({
-          url: window.top.location.href,
-          key: ['serverId', 'authType', 'code', 'sessionId']
-        });
-        window.top.location.href = url;
-        setTimeout(function () {
-          window.top.location.reload();
-        }, 200);
-      } catch (error) {
-        var _url = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* delUrlParam */ "j"])({
-          url: window.location.href,
-          key: ['serverId', 'authType', 'code', 'sessionId']
-        });
-        window.location.href = _url;
-        setTimeout(function () {
-          window.location.reload();
-        }, 200);
-      }
-      break;
-    case 3:
-      // 跳转到授权URL
-      try {
-        var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(window.top.location.href));
-        window.top.location.href = href;
-      } catch (error) {
-        var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(window.location.href));
-        window.location.href = _href;
-      }
-      break;
-    case 4:
-      // 账号未绑定
-      eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default.a.error({
-        message: results.msg || '账号未绑定，账号密码登录后自动绑定！',
-        onClose: function onClose() {
-          sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-          redirectToLoginPage(loginPage, next);
-        } });
-      break;
-  }
-}
-
-/**
- * 处理认证错误
- * @param {String} message - 错误消息
- * @param {String} loginPage - 登录页面地址
- * @param {Function} next - 路由跳转函数
- */
-function handleAuthError(message, loginPage, next) {
-  eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default.a.error({
-    message: message,
-    onClose: function onClose() {
-      redirectToLoginPage(loginPage, next);
-    }
-  });
-}
-
 /**
  * 重定向到登录页面（带错误处理）
  * @param {String} loginPage - 登录页面地址
@@ -6713,7 +6722,7 @@ var downloadFile = function downloadFile(_ref6) {
 
     // 拼接URL参数
     if (Object.keys(params).length > 0) {
-      downloadUrl = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "X"])({ url: downloadUrl, param: params });
+      downloadUrl = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "Y"])({ url: downloadUrl, param: params });
     }
   } else if (file.raw) {
     downloadUrl = URL.createObjectURL(file.raw);
@@ -6775,7 +6784,7 @@ var downloadZip = function downloadZip(_ref7) {
 
   // 拼接URL参数
   if (Object.keys(params).length > 0) {
-    downloadUrl = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "X"])({ url: downloadUrl, param: params });
+    downloadUrl = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* urlJoinParams */ "Y"])({ url: downloadUrl, param: params });
   }
 
   // 创建a标签
@@ -6880,7 +6889,7 @@ var getTableData = function getTableData(_ref9) {
       onSuccess = _ref9.onSuccess,
       onError = _ref9.onError;
 
-  var loadingInstance = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* loading */ "K"])('数据加载中...');
+  var loadingInstance = Object(_util__WEBPACK_IMPORTED_MODULE_6__[/* loading */ "L"])('数据加载中...');
   return new Promise(function (resolve, reject) {
     ajax({
       method: method,

package/lib/popconfirm.js

@@ -82,19 +82,19 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 210);
+/******/ 	return __webpack_require__(__webpack_require__.s = 213);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 114:
+/***/ 117:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/popover");
 
 /***/ }),
 
-/***/ 210:
+/***/ 213:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -175,7 +175,7 @@ render._withStripped = true
 // CONCATENATED MODULE: ./packages/popconfirm/src/popconfirm.vue?vue&type=template&id=bbac4d5c&
 
 // EXTERNAL MODULE: external "eoss/lib/popover"
-var popover_ = __webpack_require__(114);
+var popover_ = __webpack_require__(117);
 var popover_default = /*#__PURE__*/__webpack_require__.n(popover_);
 
 // EXTERNAL MODULE: external "eoss/lib/button"