ls-pro-common 1.0.4 → 1.0.8

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

@@ -1,29 +1,41 @@
 import type { ActionType } from 'ls-pro-table';
 import type { ProFormInstance } from 'ls-pro-form';
-import type { TableToolbar } from '../../typing';
+import type { ApiResponse, TableToolbar } from '../../typing';
+export declare type SingleParamType = {
+    service: any;
+    toolConfig?: TableToolbar;
+    initItem?: any;
+    beforeLoad?: (param: Record<string, any>) => Promise<boolean>;
+    beforeRemove?: (rows: any[]) => Promise<any>;
+    beforeAdd?: (item: any) => Promise<any>;
+    beforeEdit?: (item: any) => Promise<any>;
+    afterRemove?: (result: ApiResponse, rows?: any[]) => Promise<boolean>;
+    afterSave?: (result: ApiResponse, item?: any) => Promise<boolean>;
+};
 /**
  * 单表基本增删改查 hooks
  * @param service 单表服务
- * @param toolbar 定义基础功能按钮
+ * @param toolConfig 定义基础功能按钮
  * @param initItem 对象初始值,新增时设置默认值
- * @param onBeforeSave 保存之前方法,开放给每个模块重写
  * @param onBeforeRemove 删除之前方法，开放给每个模块重写
  * @returns
  */
