wargerm 0.2.1 → 0.2.5

package/dist/components/Input/index.d.ts

@@ -1,6 +1,10 @@
-import { FC } from 'react';
-import { InputProps } from 'antd/lib/input';
+import React from 'react';
+import { InputProps, TextAreaProps } from 'antd/lib/input';
 export interface IInputProps extends InputProps {
 }
-declare const WInput: FC<IInputProps>;
-export default WInput;
+export declare type IndexComponent = React.FC<IInputProps> & {
+    TextArea: React.FC<TextAreaProps>;
+    Button: React.FC<any>;
+};
+declare const Index: IndexComponent;
+export default Index;

package/dist/components/InputNumber/index.d.ts

@@ -0,0 +1,6 @@
+import { FC } from 'react';
+import { InputNumberProps } from 'antd/lib/input-number';
+export interface IInputNumberProps extends InputNumberProps {
+}
+declare const WInputNumber: FC<IInputNumberProps>;
+export default WInputNumber;

package/dist/components/WForm/index.d.ts

@@ -12,7 +12,7 @@ export interface ColumnProps {
     search?: {
         transform?: (value: any) => Record<string, any>;
     };
-    valueType?: 'text' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'image';
+    valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'image';
     valueEnum?: Record<string, any>;
     options?: Record<string, any>[];
     fieldProps?: Record<string, any>;
@@ -48,6 +48,7 @@ export interface WFormProps extends FormProps {
     style?: React.CSSProperties;
     columns: ColumnProps[];
     disabled?: boolean;
+    disabledHideInSearch?: boolean;
     onSubmit?: (params: Record<string, any>) => void;
     onReset?: () => void;
     formRef?: MutableRefObject<FormInstance>;

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import './styles/index.less';
 export { default as Button } from './components/Button';
 export { default as IconFont } from './components/IconFont';
 export { default as Input } from './components/Input';
+export { default as InputNumber } from './components/InputNumber';
 export { default as Table } from './components/Table';
 export { default as Checkbox } from './components/Checkbox';
 export { default as Radio } from './components/Radio';

package/dist/index.esm.js

@@ -8,6 +8,8 @@ import React, { useState, useEffect, useMemo, useImperativeHandle, useRef } from
 import { createFromIconfontCN, SearchOutlined, ReloadOutlined, CloseCircleOutlined, PlusOutlined, EditOutlined, EyeOutlined, ExclamationCircleOutlined, DeleteOutlined } from '@ant-design/icons';
 import 'antd/es/input/style';
 import _Input from 'antd/es/input';
+import 'antd/es/input-number/style';
+import _InputNumber from 'antd/es/input-number';
 import 'antd/es/pagination/style';
 import _Pagination from 'antd/es/pagination';
 import 'antd/es/row/style';
@@ -489,8 +491,18 @@ var WInput = function WInput(props) {
   return /*#__PURE__*/React.createElement(_Input, _objectSpread2({}, extraProps));
 };
 
+var Index = WInput;
+Index.TextArea = _Input.TextArea;
 WInput.defaultProps = {};
 
+var WInputNumber = function WInputNumber(props) {
+  var extraProps = _extends({}, props);
+
+  return /*#__PURE__*/React.createElement(_InputNumber, _objectSpread2({}, extraProps));
+};
+
+WInputNumber.defaultProps = {};
+
 var _excluded$1 = ["request", "valueEnum", "onLoad", "children"],
     _excluded2 = ["children"];
 
@@ -586,8 +598,8 @@ var Option = function Option(props) {
   return /*#__PURE__*/React.createElement(_Select.Option, _objectSpread2({}, extraProps), children);
 };
 
-var Index = WSelect;
-Index.Option = Option;
+var Index$1 = WSelect;
+Index$1.Option = Option;
 
 var WDatePicker = function WDatePicker(props) {
   var extraProps = _extends({}, props);
@@ -614,8 +626,8 @@ var RangePicker = function RangePicker(props) {
 };
 
 RangePicker.defaultProps = {};
-var Index$1 = WDatePicker;
-Index$1.RangePicker = RangePicker;
+var Index$2 = WDatePicker;
+Index$2.RangePicker = RangePicker;
 
 var WSwitch = function WSwitch(props) {
   var extraProps = _extends({}, props);
@@ -631,9 +643,9 @@ var WRadio = function WRadio(props) {
   return /*#__PURE__*/React.createElement(_Radio, _objectSpread2({}, extraProps));
 };
 
-var Index$2 = WRadio;
-Index$2.Group = _Radio.Group;
-Index$2.Button = _Radio.Button;
+var Index$3 = WRadio;
+Index$3.Group = _Radio.Group;
+Index$3.Button = _Radio.Button;
 WRadio.defaultProps = {};
 
 var WCheckbox = function WCheckbox(props) {
@@ -643,8 +655,8 @@ var WCheckbox = function WCheckbox(props) {
 };
 
 WCheckbox.defaultProps = {};
-var Index$3 = WCheckbox;
-Index$3.Group = _Checkbox.Group;
+var Index$4 = WCheckbox;
+Index$4.Group = _Checkbox.Group;
 
 function formatNumber(value) {
   value += '';
@@ -803,8 +815,8 @@ var TreeSelect = function TreeSelect(_ref) {
   }, props), !props.children ? renderTree(treeData) : props.children);
 };
 
-var Index$4 = TreeSelect;
-Index$4.TreeNode = _TreeSelect.TreeNode;
+var Index$5 = TreeSelect;
+Index$5.TreeNode = _TreeSelect.TreeNode;
 
 /*
  * @Author: lijin
@@ -6575,7 +6587,7 @@ function FrameBox(_ref) {
 }
 
 var _excluded$4 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection"];
-var RangePicker$1 = Index$1.RangePicker;
+var RangePicker$1 = Index$2.RangePicker;
 function Table(_ref) {
   var _classnames2;
 
@@ -6713,7 +6725,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React.createElement(Index, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$1, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           onLoad: function onLoad(opt) {
             setColumnsFields(function (preColumnsFields) {
@@ -6749,7 +6761,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol
-        }), /*#__PURE__*/React.createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$5, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           onLoad: function onLoad(opt) {}
         }, c.fieldProps), _extraProps))));
