ls-pro-common 1.1.1 → 1.1.3

package/es/hooks/useSingle/index.js

@@ -1,11 +1,11 @@
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["current", "pageSize", "sumProperties"];
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import { useState, useRef, useMemo, useCallback } from 'react';
 import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, AuditOutlined } from '@ant-design/icons';
@@ -20,710 +20,547 @@ import usePermission from '../usePermission';
  * @param onBeforeRemove 删除之前方法，开放给每个模块重写
  * @returns
  */
-
 function useSingle(inParam) {
   var _usePermission = usePermission(),
-      resourceId = _usePermission.resourceId,
-      loginName = _usePermission.loginName,
-      checkRight = _usePermission.checkRight,
-      canAdd = _usePermission.canAdd,
-      canEdit = _usePermission.canEdit,
-      canDelete = _usePermission.canDelete,
-      canAudit = _usePermission.canAudit,
-      canImport = _usePermission.canImport,
-      canExport = _usePermission.canExport;
-
+    resourceId = _usePermission.resourceId,
+    loginName = _usePermission.loginName,
+    checkRight = _usePermission.checkRight,
+    canAdd = _usePermission.canAdd,
+    canEdit = _usePermission.canEdit,
+    canDelete = _usePermission.canDelete,
+    canAudit = _usePermission.canAudit,
+    canImport = _usePermission.canImport,
+    canExport = _usePermission.canExport;
   var service = inParam.service,
-      toolConfig = inParam.toolConfig,
-      initItem = inParam.initItem,
-      statusField = inParam.statusField,
-      auditStatus = inParam.auditStatus,
-      beforeAudit = inParam.beforeAudit,
-      beforeLoad = inParam.beforeLoad,
-      beforeRemove = inParam.beforeRemove,
-      beforeAdd = inParam.beforeAdd,
-      beforeEdit = inParam.beforeEdit,
-      beforeSave = inParam.beforeSave,
-      afterRemove = inParam.afterRemove,
-      afterSave = inParam.afterSave,
-      afterAudit = inParam.afterAudit,
-      btnStatus = inParam.btnStatus;
+    toolConfig = inParam.toolConfig,
+    initItem = inParam.initItem,
+    statusField = inParam.statusField,
+    auditStatus = inParam.auditStatus,
+    beforeAudit = inParam.beforeAudit,
+    beforeLoad = inParam.beforeLoad,
+    beforeRemove = inParam.beforeRemove,
+    beforeAdd = inParam.beforeAdd,
+    beforeEdit = inParam.beforeEdit,
+    beforeSave = inParam.beforeSave,
+    afterRemove = inParam.afterRemove,
+    afterSave = inParam.afterSave,
+    afterAudit = inParam.afterAudit,
+    btnStatus = inParam.btnStatus;
   /** @name 选中行数据 */
-
   var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      selectedRows = _useState2[0],
-      setSelectedRows = _useState2[1];
+    _useState2 = _slicedToArray(_useState, 2),
+    selectedRows = _useState2[0],
+    setSelectedRows = _useState2[1];
   /** @name 显示新增编辑框 */
-
-
   var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      showEdit = _useState4[0],
-      setShowEdit = _useState4[1];
+    _useState4 = _slicedToArray(_useState3, 2),
+    showEdit = _useState4[0],
+    setShowEdit = _useState4[1];
   /** @name 新增或编辑对象初始值 */
-
-
   var _useState5 = useState(initItem),
-      _useState6 = _slicedToArray(_useState5, 2),
-      editItem = _useState6[0],
-      setEditItem = _useState6[1];
+    _useState6 = _slicedToArray(_useState5, 2),
+    editItem = _useState6[0],
+    setEditItem = _useState6[1];
   /** @name 表格Ref */
-
-
   var tableRef = useRef();
   /** @name 查询表单Ref */
-
   var formRef = useRef();
   /**@name 编辑表单Ref */
-
   var editFormRef = useRef();
   /**@name 查看历史数据 */
-
   var _useState7 = useState(0),
-      _useState8 = _slicedToArray(_useState7, 2),
-      ifHistoryData = _useState8[0],
-      setIfHistoryData = _useState8[1];
+    _useState8 = _slicedToArray(_useState7, 2),
+    ifHistory = _useState8[0],
+    setIfHistory = _useState8[1];
   /** 判断是否已审核，只有传入审核状态和状态字段才进行判断 */
-
-
   var isAudit = useCallback(function () {
     var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     if (!auditStatus || !statusField) return false;
     if (!row && !selectedRows.length) return false;
-
     if (row) {
       return Number(row[statusField] || 0) >= auditStatus;
     }
-
     return selectedRows.findIndex(function (o) {
       return Number(o[statusField] || 0) >= auditStatus;
     }) > -1;
   }, [auditStatus, statusField, selectedRows]);
   /** 新增按钮事件 */
-
   var onAdd = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(item) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!item) {
-                item = _objectSpread({}, initItem);
-              }
-
-              _context.t0 = beforeAdd;
-
-              if (!_context.t0) {
-                _context.next = 7;
-                break;
-              }
-
-              _context.next = 5;
-              return beforeAdd(item);
-
-            case 5:
-              _context.t1 = _context.sent;
-              _context.t0 = _context.t1 === false;
-
-            case 7:
-              if (!_context.t0) {
-                _context.next = 9;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 9:
-              setEditItem(item);
-              setShowEdit(true);
-
-            case 11:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!item) {
+              item = _objectSpread({}, initItem);
+            }
+            _context.t0 = beforeAdd;
+            if (!_context.t0) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 5;
+            return beforeAdd(item);
+          case 5:
+            _context.t1 = _context.sent;
+            _context.t0 = _context.t1 === false;
+          case 7:
+            if (!_context.t0) {
+              _context.next = 9;
+              break;
+            }
+            return _context.abrupt("return");
+          case 9:
+            setEditItem(item);
+            setShowEdit(true);
+          case 11:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
-
     return function onAdd(_x) {
       return _ref.apply(this, arguments);
     };
   }();
   /** 编辑按钮事件 */