-declare function useSingle(service: any, toolConfig?: TableToolbar, initItem?: any, beforeSave?: Function, beforeRemove?: Function): {
+declare function useSingle(inParam: SingleParamType): {
     formRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;
+    editFormRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;
     tableRef: import("react").MutableRefObject<ActionType | undefined>;
     selectedRows: any;
     showEdit: boolean;
     editItem: any;
-    baseToolBar: JSX.Element[];
+    tableTools: JSX.Element[];
     setSelectedRows: import("react").Dispatch<any>;
     setShowEdit: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     setEditItem: import("react").Dispatch<any>;
     onRemove: () => void;
     onSave: (formData: any) => Promise<boolean>;
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
-    onAdd: () => void;
-    onEdit: () => void;
+    onAdd: () => Promise<void>;
+    onEdit: () => Promise<void>;
+    onExport: (url: string, param: any) => Promise<boolean>;
 };
 export default useSingle;

package/lib/hooks/useSingle/index.js

@@ -15,10 +15,10 @@ var _button = _interopRequireDefault(require("antd/es/button"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -34,14 +34,23 @@ var _excluded = ["current", "pageSize"];
 /**
  * 单表基本增删改查 hooks
  * @param service 单表服务
- * @param toolbar 定义基础功能按钮
+ * @param toolConfig 定义基础功能按钮
  * @param initItem 对象初始值,新增时设置默认值
- * @param onBeforeSave 保存之前方法,开放给每个模块重写
  * @param onBeforeRemove 删除之前方法，开放给每个模块重写
  * @returns
  */
-function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
+function useSingle(inParam) {
+  var service = inParam.service,
+      toolConfig = inParam.toolConfig,
+      initItem = inParam.initItem,
+      beforeLoad = inParam.beforeLoad,
+      beforeRemove = inParam.beforeRemove,
+      beforeAdd = inParam.beforeAdd,
+      beforeEdit = inParam.beforeEdit,
+      afterRemove = inParam.afterRemove,
+      afterSave = inParam.afterSave;
   /** @name 选中行数据 */
+
   var _useState = (0, _react.useState)([]),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       selectedRows = _useState2[0],
@@ -60,31 +69,118 @@ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       editItem = _useState6[0],
       setEditItem = _useState6[1];
-  /** @name 表格ref */
+  /** @name 表格Ref */
 
 
   var tableRef = (0, _react.useRef)();
-  /** @name 查询表单ref */
+  /** @name 查询表单Ref */
 
   var formRef = (0, _react.useRef)();
+  /**@name 编辑表单Ref */
+
+  var editFormRef = (0, _react.useRef)();
   /** 新增按钮事件 */
 
-  var onAdd = function onAdd() {
-    setEditItem(initItem);
-    setShowEdit(true);
-  };
+  var onAdd = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.t0 = beforeAdd;
+
+              if (!_context.t0) {
+                _context.next = 6;
+                break;
+              }
+
+              _context.next = 4;
+              return beforeAdd(initItem);
+
+            case 4:
+              _context.t1 = _context.sent;
+              _context.t0 = _context.t1 === false;
+
+            case 6:
+              if (!_context.t0) {
+                _context.next = 8;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 8:
+              setEditItem(initItem);
+              setShowEdit(true);
+
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function onAdd() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   /** 编辑按钮事件 */
 
 
-  var onEdit = function onEdit() {
-    if (!selectedRows.length) {
-      (0, _utils.showWarn)('请先选择需要更改的数据');
-      return;
-    }
+  var onEdit = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (selectedRows.length) {
+                _context2.next = 3;
+                break;
+              }
 
-    setEditItem(selectedRows[0]);
-    setShowEdit(true);
-  };
+              (0, _utils.showWarn)('请先选择需要更改的数据');
+              return _context2.abrupt("return");
+
+            case 3:
+              _context2.t0 = beforeEdit;
+
+              if (!_context2.t0) {
+                _context2.next = 9;
+                break;
+              }
+
+              _context2.next = 7;
+              return beforeEdit(selectedRows[0]);
+
+            case 7:
+              _context2.t1 = _context2.sent;
+              _context2.t0 = _context2.t1 === false;
+
+            case 9:
+              if (!_context2.t0) {
+                _context2.next = 11;
+                break;
+              }
+
+              return _context2.abrupt("return");
+
+            case 11:
+              setEditItem(selectedRows[0]);
+              setShowEdit(true);
+
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function onEdit() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   /** 删除按钮事件 */
 
 
@@ -94,67 +190,103 @@ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
       return;
     }
 
-    (0, _utils.showConfirm)('确认要删除选择的数据?').then(function () {
-      var ids = selectedRows.map(function (o) {
-        return o.id;
-      });
-      service.remove(ids).then(function (result) {
-        var _result$flag;
+    (0, _utils.showConfirm)('确认要删除选择的数据?').then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var _result$flag;
 
-        if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
-          (0, _utils.showSuccess)(result.flag.retMsg);
+      var ids, result;
+      return _regenerator.default.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!beforeRemove) {
+                _context3.next = 6;
+                break;
+              }
 
-          if (tableRef.current) {
-            tableRef.current.reload(false);
+              _context3.next = 3;
+              return beforeRemove(selectedRows);
+
+            case 3:
+              ids = _context3.sent;
+
+              if (!(ids === false)) {
+                _context3.next = 6;
+                break;
+              }
+
+              return _context3.abrupt("return");
+
+            case 6:
+              if (!ids) {
+                ids = selectedRows.map(function (o) {
+                  return o.id;
+                });
+              }
+
+              _context3.next = 9;
+              return service.remove(ids);
+
+            case 9:
+              result = _context3.sent;
+
+              if (!afterRemove) {
+                _context3.next = 13;
+                break;
+              }
+
+              afterRemove(result, selectedRows);
+              return _context3.abrupt("return");
+
+            case 13:
+              if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
+                (0, _utils.showSuccess)(result.flag.retMsg);
+
+                if (tableRef.current) {
+                  tableRef.current.reload(false);
+                }
+              }
+
+            case 14:
+            case "end":
+              return _context3.stop();
           }
         }
-      });
-    });
+      }, _callee3);
+    })));
   };
   /** 新增，更改对应的保存事件 */
 
 
   var onSave = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(formData) {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(formData) {
       var _result$flag2;
 
       var data, result;
-      return _regenerator.default.wrap(function _callee$(_context) {
+      return _regenerator.default.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, editItem), formData);
-              _context.t0 = beforeSave;
-
-              if (!_context.t0) {
-                _context.next = 7;
-                break;
-              }
-
-              _context.next = 5;
-              return beforeSave(data);
+              _context4.next = 3;
+              return service.save(data);
 
-            case 5:
-              _context.t1 = _context.sent;
-              _context.t0 = _context.t1 === false;
+            case 3:
+              result = _context4.sent;
 
-            case 7:
-              if (!_context.t0) {
-                _context.next = 9;
+              if (!afterSave) {
+                _context4.next = 8;
                 break;
               }
 
-              return _context.abrupt("return", false);
-
-            case 9:
-              _context.next = 11;
-              return service.save(data);
+              _context4.next = 7;
+              return afterSave(result, data);
 
-            case 11:
-              result = _context.sent;
+            case 7:
+              return _context4.abrupt("return", _context4.sent);
 
+            case 8:
               if (!((result === null || result === void 0 ? void 0 : (_result$flag2 = result.flag) === null || _result$flag2 === void 0 ? void 0 : _result$flag2.retCode) === '0')) {
-                _context.next = 16;
+                _context4.next = 12;
                 break;
               }
 
@@ -164,32 +296,32 @@ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
                 tableRef.current.reload(false);
               }
 
-              return _context.abrupt("return", true);
+              return _context4.abrupt("return", true);
 
-            case 16:
-              return _context.abrupt("return", false);
+            case 12:
+              return _context4.abrupt("return", false);
 
-            case 17:
+            case 13:
             case "end":
-              return _context.stop();
+              return _context4.stop();
           }
         }
