ls-pro-common 3.1.26 → 3.1.29

package/lib/hooks/index.js

@@ -0,0 +1,13 @@
+export { default as useSingle } from './useSingle';
+export { default as useDtl } from './useDtl';
+export { default as usePermission } from './usePermission';
+export { default as useGetState } from './useGetState';
+export { default as useFilterLocal } from './useFilterBack';
+export { default as useBaseDict } from './useBaseDict';
+export { default as useSelectOptions } from './useSelectOptions';
+export { default as showConfirmFun } from './useShowConfirm';
+export { default as useQueue } from './useQueue';
+export { default as useSyncState } from './useSyncState';
+export { useApiLoader } from './useApiLoad';
+export { useDict } from './useDict';
+export { default as useMdm } from './useMdm';

package/lib/http/index.js

@@ -525,6 +525,8 @@ function _httpBatchRequest() {
       currentPage,
       _objectSpread2,
       firstParams,
+      api,
+      _setUrlQuery3,
       firstResponse,
       firstData,
       actualPageSize,
@@ -555,7 +557,8 @@ function _httpBatchRequest() {
           }
           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;
+          // 是否为 2.0版本的api。
+          isV2 = url.includes('page.size') || (params === null || params === void 0 ? void 0 : params['page.size']) ? true : false; // 不同版本api的请求分页关键字处理，
           PAGE_SIZE = isV2 ? 'page.size' : 'pageSize';
           PAGE_NUM = isV2 ? 'page.pn' : 'page'; // 分批获取数据时，需要从URL中移除原有的pageSize和page参数
           cleanUrl = url;
@@ -572,34 +575,38 @@ function _httpBatchRequest() {
           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:
+          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;
+          return ajax(api, firstParams, method, needGateWay, true, timeout);
+        case 26:
           firstResponse = _context5.sent;
           firstData = firstResponse; // 如果返回值没有 rows 或 total，直接返回普通请求
           if (!(!('rows' in firstData) || !('total' in firstData))) {
-            _context5.next = 28;
+            _context5.next = 30;
             break;
           }
           return _context5.abrupt("return", ajax(url, params, method, needGateWay, true, timeout));
-        case 28:
+        case 30:
           if (firstData.rows) {
             allRows.push.apply(allRows, _toConsumableArray(firstData.rows));
             total = firstData.total || 0;
           }
           // 如果total小于等于defaultPageSize，不需要分批获取，直接返回
           if (!(total <= defaultPageSize)) {
-            _context5.next = 31;
+            _context5.next = 33;
             break;
           }
           return _context5.abrupt("return", firstResponse);
-        case 31:
+        case 33:
           // 计算实际需要获取的数据量（不超过用户传入的pageSize）
           actualPageSize = Math.min(pageSize, total); // 计算需要请求的总页数（基于实际需要的数据量）
           totalPages = Math.ceil(actualPageSize / batchSize); // 如果还有更多数据需要获取
           if (!(totalPages > 1)) {
-            _context5.next = 48;
+            _context5.next = 50;
             break;
           }
           // 分批并发请求，每次最多6个并发
@@ -610,9 +617,9 @@ function _httpBatchRequest() {
           }
           // 分批处理请求
           _i = 0;
-        case 38:
+        case 40:
           if (!(_i < remainingPages.length)) {
-            _context5.next = 48;
+            _context5.next = 50;
             break;
           }
           batchPages = remainingPages.slice(_i, _i + maxConcurrent);
@@ -626,11 +633,15 @@ function _httpBatchRequest() {
               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);
+            if (method === 'post') {
+              var _setUrlQuery4;
+              api = setUrlQuery(cleanUrl, (_setUrlQuery4 = {}, _defineProperty(_setUrlQuery4, PAGE_SIZE, currentPageSize), _defineProperty(_setUrlQuery4, PAGE_NUM, pageNum), _setUrlQuery4));
+            }
+            return ajax(api, requestParams, method, needGateWay, true, timeout);
           }); // 并发执行当前批次的请求
-          _context5.next = 43;
+          _context5.next = 45;
           return Promise.all(batchRequests);
-        case 43:
+        case 45:
           batchResponses = _context5.sent;
           // 合并当前批次的响应数据
           batchResponses.forEach(function (response) {
@@ -639,11 +650,11 @@ function _httpBatchRequest() {
               allRows.push.apply(allRows, _toConsumableArray(data.rows));
             }
           });
-        case 45:
+        case 47:
           _i += maxConcurrent;
-          _context5.next = 38;
+          _context5.next = 40;
           break;