-
-
   var onEdit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(item) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(!item && !selectedRows.length)) {
-                _context2.next = 3;
-                break;
-              }
-
-              showWarn('请先选择需要更改的数据');
-              return _context2.abrupt("return");
-
-            case 3:
-              if (!item) {
-                item = _objectSpread({}, selectedRows[0]);
-              }
-
-              _context2.t0 = beforeEdit;
-
-              if (!_context2.t0) {
-                _context2.next = 10;
-                break;
-              }
-
-              _context2.next = 8;
-              return beforeEdit(item);
-
-            case 8:
-              _context2.t1 = _context2.sent;
-              _context2.t0 = _context2.t1 === false;
-
-            case 10:
-              if (!_context2.t0) {
-                _context2.next = 12;
-                break;
-              }
-
-              return _context2.abrupt("return");
-
-            case 12:
-              setEditItem(item);
-              setShowEdit(true);
-
-            case 14:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(!item && !selectedRows.length)) {
+              _context2.next = 3;
+              break;
+            }
+            showWarn('请先选择需要更改的数据');
+            return _context2.abrupt("return");
+          case 3:
+            if (!item) {
+              item = _objectSpread({}, selectedRows[0]);
+            }
+            _context2.t0 = beforeEdit;
+            if (!_context2.t0) {
+              _context2.next = 10;
+              break;
+            }
+            _context2.next = 8;
+            return beforeEdit(item);
+          case 8:
+            _context2.t1 = _context2.sent;
+            _context2.t0 = _context2.t1 === false;
+          case 10:
+            if (!_context2.t0) {
+              _context2.next = 12;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 12:
+            setEditItem(item);
+            setShowEdit(true);
+          case 14:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
-
     return function onEdit(_x2) {
       return _ref2.apply(this, arguments);
     };
   }();
   /** 删除按钮事件 */
