ls-pro-common 1.0.26 → 1.0.27

package/es/components/DtlLayout.d.ts

@@ -10,6 +10,8 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     renderButton?: (defaultBtn: JSX.Element[]) => JSX.Element[];
     /** 审核方法 */
     onAudit?: () => void;
+    /**按钮状态 */
+    btnStatus?: (btnKey: string) => boolean | void;
     /** 保存按钮文本 */
     btnSaveText?: string;
     /** 返回按钮文本 */

package/es/components/DtlLayout.js

@@ -20,7 +20,8 @@ function DtlLayout(props) {
       _props$btnSaveText = props.btnSaveText,
       btnSaveText = _props$btnSaveText === void 0 ? '保存' : _props$btnSaveText,
       _props$btnExitText = props.btnExitText,
-      btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText;
+      btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
+      btnStatus = props.btnStatus;
   var dtlTitle = useMemo(function () {
     if (title) return title;
     if (!masterObject) return '';
@@ -38,6 +39,7 @@ function DtlLayout(props) {
 
         formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
       },
+      disabled: btnStatus ? btnStatus('btnSave') || false : false,
       icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
     }, btnSaveText), /*#__PURE__*/React.createElement(_Button, {
       key: "btnBack",
@@ -50,6 +52,11 @@ function DtlLayout(props) {
     if (props.onAudit) {
       b.unshift( /*#__PURE__*/React.createElement(_Button, {
         key: "btnAudit",
+        disabled: btnStatus ? btnStatus('btnAudit') || false : false,
+        onClick: function onClick() {
+          if (!props.onAudit) return;
+          props.onAudit();
+        },
         icon: /*#__PURE__*/React.createElement(CheckOutlined, null)
       }, "\u5BA1\u6838"));
     }

package/es/hooks/useDtl/index.js

@@ -143,7 +143,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              showSuccess(result.flag.retMsg);
+              showSuccess(result.flag.retMsg || '操作成功');
               Object.assign(masterObject, result.data);
               setEditItem({});
               return _context.abrupt("return", true);
@@ -252,7 +252,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              showSuccess(result.flag.retMsg);
+              showSuccess(result.flag.retMsg || '删除成功');
               return _context2.abrupt("return", true);
 
             case 28:
@@ -791,53 +791,48 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 3:
-              obj = _objectSpread({}, masterObject); // beforeAudit 强式终止
-
-              _context9.t0 = beforeAudit;
+              obj = _objectSpread({}, masterObject);
 
-              if (!_context9.t0) {
-                _context9.next = 10;
+              if (masterObject[mstKeyField]) {
+                _context9.next = 7;
                 break;
               }
 
-              _context9.next = 8;
-              return beforeAudit(obj);
+              showWarn('当前数据未保存，不能审核');
+              return _context9.abrupt("return");
 
-            case 8:
-              _context9.t1 = _context9.sent;
-              _context9.t0 = _context9.t1 === false;
+            case 7:
+              _context9.prev = 7;
+              _context9.next = 10;
+              return showConfirm('确认要审核此数据？', '审核提示');
 
             case 10:
-              if (!_context9.t0) {
-                _context9.next = 12;
-                break;
-              }
-
-              return _context9.abrupt("return");
+              _context9.next = 16;
+              break;
 
             case 12:
               _context9.prev = 12;
-              _context9.next = 15;
-              return mstService.audit([obj]);
+              _context9.t0 = _context9["catch"](7);
+              console.log('终止审核', _context9.t0);
+              return _context9.abrupt("return");
 
-            case 15:
-              result = _context9.sent;
-              _context9.t2 = afterAudit;
+            case 16:
+              _context9.t1 = beforeAudit;
 
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 22;
                 break;
               }
 
               _context9.next = 20;
-              return afterAudit(result, [obj]);
+              return beforeAudit(obj);
 
             case 20:
-              _context9.t3 = _context9.sent;
-              _context9.t2 = _context9.t3 === false;
+              _context9.t2 = _context9.sent;
+              _context9.t1 = _context9.t2 === false;
 
             case 22:
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 24;
                 break;
               }
@@ -845,25 +840,54 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 24:
+              _context9.prev = 24;
+              _context9.next = 27;
+              return mstService.audit([obj]);
+
+            case 27:
+              result = _context9.sent;
+              _context9.t3 = afterAudit;
+
+              if (!_context9.t3) {
+                _context9.next = 34;
+                break;
+              }
+
+              _context9.next = 32;
+              return afterAudit(result, [obj]);
+
+            case 32:
+              _context9.t4 = _context9.sent;
+              _context9.t3 = _context9.t4 === false;
+
+            case 34:
+              if (!_context9.t3) {
+                _context9.next = 36;
+                break;
+              }
+
+              return _context9.abrupt("return");
+
+            case 36:
               if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
-                showSuccess(result.flag.retMsg);
+                showSuccess(result.flag.retMsg || '审核成功');
                 Object.assign(masterObject, result.data);
               }
 
-              _context9.next = 30;
+              _context9.next = 42;
               break;
 
-            case 27:
-              _context9.prev = 27;
-              _context9.t4 = _context9["catch"](12);
-              console.log(_context9.t4);
+            case 39:
+              _context9.prev = 39;
+              _context9.t5 = _context9["catch"](24);
+              console.log('审核异常', _context9.t5);
 
-            case 30:
+            case 42:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, null, [[12, 27]]);
+      }, _callee9, null, [[7, 12], [24, 39]]);
     }));
 
     return function onAudit() {
@@ -914,6 +938,7 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         return onAddDtl();
       },
