ls-pro-common 3.1.22 → 3.1.24

package/lib/http/index.d.ts

@@ -71,4 +71,16 @@ export declare function getDict(dictCodes: string, showValue?: boolean, needGate
  */
 export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
 export declare const checkResourceRight: (ids: string[]) => Promise<any>;
+/**
+ * 分批获取数据，当一次性取大于2000条，且是第一页时，分多次去取，避免一次性取太多数据导致后端工程压力过大
+ *
+ * 注意：如果pageSize小于等于2000，或不是取第一页数据时，直接使用普通请求
+ *
+ * @param url
+ * @param params
+ * @param needGateWay
+ * @param timeout
+ * @returns
+ */
+export declare const httpBatchGet: (url: string, params?: Record<string, any>, needGateWay?: boolean, timeout?: number) => Promise<any>;
 export default request;

package/lib/http/index.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -91,6 +92,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 +409,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 _callee3(url, param, valueField, labelField) {
     var showValue,
       needGateWay,
       timeout,
@@ -414,44 +417,44 @@ function _fetchOptions() {
       valueIsNumber,
       rows,
       data,
-      _args2 = arguments;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+      _args3 = arguments;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.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 = _args3.length > 4 && _args3[4] !== undefined ? _args3[4] : true;
+          needGateWay = _args3.length > 5 && _args3[5] !== undefined ? _args3[5] : true;
+          timeout = _args3.length > 6 && _args3[6] !== undefined ? _args3[6] : 60000;
+          isGet = _args3.length > 7 && _args3[7] !== undefined ? _args3[7] : true;
+          valueIsNumber = _args3.length > 8 && _args3[8] !== undefined ? _args3[8] : false;
           if (!isGet) {
-            _context2.next = 14;
+            _context3.next = 14;
             break;
           }
-          _context2.next = 8;
+          _context3.next = 8;
           return httpGet(url, param, needGateWay, timeout);
         case 8:
-          _context2.t0 = _context2.sent.rows;
-          if (_context2.t0) {
-            _context2.next = 11;
+          _context3.t0 = _context3.sent.rows;
+          if (_context3.t0) {
+            _context3.next = 11;
             break;
           }
-          _context2.t0 = [];
+          _context3.t0 = [];
         case 11:
-          rows = _context2.t0;
-          _context2.next = 20;
+          rows = _context3.t0;
+          _context3.next = 20;
           break;
         case 14:
-          _context2.next = 16;
+          _context3.next = 16;
           return httpPost(url, param, true, needGateWay, timeout);
         case 16:
-          _context2.t1 = _context2.sent.rows;
-          if (_context2.t1) {
-            _context2.next = 19;
+          _context3.t1 = _context3.sent.rows;
+          if (_context3.t1) {
+            _context3.next = 19;
             break;
           }
-          _context2.t1 = [];
+          _context3.t1 = [];
         case 19:
-          rows = _context2.t1;
+          rows = _context3.t1;
         case 20:
           data = (rows || []).map(function (o) {
             return _objectSpread(_objectSpread({}, o), {}, {
@@ -460,12 +463,12 @@ function _fetchOptions() {
               label: (showValue ? o[valueField] + '→' : '') + o[labelField]
             });
           });
-          return _context2.abrupt("return", data);
+          return _context3.abrupt("return", data);
         case 22:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _fetchOptions.apply(this, arguments);
 }
@@ -475,4 +478,172 @@ export var checkResourceRight = function checkResourceRight(ids) {
     resourceIds: ids
   }, true, false);
 };
+/**
+ * 分批获取数据，当一次性取大于2000条，且是第一页时，分多次去取，避免一次性取太多数据导致后端工程压力过大
+ *
+ * 注意：如果pageSize小于等于2000，或不是取第一页数据时，直接使用普通请求
+ *
+ * @param url
+ * @param params
+ * @param needGateWay
+ * @param timeout
+ * @returns
+ */
+export var httpBatchGet = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url) {
+    var params,
+      needGateWay,
+      timeout,
+      urlPageSize,
+      urlPageNum,
+      pageSize,
+      pageNum,
+      cleanUrl,
+      batchSize,
+      allRows,
+      total,
+      currentPage,
+      firstParams,
+      firstResponse,
+      firstData,
+      actualPageSize,
+      totalPages,
+      maxConcurrent,
+      remainingPages,
+      i,
+      _i,
+      batchPages,
+      batchRequests,
+      batchResponses,
+      _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;
+          // 从URL中获取pageSize和page参数
+          urlPageSize = getUrlQuery('pageSize', url);
+          urlPageNum = getUrlQuery('page', url) || '1'; // 获取pageSize值，优先使用params中的，其次使用URL中的
+          pageSize = params.pageSize || (urlPageSize ? parseInt(urlPageSize) : 2000);
+          pageNum = params.page || (urlPageNum ? parseInt(urlPageNum) : 1); // 如果pageSize小于等于2000，或不是取第一页数据时，直接使用普通请求
+          if (!(pageSize <= 2000 || pageNum !== 1)) {
+            _context2.next = 9;
+            break;
+          }
+          return _context2.abrupt("return", ajax(url, params, 'get', needGateWay, true, timeout));
+        case 9:
+          // 分批获取数据时，需要从URL中移除原有的pageSize和page参数
+          cleanUrl = url;
+          if (urlPageSize) {
+            cleanUrl = setUrlQuery(cleanUrl, {
+              pageSize: ''
+            }).replace('&pageSize=', '').replace('pageSize=', '');
+          }
+          if (urlPageNum) {
+            cleanUrl = setUrlQuery(cleanUrl, {
+              page: ''
+            }).replace('&page=', '').replace('page=', '');
+          }
+          // 分批获取数据
+          batchSize = 2000;
+          allRows = [];
+          total = 0;
+          currentPage = pageNum;
+          _context2.prev = 16;
+          // 第一次请求，获取总数
+          firstParams = _objectSpread(_objectSpread({}, params), {}, {
+            pageSize: batchSize,
+            page: currentPage
+          });
+          _context2.next = 20;
+          return ajax(cleanUrl, firstParams, 'get', needGateWay, true, timeout);
+        case 20:
+          firstResponse = _context2.sent;
+          firstData = firstResponse;
+          if (firstData.rows) {
+            allRows.push.apply(allRows, _toConsumableArray(firstData.rows));
+            total = firstData.total || 0;
+          }
+          // 如果total小于等于2000，不需要分批获取，直接返回
+          if (!(total <= 2000)) {
+            _context2.next = 25;
+            break;
+          }
+          return _context2.abrupt("return", firstResponse);
+        case 25:
+          // 计算实际需要获取的数据量（不超过用户传入的pageSize）
+          actualPageSize = Math.min(pageSize, total); // 计算需要请求的总页数（基于实际需要的数据量）
+          totalPages = Math.ceil(actualPageSize / batchSize); // 如果还有更多数据需要获取
+          if (!(totalPages > 1)) {
+            _context2.next = 42;
+            break;
+          }
+          // 分批并发请求，每次最多6个并发
+          maxConcurrent = 6;
+          remainingPages = []; // 准备所有需要请求的页码
+          for (i = currentPage + 1; i <= totalPages; i++) {
+            remainingPages.push(i);
+          }
+          // 分批处理请求
+          _i = 0;
+        case 32:
+          if (!(_i < remainingPages.length)) {
+            _context2.next = 42;
+            break;
+          }
+          batchPages = remainingPages.slice(_i, _i + maxConcurrent);
+          batchRequests = batchPages.map(function (pageNum) {
+            // 计算当前页应该获取的数据量
+            var currentPageSize = batchSize;
+            // 如果是最后一页，计算实际需要的数据量
+            if (pageNum === totalPages) {
+              var remainingData = actualPageSize - (pageNum - 1) * batchSize;
+              currentPageSize = Math.max(0, remainingData);
+            }
+            var requestParams = _objectSpread(_objectSpread({}, params), {}, {
+              pageSize: currentPageSize,
+              page: pageNum
+            });
+            return ajax(cleanUrl, requestParams, 'get', needGateWay, true, timeout);
+          }); // 并发执行当前批次的请求
+          _context2.next = 37;
+          return Promise.all(batchRequests);
+        case 37:
+          batchResponses = _context2.sent;
+          // 合并当前批次的响应数据
+          batchResponses.forEach(function (response) {
+            var data = response;
+            if (data.rows) {
+              allRows.push.apply(allRows, _toConsumableArray(data.rows));
+            }
+          });
+        case 39:
+          _i += maxConcurrent;
+          _context2.next = 32;
+          break;
+        case 42:
+          // 如果获取的数据超过了用户要求的pageSize，进行截取
+          if (allRows.length > actualPageSize) {
+            allRows.splice(actualPageSize);
+          }
+          // 返回合并后的数据，保持与原始响应格式一致
+          return _context2.abrupt("return", _objectSpread(_objectSpread({}, firstResponse), {}, {
+            rows: allRows,
+            total: total // 保持原始的total值
+          }));
+        case 46:
+          _context2.prev = 46;
+          _context2.t0 = _context2["catch"](16);
+          throw _context2.t0;
+        case 49:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[16, 46]]);
+  }));
+  return function httpBatchGet(_x7) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 export default request;