-
-
   var onRemove = function onRemove(row) {
     if (!row && !selectedRows.length) {
       showWarn('请选择需要删除的数据');
       return;
     }
-
     if (isAudit(row)) {
       showWarn('选择中数据中有已审核，不能删除!');
       return;
     }
-
     showConfirm('确认要删除选择的数据?').then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var rows, ids, _result$flag, result;
-
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              rows = row ? [row] : selectedRows;
-
-              if (!beforeRemove) {
-                _context3.next = 7;
-                break;
-              }
-
-              _context3.next = 4;
-              return beforeRemove(rows);
-
-            case 4:
-              ids = _context3.sent;
-
-              if (!(ids === false)) {
-                _context3.next = 7;
-                break;
-              }
-
-              return _context3.abrupt("return");
-
-            case 7:
-              if (!ids) {
-                ids = rows.map(function (o) {
-                  return o.id;
-                });
-              }
-
-              _context3.prev = 8;
-              _context3.next = 11;
-              return service.remove(ids);
-
-            case 11:
-              result = _context3.sent;
-              _context3.t0 = afterRemove;
-
-              if (!_context3.t0) {
-                _context3.next = 18;
-                break;
-              }
-
-              _context3.next = 16;
-              return afterRemove(result, rows);
-
-            case 16:
-              _context3.t1 = _context3.sent;
-              _context3.t0 = _context3.t1 === false;
-
-            case 18:
-              if (!_context3.t0) {
-                _context3.next = 20;
-                break;
-              }
-
-              return _context3.abrupt("return");
-
-            case 20:
-              if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
-                showSuccess(result.flag.retMsg || '删除成功');
-
-                if (tableRef.current) {
-                  tableRef.current.reload(false);
-                }
-              }
-
-              _context3.next = 26;
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            rows = row ? [row] : selectedRows;
+            if (!beforeRemove) {
+              _context3.next = 7;
+              break;
+            }
+            _context3.next = 4;
+            return beforeRemove(rows);
+          case 4:
+            ids = _context3.sent;
+            if (!(ids === false)) {
+              _context3.next = 7;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 7:
+            if (!ids) {
+              ids = rows.map(function (o) {
+                return o.id;
+              });
+            }
+            _context3.prev = 8;
+            _context3.next = 11;
+            return service.remove(ids);
+          case 11:
+            result = _context3.sent;
+            _context3.t0 = afterRemove;
+            if (!_context3.t0) {
+              _context3.next = 18;
               break;
-
-            case 23:
-              _context3.prev = 23;
-              _context3.t2 = _context3["catch"](8);
-              console.log(_context3.t2);
-
-            case 26:
-            case "end":
-              return _context3.stop();
-          }
+            }
+            _context3.next = 16;
+            return afterRemove(result, rows);
+          case 16:
+            _context3.t1 = _context3.sent;
+            _context3.t0 = _context3.t1 === false;
+          case 18:
+            if (!_context3.t0) {
+              _context3.next = 20;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 20:
+            if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
+              showSuccess(result.flag.retMsg || '删除成功');
+              if (tableRef.current) {
+                tableRef.current.reload(false);
+              }
+            }
+            _context3.next = 26;
+            break;
+          case 23:
+            _context3.prev = 23;
+            _context3.t2 = _context3["catch"](8);
+            console.log(_context3.t2);
+          case 26:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3, null, [[8, 23]]);
     })));
   };
   /** 审核按钮事件 */