@@ -6798,7 +6810,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol2
-        }), /*#__PURE__*/React.createElement(Index$1, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
       } else if (c.valueType === 'dateRange' || c.valueType === 'dateTimeRange') {
@@ -6871,7 +6883,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol4
-        }), /*#__PURE__*/React.createElement(Index$3.Group, _objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$4.Group, _objectSpread2({
           options: options
         }, c.fieldProps))));
       } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
@@ -6921,7 +6933,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol5
-        }), /*#__PURE__*/React.createElement(Index$2.Group, _objectSpread2(_objectSpread2({}, radioButtonProps), {}, {
+        }), /*#__PURE__*/React.createElement(Index$3.Group, _objectSpread2(_objectSpread2({}, radioButtonProps), {}, {
           options: _options
         }, c.fieldProps))));
       } else if (c.valueType === 'switch') {
@@ -7011,7 +7023,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol8
-        }), /*#__PURE__*/React.createElement(WInput, _objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index, _objectSpread2({
           placeholder: "\u8BF7\u8F93\u5165"
         }, c.fieldProps))));
       }
@@ -7151,7 +7163,7 @@ function Table(_ref) {
         flex: '0 1 auto'
       },
       className: "td"
-    }, /*#__PURE__*/React.createElement(Index$3, {
+    }, /*#__PURE__*/React.createElement(Index$4, {
       checked: (_ref2 = [].concat(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []), _toConsumableArray(selectedRowKeys))) === null || _ref2 === void 0 ? void 0 : _ref2.includes(key),
       onClick: function onClick(e) {
         return e.stopPropagation();
@@ -7189,7 +7201,7 @@ function Table(_ref) {
         flex: '0 1 auto'
       },
       className: "td"
-    }, /*#__PURE__*/React.createElement(Index$2, {
+    }, /*#__PURE__*/React.createElement(Index$3, {
       checked: (_ref3 = [].concat(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []), _toConsumableArray(selectedRowKeys))) === null || _ref3 === void 0 ? void 0 : _ref3.includes(key),
       onClick: function onClick(e) {
         return e.stopPropagation();
@@ -7475,7 +7487,7 @@ function Table(_ref) {
       flex: '0 1 auto'
     },
     className: "td"
-  }, /*#__PURE__*/React.createElement(Index$3, {
+  }, /*#__PURE__*/React.createElement(Index$4, {
     checked: dataSource.every(function (record) {
       return selectedRowKeys.includes(typeof rowKey === 'function' ? record[rowKey(record)] : record[rowKey]);
     }),
@@ -7520,8 +7532,8 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "className", "style", "search", "disabled", "onSubmit", "onReset"];
-var RangePicker$2 = Index$1.RangePicker;
+var _excluded$5 = ["columns", "className", "style", "search", "disabled", "disabledHideInSearch", "onSubmit", "onReset"];
+var RangePicker$2 = Index$2.RangePicker;
 
 var WForm = function WForm(props, ref) {
   var columns = props.columns,
@@ -7529,6 +7541,7 @@ var WForm = function WForm(props, ref) {
       style = props.style,
       search = props.search,
       disabled = props.disabled,
+      disabledHideInSearch = props.disabledHideInSearch,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       extraProps = _objectWithoutProperties(props, _excluded$5);
@@ -7548,7 +7561,7 @@ var WForm = function WForm(props, ref) {
       setColumnsFields = _useState4[1];
 
   var filterFormColumns = columns.filter(function (c) {
-    return !c.hideInSearch;
+    return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
@@ -7597,7 +7610,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React.createElement(Index, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$1, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
@@ -7634,7 +7647,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol
-        }), /*#__PURE__*/React.createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$5, _objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u9009\u62E9",
           onLoad: function onLoad(opt) {}
@@ -7684,7 +7697,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol2
-        }), /*#__PURE__*/React.createElement(Index$1, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
@@ -7764,7 +7777,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol4
-        }), /*#__PURE__*/React.createElement(Index$3.Group, _objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$4.Group, _objectSpread2({
           disabled: disabled,
           options: options
         }, c.fieldProps))));
@@ -7819,7 +7832,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol5
-        }), /*#__PURE__*/React.createElement(Index$2.Group, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$3.Group, _objectSpread2(_objectSpread2({
           disabled: disabled
         }, radioButtonProps), {}, {
           options: _options
@@ -7919,7 +7932,7 @@ var WForm = function WForm(props, ref) {
           label: c.title,
           labelCol: _labelCol8
         }), baseitem)) : null;
-      } else {
+      } else if (c.valueType === 'textarea') {
         var _labelCol9 = {};
 
         if (search && search.labelWidth) {
@@ -7941,7 +7954,60 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol9
-        }), /*#__PURE__*/React.createElement(WInput, _objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index.TextArea, _objectSpread2({
+          rows: 4,
+          disabled: disabled,
+          placeholder: "\u8BF7\u8F93\u5165"
+        }, c.fieldProps))));
+      } else if (c.valueType === 'inputNumber') {
+        var _labelCol10 = {};
+
+        if (search && search.labelWidth) {
+          _labelCol10.style = {
+            width: search.labelWidth
+          };
+        }
+
+        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+          style: {
+            paddingLeft: '12px',
+            paddingRight: '12px'
+          }
+        }, colProps), {}, {
+          key: c.dataIndex
+        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+          initialValue: c.initialValue
+        }, c.formItemProps), {}, {
+          name: c.dataIndex,
+          label: c.title,
+          labelCol: _labelCol10
+        }), /*#__PURE__*/React.createElement(WInputNumber, _objectSpread2({
+          disabled: disabled,
+          placeholder: "\u8BF7\u8F93\u5165"
+        }, c.fieldProps))));
+      } else {
+        var _labelCol11 = {};
+
+        if (search && search.labelWidth) {
+          _labelCol11.style = {
+            width: search.labelWidth
+          };
+        }
+
+        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+          style: {
+            paddingLeft: '12px',
+            paddingRight: '12px'
+          }
+        }, colProps), {}, {
+          key: c.dataIndex
+        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+          initialValue: c.initialValue
+        }, c.formItemProps), {}, {
+          name: c.dataIndex,
+          label: c.title,
+          labelCol: _labelCol11
+        }), /*#__PURE__*/React.createElement(Index, _objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, c.fieldProps))));
@@ -8207,7 +8273,7 @@ Number.defaultProps = {
   height: 40
 };
 
