eoss-ui 0.7.22 → 0.7.24

package/lib/wujie.js

@@ -243,16 +243,17 @@ var ajax = function ajax(_ref) {
     http.interceptors.response.use(function (response) {
       // delPendingRequest(response.config);
       loading && loading.close();
-      if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-        setStorage({
+      if (response.headers.authorization) {
+        response.headers.authorization !== getStorage('token') && setStorage({
+
           key: ['token', 'Authorization'],
           value: response.headers.authorization
         });
       }
       var ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
 
-      if (ssId && ssId !== getStorage('ssId')) {
-        setStorage({
+      if (ssId) {
+        ssId !== getStorage('ssId') && setStorage({
           key: 'ssId',
           value: ssId
         });
@@ -3450,6 +3451,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 +3507,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/wxlogin.js

@@ -243,16 +243,17 @@ var ajax = function ajax(_ref) {
     http.interceptors.response.use(function (response) {
       // delPendingRequest(response.config);
       loading && loading.close();
-      if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-        setStorage({
+      if (response.headers.authorization) {
+        response.headers.authorization !== getStorage('token') && setStorage({
+
           key: ['token', 'Authorization'],
           value: response.headers.authorization
         });
       }
       var ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
 
-      if (ssId && ssId !== getStorage('ssId')) {
-        setStorage({
+      if (ssId) {
+        ssId !== getStorage('ssId') && setStorage({
           key: 'ssId',
           value: ssId
         });
@@ -3450,6 +3451,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 +3507,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/package.json

@@ -1,160 +1,160 @@
-{
-  "name": "eoss-ui",
-  "version": "0.7.22",
-  "description": "eoss内部业务组件",
-  "main": "lib/eoss-ui.common.js",
-  "files": [
-    "lib",
-    "src",
-    "packages",
-    "types"
-  ],
-  "scripts": {
-    "bootstrap": "yarn || npm i",
-    "build:file": "node build/bin/iconInit.js & node build/bin/build-entry.js",
-    "build:theme": "node build/bin/gen-cssfile && gulp build --gulpfile packages/theme-chalk/gulpfile.js && cp-cli packages/theme-chalk/lib lib/theme-chalk",
-    "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js",
-    "clean": "rimraf lib && rimraf packages/*/lib && rimraf test/**/coverage",
-    "deploy:build": "npm run build:file && cross-env NODE_ENV=production webpack --config build/webpack.demo.js",
-    "deploy:extension": "cross-env NODE_ENV=production webpack --config build/webpack.extension.js",
-    "dev:extension": "rimraf examples/extension/dist && cross-env NODE_ENV=development webpack --watch --config build/webpack.extension.js",
-    "dev": "npm run bootstrap && npm run build:file && cross-env NODE_ENV=development webpack-dev-server --config build/webpack.demo.js & node build/bin/template.js",
-    "dev:play": "npm run build:file && cross-env NODE_ENV=development PLAY_ENV=true webpack-dev-server --config build/webpack.demo.js",
-    "dist": "npm run clean && npm run build:file && npm run lint && webpack --config build/webpack.conf.js && webpack --config build/webpack.common.js && webpack --config build/webpack.component.js && npm run build:utils && npm run build:theme",
-    "lint": "eslint src/**/* test/**/* packages/**/* build/**/* --quiet",
-    "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh && node build/bin/gen-indices.js && sh build/deploy-faas.sh",
-    "test": "npm run lint && npm run build:theme && cross-env CI_ENV=/dev/ BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
-    "test:watch": "npm run build:theme && cross-env BABEL_ENV=test karma start test/unit/karma.conf.js"
-  },
-  "faas": [
-    {
-      "domain": "eoss",
-      "public": "temp_web/eoss"
-    },
-    {
-      "domain": "eoss-theme",
-      "public": "examples/eoss-ui",
-      "build": [
-        "yarn",
-        "npm run deploy:build"
-      ]
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git@http://git.wisesoft.net.cn/eoss-ui/eoss-ui.git"
-  },
-  "keywords": [
-    "eoss",
-    "vue",
-    "components"
-  ],
-  "license": "MIT",
-  "unpkg": "lib/index.js",
-  "style": "lib/theme-chalk/index.css",
-  "dependencies": {
-    "@interactjs/feedback": "^1.10.3",
-    "axios": "^0.27.2",
-    "interactjs": "^1.10.26",
-    "js-base64": "^3.7.5",
-    "json-bigint": "^1.0.0",
-    "lodash": "^4.17.21",
-    "net": "^1.0.2",
-    "qrcode": "1.5.3",
-    "qs": "^6.11.2",
-    "runtime-import": "^2.2.1",
-    "slate": "^0.100.0",
-    "slate-history": "^0.100.0",
-    "sm-crypto": "^0.3.11",
-    "sockjs-client": "^1.6.1",
-    "stompjs": "^2.3.3",
-    "throttle-debounce": "^5.0.2",
-    "ua-parser-js": "^2.0.3",
-    "video.js": "^8.0.4",
-    "wujie-vue2": "^1.0.29"
-  },
-  "peerDependencies": {
-    "vue": "^2.5.22"
-  },
-  "devDependencies": {
-    "@vue/component-compiler-utils": "^3.3.0",
-    "algoliasearch": "^3.24.5",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.5",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-istanbul": "^4.1.1",
-    "babel-plugin-module-resolver": "^2.2.0",
-    "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-plugin-transform-remove-strict-mode": "^0.0.2",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-plugin-transform-vue-jsx": "^3.7.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-stage-2": "^6.24.1",
-    "babel-regenerator-runtime": "^6.5.0",
-    "chai": "^4.2.0",
-    "chokidar": "^1.7.0",
-    "copy-webpack-plugin": "^5.0.0",
-    "coveralls": "^3.0.3",
-    "cp-cli": "^1.0.2",
-    "cross-env": "^3.1.3",
-    "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.60",
-    "es6-promise": "^4.0.5",
-    "eslint": "4.18.2",
-    "eslint-config-elemefe": "0.1.1",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-loader": "^2.0.0",
-    "eslint-plugin-html": "^4.0.1",
-    "eslint-plugin-json": "^1.2.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^7.14.0",
-    "file-loader": "^1.1.11",
-    "file-save": "^0.2.0",
-    "gulp": "^4.0.0",
-    "gulp-autoprefixer": "^6.0.0",
-    "gulp-cssmin": "^0.2.0",
-    "gulp-sass": "^4.0.2",
-    "highlight.js": "^11.9.0",
-    "html-webpack-plugin": "^3.2.0",
-    "json-loader": "^0.5.7",
-    "json-templater": "^1.0.4",
-    "karma": "^4.0.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.2",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^2.0.2",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "^0.0.32",
-    "karma-webpack": "^3.0.5",
-    "markdown-it": "^8.4.1",
-    "markdown-it-anchor": "^5.0.2",
-    "markdown-it-chain": "^1.3.0",
-    "markdown-it-container": "^2.0.0",
-    "mini-css-extract-plugin": "^0.4.1",
-    "mocha": "^6.0.2",
-    "node-sass": "^4.11.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "postcss": "^7.0.14",
-    "progress-bar-webpack-plugin": "^1.11.0",
-    "rimraf": "^2.5.4",
-    "sass-loader": "^7.1.0",
-    "select-version-cli": "^0.0.2",
-    "sinon": "^7.2.7",
-    "sinon-chai": "^3.3.0",
-    "style-loader": "^0.23.1",
-    "transliteration": "^1.1.11",
-    "uglifyjs-webpack-plugin": "1",
-    "uppercamelcase": "^1.1.0",
-    "url-loader": "^1.0.1",
-    "vue": "2.5.22",
-    "vue-loader": "15.10.2",
-    "vue-router": "^3.6.4",
-    "vue-template-compiler": "2.5.22",
-    "vue-template-es2015-compiler": "^1.6.0",
-    "webpack": "^4.14.0",
-    "webpack-cli": "^3.0.8",
-    "webpack-dev-server": "^3.1.11",
-    "webpack-node-externals": "^1.7.2"
-  }
-}
+{
+  "name": "eoss-ui",
+  "version": "0.7.24",
+  "description": "eoss内部业务组件",
+  "main": "lib/eoss-ui.common.js",
+  "files": [
+    "lib",
+    "src",
+    "packages",
+    "types"
+  ],
+  "scripts": {
+    "bootstrap": "yarn || npm i",
+    "build:file": "node build/bin/iconInit.js & node build/bin/build-entry.js",
+    "build:theme": "node build/bin/gen-cssfile && gulp build --gulpfile packages/theme-chalk/gulpfile.js && cp-cli packages/theme-chalk/lib lib/theme-chalk",
+    "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js",
+    "clean": "rimraf lib && rimraf packages/*/lib && rimraf test/**/coverage",
+    "deploy:build": "npm run build:file && cross-env NODE_ENV=production webpack --config build/webpack.demo.js",
+    "deploy:extension": "cross-env NODE_ENV=production webpack --config build/webpack.extension.js",
+    "dev:extension": "rimraf examples/extension/dist && cross-env NODE_ENV=development webpack --watch --config build/webpack.extension.js",
+    "dev": "npm run bootstrap && npm run build:file && cross-env NODE_ENV=development webpack-dev-server --config build/webpack.demo.js & node build/bin/template.js",
+    "dev:play": "npm run build:file && cross-env NODE_ENV=development PLAY_ENV=true webpack-dev-server --config build/webpack.demo.js",
+    "dist": "npm run clean && npm run build:file && npm run lint && webpack --config build/webpack.conf.js && webpack --config build/webpack.common.js && webpack --config build/webpack.component.js && npm run build:utils && npm run build:theme",
+    "lint": "eslint src/**/* test/**/* packages/**/* build/**/* --quiet",
+    "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh && node build/bin/gen-indices.js && sh build/deploy-faas.sh",
+    "test": "npm run lint && npm run build:theme && cross-env CI_ENV=/dev/ BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
+    "test:watch": "npm run build:theme && cross-env BABEL_ENV=test karma start test/unit/karma.conf.js"
+  },
+  "faas": [
+    {
+      "domain": "eoss",
+      "public": "temp_web/eoss"
+    },
+    {
+      "domain": "eoss-theme",
+      "public": "examples/eoss-ui",
+      "build": [
+        "yarn",
+        "npm run deploy:build"
+      ]
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git@http://git.wisesoft.net.cn/eoss-ui/eoss-ui.git"
+  },
+  "keywords": [
+    "eoss",
+    "vue",
+    "components"
+  ],
+  "license": "MIT",
+  "unpkg": "lib/index.js",
+  "style": "lib/theme-chalk/index.css",
+  "dependencies": {
+    "@interactjs/feedback": "^1.10.3",
+    "axios": "^0.27.2",
+    "interactjs": "^1.10.26",
+    "js-base64": "^3.7.5",
+    "json-bigint": "^1.0.0",
+    "lodash": "^4.17.21",
+    "net": "^1.0.2",
+    "qrcode": "1.5.3",
+    "qs": "^6.11.2",
+    "runtime-import": "^2.2.1",
+    "slate": "^0.100.0",
+    "slate-history": "^0.100.0",
+    "sm-crypto": "^0.3.11",
+    "sockjs-client": "^1.6.1",
+    "stompjs": "^2.3.3",
+    "throttle-debounce": "^5.0.2",
+    "ua-parser-js": "^2.0.3",
+    "video.js": "^8.0.4",
+    "wujie-vue2": "^1.0.29"
+  },
+  "peerDependencies": {
+    "vue": "^2.5.22"
+  },
+  "devDependencies": {
+    "@vue/component-compiler-utils": "^3.3.0",
+    "algoliasearch": "^3.24.5",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-istanbul": "^4.1.1",
+    "babel-plugin-module-resolver": "^2.2.0",
+    "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-plugin-transform-remove-strict-mode": "^0.0.2",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-plugin-transform-vue-jsx": "^3.7.0",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-stage-2": "^6.24.1",
+    "babel-regenerator-runtime": "^6.5.0",
+    "chai": "^4.2.0",
+    "chokidar": "^1.7.0",
+    "copy-webpack-plugin": "^5.0.0",
+    "coveralls": "^3.0.3",
+    "cp-cli": "^1.0.2",
+    "cross-env": "^3.1.3",
+    "css-loader": "^2.1.0",
+    "eoss-element": "^0.3.61",
+    "es6-promise": "^4.0.5",
+    "eslint": "4.18.2",
+    "eslint-config-elemefe": "0.1.1",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-loader": "^2.0.0",
+    "eslint-plugin-html": "^4.0.1",
+    "eslint-plugin-json": "^1.2.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^7.14.0",
+    "file-loader": "^1.1.11",
+    "file-save": "^0.2.0",
+    "gulp": "^4.0.0",
+    "gulp-autoprefixer": "^6.0.0",
+    "gulp-cssmin": "^0.2.0",
+    "gulp-sass": "^4.0.2",
+    "highlight.js": "^11.9.0",
+    "html-webpack-plugin": "^3.2.0",
+    "json-loader": "^0.5.7",
+    "json-templater": "^1.0.4",
+    "karma": "^4.0.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.2",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^2.0.2",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "^0.0.32",
+    "karma-webpack": "^3.0.5",
+    "markdown-it": "^8.4.1",
+    "markdown-it-anchor": "^5.0.2",
+    "markdown-it-chain": "^1.3.0",
+    "markdown-it-container": "^2.0.0",
+    "mini-css-extract-plugin": "^0.4.1",
+    "mocha": "^6.0.2",
+    "node-sass": "^4.11.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
+    "postcss": "^7.0.14",
+    "progress-bar-webpack-plugin": "^1.11.0",
+    "rimraf": "^2.5.4",
+    "sass-loader": "^7.1.0",
+    "select-version-cli": "^0.0.2",
+    "sinon": "^7.2.7",
+    "sinon-chai": "^3.3.0",
+    "style-loader": "^0.23.1",
+    "transliteration": "^1.1.11",
+    "uglifyjs-webpack-plugin": "1",
+    "uppercamelcase": "^1.1.0",
+    "url-loader": "^1.0.1",
+    "vue": "2.5.22",
+    "vue-loader": "15.10.2",
+    "vue-router": "^3.6.4",
+    "vue-template-compiler": "2.5.22",
+    "vue-template-es2015-compiler": "^1.6.0",
+    "webpack": "^4.14.0",
+    "webpack-cli": "^3.0.8",
+    "webpack-dev-server": "^3.1.11",
+    "webpack-node-externals": "^1.7.2"
+  }
+}