-        case 48:
+        case 50:
           // 如果获取的数据超过了用户要求的pageSize，进行截取
           if (allRows.length > actualPageSize) {
             allRows.splice(actualPageSize);
@@ -653,15 +664,15 @@ function _httpBatchRequest() {
             rows: allRows,
             total: total // 保持原始的total值
           }));
-        case 52:
-          _context5.prev = 52;
+        case 54:
+          _context5.prev = 54;
           _context5.t0 = _context5["catch"](20);
           throw _context5.t0;
-        case 55:
+        case 57:
         case "end":
           return _context5.stop();
       }
-    }, _callee5, null, [[20, 52]]);
+    }, _callee5, null, [[20, 54]]);
   }));
   return _httpBatchRequest.apply(this, arguments);
 }

package/lib/index.d.ts

@@ -1,46 +1,24 @@
-import DtlLayout from './components/DtlLayout';
-import InputTable from './components/InputTable';
-import Page404 from './components/404';
-import Loading from './components/Loading';
-import IconSelector from './components/IconSelector';
-import ImageSelector from './components/ImageSelector';
-import InputMultiLine from './components/InputMultiLine';
-import AreaCascader from './components/AreaCascader';
-import AreaCascaderPanel from './components/AreaCascaderPanel';
-import DescritionCard from './components/DescritionCard';
-import Permission from './components/Permission';
-import GroupTip from './components/GroupTip';
-import IconBack from './components/IconBack';
-import IconText from './components/IconText';
-import IconQuestion from './components/IconQuestion';
-import IconBell from './components/IconBell';
-import IconSearch from './components/IconSearch';
-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, httpBatchGet, httpBatchPost, getResourceRight } from './http';
-import BaseService from './service/BaseService';
+/** 组件 */
+export * from './components';
+/** Hooks */
+export * from './hooks';
+/** Http请求 */
+export { default as request } from './http';
+export * from './http';
+/** 基础服务 */
+export { default as BaseService } from './service/BaseService';
+/** 导出进度及完成后自动下载 */
+export { default as exportProcess } from './utils/exportProcess';
+/** Utils方法 */
+export * from './utils';
+/** 主数据请求 */
 import * as mdmRequest from './http/mdmRequest';
+/** Utils 对象 */
 import * as utils from './utils';
-import exportProcess from './utils/exportProcess';
-/** Hooks */
-import useSingle from './hooks/useSingle';
-import useDtl from './hooks/useDtl';
-import usePermission from './hooks/usePermission';
-import useGetState from './hooks/useGetState';
-import useFilterLocal from './hooks/useFilterBack';
-import useBaseDict from './hooks/useBaseDict';
-import useSelectOptions from './hooks/useSelectOptions';
-import showConfirmFun from './hooks/useShowConfirm';
-import useQueue from './hooks/useQueue';
-import { useDict } from './hooks/useDict';
-import useMdm from './hooks/useMdm';
+export { utils, mdmRequest };
 /** Type */
-import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
-import type { DtlLyaoutProps } from './components/DtlLayout';
-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, httpBatchGet, httpBatchPost, getResourceRight, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog, };
+export type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
+export type { DtlLyaoutProps } from './components/DtlLayout';
+export type { DescritionCardProps } from './components/DescritionCard';
+export type { PermissionProps } from './components/Permission';
+export type { TDict } from './hooks/useDict';

package/lib/index.js

@@ -1,39 +1,18 @@
-import DtlLayout from './components/DtlLayout';
-import InputTable from './components/InputTable';
-import Page404 from './components/404';
-import Loading from './components/Loading';
-import IconSelector from './components/IconSelector';
-import ImageSelector from './components/ImageSelector';
-import InputMultiLine from './components/InputMultiLine';
-import AreaCascader from './components/AreaCascader';
-import AreaCascaderPanel from './components/AreaCascaderPanel';
-import DescritionCard from './components/DescritionCard';
-import Permission from './components/Permission';
-import GroupTip from './components/GroupTip';
-import IconBack from './components/IconBack';
-import IconText from './components/IconText';
-import IconQuestion from './components/IconQuestion';
-import IconBell from './components/IconBell';
-import IconSearch from './components/IconSearch';
-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, httpBatchGet, httpBatchPost, getResourceRight } from './http';
-import BaseService from './service/BaseService';
+/** 组件 */
+export * from './components';
+/** Hooks */
+export * from './hooks';
+/** Http请求 */
+export { default as request } from './http';
+export * from './http';
+/** 基础服务 */
+export { default as BaseService } from './service/BaseService';
+/** 导出进度及完成后自动下载 */
+export { default as exportProcess } from './utils/exportProcess';
+/** Utils方法 */
+export * from './utils';
+/** 主数据请求 */
 import * as mdmRequest from './http/mdmRequest';