-
-
   var onAudit = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(row) {
       var rows, _result$flag2, result;
-
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              if (!(!row && !selectedRows.length)) {
-                _context4.next = 3;
-                break;
-              }
-
-              showWarn('请选择需要审核的数据');
-              return _context4.abrupt("return");
-
-            case 3:
-              if (!isAudit(row)) {
-                _context4.next = 6;
-                break;
-              }
-
-              showWarn('选择中数据中有已审核，不能再次进行操作!');
-              return _context4.abrupt("return");
-
-            case 6:
-              rows = (row ? [row] : selectedRows).map(function (o) {
-                var obj = _objectSpread({}, o); //@ts-ignore
-
-
-                obj[statusField] = auditStatus;
-                return obj;
-              });
-              _context4.prev = 7;
-              _context4.next = 10;
-              return showConfirm('确认要审核选中的数据？', '审核提示');
-
-            case 10:
-              _context4.next = 16;
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            if (!(!row && !selectedRows.length)) {
+              _context4.next = 3;
               break;
-
-            case 12:
-              _context4.prev = 12;
-              _context4.t0 = _context4["catch"](7);
-              console.log(_context4.t0);
-              return _context4.abrupt("return");
-
-            case 16:
-              _context4.t1 = beforeAudit;
-
-              if (!_context4.t1) {
-                _context4.next = 22;
-                break;
-              }
-
-              _context4.next = 20;
-              return beforeAudit(rows);
-
-            case 20:
-              _context4.t2 = _context4.sent;
-              _context4.t1 = _context4.t2 === false;
-
-            case 22:
-              if (!_context4.t1) {
-                _context4.next = 24;
-                break;
-              }
-
-              return _context4.abrupt("return");
-
-            case 24:
-              _context4.prev = 24;
-              _context4.next = 27;
-              return service.audit(rows);
-
-            case 27:
-              result = _context4.sent;
-
-              if (!afterAudit) {
-                _context4.next = 31;
-                break;
-              }
-
-              afterAudit(result, rows);
-              return _context4.abrupt("return");
-
-            case 31:
-              if ((result === null || result === void 0 ? void 0 : (_result$flag2 = result.flag) === null || _result$flag2 === void 0 ? void 0 : _result$flag2.retCode) === '0') {
-                showSuccess(result.flag.retMsg || '审核成功');
-
-                if (tableRef.current) {
-                  tableRef.current.reload(false);
-                }
-              }
-
-              _context4.next = 37;
+            }
+            showWarn('请选择需要审核的数据');
+            return _context4.abrupt("return");
+          case 3:
+            if (!isAudit(row)) {
+              _context4.next = 6;
+              break;
+            }
+            showWarn('选择中数据中有已审核，不能再次进行操作!');
+            return _context4.abrupt("return");
+          case 6:
+            rows = (row ? [row] : selectedRows).map(function (o) {
+              var obj = _objectSpread({}, o);
+              //@ts-ignore
+              obj[statusField] = auditStatus;
+              return obj;
+            });
+            _context4.prev = 7;
+            _context4.next = 10;
+            return showConfirm('确认要审核选中的数据？', '审核提示');
+          case 10:
+            _context4.next = 16;
+            break;
+          case 12:
+            _context4.prev = 12;
+            _context4.t0 = _context4["catch"](7);
+            console.log(_context4.t0);
+            return _context4.abrupt("return");
+          case 16:
+            _context4.t1 = beforeAudit;
+            if (!_context4.t1) {
+              _context4.next = 22;
               break;
-
-            case 34:
-              _context4.prev = 34;
-              _context4.t3 = _context4["catch"](24);
-              console.log(_context4.t3);
-
-            case 37:
-            case "end":
-              return _context4.stop();
-          }
+            }
+            _context4.next = 20;
+            return beforeAudit(rows);
+          case 20:
+            _context4.t2 = _context4.sent;
+            _context4.t1 = _context4.t2 === false;
+          case 22:
+            if (!_context4.t1) {
+              _context4.next = 24;
+              break;
+            }
+            return _context4.abrupt("return");
+          case 24:
+            _context4.prev = 24;
+            _context4.next = 27;
+            return service.audit(rows);
+          case 27:
+            result = _context4.sent;
+            if (!afterAudit) {
+              _context4.next = 31;
+              break;
+            }
+            afterAudit(result, rows);
+            return _context4.abrupt("return");
+          case 31:
+            if ((result === null || result === void 0 ? void 0 : (_result$flag2 = result.flag) === null || _result$flag2 === void 0 ? void 0 : _result$flag2.retCode) === '0') {
+              showSuccess(result.flag.retMsg || '审核成功');
+              if (tableRef.current) {
+                tableRef.current.reload(false);
+              }
+            }
+            _context4.next = 37;
+            break;
+          case 34:
+            _context4.prev = 34;
+            _context4.t3 = _context4["catch"](24);
+            console.log(_context4.t3);
+          case 37:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4, null, [[7, 12], [24, 34]]);
     }));
-
     return function onAudit(_x3) {
       return _ref4.apply(this, arguments);
     };
   }();
   /** 新增，更改对应的保存事件 */
