ls-pro-common 3.1.15 → 3.1.16

package/es/components/Permission.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 export declare type PermissionProps = {
     rightValue: number;
+    children: React.ReactNode;
+    [key: string]: any;
 };
 declare const Permission: React.FC<PermissionProps>;
 export default Permission;

package/es/components/Permission.js

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children", "rightValue"];
 import React from 'react';
-import usePermission from "../hooks/usePermission";
+import usePermission from '../hooks/usePermission';
 var Permission = function Permission(_ref) {
   var children = _ref.children,
     rightValue = _ref.rightValue,

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, setCache } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -14,14 +14,12 @@ var httpStatus = {
   503: '请求的服务器异常',
   504: '请求服务超时'
 };
-var browserId = '';
+var browserId = getCache('browserId') || '';
 (function () {
   setTimeout(function () {
-    try {
-      getBrowserId().then(function (id) {
-        browserId = id;
-      });
-    } catch (_unused) {}
+    getBrowserId().then(function (id) {
+      browserId = id;
+    });
   }, 0);
 })();
 //是否跨域
@@ -58,25 +56,29 @@ request.interceptors.request.use(function (url, options) {
   // 处理浏览器指纹
   if (browserId) {
     // @ts-ignore
-    options.headers['browserId'] = browserId;
+    options.headers.browserId = browserId;
+  } else {
+    getBrowserId().then(function (id) {
+      browserId = id;
+    });
   }
   // 处理门店
-  var shopNo = getCache('shopNo', true) || getCache('shopNo');
+  var shopNo = getCacheSessionFirst('shopNo');
   if (shopNo) {
     // @ts-ignore
-    options.headers['shopNo'] = shopNo;
+    options.headers.shopNo = shopNo;
   }
   // 处理门店
-  var shopCode = getCache('shopCode', true) || getCache('shopCode');
+  var shopCode = getCacheSessionFirst('shopCode');
   if (shopCode) {
     // @ts-ignore
-    options.headers['shopCode'] = shopCode;
+    options.headers.shopCode = shopCode;
   }
   // 处理仓库
-  var storeNo = getCache('storeNo', true) || getCache('storeNo');
+  var storeNo = getCacheSessionFirst('storeNo');
   if (storeNo) {
     // @ts-ignore
-    options.headers['storeNo'] = storeNo;
+    options.headers.storeNo = storeNo;
   }
   var tag = getCookie('x-asm-prefer-tag');
   if (tag) {
@@ -86,11 +88,11 @@ request.interceptors.request.use(function (url, options) {
   // wms 提示，是否排班标识
   var expireWarnFlag = getCache('expireWarnFlag', true);
   // @ts-ignore
-  options.headers['expireWarnFlag'] = expireWarnFlag === '1' ? '1' : '0';
+  options.headers.expireWarnFlag = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');
   if (token && url.indexOf('noToken=1') === -1) {
     //@ts-ignore
-    options.headers['token'] = token;
+    options.headers.token = token;
   }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
@@ -109,11 +111,12 @@ request.interceptors.request.use(function (url, options) {
     options: options
   };
 });
+var ifExpireWarn = false;
 /** 请求返回拦截器,统一处理业务异常 */
 request.interceptors.response.use( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response, options) {
     var _navigator, _navigator$userAgent;
-    var noMsg, userAgent, isMobile, _data$flag, _data$flag2, _data$flag3, data, retCode, retMsg, faultCode, text, _text, _text2, _data$flag4, _data$flag5, _data$flag6, _data$flag7, _data, _retCode, _retMsg, status, requestId, _faultCode;
+    var noMsg, userAgent, isMobile, _data$flag, _data$flag2, _data$flag3, data, retCode, retMsg, faultCode, is99110, text, _text, _text2, _data$flag4, _data$flag5, _data$flag6, _data$flag7, _data, _retCode, _retMsg, status, requestId, _faultCode, _is;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -121,7 +124,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 = 25;
+            _context.next = 28;
             break;
           }
           _context.prev = 4;
@@ -131,19 +134,22 @@ 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; // wms 提示，是否排班标识
+          faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode;
+          is99110 = false; // wms 提示，是否排班标识
           if (!(retCode === '99110')) {
-            _context.next = 15;
+            _context.next = 18;
             break;
           }
-          if (!(getCache('expireWarnFlag', true) === '1')) {
-            _context.next = 14;
+          is99110 = true;
+          if (!(getCache('expireWarnFlag', true) === '1' || ifExpireWarn)) {
+            _context.next = 16;
             break;
           }
           return _context.abrupt("return", response);
-        case 14:
+        case 16:
+          ifExpireWarn = true;
           setCache('expireWarnFlag', '1', true);
-        case 15:
+        case 18:
           if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013') && !isMobile) {
             if (!getCookie('token')) {
               (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
@@ -155,7 +161,9 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               if (retCode === '4012') {
                 text = '用户已禁用,无权限进行操作';
               }
-              httpError(text || retMsg, retCode, faultCode, options.url);
+              httpError(text || retMsg, retCode, faultCode, {
+                title: is99110 ? '账号到期提醒' : '请求接口出错'
+              });
             } else {
               _text = httpStatus[response.status];
               if (response.status === 503 && response.statusText === 'no healthy upstream') {
@@ -166,10 +174,10 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               showError(_text || retMsg);
             }
           }
-          _context.next = 23;
+          _context.next = 26;
           break;
-        case 18:
-          _context.prev = 18;
+        case 21:
+          _context.prev = 21;
           _context.t0 = _context["catch"](4);
           _text2 = httpStatus[response.status];
           if (response.status === 503 && response.statusText === 'no healthy upstream') {
@@ -178,35 +186,38 @@ request.interceptors.response.use( /*#__PURE__*/function () {
             _text2 = '请求的服务被限流';
           }
           showError(_text2 || _context.t0.message || response.statusText);
-        case 23:
-          _context.next = 39;
+        case 26:
+          _context.next = 45;
           break;
-        case 25:
+        case 28:
           if (!(noMsg !== '1')) {
-            _context.next = 39;
+            _context.next = 45;
             break;
           }
-          _context.next = 28;
+          _context.next = 31;
           return response.clone().json();
-        case 28:
+        case 31:
           _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; // wms 提示，是否排班标识
+          _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode;
+          _is = false; // wms 提示，是否排班标识
           if (!(_retCode === '99110')) {
-            _context.next = 38;
+            _context.next = 44;
             break;
           }
-          if (!(getCache('expireWarnFlag', true) === '1')) {
-            _context.next = 37;
+          _is = true;
+          if (!(getCache('expireWarnFlag', true) === '1' || ifExpireWarn)) {
+            _context.next = 42;
             break;
           }
           return _context.abrupt("return", response);
-        case 37:
+        case 42:
+          ifExpireWarn = true;
           setCache('expireWarnFlag', '1', true);
-        case 38:
+        case 44:
           if (_retCode && !status.includes(_retCode)) {
             if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
               if (!getCookie('token')) {
@@ -216,19 +227,21 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               }
             } else {
               if (_faultCode) {
-                httpError(_retMsg, _retCode, _faultCode, options.url);
+                httpError(_retMsg, _retCode, _faultCode, {
+                  title: _is ? '账号到期提醒' : '请求接口出错'
+                });
               } else {
                 showError(_retMsg);
               }
             }
           }
-        case 39:
+        case 45:
           return _context.abrupt("return", response);
-        case 40:
+        case 46:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4, 18]]);
+    }, _callee, null, [[4, 21]]);
   }));
   return function (_x, _x2) {
     return _ref.apply(this, arguments);

package/es/utils/index.js

@@ -91,8 +91,9 @@ export var toGatewayUrl = function toGatewayUrl(url) {
   if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
   // 读取项目的默认网关
   if (!defGateway) {
+    var _top;
     // @ts-ignore
-    defGateway = window.defaultGateway || '';
+    defGateway = window.defaultGateway || ((_top = top) === null || _top === void 0 ? void 0 : _top.window.lsMainGateway) || '';
   }
   // 取网关的顺序， 1.取url里的传参，2.取资源里的网关， 3. 取项目里设置的默认网关
   var gateway = getUrlQuery(gatewayKey) || getResourceProps(gatewayKey) || defGateway;

package/lib/components/Permission.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 export declare type PermissionProps = {
     rightValue: number;
+    children: React.ReactNode;
+    [key: string]: any;
 };
 declare const Permission: React.FC<PermissionProps>;
 export default Permission;

package/lib/components/Permission.js

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children", "rightValue"];
 import React from 'react';
-import usePermission from "../hooks/usePermission";
+import usePermission from '../hooks/usePermission';
 var Permission = function Permission(_ref) {
   var children = _ref.children,
     rightValue = _ref.rightValue,

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, setCache } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -14,14 +14,12 @@ var httpStatus = {
   503: '请求的服务器异常',
   504: '请求服务超时'
 };
-var browserId = '';
+var browserId = getCache('browserId') || '';
 (function () {
   setTimeout(function () {
-    try {
-      getBrowserId().then(function (id) {
-        browserId = id;
-      });
-    } catch (_unused) {}
+    getBrowserId().then(function (id) {
+      browserId = id;
+    });
   }, 0);
 })();
 //是否跨域
@@ -58,25 +56,29 @@ request.interceptors.request.use(function (url, options) {
   // 处理浏览器指纹
   if (browserId) {
     // @ts-ignore
-    options.headers['browserId'] = browserId;
+    options.headers.browserId = browserId;
+  } else {
+    getBrowserId().then(function (id) {
+      browserId = id;
+    });
   }
   // 处理门店
-  var shopNo = getCache('shopNo', true) || getCache('shopNo');
+  var shopNo = getCacheSessionFirst('shopNo');
   if (shopNo) {
     // @ts-ignore
-    options.headers['shopNo'] = shopNo;
+    options.headers.shopNo = shopNo;
   }
   // 处理门店
-  var shopCode = getCache('shopCode', true) || getCache('shopCode');
+  var shopCode = getCacheSessionFirst('shopCode');
   if (shopCode) {
     // @ts-ignore
-    options.headers['shopCode'] = shopCode;
+    options.headers.shopCode = shopCode;
   }
   // 处理仓库
-  var storeNo = getCache('storeNo', true) || getCache('storeNo');
+  var storeNo = getCacheSessionFirst('storeNo');
   if (storeNo) {
     // @ts-ignore
-    options.headers['storeNo'] = storeNo;
+    options.headers.storeNo = storeNo;
   }
   var tag = getCookie('x-asm-prefer-tag');
   if (tag) {
@@ -86,11 +88,11 @@ request.interceptors.request.use(function (url, options) {
   // wms 提示，是否排班标识
   var expireWarnFlag = getCache('expireWarnFlag', true);
   // @ts-ignore
-  options.headers['expireWarnFlag'] = expireWarnFlag === '1' ? '1' : '0';
+  options.headers.expireWarnFlag = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');
   if (token && url.indexOf('noToken=1') === -1) {
     //@ts-ignore
-    options.headers['token'] = token;
+    options.headers.token = token;
   }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
@@ -109,11 +111,12 @@ request.interceptors.request.use(function (url, options) {
     options: options
   };
 });
+var ifExpireWarn = false;
 /** 请求返回拦截器,统一处理业务异常 */
 request.interceptors.response.use( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response, options) {
     var _navigator, _navigator$userAgent;
-    var noMsg, userAgent, isMobile, _data$flag, _data$flag2, _data$flag3, data, retCode, retMsg, faultCode, text, _text, _text2, _data$flag4, _data$flag5, _data$flag6, _data$flag7, _data, _retCode, _retMsg, status, requestId, _faultCode;
+    var noMsg, userAgent, isMobile, _data$flag, _data$flag2, _data$flag3, data, retCode, retMsg, faultCode, is99110, text, _text, _text2, _data$flag4, _data$flag5, _data$flag6, _data$flag7, _data, _retCode, _retMsg, status, requestId, _faultCode, _is;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -121,7 +124,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 = 25;
+            _context.next = 28;
             break;
           }
           _context.prev = 4;
@@ -131,19 +134,22 @@ 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; // wms 提示，是否排班标识
+          faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode;
+          is99110 = false; // wms 提示，是否排班标识
           if (!(retCode === '99110')) {
-            _context.next = 15;
+            _context.next = 18;
             break;
           }
-          if (!(getCache('expireWarnFlag', true) === '1')) {
-            _context.next = 14;
+          is99110 = true;
+          if (!(getCache('expireWarnFlag', true) === '1' || ifExpireWarn)) {
+            _context.next = 16;
             break;
           }
           return _context.abrupt("return", response);
-        case 14:
+        case 16:
+          ifExpireWarn = true;
           setCache('expireWarnFlag', '1', true);
-        case 15:
+        case 18:
           if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013') && !isMobile) {
             if (!getCookie('token')) {
               (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
@@ -155,7 +161,9 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               if (retCode === '4012') {
                 text = '用户已禁用,无权限进行操作';
               }
-              httpError(text || retMsg, retCode, faultCode, options.url);
+              httpError(text || retMsg, retCode, faultCode, {
+                title: is99110 ? '账号到期提醒' : '请求接口出错'
+              });
             } else {
               _text = httpStatus[response.status];
               if (response.status === 503 && response.statusText === 'no healthy upstream') {
@@ -166,10 +174,10 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               showError(_text || retMsg);
             }
           }
-          _context.next = 23;
+          _context.next = 26;
           break;
-        case 18:
-          _context.prev = 18;
+        case 21:
+          _context.prev = 21;
           _context.t0 = _context["catch"](4);
           _text2 = httpStatus[response.status];
           if (response.status === 503 && response.statusText === 'no healthy upstream') {
@@ -178,35 +186,38 @@ request.interceptors.response.use( /*#__PURE__*/function () {
             _text2 = '请求的服务被限流';
           }
           showError(_text2 || _context.t0.message || response.statusText);
-        case 23:
-          _context.next = 39;
+        case 26:
+          _context.next = 45;
           break;
-        case 25:
+        case 28:
           if (!(noMsg !== '1')) {
-            _context.next = 39;
+            _context.next = 45;
             break;
           }
-          _context.next = 28;
+          _context.next = 31;
           return response.clone().json();
-        case 28:
+        case 31:
           _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; // wms 提示，是否排班标识
+          _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode;
+          _is = false; // wms 提示，是否排班标识
           if (!(_retCode === '99110')) {
-            _context.next = 38;
+            _context.next = 44;
             break;
           }
-          if (!(getCache('expireWarnFlag', true) === '1')) {
-            _context.next = 37;
+          _is = true;
+          if (!(getCache('expireWarnFlag', true) === '1' || ifExpireWarn)) {
+            _context.next = 42;
             break;
           }
           return _context.abrupt("return", response);
-        case 37:
+        case 42:
+          ifExpireWarn = true;
           setCache('expireWarnFlag', '1', true);
-        case 38:
+        case 44:
           if (_retCode && !status.includes(_retCode)) {
             if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
               if (!getCookie('token')) {
@@ -216,19 +227,21 @@ request.interceptors.response.use( /*#__PURE__*/function () {
               }
             } else {
               if (_faultCode) {
-                httpError(_retMsg, _retCode, _faultCode, options.url);
+                httpError(_retMsg, _retCode, _faultCode, {
+                  title: _is ? '账号到期提醒' : '请求接口出错'
+                });
               } else {
                 showError(_retMsg);
               }
             }
           }
-        case 39:
+        case 45:
           return _context.abrupt("return", response);
-        case 40:
+        case 46:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4, 18]]);
+    }, _callee, null, [[4, 21]]);
   }));
   return function (_x, _x2) {
     return _ref.apply(this, arguments);

package/lib/utils/index.js

@@ -91,8 +91,9 @@ export var toGatewayUrl = function toGatewayUrl(url) {
   if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
   // 读取项目的默认网关
   if (!defGateway) {
+    var _top;
     // @ts-ignore
-    defGateway = window.defaultGateway || '';
+    defGateway = window.defaultGateway || ((_top = top) === null || _top === void 0 ? void 0 : _top.window.lsMainGateway) || '';
   }
   // 取网关的顺序， 1.取url里的传参，2.取资源里的网关， 3. 取项目里设置的默认网关
   var gateway = getUrlQuery(gatewayKey) || getResourceProps(gatewayKey) || defGateway;

package/package.json

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