-var Index$5 = function Index(props) {
+var Index$6 = function Index(props) {
   var count = props.count,
       width = props.width,
       height = props.height,
@@ -8246,7 +8312,7 @@ var Index$5 = function Index(props) {
 
 var _excluded$7 = ["duration"];
 
-var Index$6 = function Index(props) {
+var Index$7 = function Index(props) {
   var _props$duration = props.duration,
       duration = _props$duration === void 0 ? 2.75 : _props$duration,
       extraProps = _objectWithoutProperties(props, _excluded$7);
@@ -8255,7 +8321,7 @@ var Index$6 = function Index(props) {
   }, extraProps));
 };
 
-Index$6.defaultProps = {};
+Index$7.defaultProps = {};
 
 var _excluded$8 = ["list", "render", "partSize"];
 var autoScrollInterval = null;
@@ -8333,7 +8399,7 @@ function AutoScroll(props) {
   }));
 }
 
-var Index$7 = function Index(_ref) {
+var Index$8 = function Index(_ref) {
   var list = _ref.list,
       render = _ref.render,
       _ref$partSize = _ref.partSize,
@@ -8419,7 +8485,7 @@ var _excluded$9 = ["data", "onClick", "renderItem"];
 
 SwiperCore.use([Pagination, Navigation]);
 
-var Index$8 = function Index(props) {
+var Index$9 = function Index(props) {
   var data = props.data,
       _onClick = props.onClick,
       renderItem = props.renderItem,
@@ -8452,7 +8518,7 @@ var Index$8 = function Index(props) {
   }));
 };
 
-Index$8.defaultProps = {};
+Index$9.defaultProps = {};
 
 function _extends$1() {
   _extends$1 = Object.assign || function (target) {
@@ -9061,7 +9127,7 @@ function itemRender(route, params, routes, paths) {
   }, route.breadcrumbName);
 }
 
-var Index$9 = function Index(_ref) {
+var Index$a = function Index(_ref) {
   var routes = _ref.routes,
       className = _ref.className,
       props = _objectWithoutProperties(_ref, _excluded$a);
@@ -9076,7 +9142,7 @@ var Index$9 = function Index(_ref) {
 
 var _excluded$b = ["title", "className", "headerTail", "headerCenter"];
 
-var Index$a = function Index(_ref) {
+var Index$b = function Index(_ref) {
   var _classNames;
 
   var title = _ref.title,
@@ -9103,7 +9169,7 @@ var Index$a = function Index(_ref) {
   }, props.children))));
 };
 
-Index$a.defaultProps = {};
+Index$b.defaultProps = {};
 
 var controlShow = function controlShow(f1, f2, value, timer) {
   f1(value);
@@ -9392,17 +9458,10 @@ var ModalForm = function ModalForm(props, ref) {
     }
   };
 
-  var done = function done() {
-    setVisible(false);
-  };
-
   useImperativeHandle(ref, function () {
     return {
       formRef: formRef,
-      onSubmit: onSubmit,
-      done: done // resetFields,
-      // setFieldsValue,
-
+      onSubmit: onSubmit
     };
   });
 
@@ -9442,20 +9501,20 @@ var ModalForm = function ModalForm(props, ref) {
               res = {};
 
               if (!submitMethod) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
 
               _context2.next = 5;
               return submitMethod(values, function () {
-                setConfirmLoading(false);
                 setVisible(false);
               });
 
             case 5:
               res = _context2.sent;
+              setConfirmLoading(false);
 
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -9483,18 +9542,19 @@ var ModalForm = function ModalForm(props, ref) {
     onOk: handleOk,
     confirmLoading: confirmLoading,
     onCancel: handleCancel
-  }), /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
+  }, extraProps), /*#__PURE__*/React.createElement(WForm$1, {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    disabledHideInSearch: true,
     search: search,
     columns: columns
-  }, extraProps)));
+  }));
 };
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style"];
+var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -9504,6 +9564,7 @@ var TabelCard = function TabelCard(props, ref) {
       renderTableBar = props.renderTableBar,
       className = props.className,
       style = props.style,
+      modalConfig = props.modalConfig,
       extraProps = _objectWithoutProperties(props, _excluded$e);
 
   var actionRef = useRef();
@@ -9519,11 +9580,6 @@ var TabelCard = function TabelCard(props, ref) {
       modalFormConfig = _useState4[0],
       setModalFormConfig = _useState4[1];
 
-  var _useState5 = useState({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      submitValues = _useState6[0],
-      setSubmitValues = _useState6[1];
-
   useImperativeHandle(ref, function () {
     return {};
   });
@@ -9546,7 +9602,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '编辑',
               record: record,
               modalOnOk: function () {
-                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values, loading) {
                   return regeneratorRuntime.wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
@@ -9560,6 +9616,7 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current;
 
+                            loading();
                             actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
                           });
 
@@ -9571,7 +9628,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee);
                 }));
 
