ls-pro-common 1.0.18 → 1.0.21

package/es/http/index.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, showError, toGatewayUrl } from '../utils'; //默认超时时间为1分钟
+import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl } from '../utils'; //默认超时时间为1分钟
 
 var request = extend({
   timeout: 60000
@@ -22,8 +22,11 @@ request.interceptors.request.use(function (url, options) {
     });
   }
 
+  var param = {
+    resCode: getUrlQuery('resourceId') || getResourceProps('resourceId')
+  };
   return {
-    url: url,
+    url: setUrlQuery(url, param),
     options: opts
   };
 });

package/es/typing.d.ts

@@ -15,6 +15,8 @@ export declare type TableToolbar = {
     remove?: boolean;
     export?: boolean;
     import?: boolean;
+    audit?: boolean;
+    config?: boolean;
     print?: boolean;
 };
 /** 基础模块接口类型 */

package/es/utils/index.js

@@ -52,7 +52,7 @@ export var setCookie = function setCookie(key, value) {
  */
 
 export var isLogin = function isLogin() {
-  return !!getCookie('token');
+  return !!getCookie('inline');
 };
 /**
  * 设置本地缓存

package/lib/components/InputTable.d.ts

@@ -12,6 +12,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     textField?: string;
     textName?: string;
     tableConfig?: any;
+    labelWidth?: number;
     onSelectChange?: (item: any) => void;
 };
 declare function InputTable(prop: InputTableProps): JSX.Element;

package/lib/components/InputTable.js

@@ -43,7 +43,7 @@ var _icons = require("@ant-design/icons");
 
 var _http = require("../http");
 
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "textField", "onSelectChange"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange"],
     _excluded2 = ["current", "pageSize"];
 
 function InputTable(prop) {
@@ -81,6 +81,8 @@ function InputTable(prop) {
       readonly = _prop$readonly === void 0 ? true : _prop$readonly,
       multiple = prop.multiple,
       valueField = prop.valueField,
+      _prop$labelWidth = prop.labelWidth,
+      labelWidth = _prop$labelWidth === void 0 ? 70 : _prop$labelWidth,
       textField = prop.textField,
       onSelectChange = prop.onSelectChange,
       rest = (0, _objectWithoutProperties2.default)(prop, _excluded);
@@ -145,7 +147,7 @@ function InputTable(prop) {
     manualRequest: false,
     actionRef: tableRef,
     search: {
-      labelWidth: 70
+      labelWidth: labelWidth
     },
     options: {
       density: false,
@@ -155,7 +157,8 @@ function InputTable(prop) {
     form: {
       submitter: {
         resetButtonProps: false
-      }
+      },
+      btnInline: true
     },
     height: 'full',
     rowSelection: {

package/lib/hooks/useDtl/index.d.ts

@@ -15,17 +15,18 @@ declare function useDtl(dtlParam: DtlParamType): {
     selectedRows: any;
     showEdit: boolean;
     editItem: any;
-    tableTools: JSX.Element[];
+    tableTools: (boolean | JSX.Element)[];
     setSelectedRows: import("react").Dispatch<any>;
     setShowEdit: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     setEditItem: import("react").Dispatch<any>;
-    onRemoveDtl: () => void;
+    onRemoveDtl: (rows?: any) => void;
     onSaveDtl: (formData: any) => Promise<boolean>;
     onLoadDtl: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
-    onAddDtl: () => Promise<boolean>;
-    onEditDtl: () => Promise<boolean>;
-    onSaveMst: (values: any) => Promise<void>;
+    onAddDtl: (item?: any) => Promise<boolean>;
+    onEditDtl: (item?: any) => Promise<boolean>;
+    onSaveMst: (values: any) => Promise<boolean>;
     onRemoveMst: () => Promise<boolean | undefined>;
     onExportDtl: (url: string, param: exportParam) => Promise<boolean>;
+    isAudit: () => boolean;
 };
 export default useDtl;

package/lib/hooks/useDtl/index.js

@@ -42,12 +42,16 @@ function useDtl(dtlParam) {
       relationField = dtlParam.relationField,
       toolConfig = dtlParam.toolConfig,
       dtlItem = dtlParam.dtlItem,
+      auditStatus = dtlParam.auditStatus,
+      statusField = dtlParam.statusField,
       beforeLoad = dtlParam.beforeLoad,
       beforeAdd = dtlParam.beforeAdd,
       beforeEdit = dtlParam.beforeEdit,
+      beforeSave = dtlParam.beforeSave,
       beforeRemove = dtlParam.beforeRemove,
       afterSave = dtlParam.afterSave,
-      afterRemove = dtlParam.afterRemove;
+      afterRemove = dtlParam.afterRemove,
+      btnStatus = dtlParam.btnStatus;
   /** @name 选中行数据 */
 
   var _useState = (0, _react.useState)([]),
@@ -78,6 +82,10 @@ function useDtl(dtlParam) {
   /** @name 从表编辑表单Ref */
 
   var dtlFormRef = (0, _react.useRef)();
+  var isAudit = (0, _react.useCallback)(function () {
+    if (!auditStatus || !statusField) return false;
+    return Number(masterObject[statusField] || 0) >= auditStatus;
+  }, [auditStatus, statusField, masterObject]);
 
   var onSaveMst = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(values) {
@@ -88,13 +96,17 @@ function useDtl(dtlParam) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, masterObject), values);
-              _context.next = 3;
-              return mstService.save(data);
+              if (!isAudit()) {
+                _context.next = 3;
+                break;
+              }
+
+              (0, _utils.showWarn)('当前单据已审核,不能保存');
+              return _context.abrupt("return", false);
 
             case 3:
-              result = _context.sent;
-              _context.t0 = afterSave;
+              data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, masterObject), values);
+              _context.t0 = beforeSave;
 
               if (!_context.t0) {
                 _context.next = 10;
@@ -102,7 +114,7 @@ function useDtl(dtlParam) {
               }
 
               _context.next = 8;
-              return afterSave(result, data);
+              return beforeSave(data, false);
 
             case 8:
               _context.t1 = _context.sent;
@@ -114,16 +126,51 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              return _context.abrupt("return");
+              return _context.abrupt("return", false);
 
             case 12:
-              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);
-                Object.assign(masterObject, result.data);
-                setEditItem({});
+              _context.next = 14;
+              return mstService.save(data);
+
+            case 14:
+              result = _context.sent;
+              _context.t2 = afterSave;
+
+              if (!_context.t2) {
+                _context.next = 21;
+                break;
               }
 