-
-
   var onSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(formData) {
       var data, _result$flag3, result;
-
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
-              data = _objectSpread(_objectSpread({}, editItem), formData);
-              _context5.prev = 1;
-              _context5.t0 = beforeSave;
-
-              if (!_context5.t0) {
-                _context5.next = 8;
-                break;
-              }
-
-              _context5.next = 6;
-              return beforeSave(data);
-
-            case 6:
-              _context5.t1 = _context5.sent;
-              _context5.t0 = _context5.t1 === false;
-
-            case 8:
-              if (!_context5.t0) {
-                _context5.next = 10;
-                break;
-              }
-
-              return _context5.abrupt("return", false);
-
-            case 10:
-              _context5.next = 12;
-              return service.save(data);
-
-            case 12:
-              result = _context5.sent;
-
-              if (!afterSave) {
-                _context5.next = 17;
-                break;
-              }
-
-              _context5.next = 16;
-              return afterSave(result, data, false);
-
-            case 16:
-              return _context5.abrupt("return", _context5.sent);
-
-            case 17:
-              if (!((result === null || result === void 0 ? void 0 : (_result$flag3 = result.flag) === null || _result$flag3 === void 0 ? void 0 : _result$flag3.retCode) === '0')) {
-                _context5.next = 21;
-                break;
-              }
-
-              showSuccess(result.flag.retMsg || '操作成功');
-
-              if (tableRef.current) {
-                tableRef.current.reload(false);
-              }
-
-              return _context5.abrupt("return", true);
-
-            case 21:
-              _context5.next = 26;
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            data = _objectSpread(_objectSpread({}, editItem), formData);
+            _context5.prev = 1;
+            _context5.t0 = beforeSave;
+            if (!_context5.t0) {
+              _context5.next = 8;
+              break;
+            }
+            _context5.next = 6;
+            return beforeSave(data);
+          case 6:
+            _context5.t1 = _context5.sent;
+            _context5.t0 = _context5.t1 === false;
+          case 8:
+            if (!_context5.t0) {
+              _context5.next = 10;
+              break;
+            }
+            return _context5.abrupt("return", false);
+          case 10:
+            _context5.next = 12;
+            return service.save(data);
+          case 12:
+            result = _context5.sent;
+            if (!afterSave) {
+              _context5.next = 17;
               break;
-
-            case 23:
-              _context5.prev = 23;
-              _context5.t2 = _context5["catch"](1);
-              console.log(_context5.t2);
-
-            case 26:
-              return _context5.abrupt("return", false);
-
-            case 27:
-            case "end":
-              return _context5.stop();
-          }
+            }
+            _context5.next = 16;
+            return afterSave(result, data, false);
+          case 16:
+            return _context5.abrupt("return", _context5.sent);
+          case 17:
+            if (!((result === null || result === void 0 ? void 0 : (_result$flag3 = result.flag) === null || _result$flag3 === void 0 ? void 0 : _result$flag3.retCode) === '0')) {
+              _context5.next = 21;
+              break;
+            }
+            showSuccess(result.flag.retMsg || '操作成功');
+            if (tableRef.current) {
+              tableRef.current.reload(false);
+            }
+            return _context5.abrupt("return", true);
+          case 21:
+            _context5.next = 26;
+            break;
+          case 23:
+            _context5.prev = 23;
+            _context5.t2 = _context5["catch"](1);
+            console.log(_context5.t2);
+          case 26:
+            return _context5.abrupt("return", false);
+          case 27:
+          case "end":
+            return _context5.stop();
         }
       }, _callee5, null, [[1, 23]]);
     }));
-
     return function onSave(_x4) {
       return _ref5.apply(this, arguments);
     };
   }();
   /** 加载数据方法 */