-                function modalOnOk(_x) {
+                function modalOnOk(_x, _x2) {
                   return _modalOnOk.apply(this, arguments);
                 }
 
@@ -9707,7 +9764,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '新增',
               record: {},
               modalOnOk: function () {
-                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values) {
+                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values, loading) {
                   return regeneratorRuntime.wrap(function _callee5$(_context5) {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
@@ -9721,7 +9778,8 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current4;
 
-                            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
+                            loading();
+                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
                           });
 
                         case 3:
@@ -9732,7 +9790,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee5);
                 }));
 
-                function modalOnOk(_x2) {
+                function modalOnOk(_x3, _x4) {
                   return _modalOnOk3.apply(this, arguments);
                 }
 
@@ -9753,8 +9811,8 @@ var TabelCard = function TabelCard(props, ref) {
         });
       }
     });
-  }, [submitValues, actionRef]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, {
+  }, [actionRef]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: formRef,
     title: modalFormConfig.type || '新增',
     visible: visible,
@@ -9768,17 +9826,14 @@ var TabelCard = function TabelCard(props, ref) {
             switch (_context6.prev = _context6.next) {
               case 0:
                 if (!modalFormConfig.modalOnOk) {
-                  _context6.next = 4;
+                  _context6.next = 3;
                   break;
                 }
 
                 _context6.next = 3;
-                return modalFormConfig.modalOnOk(values);
+                return modalFormConfig.modalOnOk(values, loading);
 
               case 3:
-                loading();
-
-              case 4:
               case "end":
                 return _context6.stop();
             }
@@ -9786,31 +9841,32 @@ var TabelCard = function TabelCard(props, ref) {
         }, _callee6);
       }));
 
-      function submitMethod(_x3, _x4) {
+      function submitMethod(_x5, _x6) {
         return _submitMethod.apply(this, arguments);
       }
 
       return submitMethod;
     }(),