+/** Utils 对象 */
 import * as utils from './utils';
-import exportProcess from './utils/exportProcess';
-/** Hooks */
-import useSingle from './hooks/useSingle';
-import useDtl from './hooks/useDtl';
-import usePermission from './hooks/usePermission';
-import useGetState from './hooks/useGetState';
-import useFilterLocal from './hooks/useFilterBack';
-import useBaseDict from './hooks/useBaseDict';
-import useSelectOptions from './hooks/useSelectOptions';
-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, httpBatchGet, httpBatchPost, getResourceRight, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog };
+export { utils, mdmRequest };

package/lib/utils/clac.d.ts

@@ -1,32 +1,28 @@
 /**
- * Add 加法函数，val1参数一，val2参数二
+ * Add 加法函数，支持多个参数相加
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相加结果
  */
-export declare const add: (val1: number | string, val2: number | string) => number;
+export declare const add: (...values: (number | string)[]) => string | number;
 /**
- * Sub 减法函数，val1参数一，val2参数二
+ * Sub 减法函数，支持多个参数相减
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相减结果
  */
-export declare const sub: (val1: number | string, val2: number | string) => number;
+export declare const sub: (...values: (number | string)[]) => string | number;
 /**
- * Mul 乘法函数，val1参数一，val2参数二
+ * Mul 乘法函数，支持多个参数相乘
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相乘结果
  */
-export declare const mul: (val1: number | string, val2: number | string) => number;
+export declare const mul: (...values: (number | string)[]) => string | number;
 /**
- * Div 除法函数，val1参数一，val2参数二
+ * Div 除法函数，支持多个参数相除
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相除结果
  */
-export declare const div: (val1: number | string, val2: number | string) => number;
+export declare const div: (...values: (number | string)[]) => string | number;

package/lib/utils/clac.js

@@ -1,41 +1,71 @@
 import Big from 'big.js';
 /**
- * Add 加法函数，val1参数一，val2参数二
+ * Add 加法函数，支持多个参数相加
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相加结果
  */
-export var add = function add(val1, val2) {
-  return Number(new Big(Number(val1)).plus(Number(val2)).toString());
+export var add = function add() {
+  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
+    values[_key] = arguments[_key];
+  }
+  if (values.length === 0) return 0;
+  if (values.length === 1) return Number(values[0]) || 0;
+  return values.reduce(function (acc, cur) {
+    return Number(new Big(Number(acc)).plus(Number(cur)));
+  }, 0);
 };
 /**
- * Sub 减法函数，val1参数一，val2参数二
+ * Sub 减法函数，支持多个参数相减
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相减结果
  */
