ls-pro-common 3.0.11 → 3.0.12

package/es/components/DtlLayout.d.ts

@@ -19,7 +19,7 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     /** 返回按钮文本,默认为'返回' */
     btnExitText?: string;
     /** 标题 */
-    title?: string;
+    title?: JSX.Element | string;
     /** 主表对象 */
     masterObject?: any;
     /** 主表主键字段 */

package/es/components/InputTable.js

@@ -5,8 +5,8 @@ import _Popover from "antd/es/popover";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -24,18 +24,15 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   var _useContext = useContext(ProFormContext),
     formRef = _useContext.formRef;
   var tableRef = useRef();
+  var selectRowRef = useRef([]);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var _useState3 = useState([]),
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectedRows = _useState4[0],
-    setSelectedRows = _useState4[1];
-  var _useState5 = useState(''),
-    _useState6 = _slicedToArray(_useState5, 2),
-    text = _useState6[0],
-    setText = _useState6[1];
+    text = _useState4[0],
+    setText = _useState4[1];
   var inputRef = useRef();
   useImperativeHandle(ref, function () {
     return inputRef.current;
@@ -123,9 +120,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
             ;
             if (Object.keys(rest).length && !isV2) {
               data.where = rest;
+            } else {
+              data = _objectSpread(_objectSpread({}, data), rest);
             }
             if (!keepSelect) {
-              setSelectedRows([]);
+              selectRowRef.current = [];
               (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
             }
             if (beforeLoad) {
@@ -297,7 +296,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   useEffect(function () {
     if (!text) {
       var _tableRef$current2, _tableRef$current2$cl;
-      setSelectedRows([]);
+      selectRowRef.current = [];
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
     }
   }, [text]);
@@ -330,7 +329,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     rowSelection: {
       type: multiple ? 'checkbox' : 'radio',
       onChange: function onChange(keys, rows) {
-        setSelectedRows(rows);
+        selectRowRef.current = rows;
       }
     },
     tableAlertRender: false,
@@ -344,7 +343,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     toolBarRender: function toolBarRender() {
       return [/*#__PURE__*/React.createElement(_Button, {
         onClick: function onClick() {
-          handleValue(selectedRows);
+          handleValue(selectRowRef.current || []);
         }
       }, "\u786E\u8BA4")];
     },
@@ -386,7 +385,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
           maxHeight: '95vh',
           overflow: 'auto'
         }
-      }, loadOnShow ? visible ? tableDom : null : tableDom),
+      }, tableDom),
       trigger: "click",
       overlayInnerStyle: {
         width: 'max-content'
@@ -433,7 +432,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
           maxHeight: '95vh',
           overflow: 'auto'
         }