-    search: modalFormSearch,
+    search: modalFormSearch
+  }, modalConfig), {}, {
     columns: (columns || []).filter(function (item) {
       return !item.hiddenInModalForm;
     })
-  }), /*#__PURE__*/React.createElement(ProTable, _objectSpread2({
+  })), /*#__PURE__*/React.createElement(ProTable, _objectSpread2({
     actionRef: actionRef,
     rowKey: "id",
     bordered: true,
     options: false,
     toolBarRender: false,
     request: request,
-    columns: [].concat(_toConsumableArray(columns || []), [{
+    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [{
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }]),
+    }]) : columns || [],
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {
@@ -9825,4 +9881,4 @@ var TabelCard = function TabelCard(props, ref) {
 
 var index$1 = /*#__PURE__*/React.forwardRef(TabelCard);
 
-export { Index$7 as AutoScroll, Index$9 as Breadcrumb, WButton as Button, Index$a as Card, Index$3 as Checkbox, Index$6 as CountUp, Index$1 as DatePicker, index as IconFont, WInput as Input, Modal, ModalForm$1 as ModalForm, Index$5 as Number, NumericInput, Index$2 as Radio, Index as Select, Index$8 as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$4 as TreeSelect, WForm$1 as WForm };
+export { Index$8 as AutoScroll, Index$a as Breadcrumb, WButton as Button, Index$b as Card, Index$4 as Checkbox, Index$7 as CountUp, Index$2 as DatePicker, index as IconFont, Index as Input, WInputNumber as InputNumber, Modal, ModalForm$1 as ModalForm, Index$6 as Number, NumericInput, Index$3 as Radio, Index$1 as Select, Index$9 as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$5 as TreeSelect, WForm$1 as WForm };

package/dist/index.js

@@ -12,6 +12,8 @@ var React = require('react');
 var icons = require('@ant-design/icons');
 require('antd/es/input/style');
 var _Input = require('antd/es/input');
+require('antd/es/input-number/style');
+var _InputNumber = require('antd/es/input-number');
 require('antd/es/pagination/style');
 var _Pagination = require('antd/es/pagination');
 require('antd/es/row/style');
@@ -55,6 +57,7 @@ var _Dropdown__default = /*#__PURE__*/_interopDefaultLegacy(_Dropdown);
 var _Menu__default = /*#__PURE__*/_interopDefaultLegacy(_Menu);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var _Input__default = /*#__PURE__*/_interopDefaultLegacy(_Input);
+var _InputNumber__default = /*#__PURE__*/_interopDefaultLegacy(_InputNumber);
 var _Pagination__default = /*#__PURE__*/_interopDefaultLegacy(_Pagination);
 var _Row__default = /*#__PURE__*/_interopDefaultLegacy(_Row);
 var _Spin__default = /*#__PURE__*/_interopDefaultLegacy(_Spin);
@@ -521,8 +524,18 @@ var WInput = function WInput(props) {
   return /*#__PURE__*/React__default['default'].createElement(_Input__default['default'], _objectSpread2({}, extraProps));
 };
 
+var Index = WInput;
+Index.TextArea = _Input__default['default'].TextArea;
 WInput.defaultProps = {};
 
+var WInputNumber = function WInputNumber(props) {
+  var extraProps = _extends({}, props);
+
+  return /*#__PURE__*/React__default['default'].createElement(_InputNumber__default['default'], _objectSpread2({}, extraProps));
+};
+
+WInputNumber.defaultProps = {};
+
 var _excluded$1 = ["request", "valueEnum", "onLoad", "children"],
     _excluded2 = ["children"];
 
@@ -618,8 +631,8 @@ var Option = function Option(props) {
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, _objectSpread2({}, extraProps), children);
 };
 
-var Index = WSelect;
-Index.Option = Option;
+var Index$1 = WSelect;
+Index$1.Option = Option;
 
 var WDatePicker = function WDatePicker(props) {
   var extraProps = _extends({}, props);
@@ -646,8 +659,8 @@ var RangePicker = function RangePicker(props) {
 };
 
 RangePicker.defaultProps = {};
-var Index$1 = WDatePicker;
-Index$1.RangePicker = RangePicker;
+var Index$2 = WDatePicker;
+Index$2.RangePicker = RangePicker;
 
 var WSwitch = function WSwitch(props) {
   var extraProps = _extends({}, props);
@@ -663,9 +676,9 @@ var WRadio = function WRadio(props) {
   return /*#__PURE__*/React__default['default'].createElement(_Radio__default['default'], _objectSpread2({}, extraProps));
 };
 
-var Index$2 = WRadio;
-Index$2.Group = _Radio__default['default'].Group;
-Index$2.Button = _Radio__default['default'].Button;
+var Index$3 = WRadio;
+Index$3.Group = _Radio__default['default'].Group;
+Index$3.Button = _Radio__default['default'].Button;
 WRadio.defaultProps = {};
 
 var WCheckbox = function WCheckbox(props) {
@@ -675,8 +688,8 @@ var WCheckbox = function WCheckbox(props) {
 };
 
 WCheckbox.defaultProps = {};
-var Index$3 = WCheckbox;
-Index$3.Group = _Checkbox__default['default'].Group;
+var Index$4 = WCheckbox;
+Index$4.Group = _Checkbox__default['default'].Group;
 
 function formatNumber(value) {
   value += '';
@@ -835,8 +848,8 @@ var TreeSelect = function TreeSelect(_ref) {
   }, props), !props.children ? renderTree(treeData) : props.children);
 };
 
-var Index$4 = TreeSelect;
-Index$4.TreeNode = _TreeSelect__default['default'].TreeNode;
+var Index$5 = TreeSelect;
+Index$5.TreeNode = _TreeSelect__default['default'].TreeNode;
 
 /*
  * @Author: lijin
@@ -6607,7 +6620,7 @@ function FrameBox(_ref) {
 }
 
 var _excluded$4 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection"];
-var RangePicker$1 = Index$1.RangePicker;
+var RangePicker$1 = Index$2.RangePicker;
 function Table(_ref) {
   var _classnames2;
 
@@ -6745,7 +6758,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React__default['default'].createElement(Index, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$1, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           onLoad: function onLoad(opt) {
             setColumnsFields(function (preColumnsFields) {
@@ -6781,7 +6794,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol
-        }), /*#__PURE__*/React__default['default'].createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$5, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           onLoad: function onLoad(opt) {}
         }, c.fieldProps), _extraProps))));
