ls-pro-common 3.1.23 → 3.1.25

package/lib/http/index.js

@@ -1,3 +1,5 @@
+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 _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -91,6 +93,8 @@ request.interceptors.request.use(function (url, options) {
     // @ts-ignore
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
+  // @ts-ignore
+  options.headers['terminal'] = 'PC';
   // wms 提示，是否排班标识
   var expireWarnFlag = getCache('expireWarnFlag', true);
   // @ts-ignore
@@ -406,7 +410,7 @@ export function fetchOptions(_x3, _x4, _x5, _x6) {
   return _fetchOptions.apply(this, arguments);
 }
 function _fetchOptions() {
-  _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url, param, valueField, labelField) {
+  _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url, param, valueField, labelField) {
     var showValue,
       needGateWay,
       timeout,
@@ -414,44 +418,44 @@ function _fetchOptions() {
       valueIsNumber,
       rows,
       data,
-      _args2 = arguments;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+      _args4 = arguments;
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          showValue = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true;
-          needGateWay = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : true;
-          timeout = _args2.length > 6 && _args2[6] !== undefined ? _args2[6] : 60000;
-          isGet = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : true;
-          valueIsNumber = _args2.length > 8 && _args2[8] !== undefined ? _args2[8] : false;
+          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) {
-            _context2.next = 14;
+            _context4.next = 14;
             break;
           }
-          _context2.next = 8;
-          return httpGet(url, param, needGateWay, timeout);
+          _context4.next = 8;
+          return httpBatchGet(url, param, needGateWay, timeout);
         case 8:
-          _context2.t0 = _context2.sent.rows;
-          if (_context2.t0) {
-            _context2.next = 11;
+          _context4.t0 = _context4.sent.rows;
+          if (_context4.t0) {
+            _context4.next = 11;
             break;
           }
-          _context2.t0 = [];
+          _context4.t0 = [];
         case 11:
-          rows = _context2.t0;
-          _context2.next = 20;
+          rows = _context4.t0;
+          _context4.next = 20;
           break;
         case 14:
-          _context2.next = 16;
-          return httpPost(url, param, true, needGateWay, timeout);
+          _context4.next = 16;
+          return httpBatchPost(url, param, needGateWay, timeout);
         case 16:
-          _context2.t1 = _context2.sent.rows;
-          if (_context2.t1) {
-            _context2.next = 19;
+          _context4.t1 = _context4.sent.rows;
+          if (_context4.t1) {
+            _context4.next = 19;
             break;
           }
-          _context2.t1 = [];
+          _context4.t1 = [];
         case 19:
-          rows = _context2.t1;
+          rows = _context4.t1;
         case 20:
           data = (rows || []).map(function (o) {
             return _objectSpread(_objectSpread({}, o), {}, {
@@ -460,19 +464,262 @@ function _fetchOptions() {
               label: (showValue ? o[valueField] + '→' : '') + o[labelField]
             });
           });
-          return _context2.abrupt("return", data);
+          return _context4.abrupt("return", data);
         case 22:
         case "end":
-          return _context2.stop();
+          return _context4.stop();
       }
-    }, _callee2);
+    }, _callee4);
   }));
   return _fetchOptions.apply(this, arguments);
 }