-      }, loadOnShow ? visible ? tableDom : null : tableDom),
+      }, tableDom),
       trigger: "click",
       overlayInnerStyle: {
         width: 'max-content'

package/es/components/common.less

@@ -3,47 +3,47 @@ body {
   --bg-color: #F9FAFB;
 
 
-  --ant-primary-color: #1869ED;
-  --ant-primary-color-hover: #418efa;
-  --ant-primary-color-active: #0a4cc7;
-  --ant-primary-color-outline: rgba(24, 105, 237, 0.4);
-  --ant-primary-1: #e6f4ff;
-  --ant-primary-2: #bddfff;
-  --ant-primary-3: #94c8ff;
-  --ant-primary-4: #6baeff;
-  --ant-primary-5: #418efa;
-  --ant-primary-6: #1869ED;
-  --ant-primary-7: #0a4cc7;
-  --ant-primary-color-deprecated-pure: #bed5fa;
-  --ant-primary-color-deprecated-l-35: #bed5fa;
-  --ant-primary-color-deprecated-l-20: #77a6f4;
-  --ant-primary-color-deprecated-t-20: #4687f1;
-  --ant-primary-color-deprecated-t-50: #8cb4f6;
-  --ant-primary-color-deprecated-f-12: rgba(24, 105, 237, 0.12);
+  --ant-primary-color                       : #1869ED;
+  --ant-primary-color-hover                 : #418efa;
+  --ant-primary-color-active                : #0a4cc7;
+  --ant-primary-color-outline               : rgba(24, 105, 237, 0.4);
+  --ant-primary-1                           : #e6f4ff;
+  --ant-primary-2                           : #bddfff;
+  --ant-primary-3                           : #94c8ff;
+  --ant-primary-4                           : #6baeff;
+  --ant-primary-5                           : #418efa;
+  --ant-primary-6                           : #1869ED;
+  --ant-primary-7                           : #0a4cc7;
+  --ant-primary-color-deprecated-pure       : #bed5fa;
+  --ant-primary-color-deprecated-l-35       : #bed5fa;
+  --ant-primary-color-deprecated-l-20       : #77a6f4;
+  --ant-primary-color-deprecated-t-20       : #4687f1;
+  --ant-primary-color-deprecated-t-50       : #8cb4f6;
+  --ant-primary-color-deprecated-f-12       : rgba(24, 105, 237, 0.12);
   --ant-primary-color-active-deprecated-f-30: rgba(230, 244, 255, 0.3);
   --ant-primary-color-active-deprecated-d-02: #dcf0ff;
-  --ant-success-color: #52c41a;
-  --ant-success-color-hover: #73d13d;
-  --ant-success-color-active: #389e0d;
-  --ant-success-color-outline: rgba(82, 196, 26, 0.2);
-  --ant-success-color-deprecated-bg: #f6ffed;
-  --ant-success-color-deprecated-border: #b7eb8f;
-  --ant-error-color: #ff4d4f;
-  --ant-error-color-hover: #ff7875;
-  --ant-error-color-active: #d9363e;
-  --ant-error-color-outline: rgba(255, 77, 79, 0.2);
-  --ant-error-color-deprecated-bg: #fff2f0;
-  --ant-error-color-deprecated-border: #ffccc7;
-  --ant-warning-color: #faad14;
-  --ant-warning-color-hover: #ffc53d;
-  --ant-warning-color-active: #d48806;
-  --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
-  --ant-warning-color-deprecated-bg: #fffbe6;
-  --ant-warning-color-deprecated-border: #ffe58f;
-  --ant-info-color: #1869ED;
-  --ant-info-color-deprecated-bg: #e6f4ff;
-  --ant-info-color-deprecated-border: #94c8ff;
-  
+  --ant-success-color                       : #52c41a;
+  --ant-success-color-hover                 : #73d13d;
+  --ant-success-color-active                : #389e0d;
+  --ant-success-color-outline               : rgba(82, 196, 26, 0.2);
+  --ant-success-color-deprecated-bg         : #f6ffed;
+  --ant-success-color-deprecated-border     : #b7eb8f;
+  --ant-error-color                         : #ff4d4f;
+  --ant-error-color-hover                   : #ff7875;
+  --ant-error-color-active                  : #d9363e;
+  --ant-error-color-outline                 : rgba(255, 77, 79, 0.2);
+  --ant-error-color-deprecated-bg           : #fff2f0;
+  --ant-error-color-deprecated-border       : #ffccc7;
+  --ant-warning-color                       : #faad14;
+  --ant-warning-color-hover                 : #ffc53d;
+  --ant-warning-color-active                : #d48806;
+  --ant-warning-color-outline               : rgba(250, 173, 20, 0.2);
+  --ant-warning-color-deprecated-bg         : #fffbe6;
+  --ant-warning-color-deprecated-border     : #ffe58f;
+  --ant-info-color                          : #1869ED;
+  --ant-info-color-deprecated-bg            : #e6f4ff;
+  --ant-info-color-deprecated-border        : #94c8ff;
+
 }
 
 * ::-webkit-scrollbar-thumb {
@@ -164,8 +164,9 @@ body.theme-yellow {
     // }
 
     .dtl-title {
-      font-size: 16px;
+      font-size  : 16px;
       font-weight: 700;
+      position   : relative;     
     }
 
     .dtl-btns {
@@ -332,7 +333,7 @@ a:hover {
 
   .ant-pro-card-header-border {
     border-bottom: 1px solid #dbeafa;
-  } 
+  }
 }
 
 .has-background {

package/es/hooks/useGetState.d.ts

@@ -0,0 +1 @@
+export default function (initVal: any): any[];

package/es/hooks/useGetState.js

@@ -0,0 +1,17 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useState, useRef } from "react";
+export default function (initVal) {
+  var _useState = useState(initVal),
+    _useState2 = _slicedToArray(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  var ref = useRef(initVal);
+  var shangeState = function shangeState(newVal) {
+    ref.current = newVal;
+    setState(newVal);
+  };
+  var getState = function getState() {
+    return ref.current;
+  };
+  return [state, shangeState, getState];
+}

package/es/http/index.js

@@ -121,7 +121,11 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           _faultCode = (_data$flag8 = _data.flag) === null || _data$flag8 === void 0 ? void 0 : _data$flag8.faultCode;
           if (_retCode && !status.includes(_retCode)) {
             if (_retCode === 'timeout' || _retCode === '4011') {
-              reLogin();
+              if (!getCookie("token")) {
+                (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
+              } else {
+                reLogin();
+              }
             } else {
               if (_faultCode) {
                 httpError(_retMsg, _retCode, _faultCode, options.url);

package/es/index.d.ts

@@ -22,10 +22,11 @@ import * as utils from './utils';
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
+import useGetState from './hooks/useGetState';
 /** Type */
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };

package/es/index.js

@@ -22,4 +22,5 @@ import * as utils from './utils';
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+import useGetState from './hooks/useGetState';
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };

package/es/utils/index.d.ts

@@ -91,6 +91,12 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @returns 关键字对应的值
  */
 export declare const getCache: (key: string, session?: boolean) => string | null;
+/**
+ * 读取本地缓存，优先从sessionStorage 取，取不到时再从 localStorage取
+ * @param key
+ * @returns
+ */
+export declare const getCacheSessionFirst: (key: string) => string | null;
 /**
  *
  * @param key 关键字，不传清除所有

package/es/utils/index.js

@@ -189,6 +189,14 @@ export var getCache = function getCache(key) {
   }
   return data;
 };
+/**
+ * 读取本地缓存，优先从sessionStorage 取，取不到时再从 localStorage取
+ * @param key
+ * @returns
+ */
+export var getCacheSessionFirst = function getCacheSessionFirst(key) {
+  return getCache(key, true) || getCache(key);
+};
 /**
  *
  * @param key 关键字，不传清除所有
@@ -314,7 +322,7 @@ export var reLogin = function reLogin() {
     maskClosable: false,
     afterClose: function afterClose() {
       timeout = false;
-      location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
+      (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
     }
   });
 };

package/lib/components/DtlLayout.d.ts

@@ -19,7 +19,7 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     /** 返回按钮文本,默认为'返回' */
     btnExitText?: string;
     /** 标题 */
-    title?: string;
+    title?: JSX.Element | string;
     /** 主表对象 */
     masterObject?: any;
     /** 主表主键字段 */

package/lib/components/InputTable.js

@@ -14,8 +14,8 @@ var _popover = _interopRequireDefault(require("antd/es/popover"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -32,18 +32,15 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
   var _useContext = (0, _react.useContext)(_lsProForm.ProFormContext),
     formRef = _useContext.formRef;
   var tableRef = (0, _react.useRef)();
+  var selectRowRef = (0, _react.useRef)([]);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var _useState3 = (0, _react.useState)([]),
+  var _useState3 = (0, _react.useState)(''),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    selectedRows = _useState4[0],
-    setSelectedRows = _useState4[1];
-  var _useState5 = (0, _react.useState)(''),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    text = _useState6[0],
-    setText = _useState6[1];
+    text = _useState4[0],
+    setText = _useState4[1];
   var inputRef = (0, _react.useRef)();
   (0, _react.useImperativeHandle)(ref, function () {
     return inputRef.current;
@@ -131,9 +128,11 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
             ;
             if (Object.keys(rest).length && !isV2) {
               data.where = rest;
+            } else {
+              data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), rest);
             }
             if (!keepSelect) {
-              setSelectedRows([]);
+              selectRowRef.current = [];
               (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
             }
             if (beforeLoad) {
@@ -305,7 +304,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
   (0, _react.useEffect)(function () {
     if (!text) {
       var _tableRef$current2, _tableRef$current2$cl;
-      setSelectedRows([]);
+      selectRowRef.current = [];
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
     }
   }, [text]);
@@ -338,7 +337,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     rowSelection: {
       type: multiple ? 'checkbox' : 'radio',
       onChange: function onChange(keys, rows) {
-        setSelectedRows(rows);
+        selectRowRef.current = rows;
       }
     },
     tableAlertRender: false,
@@ -352,7 +351,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     toolBarRender: function toolBarRender() {
       return [/*#__PURE__*/_react.default.createElement(_button.default, {
         onClick: function onClick() {
-          handleValue(selectedRows);
+          handleValue(selectRowRef.current || []);
         }
       }, "\u786E\u8BA4")];
     },
@@ -394,7 +393,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
           maxHeight: '95vh',
           overflow: 'auto'
         }
-      }, loadOnShow ? visible ? tableDom : null : tableDom),
+      }, tableDom),
       trigger: "click",
       overlayInnerStyle: {
         width: 'max-content'
@@ -441,7 +440,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
           maxHeight: '95vh',
           overflow: 'auto'
         }
-      }, loadOnShow ? visible ? tableDom : null : tableDom),
+      }, tableDom),
       trigger: "click",
       overlayInnerStyle: {
         width: 'max-content'

package/lib/components/common.less

@@ -3,47 +3,47 @@ body {
   --bg-color: #F9FAFB;
 
 
-  --ant-primary-color: #1869ED;
-  --ant-primary-color-hover: #418efa;
-  --ant-primary-color-active: #0a4cc7;
-  --ant-primary-color-outline: rgba(24, 105, 237, 0.4);
-  --ant-primary-1: #e6f4ff;
-  --ant-primary-2: #bddfff;
-  --ant-primary-3: #94c8ff;
-  --ant-primary-4: #6baeff;
-  --ant-primary-5: #418efa;
-  --ant-primary-6: #1869ED;
-  --ant-primary-7: #0a4cc7;
-  --ant-primary-color-deprecated-pure: #bed5fa;
-  --ant-primary-color-deprecated-l-35: #bed5fa;
-  --ant-primary-color-deprecated-l-20: #77a6f4;
-  --ant-primary-color-deprecated-t-20: #4687f1;
-  --ant-primary-color-deprecated-t-50: #8cb4f6;
-  --ant-primary-color-deprecated-f-12: rgba(24, 105, 237, 0.12);
+  --ant-primary-color                       : #1869ED;
+  --ant-primary-color-hover                 : #418efa;
+  --ant-primary-color-active                : #0a4cc7;
+  --ant-primary-color-outline               : rgba(24, 105, 237, 0.4);
+  --ant-primary-1                           : #e6f4ff;
+  --ant-primary-2                           : #bddfff;
+  --ant-primary-3                           : #94c8ff;
+  --ant-primary-4                           : #6baeff;
+  --ant-primary-5                           : #418efa;
+  --ant-primary-6                           : #1869ED;
+  --ant-primary-7                           : #0a4cc7;
+  --ant-primary-color-deprecated-pure       : #bed5fa;
+  --ant-primary-color-deprecated-l-35       : #bed5fa;
+  --ant-primary-color-deprecated-l-20       : #77a6f4;
+  --ant-primary-color-deprecated-t-20       : #4687f1;
+  --ant-primary-color-deprecated-t-50       : #8cb4f6;
+  --ant-primary-color-deprecated-f-12       : rgba(24, 105, 237, 0.12);
   --ant-primary-color-active-deprecated-f-30: rgba(230, 244, 255, 0.3);
   --ant-primary-color-active-deprecated-d-02: #dcf0ff;
-  --ant-success-color: #52c41a;
-  --ant-success-color-hover: #73d13d;
-  --ant-success-color-active: #389e0d;
-  --ant-success-color-outline: rgba(82, 196, 26, 0.2);
-  --ant-success-color-deprecated-bg: #f6ffed;
-  --ant-success-color-deprecated-border: #b7eb8f;
-  --ant-error-color: #ff4d4f;
-  --ant-error-color-hover: #ff7875;
-  --ant-error-color-active: #d9363e;
-  --ant-error-color-outline: rgba(255, 77, 79, 0.2);
-  --ant-error-color-deprecated-bg: #fff2f0;
-  --ant-error-color-deprecated-border: #ffccc7;
-  --ant-warning-color: #faad14;
-  --ant-warning-color-hover: #ffc53d;
-  --ant-warning-color-active: #d48806;
-  --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
-  --ant-warning-color-deprecated-bg: #fffbe6;
-  --ant-warning-color-deprecated-border: #ffe58f;
-  --ant-info-color: #1869ED;
-  --ant-info-color-deprecated-bg: #e6f4ff;
-  --ant-info-color-deprecated-border: #94c8ff;
-  
+  --ant-success-color                       : #52c41a;
+  --ant-success-color-hover                 : #73d13d;
+  --ant-success-color-active                : #389e0d;
+  --ant-success-color-outline               : rgba(82, 196, 26, 0.2);
+  --ant-success-color-deprecated-bg         : #f6ffed;
+  --ant-success-color-deprecated-border     : #b7eb8f;
+  --ant-error-color                         : #ff4d4f;
+  --ant-error-color-hover                   : #ff7875;
+  --ant-error-color-active                  : #d9363e;
+  --ant-error-color-outline                 : rgba(255, 77, 79, 0.2);
+  --ant-error-color-deprecated-bg           : #fff2f0;
+  --ant-error-color-deprecated-border       : #ffccc7;
+  --ant-warning-color                       : #faad14;
+  --ant-warning-color-hover                 : #ffc53d;
+  --ant-warning-color-active                : #d48806;
+  --ant-warning-color-outline               : rgba(250, 173, 20, 0.2);
+  --ant-warning-color-deprecated-bg         : #fffbe6;
+  --ant-warning-color-deprecated-border     : #ffe58f;
+  --ant-info-color                          : #1869ED;
+  --ant-info-color-deprecated-bg            : #e6f4ff;
+  --ant-info-color-deprecated-border        : #94c8ff;
+
 }
 
 * ::-webkit-scrollbar-thumb {
@@ -164,8 +164,9 @@ body.theme-yellow {
     // }
 
     .dtl-title {
-      font-size: 16px;
+      font-size  : 16px;
       font-weight: 700;
+      position   : relative;     
     }
 
     .dtl-btns {
@@ -332,7 +333,7 @@ a:hover {
 
   .ant-pro-card-header-border {
     border-bottom: 1px solid #dbeafa;
-  } 
+  }
 }
 
 .has-background {

package/lib/hooks/useGetState.d.ts

@@ -0,0 +1 @@
+export default function (initVal: any): any[];

package/lib/hooks/useGetState.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+function _default(initVal) {
+  var _useState = (0, _react.useState)(initVal),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  var ref = (0, _react.useRef)(initVal);
+  var shangeState = function shangeState(newVal) {
+    ref.current = newVal;
+    setState(newVal);
+  };
+  var getState = function getState() {
+    return ref.current;
+  };
+  return [state, shangeState, getState];
+}

package/lib/http/index.js

@@ -134,7 +134,11 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           _faultCode = (_data$flag8 = _data.flag) === null || _data$flag8 === void 0 ? void 0 : _data$flag8.faultCode;
           if (_retCode && !status.includes(_retCode)) {
             if (_retCode === 'timeout' || _retCode === '4011') {
-              (0, _utils.reLogin)();
+              if (!(0, _utils.getCookie)("token")) {
+                (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
+              } else {
+                (0, _utils.reLogin)();
+              }
             } else {
               if (_faultCode) {
                 (0, _utils.httpError)(_retMsg, _retCode, _faultCode, options.url);

package/lib/index.d.ts

@@ -22,10 +22,11 @@ import * as utils from './utils';
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
+import useGetState from './hooks/useGetState';
 /** Type */
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };

package/lib/index.js

@@ -161,6 +161,12 @@ Object.defineProperty(exports, "useDtl", {
     return _useDtl.default;
   }
 });
+Object.defineProperty(exports, "useGetState", {
+  enumerable: true,
+  get: function get() {
+    return _useGetState.default;
+  }
+});
 Object.defineProperty(exports, "usePermission", {
   enumerable: true,
   get: function get() {
@@ -197,4 +203,5 @@ var utils = _interopRequireWildcard(require("./utils"));
 exports.utils = utils;
 var _useSingle = _interopRequireDefault(require("./hooks/useSingle"));
 var _useDtl = _interopRequireDefault(require("./hooks/useDtl"));
-var _usePermission = _interopRequireDefault(require("./hooks/usePermission"));
+var _usePermission = _interopRequireDefault(require("./hooks/usePermission"));
+var _useGetState = _interopRequireDefault(require("./hooks/useGetState"));

package/lib/utils/index.d.ts

@@ -91,6 +91,12 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @returns 关键字对应的值
  */
 export declare const getCache: (key: string, session?: boolean) => string | null;
+/**
+ * 读取本地缓存，优先从sessionStorage 取，取不到时再从 localStorage取
+ * @param key
+ * @returns
+ */
+export declare const getCacheSessionFirst: (key: string) => string | null;
 /**
  *
  * @param key 关键字，不传清除所有

package/lib/utils/index.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "debounce", {
     return _lodash.debounce;
   }
 });
-exports.getLoginName = exports.getFullScreenElement = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.exitLoading = exports.exitAlert = exports.deepClone = void 0;
+exports.getLoginName = exports.getFullScreenElement = exports.getCookie = exports.getCompanyId = exports.getCacheSessionFirst = exports.getCache = exports.formatMoney = exports.formatDate = exports.exitLoading = exports.exitAlert = exports.deepClone = void 0;
 Object.defineProperty(exports, "getResourceProps", {
   enumerable: true,
   get: function get() {
@@ -254,12 +254,21 @@ var getCache = function getCache(key) {
   }
   return data;
 };
+/**
+ * 读取本地缓存，优先从sessionStorage 取，取不到时再从 localStorage取
+ * @param key
+ * @returns
+ */
+exports.getCache = getCache;
+var getCacheSessionFirst = function getCacheSessionFirst(key) {
+  return getCache(key, true) || getCache(key);
+};
 /**
  *
  * @param key 关键字，不传清除所有
  * @param session 是否session storage , 默认 localStorage
  */
-exports.getCache = getCache;
+exports.getCacheSessionFirst = getCacheSessionFirst;
 var clearCache = function clearCache(key) {
   var session = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (key) {
@@ -388,7 +397,7 @@ var reLogin = function reLogin() {
     maskClosable: false,
     afterClose: function afterClose() {
       timeout = false;
-      location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
+      (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
     }
   });
 };