-export var sub = function sub(val1, val2) {
-  return Number(new Big(Number(val1)).minus(Number(val2)).toString());
+export var sub = function sub() {
+  for (var _len2 = arguments.length, values = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+    values[_key2] = arguments[_key2];
+  }
+  if (values.length === 0) return 0;
+  if (values.length === 1) return Number(values[0]) || 0;
+  return values.reduce(function (acc, cur) {
+    return Number(new Big(Number(acc)).minus(Number(cur)));
+  });
 };
 /**
- * Mul 乘法函数，val1参数一，val2参数二
+ * Mul 乘法函数，支持多个参数相乘
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相乘结果
  */
-export var mul = function mul(val1, val2) {
-  return Number(new Big(Number(val1)).times(Number(val2)).toString());
+export var mul = function mul() {
+  for (var _len3 = arguments.length, values = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+    values[_key3] = arguments[_key3];
+  }
+  if (values.length === 0) return 0;
+  if (values.length === 1) return Number(values[0]) || 0;
+  return values.reduce(function (acc, cur) {
+    return Number(new Big(Number(acc)).times(Number(cur)));
+  }, 1); // 乘法从1开始
 };
 /**
- * Div 除法函数，val1参数一，val2参数二
+ * Div 除法函数，支持多个参数相除
  *
- * @param val1
- * @param val2
- * @returns
+ * @param values 数值参数，支持任意数量
+ * @returns 相除结果
  */
-export var div = function div(val1, val2) {
-  return Number(new Big(Number(val1)).div(Number(val2)).toString());
+export var div = function div() {
+  for (var _len4 = arguments.length, values = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+    values[_key4] = arguments[_key4];
+  }
+  if (values.length === 0) return 0;
+  if (values.length === 1) return Number(values[0]) || 0;
+  // 检查除数是否为零
+  for (var i = 1; i < values.length; i++) {
+    if (Number(values[i]) === 0) {
+      throw new Error('除数不能为零');
+    }
+  }
+  return values.reduce(function (acc, cur) {
+    return Number(new Big(Number(acc)).div(Number(cur)));
+  });
 };

package/lib/utils/index.d.ts

@@ -28,10 +28,10 @@ export declare const setUrlQuery: (url: string, keyvals?: Record<string, any>) =
  *
  * @param url 原url，以 / 打头
  * @param gatewayKey 设置gateway关键字 默认为 'gateway'
- * @param defGateway 默认网关 ''
+ * @param defaultGateway 默认网关 ''
  * @returns
  */
-export declare const toGatewayUrl: (url: string, gatewayKey?: string, defGateway?: string) => string;
+export declare const toGatewayUrl: (url: string, gatewayKey?: string, defaultGateway?: string) => string;
 /**
  * 设置文档title
  *
@@ -75,14 +75,14 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @param {boolean} session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
-export declare const getCache: (key: string, session?: boolean) => string | null;
+export declare const getCache: any;
 /**
  * 读取本地缓存，优先从sessionStorage 取，取不到时再从 localStorage取
  *
  * @param key
  * @returns
  */
-export declare const getCacheSessionFirst: (key: string) => string | null;
+export declare const getCacheSessionFirst: (key: string) => any;
 /**
  * @param key 关键字，不传清除所有
  * @param session 是否session storage , 默认 localStorage
@@ -226,5 +226,6 @@ export declare const urlDownloadDomain: (url: string) => string;
  *
  * @param url 文件地址
  * @param fileName 文件名
+ * @param isBlank 是否新开窗口下载，默认新开窗口，不影响原页面展示
  */
-export declare const downloadFile: (url: string, fileName?: string | undefined) => void;
+export declare const downloadFile: (url: string, fileName?: string | undefined, isBlank?: boolean) => void;

package/lib/utils/index.js

@@ -82,22 +82,26 @@ export var setUrlQuery = function setUrlQuery(url) {
  *
  * @param url 原url，以 / 打头
  * @param gatewayKey 设置gateway关键字 默认为 'gateway'
- * @param defGateway 默认网关 ''
+ * @param defaultGateway 默认网关 ''
  * @returns
  */
 export var toGatewayUrl = function toGatewayUrl(url) {
   var gatewayKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'gateway';
-  var defGateway = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var defaultGateway = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  url = url || '';
   // 如果url带有名称，不需要设置网关
   if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
+  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/')) {
+    return location.origin + url;
+  }
   // 读取项目的默认网关
-  if (!defGateway) {
+  if (!defaultGateway) {
     var _top;
     // @ts-ignore
-    defGateway = window.defaultGateway || ((_top = top) === null || _top === void 0 ? void 0 : _top.window.lsMainGateway) || '';
+    defaultGateway = window.defaultGateway || ((_top = top) === null || _top === void 0 ? void 0 : _top.window.lsMainGateway) || '';
   }
   // 取网关的顺序， 1.取url里的传参，2.取资源里的网关， 3. 取项目里设置的默认网关
-  var gateway = getUrlQuery(gatewayKey) || getResourceProps(gatewayKey) || defGateway;
+  var gateway = getUrlQuery(gatewayKey) || getResourceProps(gatewayKey) || defaultGateway;
   // 如果没有找到网关，直接从项目配置中取网关
   if (!gateway) {
     var projects = JSON.parse(sessionStorage.getItem('lsProjects') || '[]');
@@ -113,8 +117,7 @@ export var toGatewayUrl = function toGatewayUrl(url) {
   }
   // 网关加上域名，避免多次设置
   if (gateway && !gateway.startsWith('http')) {
-    var h = location.origin ? location.origin : "".concat(location.protocol, "//").concat(location.hostname).concat(location.port ? ':' + location.port : '');
-    gateway = h + gateway;
+    gateway = location.origin + gateway;
   }
   return gateway + url;
 };
@@ -490,12 +493,17 @@ export var urlDownloadDomain = function urlDownloadDomain(url) {
  *
  * @param url 文件地址
  * @param fileName 文件名
+ * @param isBlank 是否新开窗口下载，默认新开窗口，不影响原页面展示
  */
 export var downloadFile = function downloadFile(url, fileName) {
+  var isBlank = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var a = document.createElement('a');
   url = urlDownloadDomain(url);
   a.href = url;
-  // a.target = '_blank'; // 新开屏有闪烁
+  if (isBlank) {
+    a.target = '_blank'; // 新开屏有闪烁,但不会导致下载文件不存在或无法访问时原始页面出错。
+  }
+
   if (fileName) {
     a.setAttribute('download', fileName);
   }

package/package.json

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