+      disabled: btnDisabled('add'),
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
       key: "edit",
@@ -935,12 +960,14 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         onImport();
       },
+      disabled: btnDisabled('import'),
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
     }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) ? /*#__PURE__*/React.createElement(_Button, {
       key: "export",
       onClick: function onClick() {
         onExport();
       },
+      disabled: btnDisabled('export'),
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;

package/es/hooks/useSingle/index.js

@@ -259,7 +259,7 @@ function useSingle(inParam) {
 
             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);
+                showSuccess(result.flag.retMsg || '删除成功');
 
                 if (tableRef.current) {
                   tableRef.current.reload(false);
@@ -317,69 +317,83 @@ function useSingle(inParam) {
 
                 obj[statusField] = auditStatus;
                 return obj;
-              }); // beforeAudit 强式终止
+              });
+              _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");
 
-              _context4.t0 = beforeAudit;
+            case 16:
+              _context4.t1 = beforeAudit;
 
-              if (!_context4.t0) {
-                _context4.next = 13;
+              if (!_context4.t1) {
+                _context4.next = 22;
                 break;
               }
 
-              _context4.next = 11;
+              _context4.next = 20;
               return beforeAudit(rows);
 
-            case 11:
-              _context4.t1 = _context4.sent;
-              _context4.t0 = _context4.t1 === false;
+            case 20:
+              _context4.t2 = _context4.sent;
+              _context4.t1 = _context4.t2 === false;
 
-            case 13:
-              if (!_context4.t0) {
-                _context4.next = 15;
+            case 22:
+              if (!_context4.t1) {
+                _context4.next = 24;
                 break;
               }
 
               return _context4.abrupt("return");
 
-            case 15:
-              _context4.prev = 15;
-              _context4.next = 18;
+            case 24:
+              _context4.prev = 24;
+              _context4.next = 27;
               return service.audit(rows);
 
-            case 18:
+            case 27:
               result = _context4.sent;
 
               if (!afterAudit) {
-                _context4.next = 22;
+                _context4.next = 31;
                 break;
               }
 
               afterAudit(result, rows);
               return _context4.abrupt("return");
 
-            case 22:
+            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);
+                showSuccess(result.flag.retMsg || '审核成功');
 
                 if (tableRef.current) {
                   tableRef.current.reload(false);
                 }
               }
 
-              _context4.next = 28;
+              _context4.next = 37;
               break;
 
-            case 25:
-              _context4.prev = 25;
-              _context4.t2 = _context4["catch"](15);
-              console.log(_context4.t2);
+            case 34:
+              _context4.prev = 34;
+              _context4.t3 = _context4["catch"](24);
+              console.log(_context4.t3);
 
-            case 28:
+            case 37:
             case "end":
               return _context4.stop();
           }
         }
