ls-pro-common 3.1.5 → 3.1.7

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/hooks/useDtl/index.d.ts

@@ -1,5 +1,6 @@
 import type { ActionType } from 'ls-pro-table';
 import type { ProFormInstance } from 'ls-pro-form';
+import type { ApiResponse } from '../../typing';
 import type { SingleParamType } from '../useSingle';
 export declare type DtlParamType = SingleParamType & {
     /** 重置主表对象方法 */
@@ -40,7 +41,7 @@ declare function useDtl(dtlParam: DtlParamType): {
     onSaveMst: (values: any) => Promise<boolean>;
     onSaveMstDtl: (isDelete?: boolean) => Promise<boolean | undefined>;
     onRemoveMst: () => Promise<boolean | undefined>;
-    onExportDtl: (url: string, param: any) => Promise<boolean>;
+    onExportDtl: (url: string, param: any) => Promise<boolean | ApiResponse>;
     isAudit: () => boolean;
     onAudit: () => Promise<void>;
 };

package/es/hooks/useDtl/index.js

@@ -730,7 +730,7 @@ function useDtl(dtlParam) {
   var onExportDtl = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag6, result, _result$flag7;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag6, _result$flag7, _result$flag8, result, _result$flag9;
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -792,14 +792,14 @@ function useDtl(dtlParam) {
             return httpPost(url, param);
           case 10:
             result = _context9.sent;
-            if (!(result.data && typeof result.data === 'string')) {
+            if (!(result.data && typeof result.data === 'string' && ((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
               _context9.next = 14;
               break;
             }
             downloadFile(result.data);
             return _context9.abrupt("return", true);
           case 14:
-            if (!(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
+            if (!(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retCode) === '0')) {
               _context9.next = 19;
               break;
             }
@@ -807,21 +807,27 @@ function useDtl(dtlParam) {
             // showSuccess(result.flag?.retMsg || '导出成功');
             return _context9.abrupt("return", true);
           case 19:
-            showError(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出失败,请联系系统管理员');
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) || '0')) {
+              _context9.next = 23;
+              break;
+            }
+            return _context9.abrupt("return", result);
+          case 23:
+            showError(((_result$flag9 = result.flag) === null || _result$flag9 === void 0 ? void 0 : _result$flag9.retMsg) || '导出失败,请联系系统管理员');
             return _context9.abrupt("return", false);
-          case 21:
-            _context9.next = 27;
+          case 25:
+            _context9.next = 31;
             break;
-          case 23:
-            _context9.prev = 23;
+          case 27:
+            _context9.prev = 27;
             _context9.t0 = _context9["catch"](7);
             showError(_context9.t0.message);
             return _context9.abrupt("return", false);
-          case 27:
+          case 31:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[7, 23]]);
+      }, _callee9, null, [[7, 27]]);
     }));
     return function onExportDtl(_x6, _x7) {
       return _ref9.apply(this, arguments);
@@ -830,7 +836,7 @@ function useDtl(dtlParam) {
   /** 审核按钮事件 */
   var onAudit = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      var obj, _result$flag8, result;
+      var obj, _result$flag10, result;
       return _regeneratorRuntime.wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
           case 0:
@@ -900,7 +906,7 @@ function useDtl(dtlParam) {
             }
             return _context10.abrupt("return");
           case 36:
-            if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
+            if ((result === null || result === void 0 ? void 0 : (_result$flag10 = result.flag) === null || _result$flag10 === void 0 ? void 0 : _result$flag10.retCode) === '0') {
               showSuccess(result.flag.retMsg || '审核成功');
               Object.assign(masterObject, result.data);
             }

package/es/hooks/useSingle/index.d.ts

@@ -44,7 +44,7 @@ declare function useSingle(inParam: SingleParamType): {
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>, isHistory: any) => Promise<any>;
     onAdd: (item: any) => Promise<void>;
     onEdit: (item: any) => Promise<void>;
-    onExport: (url: string, param: any) => Promise<boolean>;
+    onExport: (url: string, param: any) => Promise<boolean | ApiResponse>;
     onAudit: (row: any) => Promise<void>;
     resourceId: any;
     checkRight: (val: number) => boolean;

package/es/hooks/useSingle/index.js

@@ -528,7 +528,7 @@ function useSingle(inParam) {
   var onExport = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, _result$flag5;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, code, _result$flag5;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -590,37 +590,44 @@ function useSingle(inParam) {
             return httpPost(url, param, true, false);
           case 10:
             result = _context7.sent;
-            if (!(result.data && typeof result.data === 'string')) {
-              _context7.next = 14;
+            code = ((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) || '9009'; // 后端直接返回导出文件地址，直接打开相当于是下载
+            if (!(result.data && typeof result.data === 'string' && code === '0')) {
+              _context7.next = 15;
               break;
             }
             downloadFile(result.data);
             return _context7.abrupt("return", true);
-          case 14:
-            if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-              _context7.next = 19;
+          case 15:
+            if (!(code === '0')) {
+              _context7.next = 20;
               break;
             }
             // showSuccess(result.flag?.retMsg || '导出成功');
             exportProcess(result);
             return _context7.abrupt("return", true);
-          case 19:
+          case 20:
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes(code)) {
+              _context7.next = 24;
+              break;
+            }
+            return _context7.abrupt("return", result);
+          case 24:
             showError(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出失败,请联系系统管理员');
             return _context7.abrupt("return", false);
-          case 21:
-            _context7.next = 28;
+          case 26:
+            _context7.next = 33;
             break;
-          case 23:
-            _context7.prev = 23;
+          case 28:
+            _context7.prev = 28;
             _context7.t0 = _context7["catch"](7);
             console.log(_context7.t0);
             showError(_context7.t0.message);
             return _context7.abrupt("return", false);
-          case 28:
+          case 33:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[7, 23]]);
+      }, _callee7, null, [[7, 28]]);
     }));
     return function onExport(_x9, _x10) {
       return _ref7.apply(this, arguments);

package/es/http/index.d.ts

@@ -49,9 +49,11 @@ export declare function httpDelete(url: string, data: any, needGateWay?: boolean
  * @param dictCode 字典编码
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout 超时时间,默认60000毫秒
+ * @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(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, valueIsNumber?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  *
@@ -61,7 +63,8 @@ export declare function getDict(dictCode: string, showValue?: boolean, needGateW
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为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, valueIsNumber?: boolean): Promise<any>;
 export default request;

package/es/http/index.js

@@ -324,17 +324,20 @@ export function httpDelete(url, data) {
  * @param dictCode 字典编码
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout 超时时间,默认60000毫秒
+ * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
 export function getDict(dictCode) {
   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 valueIsNumber = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var api = '/lesoon-petrel-integration-api/sysDictDtl/listByProperties';
   var param = {
     dictCode: dictCode
   };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, valueIsNumber);
 }
 /**
  * 加载下拉框的数据源
@@ -345,6 +348,7 @@ export function getDict(dictCode) {
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
 export function fetchOptions(_x3, _x4, _x5, _x6) {
@@ -355,6 +359,7 @@ function _fetchOptions() {
     var showValue,
       needGateWay,
       timeout,
+      valueIsNumber,
       _yield$httpGet,
       _yield$httpGet$rows,
       rows,
@@ -366,21 +371,22 @@ 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;
+          valueIsNumber = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : false;
+          _context2.next = 6;
           return httpGet(url, param, needGateWay, timeout);
-        case 5:
+        case 6:
           _yield$httpGet = _context2.sent;
           _yield$httpGet$rows = _yield$httpGet.rows;
           rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
           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 11:
         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/hooks/useDtl/index.d.ts

@@ -1,5 +1,6 @@
 import type { ActionType } from 'ls-pro-table';
 import type { ProFormInstance } from 'ls-pro-form';
+import type { ApiResponse } from '../../typing';
 import type { SingleParamType } from '../useSingle';
 export declare type DtlParamType = SingleParamType & {
     /** 重置主表对象方法 */
@@ -40,7 +41,7 @@ declare function useDtl(dtlParam: DtlParamType): {
     onSaveMst: (values: any) => Promise<boolean>;
     onSaveMstDtl: (isDelete?: boolean) => Promise<boolean | undefined>;
     onRemoveMst: () => Promise<boolean | undefined>;
-    onExportDtl: (url: string, param: any) => Promise<boolean>;
+    onExportDtl: (url: string, param: any) => Promise<boolean | ApiResponse>;
     isAudit: () => boolean;
     onAudit: () => Promise<void>;
 };

package/lib/hooks/useDtl/index.js

@@ -730,7 +730,7 @@ function useDtl(dtlParam) {
   var onExportDtl = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag6, result, _result$flag7;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag6, _result$flag7, _result$flag8, result, _result$flag9;
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -792,14 +792,14 @@ function useDtl(dtlParam) {
             return httpPost(url, param);
           case 10:
             result = _context9.sent;
-            if (!(result.data && typeof result.data === 'string')) {
+            if (!(result.data && typeof result.data === 'string' && ((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
               _context9.next = 14;
               break;
             }
             downloadFile(result.data);
             return _context9.abrupt("return", true);
           case 14:
-            if (!(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
+            if (!(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retCode) === '0')) {
               _context9.next = 19;
               break;
             }
@@ -807,21 +807,27 @@ function useDtl(dtlParam) {
             // showSuccess(result.flag?.retMsg || '导出成功');
             return _context9.abrupt("return", true);
           case 19:
-            showError(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出失败,请联系系统管理员');
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) || '0')) {
+              _context9.next = 23;
+              break;
+            }
+            return _context9.abrupt("return", result);
+          case 23:
+            showError(((_result$flag9 = result.flag) === null || _result$flag9 === void 0 ? void 0 : _result$flag9.retMsg) || '导出失败,请联系系统管理员');
             return _context9.abrupt("return", false);
-          case 21:
-            _context9.next = 27;
+          case 25:
+            _context9.next = 31;
             break;
-          case 23:
-            _context9.prev = 23;
+          case 27:
+            _context9.prev = 27;
             _context9.t0 = _context9["catch"](7);
             showError(_context9.t0.message);
             return _context9.abrupt("return", false);
-          case 27:
+          case 31:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[7, 23]]);
+      }, _callee9, null, [[7, 27]]);
     }));
     return function onExportDtl(_x6, _x7) {
       return _ref9.apply(this, arguments);
@@ -830,7 +836,7 @@ function useDtl(dtlParam) {
   /** 审核按钮事件 */
   var onAudit = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      var obj, _result$flag8, result;
+      var obj, _result$flag10, result;
       return _regeneratorRuntime.wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
           case 0:
@@ -900,7 +906,7 @@ function useDtl(dtlParam) {
             }
             return _context10.abrupt("return");
           case 36:
-            if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
+            if ((result === null || result === void 0 ? void 0 : (_result$flag10 = result.flag) === null || _result$flag10 === void 0 ? void 0 : _result$flag10.retCode) === '0') {
               showSuccess(result.flag.retMsg || '审核成功');
               Object.assign(masterObject, result.data);
             }

package/lib/hooks/useSingle/index.d.ts

@@ -44,7 +44,7 @@ declare function useSingle(inParam: SingleParamType): {
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>, isHistory: any) => Promise<any>;
     onAdd: (item: any) => Promise<void>;
     onEdit: (item: any) => Promise<void>;
-    onExport: (url: string, param: any) => Promise<boolean>;
+    onExport: (url: string, param: any) => Promise<boolean | ApiResponse>;
     onAudit: (row: any) => Promise<void>;
     resourceId: any;
     checkRight: (val: number) => boolean;

package/lib/hooks/useSingle/index.js

@@ -528,7 +528,7 @@ function useSingle(inParam) {
   var onExport = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, _result$flag5;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, code, _result$flag5;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -590,37 +590,44 @@ function useSingle(inParam) {
             return httpPost(url, param, true, false);
           case 10:
             result = _context7.sent;
-            if (!(result.data && typeof result.data === 'string')) {
-              _context7.next = 14;
+            code = ((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) || '9009'; // 后端直接返回导出文件地址，直接打开相当于是下载
+            if (!(result.data && typeof result.data === 'string' && code === '0')) {
+              _context7.next = 15;
               break;
             }
             downloadFile(result.data);
             return _context7.abrupt("return", true);
-          case 14:
-            if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-              _context7.next = 19;
+          case 15:
+            if (!(code === '0')) {
+              _context7.next = 20;
               break;
             }
             // showSuccess(result.flag?.retMsg || '导出成功');
             exportProcess(result);
             return _context7.abrupt("return", true);
-          case 19:
+          case 20:
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes(code)) {
+              _context7.next = 24;
+              break;
+            }
+            return _context7.abrupt("return", result);
+          case 24:
             showError(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出失败,请联系系统管理员');
             return _context7.abrupt("return", false);
-          case 21:
-            _context7.next = 28;
+          case 26:
+            _context7.next = 33;
             break;
-          case 23:
-            _context7.prev = 23;
+          case 28:
+            _context7.prev = 28;
             _context7.t0 = _context7["catch"](7);
             console.log(_context7.t0);
             showError(_context7.t0.message);
             return _context7.abrupt("return", false);
-          case 28:
+          case 33:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[7, 23]]);
+      }, _callee7, null, [[7, 28]]);
     }));
     return function onExport(_x9, _x10) {
       return _ref7.apply(this, arguments);

package/lib/http/index.d.ts

@@ -49,9 +49,11 @@ export declare function httpDelete(url: string, data: any, needGateWay?: boolean
  * @param dictCode 字典编码
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout 超时时间,默认60000毫秒
+ * @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(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, valueIsNumber?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  *
@@ -61,7 +63,8 @@ export declare function getDict(dictCode: string, showValue?: boolean, needGateW
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为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, valueIsNumber?: boolean): Promise<any>;
 export default request;

package/lib/http/index.js

@@ -324,17 +324,20 @@ export function httpDelete(url, data) {
  * @param dictCode 字典编码
  * @param showValue 是否显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param timeout 超时时间,默认60000毫秒
+ * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
 export function getDict(dictCode) {
   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 valueIsNumber = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var api = '/lesoon-petrel-integration-api/sysDictDtl/listByProperties';
   var param = {
     dictCode: dictCode
   };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout, valueIsNumber);
 }
 /**
  * 加载下拉框的数据源
@@ -345,6 +348,7 @@ export function getDict(dictCode) {
  * @param labelField 显示字段
  * @param showValue 显示值
  * @param needGateWay 是否需要网关 默认为true
+ * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
 export function fetchOptions(_x3, _x4, _x5, _x6) {
@@ -355,6 +359,7 @@ function _fetchOptions() {
     var showValue,
       needGateWay,
       timeout,
+      valueIsNumber,
       _yield$httpGet,
       _yield$httpGet$rows,
       rows,
@@ -366,21 +371,22 @@ 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;
+          valueIsNumber = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : false;
+          _context2.next = 6;
           return httpGet(url, param, needGateWay, timeout);
-        case 5:
+        case 6:
           _yield$httpGet = _context2.sent;
           _yield$httpGet$rows = _yield$httpGet.rows;
           rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
           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 11:
         case "end":
           return _context2.stop();
       }

package/package.json

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