ls-pro-common 1.0.20 → 1.0.23

package/es/components/DtlLayout.d.ts

@@ -2,18 +2,33 @@ import React from 'react';
 import type { ProFormInstance } from 'ls-pro-form';
 import './common.less';
 export declare type DtlLyaoutProps = Record<string, any> & {
+    /** 返回方法 */
     onExit: (visible?: boolean) => void;
+    /** 保存方法 */
     onSave?: () => void;
+    /** 自定义按钮方法 */
     renderButton?: (defaultBtn: JSX.Element[]) => JSX.Element[];
+    /** 审核方法 */
+    onAudit?: () => void;
+    /** 保存按钮文本 */
     btnSaveText?: string;
+    /** 返回按钮文本 */
     btnExitText?: string;
+    /** 标题 */
     title?: string;
+    /** 主表对象 */
     masterObject?: any;
+    /** 主表主键字段 */
     keyField?: string;
+    /** body类 */
     bodyClass?: string;
+    /** header 类 */
     headerClass?: string;
+    /** body样式 */
     bodyStyle?: React.CSSProperties;
+    /** header样式 */
     headerStyle?: React.CSSProperties;
+    /** 表单ref */
     formRef?: React.MutableRefObject<ProFormInstance | undefined>;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;

package/es/components/DtlLayout.js

@@ -2,7 +2,7 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import { ArrowLeftOutlined, SaveOutlined } from '@ant-design/icons';
+import { ArrowLeftOutlined, SaveOutlined, CheckOutlined } from '@ant-design/icons';
 import './common.less';
 
 function DtlLayout(props) {
@@ -26,25 +26,36 @@ function DtlLayout(props) {
     if (!masterObject) return '';
     return masterObject[keyField] ? '编辑' : '新增';
   }, [title, masterObject, keyField]);
-  var btns = [/*#__PURE__*/React.createElement(_Button, {
-    key: "btnSave",
-    onClick: function onClick() {
-      var _formRef$current;
+  var btns = useMemo(function () {
+    var b = [/*#__PURE__*/React.createElement(_Button, {
+      key: "btnSave",
+      onClick: function onClick() {
+        var _formRef$current;
 
-      if (props.onSave) {
-        return props.onSave();
-      }
+        if (props.onSave) {
+          return props.onSave();
+        }
 
-      formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
-    },
-    icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
-  }, " ", btnSaveText, " "), /*#__PURE__*/React.createElement(_Button, {
-    key: "btnBack",
-    onClick: function onClick() {
-      return props.onExit(false);
-    },
-    icon: /*#__PURE__*/React.createElement(ArrowLeftOutlined, null)
-  }, "  ", btnExitText, " ")];
+        formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
+      },
+      icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
+    }, btnSaveText), /*#__PURE__*/React.createElement(_Button, {
+      key: "btnBack",
+      onClick: function onClick() {
+        return props.onExit(false);
+      },
+      icon: /*#__PURE__*/React.createElement(ArrowLeftOutlined, null)
+    }, btnExitText)];
+
+    if (props.onAudit) {
+      b.unshift( /*#__PURE__*/React.createElement(_Button, {
+        key: "btnAudit",
+        icon: /*#__PURE__*/React.createElement(CheckOutlined, null)
+      }, "\u5BA1\u6838"));
+    }
+
+    return b;
+  }, [props]);
   var buttons = renderButton ? renderButton(btns) : btns;
   return /*#__PURE__*/React.createElement("div", {
     className: "dtl-layout"

package/es/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/es/components/InputTable.js

@@ -10,7 +10,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-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"];
 import React from "react";
 import { useRef, useState, useEffect, useContext } from 'react';
@@ -54,6 +54,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 = _objectWithoutProperties(prop, _excluded);
@@ -118,7 +120,7 @@ function InputTable(prop) {
     manualRequest: false,
     actionRef: tableRef,
     search: {
-      labelWidth: 70
+      labelWidth: labelWidth
     },
     options: {
       density: false,

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

@@ -28,5 +28,6 @@ declare function useDtl(dtlParam: DtlParamType): {
     onRemoveMst: () => Promise<boolean | undefined>;
     onExportDtl: (url: string, param: exportParam) => Promise<boolean>;
     isAudit: () => boolean;
+    onAudit: () => Promise<void>;
 };
 export default useDtl;

package/es/hooks/useDtl/index.js

@@ -30,7 +30,9 @@ function useDtl(dtlParam) {
       beforeRemove = dtlParam.beforeRemove,
       afterSave = dtlParam.afterSave,
       afterRemove = dtlParam.afterRemove,
-      btnStatus = dtlParam.btnStatus;
+      btnStatus = dtlParam.btnStatus,
+      beforeAudit = dtlParam.beforeAudit,
+      afterAudit = dtlParam.afterAudit;
   /** @name 选中行数据 */
 
   var _useState = useState([]),
@@ -181,73 +183,82 @@ function useDtl(dtlParam) {
               return _context2.abrupt("return", false);
 
             case 2:
-              _context2.next = 4;
+              if (!isAudit()) {
+                _context2.next = 5;
+                break;
+              }
+
+              showWarn('当前单据已审核,不能删除');
+              return _context2.abrupt("return", false);
+
+            case 5:
+              _context2.next = 7;
               return showConfirm('确认要删除当前数据?');
 
-            case 4:
+            case 7:
               if (!beforeRemove) {
-                _context2.next = 10;
+                _context2.next = 13;
                 break;
               }
 
-              _context2.next = 7;
+              _context2.next = 10;
               return beforeRemove([masterObject]);
 
-            case 7:
+            case 10:
               ids = _context2.sent;
 
               if (!(ids === false)) {
-                _context2.next = 10;
+                _context2.next = 13;
                 break;
               }
 
               return _context2.abrupt("return", false);
 
-            case 10:
+            case 13:
               if (!ids) {
                 ids = [masterObject[mstKeyField]];
               }
 
-              _context2.next = 13;
+              _context2.next = 16;
               return mstService.remove(ids);
 
-            case 13:
+            case 16:
               result = _context2.sent;
               _context2.t0 = afterRemove;
 
               if (!_context2.t0) {
-                _context2.next = 20;
+                _context2.next = 23;
                 break;
               }
 
-              _context2.next = 18;
+              _context2.next = 21;
               return afterRemove(result, masterObject);
 
-            case 18:
+            case 21:
               _context2.t1 = _context2.sent;
               _context2.t0 = _context2.t1 === false;
 
-            case 20:
+            case 23:
               if (!_context2.t0) {
-                _context2.next = 22;
+                _context2.next = 25;
                 break;
               }
 
               return _context2.abrupt("return");
 
-            case 22:
+            case 25:
               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 = 25;
+                _context2.next = 28;
                 break;
               }
 
               showSuccess(result.flag.retMsg);
               return _context2.abrupt("return", true);
 
-            case 25:
+            case 28:
               return _context2.abrupt("return", false);
 
-            case 26:
+            case 29:
             case "end":
               return _context2.stop();
           }
@@ -756,6 +767,105 @@ function useDtl(dtlParam) {
       return _ref8.apply(this, arguments);
     };
   }();
+  /** 审核按钮事件 */
+
+
+  var onAudit = /*#__PURE__*/function () {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var obj, _result$flag8, result;
+
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) {
+          switch (_context9.prev = _context9.next) {
+            case 0:
+              if (!isAudit()) {
+                _context9.next = 3;
+                break;
+              }
+
+              showWarn('当前数据已审核，不能再做审核操作!');
+              return _context9.abrupt("return");
+
+            case 3:
+              obj = _objectSpread({}, masterObject); // beforeAudit 强式终止
+
+              _context9.t0 = beforeAudit;
+
+              if (!_context9.t0) {
+                _context9.next = 10;
+                break;
+              }
+
+              _context9.next = 8;
+              return beforeAudit(obj);
+
+            case 8:
+              _context9.t1 = _context9.sent;
+              _context9.t0 = _context9.t1 === false;
+
+            case 10:
+              if (!_context9.t0) {
+                _context9.next = 12;
+                break;
+              }
+
+              return _context9.abrupt("return");
+
+            case 12:
+              _context9.prev = 12;
+              _context9.next = 15;
+              return mstService.audit([obj]);
+
+            case 15:
+              result = _context9.sent;
+              _context9.t2 = afterAudit;
+
+              if (!_context9.t2) {
+                _context9.next = 22;
+                break;
+              }
+
+              _context9.next = 20;
+              return afterAudit(result, [obj]);
+
+            case 20:
+              _context9.t3 = _context9.sent;
+              _context9.t2 = _context9.t3 === false;
+
+            case 22:
+              if (!_context9.t2) {
+                _context9.next = 24;
+                break;
+              }
+
+              return _context9.abrupt("return");
+
+            case 24:
+              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);
+                Object.assign(masterObject, result.data);
+              }
+
+              _context9.next = 30;
+              break;
+
+            case 27:
+              _context9.prev = 27;
+              _context9.t4 = _context9["catch"](12);
+              console.log(_context9.t4);
+
+            case 30:
+            case "end":
+              return _context9.stop();
+          }
+        }
+      }, _callee9, null, [[12, 27]]);
+    }));
+
+    return function onAudit() {
+      return _ref9.apply(this, arguments);
+    };
+  }();
 
   var btnDisabled = function btnDisabled(key) {
     if (btnStatus && typeof btnStatus(key) === 'boolean') return btnStatus(key);
@@ -772,6 +882,28 @@ function useDtl(dtlParam) {
     }
   };
 
