ls-pro-common 1.0.26 → 1.0.29

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;

package/lib/hooks/useSingle/index.js

@@ -281,7 +281,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') {
-                (0, _utils.showSuccess)(result.flag.retMsg);
+                (0, _utils.showSuccess)(result.flag.retMsg || '删除成功');
 
                 if (tableRef.current) {
                   tableRef.current.reload(false);
@@ -338,69 +338,83 @@ function useSingle(inParam) {
 
                 obj[statusField] = auditStatus;
                 return obj;
-              }); // beforeAudit 强式终止
+              });
+              _context4.prev = 7;
+              _context4.next = 10;
+              return (0, _utils.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') {
-                (0, _utils.showSuccess)(result.flag.retMsg);
+                (0, _utils.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) {
@@ -466,7 +480,7 @@ function useSingle(inParam) {
                 break;
               }
 
-              (0, _utils.showSuccess)(result.flag.retMsg);
+              (0, _utils.showSuccess)(result.flag.retMsg || '操作成功');
 
               if (tableRef.current) {
                 tableRef.current.reload(false);
@@ -688,6 +702,7 @@ function useSingle(inParam) {
       onClick: function onClick() {
         return onAdd(null);
       },
+      disabled: btnDisabled('add'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
@@ -718,6 +733,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.default.createElement(_icons.ImportOutlined, null)
     }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && checkRight(256) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
@@ -726,6 +742,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.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import DtlLayout from './components/DtlLayout';
 import InputTable from './components/InputTable';
 import Page404 from './components/404';
 import Loading from './components/Loading';
+import IconSelector from './components/IconSelector';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -13,4 +14,4 @@ import usePermission from './hooks/usePermission';
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
-export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/lib/index.js

@@ -19,6 +19,12 @@ Object.defineProperty(exports, "DtlLayout", {
     return _DtlLayout.default;
   }
 });
+Object.defineProperty(exports, "IconSelector", {
+  enumerable: true,
+  get: function get() {
+    return _IconSelector.default;
+  }
+});
 Object.defineProperty(exports, "InputTable", {
   enumerable: true,
   get: function get() {
@@ -107,6 +113,8 @@ var _ = _interopRequireDefault(require("./components/404"));
 
 var _Loading = _interopRequireDefault(require("./components/Loading"));
 
+var _IconSelector = _interopRequireDefault(require("./components/IconSelector"));
+
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
 var _http = _interopRequireWildcard(require("./http"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.24",
-    "ls-pro-form": "1.52.23",
+    "ls-pro-table": "2.62.25",
+    "ls-pro-form": "1.52.24",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",