eoss-ui 0.7.23 → 0.7.25

package/lib/input-number.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq
@@ -3451,6 +3454,9 @@ var getStorage = function getStorage(key) {
     if (key === 'host' && !res) {
       return win.location.origin;
     }
+    if (!res && key === 'token') {
+      res = getCookie('token');
+    }
     return res;
   }
   var defaults = {};
@@ -3504,11 +3510,48 @@ var removeStorage = function removeStorage(key) {
  * @desc 设置cookie
  * @author huangbo
  * @param {string} [name] cookie名称
- * @return {string} [value] cookie值
+ * @param {string} [value] cookie值
+ * @param {boolean} [isSession] 是否是会话cookie
  **/
 var setCookie = function setCookie(name, value) {
-  // 不设置 expires 或 max-age，默认为会话 Cookie
-  document.cookie = encodeURIComponent(name) + '=' + encodeURIComponent(value) + '; path=/';
+  var isSession = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var time = arguments[3];
+
+  var isIE = /MSIE|Trident/.test(navigator.userAgent);
+  try {
+    var cookieParts = [encodeURIComponent(name) + '=' + encodeURIComponent(value), 'path=/' // 仅保留path设置，确保全站访问
+    ];
+    // 会话/持久Cookie设置
+    if (!isSession) {
+      if (isIE) {
+        // IE使用expires
+        var date = new Date();
+        date.setTime(date.getTime() + (time || 7 * 24 * 60 * 60 * 1000));
+        cookieParts.push('expires=' + date.toUTCString());
+      } else {
+        // 其他浏览器使用max-age
+        cookieParts.push('max-age=' + (time || 7 * 24 * 60 * 60));
+      }
+    }
+    // 内核兼容处理
+    if (isIE) {
+      // IE特殊处理：添加P3P协议头
+      cookieParts.push('P3P=CP="CURa ADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSP COR"');
+    } else {
+      // 现代浏览器设置
+      cookieParts.push('samesite=lax');
+      if (window.location.protocol === 'https:') {
+        cookieParts.push('secure');
+      }
+    }
+
+    // 设置Cookie
+    document.cookie = cookieParts.join('; ');
+    return true;
+  } catch (e) {
+    console.error('Cookie设置失败:', e);
+    return false;
+  }
 };
 
 /**

package/lib/input.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq
@@ -3451,6 +3454,9 @@ var getStorage = function getStorage(key) {
     if (key === 'host' && !res) {
       return win.location.origin;
     }
+    if (!res && key === 'token') {
+      res = getCookie('token');
+    }
     return res;
   }
   var defaults = {};
@@ -3504,11 +3510,48 @@ var removeStorage = function removeStorage(key) {
  * @desc 设置cookie
  * @author huangbo
  * @param {string} [name] cookie名称
- * @return {string} [value] cookie值
+ * @param {string} [value] cookie值
+ * @param {boolean} [isSession] 是否是会话cookie
  **/
 var setCookie = function setCookie(name, value) {
-  // 不设置 expires 或 max-age，默认为会话 Cookie
-  document.cookie = encodeURIComponent(name) + '=' + encodeURIComponent(value) + '; path=/';
+  var isSession = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var time = arguments[3];
+
+  var isIE = /MSIE|Trident/.test(navigator.userAgent);
+  try {
+    var cookieParts = [encodeURIComponent(name) + '=' + encodeURIComponent(value), 'path=/' // 仅保留path设置，确保全站访问
+    ];
+    // 会话/持久Cookie设置
+    if (!isSession) {
+      if (isIE) {
+        // IE使用expires
+        var date = new Date();
+        date.setTime(date.getTime() + (time || 7 * 24 * 60 * 60 * 1000));
+        cookieParts.push('expires=' + date.toUTCString());
+      } else {
+        // 其他浏览器使用max-age
+        cookieParts.push('max-age=' + (time || 7 * 24 * 60 * 60));
+      }
+    }
+    // 内核兼容处理
+    if (isIE) {
+      // IE特殊处理：添加P3P协议头
+      cookieParts.push('P3P=CP="CURa ADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSP COR"');
+    } else {
+      // 现代浏览器设置
+      cookieParts.push('samesite=lax');
+      if (window.location.protocol === 'https:') {
+        cookieParts.push('secure');
+      }
+    }
+
+    // 设置Cookie
+    document.cookie = cookieParts.join('; ');
+    return true;
+  } catch (e) {
+    console.error('Cookie设置失败:', e);
+    return false;
+  }
 };
 
 /**

package/lib/login.js

@@ -2286,7 +2286,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq
@@ -3450,6 +3453,9 @@ var getStorage = function getStorage(key) {
     if (key === 'host' && !res) {
       return win.location.origin;
     }
+    if (!res && key === 'token') {
+      res = getCookie('token');
+    }
     return res;
   }
   var defaults = {};
@@ -3503,11 +3509,48 @@ var removeStorage = function removeStorage(key) {
  * @desc 设置cookie
  * @author huangbo
  * @param {string} [name] cookie名称
- * @return {string} [value] cookie值
+ * @param {string} [value] cookie值
+ * @param {boolean} [isSession] 是否是会话cookie
  **/
 var setCookie = function setCookie(name, value) {
-  // 不设置 expires 或 max-age，默认为会话 Cookie
-  document.cookie = encodeURIComponent(name) + '=' + encodeURIComponent(value) + '; path=/';
+  var isSession = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var time = arguments[3];
+
+  var isIE = /MSIE|Trident/.test(navigator.userAgent);
+  try {
+    var cookieParts = [encodeURIComponent(name) + '=' + encodeURIComponent(value), 'path=/' // 仅保留path设置，确保全站访问
+    ];
+    // 会话/持久Cookie设置
+    if (!isSession) {
+      if (isIE) {
+        // IE使用expires
+        var date = new Date();
+        date.setTime(date.getTime() + (time || 7 * 24 * 60 * 60 * 1000));
+        cookieParts.push('expires=' + date.toUTCString());
+      } else {
+        // 其他浏览器使用max-age
+        cookieParts.push('max-age=' + (time || 7 * 24 * 60 * 60));
+      }
+    }
+    // 内核兼容处理
+    if (isIE) {
+      // IE特殊处理：添加P3P协议头
+      cookieParts.push('P3P=CP="CURa ADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSP COR"');
+    } else {
+      // 现代浏览器设置
+      cookieParts.push('samesite=lax');
+      if (window.location.protocol === 'https:') {
+        cookieParts.push('secure');
+      }
+    }
+
+    // 设置Cookie
+    document.cookie = cookieParts.join('; ');
+    return true;
+  } catch (e) {
+    console.error('Cookie设置失败:', e);
+    return false;
+  }
 };
 
 /**
@@ -4476,7 +4519,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=3be2e7f1&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=710e2bf9&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5770,7 +5813,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=3be2e7f1&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=710e2bf9&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -6884,7 +6927,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 
 
-var ceshi = util["a" /* default */].getParams('ceshi');
+var mainvue_type_script_lang_js_params = util["a" /* default */].getParams();
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsLogin',
@@ -6893,6 +6936,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
     resetPassword: resetPassword
   },
   props: {
+    ceshi: String,
     //初始登录配置接口地址
     initLogin: {
       type: String,
@@ -7219,6 +7263,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
     },
     showForget: function showForget() {
       return this.forgetUrl && typeof this.forgetUrl === 'string' ? true : this.forgetUrl === true && this.loginModel.indexOf('0') > -1;
+    },
+    isCeshi: function isCeshi() {
+      return this.ceshi ? mainvue_type_script_lang_js_params[this.ceshi] : false;
     }
   },
   watch: {
@@ -7357,7 +7404,8 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       launchTime: 2000,
       switchActive: this.switchsActive,
       loginDownloadApp: this.loginDownloadApps,
-      installPath: this.caInstallPath
+      installPath: this.caInstallPath,
+      storageType: this.storage
     };
   },
   beforeCreate: function beforeCreate() {
@@ -7368,8 +7416,8 @@ var ceshi = util["a" /* default */].getParams('ceshi');
   },
   created: function created() {
     this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
-    if (ceshi) {
-      this.loginModel = ceshi == 'true' || ceshi == true ? '0' : ceshi;
+    if (this.isCeshi) {
+      this.loginModel = this.isCeshi == 'true' || this.isCeshi == true ? '0' : this.isCeshi;
     }
     if (this.isScale || util["a" /* default */].getParams('scale')) {
       util["a" /* default */].setScale();
@@ -7683,7 +7731,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         document.title = res.subsystemName;
       }
       this.app = res.appName || res.subsystemName;
-      if (res.loginModel && !ceshi) {
+      if (res.loginModel && !this.isCeshi) {
         this.loginModel = (res.firstLoginModel || this.firstLoginModel) && !isLogined ? res.firstLoginModel || this.firstLoginModel : res.loginModel;
       }
 
@@ -7777,6 +7825,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         if (res.subsystemExtend.caInstallPath) {
           this.installPath = res.subsystemExtend.caInstallPath;
         }
+        if (res.subsystemExtend.storageType) {
+          this.storageType = res.subsystemExtend.storageType;
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;
@@ -8072,7 +8123,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         case 0:
           this.userName = results.userName;
           util["a" /* default */].setStorage({
-            type: this.storage,
+            type: this.storageType,
             key: {
               ssId: results.ssId,
               token: results.token,