-
-
   var onLoad = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params, sort, filter) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params, sort, filter, isHistory) {
       var _tableRef$current, _tableRef$current$cle;
-
       var current, pageSize, sumProperties, rest, param, key, k, sortArr, _key, result;
-
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-        while (1) {
-          switch (_context6.prev = _context6.next) {
-            case 0:
-              current = params.current, pageSize = params.pageSize, sumProperties = params.sumProperties, rest = _objectWithoutProperties(params, _excluded);
-              param = {}; // 分页
-
-              if (current) {
-                param.page = current;
-                param.pageSize = pageSize;
-              } // 合计
-
-
-              if (sumProperties) {
-                param.sumProperties = sumProperties;
-                delete param.page;
-                delete param.pageSize;
-              } // 处理查询条件
-
-
-              for (key in rest) {
-                if (rest[key] === '') {
-                  delete rest[key];
-                }
-              }
-
-              if (Object.keys(rest).length) {
-                param.where = rest;
-              }
-
-              if (filter && Object.keys(filter).length) {
-                param.where = param.where || {};
-
-                for (k in filter) {
-                  if (filter[k] && !param.where[k]) {
-                    param.where[k] = filter[k];
-                  }
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            current = params.current, pageSize = params.pageSize, sumProperties = params.sumProperties, rest = _objectWithoutProperties(params, _excluded);
+            param = {}; // 分页
+            if (current) {
+              param.page = current;
+              param.pageSize = pageSize;
+            }
+            // 合计
+            if (sumProperties) {
+              param.sumProperties = sumProperties;
+              delete param.page;
+              delete param.pageSize;
+            }
+            // 处理查询条件
+            for (key in rest) {
+              if (rest[key] === '') {
+                delete rest[key];
+              }
+            }
+            if (Object.keys(rest).length) {
+              param.where = rest;
+            }
+            if (filter && Object.keys(filter).length) {
+              param.where = param.where || {};
+              for (k in filter) {
+                if (filter[k] && !param.where[k]) {
+                  param.where[k] = filter[k];
                 }
-
-                if (!Object.keys(param.where).length) {
-                  delete param.where;
-                }
-              } //处理排序
-
-
-              if (!sumProperties && sort && Object.keys(sort).length) {
-                sortArr = [];
-
-                for (_key in sort) {
-                  sortArr.push(_key + ' ' + (sort[_key] === 'ascend' ? 'asc' : 'desc'));
-                }
-
-                param.sort = sortArr.join(',');
-              }
-
-              if (ifHistoryData) {
-                param.history = 1;
-              }
-
-              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);
-              _context6.t0 = beforeLoad;
-
-              if (!_context6.t0) {
-                _context6.next = 17;
-                break;
-              }
-
-              _context6.next = 15;
-              return beforeLoad(param);
-
-            case 15:
-              _context6.t1 = _context6.sent;
-              _context6.t0 = _context6.t1 === false;
-
-            case 17:
-              if (!_context6.t0) {
-                _context6.next = 19;
-                break;
               }
-
-              return _context6.abrupt("return", {
-                data: [],
-                success: false,
-                total: 0
-              });
-
-            case 19:
-              if (sumProperties && param.sort) {
-                delete param.sort;
-              }
-
-              _context6.next = 22;
-              return service.load(param);
-
-            case 22:
-              result = _context6.sent;
-              result.data = result.rows || [];
-              result.success = true;
-
-              if (sumProperties) {
-                result.data = result.footer;
-              }
-
-              return _context6.abrupt("return", result);
-
-            case 27:
-            case "end":
-              return _context6.stop();
-          }
+              if (!Object.keys(param.where).length) {
+                delete param.where;
+              }
+            }
+            //处理排序
+            if (!sumProperties && sort && Object.keys(sort).length) {
+              sortArr = [];
+              for (_key in sort) {
+                sortArr.push(_key + ' ' + (sort[_key] === 'ascend' ? 'asc' : 'desc'));
+              }
+              param.sort = sortArr.join(',');
+            }
+            if (ifHistory || isHistory) {
+              param.ifHistory = 1;
+            }
+            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);
+            _context6.t0 = beforeLoad;
+            if (!_context6.t0) {
+              _context6.next = 17;
+              break;
+            }
+            _context6.next = 15;
+            return beforeLoad(param);
+          case 15:
+            _context6.t1 = _context6.sent;
+            _context6.t0 = _context6.t1 === false;
+          case 17:
+            if (!_context6.t0) {
+              _context6.next = 19;
+              break;
+            }
+            return _context6.abrupt("return", {
+              data: [],
+              success: false,
+              total: 0
+            });
+          case 19:
+            if (sumProperties && param.sort) {
+              delete param.sort;
+            }
+            _context6.next = 22;
+            return service.load(param);
+          case 22:
+            result = _context6.sent;
+            result.data = result.rows || [];
+            result.success = true;
+            if (sumProperties) {
+              result.data = result.footer;
+            }
+            return _context6.abrupt("return", result);
+          case 27:
+          case "end":
+            return _context6.stop();
         }
       }, _callee6);
     }));
-
-    return function onLoad(_x5, _x6, _x7) {
+    return function onLoad(_x5, _x6, _x7, _x8) {
       return _ref6.apply(this, arguments);
     };
   }();
-
   var onExport = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
