ls-pro-common 3.1.49 → 3.1.51

package/lib/http/index.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
@@ -359,116 +359,6 @@ export function httpDelete(url, data) {
   var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
   return ajax(url, data, 'delete', needGateWay, true, timeout);
 }
-/**
- * 读取数据字典
- *
- * @param dictCode 字典编码
- * @param showValue 是否显示值
- * @param needGateWay 是否需要网关 默认为true
- * @param timeout 超时时间,默认60000毫秒
- * @param isGet 是否Get请求
- * @param valueIsNumber 返回值是否为数字,默认false
- * @returns Promise<Record<string,string>[]>
- */
-export function getDict(dictCodes) {
-  var showValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
-  var isGet = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  var valueIsNumber = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
-  var api = '/lesoon-petrel-integration-api/sysDictDtl/listByProperties';
-  var param = {
-    dictCodes: (dictCodes || '').split(',')
-  };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, isGet, valueIsNumber);
-}
-/**
- * 加载下拉框的数据源
- *
- * @param url 后端接口
- * @param param 请求参数
- * @param valueField 值字段
- * @param labelField 显示字段
- * @param showValue 显示值
- * @param needGateWay 是否需要网关 默认为true
- * @param timeout
- * @param isGet = true 是否get请求，默认true
- * @param valueIsNumber 返回值是否为数字,默认false
- * @returns
- */
-export function fetchOptions(_x3, _x4, _x5, _x6) {
-  return _fetchOptions.apply(this, arguments);
-}
-function _fetchOptions() {
-  _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url, param, valueField, labelField) {
-    var showValue,
-      needGateWay,
-      timeout,
-      isGet,
-      valueIsNumber,
-      rows,
-      data,
-      _args4 = arguments;
-    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          showValue = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : true;
-          needGateWay = _args4.length > 5 && _args4[5] !== undefined ? _args4[5] : true;
-          timeout = _args4.length > 6 && _args4[6] !== undefined ? _args4[6] : 60000;
-          isGet = _args4.length > 7 && _args4[7] !== undefined ? _args4[7] : true;
-          valueIsNumber = _args4.length > 8 && _args4[8] !== undefined ? _args4[8] : false;
-          if (!isGet) {
-            _context4.next = 14;
-            break;
-          }
-          _context4.next = 8;
-          return httpBatchGet(url, param, needGateWay, timeout);
-        case 8:
-          _context4.t0 = _context4.sent.rows;
-          if (_context4.t0) {
-            _context4.next = 11;
-            break;
-          }
-          _context4.t0 = [];
-        case 11:
-          rows = _context4.t0;
-          _context4.next = 20;
-          break;
-        case 14:
-          _context4.next = 16;
-          return httpBatchPost(url, param, needGateWay, timeout);
-        case 16:
-          _context4.t1 = _context4.sent.rows;
-          if (_context4.t1) {
-            _context4.next = 19;
-            break;
-          }
-          _context4.t1 = [];
-        case 19:
-          rows = _context4.t1;
-        case 20:
-          data = (rows || []).map(function (o) {
-            return _objectSpread(_objectSpread({}, o), {}, {
-              value: valueIsNumber && !isNaN(o[valueField]) ? Number(o[valueField]) : o[valueField],
-              text: o[labelField],
-              label: (showValue ? o[valueField] + '→' : '') + o[labelField]
-            });
-          });
-          return _context4.abrupt("return", data);
-        case 22:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4);
-  }));
-  return _fetchOptions.apply(this, arguments);
-}
-export var getResourceRight = function getResourceRight(ids) {
-  var url = '/lesoon/lesoon-petrel-permission-api/sysUserRole/selectResourceIds';
-  return httpPost(url, {
-    resourceIds: ids
-  }, true, false);
-};
 /**
  * 上传文件，因fetch不支持进度回调，使用XMLHttpRequest实现上传文件
  *
@@ -725,7 +615,7 @@ var defaultPageSize = 2000;
  * @param timeout
  * @returns
  */
