ls-pro-common 3.1.6 → 3.1.8

package/dist/common.min.js.LICENSE.txt

@@ -4,28 +4,6 @@
 	http://jedwatson.github.io/classnames
 */
 
-/*!
-  Copyright (c) 2011, Yahoo! Inc. All rights reserved.
-  Code licensed under the BSD License:
-  http://developer.yahoo.com/yui/license.html
-  version: 2.9.0
-  */
-
-/*! *****************************************************************************
-  Copyright (c) Microsoft Corporation. All rights reserved.
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-  this file except in compliance with the License. You may obtain a copy of the
-  License at http://www.apache.org/licenses/LICENSE-2.0
-  
-  THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-  WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-  MERCHANTABLITY OR NON-INFRINGEMENT.
-  
-  See the Apache Version 2.0 License for specific language governing permissions
-  and limitations under the License.
-  ***************************************************************************** */
-
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -43,15 +21,6 @@ PERFORMANCE OF THIS SOFTWARE.
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
-/**
-   * @fileOverview
-   * @name asn1-1.0.js
-   * @author Kenji Urushima kenji.urushima@gmail.com
-   * @version asn1 1.0.13 (2017-Jun-02)
-   * @since jsrsasign 2.1
-   * @license <a href="https://kjur.github.io/jsrsasign/license/">MIT License</a>
-   */
-
 /**
  * @license
  * Lodash <https://lodash.com/>

package/es/hooks/useBaseDict.js

@@ -13,7 +13,7 @@ import { showWarn } from '../utils';
  */
 export var useBaseDict = function useBaseDict(props) {
   var _props$url = props.url,
-    url = _props$url === void 0 ? '/lesoon-integration/sysDictDtl?lesoon-tenant=1' : _props$url,
+    url = _props$url === void 0 ? '/lesoon-petrel-integration-api/sysDictDtl/page' : _props$url,
     _props$method = props.method,
     method = _props$method === void 0 ? 'GET' : _props$method,
     _props$dictValue = props.dictValue,

package/es/http/index.d.ts

@@ -49,9 +49,12 @@ export declare function httpDelete(url: string, data: any, needGateWay?: boolean
  * @param dictCode 字典编码
  * @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): Promise<any>;
+export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  *
@@ -61,7 +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): 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

@@ -324,17 +324,22 @@ export function httpDelete(url, data) {
  * @param dictCode 字典编码
  * @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 api = '/lesoon-integration/sysDictDtl/listByProperties';
+  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);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, isGet, valueIsNumber);
 }
 /**
  * 加载下拉框的数据源
@@ -345,6 +350,9 @@ export function getDict(dictCode) {
  * @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) {
@@ -355,8 +363,8 @@ function _fetchOptions() {
     var showValue,
       needGateWay,
       timeout,
-      _yield$httpGet,
-      _yield$httpGet$rows,
+      isGet,
+      valueIsNumber,
       rows,
       data,
       _args2 = arguments;
@@ -366,21 +374,47 @@ 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;
-          _context2.next = 5;
+          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 5:
-          _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: o[valueField],
+              value: valueIsNumber && !isNaN(o[valueField]) ? Number(o[valueField]) : o[valueField],
               text: o[labelField],
               label: (showValue ? o[valueField] + '→' : '') + o[labelField]
             });
           });
           return _context2.abrupt("return", data);
-        case 10:
+        case 22:
         case "end":
           return _context2.stop();
       }

package/lib/hooks/useBaseDict.js

@@ -13,7 +13,7 @@ import { showWarn } from '../utils';
  */
 export var useBaseDict = function useBaseDict(props) {
   var _props$url = props.url,
-    url = _props$url === void 0 ? '/lesoon-integration/sysDictDtl?lesoon-tenant=1' : _props$url,
+    url = _props$url === void 0 ? '/lesoon-petrel-integration-api/sysDictDtl/page' : _props$url,
     _props$method = props.method,
     method = _props$method === void 0 ? 'GET' : _props$method,
     _props$dictValue = props.dictValue,

package/lib/http/index.d.ts

@@ -49,9 +49,12 @@ export declare function httpDelete(url: string, data: any, needGateWay?: boolean
  * @param dictCode 字典编码
  * @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): Promise<any>;
+export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  *
@@ -61,7 +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): 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

@@ -324,17 +324,22 @@ export function httpDelete(url, data) {
  * @param dictCode 字典编码
  * @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 api = '/lesoon-integration/sysDictDtl/listByProperties';
+  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);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, isGet, valueIsNumber);
 }
 /**
  * 加载下拉框的数据源
@@ -345,6 +350,9 @@ export function getDict(dictCode) {
  * @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) {
@@ -355,8 +363,8 @@ function _fetchOptions() {
     var showValue,
       needGateWay,
       timeout,
-      _yield$httpGet,
-      _yield$httpGet$rows,
+      isGet,
+      valueIsNumber,
       rows,
       data,
       _args2 = arguments;
@@ -366,21 +374,47 @@ 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;
-          _context2.next = 5;
+          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 5:
-          _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: o[valueField],
+              value: valueIsNumber && !isNaN(o[valueField]) ? Number(o[valueField]) : o[valueField],
               text: o[labelField],
               label: (showValue ? o[valueField] + '→' : '') + o[labelField]
             });
           });
           return _context2.abrupt("return", data);
-        case 10:
+        case 22:
         case "end":
           return _context2.stop();
       }

package/package.json

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