-      var _param$exportColumns;
-
-      var _result$flag4, result, _result$flag5, _result$flag6;
-
+      var _param$exportColumns, _param$searchData;
+      var searchArr, _result$flag4, result, _result$flag5, _result$flag6;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) {
-          switch (_context7.prev = _context7.next) {
-            case 0:
-              if ((_param$exportColumns = param.exportColumns) === null || _param$exportColumns === void 0 ? void 0 : _param$exportColumns.length) {
-                _context7.next = 3;
-                break;
-              }
-
-              showWarn('请选择要导出的列');
-              return _context7.abrupt("return", false);
-
-            case 3:
-              if (param.findUrl) {
-                _context7.next = 6;
-                break;
-              }
-
-              showWarn('请配置业务接口 bizApi 属性');
-              return _context7.abrupt("return", false);
-
-            case 6:
-              _context7.prev = 6;
-              _context7.next = 9;
-              return httpPost(url, param, true, false);
-
-            case 9:
-              result = _context7.sent;
-
-              if (!(result.data && typeof result.data === 'string')) {
-                _context7.next = 13;
-                break;
-              }
-
-              window.open(result.data);
-              return _context7.abrupt("return", true);
-
-            case 13:
-              if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-                _context7.next = 18;
-                break;
-              }
-
-              showSuccess(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出成功');
-              return _context7.abrupt("return", true);
-
-            case 18:
-              showError(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出失败,请联系系统管理员');
-              return _context7.abrupt("return", false);
-
-            case 20:
-              _context7.next = 27;
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            if ((_param$exportColumns = param.exportColumns) === null || _param$exportColumns === void 0 ? void 0 : _param$exportColumns.length) {
+              _context7.next = 3;
               break;
-
-            case 22:
-              _context7.prev = 22;
-              _context7.t0 = _context7["catch"](6);
-              console.log(_context7.t0);
-              showError(_context7.t0.message);
-              return _context7.abrupt("return", false);
-
-            case 27:
-            case "end":
-              return _context7.stop();
-          }
+            }
+            showWarn('请选择要导出的列');
+            return _context7.abrupt("return", false);
+          case 3:
+            if (param.findUrl) {
+              _context7.next = 6;
+              break;
+            }
+            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'))) {
+              searchArr = (param.searchData || '').split('&');
+              searchArr.push('ifHistory=1');
+              param.searchData = searchArr.join('&');
+            }
+            _context7.prev = 7;
+            _context7.next = 10;
+            return httpPost(url, param, true, false);
+          case 10:
+            result = _context7.sent;
+            if (!(result.data && typeof result.data === 'string')) {
+              _context7.next = 14;
+              break;
+            }
+            window.open(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;
+              break;
+            }
+            showSuccess(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出成功');
+            return _context7.abrupt("return", true);
+          case 19:
+            showError(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出失败,请联系系统管理员');
+            return _context7.abrupt("return", false);
+          case 21:
+            _context7.next = 28;
+            break;
+          case 23:
+            _context7.prev = 23;
+            _context7.t0 = _context7["catch"](7);
+            console.log(_context7.t0);
+            showError(_context7.t0.message);
+            return _context7.abrupt("return", false);
+          case 28:
+          case "end":
+            return _context7.stop();
         }
-      }, _callee7, null, [[6, 22]]);
+      }, _callee7, null, [[7, 23]]);
     }));
-
-    return function onExport(_x8, _x9) {
+    return function onExport(_x9, _x10) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -732,25 +569,19 @@ function useSingle(inParam) {
    * @param key
    * @returns
    */
-
-
   var btnDisabled = function btnDisabled(key) {
     if (btnStatus && typeof btnStatus(key) === 'boolean') return btnStatus(key);
-
     switch (key) {
       case 'edit':
         return selectedRows.length !== 1 || isAudit();
-
       case 'remove':
       case 'audit':
         return selectedRows.length === 0 || isAudit();
-
       default:
         return false;
     }
-  }; // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
-
-
+  };
+  // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
   var tableTools = useMemo(function () {
     return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && canAdd ? /*#__PURE__*/React.createElement(_Button, {
       key: "add",
@@ -785,7 +616,6 @@ function useSingle(inParam) {
       key: "import",
       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.showImport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
       },
       disabled: btnDisabled('import'),
@@ -794,7 +624,6 @@ function useSingle(inParam) {
       key: "export",
       onClick: function onClick() {
         var _tableRef$current3, _tableRef$current3$sh;
-
         tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$sh = _tableRef$current3.showExport) === null || _tableRef$current3$sh === void 0 ? void 0 : _tableRef$current3$sh.call(_tableRef$current3);
       },
       disabled: btnDisabled('export'),
@@ -825,10 +654,9 @@ function useSingle(inParam) {
     checkRight: checkRight,
     loginName: loginName,
     isAudit: isAudit,
-    ifHistoryData: ifHistoryData,
-    setIfHistoryData: setIfHistoryData
+    ifHistory: ifHistory,
+    setIfHistory: setIfHistory
   };
 }
-
 ;
 export default useSingle;