ls-pro-common 3.0.38 → 3.0.40

package/lib/hooks/useDtl/index.js

@@ -34,7 +34,9 @@ function useDtl(dtlParam) {
     beforeAudit = dtlParam.beforeAudit,
     afterAudit = dtlParam.afterAudit,
     _dtlParam$ifHistory = dtlParam.ifHistory,
-    ifHistory = _dtlParam$ifHistory === void 0 ? 0 : _dtlParam$ifHistory;
+    ifHistory = _dtlParam$ifHistory === void 0 ? 0 : _dtlParam$ifHistory,
+    _dtlParam$isV = dtlParam.isV2,
+    isV2 = _dtlParam$isV === void 0 ? false : _dtlParam$isV;
   var _usePermission = usePermission(),
     canAdd = _usePermission.canAdd,
     canEdit = _usePermission.canEdit,
@@ -592,6 +594,27 @@ function useDtl(dtlParam) {
       return _ref7.apply(this, arguments);
     };
   }();
+  var toV2LoadParams = function toV2LoadParams(param) {
+    var page = param.page,
+      pageSize = param.pageSize,
+      where = param.where,
+      sort = param.sort;
+    delete param.page;
+    delete param.pageSize;
+    delete param.where;
+    delete param.sort;
+    param['page.pn'] = page;
+    param['page.size'] = pageSize;
+    if (where && Object.keys(where).length) {
+      for (var key in where) {
+        param['search.' + key] = where[key];
+      }
+    }
+    if (sort) {
+      var sortArr = sort.split(' ');
+      param['sort.' + sortArr[0].trim()] = (sortArr[1] || 'asc').trim();
+    }
+  };
   /** 加载数据方法 */
   var onLoadDtl = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(params, sort, filter) {
@@ -651,32 +674,35 @@ function useDtl(dtlParam) {
             if (ifHistory === 1) {
               param.ifHistory = 1;
             }
+            if (isV2) {
+              toV2LoadParams(param);
+            }
             _context8.t0 = beforeLoad;
             if (!_context8.t0) {
-              _context8.next = 21;
+              _context8.next = 22;
               break;
             }
-            _context8.next = 19;
+            _context8.next = 20;
             return beforeLoad(param);
-          case 19:
+          case 20:
             _context8.t1 = _context8.sent;
             _context8.t0 = _context8.t1 === false;
-          case 21:
+          case 22:
             if (!_context8.t0) {
-              _context8.next = 23;
+              _context8.next = 24;
               break;
             }
             return _context8.abrupt("return", {
               data: [],
               success: true
             });
-          case 23:
+          case 24:
             if (sumProperties && param.sort) {
               delete param.sort;
             }
-            _context8.next = 26;
+            _context8.next = 27;
             return dtlService.load(param);
-          case 26:
+          case 27:
             result = _context8.sent;
             result.data = result.rows;
             result.success = true;
@@ -684,7 +710,7 @@ function useDtl(dtlParam) {
               result.data = result.footer;
             }
             return _context8.abrupt("return", result);
-          case 31:
+          case 32:
           case "end":
             return _context8.stop();
         }
@@ -696,8 +722,8 @@ function useDtl(dtlParam) {
   }();
   var onExportDtl = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url, param) {
-      var _param$exportColumns, _param$searchData;
-      var searchArr, _result$flag6, result, _result$flag7, _result$flag8;
+      var _param$exportColumns;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag6, result, _result$flag7, _result$flag8;
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -715,11 +741,44 @@ function useDtl(dtlParam) {
             showWarn('请配置业务接口 bizApi 属性');
             return _context9.abrupt("return", false);
           case 6:
-            // 处理导出历史数据传参
-            if (ifHistory && !param.searchData || !((_param$searchData = param.searchData) === null || _param$searchData === void 0 ? void 0 : _param$searchData.includes('ifHistory=1'))) {
+            if (param.searchData) {
               searchArr = (param.searchData || '').split('&');
-              searchArr.push('ifHistory=1');
-              param.searchData = searchArr.join('&');
+              if (isV2) {
+                arr = searchArr.map(function (item) {
+                  if (item.startsWith('page=')) {
+                    // page=1 改成 page.pn=1;
+                    return item.replace('page=', 'page.pn=');
+                  } else if (item.startsWith('pageSize=')) {
+                    // pageSize=25 => page.size=25
+                    return item.replace('pageSize=', 'page.size=');
+                  } else if (item.startsWith('sort=')) {
+                    // sort=createTime desc => sort.createTime=desc
+                    return item.replace('sort=', 'sort.').replace(' ', '=');
+                  } else if (item.startsWith('ifPage=') || item.startsWith('ifHistory=')) {
+                    return item;
+                  } else {
+                    //其它查询条件，添加 search.
+                    return 'search.' + item;
+                  }
+                });
+                param.searchData = arr.join('&');
+              } else {
+                otherArr = searchArr.filter(function (item) {
+                  return item.startsWith('page=') || item.startsWith('pageSize=') || item.startsWith('ifPage=') || item.startsWith('ifHistory=') || item.startsWith('sort=');
+                });
+                whereArr = searchArr.filter(function (item) {
+                  return !otherArr.includes(item);
+                });
+                where = {};
+                if (whereArr.length) {
+                  whereArr.forEach(function (item) {
+                    var itemArr = item.split('=');
+                    where[itemArr[0]] = itemArr[1];
+                  });
+                  otherArr.push("where=" + JSON.stringify(where));
+                  param.searchData = otherArr.join('&');
+                }
+              }
             }
             _context9.prev = 7;
             _context9.next = 10;

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

@@ -7,6 +7,7 @@ export declare type SingleParamType = {
     initItem?: any;
     statusField?: string;
     auditStatus?: number;
+    isV2?: boolean;
     beforeLoad?: (param: Record<string, any>) => Promise<boolean>;
     beforeRemove?: (rows: any[]) => Promise<any>;
     beforeAudit?: (rows: any[]) => Promise<any>;

package/lib/hooks/useSingle/index.js

@@ -45,7 +45,9 @@ function useSingle(inParam) {
     afterRemove = inParam.afterRemove,
     afterSave = inParam.afterSave,
     afterAudit = inParam.afterAudit,
-    btnStatus = inParam.btnStatus;
+    btnStatus = inParam.btnStatus,
+    _inParam$isV = inParam.isV2,
+    isV2 = _inParam$isV === void 0 ? false : _inParam$isV;
   /** @name 选中行数据 */
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -400,6 +402,27 @@ function useSingle(inParam) {
       return _ref5.apply(this, arguments);
     };
   }();
+  var toV2LoadParams = function toV2LoadParams(param) {
+    var page = param.page,
+      pageSize = param.pageSize,
+      where = param.where,
+      sort = param.sort;
+    delete param.page;
+    delete param.pageSize;
+    delete param.where;
+    delete param.sort;
+    param['page.pn'] = page;
+    param['page.size'] = pageSize;
+    if (where && Object.keys(where).length) {
+      for (var key in where) {
+        param['search.' + key] = where[key];
+      }
+    }
+    if (sort) {
+      var sortArr = sort.split(' ');
+      param['sort.' + sortArr[0].trim()] = (sortArr[1] || 'asc').trim();
+    }
+  };
   /** 加载数据方法 */
   var onLoad = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params, sort, filter, isHistory) {
@@ -453,19 +476,22 @@ function useSingle(inParam) {
             }
             setSelectedRows([]);
             (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
+            if (isV2) {
+              toV2LoadParams(param);
+            }
             _context6.t0 = beforeLoad;
             if (!_context6.t0) {
-              _context6.next = 17;
+              _context6.next = 18;
               break;
             }
-            _context6.next = 15;
+            _context6.next = 16;
             return beforeLoad(param);
-          case 15:
+          case 16:
             _context6.t1 = _context6.sent;
             _context6.t0 = _context6.t1 === false;
-          case 17:
+          case 18:
             if (!_context6.t0) {
-              _context6.next = 19;
+              _context6.next = 20;
               break;
             }
             return _context6.abrupt("return", {
@@ -473,13 +499,13 @@ function useSingle(inParam) {
               success: false,
               total: 0
             });
-          case 19:
+          case 20:
             if (sumProperties && param.sort) {
               delete param.sort;
             }
-            _context6.next = 22;
+            _context6.next = 23;
             return service.load(param);
-          case 22:
+          case 23:
             result = _context6.sent;
             result.data = result.rows || [];
             result.success = true;
@@ -487,7 +513,7 @@ function useSingle(inParam) {
               result.data = result.footer;
             }
             return _context6.abrupt("return", result);
-          case 27:
+          case 28:
           case "end":
             return _context6.stop();
         }
@@ -499,8 +525,8 @@ function useSingle(inParam) {
   }();
   var onExport = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
-      var _param$exportColumns, _param$searchData;
-      var searchArr, _result$flag4, result, _result$flag5, _result$flag6;
+      var _param$exportColumns;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, _result$flag5, _result$flag6;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -518,11 +544,44 @@ function useSingle(inParam) {
             showWarn('请配置业务接口 bizApi 属性');
             return _context7.abrupt("return", false);
           case 6:
-            // 处理导出历史数据传参，如果组件里没有传入参数，hooks再处理一次
-            if (ifHistory && !param.searchData || !((_param$searchData = param.searchData) === null || _param$searchData === void 0 ? void 0 : _param$searchData.includes('ifHistory=1'))) {
+            if (param.searchData) {
               searchArr = (param.searchData || '').split('&');
-              searchArr.push('ifHistory=1');
-              param.searchData = searchArr.join('&');
+              if (isV2) {
+                arr = searchArr.map(function (item) {
+                  if (item.startsWith('page=')) {
+                    // page=1 改成 page.pn=1;
+                    return item.replace('page=', 'page.pn=');
+                  } else if (item.startsWith('pageSize=')) {
+                    // pageSize=25 => page.size=25
+                    return item.replace('pageSize=', 'page.size=');
+                  } else if (item.startsWith('sort=')) {
+                    // sort=createTime desc => sort.createTime=desc
+                    return item.replace('sort=', 'sort.').replace(' ', '=');
+                  } else if (item.startsWith('ifPage=') || item.startsWith('ifHistory=')) {
+                    return item;
+                  } else {
+                    //其它查询条件，添加 search.
+                    return 'search.' + item;
+                  }
+                });
+                param.searchData = arr.join('&');
+              } else {
+                otherArr = searchArr.filter(function (item) {
+                  return item.startsWith('page=') || item.startsWith('pageSize=') || item.startsWith('ifPage=') || item.startsWith('ifHistory=') || item.startsWith('sort=');
+                });
+                whereArr = searchArr.filter(function (item) {
+                  return !otherArr.includes(item);
+                });
+                where = {};
+                if (whereArr.length) {
+                  whereArr.forEach(function (item) {
+                    var itemArr = item.split('=');
+                    where[itemArr[0]] = itemArr[1];
+                  });
+                  otherArr.push("where=" + JSON.stringify(where));
+                  param.searchData = otherArr.join('&');
+                }
+              }
             }
             _context7.prev = 7;
             _context7.next = 10;

package/lib/http/index.d.ts

@@ -6,7 +6,7 @@ declare const request: import("umi-request").RequestMethod<false>;
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean): Promise<any>;
+export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * post请求
  * @param url 接口
@@ -15,7 +15,7 @@ export declare function httpGet(url: string, params?: Record<string, any>, needG
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * put 请求
  * @param url 接口
@@ -23,7 +23,7 @@ export declare function httpPost(url: string, data?: Record<string, any>, isJson
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean): Promise<any>;
+export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * delete 请求
  * @param url 接口
@@ -31,14 +31,14 @@ export declare function httpPut(url: string, data?: Record<string, any>, needGat
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpDelete(url: string, data: any, needGateWay?: boolean): Promise<any>;
+export declare function httpDelete(url: string, data: any, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 读取数据字典
  * @param dictCode 字典编码
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
-export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 加载下拉框的数据源
  * @param url 后端接口
@@ -49,5 +49,5 @@ export declare function getDict(dictCode: string, showValue?: boolean, needGateW
  * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 export default request;

package/lib/http/index.js

@@ -155,6 +155,7 @@ function ajax(url) {
   var type = arguments.length > 2 ? arguments[2] : undefined;
   var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var isJson = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+  var timeout = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 60000;
   if (needGateWay) {
     url = toGatewayUrl(url);
   }
@@ -167,25 +168,29 @@ function ajax(url) {
   }
   if (type === 'get') {
     return request.get(url, {
-      params: params
+      params: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else if (type === 'delete') {
     return request.delete(url, {
-      data: params
+      data: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else if (type === 'put') {
     return request.put(url, {
-      data: params
+      data: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else {
     return request.post(url, {
       data: params,
+      timeout: timeout,
       requestType: isJson ? 'json' : 'form'
     }).finally(function () {
       return exitLoading();
@@ -202,7 +207,8 @@ function ajax(url) {
 export function httpGet(url) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, params, 'get', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, params, 'get', needGateWay, true, timeout);
 }
 /**
  * post请求
@@ -216,7 +222,8 @@ export function httpPost(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isJson = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  return ajax(url, data, 'post', needGateWay, isJson);
+  var timeout = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 60000;
+  return ajax(url, data, 'post', needGateWay, isJson, timeout);
 }
 /**
  * put 请求
@@ -228,7 +235,8 @@ export function httpPost(url) {
 export function httpPut(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, data, 'put', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, data, 'put', needGateWay, true, timeout);
 }
 /**
  * delete 请求
@@ -239,7 +247,8 @@ export function httpPut(url) {
  */
 export function httpDelete(url, data) {
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, data, 'delete', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, data, 'delete', needGateWay, true, timeout);
 }
 /**
  * 读取数据字典
@@ -250,11 +259,12 @@ export function httpDelete(url, data) {
 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 param = {
     dictCode: dictCode
   };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout);
 }
 /**
  * 加载下拉框的数据源
@@ -273,6 +283,7 @@ function _fetchOptions() {
   _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url, param, valueField, labelField) {
     var showValue,
       needGateWay,
+      timeout,
       _yield$httpGet,
       _yield$httpGet$rows,
       rows,
@@ -283,9 +294,10 @@ function _fetchOptions() {
         case 0:
           showValue = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true;
           needGateWay = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : true;
-          _context2.next = 4;
-          return httpGet(url, param, needGateWay);
-        case 4:
+          timeout = _args2.length > 6 && _args2[6] !== undefined ? _args2[6] : 60000;
+          _context2.next = 5;
+          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;
@@ -298,7 +310,7 @@ function _fetchOptions() {
             };
           });
           return _context2.abrupt("return", data);
-        case 9:
+        case 10:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.38",
+  "version": "3.0.40",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [
@@ -21,8 +21,9 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "^3.0.24",
+    "ls-pro-table": "^3.0.25",
     "ls-pro-form": "^3.0.9",
+    "ls-pro-field": "^3.0.5",
     "ls-pro-descriptions": "^3.0.1",
     "ls-pro-card": "^3.0.3",
     "ls-pro-utils": "^3.0.6",
@@ -36,6 +37,10 @@
   "peerDependencies": {
     "antd": "4.x",
     "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
+    "react-dom": ">=16.9.0",
+    "rc-picker": "^3.14.6"
+  },
+  "resolutions": {
+    "rc-picker": "^3.14.6"
   }
 }