-function httpBatchRequest(_x7) {
+function httpBatchRequest(_x3) {
   return _httpBatchRequest.apply(this, arguments);
 }
 /**
@@ -740,7 +630,7 @@ function httpBatchRequest(_x7) {
  * @returns
  */
 function _httpBatchRequest() {
-  _httpBatchRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url) {
+  _httpBatchRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url) {
     var params,
       method,
       needGateWay,
@@ -772,24 +662,24 @@ function _httpBatchRequest() {
       batchPages,
       batchRequests,
       batchResponses,
-      _args5 = arguments;
-    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+      _args4 = arguments;
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          params = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
-          method = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : 'get';
-          needGateWay = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : true;
-          timeout = _args5.length > 4 && _args5[4] !== undefined ? _args5[4] : 60000;
+          params = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
+          method = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : 'get';
+          needGateWay = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : true;
+          timeout = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : 60000;
           // 从URL中获取pageSize和page参数
           urlPageSize = getUrlQuery('pageSize', url) || getUrlQuery('page.size', url);
           urlPageNum = getUrlQuery('page', url) || getUrlQuery('page.pn', url) || '1'; // 优先使用params中的分页参数，其次使用URL中的分页参数
           pageSize = (params === null || params === void 0 ? void 0 : params.pageSize) || (params === null || params === void 0 ? void 0 : params['page.size']) || (urlPageSize ? parseInt(urlPageSize) : defaultPageSize);
           pageNum = (params === null || params === void 0 ? void 0 : params.page) || (params === null || params === void 0 ? void 0 : params['page.pn']) || parseInt(urlPageNum); // 如果pageSize小于等于defaultPageSize，或不是取第一页数据时，直接使用普通请求
           if (!(pageSize <= defaultPageSize || pageNum !== 1)) {
-            _context5.next = 10;
+            _context4.next = 10;
             break;
           }
-          return _context5.abrupt("return", ajax(url, params, method, needGateWay, true, timeout));
+          return _context4.abrupt("return", ajax(url, params, method, needGateWay, true, timeout));
         case 10:
           // 是否为 2.0版本的api。
           isV2 = url.includes('page.size') || (params === null || params === void 0 ? void 0 : params['page.size']) ? true : false; // 不同版本api的请求分页关键字处理，
@@ -807,23 +697,23 @@ function _httpBatchRequest() {
           allRows = [];
           total = 0;
           currentPage = pageNum;
-          _context5.prev = 20;
+          _context4.prev = 20;
           // 第一次请求，获取总数
           firstParams = _objectSpread(_objectSpread({}, params), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, PAGE_SIZE, batchSize), _defineProperty(_objectSpread2, PAGE_NUM, currentPage), _objectSpread2)); // 如果是 post 请求，body 和 query 里都传入分页参数
           api = cleanUrl;
           if (method === 'post') {
             api = setUrlQuery(cleanUrl, (_setUrlQuery3 = {}, _defineProperty(_setUrlQuery3, PAGE_SIZE, batchSize), _defineProperty(_setUrlQuery3, PAGE_NUM, currentPage), _setUrlQuery3));
           }
-          _context5.next = 26;
+          _context4.next = 26;
           return ajax(api, firstParams, method, needGateWay, true, timeout);
         case 26:
-          firstResponse = _context5.sent;
+          firstResponse = _context4.sent;
           firstData = firstResponse; // 如果返回值没有 rows 或 total，直接返回普通请求
           if (!(!('rows' in firstData) || !('total' in firstData))) {
-            _context5.next = 30;
+            _context4.next = 30;
             break;
           }
-          return _context5.abrupt("return", ajax(url, params, method, needGateWay, true, timeout));
+          return _context4.abrupt("return", ajax(url, params, method, needGateWay, true, timeout));
         case 30:
           if (firstData.rows) {
             allRows.push.apply(allRows, _toConsumableArray(firstData.rows));
@@ -831,16 +721,16 @@ function _httpBatchRequest() {
           }
           // 如果total小于等于defaultPageSize，不需要分批获取，直接返回
           if (!(total <= defaultPageSize)) {
-            _context5.next = 33;
+            _context4.next = 33;
             break;
           }
-          return _context5.abrupt("return", firstResponse);
+          return _context4.abrupt("return", firstResponse);
         case 33:
           // 计算实际需要获取的数据量（不超过用户传入的pageSize）
           actualPageSize = Math.min(pageSize, total); // 计算需要请求的总页数（基于实际需要的数据量）
           totalPages = Math.ceil(actualPageSize / batchSize); // 如果还有更多数据需要获取
           if (!(totalPages > 1)) {
-            _context5.next = 50;
+            _context4.next = 50;
             break;
           }
           // 分批并发请求，每次最多6个并发
@@ -853,30 +743,24 @@ function _httpBatchRequest() {
           _i = 0;
         case 40:
           if (!(_i < remainingPages.length)) {
-            _context5.next = 50;
+            _context4.next = 50;
             break;
           }
           batchPages = remainingPages.slice(_i, _i + maxConcurrent);
-          batchRequests = batchPages.map(function (pageNum) {
+          batchRequests = batchPages.map(function (page) {
             var _objectSpread3;
-            // 计算当前页应该获取的数据量
-            var currentPageSize = batchSize;
-            // 如果是最后一页，计算实际需要的数据量
-            if (pageNum === totalPages) {
-              var remainingData = actualPageSize - (pageNum - 1) * batchSize;
-              currentPageSize = Math.max(0, remainingData);
-            }
-            var requestParams = _objectSpread(_objectSpread({}, params), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, PAGE_SIZE, currentPageSize), _defineProperty(_objectSpread3, PAGE_NUM, pageNum), _objectSpread3));
+            var requestParams = _objectSpread(_objectSpread({}, params), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, PAGE_SIZE, batchSize), _defineProperty(_objectSpread3, PAGE_NUM, page), _objectSpread3));
+            var requestApi = cleanUrl;
             if (method === 'post') {
               var _setUrlQuery4;
-              api = setUrlQuery(cleanUrl, (_setUrlQuery4 = {}, _defineProperty(_setUrlQuery4, PAGE_SIZE, currentPageSize), _defineProperty(_setUrlQuery4, PAGE_NUM, pageNum), _setUrlQuery4));
+              requestApi = setUrlQuery(cleanUrl, (_setUrlQuery4 = {}, _defineProperty(_setUrlQuery4, PAGE_SIZE, batchSize), _defineProperty(_setUrlQuery4, PAGE_NUM, page), _setUrlQuery4));
             }
-            return ajax(api, requestParams, method, needGateWay, true, timeout);
+            return ajax(requestApi, requestParams, method, needGateWay, true, timeout);
           }); // 并发执行当前批次的请求
-          _context5.next = 45;
+          _context4.next = 45;
           return Promise.all(batchRequests);
         case 45:
-          batchResponses = _context5.sent;
+          batchResponses = _context4.sent;
           // 合并当前批次的响应数据
           batchResponses.forEach(function (response) {
             var data = response;
@@ -886,7 +770,7 @@ function _httpBatchRequest() {
           });
         case 47:
           _i += maxConcurrent;
-          _context5.next = 40;
+          _context4.next = 40;
           break;
         case 50:
           // 如果获取的数据超过了用户要求的pageSize，进行截取
@@ -894,19 +778,19 @@ function _httpBatchRequest() {
             allRows.splice(actualPageSize);
           }
           // 返回合并后的数据，保持与原始响应格式一致
-          return _context5.abrupt("return", _objectSpread(_objectSpread({}, firstResponse), {}, {
+          return _context4.abrupt("return", _objectSpread(_objectSpread({}, firstResponse), {}, {
             rows: allRows,
             total: total // 保持原始的total值
           }));
         case 54:
-          _context5.prev = 54;
-          _context5.t0 = _context5["catch"](20);
-          throw _context5.t0;
+          _context4.prev = 54;
+          _context4.t0 = _context4["catch"](20);
+          throw _context4.t0;
         case 57:
         case "end":
-          return _context5.stop();
+          return _context4.stop();
       }
-    }, _callee5, null, [[20, 54]]);
+    }, _callee4, null, [[20, 54]]);
   }));
   return _httpBatchRequest.apply(this, arguments);
 }
