ls-pro-common 3.1.17 → 3.1.19

package/lib/hooks/useSingle/index.js

@@ -88,87 +88,108 @@ function useSingle(inParam) {
       return Number(o[statusField] || 0) >= auditStatus;
     }) > -1;
   }, [auditStatus, statusField, selectedRows]);
-  /** 新增按钮事件 */
-  var onAdd = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(item) {
+  var handleBefore = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(beforeFn, arg) {
+      var data;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!item) {
-              item = _objectSpread({}, initItem);
+            if (beforeFn) {
+              _context.next = 2;
+              break;
             }
-            _context.t0 = beforeAdd;
-            if (!_context.t0) {
+            return _context.abrupt("return", arg);
+          case 2:
+            _context.next = 4;
+            return beforeFn(arg);
+          case 4:
+            data = _context.sent;
+            if (!(data === false)) {
               _context.next = 7;
               break;
             }
-            _context.next = 5;
-            return beforeAdd(item);
-          case 5:
-            _context.t1 = _context.sent;
-            _context.t0 = _context.t1 === false;
+            return _context.abrupt("return", false);
           case 7:
-            if (!_context.t0) {
-              _context.next = 9;
-              break;
-            }
-            return _context.abrupt("return");
-          case 9:
-            setEditItem(item);
-            setShowEdit(true);
-          case 11:
+            return _context.abrupt("return", arg);
+          case 8:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onAdd(_x) {
+    return function handleBefore(_x, _x2) {
       return _ref.apply(this, arguments);
     };
   }();
-  /** 编辑按钮事件 */
-  var onEdit = /*#__PURE__*/function () {
+  /** 新增按钮事件 */
+  var onAdd = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(item) {
+      var data;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!item) {
+              item = _objectSpread({}, initItem);
+            }
+            _context2.next = 3;
+            return handleBefore(beforeAdd, item);
+          case 3:
+            data = _context2.sent;
+            if (!(data === false)) {
+              _context2.next = 6;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 6:
+            setEditItem(data);
+            setShowEdit(true);
+          case 8:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onAdd(_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  /** 编辑按钮事件 */
+  var onEdit = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(item) {
+      var data;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             if (!(!item && !selectedRows.length)) {
-              _context2.next = 3;
+              _context3.next = 3;
               break;
             }
             showWarn('请先选择需要更改的数据');
-            return _context2.abrupt("return");
+            return _context3.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;
+            _context3.next = 6;
+            return handleBefore(beforeEdit, item);
+          case 6:
+            data = _context3.sent;
+            if (!(data === false)) {
+              _context3.next = 9;
               break;
             }
-            return _context2.abrupt("return");
-          case 12:
-            setEditItem(item);
+            return _context3.abrupt("return");
+          case 9:
+            setEditItem(data);
             setShowEdit(true);
-          case 14:
+          case 11:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    return function onEdit(_x2) {
-      return _ref2.apply(this, arguments);
+    return function onEdit(_x4) {
+      return _ref3.apply(this, arguments);
     };
   }();
   /** 删除按钮事件 */
@@ -181,52 +202,52 @@ function useSingle(inParam) {
       showWarn('选择中数据中有已审核，不能删除!');
       return;
     }
-    showConfirm('确认要删除选择的数据?').then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    showConfirm('确认要删除选择的数据?').then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
       var rows, ids, _result$flag, 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:
             rows = row ? [row] : selectedRows;
             if (!beforeRemove) {
-              _context3.next = 7;
+              _context4.next = 7;
               break;
             }
-            _context3.next = 4;
+            _context4.next = 4;
             return beforeRemove(rows);
           case 4:
-            ids = _context3.sent;
+            ids = _context4.sent;
             if (!(ids === false)) {
-              _context3.next = 7;
+              _context4.next = 7;
               break;
             }
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 7:
-            if (!ids) {
+            if (ids === true || ids === undefined) {
               ids = rows.map(function (o) {
                 return o.id;
               });
             }
-            _context3.prev = 8;
-            _context3.next = 11;
+            _context4.prev = 8;
+            _context4.next = 11;
             return service.remove(ids);
           case 11:
-            result = _context3.sent;
-            _context3.t0 = afterRemove;
-            if (!_context3.t0) {
-              _context3.next = 18;
+            result = _context4.sent;
+            _context4.t0 = afterRemove;
+            if (!_context4.t0) {
+              _context4.next = 18;
               break;
             }
-            _context3.next = 16;
+            _context4.next = 16;
             return afterRemove(result, rows);
           case 16:
-            _context3.t1 = _context3.sent;
-            _context3.t0 = _context3.t1 === false;
+            _context4.t1 = _context4.sent;
+            _context4.t0 = _context4.t1 === false;
           case 18:
-            if (!_context3.t0) {
-              _context3.next = 20;
+            if (!_context4.t0) {
+              _context4.next = 20;
               break;
             }
-            return _context3.abrupt("return");
+            return _context4.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 || '删除成功');
@@ -234,39 +255,39 @@ function useSingle(inParam) {
                 tableRef.current.reload(false);
               }
             }
-            _context3.next = 26;
+            _context4.next = 26;
             break;
           case 23:
-            _context3.prev = 23;
-            _context3.t2 = _context3["catch"](8);
-            console.log(_context3.t2);
+            _context4.prev = 23;
+            _context4.t2 = _context4["catch"](8);
+            console.log(_context4.t2);
           case 26:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, null, [[8, 23]]);
+      }, _callee4, 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) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(row) {
+      var rows, datas, _result$flag2, result;
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if (!(!row && !selectedRows.length)) {
-              _context4.next = 3;
+              _context5.next = 3;
               break;
             }
             showWarn('请选择需要审核的数据');
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 3:
             if (!isAudit(row)) {
-              _context4.next = 6;
+              _context5.next = 6;
               break;
             }
             showWarn('选择中数据中有已审核，不能再次进行操作!');
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 6:
             rows = (row ? [row] : selectedRows).map(function (o) {
               var obj = _objectSpread({}, o);
@@ -274,134 +295,120 @@ function useSingle(inParam) {
               obj[statusField] = auditStatus;
               return obj;
             });
-            _context4.prev = 7;
-            _context4.next = 10;
+            _context5.prev = 7;
+            _context5.next = 10;
             return showConfirm('确认要审核选中的数据？', '审核提示');
           case 10:
-            _context4.next = 16;
+            _context5.next = 16;
             break;
           case 12:
-            _context4.prev = 12;
-            _context4.t0 = _context4["catch"](7);
-            console.log(_context4.t0);
-            return _context4.abrupt("return");
+            _context5.prev = 12;
+            _context5.t0 = _context5["catch"](7);
+            console.log(_context5.t0);
+            return _context5.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;
+            _context5.next = 18;
+            return handleBefore(beforeAudit, rows);
+          case 18:
+            datas = _context5.sent;
+            if (!(datas === false)) {
+              _context5.next = 21;
               break;
             }
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
+          case 21:
+            _context5.prev = 21;
+            _context5.next = 24;
+            return service.audit(datas);
           case 24:
-            _context4.prev = 24;
-            _context4.next = 27;
-            return service.audit(rows);
-          case 27:
-            result = _context4.sent;
+            result = _context5.sent;
             if (!afterAudit) {
-              _context4.next = 31;
+              _context5.next = 28;
               break;
             }
-            afterAudit(result, rows);
-            return _context4.abrupt("return");
-          case 31:
+            afterAudit(result, datas);
+            return _context5.abrupt("return");
+          case 28:
             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;
+            _context5.next = 34;
             break;
+          case 31:
+            _context5.prev = 31;
+            _context5.t1 = _context5["catch"](21);
+            console.log(_context5.t1);
           case 34:
-            _context4.prev = 34;
-            _context4.t3 = _context4["catch"](24);
-            console.log(_context4.t3);
-          case 37:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[7, 12], [24, 34]]);
+      }, _callee5, null, [[7, 12], [21, 31]]);
     }));
