ls-pro-common 1.0.19 → 1.0.22

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,
@@ -128,7 +130,8 @@ function InputTable(prop) {
     form: {
       submitter: {
         resetButtonProps: false
-      }
+      },
+      btnInline: true
     },
     height: 'full',
     rowSelection: {

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

@@ -15,17 +15,19 @@ 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>;
+    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;
+    onAudit: () => Promise<void>;
 };
 export default useDtl;