package/lib/index.d.ts

@@ -19,7 +19,7 @@ import TagCheck from './components/TagCheck';
 import ViewOffice from './components/ViewOffice';
 import ProButton from './components/ProButton';
 import RecordLog from './components/RecordLog';
-import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
+import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions, httpBatchGet } from './http';
 import BaseService from './service/BaseService';
 import * as mdmRequest from './http/mdmRequest';
 import * as utils from './utils';
@@ -43,4 +43,4 @@ import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 import type { TDict } from './hooks/useDict';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps, TDict, };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog, };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, httpBatchGet, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog, };

package/lib/index.js

@@ -19,7 +19,7 @@ import TagCheck from './components/TagCheck';
 import ViewOffice from './components/ViewOffice';
 import ProButton from './components/ProButton';
 import RecordLog from './components/RecordLog';
-import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
+import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions, httpBatchGet } from './http';
 import BaseService from './service/BaseService';
 import * as mdmRequest from './http/mdmRequest';
 import * as utils from './utils';
@@ -36,4 +36,4 @@ import showConfirmFun from './hooks/useShowConfirm';
 import useQueue from './hooks/useQueue';
 import { useDict } from './hooks/useDict';
 import useMdm from './hooks/useMdm';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, httpBatchGet, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog };

package/lib/utils/clac.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Add 加法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export declare const add: (val1: number | string, val2: number | string) => number;
+/**
+ * Sub 减法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export declare const sub: (val1: number | string, val2: number | string) => number;
+/**
+ * Mul 乘法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export declare const mul: (val1: number | string, val2: number | string) => number;
+/**
+ * Div 除法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export declare const div: (val1: number | string, val2: number | string) => number;

package/lib/utils/clac.js

@@ -0,0 +1,41 @@
+import Big from 'big.js';
+/**
+ * Add 加法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export var add = function add(val1, val2) {
+  return Number(new Big(Number(val1)).plus(Number(val2)).toString());
+};
+/**
+ * Sub 减法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export var sub = function sub(val1, val2) {
+  return Number(new Big(Number(val1)).minus(Number(val2)).toString());
+};
+/**
+ * Mul 乘法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export var mul = function mul(val1, val2) {
+  return Number(new Big(Number(val1)).times(Number(val2)).toString());
+};
+/**
+ * Div 除法函数，val1参数一，val2参数二
+ *
+ * @param val1
+ * @param val2
+ * @returns
+ */
+export var div = function div(val1, val2) {
+  return Number(new Big(Number(val1)).div(Number(val2)).toString());
+};

package/lib/utils/index.d.ts

@@ -4,6 +4,7 @@ export * from './array';
 export * from './format';
 export * from './size';
 export * from './promise';
+export * from './clac';
 export { getBrowserId } from 'ls-pro-tools';
 /**
  * 获取 url 参数

package/lib/utils/index.js

@@ -7,6 +7,7 @@ export * from './array';
 export * from './format';
 export * from './size';
 export * from './promise';
+export * from './clac';
 export { getBrowserId } from 'ls-pro-tools';
 /**
  * 获取 url 参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.1.22",
+  "version": "3.1.24",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [
@@ -34,7 +34,8 @@
     "rc-util": "^5.0.6",
     "react-sortable-hoc": "^2.0.0",
     "swr": "1.1.0",
-    "@fingerprintjs/fingerprintjs": "^4.6.1"
+    "@fingerprintjs/fingerprintjs": "^4.6.1",
+    "big.js": "^6.2.1"
   },
   "peerDependencies": {
     "antd": "4.x",