wargerm 0.5.16 → 0.5.19

package/dist/index.esm.js

@@ -7654,503 +7654,12 @@ var WForm = function WForm(props, ref) {
   ]);
   var filterExtraColumnsForm = useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
-      if (disabledRuler && c.formItemProps) {
-        delete c.formItemProps.rules;
-      }
-
-      var colProps = {};
-
-      if (search && search.span) {
-        colProps.span = typeof search.span == 'number' ? (c.colSize || 1) * search.span : {
-          xs: 24,
-          sm: 24,
-          md: 12,
-          lg: 12,
-          xl: 8,
-          xxl: 6
-        };
-      }
-
-      if (c.valueType == 'select') {
-        var _extraProps4 = {};
-
-        if (c.request) {
-          _extraProps4.request = c.request;
-        } else if (c.valueEnum) {
-          _extraProps4.valueEnum = c.valueEnum;
-        }
-
-        var labelCol = {};
-
-        if (search && search.labelWidth) {
-          labelCol.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: labelCol
-        }), /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
-          placeholder: "\u8BF7\u9009\u62E9",
-          disabled: disabled,
-          onLoad: function onLoad(opt) {
-            // if (columnsFieldsRef.current) {
-            //   columnsFieldsRef.current[c.dataIndex] = opt;
-            // }
-            setColumnsFields(function (preColumnsFields) {
-              return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
-            });
-
-            if (c.useFirstIteminitialValue) {
-              var _form$setFieldsValue2, _opt$0$value2, _opt$2;
-
-              form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value2 = opt === null || opt === void 0 ? void 0 : (_opt$2 = opt[0]) === null || _opt$2 === void 0 ? void 0 : _opt$2.value) !== null && _opt$0$value2 !== void 0 ? _opt$0$value2 : ''));
-            }
-          }
-        }, c.fieldProps), _extraProps4))));
-      } else if (c.valueType == 'upload') {
-        var _labelCol14 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol14.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol14
-        }), /*#__PURE__*/React.createElement(Upload, _objectSpread2({
-          getFileList: function getFileList(fileListUrls, fileList) {
-            setColumnsFields(function (preColumnsFields) {
-              return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, {
-                fileListUrls: fileListUrls,
-                fileList: fileList
-              }));
-            });
-          },
-          disabled: disabled
-        }, c.fieldProps))));
-      } else if (c.valueType == 'cascader') {
-        var _extraProps5 = {};
-
-        if (c.request) {
-          _extraProps5.request = c.request;
-        }
-
-        var _labelCol15 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol15.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol15
-        }), /*#__PURE__*/React.createElement(WCascader, _objectSpread2(_objectSpread2({
-          placeholder: "\u8BF7\u9009\u62E9",
-          disabled: disabled,
-          onLoad: function onLoad(opt) {
-            setColumnsFields(function (preColumnsFields) {
-              return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
-            });
-          }
-        }, c.fieldProps), _extraProps5))));
-      } else if (c.valueType == 'treeSelect') {
-        var _extraProps6 = {};
-
-        if (c.request) {
-          _extraProps6.request = c.request;
-        }
-
-        var _labelCol16 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol16.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol16
-        }), /*#__PURE__*/React.createElement(Index$7, _objectSpread2(_objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u9009\u62E9",
-          onLoad: function onLoad(opt) {}
-        }, c.fieldProps), _extraProps6))));
-      } else if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear'].includes(c.valueType)) {
-        var _labelCol17 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol17.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var showTime = {};
-        var picker = {};
-
-        if (c.valueType == 'dateTime') {
-          showTime = {
-            showTime: {
-              format: 'HH:mm'
-            }
-          };
-        }
-
-        if (c.valueType == 'dateMonth') {
-          picker = {
-            picker: 'month'
-          };
-        }
-
-        if (c.valueType == 'dateYear') {
-          picker = {
-            picker: 'year'
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol17
-        }), /*#__PURE__*/React.createElement(Index$6, _objectSpread2(_objectSpread2(_objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, picker), showTime), c.fieldProps))));
-      } else if (c.valueType === 'dateRange' || c.valueType === 'dateTimeRange') {
-        var _labelCol18 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol18.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var _showTime2 = {};
-
-        if (c.valueType == 'dateTimeRange') {
-          _showTime2 = {
-            showTime: {
-              format: 'HH:mm'
-            }
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol18
-        }), /*#__PURE__*/React.createElement(RangePicker$2, _objectSpread2(_objectSpread2({
-          disabled: disabled
-        }, _showTime2), c.fieldProps))));
-      } else if (c.valueType === 'checkbox') {
-        var options = [];
-
-        if (c.valueEnum) {
-          for (var key in c.valueEnum) {
-            var text = c.valueEnum[key].text;
-            options.push({
-              label: text,
-              value: key
-            });
-          }
-        }
-
-        if (c.options) {
-          options = c.options;
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
-
-
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
-        });
-        var _labelCol19 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol19.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol19
-        }), /*#__PURE__*/React.createElement(Index$4.Group, _objectSpread2({
-          disabled: disabled,
-          options: options
-        }, c.fieldProps))));
-      } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
-        var _options3 = [];
-
-        if (c.options) {
-          _options3 = c.options;
-        }
-
-        if (c.valueEnum) {
-          for (var _key3 in c.valueEnum) {
-            var _text3 = c.valueEnum[_key3].text;
-
-            _options3.push({
-              label: _text3,
-              value: _key3
-            });
-          }
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
-
-
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
-        });
-        var _labelCol20 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol20.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var radioButtonProps = {};
-
-        if (c.valueType === 'radioButton') {
-          radioButtonProps = {
-            optionType: 'button',
-            buttonStyle: 'solid'
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol20
-        }), /*#__PURE__*/React.createElement(Index$3.Group, _objectSpread2(_objectSpread2({
-          disabled: disabled
-        }, radioButtonProps), {}, {
-          options: _options3
-        }, c.fieldProps))));
-      } else if (c.valueType === 'switch') {
-        var _options4 = [];
-
-        if (c.valueEnum) {
-          for (var _key4 in c.valueEnum) {
-            var _text4 = c.valueEnum[_key4].text;
-
-            _options4.push({
-              label: _text4,
-              value: _key4
-            });
-          }
-        }
-
-        var _labelCol21 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol21.style = {
-            width: search.labelWidth
-          };
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
-
-
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
-        });
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue,
-          valuePropName: "checked"
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol21
-        }), /*#__PURE__*/React.createElement(WSwitch, _objectSpread2({
-          disabled: disabled
-        }, c.fieldProps))));
-      } else if (c.valueType === 'digit') {
-        var _labelCol22 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol22.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol22
-        }), /*#__PURE__*/React.createElement(NumericInput, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165\u53C2\u6570(double/int)"
-        }, c.fieldProps))));
-      } else if (c.renderFormItem) {
-        var _labelCol23 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol23.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
-          disabled: disabled,
-          formItemProps: c.formItemProps,
-          fieldProps: c.fieldProps,
-          columnsFields: columnsFields // columnsFieldsRef,
-
-        }), form);
-        return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol23
-        }), baseitem)) : null;
-      } else if (c.valueType === 'textarea') {
-        var _labelCol24 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol24.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol24
-        }), /*#__PURE__*/React.createElement(Index.TextArea, _objectSpread2({
-          rows: 4,
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
-      } else if (c.valueType === 'inputNumber') {
-        var _labelCol25 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol25.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol25
-        }), /*#__PURE__*/React.createElement(WInputNumber, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
+      if (c.type == 'group') {
+        return c.groupNode(c.children.map(function (c) {
+          return renderItemForm(c);
+        }));
       } else {
-        var _labelCol26 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol26.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol26
-        }), /*#__PURE__*/React.createElement(Index, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
+        return renderItemForm(c);
       }
     });
   }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