-            case 13:
+              _context.next = 19;
+              return afterSave(result, data, false);
+
+            case 19:
+              _context.t3 = _context.sent;
+              _context.t2 = _context.t3 === false;
+
+            case 21:
+              if (!_context.t2) {
+                _context.next = 23;
+                break;
+              }
+
+              return _context.abrupt("return", false);
+
+            case 23:
+              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 = 28;
+                break;
+              }
+
+              (0, _utils.showSuccess)(result.flag.retMsg);
+              Object.assign(masterObject, result.data);
+              setEditItem({});
+              return _context.abrupt("return", true);
+
+            case 28:
+              return _context.abrupt("return", false);
+
+            case 29:
             case "end":
               return _context.stop();
           }
@@ -152,7 +199,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              return _context2.abrupt("return");
+              return _context2.abrupt("return", false);
 
             case 2:
               _context2.next = 4;
@@ -175,7 +222,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              return _context2.abrupt("return");
+              return _context2.abrupt("return", false);
 
             case 10:
               if (!ids) {
@@ -195,7 +242,7 @@ function useDtl(dtlParam) {
               }
 
               _context2.next = 18;
-              return afterRemove(result, masterObject[mstKeyField]);
+              return afterRemove(result, masterObject);
 
             case 18:
               _context2.t1 = _context2.sent;
@@ -238,52 +285,85 @@ function useDtl(dtlParam) {
 
   var onAddDtl = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var item,
+          _formRef$current,
+          mstVal,
+          mst,
+          _args3 = arguments;
+
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              if (masterObject[mstKeyField]) {
-                _context3.next = 3;
+              item = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : (0, _objectSpread2.default)({}, dtlItem);
+
+              if (!(!masterObject[mstKeyField] && formRef.current)) {
+                _context3.next = 16;
+                break;
+              }
+
+              _context3.prev = 2;
+              _context3.next = 5;
+              return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+
+            case 5:
+              mstVal = formRef.current.getFieldsValue();
+              _context3.next = 8;
+              return onSaveMst(mstVal);
+
+            case 8:
+              mst = _context3.sent;
+
+              if (!(mst !== true)) {
+                _context3.next = 11;
                 break;
               }
 
-              (0, _utils.showWarn)("请先保存主表");
               return _context3.abrupt("return", false);
 
-            case 3:
-              _context3.t0 = beforeAdd;
+            case 11:
+              _context3.next = 16;
+              break;
+
+            case 13:
+              _context3.prev = 13;
+              _context3.t0 = _context3["catch"](2);
+              return _context3.abrupt("return", false);
 
-              if (!_context3.t0) {
-                _context3.next = 9;
+            case 16:
+              _context3.t1 = beforeAdd;
+
+              if (!_context3.t1) {
+                _context3.next = 22;
                 break;
               }
 
-              _context3.next = 7;
-              return beforeAdd(dtlItem);
+              _context3.next = 20;
+              return beforeAdd(item);
 
-            case 7:
-              _context3.t1 = _context3.sent;
-              _context3.t0 = _context3.t1 === false;
+            case 20:
+              _context3.t2 = _context3.sent;
+              _context3.t1 = _context3.t2 === false;
 
-            case 9:
-              if (!_context3.t0) {
-                _context3.next = 11;
+            case 22:
+              if (!_context3.t1) {
+                _context3.next = 24;
                 break;
               }
 
               return _context3.abrupt("return", false);
 
-            case 11:
-              setEditItem(dtlItem);
+            case 24:
+              setEditItem(item);
               setShowEdit(true);
               return _context3.abrupt("return", true);
 
-            case 14:
+            case 27:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3);
+      }, _callee3, null, [[2, 13]]);
     }));
 
     return function onAddDtl() {
@@ -295,47 +375,51 @@ function useDtl(dtlParam) {
 
   var onEditDtl = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      var item,
+          _args4 = arguments;
       return _regenerator.default.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
+              item = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : (0, _objectSpread2.default)({}, selectedRows[0]);
+
               if (selectedRows.length) {
-                _context4.next = 3;
+                _context4.next = 4;
                 break;
               }
 
               (0, _utils.showWarn)('请先选择需要更改的数据');
               return _context4.abrupt("return", false);
 
-            case 3:
+            case 4:
               _context4.t0 = beforeEdit;
 
               if (!_context4.t0) {
-                _context4.next = 9;
+                _context4.next = 10;
                 break;
               }
 
-              _context4.next = 7;
-              return beforeEdit(selectedRows[0]);
+              _context4.next = 8;
+              return beforeEdit(item);
 
-            case 7:
+            case 8:
               _context4.t1 = _context4.sent;
               _context4.t0 = _context4.t1 === false;
 
-            case 9:
+            case 10:
               if (!_context4.t0) {
-                _context4.next = 11;
+                _context4.next = 12;
                 break;
               }
 
               return _context4.abrupt("return", false);
 
-            case 11:
-              setEditItem(selectedRows[0]);
+            case 12:
+              setEditItem(item);
               setShowEdit(true);
               return _context4.abrupt("return", true);
 
-            case 14:
+            case 15:
             case "end":
               return _context4.stop();
           }
@@ -351,7 +435,9 @@ function useDtl(dtlParam) {
 
 
   var onRemoveDtl = function onRemoveDtl() {
-    if (!selectedRows.length) {
+    var rows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : selectedRows;
+
+    if (!rows || !rows.length) {
       (0, _utils.showWarn)('请选择需要删除的数据');
       return;
     }
@@ -370,7 +456,7 @@ function useDtl(dtlParam) {
               }
 
               _context5.next = 3;
-              return beforeRemove(selectedRows);
+              return beforeRemove(rows);
 
             case 3:
               ids = _context5.sent;
@@ -384,7 +470,7 @@ function useDtl(dtlParam) {
 
             case 6:
               if (!ids) {
-                ids = selectedRows.map(function (o) {
+                ids = rows.map(function (o) {
                   return o.id;
                 });
               }
@@ -402,7 +488,7 @@ function useDtl(dtlParam) {
               }
 
               _context5.next = 14;
-              return afterRemove(result, selectedRows);
+              return afterRemove(result, rows);
 
             case 14:
               _context5.t1 = _context5.sent;
@@ -451,36 +537,59 @@ function useDtl(dtlParam) {
                 data[relationField] = masterObject[mstKeyField];
               }
 
-              _context6.next = 4;
-              return dtlService.save(data);
-
-            case 4:
-              result = _context6.sent;
-              _context6.t0 = afterSave;
+              _context6.t0 = beforeSave;
 
               if (!_context6.t0) {
-                _context6.next = 11;
+                _context6.next = 8;
                 break;
               }
 
-              _context6.next = 9;
-              return afterSave(data);
+              _context6.next = 6;
+              return beforeSave(data, true);
 
-            case 9:
+            case 6:
               _context6.t1 = _context6.sent;
               _context6.t0 = _context6.t1 === false;
 
-            case 11:
+            case 8:
               if (!_context6.t0) {
-                _context6.next = 13;
+                _context6.next = 10;
                 break;
               }
 
               return _context6.abrupt("return", false);
 
-            case 13:
+            case 10:
+              _context6.next = 12;
+              return dtlService.save(data);
+
+            case 12:
+              result = _context6.sent;
+              _context6.t2 = afterSave;
+
+              if (!_context6.t2) {
+                _context6.next = 19;
+                break;
+              }
+
+              _context6.next = 17;
+              return afterSave(result, data, true);
+
+            case 17:
+              _context6.t3 = _context6.sent;
+              _context6.t2 = _context6.t3 === false;
+
+            case 19:
+              if (!_context6.t2) {
+                _context6.next = 21;
+                break;
+              }
+
+              return _context6.abrupt("return", false);
+
+            case 21:
               if (!((result === null || result === void 0 ? void 0 : (_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-                _context6.next = 17;
+                _context6.next = 25;
                 break;
               }
 
@@ -492,10 +601,10 @@ function useDtl(dtlParam) {
 
               return _context6.abrupt("return", true);
 
-            case 17:
+            case 25:
               return _context6.abrupt("return", false);
 
-            case 18:
+            case 26:
             case "end":
               return _context6.stop();
           }
@@ -669,37 +778,44 @@ function useDtl(dtlParam) {
     };
   }();
 
-  var tableTools = [];
+  var btnDisabled = function btnDisabled(key) {
+    if (btnStatus && typeof btnStatus(key) === 'boolean') return btnStatus(key);
+
+    switch (key) {
+      case 'edit':
+        return selectedRows.length !== 1;
+
+      case 'remove':
+        return selectedRows.length === 0 || isAudit();
 
-  if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
-    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+      default:
+        return false;
+    }
+  };
+
+  var tableTools = (0, _react.useMemo)(function () {
+    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "add",
-      onClick: onAddDtl,
+      onClick: function onClick() {
+        return onAddDtl();
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
-    }, "\u65B0\u589E"));
-  }
-
-  if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) {
-    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
-      disabled: selectedRows.length !== 1,
-      onClick: onEditDtl,
+      disabled: btnDisabled('edit'),
+      onClick: function onClick() {
+        return onEditDtl();
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)
-    }, "\u7F16\u8F91"));
-  }
-
-  if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) {
-    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "remove",
-      onClick: onRemoveDtl,
+      onClick: function onClick() {
+        return onRemoveDtl();
+      },
       danger: true,
-      disabled: selectedRows.length === 0,
+      disabled: btnDisabled('remove'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.DeleteOutlined, null)
-    }, "\u5220\u9664"));
-  }
-
-  if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) {
-    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
       onClick: function onClick() {
         var _tableRef$current, _tableRef$current$sho;
@@ -707,11 +823,7 @@ function useDtl(dtlParam) {
         tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showImport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
       },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
-    }, "\u5BFC\u5165"));
-  }
-
-  if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) {
-    tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
       onClick: function onClick() {
         var _tableRef$current2, _tableRef$current2$sh;
@@ -719,9 +831,10 @@ function useDtl(dtlParam) {
         tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
       },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
-    }, "\u5BFC\u51FA"));
-  }
-
+    }, "\u5BFC\u51FA") : false].filter(function (o) {
+      return o !== false;
+    });
+  }, [selectedRows]);
   return {
     formRef: formRef,
     tableRef: tableRef,
@@ -740,7 +853,8 @@ function useDtl(dtlParam) {
     onEditDtl: onEditDtl,
     onSaveMst: onSaveMst,
     onRemoveMst: onRemoveMst,
-    onExportDtl: onExportDtl
+    onExportDtl: onExportDtl,
+    isAudit: isAudit
   };
 }
 

package/lib/hooks/usePermission/index.d.ts

@@ -0,0 +1,7 @@
+declare function usePermission(): {
+    resourceId: any;
+    permissionVal: number;
+    resRightVal: number;
+    checkRight: (val: number) => boolean;
+};
+export default usePermission;