-    return function onAudit(_x3) {
-      return _ref4.apply(this, arguments);
+    return function onAudit(_x5) {
+      return _ref5.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) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(formData) {
+      var obj, _result$flag3, data, result;
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.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;
+            obj = _objectSpread(_objectSpread({}, editItem), formData);
+            _context6.prev = 1;
+            _context6.next = 4;
+            return handleBefore(beforeSave, obj);
+          case 4:
+            data = _context6.sent;
+            if (!(data === false)) {
+              _context6.next = 7;
               break;
             }
-            return _context5.abrupt("return", false);
-          case 10:
-            _context5.next = 12;
+            return _context6.abrupt("return", false);
+          case 7:
+            _context6.next = 9;
             return service.save(data);
-          case 12:
-            result = _context5.sent;
+          case 9:
+            result = _context6.sent;
             if (!afterSave) {
-              _context5.next = 17;
+              _context6.next = 14;
               break;
             }
-            _context5.next = 16;
+            _context6.next = 13;
             return afterSave(result, data, false);
-          case 16:
-            return _context5.abrupt("return", _context5.sent);
-          case 17:
+          case 13:
+            return _context6.abrupt("return", _context6.sent);
+          case 14:
             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;
+              _context6.next = 18;
               break;
             }
             showSuccess(result.flag.retMsg || '操作成功');
             if (tableRef.current) {
               tableRef.current.reload(false);
             }
-            return _context5.abrupt("return", true);
-          case 21:
-            _context5.next = 26;
+            return _context6.abrupt("return", true);
+          case 18:
+            _context6.next = 23;
             break;
+          case 20:
+            _context6.prev = 20;
+            _context6.t0 = _context6["catch"](1);
+            console.log(_context6.t0);
           case 23:
-            _context5.prev = 23;
-            _context5.t2 = _context5["catch"](1);
-            console.log(_context5.t2);
-          case 26:
-            return _context5.abrupt("return", false);
-          case 27:
+            return _context6.abrupt("return", false);
+          case 24:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, null, [[1, 23]]);
+      }, _callee6, null, [[1, 20]]);
     }));
