ls-pro-common 3.1.7 → 3.1.9

package/es/http/index.d.ts

@@ -50,10 +50,11 @@ export declare function httpDelete(url: string, data: any, needGateWay?: boolean
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
  * @param timeout 超时时间,默认60000毫秒
+ * @param isGet 是否Get请求
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
-export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, valueIsNumber?: boolean): Promise<any>;
+export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  *
@@ -63,8 +64,10 @@ export declare function getDict(dictCode: string, showValue?: boolean, needGateW
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout
+ * @param isGet = true 是否get请求，默认true
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, valueIsNumber?: boolean): Promise<any>;
+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 default request;

package/es/http/index.js

@@ -53,7 +53,7 @@ export var isCrossDomain = function isCrossDomain(url) {
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
-  var _options$params;
+  var _window$crypto$random, _window$crypto, _options$params;
   options.headers = options.headers || {};
   // 处理浏览器指纹
   if (browserId) {
@@ -92,7 +92,8 @@ request.interceptors.request.use(function (url, options) {
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
-    _t1: Date.now()
+    _t1: Date.now(),
+    __r: ((_window$crypto$random = (_window$crypto = window.crypto)['randomUUID']) === null || _window$crypto$random === void 0 ? void 0 : _window$crypto$random.call(_window$crypto)) || Math.random()
   };
   // 当没有明文参数resCode的时候，添加resCode参数为资源Id
   //@ts-ignore
@@ -325,19 +326,21 @@ export function httpDelete(url, data) {
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
  * @param timeout 超时时间,默认60000毫秒
+ * @param isGet 是否Get请求
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
-export function getDict(dictCode) {
+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 valueIsNumber = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  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 = {
-    dictCode: dictCode
+    dictCodes: (dictCodes || '').split(',')
   };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, valueIsNumber);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, isGet, valueIsNumber);
 }
 /**
  * 加载下拉框的数据源
@@ -348,6 +351,8 @@ export function getDict(dictCode) {
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout
+ * @param isGet = true 是否get请求，默认true
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
@@ -359,9 +364,8 @@ function _fetchOptions() {
     var showValue,
       needGateWay,
       timeout,
+      isGet,
       valueIsNumber,
-      _yield$httpGet,
-      _yield$httpGet$rows,
       rows,
       data,
       _args2 = arguments;
@@ -371,13 +375,38 @@ function _fetchOptions() {
           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;
-          valueIsNumber = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : false;
-          _context2.next = 6;
+          isGet = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : true;
+          valueIsNumber = _args2.length > 8 && _args2[8] !== undefined ? _args2[8] : false;
+          if (!isGet) {
+            _context2.next = 14;
+            break;
+          }
+          _context2.next = 8;
           return httpGet(url, param, needGateWay, timeout);
-        case 6:
-          _yield$httpGet = _context2.sent;
-          _yield$httpGet$rows = _yield$httpGet.rows;
-          rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
+        case 8:
+          _context2.t0 = _context2.sent.rows;
+          if (_context2.t0) {
+            _context2.next = 11;
+            break;
+          }
+          _context2.t0 = [];
+        case 11:
+          rows = _context2.t0;
+          _context2.next = 20;
+          break;
+        case 14:
+          _context2.next = 16;
+          return httpPost(url, param, true, needGateWay, timeout);
+        case 16:
+          _context2.t1 = _context2.sent.rows;
+          if (_context2.t1) {
+            _context2.next = 19;
+            break;
+          }
+          _context2.t1 = [];
+        case 19:
+          rows = _context2.t1;
+        case 20:
           data = (rows || []).map(function (o) {
             return _objectSpread(_objectSpread({}, o), {}, {
               value: valueIsNumber && !isNaN(o[valueField]) ? Number(o[valueField]) : o[valueField],
@@ -386,7 +415,7 @@ function _fetchOptions() {
             });
           });
           return _context2.abrupt("return", data);
-        case 11:
+        case 22:
         case "end":
           return _context2.stop();
       }

package/es/utils/index.d.ts

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

package/es/utils/index.js

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

package/es/utils/promise.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export declare function execPromise<T>(promise: Promise<T>): Promise<[T | null, Error | null]>;

package/es/utils/promise.js

@@ -0,0 +1,21 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export function execPromise(promise) {
+  return promise.then(function (res) {
+    return [res, null];
+  }).catch(function (err) {
+    return [null, err];
+  });
+}

package/lib/http/index.d.ts

@@ -50,10 +50,11 @@ export declare function httpDelete(url: string, data: any, needGateWay?: boolean
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
  * @param timeout 超时时间,默认60000毫秒
+ * @param isGet 是否Get请求
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
-export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, valueIsNumber?: boolean): Promise<any>;
+export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  *
@@ -63,8 +64,10 @@ export declare function getDict(dictCode: string, showValue?: boolean, needGateW
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout
+ * @param isGet = true 是否get请求，默认true
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, valueIsNumber?: boolean): Promise<any>;
+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 default request;

package/lib/http/index.js

@@ -53,7 +53,7 @@ export var isCrossDomain = function isCrossDomain(url) {
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
-  var _options$params;
+  var _window$crypto$random, _window$crypto, _options$params;
   options.headers = options.headers || {};
   // 处理浏览器指纹
   if (browserId) {
@@ -92,7 +92,8 @@ request.interceptors.request.use(function (url, options) {
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
-    _t1: Date.now()
+    _t1: Date.now(),
+    __r: ((_window$crypto$random = (_window$crypto = window.crypto)['randomUUID']) === null || _window$crypto$random === void 0 ? void 0 : _window$crypto$random.call(_window$crypto)) || Math.random()
   };
   // 当没有明文参数resCode的时候，添加resCode参数为资源Id
   //@ts-ignore
@@ -325,19 +326,21 @@ export function httpDelete(url, data) {
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
  * @param timeout 超时时间,默认60000毫秒
+ * @param isGet 是否Get请求
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
-export function getDict(dictCode) {
+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 valueIsNumber = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  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 = {
-    dictCode: dictCode
+    dictCodes: (dictCodes || '').split(',')
   };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, valueIsNumber);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, isGet, valueIsNumber);
 }
 /**
  * 加载下拉框的数据源
@@ -348,6 +351,8 @@ export function getDict(dictCode) {
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout
+ * @param isGet = true 是否get请求，默认true
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
@@ -359,9 +364,8 @@ function _fetchOptions() {
     var showValue,
       needGateWay,
       timeout,
+      isGet,
       valueIsNumber,
-      _yield$httpGet,
-      _yield$httpGet$rows,
       rows,
       data,
       _args2 = arguments;
@@ -371,13 +375,38 @@ function _fetchOptions() {
           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;
-          valueIsNumber = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : false;
-          _context2.next = 6;
+          isGet = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : true;
+          valueIsNumber = _args2.length > 8 && _args2[8] !== undefined ? _args2[8] : false;
+          if (!isGet) {
+            _context2.next = 14;
+            break;
+          }
+          _context2.next = 8;
           return httpGet(url, param, needGateWay, timeout);
-        case 6:
-          _yield$httpGet = _context2.sent;
-          _yield$httpGet$rows = _yield$httpGet.rows;
-          rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
+        case 8:
+          _context2.t0 = _context2.sent.rows;
+          if (_context2.t0) {
+            _context2.next = 11;
+            break;
+          }
+          _context2.t0 = [];
+        case 11:
+          rows = _context2.t0;
+          _context2.next = 20;
+          break;
+        case 14:
+          _context2.next = 16;
+          return httpPost(url, param, true, needGateWay, timeout);
+        case 16:
+          _context2.t1 = _context2.sent.rows;
+          if (_context2.t1) {
+            _context2.next = 19;
+            break;
+          }
+          _context2.t1 = [];
+        case 19:
+          rows = _context2.t1;
+        case 20:
           data = (rows || []).map(function (o) {
             return _objectSpread(_objectSpread({}, o), {}, {
               value: valueIsNumber && !isNaN(o[valueField]) ? Number(o[valueField]) : o[valueField],
@@ -386,7 +415,7 @@ function _fetchOptions() {
             });
           });
           return _context2.abrupt("return", data);
-        case 11:
+        case 22:
         case "end":
           return _context2.stop();
       }

package/lib/utils/index.d.ts

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

package/lib/utils/index.js

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

package/lib/utils/promise.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export declare function execPromise<T>(promise: Promise<T>): Promise<[T | null, Error | null]>;

package/lib/utils/promise.js

@@ -0,0 +1,21 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export function execPromise(promise) {
+  return promise.then(function (res) {
+    return [res, null];
+  }).catch(function (err) {
+    return [null, err];
+  });
+}

package/package.json

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