@@ -8282,7 +7791,7 @@ var WForm = function WForm(props, ref) {
   };
 
   var setFieldsValue = function setFieldsValue(record) {
-    var _form$setFieldsValue4;
+    var _form$setFieldsValue2;
 
     var setFieldsValues = _objectSpread2({}, record);
 
@@ -8298,7 +7807,7 @@ var WForm = function WForm(props, ref) {
         return false;
       }
     });
-    form === null || form === void 0 ? void 0 : (_form$setFieldsValue4 = form.setFieldsValue) === null || _form$setFieldsValue4 === void 0 ? void 0 : _form$setFieldsValue4.call(form, setFieldsValues);
+    form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, setFieldsValues);
   };
 
   useImperativeHandle(ref, function () {
@@ -10920,6 +10429,11 @@ var ModalForm = function ModalForm(props, ref) {
       confirmLoading = _useState2[0],
       setConfirmLoading = _useState2[1];
 
+  var _useState3 = useState(null),
+      _useState4 = _slicedToArray(_useState3, 2),
+      formIntance = _useState4[0],
+      setFormIntance = _useState4[1];
+
   var handleSubmit = function handleSubmit() {
     var _formRef$current;
 
@@ -11015,13 +10529,17 @@ var ModalForm = function ModalForm(props, ref) {
     };
   }();
 
+  var setForm = function setForm(form) {
+    setFormIntance(form);
+  };
+
   useEffect(function () {
-    if (visible) {
+    if (formIntance) {
       resetFields();
       setFieldsValue(record);
       modalFormOpend && modalFormOpend(record);
     }
-  }, [visible, record]);
+  }, [visible, record, formIntance, extraColumns, columns]);
   return /*#__PURE__*/React.createElement(_Modal, _objectSpread2(_objectSpread2({
     title: title,
     visible: visible
@@ -11035,6 +10553,7 @@ var ModalForm = function ModalForm(props, ref) {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    setForm: setForm,
     onFormChange: onFormChange,
     disabledHideInSearch: true,
     search: search,
@@ -11476,7 +10995,21 @@ var TabelCard = function TabelCard(props, ref) {
     search: modalFormSearch
   }, modalConfig), {}, {
     onFormChange: onFormChange,
-    extraColumns: extraColumns || [],
+    extraColumns: (extraColumns || []).filter(function (item) {
+      if (item.hiddenInModalForm) {
+        return false;
+      }
+
+      if (item.onlyShowInView) {
+        if (modalFormConfig.type === '查看') {
+          return true;
+        } else {
+          return false;
+        }
+      }
+
+      return true;
+    }),
     columns: (modalFormColumn || []).filter(function (item) {
       if (item.hiddenInModalForm) {
         return false;

package/dist/index.js

@@ -7714,503 +7714,12 @@ var WForm = function WForm(props, ref) {
   ]);
   var filterExtraColumnsForm = React.useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
-      if (disabledRuler && c.formItemProps) {
-        delete c.formItemProps.rules;
-      }
-
-      var colProps = {};
-
-      if (search && search.span) {
-        colProps.span = typeof search.span == 'number' ? (c.colSize || 1) * search.span : {
-          xs: 24,
-          sm: 24,
-          md: 12,
-          lg: 12,
-          xl: 8,
-          xxl: 6
-        };
-      }
-
-      if (c.valueType == 'select') {
-        var _extraProps4 = {};
-
-        if (c.request) {
-          _extraProps4.request = c.request;
-        } else if (c.valueEnum) {
-          _extraProps4.valueEnum = c.valueEnum;
-        }
-
-        var labelCol = {};
-
-        if (search && search.labelWidth) {
-          labelCol.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: labelCol
-        }), /*#__PURE__*/React__default['default'].createElement(Select, _objectSpread2(_objectSpread2({
-          placeholder: "\u8BF7\u9009\u62E9",
-          disabled: disabled,
-          onLoad: function onLoad(opt) {
-            // if (columnsFieldsRef.current) {
-            //   columnsFieldsRef.current[c.dataIndex] = opt;
-            // }
-            setColumnsFields(function (preColumnsFields) {
-              return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
-            });
-
-            if (c.useFirstIteminitialValue) {
-              var _form$setFieldsValue2, _opt$0$value2, _opt$2;
-
-              form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value2 = opt === null || opt === void 0 ? void 0 : (_opt$2 = opt[0]) === null || _opt$2 === void 0 ? void 0 : _opt$2.value) !== null && _opt$0$value2 !== void 0 ? _opt$0$value2 : ''));
-            }
-          }
-        }, c.fieldProps), _extraProps4))));
-      } else if (c.valueType == 'upload') {
-        var _labelCol14 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol14.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol14
-        }), /*#__PURE__*/React__default['default'].createElement(Upload, _objectSpread2({
-          getFileList: function getFileList(fileListUrls, fileList) {
-            setColumnsFields(function (preColumnsFields) {
-              return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, {
-                fileListUrls: fileListUrls,
-                fileList: fileList
-              }));
-            });
-          },
-          disabled: disabled
-        }, c.fieldProps))));
-      } else if (c.valueType == 'cascader') {
-        var _extraProps5 = {};
-
-        if (c.request) {
-          _extraProps5.request = c.request;
-        }
-
-        var _labelCol15 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol15.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol15
-        }), /*#__PURE__*/React__default['default'].createElement(WCascader, _objectSpread2(_objectSpread2({
-          placeholder: "\u8BF7\u9009\u62E9",
-          disabled: disabled,
-          onLoad: function onLoad(opt) {
-            setColumnsFields(function (preColumnsFields) {
-              return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
-            });
-          }
-        }, c.fieldProps), _extraProps5))));
-      } else if (c.valueType == 'treeSelect') {
-        var _extraProps6 = {};
-
-        if (c.request) {
-          _extraProps6.request = c.request;
-        }
-
-        var _labelCol16 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol16.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol16
-        }), /*#__PURE__*/React__default['default'].createElement(Index$7, _objectSpread2(_objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u9009\u62E9",
-          onLoad: function onLoad(opt) {}
-        }, c.fieldProps), _extraProps6))));
-      } else if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear'].includes(c.valueType)) {
-        var _labelCol17 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol17.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var showTime = {};
-        var picker = {};
-
-        if (c.valueType == 'dateTime') {
-          showTime = {
-            showTime: {
-              format: 'HH:mm'
-            }
-          };
-        }
-
-        if (c.valueType == 'dateMonth') {
-          picker = {
-            picker: 'month'
-          };
-        }
-
-        if (c.valueType == 'dateYear') {
-          picker = {
-            picker: 'year'
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol17
-        }), /*#__PURE__*/React__default['default'].createElement(Index$6, _objectSpread2(_objectSpread2(_objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, picker), showTime), c.fieldProps))));
-      } else if (c.valueType === 'dateRange' || c.valueType === 'dateTimeRange') {
-        var _labelCol18 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol18.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var _showTime2 = {};
-
-        if (c.valueType == 'dateTimeRange') {
-          _showTime2 = {
-            showTime: {
-              format: 'HH:mm'
-            }
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol18
-        }), /*#__PURE__*/React__default['default'].createElement(RangePicker$2, _objectSpread2(_objectSpread2({
-          disabled: disabled
-        }, _showTime2), c.fieldProps))));
-      } else if (c.valueType === 'checkbox') {
-        var options = [];
-
-        if (c.valueEnum) {
-          for (var key in c.valueEnum) {
-            var text = c.valueEnum[key].text;
-            options.push({
-              label: text,
-              value: key
-            });
-          }
-        }
-
-        if (c.options) {
-          options = c.options;
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
-
-
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
-        });
-        var _labelCol19 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol19.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol19
-        }), /*#__PURE__*/React__default['default'].createElement(Index$4.Group, _objectSpread2({
-          disabled: disabled,
-          options: options
-        }, c.fieldProps))));
-      } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
-        var _options3 = [];
-
-        if (c.options) {
-          _options3 = c.options;
-        }
-
-        if (c.valueEnum) {
-          for (var _key3 in c.valueEnum) {
-            var _text3 = c.valueEnum[_key3].text;
-
-            _options3.push({
-              label: _text3,
-              value: _key3
-            });
-          }
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
-
-
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
-        });
-        var _labelCol20 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol20.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var radioButtonProps = {};
-
-        if (c.valueType === 'radioButton') {
-          radioButtonProps = {
-            optionType: 'button',
-            buttonStyle: 'solid'
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol20
-        }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2(_objectSpread2({
-          disabled: disabled
-        }, radioButtonProps), {}, {
-          options: _options3
-        }, c.fieldProps))));
-      } else if (c.valueType === 'switch') {
-        var _options4 = [];
-
-        if (c.valueEnum) {
-          for (var _key4 in c.valueEnum) {
-            var _text4 = c.valueEnum[_key4].text;
-
-            _options4.push({
-              label: _text4,
-              value: _key4
-            });
-          }
-        }
-
-        var _labelCol21 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol21.style = {
-            width: search.labelWidth
-          };
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
-
-
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
-        });
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, colProps), {}, {
-          key: c.dataIndex
-        }), /*#__PURE__*/React__default['default'].createElement(_Form__default['default'].Item, _objectSpread2(_objectSpread2({
-          initialValue: c.initialValue,
-          valuePropName: "checked"
-        }, c.formItemProps), {}, {
-          name: c.dataIndex,
-          label: c.title,
-          labelCol: _labelCol21
-        }), /*#__PURE__*/React__default['default'].createElement(WSwitch, _objectSpread2({
-          disabled: disabled
-        }, c.fieldProps))));
-      } else if (c.valueType === 'digit') {
-        var _labelCol22 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol22.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol22
-        }), /*#__PURE__*/React__default['default'].createElement(NumericInput, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165\u53C2\u6570(double/int)"
-        }, c.fieldProps))));
-      } else if (c.renderFormItem) {
-        var _labelCol23 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol23.style = {
-            width: search.labelWidth
-          };
-        }
-
-        var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
-          disabled: disabled,
-          formItemProps: c.formItemProps,
-          fieldProps: c.fieldProps,
-          columnsFields: columnsFields // columnsFieldsRef,
-
-        }), form);
-        return baseitem ? /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol23
-        }), baseitem)) : null;
-      } else if (c.valueType === 'textarea') {
-        var _labelCol24 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol24.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol24
-        }), /*#__PURE__*/React__default['default'].createElement(Index.TextArea, _objectSpread2({
-          rows: 4,
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
-      } else if (c.valueType === 'inputNumber') {
-        var _labelCol25 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol25.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol25
-        }), /*#__PURE__*/React__default['default'].createElement(WInputNumber, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
+      if (c.type == 'group') {
+        return c.groupNode(c.children.map(function (c) {
+          return renderItemForm(c);
+        }));
       } else {
-        var _labelCol26 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol26.style = {
-            width: search.labelWidth
-          };
-        }
-
-        return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
-          className: "pl12 pr12"
-        }, 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: _labelCol26
-        }), /*#__PURE__*/React__default['default'].createElement(Index, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
+        return renderItemForm(c);
       }
     });
   }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