+  var onExport = function onExport() {
+    var _tableRef$current, _tableRef$current$sho;
+
+    if (!masterObject[mstKeyField]) {
+      showWarn('主表没保存，无法导出数据');
+      return;
+    }
+
+    tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showExport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
+  };
+
+  var onImport = function onImport() {
+    var _tableRef$current2, _tableRef$current2$sh;
+
+    if (!masterObject[mstKeyField]) {
+      showWarn('主表没保存，无法导入数据');
+      return;
+    }
+
+    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);
+  };
+
   var tableTools = useMemo(function () {
     return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
       key: "add",
@@ -797,17 +929,13 @@ function useDtl(dtlParam) {
     }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/React.createElement(_Button, {
       key: "import",
       onClick: function onClick() {
-        var _tableRef$current, _tableRef$current$sho;
-
-        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);
+        onImport();
       },
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
     }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/React.createElement(_Button, {
       key: "export",
       onClick: function onClick() {
-        var _tableRef$current2, _tableRef$current2$sh;
-
-        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);
+        onExport();
       },
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
@@ -833,7 +961,8 @@ function useDtl(dtlParam) {
     onSaveMst: onSaveMst,
     onRemoveMst: onRemoveMst,
     onExportDtl: onExportDtl,
-    isAudit: isAudit
+    isAudit: isAudit,
+    onAudit: onAudit
   };
 }
 

package/es/hooks/useSingle/index.d.ts

@@ -47,6 +47,6 @@ declare function useSingle(inParam: SingleParamType): {
     onAudit: (row: any) => Promise<void>;
     resourceId: any;
     checkRight: (val: number) => boolean;
-    isAudit: () => boolean;
+    isAudit: (row?: any) => boolean;
 };
 export default useSingle;

package/es/hooks/useSingle/index.js

@@ -190,6 +190,11 @@ function useSingle(inParam) {
       return;
     }
 
+    if (isAudit(row)) {
+      showWarn('选择中数据中有已审核，不能删除!');
+      return;
+    }
+
     showConfirm('确认要删除选择的数据?').then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var rows, ids, _result$flag, result;
 
@@ -297,48 +302,62 @@ function useSingle(inParam) {
               return _context4.abrupt("return");
 
             case 3:
+              if (!isAudit(row)) {
+                _context4.next = 6;
+                break;
+              }
+
+              showWarn('选择中数据中有已审核，不能再次进行操作!');
+              return _context4.abrupt("return");
+
+            case 6:
               rows = (row ? [row] : selectedRows).map(function (o) {
-                return _objectSpread({}, o);
-              });
+                var obj = _objectSpread({}, o); //@ts-ignore
+
+
+                obj[statusField] = auditStatus;
+                return obj;
+              }); // beforeAudit 强式终止
+
               _context4.t0 = beforeAudit;
 
               if (!_context4.t0) {
-                _context4.next = 10;
+                _context4.next = 13;
                 break;
               }
 
-              _context4.next = 8;
+              _context4.next = 11;
               return beforeAudit(rows);
 
-            case 8:
+            case 11:
               _context4.t1 = _context4.sent;
               _context4.t0 = _context4.t1 === false;
 
-            case 10:
+            case 13:
               if (!_context4.t0) {
-                _context4.next = 12;
+                _context4.next = 15;
                 break;
               }
 
               return _context4.abrupt("return");
 
-            case 12:
-              _context4.prev = 12;
-              _context4.next = 15;
+            case 15:
+              _context4.prev = 15;
+              _context4.next = 18;
               return service.audit(rows);
 
-            case 15:
+            case 18:
               result = _context4.sent;
 
               if (!afterAudit) {
-                _context4.next = 19;
+                _context4.next = 22;
                 break;
               }
 
               afterAudit(result, rows);
               return _context4.abrupt("return");
 
-            case 19:
+            case 22:
               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);
 