@@ -929,7 +813,7 @@ export var httpBatchGet = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function httpBatchGet(_x8) {
+  return function httpBatchGet(_x4) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -963,8 +847,124 @@ export var httpBatchPost = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function httpBatchPost(_x9) {
+  return function httpBatchPost(_x5) {
     return _ref3.apply(this, arguments);
   };
 }();
+/**
+ * 读取数据字典
+ *
+ * @param dictCode 字典编码
+ * @param showValue 是否显示值
+ * @param needGateWay 是否需要网关 默认为true
+ * @param timeout 超时时间,默认60000毫秒
+ * @param isGet 是否Get请求
+ * @param valueIsNumber 返回值是否为数字,默认false
+ * @returns Promise<Record<string,string>[]>
+ */
+export function getDict(dictCodes) {
+  var showValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  var isGet = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var valueIsNumber = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var api = '/lesoon-petrel-integration-api/sysDictDtl/listByProperties';
+  var param = {
+    dictCodes: (dictCodes || '').split(',')
+  };
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, isGet, valueIsNumber);
+}
+/**
+ * 加载下拉框的数据源
+ *
+ * @param url 后端接口
+ * @param param 请求参数
+ * @param valueField 值字段
+ * @param labelField 显示字段
+ * @param showValue 显示值
+ * @param needGateWay 是否需要网关 默认为true
+ * @param timeout
+ * @param isGet = true 是否get请求，默认true
+ * @param valueIsNumber 返回值是否为数字,默认false
+ * @returns
+ */
+export function fetchOptions(_x6, _x7, _x8, _x9) {
+  return _fetchOptions.apply(this, arguments);
+}
+/**
+ * 获取用户资源Id对应的权限值
+ *
+ * @param ids 资源id
+ * @returns
+ */
+function _fetchOptions() {
+  _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url, param, valueField, labelField) {
+    var showValue,
+      needGateWay,
+      timeout,
+      isGet,
+      valueIsNumber,
+      rows,
+      data,
+      _args5 = arguments;
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          showValue = _args5.length > 4 && _args5[4] !== undefined ? _args5[4] : true;
+          needGateWay = _args5.length > 5 && _args5[5] !== undefined ? _args5[5] : true;
+          timeout = _args5.length > 6 && _args5[6] !== undefined ? _args5[6] : 60000;
+          isGet = _args5.length > 7 && _args5[7] !== undefined ? _args5[7] : true;
+          valueIsNumber = _args5.length > 8 && _args5[8] !== undefined ? _args5[8] : false;
+          if (!isGet) {
+            _context5.next = 14;
+            break;
+          }
+          _context5.next = 8;
+          return httpBatchGet(url, param, needGateWay, timeout);
+        case 8:
+          _context5.t0 = _context5.sent.rows;
+          if (_context5.t0) {
+            _context5.next = 11;
+            break;
+          }
+          _context5.t0 = [];
+        case 11:
+          rows = _context5.t0;
+          _context5.next = 20;
+          break;
+        case 14:
+          _context5.next = 16;
+          return httpBatchPost(url, param, needGateWay, timeout);
+        case 16:
+          _context5.t1 = _context5.sent.rows;
+          if (_context5.t1) {
+            _context5.next = 19;
+            break;
+          }
+          _context5.t1 = [];
+        case 19:
+          rows = _context5.t1;
+        case 20:
+          data = (rows || []).map(function (o) {
+            return _objectSpread(_objectSpread({}, o), {}, {
+              value: valueIsNumber && !isNaN(o[valueField]) ? Number(o[valueField]) : o[valueField],
+              text: o[labelField],
+              label: (showValue ? o[valueField] + '→' : '') + o[labelField]
+            });
+          });
+          return _context5.abrupt("return", data);
+        case 22:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return _fetchOptions.apply(this, arguments);
+}
+export var getResourceRight = function getResourceRight(ids) {
+  var url = '/lesoon/lesoon-petrel-permission-api/sysUserRole/selectResourceIds';
+  return httpPost(url, {
+    resourceIds: ids
+  }, true, false);
+};
 export default request;

package/lib/utils/url.js

@@ -81,7 +81,7 @@ export var toGatewayUrl = function toGatewayUrl(url) {
   url = url || '';
   // 如果url带有名称，不需要设置网关
   if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
-  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/')) {
+  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/') || url.startsWith('/lesoon-retail/') || url.startsWith('/scm-bms/')) {
     return location.origin + url;
   }
   // 读取项目的默认网关

package/package.json

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