@@ -8342,7 +7851,7 @@ var WForm = function WForm(props, ref) {
   };
 
   var setFieldsValue = function setFieldsValue(record) {
-    var _form$setFieldsValue4;
+    var _form$setFieldsValue2;
 
     var setFieldsValues = _objectSpread2({}, record);
 
@@ -8358,7 +7867,7 @@ var WForm = function WForm(props, ref) {
         return false;
       }
     });
-    form === null || form === void 0 ? void 0 : (_form$setFieldsValue4 = form.setFieldsValue) === null || _form$setFieldsValue4 === void 0 ? void 0 : _form$setFieldsValue4.call(form, setFieldsValues);
+    form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, setFieldsValues);
   };
 
   React.useImperativeHandle(ref, function () {
@@ -10980,6 +10489,11 @@ var ModalForm = function ModalForm(props, ref) {
       confirmLoading = _useState2[0],
       setConfirmLoading = _useState2[1];
 
+  var _useState3 = React.useState(null),
+      _useState4 = _slicedToArray(_useState3, 2),
+      formIntance = _useState4[0],
+      setFormIntance = _useState4[1];
+
   var handleSubmit = function handleSubmit() {
     var _formRef$current;
 
@@ -11075,13 +10589,17 @@ var ModalForm = function ModalForm(props, ref) {
     };
   }();
 
+  var setForm = function setForm(form) {
+    setFormIntance(form);
+  };
+
   React.useEffect(function () {
-    if (visible) {
+    if (formIntance) {
       resetFields();
       setFieldsValue(record);
       modalFormOpend && modalFormOpend(record);
     }
-  }, [visible, record]);
+  }, [visible, record, formIntance, extraColumns, columns]);
   return /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], _objectSpread2(_objectSpread2({
     title: title,
     visible: visible
@@ -11095,6 +10613,7 @@ var ModalForm = function ModalForm(props, ref) {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    setForm: setForm,
     onFormChange: onFormChange,
     disabledHideInSearch: true,
     search: search,
@@ -11536,7 +11055,21 @@ var TabelCard = function TabelCard(props, ref) {
     search: modalFormSearch
   }, modalConfig), {}, {
     onFormChange: onFormChange,
-    extraColumns: extraColumns || [],
+    extraColumns: (extraColumns || []).filter(function (item) {
+      if (item.hiddenInModalForm) {
+        return false;
+      }
+
+      if (item.onlyShowInView) {
+        if (modalFormConfig.type === '查看') {
+          return true;
+        } else {
+          return false;
+        }
+      }
+
+      return true;
+    }),
     columns: (modalFormColumn || []).filter(function (item) {
       if (item.hiddenInModalForm) {
         return false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.5.16",
+  "version": "0.5.19",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",
@@ -85,4 +85,4 @@
     "react": "^16.12.0",
     "yorkie": "^2.0.0"
   }
-}
+}