@@ -6830,7 +6843,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol2
-        }), /*#__PURE__*/React__default['default'].createElement(Index$1, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
       } else if (c.valueType === 'dateRange' || c.valueType === 'dateTimeRange') {
@@ -6903,7 +6916,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol4
-        }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$4.Group, _objectSpread2({
           options: options
         }, c.fieldProps))));
       } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
@@ -6953,7 +6966,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol5
-        }), /*#__PURE__*/React__default['default'].createElement(Index$2.Group, _objectSpread2(_objectSpread2({}, radioButtonProps), {}, {
+        }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2(_objectSpread2({}, radioButtonProps), {}, {
           options: _options
         }, c.fieldProps))));
       } else if (c.valueType === 'switch') {
@@ -7043,7 +7056,7 @@ function Table(_ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol8
-        }), /*#__PURE__*/React__default['default'].createElement(WInput, _objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index, _objectSpread2({
           placeholder: "\u8BF7\u8F93\u5165"
         }, c.fieldProps))));
       }
@@ -7183,7 +7196,7 @@ function Table(_ref) {
         flex: '0 1 auto'
       },
       className: "td"
-    }, /*#__PURE__*/React__default['default'].createElement(Index$3, {
+    }, /*#__PURE__*/React__default['default'].createElement(Index$4, {
       checked: (_ref2 = [].concat(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []), _toConsumableArray(selectedRowKeys))) === null || _ref2 === void 0 ? void 0 : _ref2.includes(key),
       onClick: function onClick(e) {
         return e.stopPropagation();
@@ -7221,7 +7234,7 @@ function Table(_ref) {
         flex: '0 1 auto'
       },
       className: "td"
-    }, /*#__PURE__*/React__default['default'].createElement(Index$2, {
+    }, /*#__PURE__*/React__default['default'].createElement(Index$3, {
       checked: (_ref3 = [].concat(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []), _toConsumableArray(selectedRowKeys))) === null || _ref3 === void 0 ? void 0 : _ref3.includes(key),
       onClick: function onClick(e) {
         return e.stopPropagation();
@@ -7507,7 +7520,7 @@ function Table(_ref) {
       flex: '0 1 auto'
     },
     className: "td"
-  }, /*#__PURE__*/React__default['default'].createElement(Index$3, {
+  }, /*#__PURE__*/React__default['default'].createElement(Index$4, {
     checked: dataSource.every(function (record) {
       return selectedRowKeys.includes(typeof rowKey === 'function' ? record[rowKey(record)] : record[rowKey]);
     }),
@@ -7552,8 +7565,8 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "className", "style", "search", "disabled", "onSubmit", "onReset"];
-var RangePicker$2 = Index$1.RangePicker;
+var _excluded$5 = ["columns", "className", "style", "search", "disabled", "disabledHideInSearch", "onSubmit", "onReset"];
+var RangePicker$2 = Index$2.RangePicker;
 
 var WForm = function WForm(props, ref) {
   var columns = props.columns,
@@ -7561,6 +7574,7 @@ var WForm = function WForm(props, ref) {
       style = props.style,
       search = props.search,
       disabled = props.disabled,
+      disabledHideInSearch = props.disabledHideInSearch,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       extraProps = _objectWithoutProperties(props, _excluded$5);
@@ -7580,7 +7594,7 @@ var WForm = function WForm(props, ref) {
       setColumnsFields = _useState4[1];
 
   var filterFormColumns = columns.filter(function (c) {
-    return !c.hideInSearch;
+    return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
@@ -7629,7 +7643,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React__default['default'].createElement(Index, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$1, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
@@ -7666,7 +7680,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol
-        }), /*#__PURE__*/React__default['default'].createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$5, _objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u9009\u62E9",
           onLoad: function onLoad(opt) {}
@@ -7716,7 +7730,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol2
-        }), /*#__PURE__*/React__default['default'].createElement(Index$1, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
@@ -7796,7 +7810,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol4
-        }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$4.Group, _objectSpread2({
           disabled: disabled,
           options: options
         }, c.fieldProps))));
@@ -7851,7 +7865,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol5
-        }), /*#__PURE__*/React__default['default'].createElement(Index$2.Group, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2(_objectSpread2({
           disabled: disabled
         }, radioButtonProps), {}, {
           options: _options
@@ -7951,7 +7965,7 @@ var WForm = function WForm(props, ref) {
           label: c.title,
           labelCol: _labelCol8
         }), baseitem)) : null;
-      } else {
+      } else if (c.valueType === 'textarea') {
         var _labelCol9 = {};
 
         if (search && search.labelWidth) {
@@ -7973,7 +7987,60 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol9
-        }), /*#__PURE__*/React__default['default'].createElement(WInput, _objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index.TextArea, _objectSpread2({
+          rows: 4,
+          disabled: disabled,
+          placeholder: "\u8BF7\u8F93\u5165"
+        }, c.fieldProps))));
+      } else if (c.valueType === 'inputNumber') {
+        var _labelCol10 = {};
+
+        if (search && search.labelWidth) {
+          _labelCol10.style = {
+            width: search.labelWidth
+          };
+        }
+
+        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
+          style: {
+            paddingLeft: '12px',
+            paddingRight: '12px'
+          }
+        }, colProps), {}, {
+          key: c.dataIndex
+        }), /*#__PURE__*/React__default['default'].createElement(_Form__default['default'].Item, _objectSpread2(_objectSpread2({
+          initialValue: c.initialValue
+        }, c.formItemProps), {}, {
+          name: c.dataIndex,
+          label: c.title,
+          labelCol: _labelCol10
+        }), /*#__PURE__*/React__default['default'].createElement(WInputNumber, _objectSpread2({
+          disabled: disabled,
+          placeholder: "\u8BF7\u8F93\u5165"
+        }, c.fieldProps))));
+      } else {
+        var _labelCol11 = {};
+
+        if (search && search.labelWidth) {
+          _labelCol11.style = {
+            width: search.labelWidth
+          };
+        }
+
+        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
+          style: {
+            paddingLeft: '12px',
+            paddingRight: '12px'
+          }
+        }, colProps), {}, {
+          key: c.dataIndex
+        }), /*#__PURE__*/React__default['default'].createElement(_Form__default['default'].Item, _objectSpread2(_objectSpread2({
+          initialValue: c.initialValue
+        }, c.formItemProps), {}, {
+          name: c.dataIndex,
+          label: c.title,
+          labelCol: _labelCol11
+        }), /*#__PURE__*/React__default['default'].createElement(Index, _objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, c.fieldProps))));
@@ -8239,7 +8306,7 @@ Number.defaultProps = {
   height: 40
 };
 