-      }, _callee);
+      }, _callee4);
     }));
 
     return function onSave(_x) {
-      return _ref.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   /** 加载数据方法 */
 
 
   var onLoad = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(params, sort, filter) {
-      var current, pageSize, rest, param, result;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
+    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(params, sort, filter) {
+      var current, pageSize, rest, param, key, result;
+      return _regenerator.default.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               current = params.current, pageSize = params.pageSize, rest = (0, _objectWithoutProperties2.default)(params, _excluded);
               param = {};
@@ -199,37 +331,90 @@ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
                 param.pageSize = pageSize;
               }
 
+              for (key in rest) {
+                if (rest[key] === '') {
+                  delete rest[key];
+                }
+              }
+
               if (Object.keys(rest).length) {
                 param.where = rest;
               }
 
-              console.log("useSingle", param, sort, filter);
-              _context2.next = 7;
+              _context5.t0 = beforeLoad;
+
+              if (!_context5.t0) {
+                _context5.next = 11;
+                break;
+              }
+
+              _context5.next = 9;
+              return beforeLoad(param);
+
+            case 9:
+              _context5.t1 = _context5.sent;
+              _context5.t0 = _context5.t1 === false;
+
+            case 11:
+              if (!_context5.t0) {
+                _context5.next = 13;
+                break;
+              }
+
+              return _context5.abrupt("return", {
+                data: [],
+                success: false,
+                total: 0
+              });
+
+            case 13:
+              _context5.next = 15;
               return service.load(param);
 
-            case 7:
-              result = _context2.sent;
+            case 15:
+              result = _context5.sent;
               result.data = result.rows;
               result.success = true;
-              return _context2.abrupt("return", result);
+              return _context5.abrupt("return", result);
 
-            case 11:
+            case 19:
             case "end":
-              return _context2.stop();
+              return _context5.stop();
           }
         }
-      }, _callee2);
+      }, _callee5);
     }));
 
     return function onLoad(_x2, _x3, _x4) {
-      return _ref2.apply(this, arguments);
+      return _ref5.apply(this, arguments);
+    };
+  }();
+
+  var onExport = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(url, param) {
+      return _regenerator.default.wrap(function _callee6$(_context6) {
+        while (1) {
+          switch (_context6.prev = _context6.next) {
+            case 0:
+              return _context6.abrupt("return", true);
+
+            case 1:
+            case "end":
+              return _context6.stop();
+          }
+        }
+      }, _callee6);
+    }));
+
+    return function onExport(_x5, _x6) {
+      return _ref6.apply(this, arguments);
     };
   }();
 
