ls-pro-common 3.1.17 → 3.1.18

package/lib/hooks/useDtl/index.js

@@ -70,62 +70,89 @@ function useDtl(dtlParam) {
     if (!auditStatus || !statusField) return false;
     return Number(masterObject[statusField] || 0) >= auditStatus;
   }, [auditStatus, statusField, masterObject]);
+  /** @name 处理before函数 */
+  var handleBefore = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(beforeFn, arg, isDtl) {
+      var data;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (beforeFn) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", arg);
+          case 2:
+            _context.next = 4;
+            return beforeFn(arg, isDtl);
+          case 4:
+            data = _context.sent;
+            if (!(data === true || data === undefined)) {
+              _context.next = 7;
+              break;
+            }
+            return _context.abrupt("return", arg);
+          case 7:
+            return _context.abrupt("return", data);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleBefore(_x, _x2, _x3) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   /** @name 保存主表 */
   var onSaveMst = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(values) {
       var _result$flag;
-      var data, result;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      var obj, data, result;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (!isAudit()) {
-              _context.next = 3;
+              _context2.next = 3;
               break;
             }
             showWarn('当前单据已审核,不能保存');
-            return _context.abrupt("return", false);
+            return _context2.abrupt("return", false);
           case 3:
-            data = _objectSpread(_objectSpread({}, masterObject), values);
-            _context.t0 = beforeSave;
-            if (!_context.t0) {
-              _context.next = 10;
-              break;
-            }
-            _context.next = 8;
-            return beforeSave(data, false);
-          case 8:
-            _context.t1 = _context.sent;
-            _context.t0 = _context.t1 === false;
-          case 10:
-            if (!_context.t0) {
-              _context.next = 12;
+            obj = _objectSpread(_objectSpread({}, masterObject), values);
+            _context2.next = 6;
+            return handleBefore(beforeSave, obj, false);
+          case 6:
+            data = _context2.sent;
+            if (!(data === false)) {
+              _context2.next = 9;
               break;
             }
-            return _context.abrupt("return", false);
-          case 12:
-            _context.next = 14;
+            return _context2.abrupt("return", false);
+          case 9:
+            _context2.next = 11;
             return mstService.save(data);
-          case 14:
-            result = _context.sent;
-            _context.t2 = afterSave;
-            if (!_context.t2) {
-              _context.next = 21;
+          case 11:
+            result = _context2.sent;
+            _context2.t0 = afterSave;
+            if (!_context2.t0) {
+              _context2.next = 18;
               break;
             }
-            _context.next = 19;
+            _context2.next = 16;
             return afterSave(result, data, false);
-          case 19:
-            _context.t3 = _context.sent;
-            _context.t2 = _context.t3 === false;
-          case 21:
-            if (!_context.t2) {
-              _context.next = 23;
+          case 16:
+            _context2.t1 = _context2.sent;
+            _context2.t0 = _context2.t1 === false;
+          case 18:
+            if (!_context2.t0) {
+              _context2.next = 20;
               break;
             }
-            return _context.abrupt("return", false);
-          case 23:
+            return _context2.abrupt("return", false);
+          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')) {
-              _context.next = 30;
+              _context2.next = 27;
               break;
             }
             showSuccess(result.flag.retMsg || '操作成功');
@@ -137,22 +164,22 @@ function useDtl(dtlParam) {
               masterObject.id = result.id;
             }
             setEditItem({});
-            return _context.abrupt("return", true);
-          case 30:
-            return _context.abrupt("return", false);
-          case 31:
+            return _context2.abrupt("return", true);
+          case 27:
+            return _context2.abrupt("return", false);
+          case 28:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function onSaveMst(_x) {
-      return _ref.apply(this, arguments);
+    return function onSaveMst(_x4) {
+      return _ref2.apply(this, arguments);
     };
   }();
   /** @name 主从一起保存 */
   var onSaveMstDtl = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var _formRef$current, _formRef$current$getF, _tableRef$current, _tableRef$current$get, _tableRef$current2, _tableRef$current2$ge, _result$flag2;
       var isDelete,
         values,
@@ -160,25 +187,26 @@ function useDtl(dtlParam) {
         dtlEditData,
         dtlData,
         param,
+        data,
         result,
-        _args2 = arguments;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+        _args3 = arguments;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            isDelete = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : false;
+            isDelete = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : false;
             if (!isAudit()) {
-              _context2.next = 4;
+              _context3.next = 4;
               break;
             }
             showWarn('当前单据已审核,不能保存');
-            return _context2.abrupt("return", false);
+            return _context3.abrupt("return", false);
           case 4:
             if (dtlParam.dtlName) {
-              _context2.next = 7;
+              _context3.next = 7;
               break;
             }
             showWarn('useDtl未传入dtlName参数,不能主从一起保存');
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 7:
             values = (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : (_formRef$current$getF = _formRef$current.getFieldsFormatValue) === null || _formRef$current$getF === void 0 ? void 0 : _formRef$current$getF.call(_formRef$current);
             mst = _objectSpread(_objectSpread({}, masterObject), values);
@@ -212,256 +240,237 @@ function useDtl(dtlParam) {
                 deleteRows: []
               };
             }
-            _context2.t0 = beforeSave;
-            if (!_context2.t0) {
-              _context2.next = 19;
-              break;
-            }
-            _context2.next = 17;
-            return beforeSave(param, false);
-          case 17:
-            _context2.t1 = _context2.sent;
-            _context2.t0 = _context2.t1 === false;
-          case 19:
-            if (!_context2.t0) {
-              _context2.next = 21;
+            _context3.next = 15;
+            return handleBefore(beforeSave, param, false);
+          case 15:
+            data = _context3.sent;
+            if (!(data === false)) {
+              _context3.next = 18;
               break;
             }
-            return _context2.abrupt("return", false);
-          case 21:
-            _context2.next = 23;
-            return mstService.saveMstDtl(param);
-          case 23:
-            result = _context2.sent;
-            _context2.t2 = afterSave;
-            if (!_context2.t2) {
-              _context2.next = 30;
+            return _context3.abrupt("return", false);
+          case 18:
+            _context3.next = 20;
+            return mstService.saveMstDtl(data);
+          case 20:
+            result = _context3.sent;
+            _context3.t0 = afterSave;
+            if (!_context3.t0) {
+              _context3.next = 27;
               break;
             }
-            _context2.next = 28;
-            return afterSave(result, param, false);
-          case 28:
-            _context2.t3 = _context2.sent;
-            _context2.t2 = _context2.t3 === false;
-          case 30:
-            if (!_context2.t2) {
-              _context2.next = 32;
+            _context3.next = 25;
+            return afterSave(result, data, false);
+          case 25:
+            _context3.t1 = _context3.sent;
+            _context3.t0 = _context3.t1 === false;
+          case 27:
+            if (!_context3.t0) {
+              _context3.next = 29;
               break;
             }
-            return _context2.abrupt("return", false);
-          case 32:
+            return _context3.abrupt("return", false);
+          case 29:
             if (!((result === null || result === void 0 ? void 0 : (_result$flag2 = result.flag) === null || _result$flag2 === void 0 ? void 0 : _result$flag2.retCode) === '0')) {
-              _context2.next = 37;
+              _context3.next = 34;
               break;
             }
             showSuccess(result.flag.retMsg || '操作成功');
             Object.assign(masterObject, result.data);
             setEditItem({});
-            return _context2.abrupt("return", true);
-          case 37:
-            return _context2.abrupt("return", false);
-          case 38:
+            return _context3.abrupt("return", true);
+          case 34:
+            return _context3.abrupt("return", false);
+          case 35:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function onSaveMstDtl() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   /** 删除按钮事件 */
   var onRemoveMst = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
       var _result$flag3;
       var ids, result;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (!(!masterObject || !masterObject[mstKeyField])) {
-              _context3.next = 2;
+              _context4.next = 2;
               break;
             }
-            return _context3.abrupt("return", false);
+            return _context4.abrupt("return", false);
           case 2:
             if (!isAudit()) {
-              _context3.next = 5;
+              _context4.next = 5;
               break;
             }
             showWarn('当前单据已审核,不能删除');
-            return _context3.abrupt("return", false);
+            return _context4.abrupt("return", false);
           case 5:
-            _context3.next = 7;
+            _context4.next = 7;
             return showConfirm('确认要删除当前数据?');
           case 7:
             if (!beforeRemove) {
-              _context3.next = 13;
+              _context4.next = 13;
               break;
             }
-            _context3.next = 10;
+            _context4.next = 10;
             return beforeRemove([masterObject]);
           case 10:
-            ids = _context3.sent;
+            ids = _context4.sent;
             if (!(ids === false)) {
-              _context3.next = 13;
+              _context4.next = 13;
               break;
             }
-            return _context3.abrupt("return", false);
+            return _context4.abrupt("return", false);
           case 13:
-            if (!ids) {
+            if (ids === true || ids === undefined) {
               ids = [masterObject.id || masterObject[mstKeyField]]; //优先取id为主键，除非表中无id
             }
-            _context3.next = 16;
+            _context4.next = 16;
             return mstService.remove(ids);
           case 16:
-            result = _context3.sent;
-            _context3.t0 = afterRemove;
-            if (!_context3.t0) {
-              _context3.next = 23;
+            result = _context4.sent;
+            _context4.t0 = afterRemove;
+            if (!_context4.t0) {
+              _context4.next = 23;
               break;
             }
-            _context3.next = 21;
+            _context4.next = 21;
             return afterRemove(result, masterObject);
           case 21:
-            _context3.t1 = _context3.sent;
-            _context3.t0 = _context3.t1 === false;
+            _context4.t1 = _context4.sent;
+            _context4.t0 = _context4.t1 === false;
           case 23:
-            if (!_context3.t0) {
-              _context3.next = 25;
+            if (!_context4.t0) {
+              _context4.next = 25;
               break;
             }
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 25:
             if (!((result === null || result === void 0 ? void 0 : (_result$flag3 = result.flag) === null || _result$flag3 === void 0 ? void 0 : _result$flag3.retCode) === '0')) {
-              _context3.next = 28;
+              _context4.next = 28;
               break;
             }
             showSuccess(result.flag.retMsg || '删除成功');
-            return _context3.abrupt("return", true);
+            return _context4.abrupt("return", true);
           case 28:
-            return _context3.abrupt("return", false);
+            return _context4.abrupt("return", false);
           case 29:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function onRemoveMst() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   /** 新增按钮事件 */
   var onAddDtl = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
       var item,
         _formRef$current2,
         mstVal,
         mst,
-        _args4 = arguments;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+        data,
+        _args5 = arguments;
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            item = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : _objectSpread({}, dtlItem);
+            item = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : _objectSpread({}, dtlItem);
             if (!(!masterObject[mstKeyField] && formRef.current)) {
-              _context4.next = 16;
+              _context5.next = 16;
               break;
             }
-            _context4.prev = 2;
-            _context4.next = 5;
+            _context5.prev = 2;
+            _context5.next = 5;
             return (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.validateFields();
           case 5:
             mstVal = formRef.current.getFieldsValue();
-            _context4.next = 8;
+            _context5.next = 8;
             return onSaveMst(mstVal);
           case 8:
-            mst = _context4.sent;
+            mst = _context5.sent;
             if (!(mst !== true)) {
-              _context4.next = 11;
+              _context5.next = 11;
               break;
             }
-            return _context4.abrupt("return", false);
+            return _context5.abrupt("return", false);
           case 11:
-            _context4.next = 16;
+            _context5.next = 16;
             break;
           case 13:
-            _context4.prev = 13;
-            _context4.t0 = _context4["catch"](2);
-            return _context4.abrupt("return", false);
+            _context5.prev = 13;
+            _context5.t0 = _context5["catch"](2);
+            return _context5.abrupt("return", false);
           case 16:
-            _context4.t1 = beforeAdd;
-            if (!_context4.t1) {
-              _context4.next = 22;
-              break;
-            }
-            _context4.next = 20;
-            return beforeAdd(item);
-          case 20:
-            _context4.t2 = _context4.sent;
-            _context4.t1 = _context4.t2 === false;
-          case 22:
-            if (!_context4.t1) {
-              _context4.next = 24;
+            _context5.next = 18;
+            return handleBefore(beforeAdd, item);
+          case 18:
+            data = _context5.sent;
+            if (!(data === false)) {
+              _context5.next = 21;
               break;
             }
-            return _context4.abrupt("return", false);
-          case 24:
-            setEditItem(item);
+            return _context5.abrupt("return");
+          case 21:
+            setEditItem(data);
             setShowEdit(true);
-            return _context4.abrupt("return", true);
-          case 27:
+            return _context5.abrupt("return", true);
+          case 24:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[2, 13]]);
+      }, _callee5, null, [[2, 13]]);
     }));
     return function onAddDtl() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   /** 编辑按钮事件 */
   var onEditDtl = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
       var item,
-        _args5 = arguments;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+        data,
+        _args6 = arguments;
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            item = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : _objectSpread({}, selectedRows[0]);
+            item = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : _objectSpread({}, selectedRows[0]);
             if (selectedRows.length) {
-              _context5.next = 4;
+              _context6.next = 4;
               break;
             }
             showWarn('请先选择需要更改的数据');
-            return _context5.abrupt("return", false);
+            return _context6.abrupt("return", false);
           case 4:
-            _context5.t0 = beforeEdit;
-            if (!_context5.t0) {
-              _context5.next = 10;
-              break;
-            }
-            _context5.next = 8;
-            return beforeEdit(item);
-          case 8:
-            _context5.t1 = _context5.sent;
-            _context5.t0 = _context5.t1 === false;
-          case 10:
-            if (!_context5.t0) {
-              _context5.next = 12;
+            _context6.next = 6;
+            return handleBefore(beforeEdit, item);
+          case 6:
+            data = _context6.sent;
+            if (!(data === false)) {
+              _context6.next = 9;
               break;
             }
-            return _context5.abrupt("return", false);
-          case 12:
-            setEditItem(item);
+            return _context6.abrupt("return", false);
+          case 9:
+            setEditItem(data);
             setShowEdit(true);
-            return _context5.abrupt("return", true);
-          case 15:
+            return _context6.abrupt("return", true);
+          case 12:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return function onEditDtl() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   /** 删除按钮事件 */
@@ -471,51 +480,51 @@ function useDtl(dtlParam) {
       showWarn('请选择需要删除的数据');
       return;
     }
-    showConfirm('确认要删除选择的数据?').then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+    showConfirm('确认要删除选择的数据?').then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
       var _result$flag4;
       var ids, result;
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             if (!beforeRemove) {
-              _context6.next = 6;
+              _context7.next = 6;
               break;
             }
-            _context6.next = 3;
+            _context7.next = 3;
             return beforeRemove(rows);
           case 3:
-            ids = _context6.sent;
+            ids = _context7.sent;
             if (!(ids === false)) {
-              _context6.next = 6;
+              _context7.next = 6;
               break;
             }
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
           case 6:
-            if (!ids) {
+            if (ids === true || ids === undefined) {
               ids = rows.map(function (o) {
                 return o.id;
               });
             }
-            _context6.next = 9;
+            _context7.next = 9;
             return dtlService.remove(ids);
           case 9:
-            result = _context6.sent;
-            _context6.t0 = afterRemove;
-            if (!_context6.t0) {
-              _context6.next = 16;
+            result = _context7.sent;
+            _context7.t0 = afterRemove;
+            if (!_context7.t0) {
+              _context7.next = 16;
               break;
             }
-            _context6.next = 14;
+            _context7.next = 14;
             return afterRemove(result, rows);
           case 14:
-            _context6.t1 = _context6.sent;
-            _context6.t0 = _context6.t1 === false;
+            _context7.t1 = _context7.sent;
+            _context7.t0 = _context7.t1 === false;
           case 16:
-            if (!_context6.t0) {
-              _context6.next = 18;
+            if (!_context7.t0) {
+              _context7.next = 18;
               break;
             }
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
           case 18:
             if ((result === null || result === void 0 ? void 0 : (_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0') {
               showSuccess(result.flag.retMsg);
@@ -525,80 +534,73 @@ function useDtl(dtlParam) {
             }
           case 19:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     })));
   };
   /** 新增，更改对应的保存事件 */
   var onSaveDtl = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(formData) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(formData) {
       var _result$flag5;
-      var data, result;
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      var obj, data, result;
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            data = _objectSpread(_objectSpread({}, editItem), formData);
-            if (!data.id) {
-              data[relationField] = masterObject[mstKeyField];
+            obj = _objectSpread(_objectSpread({}, editItem), formData);
+            if (!obj.id) {
+              obj[relationField] = masterObject[mstKeyField];
             }
-            _context7.t0 = beforeSave;
-            if (!_context7.t0) {
-              _context7.next = 8;
-              break;
-            }
-            _context7.next = 6;
-            return beforeSave(data, true);
-          case 6:
-            _context7.t1 = _context7.sent;
-            _context7.t0 = _context7.t1 === false;
-          case 8:
-            if (!_context7.t0) {
-              _context7.next = 10;
+            _context8.next = 4;
+            return handleBefore(beforeSave, obj, true);
+          case 4:
+            data = _context8.sent;
+            if (!(data === false)) {
+              _context8.next = 7;
               break;
             }
-            return _context7.abrupt("return", false);
-          case 10:
-            _context7.next = 12;
+            return _context8.abrupt("return", false);
+          case 7:
+            _context8.next = 9;
             return dtlService.save(data);
-          case 12:
-            result = _context7.sent;
-            _context7.t2 = afterSave;
-            if (!_context7.t2) {
-              _context7.next = 19;
+          case 9:
+            result = _context8.sent;
+            _context8.t0 = afterSave;
+            if (!_context8.t0) {
+              _context8.next = 16;
               break;
             }
-            _context7.next = 17;
+            _context8.next = 14;
             return afterSave(result, data, true);
-          case 17:
-            _context7.t3 = _context7.sent;
-            _context7.t2 = _context7.t3 === false;
-          case 19:
-            if (!_context7.t2) {
-              _context7.next = 21;
+          case 14:
+            _context8.t1 = _context8.sent;
+            _context8.t0 = _context8.t1 === false;
+          case 16:
+            if (!_context8.t0) {
+              _context8.next = 18;
               break;
             }
-            return _context7.abrupt("return", false);
-          case 21:
+            return _context8.abrupt("return", false);
+          case 18:
             if (!((result === null || result === void 0 ? void 0 : (_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retCode) === '0')) {
-              _context7.next = 25;
+              _context8.next = 22;
               break;
             }
             showSuccess(result.flag.retMsg);
             if (tableRef.current) {
               tableRef.current.reload(false);
             }
-            return _context7.abrupt("return", true);
-          case 25:
-            return _context7.abrupt("return", false);
-          case 26:
+            return _context8.abrupt("return", true);
+          case 22:
+            return _context8.abrupt("return", false);
+          case 23:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     }));
-    return function onSaveDtl(_x2) {
-      return _ref7.apply(this, arguments);
+    return function onSaveDtl(_x5) {
+      return _ref8.apply(this, arguments);
     };
   }();
   var toV2LoadParams = function toV2LoadParams(param) {
@@ -624,18 +626,18 @@ function useDtl(dtlParam) {
   };
   /** 加载数据方法 */
   var onLoadDtl = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(params, sort, filter) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(params, sort, filter) {
       var _tableRef$current3, _tableRef$current3$cl;
-      var current, pageSize, sumProperties, rest, param, key, sortArr, _key, _key2, result;
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      var current, pageSize, sumProperties, rest, param, key, sortArr, _key, _key2, where, result;
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             current = params.current, pageSize = params.pageSize, sumProperties = params.sumProperties, rest = _objectWithoutProperties(params, _excluded);
             if (!(!masterObject || !masterObject[mstKeyField])) {
-              _context8.next = 3;
+              _context9.next = 3;
               break;
             }
-            return _context8.abrupt("return", {
+            return _context9.abrupt("return", {
               data: [],
               success: true
             });
@@ -684,69 +686,67 @@ function useDtl(dtlParam) {
             if (isV2) {
               toV2LoadParams(param);
             }
-            _context8.t0 = beforeLoad;
-            if (!_context8.t0) {
-              _context8.next = 22;
-              break;
-            }
-            _context8.next = 20;
-            return beforeLoad(param);
-          case 20:
-            _context8.t1 = _context8.sent;
-            _context8.t0 = _context8.t1 === false;
-          case 22:
-            if (!_context8.t0) {
-              _context8.next = 24;
+            _context9.next = 18;
+            return handleBefore(beforeLoad, param, true);
+          case 18:
+            where = _context9.sent;
+            if (!(where === false)) {
+              _context9.next = 21;
               break;
             }
-            return _context8.abrupt("return", {
+            return _context9.abrupt("return", {
               data: [],
-              success: true
+              success: false,
+              total: 0
             });
-          case 24:
-            if (sumProperties && param.sort) {
-              delete param.sort;
+          case 21:
+            // 如果beforeLoad返回true或没有返回值,则使用原来的param
+            if (where === true || where === undefined) {
+              where = param;
             }
-            _context8.next = 27;
-            return dtlService.load(param);
-          case 27:
-            result = _context8.sent;
+            if (sumProperties && where.sort) {
+              delete where.sort;
+            }
+            _context9.next = 25;
+            return dtlService.load(where);
+          case 25:
+            result = _context9.sent;
             result.data = result.rows;
             result.success = true;
             if (sumProperties) {
               result.data = result.footer;
             }
-            return _context8.abrupt("return", result);
-          case 32:
+            return _context9.abrupt("return", result);
+          case 30:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }));
-    return function onLoadDtl(_x3, _x4, _x5) {
-      return _ref8.apply(this, arguments);
+    return function onLoadDtl(_x6, _x7, _x8) {
+      return _ref9.apply(this, arguments);
     };
   }();
   var onExportDtl = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url, param) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(url, param) {
       var _param$exportColumns;
       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) {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
             if ((_param$exportColumns = param.exportColumns) === null || _param$exportColumns === void 0 ? void 0 : _param$exportColumns.length) {
-              _context9.next = 3;
+              _context10.next = 3;
               break;
             }
             showWarn('请选择要导出的列');
-            return _context9.abrupt("return", false);
+            return _context10.abrupt("return", false);
           case 3:
             if (param.findUrl) {
-              _context9.next = 6;
+              _context10.next = 6;
               break;
             }
             showWarn('请配置业务接口 bizApi 属性');
-            return _context9.abrupt("return", false);
+            return _context10.abrupt("return", false);
           case 6:
             if (param.searchData) {
               searchArr = (param.searchData || '').split('&');
@@ -787,143 +787,136 @@ function useDtl(dtlParam) {
                 }
               }
             }
-            _context9.prev = 7;
-            _context9.next = 10;
+            _context10.prev = 7;
+            _context10.next = 10;
             return httpPost(url, param);
           case 10:
-            result = _context9.sent;
+            result = _context10.sent;
             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;
+              _context10.next = 14;
               break;
             }
             downloadFile(result.data);
-            return _context9.abrupt("return", true);
+            return _context10.abrupt("return", true);
           case 14:
             if (!(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retCode) === '0')) {
-              _context9.next = 19;
+              _context10.next = 19;
               break;
             }
             exportProcess(result);
             // showSuccess(result.flag?.retMsg || '导出成功');
-            return _context9.abrupt("return", true);
+            return _context10.abrupt("return", true);
           case 19:
             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;
+              _context10.next = 23;
               break;
             }
-            return _context9.abrupt("return", result);
+            return _context10.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);
+            return _context10.abrupt("return", false);
           case 25:
-            _context9.next = 31;
+            _context10.next = 31;
             break;
           case 27:
-            _context9.prev = 27;
-            _context9.t0 = _context9["catch"](7);
-            showError(_context9.t0.message);
-            return _context9.abrupt("return", false);
+            _context10.prev = 27;
+            _context10.t0 = _context10["catch"](7);
+            showError(_context10.t0.message);
+            return _context10.abrupt("return", false);
           case 31:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9, null, [[7, 27]]);
+      }, _callee10, null, [[7, 27]]);
     }));
-    return function onExportDtl(_x6, _x7) {
-      return _ref9.apply(this, arguments);
+    return function onExportDtl(_x9, _x10) {
+      return _ref10.apply(this, arguments);
     };
   }();
   /** 审核按钮事件 */
   var onAudit = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      var obj, _result$flag10, result;
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+      var obj, datas, _result$flag10, result;
+      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
             if (!isAudit()) {
-              _context10.next = 3;
+              _context11.next = 3;
               break;
             }
             showWarn('当前数据已审核，不能再做审核操作!');
-            return _context10.abrupt("return");
+            return _context11.abrupt("return");
           case 3:
             obj = _objectSpread({}, masterObject);
             if (masterObject[mstKeyField]) {
-              _context10.next = 7;
+              _context11.next = 7;
               break;
             }
             showWarn('当前数据未保存，不能审核');
-            return _context10.abrupt("return");
+            return _context11.abrupt("return");
           case 7:
-            _context10.prev = 7;
-            _context10.next = 10;
+            _context11.prev = 7;
+            _context11.next = 10;
             return showConfirm('确认要审核此数据？', '审核提示');
           case 10:
-            _context10.next = 16;
+            _context11.next = 16;
             break;
           case 12:
-            _context10.prev = 12;
-            _context10.t0 = _context10["catch"](7);
-            console.log('终止审核', _context10.t0);
-            return _context10.abrupt("return");
+            _context11.prev = 12;
+            _context11.t0 = _context11["catch"](7);
+            console.log('终止审核', _context11.t0);
+            return _context11.abrupt("return");
           case 16:
-            _context10.t1 = beforeAudit;
-            if (!_context10.t1) {
-              _context10.next = 22;
-              break;
-            }
-            _context10.next = 20;
-            return beforeAudit(obj);
-          case 20:
-            _context10.t2 = _context10.sent;
-            _context10.t1 = _context10.t2 === false;
-          case 22:
-            if (!_context10.t1) {
-              _context10.next = 24;
+            _context11.next = 18;
+            return handleBefore(beforeAudit, obj, false);
+          case 18:
+            datas = _context11.sent;
+            if (!(datas === false)) {
+              _context11.next = 21;
               break;
             }
-            return _context10.abrupt("return");
+            return _context11.abrupt("return");
+          case 21:
+            _context11.prev = 21;
+            _context11.next = 24;
+            return mstService.audit(datas);
           case 24:
-            _context10.prev = 24;
-            _context10.next = 27;
-            return mstService.audit([obj]);
-          case 27:
-            result = _context10.sent;
-            _context10.t3 = afterAudit;
-            if (!_context10.t3) {
-              _context10.next = 34;
+            result = _context11.sent;
+            _context11.t1 = afterAudit;
+            if (!_context11.t1) {
+              _context11.next = 31;
               break;
             }
-            _context10.next = 32;
-            return afterAudit(result, [obj]);
-          case 32:
-            _context10.t4 = _context10.sent;
-            _context10.t3 = _context10.t4 === false;
-          case 34:
-            if (!_context10.t3) {
-              _context10.next = 36;
+            _context11.next = 29;
+            return afterAudit(result, datas);
+          case 29:
+            _context11.t2 = _context11.sent;
+            _context11.t1 = _context11.t2 === false;
+          case 31:
+            if (!_context11.t1) {
+              _context11.next = 33;
               break;
             }
-            return _context10.abrupt("return");
-          case 36:
+            return _context11.abrupt("return");
+          case 33:
             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);
             }
-            _context10.next = 42;
+            _context11.next = 39;
             break;
+          case 36:
+            _context11.prev = 36;
+            _context11.t3 = _context11["catch"](21);
+            console.log('审核异常', _context11.t3);
           case 39:
-            _context10.prev = 39;
-            _context10.t5 = _context10["catch"](24);
-            console.log('审核异常', _context10.t5);
-          case 42:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10, null, [[7, 12], [24, 39]]);
+      }, _callee11, null, [[7, 12], [21, 36]]);
     }));
     return function onAudit() {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   var btnDisabled = function btnDisabled(key) {