-var Index$5 = function Index(props) {
+var Index$6 = function Index(props) {
   var count = props.count,
       width = props.width,
       height = props.height,
@@ -8278,7 +8345,7 @@ var Index$5 = function Index(props) {
 
 var _excluded$7 = ["duration"];
 
-var Index$6 = function Index(props) {
+var Index$7 = function Index(props) {
   var _props$duration = props.duration,
       duration = _props$duration === void 0 ? 2.75 : _props$duration,
       extraProps = _objectWithoutProperties(props, _excluded$7);
@@ -8287,7 +8354,7 @@ var Index$6 = function Index(props) {
   }, extraProps));
 };
 
-Index$6.defaultProps = {};
+Index$7.defaultProps = {};
 
 var _excluded$8 = ["list", "render", "partSize"];
 var autoScrollInterval = null;
@@ -8365,7 +8432,7 @@ function AutoScroll(props) {
   }));
 }
 
-var Index$7 = function Index(_ref) {
+var Index$8 = function Index(_ref) {
   var list = _ref.list,
       render = _ref.render,
       _ref$partSize = _ref.partSize,
@@ -8451,7 +8518,7 @@ var _excluded$9 = ["data", "onClick", "renderItem"];
 
 SwiperCore__default['default'].use([SwiperCore.Pagination, SwiperCore.Navigation]);
 
-var Index$8 = function Index(props) {
+var Index$9 = function Index(props) {
   var data = props.data,
       _onClick = props.onClick,
       renderItem = props.renderItem,
@@ -8484,7 +8551,7 @@ var Index$8 = function Index(props) {
   }));
 };
 
-Index$8.defaultProps = {};
+Index$9.defaultProps = {};
 
 function _extends$1() {
   _extends$1 = Object.assign || function (target) {
@@ -9093,7 +9160,7 @@ function itemRender(route, params, routes, paths) {
   }, route.breadcrumbName);
 }
 
-var Index$9 = function Index(_ref) {
+var Index$a = function Index(_ref) {
   var routes = _ref.routes,
       className = _ref.className,
       props = _objectWithoutProperties(_ref, _excluded$a);
@@ -9108,7 +9175,7 @@ var Index$9 = function Index(_ref) {
 
 var _excluded$b = ["title", "className", "headerTail", "headerCenter"];
 
-var Index$a = function Index(_ref) {
+var Index$b = function Index(_ref) {
   var _classNames;
 
   var title = _ref.title,
@@ -9135,7 +9202,7 @@ var Index$a = function Index(_ref) {
   }, props.children))));
 };
 
-Index$a.defaultProps = {};
+Index$b.defaultProps = {};
 
 var controlShow = function controlShow(f1, f2, value, timer) {
   f1(value);
@@ -9424,17 +9491,10 @@ var ModalForm = function ModalForm(props, ref) {
     }
   };
 
-  var done = function done() {
-    setVisible(false);
-  };
-
   React.useImperativeHandle(ref, function () {
     return {
       formRef: formRef,
-      onSubmit: onSubmit,
-      done: done // resetFields,
-      // setFieldsValue,
-
+      onSubmit: onSubmit
     };
   });
 
@@ -9474,20 +9534,20 @@ var ModalForm = function ModalForm(props, ref) {
               res = {};
 
               if (!submitMethod) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
 
               _context2.next = 5;
               return submitMethod(values, function () {
-                setConfirmLoading(false);
                 setVisible(false);
               });
 
             case 5:
               res = _context2.sent;
+              setConfirmLoading(false);
 
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -9515,18 +9575,19 @@ var ModalForm = function ModalForm(props, ref) {
     onOk: handleOk,
     confirmLoading: confirmLoading,
     onCancel: handleCancel
-  }), /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
+  }, extraProps), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    disabledHideInSearch: true,
     search: search,
     columns: columns