-      }, _callee4, null, [[15, 25]]);
+      }, _callee4, null, [[7, 12], [24, 34]]);
     }));
 
     return function onAudit(_x3) {
@@ -445,7 +459,7 @@ function useSingle(inParam) {
                 break;
               }
 
-              showSuccess(result.flag.retMsg);
+              showSuccess(result.flag.retMsg || '操作成功');
 
               if (tableRef.current) {
                 tableRef.current.reload(false);
@@ -667,6 +681,7 @@ function useSingle(inParam) {
       onClick: function onClick() {
         return onAdd(null);
       },
+      disabled: btnDisabled('add'),
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/React.createElement(_Button, {
       key: "edit",
@@ -697,6 +712,7 @@ function useSingle(inParam) {
 
         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'),
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
     }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && checkRight(256) ? /*#__PURE__*/React.createElement(_Button, {
       key: "export",
@@ -705,6 +721,7 @@ function useSingle(inParam) {
 
         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'),
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;

package/lib/components/DtlLayout.d.ts

@@ -10,6 +10,8 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     renderButton?: (defaultBtn: JSX.Element[]) => JSX.Element[];
     /** 审核方法 */
     onAudit?: () => void;
+    /**按钮状态 */
+    btnStatus?: (btnKey: string) => boolean | void;
     /** 保存按钮文本 */
     btnSaveText?: string;
     /** 返回按钮文本 */

package/lib/components/DtlLayout.js

@@ -36,7 +36,8 @@ function DtlLayout(props) {
       _props$btnSaveText = props.btnSaveText,
       btnSaveText = _props$btnSaveText === void 0 ? '保存' : _props$btnSaveText,
       _props$btnExitText = props.btnExitText,
-      btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText;
+      btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
+      btnStatus = props.btnStatus;
   var dtlTitle = (0, _react.useMemo)(function () {
     if (title) return title;
     if (!masterObject) return '';
@@ -54,6 +55,7 @@ function DtlLayout(props) {
 
         formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
       },
+      disabled: btnStatus ? btnStatus('btnSave') || false : false,
       icon: /*#__PURE__*/_react.default.createElement(_icons.SaveOutlined, null)
     }, btnSaveText), /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "btnBack",
@@ -66,6 +68,11 @@ function DtlLayout(props) {
     if (props.onAudit) {
       b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
         key: "btnAudit",
+        disabled: btnStatus ? btnStatus('btnAudit') || false : false,
+        onClick: function onClick() {
+          if (!props.onAudit) return;
+          props.onAudit();
+        },
         icon: /*#__PURE__*/_react.default.createElement(_icons.CheckOutlined, null)
       }, "\u5BA1\u6838"));
     }

package/lib/hooks/useDtl/index.js

@@ -164,7 +164,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              (0, _utils.showSuccess)(result.flag.retMsg);
+              (0, _utils.showSuccess)(result.flag.retMsg || '操作成功');
               Object.assign(masterObject, result.data);
               setEditItem({});
               return _context.abrupt("return", true);
@@ -273,7 +273,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              (0, _utils.showSuccess)(result.flag.retMsg);
+              (0, _utils.showSuccess)(result.flag.retMsg || '删除成功');
               return _context2.abrupt("return", true);
 
             case 28:
@@ -812,53 +812,48 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 3:
-              obj = (0, _objectSpread2.default)({}, masterObject); // beforeAudit 强式终止
-
-              _context9.t0 = beforeAudit;
+              obj = (0, _objectSpread2.default)({}, masterObject);
 
-              if (!_context9.t0) {
-                _context9.next = 10;
+              if (masterObject[mstKeyField]) {
+                _context9.next = 7;
                 break;
               }
 
-              _context9.next = 8;
-              return beforeAudit(obj);
+              (0, _utils.showWarn)('当前数据未保存，不能审核');
+              return _context9.abrupt("return");
 
-            case 8:
-              _context9.t1 = _context9.sent;
-              _context9.t0 = _context9.t1 === false;
+            case 7:
+              _context9.prev = 7;
+              _context9.next = 10;
+              return (0, _utils.showConfirm)('确认要审核此数据？', '审核提示');
 
             case 10:
-              if (!_context9.t0) {
-                _context9.next = 12;
-                break;
-              }
-
-              return _context9.abrupt("return");
+              _context9.next = 16;
+              break;
 
             case 12:
               _context9.prev = 12;
-              _context9.next = 15;
-              return mstService.audit([obj]);
+              _context9.t0 = _context9["catch"](7);
+              console.log('终止审核', _context9.t0);
+              return _context9.abrupt("return");
 
-            case 15:
-              result = _context9.sent;
-              _context9.t2 = afterAudit;
+            case 16:
+              _context9.t1 = beforeAudit;
 
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 22;
                 break;
               }
 
               _context9.next = 20;
-              return afterAudit(result, [obj]);
+              return beforeAudit(obj);
 
             case 20:
-              _context9.t3 = _context9.sent;
-              _context9.t2 = _context9.t3 === false;
+              _context9.t2 = _context9.sent;
+              _context9.t1 = _context9.t2 === false;
 
             case 22:
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 24;
                 break;
               }
@@ -866,25 +861,54 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 24:
+              _context9.prev = 24;
+              _context9.next = 27;
+              return mstService.audit([obj]);
+
+            case 27:
+              result = _context9.sent;
+              _context9.t3 = afterAudit;
+
+              if (!_context9.t3) {
+                _context9.next = 34;
+                break;
+              }
+
+              _context9.next = 32;
+              return afterAudit(result, [obj]);
+
+            case 32:
+              _context9.t4 = _context9.sent;
+              _context9.t3 = _context9.t4 === false;
+
+            case 34:
+              if (!_context9.t3) {
+                _context9.next = 36;
+                break;
+              }
+
+              return _context9.abrupt("return");
+
+            case 36:
               if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
-                (0, _utils.showSuccess)(result.flag.retMsg);
+                (0, _utils.showSuccess)(result.flag.retMsg || '审核成功');
                 Object.assign(masterObject, result.data);
               }
 
-              _context9.next = 30;
+              _context9.next = 42;
               break;
 
-            case 27:
-              _context9.prev = 27;
-              _context9.t4 = _context9["catch"](12);
-              console.log(_context9.t4);
+            case 39:
+              _context9.prev = 39;
+              _context9.t5 = _context9["catch"](24);
+              console.log('审核异常', _context9.t5);
 
-            case 30:
+            case 42:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, null, [[12, 27]]);
+      }, _callee9, null, [[7, 12], [24, 39]]);
     }));
 
     return function onAudit() {
@@ -935,6 +959,7 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         return onAddDtl();
       },
+      disabled: btnDisabled('add'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
@@ -956,12 +981,14 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         onImport();
       },
+      disabled: btnDisabled('import'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
     }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
       onClick: function onClick() {
         onExport();
       },
+      disabled: btnDisabled('export'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;