ls-pro-common 3.1.11 → 3.1.13

package/es/components/GroupTip.d.ts

@@ -5,6 +5,7 @@ export declare type GroupTitleProps = {
     className?: string;
     style?: React.CSSProperties;
     isInner?: boolean;
+    children?: React.ReactNode;
 };
 declare const GroupTip: React.FC<GroupTitleProps>;
 export default GroupTip;

package/es/components/RecordLog/index.d.ts

@@ -14,7 +14,11 @@ export interface RecordLogProps {
     style?: React.CSSProperties;
     className?: string;
     showKey?: boolean;
-    fieldValueMap?: Record<string, Record<string | number, any>>;
+    fieldValueMap?: Record<string, Record<string | number, any> | {
+        label: string;
+        value: number | string;
+        [key: string]: any;
+    }[]>;
 }
 declare const RecordLog: (props: RecordLogProps) => JSX.Element;
 export default RecordLog;

package/es/components/RecordLog/index.js

@@ -1,5 +1,6 @@
 import "antd/es/empty/style";
 import _Empty from "antd/es/empty";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
@@ -58,13 +59,23 @@ var RecordLog = function RecordLog(props) {
           row.content.forEach(function (item) {
             var o = item.oldValue || '';
             var map = fieldValueMap[item.fieldName];
-            if (map && map[o]) {
+            if (map && Array.isArray(map)) {
+              var _map$find;
+              item.oldValue = ((_map$find = map.find(function (f) {
+                return f.value == o;
+              })) === null || _map$find === void 0 ? void 0 : _map$find.label) || o;
+            } else if (map && map[o] && _typeof(map) === 'object') {
               item.oldValue = map[o];
             } else {
               item.oldValue = !o || o == '[]' || (o === null || o === void 0 ? void 0 : o.length) == 0 ? '空' : o + '';
             }
             var n = item.newValue || '';
-            if (map && map[n]) {
+            if (map && Array.isArray(map)) {
+              var _map$find2;
+              item.newValue = ((_map$find2 = map.find(function (f) {
+                return f.value == n;
+              })) === null || _map$find2 === void 0 ? void 0 : _map$find2.label) || n;
+            } else if (map && map[n] && _typeof(map) === 'object') {
               item.newValue = map[n];
             } else {
               item.newValue = !n || n == '[]' || (n === null || n === void 0 ? void 0 : n.length) == 0 ? '空' : n + '';
@@ -92,14 +103,14 @@ var RecordLog = function RecordLog(props) {
         className: "log-item-label"
       }, field.fieldDisPlayName, " :"), /*#__PURE__*/React.createElement("span", {
         className: "log-item-value"
-      }, field.oldValue), /*#__PURE__*/React.createElement(ArrowRightOutlined, {
+      }, field.oldValue + ''), /*#__PURE__*/React.createElement(ArrowRightOutlined, {
         style: {
           fontSize: '14px',
           margin: '0 10px'
         }
       }), /*#__PURE__*/React.createElement("span", {
         className: "log-item-value"
-      }, field.newValue));
+      }, field.newValue + ''));
     });
   };
   var LogDom = useMemo(function () {

package/es/hooks/useDict.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 declare type TOption = {
-    label: string;
-    value: any;
-    text?: string;
-    status?: number;
-};
+    label: string | number | React.ReactNode;
+    value: string | number;
+    text?: string | number | React.ReactNode;
+    status?: number | boolean;
+} & Record<string, any>;
 declare type TDictItem = {
     dict: string;
     showValue?: boolean;

package/es/hooks/useGetState.d.ts

@@ -1,2 +1,5 @@
-/** 用于在useEffect, useCallback, useMemo等hooks中不传依赖时获取最新的值 */
-export default function (initVal: any): any[];
+declare type Getter<T> = () => T;
+declare type Setter<T> = (pre: T) => T;
+/** 第一，二个返回值跟原来的 useState 一样， 第三个返回值是一个函数，用于在useEffect, useCallback, useMemo 等 hooks 中不传依赖时获取最新的值 */
+export default function useGetState<T>(initVal: T | Getter<T>): readonly [T, (newVal: T | Setter<T>) => void, Getter<T>];
+export {};

package/es/hooks/useGetState.js

@@ -1,23 +1,21 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useState, useRef } from 'react';
-/** 用于在useEffect, useCallback, useMemo等hooks中不传依赖时获取最新的值 */
-export default function (initVal) {
+import { useState, useRef, useCallback } from 'react';
+/** 第一，二个返回值跟原来的 useState 一样， 第三个返回值是一个函数，用于在useEffect, useCallback, useMemo 等 hooks 中不传依赖时获取最新的值 */
+export default function useGetState(initVal) {
   var _useState = useState(initVal),
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var ref = useRef(initVal);
+  var ref = useRef(typeof initVal === 'function' ? initVal() : initVal);
   var changeState = function changeState(newVal) {
     if (typeof newVal === 'function') {
       newVal = newVal(ref.current);
     }
     ref.current = newVal;
-    setState(function () {
-      return newVal;
-    });
+    setState(newVal);
   };
-  var getState = function getState() {
+  var getState = useCallback(function () {
     return ref.current;
-  };
+  }, []);
   return [state, changeState, getState];
 }

package/es/hooks/useSyncState.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 declare type Getter<T> = () => T;
+/** 通过ref处理返回值,一直得到最新的值 */
 export default function useSyncState<T>(defaultValue: T | Getter<T>): readonly [T, (action: React.SetStateAction<T>) => void, Getter<T>];
 export {};

package/es/hooks/useSyncState.js

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
+/** 通过ref处理返回值,一直得到最新的值 */
 export default function useSyncState(defaultValue) {
   var _React$useState = React.useState(0),
     _React$useState2 = _slicedToArray(_React$useState, 2),

package/es/utils/modal.d.ts

@@ -1,13 +1,13 @@
-import { ModalFuncProps } from 'antd';
+import { ModalFuncProps, MessageArgsProps } from 'antd';
 import ReactDOM from 'react-dom';
 /** @name 获取全屏元素 */
 export declare const getFullScreenElement: () => any;
 /** @name 显示错误 */
-export declare const showError: (text: string, duration?: number) => void;
+export declare const showError: (text: string, duration?: number, opts?: MessageArgsProps | undefined) => void;
 /** @name 显示警示 */
-export declare const showWarn: (text: string, duration?: number) => void;
+export declare const showWarn: (text: string, duration?: number, opts?: MessageArgsProps | undefined) => void;
 /** @name 显示成功 */
-export declare const showSuccess: (text: string, duration?: number) => void;
+export declare const showSuccess: (text: string, duration?: number, opts?: MessageArgsProps | undefined) => void;
 /**
  * 弹框提示
  *
@@ -17,7 +17,7 @@ export declare const showSuccess: (text: string, duration?: number) => void;
  * @param opts 附加参数
  * @returns Promise<Boolean>
  */
-export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn', opts?: ModalFuncProps) => Promise<unknown>;
+export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn' | 'confirm', opts?: ModalFuncProps) => Promise<unknown>;
 /**
  * 请求接口出错
  *
@@ -30,7 +30,7 @@ export declare const httpError: (retMsg?: string | undefined, retCode?: string |
 /** 销毁所有弹框 */
 export declare const exitAlert: () => void;
 /** @name 显示确认 */
-export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
+export declare const showConfirm: (text: string, title?: string, opts?: ModalFuncProps) => Promise<unknown>;
 /**
  * Token过期重新登录
  *

package/es/utils/modal.js

@@ -1,8 +1,8 @@
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import React from "react";
@@ -25,10 +25,11 @@ export var getFullScreenElement = function getFullScreenElement() {
 /** @name 显示错误 */
 export var showError = function showError(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var opts = arguments.length > 2 ? arguments[2] : undefined;
   if (!text) {
     text = '出错了!!';
   }
-  _message.error({
+  _message.error(_objectSpread({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
@@ -51,15 +52,16 @@ export var showError = function showError(text) {
         } catch (e) {}
       }
     }
-  });
+  }, opts));
 };
 /** @name 显示警示 */
 export var showWarn = function showWarn(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var opts = arguments.length > 2 ? arguments[2] : undefined;
   if (!text) {
     text = '请注意!';
   }
-  _message.warn({
+  _message.warn(_objectSpread({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
@@ -82,15 +84,16 @@ export var showWarn = function showWarn(text) {
         } catch (e) {}
       }
     }
-  });
+  }, opts));
 };
 /** @name 显示成功 */
 export var showSuccess = function showSuccess(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var opts = arguments.length > 2 ? arguments[2] : undefined;
   if (!text) {
     text = '操作成功!';
   }
-  _message.success({
+  _message.success(_objectSpread({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
@@ -113,7 +116,7 @@ export var showSuccess = function showSuccess(text) {
         } catch (e) {}
       }
     }
-  });
+  }, opts));
 };
 /**
  * 弹框提示
@@ -129,17 +132,18 @@ export var showAlert = function showAlert(text) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
   var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return new Promise(function (resolve, reject) {
-    _Modal[type](_objectSpread({
+    _Modal[type](_objectSpread(_objectSpread({
       content: text,
       title: title,
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || document.body
+    }, opts), {}, {
       onOk: function onOk() {
         resolve(true);
       },
       onCancel: function onCancel() {
         reject(false);
       }
-    }, opts));
+    }));
   });
 };
 /**
@@ -162,8 +166,9 @@ export var exitAlert = function exitAlert() {
 /** @name 显示确认 */
 export var showConfirm = function showConfirm(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return new Promise(function (resolve, reject) {
-    _Modal.confirm({
+    _Modal.confirm(_objectSpread(_objectSpread({
       title: title,
       content: text,
       icon: /*#__PURE__*/React.createElement(QuestionCircleOutlined, null),
@@ -172,33 +177,35 @@ export var showConfirm = function showConfirm(text) {
       cancelButtonProps: {
         className: 'ant-btn-gray'
       },
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || document.body
+    }, opts), {}, {
       onOk: function onOk() {
         resolve(true);
       },
       onCancel: function onCancel() {
         reject(false);
       }
-    });
+    }));
   });
 };
-var timeout = false;
 /**
  * Token过期重新登录
  *
  * @returns
  */
 export var reLogin = function reLogin() {
-  if (timeout) return;
-  timeout = true;
+  // 如果已经显示过，则不再显示
+  if (sessionStorage.getItem('reLogin') === '1') return;
+  sessionStorage.setItem('reLogin', '1');
   _Modal.warning({
     title: '登录状态已过期,请重新登录',
     okText: '重新登录',
     maskClosable: false,
     getContainer: getFullScreenElement() || document.body,
     afterClose: function afterClose() {
-      timeout = false;
-      (window.top || window).location.href = location.pathname === '/' ? '/login/' : '/login/?redirect=' + encodeURIComponent(location.href);
+      sessionStorage.removeItem('reLogin');
+      var win = window.top || window; // 获取顶层窗口，防止iframe加载子工程页面
+      win.location.href = location.pathname === '/' ? '/login/' : '/login/?redirect=' + encodeURIComponent(win.location.href);
     }
   });
 };

package/lib/components/GroupTip.d.ts

@@ -5,6 +5,7 @@ export declare type GroupTitleProps = {
     className?: string;
     style?: React.CSSProperties;
     isInner?: boolean;
+    children?: React.ReactNode;
 };
 declare const GroupTip: React.FC<GroupTitleProps>;
 export default GroupTip;

package/lib/components/RecordLog/index.d.ts

@@ -14,7 +14,11 @@ export interface RecordLogProps {
     style?: React.CSSProperties;
     className?: string;
     showKey?: boolean;
-    fieldValueMap?: Record<string, Record<string | number, any>>;
+    fieldValueMap?: Record<string, Record<string | number, any> | {
+        label: string;
+        value: number | string;
+        [key: string]: any;
+    }[]>;
 }
 declare const RecordLog: (props: RecordLogProps) => JSX.Element;
 export default RecordLog;

package/lib/components/RecordLog/index.js

@@ -1,5 +1,6 @@
 import "antd/es/empty/style";
 import _Empty from "antd/es/empty";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
@@ -58,13 +59,23 @@ var RecordLog = function RecordLog(props) {
           row.content.forEach(function (item) {
             var o = item.oldValue || '';
             var map = fieldValueMap[item.fieldName];
-            if (map && map[o]) {
+            if (map && Array.isArray(map)) {
+              var _map$find;
+              item.oldValue = ((_map$find = map.find(function (f) {
+                return f.value == o;
+              })) === null || _map$find === void 0 ? void 0 : _map$find.label) || o;
+            } else if (map && map[o] && _typeof(map) === 'object') {
               item.oldValue = map[o];
             } else {
               item.oldValue = !o || o == '[]' || (o === null || o === void 0 ? void 0 : o.length) == 0 ? '空' : o + '';
             }
             var n = item.newValue || '';
-            if (map && map[n]) {
+            if (map && Array.isArray(map)) {
+              var _map$find2;
+              item.newValue = ((_map$find2 = map.find(function (f) {
+                return f.value == n;
+              })) === null || _map$find2 === void 0 ? void 0 : _map$find2.label) || n;
+            } else if (map && map[n] && _typeof(map) === 'object') {
               item.newValue = map[n];
             } else {
               item.newValue = !n || n == '[]' || (n === null || n === void 0 ? void 0 : n.length) == 0 ? '空' : n + '';
@@ -92,14 +103,14 @@ var RecordLog = function RecordLog(props) {
         className: "log-item-label"
       }, field.fieldDisPlayName, " :"), /*#__PURE__*/React.createElement("span", {
         className: "log-item-value"
-      }, field.oldValue), /*#__PURE__*/React.createElement(ArrowRightOutlined, {
+      }, field.oldValue + ''), /*#__PURE__*/React.createElement(ArrowRightOutlined, {
         style: {
           fontSize: '14px',
           margin: '0 10px'
         }
       }), /*#__PURE__*/React.createElement("span", {
         className: "log-item-value"
-      }, field.newValue));
+      }, field.newValue + ''));
     });
   };
   var LogDom = useMemo(function () {

package/lib/hooks/useDict.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 declare type TOption = {
-    label: string;
-    value: any;
-    text?: string;
-    status?: number;
-};
+    label: string | number | React.ReactNode;
+    value: string | number;
+    text?: string | number | React.ReactNode;
+    status?: number | boolean;
+} & Record<string, any>;
 declare type TDictItem = {
     dict: string;
     showValue?: boolean;

package/lib/hooks/useGetState.d.ts

@@ -1,2 +1,5 @@
-/** 用于在useEffect, useCallback, useMemo等hooks中不传依赖时获取最新的值 */
-export default function (initVal: any): any[];
+declare type Getter<T> = () => T;
+declare type Setter<T> = (pre: T) => T;
+/** 第一，二个返回值跟原来的 useState 一样， 第三个返回值是一个函数，用于在useEffect, useCallback, useMemo 等 hooks 中不传依赖时获取最新的值 */
+export default function useGetState<T>(initVal: T | Getter<T>): readonly [T, (newVal: T | Setter<T>) => void, Getter<T>];
+export {};

package/lib/hooks/useGetState.js

@@ -1,23 +1,21 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useState, useRef } from 'react';
-/** 用于在useEffect, useCallback, useMemo等hooks中不传依赖时获取最新的值 */
-export default function (initVal) {
+import { useState, useRef, useCallback } from 'react';
+/** 第一，二个返回值跟原来的 useState 一样， 第三个返回值是一个函数，用于在useEffect, useCallback, useMemo 等 hooks 中不传依赖时获取最新的值 */
+export default function useGetState(initVal) {
   var _useState = useState(initVal),
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var ref = useRef(initVal);
+  var ref = useRef(typeof initVal === 'function' ? initVal() : initVal);
   var changeState = function changeState(newVal) {
     if (typeof newVal === 'function') {
       newVal = newVal(ref.current);
     }
     ref.current = newVal;
-    setState(function () {
-      return newVal;
-    });
+    setState(newVal);
   };
-  var getState = function getState() {
+  var getState = useCallback(function () {
     return ref.current;
-  };
+  }, []);
   return [state, changeState, getState];
 }

package/lib/hooks/useSyncState.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 declare type Getter<T> = () => T;
+/** 通过ref处理返回值,一直得到最新的值 */
 export default function useSyncState<T>(defaultValue: T | Getter<T>): readonly [T, (action: React.SetStateAction<T>) => void, Getter<T>];
 export {};

package/lib/hooks/useSyncState.js

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
+/** 通过ref处理返回值,一直得到最新的值 */
 export default function useSyncState(defaultValue) {
   var _React$useState = React.useState(0),
     _React$useState2 = _slicedToArray(_React$useState, 2),

package/lib/utils/modal.d.ts

@@ -1,13 +1,13 @@
-import { ModalFuncProps } from 'antd';
+import { ModalFuncProps, MessageArgsProps } from 'antd';
 import ReactDOM from 'react-dom';
 /** @name 获取全屏元素 */
 export declare const getFullScreenElement: () => any;
 /** @name 显示错误 */
-export declare const showError: (text: string, duration?: number) => void;
+export declare const showError: (text: string, duration?: number, opts?: MessageArgsProps | undefined) => void;
 /** @name 显示警示 */
-export declare const showWarn: (text: string, duration?: number) => void;
+export declare const showWarn: (text: string, duration?: number, opts?: MessageArgsProps | undefined) => void;
 /** @name 显示成功 */
-export declare const showSuccess: (text: string, duration?: number) => void;
+export declare const showSuccess: (text: string, duration?: number, opts?: MessageArgsProps | undefined) => void;
 /**
  * 弹框提示
  *
@@ -17,7 +17,7 @@ export declare const showSuccess: (text: string, duration?: number) => void;
  * @param opts 附加参数
  * @returns Promise<Boolean>
  */
-export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn', opts?: ModalFuncProps) => Promise<unknown>;
+export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn' | 'confirm', opts?: ModalFuncProps) => Promise<unknown>;
 /**
  * 请求接口出错
  *
@@ -30,7 +30,7 @@ export declare const httpError: (retMsg?: string | undefined, retCode?: string |
 /** 销毁所有弹框 */
 export declare const exitAlert: () => void;
 /** @name 显示确认 */
-export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
+export declare const showConfirm: (text: string, title?: string, opts?: ModalFuncProps) => Promise<unknown>;
 /**
  * Token过期重新登录
  *

package/lib/utils/modal.js

@@ -1,8 +1,8 @@
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import React from "react";
@@ -25,10 +25,11 @@ export var getFullScreenElement = function getFullScreenElement() {
 /** @name 显示错误 */
 export var showError = function showError(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var opts = arguments.length > 2 ? arguments[2] : undefined;
   if (!text) {
     text = '出错了!!';
   }
-  _message.error({
+  _message.error(_objectSpread({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
@@ -51,15 +52,16 @@ export var showError = function showError(text) {
         } catch (e) {}
       }
     }
-  });
+  }, opts));
 };
 /** @name 显示警示 */
 export var showWarn = function showWarn(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var opts = arguments.length > 2 ? arguments[2] : undefined;
   if (!text) {
     text = '请注意!';
   }
-  _message.warn({
+  _message.warn(_objectSpread({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
@@ -82,15 +84,16 @@ export var showWarn = function showWarn(text) {
         } catch (e) {}
       }
     }
-  });
+  }, opts));
 };
 /** @name 显示成功 */
 export var showSuccess = function showSuccess(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var opts = arguments.length > 2 ? arguments[2] : undefined;
   if (!text) {
     text = '操作成功!';
   }
-  _message.success({
+  _message.success(_objectSpread({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
@@ -113,7 +116,7 @@ export var showSuccess = function showSuccess(text) {
         } catch (e) {}
       }
     }
-  });
+  }, opts));
 };
 /**
  * 弹框提示
@@ -129,17 +132,18 @@ export var showAlert = function showAlert(text) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
   var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return new Promise(function (resolve, reject) {
-    _Modal[type](_objectSpread({
+    _Modal[type](_objectSpread(_objectSpread({
       content: text,
       title: title,
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || document.body
+    }, opts), {}, {
       onOk: function onOk() {
         resolve(true);
       },
       onCancel: function onCancel() {
         reject(false);
       }
-    }, opts));
+    }));
   });
 };
 /**
@@ -162,8 +166,9 @@ export var exitAlert = function exitAlert() {
 /** @name 显示确认 */
 export var showConfirm = function showConfirm(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return new Promise(function (resolve, reject) {
-    _Modal.confirm({
+    _Modal.confirm(_objectSpread(_objectSpread({
       title: title,
       content: text,
       icon: /*#__PURE__*/React.createElement(QuestionCircleOutlined, null),
@@ -172,33 +177,35 @@ export var showConfirm = function showConfirm(text) {
       cancelButtonProps: {
         className: 'ant-btn-gray'
       },
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || document.body
+    }, opts), {}, {
       onOk: function onOk() {
         resolve(true);
       },
       onCancel: function onCancel() {
         reject(false);
       }
-    });
+    }));
   });
 };
-var timeout = false;
 /**
  * Token过期重新登录
  *
  * @returns
  */
 export var reLogin = function reLogin() {
-  if (timeout) return;
-  timeout = true;
+  // 如果已经显示过，则不再显示
+  if (sessionStorage.getItem('reLogin') === '1') return;
+  sessionStorage.setItem('reLogin', '1');
   _Modal.warning({
     title: '登录状态已过期,请重新登录',
     okText: '重新登录',
     maskClosable: false,
     getContainer: getFullScreenElement() || document.body,
     afterClose: function afterClose() {
-      timeout = false;
-      (window.top || window).location.href = location.pathname === '/' ? '/login/' : '/login/?redirect=' + encodeURIComponent(location.href);
+      sessionStorage.removeItem('reLogin');
+      var win = window.top || window; // 获取顶层窗口，防止iframe加载子工程页面
+      win.location.href = location.pathname === '/' ? '/login/' : '/login/?redirect=' + encodeURIComponent(win.location.href);
     }
   });
 };