ls-pro-common 3.1.11 → 3.1.12

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/utils/modal.js

@@ -182,23 +182,24 @@ export var showConfirm = function showConfirm(text) {
     });
   });
 };
-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/utils/modal.js

@@ -182,23 +182,24 @@ export var showConfirm = function showConfirm(text) {
     });
   });
 };
-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.1.11",
+  "version": "3.1.12",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [