ls-pro-common 3.1.13 → 3.1.15

package/es/components/InputTable.js

@@ -129,6 +129,8 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     return formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2);
   };
   var setFormValue = function setFormValue(formValue) {
+    var _prop$onChange;
+    (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
     if (rowKey) {
       var _formRef$current3, _formRef$current3$set;
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$set = _formRef$current3.setFieldsValue) === null || _formRef$current3$set === void 0 ? void 0 : _formRef$current3$set.call(_formRef$current3, _defineProperty({}, rowKey, formValue));

package/es/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,10 @@ request.interceptors.request.use(function (url, options) {
     // @ts-ignore
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
-
+  // wms 提示，是否排班标识
+  var expireWarnFlag = getCache('expireWarnFlag', true);
+  // @ts-ignore
+  options.headers['expireWarnFlag'] = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');
   if (token && url.indexOf('noToken=1') === -1) {
     //@ts-ignore
@@ -118,7 +121,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 +131,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 +166,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 +178,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 +222,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/components/InputTable.js

@@ -129,6 +129,8 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     return formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2);
   };
   var setFormValue = function setFormValue(formValue) {
+    var _prop$onChange;
+    (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
     if (rowKey) {
       var _formRef$current3, _formRef$current3$set;
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$set = _formRef$current3.setFieldsValue) === null || _formRef$current3$set === void 0 ? void 0 : _formRef$current3$set.call(_formRef$current3, _defineProperty({}, rowKey, formValue));

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,10 @@ request.interceptors.request.use(function (url, options) {
     // @ts-ignore
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
-
+  // wms 提示，是否排班标识
+  var expireWarnFlag = getCache('expireWarnFlag', true);
+  // @ts-ignore
+  options.headers['expireWarnFlag'] = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');
   if (token && url.indexOf('noToken=1') === -1) {
     //@ts-ignore
@@ -118,7 +121,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 +131,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 +166,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 +178,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 +222,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/package.json

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