-export var checkResourceRight = function checkResourceRight(ids) {
+export var getResourceRight = function getResourceRight(ids) {
   var url = '/lesoon/lesoon-petrel-permission-api/sysUserRole/selectResourceIds';
   return httpPost(url, {
     resourceIds: ids
   }, true, false);
 };
+// 默认分批获取数据的大小
+var defaultPageSize = 2000;
+/**
+ * 分批获取数据
+ *
+ * @param url
+ * @param params
+ * @param method
+ * @param needGateWay
+ * @param timeout
+ * @returns
+ */
+function httpBatchRequest(_x7) {
+  return _httpBatchRequest.apply(this, arguments);
+}
+/**
+ * 分批获取数据，当一次性取大于2000条，且是第一页时，分多次去取，避免一次性取太多数据导致后端工程压力过大
+ *
+ * 注意：如果pageSize小于等于2000，或不是取第一页数据时，直接使用普通请求
+ *
+ * @param url
+ * @param params
+ * @param needGateWay
+ * @param timeout
+ * @returns
+ */
+function _httpBatchRequest() {
+  _httpBatchRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url) {
+    var params,
+      method,
+      needGateWay,
+      timeout,
+      urlPageSize,
+      urlPageNum,
+      pageSize,
+      pageNum,
+      isV2,
+      PAGE_SIZE,
+      PAGE_NUM,
+      cleanUrl,
+      batchSize,
+      allRows,
+      total,
+      currentPage,
+      _objectSpread2,
+      firstParams,
+      firstResponse,
+      firstData,
+      actualPageSize,
+      totalPages,
+      maxConcurrent,
+      remainingPages,
+      i,
+      _i,
+      batchPages,
+      batchRequests,
+      batchResponses,
+      _args5 = arguments;
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.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;
+          // 从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;
+            break;
+          }
+          return _context5.abrupt("return", ajax(url, params, method, needGateWay, true, timeout));
+        case 10:
+          isV2 = url.includes('page.size') || (params === null || params === void 0 ? void 0 : params['page.size']) ? true : false;
+          PAGE_SIZE = isV2 ? 'page.size' : 'pageSize';
+          PAGE_NUM = isV2 ? 'page.pn' : 'page'; // 分批获取数据时，需要从URL中移除原有的pageSize和page参数
+          cleanUrl = url;
+          if (urlPageSize) {
+            cleanUrl = setUrlQuery(cleanUrl, _defineProperty({}, PAGE_SIZE, '')).replace("&".concat(PAGE_SIZE, "="), '').replace("".concat(PAGE_SIZE, "="), '');
+          }
+          if (urlPageNum) {
+            cleanUrl = setUrlQuery(cleanUrl, _defineProperty({}, PAGE_NUM, '')).replace("&".concat(PAGE_NUM, "="), '').replace("".concat(PAGE_NUM, "="), '');
+          }
+          // 分批获取数据
+          batchSize = defaultPageSize;
+          allRows = [];
+          total = 0;
+          currentPage = pageNum;
+          _context5.prev = 20;
+          // 第一次请求，获取总数
+          firstParams = _objectSpread(_objectSpread({}, params), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, PAGE_SIZE, batchSize), _defineProperty(_objectSpread2, PAGE_NUM, currentPage), _objectSpread2));
+          _context5.next = 24;
+          return ajax(cleanUrl, firstParams, method, needGateWay, true, timeout);
+        case 24:
+          firstResponse = _context5.sent;
+          firstData = firstResponse; // 如果返回值没有 rows 或 total，直接返回普通请求
+          if (!(!('rows' in firstData) || !('total' in firstData))) {
+            _context5.next = 28;
+            break;
+          }
+          return _context5.abrupt("return", ajax(url, params, method, needGateWay, true, timeout));
+        case 28:
+          if (firstData.rows) {
+            allRows.push.apply(allRows, _toConsumableArray(firstData.rows));
+            total = firstData.total || 0;
+          }
+          // 如果total小于等于defaultPageSize，不需要分批获取，直接返回
+          if (!(total <= defaultPageSize)) {
+            _context5.next = 31;
+            break;
+          }
+          return _context5.abrupt("return", firstResponse);
+        case 31:
+          // 计算实际需要获取的数据量（不超过用户传入的pageSize）
+          actualPageSize = Math.min(pageSize, total); // 计算需要请求的总页数（基于实际需要的数据量）
+          totalPages = Math.ceil(actualPageSize / batchSize); // 如果还有更多数据需要获取
+          if (!(totalPages > 1)) {
+            _context5.next = 48;
+            break;
+          }
+          // 分批并发请求，每次最多6个并发
+          maxConcurrent = 6;
+          remainingPages = []; // 准备所有需要请求的页码
+          for (i = currentPage + 1; i <= totalPages; i++) {
+            remainingPages.push(i);
+          }
+          // 分批处理请求
+          _i = 0;
+        case 38:
+          if (!(_i < remainingPages.length)) {
+            _context5.next = 48;
+            break;
+          }
+          batchPages = remainingPages.slice(_i, _i + maxConcurrent);
+          batchRequests = batchPages.map(function (pageNum) {
+            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));
+            return ajax(cleanUrl, requestParams, method, needGateWay, true, timeout);
+          }); // 并发执行当前批次的请求
+          _context5.next = 43;
+          return Promise.all(batchRequests);
+        case 43:
+          batchResponses = _context5.sent;
+          // 合并当前批次的响应数据
+          batchResponses.forEach(function (response) {
+            var data = response;
+            if (data.rows) {
+              allRows.push.apply(allRows, _toConsumableArray(data.rows));
+            }
+          });
+        case 45:
+          _i += maxConcurrent;
+          _context5.next = 38;
+          break;
+        case 48:
+          // 如果获取的数据超过了用户要求的pageSize，进行截取
+          if (allRows.length > actualPageSize) {
+            allRows.splice(actualPageSize);
+          }
+          // 返回合并后的数据，保持与原始响应格式一致
+          return _context5.abrupt("return", _objectSpread(_objectSpread({}, firstResponse), {}, {
+            rows: allRows,
+            total: total // 保持原始的total值
+          }));
+        case 52:
+          _context5.prev = 52;
+          _context5.t0 = _context5["catch"](20);
+          throw _context5.t0;
+        case 55:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5, null, [[20, 52]]);
+  }));
+  return _httpBatchRequest.apply(this, arguments);
+}
+export var httpBatchGet = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url) {
+    var params,
+      needGateWay,
+      timeout,
+      _args2 = arguments;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          params = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
+          needGateWay = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : true;
+          timeout = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : 60000;
+          return _context2.abrupt("return", httpBatchRequest(url, params, 'get', needGateWay, timeout));
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function httpBatchGet(_x8) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+/**
+ * 分批获取数据，当一次性取大于2000条，且是第一页时，分多次去取，避免一次性取太多数据导致后端工程压力过大
+ *
+ * 注意：如果pageSize小于等于2000，或不是取第一页数据时，直接使用普通请求
+ *
+ * @param url
+ * @param params
+ * @param needGateWay
+ * @param timeout
+ * @returns
+ */
+export var httpBatchPost = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(url) {
+    var params,
+      needGateWay,
+      timeout,
+      _args3 = arguments;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          params = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
+          needGateWay = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : true;
+          timeout = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : 60000;
+          return _context3.abrupt("return", httpBatchRequest(url, params, 'post', needGateWay, timeout));
+        case 4:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function httpBatchPost(_x9) {
+    return _ref3.apply(this, arguments);
+  };
+}();
 export default request;

package/lib/http/mdmRequest.d.ts

@@ -1,30 +1,30 @@
 /**
  * @param params 请求参数
- * @name 获取主数据货主数据，调用接口/lesoon-mdm-center-api/bmOwner/findAll
+ * @name 获取主数据货主数据，调用接口/lesoon-mdm-center-api/bmOwner/page
  * @returns
  */
 export declare const getOwner: (params?: any) => Promise<any>;
 /**
  * @param params 请求参数
- * @name 获取主数据仓库数据，调用接口/lesoon-mdm-center-api/bmStore/findAll
+ * @name 获取主数据仓库数据，调用接口/lesoon-mdm-center-api/bmStore/page
  * @returns
  */
 export declare const getStore: (params?: any) => Promise<any>;
 /**
  * @param params 请求参数
- * @name 获取主数据品牌部数据，调用接口/lesoon-mdm-center-api/bmBrandDept/findAll
+ * @name 获取主数据品牌部数据，调用接口/lesoon-mdm-center-api/bmBrandDept/page
  * @returns
  */
 export declare const getBrandDept: (params?: any) => Promise<any>;
 /**
  * @param params 请求参数
- * @name 获取主数据物流大区数据，调用接口/lesoon-mdm-center-api/bmLogisticRegion/findAll
+ * @name 获取主数据物流大区数据，调用接口/lesoon-mdm-center-api/bmLogisticRegion/page
  * @returns
  */
 export declare const getLogisticRegion: (params?: any) => Promise<any>;
 /**
  * @param where: {forwarderLevel: 1 // 承运商级别 1:一级 2:二级 , forwarderType: 1 // 承运商类型 0:货运公司 1:快递公司 }
- * @name 获取快递/快运承运商，调用接口/lesoon-mdm-center-api/bmForwarder/findAll
+ * @name 获取快递/快运承运商，调用接口/lesoon-mdm-center-api/bmForwarder/page
  * @returns
  */
 export declare const getExpressCompany: (params?: any) => Promise<any>;
@@ -34,48 +34,48 @@ export declare const getExpressCompany: (params?: any) => Promise<any>;
  */
 export declare const getExpressCompanyPage: (params?: any) => Promise<any>;
 /**
- * @name 实体仓，调用接口/lesoon-mdm-center-api/bmPhysicalStore/findAll
+ * @name 实体仓，调用接口/lesoon-mdm-center-api/bmPhysicalStore/page
  * @returns
  */
 export declare const getPhysicalStore: (params?: any) => Promise<any>;
 /**
  * @param params
- * @name 结算大类，调用接口/lesoon-mdm-center-api/bmSettlementCate/findAll
+ * @name 结算大类，调用接口/lesoon-mdm-center-api/bmSettlementCate/page
  * @returns
  */
 export declare const getSettleCategory: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 获取损益主体，调用接口/lesoon-mdm-center-api/bmProfitLossMain/findAll
+ * @name 获取损益主体，调用接口/lesoon-mdm-center-api/bmProfitLossMain/page
  * @returns
  */
 export declare const getProfitLossMain: (param?: any) => Promise<any>;
 /**
  * @param params
- * @name 结算公司，调用接口/lesoon-mdm-center-api/bmSettleCompany/findAll
+ * @name 结算公司，调用接口/lesoon-mdm-center-api/bmSettleCompany/page
  * @returns
  */
 export declare const getSettleCompany: (params?: any) => Promise<any>;
 /**
  * @param params
- * @name 货权，调用接口/lesoon-mdm-center-api/bmPowerUnit/findAll
+ * @name 货权，调用接口/lesoon-mdm-center-api/bmPowerUnit/page
  * @returns
  */
 export declare const getPowerUnit: (params?: any) => Promise<any>;
 /**
  * @param params
- * @name 结算账号，调用接口/lesoon-mdm-center-api/bmSettleAccount/findAll
+ * @name 结算账号，调用接口/lesoon-mdm-center-api/bmSettleAccount/page
  * @returns
  */
 export declare const getSettleAccount: (params?: any) => Promise<any>;
 /**
- * @name 获取物流大类，调用接口/lesoon-mdm-center-api/bmLogisticCategory/findAll
+ * @name 获取物流大类，调用接口/lesoon-mdm-center-api/bmLogisticCategory/page
  * @returns
  */
 export declare const getLogisticCategory: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 管理城市，调用接口/lesoon-mdm-center-api/bmManagingCity/findAll
+ * @name 管理城市，调用接口/lesoon-mdm-center-api/bmManagingCity/page
  * @returns
  */
 export declare const getManagingCity: (params?: any) => Promise<any>;
@@ -88,13 +88,13 @@ interface AreaParams {
 }
 /**
  * @param {where: {level:'province'}} level Province=省,city=市,district=区
- * @name 获取省市区，调用接口/lesoon-mdm-center-api/sysAdministrativeDivision/findAll
+ * @name 获取省市区，调用接口/lesoon-mdm-center-api/sysAdministrativeDivision/page
  * @returns
  */
 export declare const getArea: (params?: AreaParams) => Promise<any>;
 /**
  * @param param
- * @name 获取集散中心，调用接口/lesoon-mdm-center-api/tmsTransportLocno/findAll
+ * @name 获取集散中心，调用接口/lesoon-mdm-center-api/tmsTransportLocno/page
  * @returns
  */
 export declare const getTransportLocno: (params?: any) => Promise<any>;
@@ -118,37 +118,37 @@ export declare const getUploadPointPage: (params?: any) => Promise<any>;
 export declare const getShopPage: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 获取颜色，调用接口/lesoon-mdm-center-api/bmColor/findAll
+ * @name 获取颜色，调用接口/lesoon-mdm-center-api/bmColor/page
  * @returns
  */
 export declare const getColor: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 获取尺码类型，调用接口/lesoon-mdm-center-api/bmSizeType/findAll
+ * @name 获取尺码类型，调用接口/lesoon-mdm-center-api/bmSizeType/page
  * @returns
  */
 export declare const getSizeType: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 获取性别，调用接口/lesoon-mdm-center-api/bmGender/findAll
+ * @name 获取性别，调用接口/lesoon-mdm-center-api/bmGender/page
  * @returns
  */
 export declare const getGender: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 获取年份，调用接口/lesoon-mdm-center-api/bmYear/findAll
+ * @name 获取年份，调用接口/lesoon-mdm-center-api/bmYear/page
  * @returns
  */
 export declare const getYear: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 获取季节，调用接口/lesoon-mdm-center-api/bmSeason/findAll
+ * @name 获取季节，调用接口/lesoon-mdm-center-api/bmSeason/page
  * @returns
  */
 export declare const getSeason: (params?: any) => Promise<any>;
 /**
  * @param param
- * @name 获取品类，调用接口/lesoon-mdm-center-api/bmCategory/findAll
+ * @name 获取品类，调用接口/lesoon-mdm-center-api/bmCategory/page
  * @returns
  */
 export declare const getCategory: (params?: any) => Promise<any>;