-    return function onSave(_x4) {
-      return _ref5.apply(this, arguments);
+    return function onSave(_x6) {
+      return _ref6.apply(this, arguments);
     };
   }();
   var toV2LoadParams = function toV2LoadParams(param) {
@@ -427,11 +434,11 @@ function useSingle(inParam) {
   };
   /** 加载数据方法 */
   var onLoad = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params, sort, filter, isHistory) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(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) {
+      var current, pageSize, sumProperties, rest, param, key, k, sortArr, _key, where, result;
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             current = params.current, pageSize = params.pageSize, sumProperties = params.sumProperties, rest = _objectWithoutProperties(params, _excluded);
             param = {}; // 分页
@@ -481,70 +488,63 @@ function useSingle(inParam) {
             if (isV2) {
               toV2LoadParams(param);
             }
-            _context6.t0 = beforeLoad;
-            if (!_context6.t0) {
-              _context6.next = 18;
-              break;
-            }
-            _context6.next = 16;
-            return beforeLoad(param);
-          case 16:
-            _context6.t1 = _context6.sent;
-            _context6.t0 = _context6.t1 === false;
-          case 18:
-            if (!_context6.t0) {
-              _context6.next = 20;
+            _context7.next = 14;
+            return handleBefore(beforeLoad, param);
+          case 14:
+            where = _context7.sent;
+            if (!(where === false)) {
+              _context7.next = 17;
               break;
             }
-            return _context6.abrupt("return", {
+            return _context7.abrupt("return", {
               data: [],
               success: false,
               total: 0
             });
-          case 20:
-            if (sumProperties && param.sort) {
-              delete param.sort;
+          case 17:
+            if (sumProperties && where.sort) {
+              delete where.sort;
             }
-            _context6.next = 23;
-            return service.load(param);
-          case 23:
-            result = _context6.sent;
+            _context7.next = 20;
+            return service.load(where);
+          case 20:
+            result = _context7.sent;
             result.data = result.rows || [];
             result.success = true;
             if (sumProperties) {
               result.data = result.footer;
             }
-            return _context6.abrupt("return", result);
-          case 28:
+            return _context7.abrupt("return", result);
+          case 25:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
-    return function onLoad(_x5, _x6, _x7, _x8) {
-      return _ref6.apply(this, arguments);
+    return function onLoad(_x7, _x8, _x9, _x10) {
+      return _ref7.apply(this, arguments);
     };
   }();
   var onExport = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(url, param) {
       var _param$exportColumns;
       var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, code, _result$flag5;
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             if ((_param$exportColumns = param.exportColumns) === null || _param$exportColumns === void 0 ? void 0 : _param$exportColumns.length) {
-              _context7.next = 3;
+              _context8.next = 3;
               break;
             }
             showWarn('请选择要导出的列');
-            return _context7.abrupt("return", false);
+            return _context8.abrupt("return", false);
           case 3:
             if (param.findUrl) {
-              _context7.next = 6;
+              _context8.next = 6;
               break;
             }
             showWarn('请配置业务接口 bizApi 属性');
-            return _context7.abrupt("return", false);
+            return _context8.abrupt("return", false);
           case 6:
             if (param.searchData) {
               searchArr = (param.searchData || '').split('&');
@@ -585,52 +585,52 @@ function useSingle(inParam) {
                 }
               }
             }
-            _context7.prev = 7;
-            _context7.next = 10;
+            _context8.prev = 7;
+            _context8.next = 10;
             return httpPost(url, param, true, false);
           case 10:
-            result = _context7.sent;
+            result = _context8.sent;
             code = ((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) || '9009'; // 后端直接返回导出文件地址，直接打开相当于是下载
             if (!(result.data && typeof result.data === 'string' && code === '0')) {
-              _context7.next = 15;
+              _context8.next = 15;
               break;
             }
             downloadFile(result.data);
-            return _context7.abrupt("return", true);
+            return _context8.abrupt("return", true);
           case 15:
             if (!(code === '0')) {
-              _context7.next = 20;
+              _context8.next = 20;
               break;
             }
             // showSuccess(result.flag?.retMsg || '导出成功');
             exportProcess(result);
-            return _context7.abrupt("return", true);
+            return _context8.abrupt("return", true);
           case 20:
             if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes(code)) {
-              _context7.next = 24;
+              _context8.next = 24;
               break;
             }
-            return _context7.abrupt("return", result);
+            return _context8.abrupt("return", result);
           case 24:
             showError(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出失败,请联系系统管理员');
-            return _context7.abrupt("return", false);
+            return _context8.abrupt("return", false);
           case 26:
-            _context7.next = 33;
+            _context8.next = 33;
             break;
           case 28:
-            _context7.prev = 28;
-            _context7.t0 = _context7["catch"](7);
-            console.log(_context7.t0);
-            showError(_context7.t0.message);
-            return _context7.abrupt("return", false);
+            _context8.prev = 28;
+            _context8.t0 = _context8["catch"](7);
+            console.log(_context8.t0);
+            showError(_context8.t0.message);
+            return _context8.abrupt("return", false);
           case 33:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7, null, [[7, 28]]);
+      }, _callee8, null, [[7, 28]]);
     }));
-    return function onExport(_x9, _x10) {
-      return _ref7.apply(this, arguments);
+    return function onExport(_x11, _x12) {
+      return _ref8.apply(this, arguments);
     };
   }();
   /**