ls-pro-common 1.0.60 → 1.0.62

package/es/hooks/useDtl/index.js

@@ -1010,7 +1010,7 @@ function useDtl(dtlParam) {
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;
     });
-  }, [selectedRows]);
+  }, [selectedRows, auditStatus, statusField, masterObject]);
   return {
     formRef: formRef,
     tableRef: tableRef,

package/es/http/index.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl, reLogin } from '../utils'; //默认超时时间为1分钟
+import { getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, toGatewayUrl, reLogin } from '../utils'; //默认超时时间为1分钟
 
 var request = extend({
   timeout: 60000
@@ -10,11 +10,11 @@ var request = extend({
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
-  var token = getCache("token");
+  var token = getCookie("token");
 
   var opts = _objectSpread({}, options);
 
-  if (token) {
+  if (token && url.indexOf('noToken=1') === -1) {
     Object.assign(opts, {
       headers: {
         token: token
@@ -22,6 +22,7 @@ request.interceptors.request.use(function (url, options) {
     });
   }
 
+  url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
   var param = {
     resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()

package/es/utils/index.d.ts

@@ -66,7 +66,7 @@ export declare const getCookie: (name: string) => string | null;
  * @param {*} value  Cookie 值
  * @param { Number } day 有效天数 默认1天,
  */
-export declare const setCookie: (key: string, value: string | number, day?: number) => void;
+export declare const setCookie: (key: string, value: string | number, day?: number, sameSite?: boolean) => void;
 /**
  * 判断是否登录
  * @returns
@@ -86,6 +86,12 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @returns 关键字对应的值
  */
 export declare const getCache: (key: string, session?: boolean) => string | null;
+/**
+ *
+ * @param key 关键字，不传清除所有
+ * @param session 是否session storage , 默认 localStorage
+ */
+export declare const clearCache: (key?: string | undefined, session?: boolean) => void;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */

package/es/utils/index.js

@@ -145,12 +145,22 @@ export var getCookie = function getCookie(name) {
 
 export var setCookie = function setCookie(key, value) {
   var day = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var sameSite = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
   if (day !== 0) {
     var d = new Date(Date.now() + day * 24 * 60 * 60 * 1000);
-    document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/");
+
+    if (sameSite) {
+      document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/;sameSite=None;secure=true");
+    } else {
+      document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/");
+    }
   } else {
-    document.cookie = key + "=" + value + ";path=/";
+    if (sameSite) {
+      document.cookie = key + "=" + value + ";path=/;sameSite=None;secure=true";
+    } else {
+      document.cookie = key + "=" + value + ";path=/";
+    }
   }
 };
 /**
@@ -194,6 +204,21 @@ export var getCache = function getCache(key) {
 
   return data;
 };
+/**
+ *
+ * @param key 关键字，不传清除所有
+ * @param session 是否session storage , 默认 localStorage
+ */
+
+export var clearCache = function clearCache(key) {
+  var session = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+  if (key) {
+    session ? sessionStorage.removeItem(key) : localStorage.removeItem(key);
+  } else {
+    session ? sessionStorage.clear() : localStorage.clear();
+  }
+};
 /** @name 显示错误 */
 
 export var showError = function showError(text) {
@@ -245,7 +270,7 @@ export var reLogin = function reLogin() {
     maskClosable: false,
     afterClose: function afterClose() {
       timeout = false;
-      location.href = '/login?redirect=' + encodeURI(location.href);
+      location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURI(location.href);
     }
   });
 };

package/lib/hooks/useDtl/index.js

@@ -1032,7 +1032,7 @@ function useDtl(dtlParam) {
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;
     });
-  }, [selectedRows]);
+  }, [selectedRows, auditStatus, statusField, masterObject]);
   return {
     formRef: formRef,
     tableRef: tableRef,

package/lib/http/index.js

@@ -30,10 +30,10 @@ var request = (0, _umiRequest.extend)({
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
-  var token = (0, _utils.getCache)("token");
+  var token = (0, _utils.getCookie)("token");
   var opts = (0, _objectSpread2.default)({}, options);
 
-  if (token) {
+  if (token && url.indexOf('noToken=1') === -1) {
     Object.assign(opts, {
       headers: {
         token: token
@@ -41,6 +41,7 @@ request.interceptors.request.use(function (url, options) {
     });
   }
 
+  url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
   var param = {
     resCode: (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId'),
     _t1: Date.now()

package/lib/utils/index.d.ts

@@ -66,7 +66,7 @@ export declare const getCookie: (name: string) => string | null;
  * @param {*} value  Cookie 值
  * @param { Number } day 有效天数 默认1天,
  */
-export declare const setCookie: (key: string, value: string | number, day?: number) => void;
+export declare const setCookie: (key: string, value: string | number, day?: number, sameSite?: boolean) => void;
 /**
  * 判断是否登录
  * @returns
@@ -86,6 +86,12 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @returns 关键字对应的值
  */
 export declare const getCache: (key: string, session?: boolean) => string | null;
+/**
+ *
+ * @param key 关键字，不传清除所有
+ * @param session 是否session storage , 默认 localStorage
+ */
+export declare const clearCache: (key?: string | undefined, session?: boolean) => void;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */

package/lib/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.dateAdd = exports.appPath = void 0;
+exports.dateAdd = exports.clearCache = exports.appPath = void 0;
 Object.defineProperty(exports, "dateFormat", {
   enumerable: true,
   get: function get() {
@@ -220,12 +220,22 @@ exports.getCookie = getCookie;
 
 var setCookie = function setCookie(key, value) {
   var day = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var sameSite = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
   if (day !== 0) {
     var d = new Date(Date.now() + day * 24 * 60 * 60 * 1000);
-    document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/");
+
+    if (sameSite) {
+      document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/;sameSite=None;secure=true");
+    } else {
+      document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/");
+    }
   } else {
-    document.cookie = key + "=" + value + ";path=/";
+    if (sameSite) {
+      document.cookie = key + "=" + value + ";path=/;sameSite=None;secure=true";
+    } else {
+      document.cookie = key + "=" + value + ";path=/";
+    }
   }
 };
 /**
@@ -278,11 +288,29 @@ var getCache = function getCache(key) {
 
   return data;
 };
-/** @name 显示错误 */
+/**
+ *
+ * @param key 关键字，不传清除所有
+ * @param session 是否session storage , 默认 localStorage
+ */
 
 
 exports.getCache = getCache;
 
+var clearCache = function clearCache(key) {
+  var session = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+  if (key) {
+    session ? sessionStorage.removeItem(key) : localStorage.removeItem(key);
+  } else {
+    session ? sessionStorage.clear() : localStorage.clear();
+  }
+};
+/** @name 显示错误 */
+
+
+exports.clearCache = clearCache;
+
 var showError = function showError(text) {
   _message2.default.error(text);
 };
@@ -343,7 +371,7 @@ var reLogin = function reLogin() {
     maskClosable: false,
     afterClose: function afterClose() {
       timeout = false;
-      location.href = '/login?redirect=' + encodeURI(location.href);
+      location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURI(location.href);
     }
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.44",
+    "ls-pro-table": "2.62.45",
     "ls-pro-form": "1.52.29",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",