ls-pro-common 1.0.39 → 1.0.40

package/es/http/index.js

@@ -1,15 +1,12 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
 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 } from '../utils';
-//默认超时时间为1分钟
+import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl, reLogin } from '../utils'; //默认超时时间为1分钟
+
 var request = extend({
   timeout: 60000
 });
-var showLogin = false;
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
@@ -72,18 +69,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
             if (retCode && !status.includes(retCode)) {
               if (retCode === 'timeout' || retCode === '4011') {
-                if (!showLogin) {
-                  showLogin = true;
-
-                  _Modal.warning({
-                    title: '登录状态已过期,请重新登录',
-                    okText: '重新登录',
-                    afterClose: function afterClose() {
-                      location.href = '/login?redirect=' + encodeURI(location.href);
-                      showLogin = false;
-                    }
-                  });
-                }
+                reLogin();
               } else {
                 showError(retMsg);
               }

package/es/utils/index.d.ts

@@ -85,7 +85,7 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
-export declare const getCache: any;
+export declare const getCache: (key: string, session?: boolean) => string | null;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */
@@ -94,6 +94,11 @@ export declare const showWarn: (text: string) => void;
 export declare const showSuccess: (text: string) => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
+/**
+ * token过期重新登录
+ * @returns
+ */
+export declare const reLogin: () => void;
 /**
  * 日期组选择转换
  * @param values 选择的值

package/es/utils/index.js

@@ -229,6 +229,26 @@ export var showConfirm = function showConfirm(text) {
     });
   });
 };
+var timeout = false;
+/**
+ * token过期重新登录
+ * @returns
+ */
+
+export var reLogin = function reLogin() {
+  if (timeout) return;
+  timeout = true;
+
+  _Modal.warning({
+    title: '登录状态已过期,请重新登录',
+    okText: '重新登录',
+    maskClosable: false,
+    afterClose: function afterClose() {
+      timeout = false;
+      location.href = '/login?redirect=' + encodeURI(location.href);
+    }
+  });
+};
 /**
  * 日期组选择转换
  * @param values 选择的值

package/lib/http/index.js

@@ -15,10 +15,6 @@ exports.httpPut = httpPut;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-require("antd/es/modal/style");
-
-var _modal = _interopRequireDefault(require("antd/es/modal"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -31,7 +27,6 @@ var _utils = require("../utils");
 var request = (0, _umiRequest.extend)({
   timeout: 60000
 });
-var showLogin = false;
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
@@ -93,18 +88,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
             if (retCode && !status.includes(retCode)) {
               if (retCode === 'timeout' || retCode === '4011') {
-                if (!showLogin) {
-                  showLogin = true;
-
-                  _modal.default.warning({
-                    title: '登录状态已过期,请重新登录',
-                    okText: '重新登录',
-                    afterClose: function afterClose() {
-                      location.href = '/login?redirect=' + encodeURI(location.href);
-                      showLogin = false;
-                    }
-                  });
-                }
+                (0, _utils.reLogin)();
               } else {
                 (0, _utils.showError)(retMsg);
               }

package/lib/utils/index.d.ts

@@ -85,7 +85,7 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
-export declare const getCache: any;
+export declare const getCache: (key: string, session?: boolean) => string | null;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */
@@ -94,6 +94,11 @@ export declare const showWarn: (text: string) => void;
 export declare const showSuccess: (text: string) => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
+/**
+ * token过期重新登录
+ * @returns
+ */
+export declare const reLogin: () => void;
 /**
  * 日期组选择转换
  * @param values 选择的值

package/lib/utils/index.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _utils.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
+exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
@@ -325,6 +325,28 @@ var showConfirm = function showConfirm(text) {
     });
   });
 };
+
+exports.showConfirm = showConfirm;
+var timeout = false;
+/**
+ * token过期重新登录
+ * @returns
+ */
+
+var reLogin = function reLogin() {
+  if (timeout) return;
+  timeout = true;
+
+  _modal.default.warning({
+    title: '登录状态已过期,请重新登录',
+    okText: '重新登录',
+    maskClosable: false,
+    afterClose: function afterClose() {
+      timeout = false;
+      location.href = '/login?redirect=' + encodeURI(location.href);
+    }
+  });
+};
 /**
  * 日期组选择转换
  * @param values 选择的值
@@ -335,7 +357,7 @@ var showConfirm = function showConfirm(text) {
  */
 
 
-exports.showConfirm = showConfirm;
+exports.reLogin = reLogin;
 
 var rangeToSearch = function rangeToSearch(values, startField, endField) {
   var endSuffix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "ls-pro-common",
   "keywords": [
     "antd",