-  }, extraProps)));
+  }));
 };
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style"];
+var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -9536,6 +9597,7 @@ var TabelCard = function TabelCard(props, ref) {
       renderTableBar = props.renderTableBar,
       className = props.className,
       style = props.style,
+      modalConfig = props.modalConfig,
       extraProps = _objectWithoutProperties(props, _excluded$e);
 
   var actionRef = React.useRef();
@@ -9551,11 +9613,6 @@ var TabelCard = function TabelCard(props, ref) {
       modalFormConfig = _useState4[0],
       setModalFormConfig = _useState4[1];
 
-  var _useState5 = React.useState({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      submitValues = _useState6[0],
-      setSubmitValues = _useState6[1];
-
   React.useImperativeHandle(ref, function () {
     return {};
   });
@@ -9578,7 +9635,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '编辑',
               record: record,
               modalOnOk: function () {
-                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values, loading) {
                   return regeneratorRuntime.wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
@@ -9592,6 +9649,7 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current;
 
+                            loading();
                             actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
                           });
 
@@ -9603,7 +9661,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee);
                 }));
 
-                function modalOnOk(_x) {
+                function modalOnOk(_x, _x2) {
                   return _modalOnOk.apply(this, arguments);
                 }
 
@@ -9739,7 +9797,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '新增',
               record: {},
               modalOnOk: function () {
-                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values) {
+                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values, loading) {
                   return regeneratorRuntime.wrap(function _callee5$(_context5) {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
@@ -9753,7 +9811,8 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current4;
 
-                            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
+                            loading();
+                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
                           });
 
                         case 3:
@@ -9764,7 +9823,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee5);
                 }));
 
-                function modalOnOk(_x2) {
+                function modalOnOk(_x3, _x4) {
                   return _modalOnOk3.apply(this, arguments);
                 }
 
@@ -9785,8 +9844,8 @@ var TabelCard = function TabelCard(props, ref) {
         });
       }
     });
-  }, [submitValues, actionRef]);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, {
+  }, [actionRef]);
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: formRef,
     title: modalFormConfig.type || '新增',
     visible: visible,
@@ -9800,17 +9859,14 @@ var TabelCard = function TabelCard(props, ref) {
             switch (_context6.prev = _context6.next) {
               case 0:
                 if (!modalFormConfig.modalOnOk) {
-                  _context6.next = 4;
+                  _context6.next = 3;
                   break;
                 }
 
                 _context6.next = 3;
-                return modalFormConfig.modalOnOk(values);
+                return modalFormConfig.modalOnOk(values, loading);
 
               case 3:
-                loading();
-
-              case 4:
               case "end":
                 return _context6.stop();
             }
@@ -9818,31 +9874,32 @@ var TabelCard = function TabelCard(props, ref) {
         }, _callee6);
       }));
 
-      function submitMethod(_x3, _x4) {
+      function submitMethod(_x5, _x6) {
         return _submitMethod.apply(this, arguments);
       }
 
       return submitMethod;
     }(),
-    search: modalFormSearch,
+    search: modalFormSearch
+  }, modalConfig), {}, {
     columns: (columns || []).filter(function (item) {
       return !item.hiddenInModalForm;
     })
-  }), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2({
+  })), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2({
     actionRef: actionRef,
     rowKey: "id",
     bordered: true,
     options: false,
     toolBarRender: false,
     request: request,
-    columns: [].concat(_toConsumableArray(columns || []), [{
+    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [{
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }]),
+    }]) : columns || [],
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {
@@ -9857,24 +9914,25 @@ var TabelCard = function TabelCard(props, ref) {
 
 var index$1 = /*#__PURE__*/React__default['default'].forwardRef(TabelCard);
 
-exports.AutoScroll = Index$7;
-exports.Breadcrumb = Index$9;
+exports.AutoScroll = Index$8;
+exports.Breadcrumb = Index$a;
 exports.Button = WButton;
-exports.Card = Index$a;
-exports.Checkbox = Index$3;
-exports.CountUp = Index$6;
-exports.DatePicker = Index$1;
+exports.Card = Index$b;
+exports.Checkbox = Index$4;
+exports.CountUp = Index$7;
+exports.DatePicker = Index$2;
 exports.IconFont = index;
-exports.Input = WInput;
+exports.Input = Index;
+exports.InputNumber = WInputNumber;
 exports.Modal = Modal;
 exports.ModalForm = ModalForm$1;
-exports.Number = Index$5;
+exports.Number = Index$6;
 exports.NumericInput = NumericInput;
-exports.Radio = Index$2;
-exports.Select = Index;
-exports.Swiper = Index$8;
+exports.Radio = Index$3;
+exports.Select = Index$1;
+exports.Swiper = Index$9;
 exports.Switch = WSwitch;
 exports.TabelCard = index$1;
 exports.Table = Table;
-exports.TreeSelect = Index$4;
+exports.TreeSelect = Index$5;
 exports.WForm = WForm$1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.2.1",
+  "version": "0.2.5",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",