ls-pro-common 1.0.59 → 1.0.61

package/lib/hooks/useSingle/index.js

@@ -46,7 +46,13 @@ var _excluded = ["current", "pageSize"];
 function useSingle(inParam) {
   var _usePermission = (0, _usePermission2.default)(),
       resourceId = _usePermission.resourceId,
-      checkRight = _usePermission.checkRight;
+      checkRight = _usePermission.checkRight,
+      canAdd = _usePermission.canAdd,
+      canEdit = _usePermission.canEdit,
+      canDelete = _usePermission.canDelete,
+      canAudit = _usePermission.canAudit,
+      canImport = _usePermission.canImport,
+      canExport = _usePermission.canExport;
 
   var service = inParam.service,
       toolConfig = inParam.toolConfig,
@@ -733,21 +739,21 @@ function useSingle(inParam) {
   }, [auditStatus, statusField, selectedRows]); // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
 
   var tableTools = (0, _react.useMemo)(function () {
-    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && checkRight(2) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && canAdd ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "add",
       onClick: function onClick() {
         return onAdd(null);
       },
       disabled: btnDisabled('add'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, null)
-    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && canEdit ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
       disabled: btnDisabled('edit'),
       onClick: function onClick() {
         return onEdit(null);
       },
       icon: /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)
-    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && (checkRight(8) || checkRight(32)) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && canDelete ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "remove",
       onClick: function onClick() {
         return onRemove(null);
@@ -755,14 +761,14 @@ function useSingle(inParam) {
       danger: true,
       disabled: btnDisabled('remove'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.DeleteOutlined, null)
-    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.audit) && checkRight(64) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.audit) && canAudit ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "audit",
       onClick: function onClick() {
         return onAudit(null);
       },
       disabled: btnDisabled('audit'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.AuditOutlined, null)
-    }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(128) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && canImport ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
       onClick: function onClick() {
         var _tableRef$current2, _tableRef$current2$sh;
@@ -771,7 +777,7 @@ function useSingle(inParam) {
       },
       disabled: btnDisabled('import'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && checkRight(256) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && canExport ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
       onClick: function onClick() {
         var _tableRef$current3, _tableRef$current3$sh;

package/lib/http/index.js

@@ -33,7 +33,7 @@ request.interceptors.request.use(function (url, options) {
   var token = (0, _utils.getCache)("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.59",
+  "version": "1.0.61",
   "description": "ls-pro-common",
   "keywords": [
     "antd",