-  var baseToolBar = [];
+  var tableTools = [];
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
-    baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "add",
       onClick: onAdd,
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
@@ -237,16 +422,16 @@ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
   }
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) {
-    baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
-      disabled: selectedRows.length === 0,
+      disabled: selectedRows.length !== 1,
       onClick: onEdit,
       icon: /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)
     }, "\u7F16\u8F91"));
   }
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) {
-    baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "remove",
       onClick: onRemove,
       danger: true,
@@ -256,26 +441,37 @@ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
   }
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) {
-    baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
+      onClick: function onClick() {
+        var _tableRef$current, _tableRef$current$sho;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showImport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
     }, "\u5BFC\u5165"));
   }
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) {
-    baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
+      onClick: function onClick() {
+        var _tableRef$current2, _tableRef$current2$sh;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA"));
   }
 
   return {
     formRef: formRef,
+    editFormRef: editFormRef,
     tableRef: tableRef,
     selectedRows: selectedRows,
     showEdit: showEdit,
     editItem: editItem,
-    baseToolBar: baseToolBar,
+    tableTools: tableTools,
     setSelectedRows: setSelectedRows,
     setShowEdit: setShowEdit,
     setEditItem: setEditItem,
@@ -283,7 +479,8 @@ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
     onSave: onSave,
     onLoad: onLoad,
     onAdd: onAdd,
-    onEdit: onEdit
+    onEdit: onEdit,
+    onExport: onExport
   };
 }
 

package/lib/http/index.d.ts

@@ -33,7 +33,7 @@ export declare function httpDelete(url: string, data: any): Promise<any>;
  * @param dictCode 字典编码
  * @returns Promise<Record<string,string>>
  */
-export declare function getDict(dictCode: string): Promise<any>;
+export declare function getDict(dictCode: string, showValue?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  * @param url 后端接口

package/lib/http/index.js

@@ -258,11 +258,15 @@ function getDict(_x8) {
 
 function _getDict() {
   _getDict = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(dictCode) {
-    var api, param;
+    var showValue,
+        api,
+        param,
+        _args6 = arguments;
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
+            showValue = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : true;
             api = '/lesoon-integration/sysDictDtl';
             param = {
               where: {
@@ -270,9 +274,9 @@ function _getDict() {
               },
               ifPage: 0
             };
-            return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName'));
+            return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName', showValue));
 
-          case 3:
+          case 4:
           case "end":
             return _context6.stop();
         }

package/lib/index.d.ts

@@ -1,10 +1,13 @@
-import EditModalForm from './components/EditModalForm';
+import DtlLayout from './components/DtlLayout';
+import InputTable from './components/InputTable';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
 /** Hooks */
 import useSingle from './hooks/useSingle';
+import useDtl from './hooks/useDtl';
 /** Type */
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
-export type { ApiResponse, TableToolbar, BaseApiType, MethodType };
-export { EditModalForm, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle };
+import type { DtlLyaoutProps } from './components/DtlLayout';
+export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
+export { DtlLayout, InputTable, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };

package/lib/index.js

@@ -13,10 +13,16 @@ Object.defineProperty(exports, "BaseService", {
     return _BaseService.default;
   }
 });
-Object.defineProperty(exports, "EditModalForm", {
+Object.defineProperty(exports, "DtlLayout", {
   enumerable: true,
   get: function get() {
-    return _EditModalForm.default;
+    return _DtlLayout.default;
+  }
+});
+Object.defineProperty(exports, "InputTable", {
+  enumerable: true,
+  get: function get() {
+    return _InputTable.default;
   }
 });
 Object.defineProperty(exports, "fetchOptions", {
@@ -61,6 +67,12 @@ Object.defineProperty(exports, "request", {
     return _http.default;
   }
 });
+Object.defineProperty(exports, "useDtl", {
+  enumerable: true,
+  get: function get() {
+    return _useDtl.default;
+  }
+});
 Object.defineProperty(exports, "useSingle", {
   enumerable: true,
   get: function get() {
@@ -69,7 +81,9 @@ Object.defineProperty(exports, "useSingle", {
 });
 exports.utils = void 0;
 
-var _EditModalForm = _interopRequireDefault(require("./components/EditModalForm"));
+var _DtlLayout = _interopRequireDefault(require("./components/DtlLayout"));
+
+var _InputTable = _interopRequireDefault(require("./components/InputTable"));
 
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
@@ -79,4 +93,6 @@ var utils = _interopRequireWildcard(require("./utils"));
 
 exports.utils = utils;
 
-var _useSingle = _interopRequireDefault(require("./hooks/useSingle"));
+var _useSingle = _interopRequireDefault(require("./hooks/useSingle"));
+
+var _useDtl = _interopRequireDefault(require("./hooks/useDtl"));