ls-pro-common 3.1.12 → 3.1.14

package/lib/http/index.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -83,7 +83,12 @@ request.interceptors.request.use(function (url, options) {
     // @ts-ignore
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
-
+  // wms 提示，是否排班标识
+  var expireWarnFlag = getCache('expireWarnFlag', true);
+  if (expireWarnFlag === '1') {
+    // @ts-ignore
+    options.headers['expireWarnFlag'] = '1';
+  }
   var token = getCookie('token');
   if (token && url.indexOf('noToken=1') === -1) {
     //@ts-ignore
@@ -118,7 +123,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           userAgent = (_navigator = navigator) === null || _navigator === void 0 ? void 0 : (_navigator$userAgent = _navigator.userAgent) === null || _navigator$userAgent === void 0 ? void 0 : _navigator$userAgent.toLowerCase();
           isMobile = /mobile/i.test(userAgent); // http 状态码错误
           if (!(response.status < 200 || response.status >= 300)) {
-            _context.next = 21;
+            _context.next = 25;
             break;
           }
           _context.prev = 4;
@@ -128,7 +133,19 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           data = _context.sent;
           retCode = (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode;
           retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
-          faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode;
+          faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode; // wms 提示，是否排班标识
+          if (!(retCode === '99110')) {
+            _context.next = 15;
+            break;
+          }
+          if (!(getCache('expireWarnFlag', true) === '1')) {
+            _context.next = 14;
+            break;
+          }
+          return _context.abrupt("return", response);
+        case 14:
+          setCache('expireWarnFlag', '1', true);
+        case 15:
           if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013') && !isMobile) {
             if (!getCookie('token')) {
               (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
@@ -151,10 +168,10 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               showError(_text || retMsg);
             }
           }
-          _context.next = 19;
+          _context.next = 23;
           break;
-        case 14:
-          _context.prev = 14;
+        case 18:
+          _context.prev = 18;
           _context.t0 = _context["catch"](4);
           _text2 = httpStatus[response.status];
           if (response.status === 503 && response.statusText === 'no healthy upstream') {
@@ -163,23 +180,35 @@ request.interceptors.response.use( /*#__PURE__*/function () {
             _text2 = '请求的服务被限流';
           }
           showError(_text2 || _context.t0.message || response.statusText);
-        case 19:
-          _context.next = 31;
+        case 23:
+          _context.next = 39;
           break;
-        case 21:
+        case 25:
           if (!(noMsg !== '1')) {
-            _context.next = 31;
+            _context.next = 39;
             break;
           }
-          _context.next = 24;
+          _context.next = 28;
           return response.clone().json();
-        case 24:
+        case 28:
           _data = _context.sent;
           _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
           _retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '请求的服务出错';
           status = (getUrlQuery('apiStatus', options.url) || '0').split(',');
           requestId = (_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.requestId;
-          _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode;
+          _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode; // wms 提示，是否排班标识
+          if (!(_retCode === '99110')) {
+            _context.next = 38;
+            break;
+          }
+          if (!(getCache('expireWarnFlag', true) === '1')) {
+            _context.next = 37;
+            break;
+          }
+          return _context.abrupt("return", response);
+        case 37:
+          setCache('expireWarnFlag', '1', true);
+        case 38:
           if (_retCode && !status.includes(_retCode)) {
             if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
               if (!getCookie('token')) {
@@ -195,13 +224,13 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               }
             }
           }
-        case 31:
+        case 39:
           return _context.abrupt("return", response);
-        case 32:
+        case 40:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4, 14]]);
+    }, _callee, null, [[4, 18]]);
   }));
   return function (_x, _x2) {
     return _ref.apply(this, arguments);

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,14 +177,15 @@ 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);
       }
-    });
+    }));
   });
 };
 /**

package/package.json

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