eoss-ui 0.7.23 → 0.7.25

package/lib/button-group.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;
+  }
 };
 
 /**

package/lib/button.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;
+  }
 };
 
 /**