@@ -347,20 +366,20 @@ function useSingle(inParam) {
                 }
               }
 
-              _context4.next = 25;
+              _context4.next = 28;
               break;
 
-            case 22:
-              _context4.prev = 22;
-              _context4.t2 = _context4["catch"](12);
+            case 25:
+              _context4.prev = 25;
+              _context4.t2 = _context4["catch"](15);
               console.log(_context4.t2);
 
-            case 25:
+            case 28:
             case "end":
               return _context4.stop();
           }
         }
-      }, _callee4, null, [[12, 22]]);
+      }, _callee4, null, [[15, 25]]);
     }));
 
     return function onAudit(_x3) {
@@ -621,14 +640,23 @@ function useSingle(inParam) {
         return false;
     }
   };
+  /** 判断是否已审核，只有传入审核状态和状态字段才进行判断 */
+
 
   var isAudit = useCallback(function () {
+    var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     if (!auditStatus || !statusField) return false;
-    if (!selectedRows.length) return false;
+    if (!row && !selectedRows.length) return false;
+
+    if (row) {
+      return Number(row[statusField] || 0) >= auditStatus;
+    }
+
     return selectedRows.findIndex(function (o) {
       return Number(o[statusField] || 0) >= auditStatus;
     }) > -1;
-  }, [auditStatus, statusField, selectedRows]);
+  }, [auditStatus, statusField, selectedRows]); // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
+
   var tableTools = useMemo(function () {
     return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && checkRight(2) ? /*#__PURE__*/React.createElement(_Button, {
       key: "add",

package/es/index.d.ts

@@ -8,8 +8,9 @@ import * as utils from './utils';
 /** Hooks */
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
+import usePermission from './hooks/usePermission';
 /** Type */
 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 };
+export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/es/index.js

@@ -9,4 +9,5 @@ import * as utils from './utils';
 
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
-export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+import usePermission from './hooks/usePermission';
+export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/es/service/BaseService.d.ts

@@ -11,5 +11,6 @@ declare class BaseService {
     save(data: Record<string, any>): Promise<any>;
     /** 批量删除对象方法，@param data id集合 */
     remove(data: any[]): Promise<any>;
+    audit(data: any[]): Promise<any>;
 }
 export default BaseService;

package/es/service/BaseService.js

@@ -157,9 +157,9 @@ var BaseService = /*#__PURE__*/function () {
                   break;
                 }
 
-                _message.error("加载方法没有配置api");
+                _message.error("删除方法没有配置api");
 
-                return _context3.abrupt("return", Promise.reject("加载方法没有配置api"));
+                return _context3.abrupt("return", Promise.reject("删除方法没有配置api"));
 
               case 4:
                 if (!(this.method.delete === 'post')) {
@@ -194,6 +194,49 @@ var BaseService = /*#__PURE__*/function () {
 
       return remove;
     }()
+  }, {
+    key: "audit",
+    value: function () {
+      var _audit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
+        var _this$api4;
+
+        var url;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                url = (_this$api4 = this.api) === null || _this$api4 === void 0 ? void 0 : _this$api4.audit;
+
+                if (url) {
+                  _context4.next = 4;
+                  break;
+                }
+
+                _message.error("审核方法没有配置api");
+
+                return _context4.abrupt("return", Promise.reject("审核方法没有配置api"));
+
+              case 4:
+                _context4.next = 6;
+                return httpPost(url, data);
+
+              case 6:
+                return _context4.abrupt("return", _context4.sent);
+
+              case 7:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+
+      function audit(_x4) {
+        return _audit.apply(this, arguments);
+      }
+
+      return audit;
+    }()
   }]);
 
   return BaseService;

package/es/typing.d.ts

@@ -33,6 +33,8 @@ export declare type BaseApiType = {
     import?: string;
     /**导出数据api,如果跟加载数据api一致，可不指定 */
     export?: string;
+    /** 审核接口 */
+    audit?: string;
 };
 /**请求后端接口方法 */
 export declare type MethodType = {

package/es/utils/index.js

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