wargerm 0.5.13 → 0.5.16

package/dist/index.js

@@ -1049,7 +1049,8 @@ function FrameBox(_ref) {
 }
 
 var _excluded$3 = ["request", "valueEnum", "onLoad", "children", "params"],
-    _excluded2 = ["children"];
+    _excluded2 = ["value", "label"],
+    _excluded3 = ["children"];
 
 var WSelect = function WSelect(props) {
   var request = props.request,
@@ -1104,11 +1105,15 @@ var WSelect = function WSelect(props) {
             case 6:
               setResList(res);
               onLoad && onLoad(res);
-              node = res === null || res === void 0 ? void 0 : res.map(function (item) {
-                return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
-                  key: item.value,
-                  value: item.value
-                }, item.label) || /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+              node = res === null || res === void 0 ? void 0 : res.map(function (_ref2) {
+                var value = _ref2.value,
+                    label = _ref2.label,
+                    extraProps = _objectWithoutProperties(_ref2, _excluded2);
+
+                return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, _objectSpread2({
+                  key: value,
+                  value: value
+                }, extraProps), label) || /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
               });
               setChildrenNode(node);
 
@@ -1164,7 +1169,7 @@ WSelect.defaultProps = {};
 
 var Option = function Option(props) {
   var children = props.children,
-      extraProps = _objectWithoutProperties(props, _excluded2);
+      extraProps = _objectWithoutProperties(props, _excluded3);
 
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, _objectSpread2({}, extraProps), children);
 };
@@ -7193,505 +7198,516 @@ var WForm = function WForm(props, ref) {
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-  var filterForm = React.useMemo(function () {
-    return filterFormColumns.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 _extraProps = {};
-
-        if (c.request) {
-          _extraProps.request = c.request;
-        } else if (c.valueEnum) {
-          _extraProps.valueEnum = c.valueEnum;
-        }
+  var renderItemForm = function renderItemForm(c) {
+    if (disabledRuler && c.formItemProps) {
+      delete c.formItemProps.rules;
+    }
 
-        var labelCol = {};
+    var colProps = {};
 
-        if (search && search.labelWidth) {
-          labelCol.style = {
-            width: search.labelWidth
-          };
-        }
+    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
+      };
+    }
 
-        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.valueType == 'select') {
+      var _extraProps = {};
 
-            if (c.useFirstIteminitialValue) {
-              var _form$setFieldsValue, _opt$0$value, _opt$;
+      if (c.request) {
+        _extraProps.request = c.request;
+      } else if (c.valueEnum) {
+        _extraProps.valueEnum = c.valueEnum;
+      }
 
-              form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value = opt === null || opt === void 0 ? void 0 : (_opt$ = opt[0]) === null || _opt$ === void 0 ? void 0 : _opt$.value) !== null && _opt$0$value !== void 0 ? _opt$0$value : ''));
-            }
-          }
-        }, c.fieldProps), _extraProps))));
-      } else if (c.valueType == 'cascader') {
-        var _extraProps2 = {};
+      var labelCol = {};
 
-        if (c.request) {
-          _extraProps2.request = c.request;
-        }
+      if (search && search.labelWidth) {
+        labelCol.style = {
+          width: search.labelWidth
+        };
+      }
 
-        var _labelCol = {};
+      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 (search && search.labelWidth) {
-          _labelCol.style = {
-            width: search.labelWidth
-          };
-        }
+          if (c.useFirstIteminitialValue) {
+            var _form$setFieldsValue, _opt$0$value, _opt$;
 
-        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(WCascader, _objectSpread2(_objectSpread2({
-          placeholder: "\u8BF7\u9009\u62E9",
-          disabled: disabled,
-          onLoad: function onLoad(opt) {
-            setColumnsFields(function (preColumnsFields) {
-              return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
-            });
+            form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value = opt === null || opt === void 0 ? void 0 : (_opt$ = opt[0]) === null || _opt$ === void 0 ? void 0 : _opt$.value) !== null && _opt$0$value !== void 0 ? _opt$0$value : ''));
           }
-        }, c.fieldProps), _extraProps2))));
-      } else if (c.valueType == 'upload') {
-        var _labelCol2 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol2.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: _labelCol2
-        }), /*#__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 == 'treeSelect') {
-        var _extraProps3 = {};
-
-        if (c.request) {
-          _extraProps3.request = c.request;
-        }
-
-        var _labelCol3 = {};
-
-        if (search && search.labelWidth) {
-          _labelCol3.style = {
-            width: search.labelWidth
-          };
         }
+      }, c.fieldProps), _extraProps))));
+    } else if (c.valueType == 'cascader') {
+      var _extraProps2 = {};
 
-        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: _labelCol3
-        }), /*#__PURE__*/React__default['default'].createElement(Index$7, _objectSpread2(_objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u9009\u62E9",
-          onLoad: function onLoad(opt) {}
-        }, c.fieldProps), _extraProps3))));
-      } else if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear'].includes(c.valueType)) {
-        var _labelCol4 = {};
+      if (c.request) {
+        _extraProps2.request = c.request;
+      }
 
-        if (search && search.labelWidth) {
-          _labelCol4.style = {
-            width: search.labelWidth
-          };
-        }
+      var _labelCol = {};
 
-        var showTime = {};
-        var picker = {};
+      if (search && search.labelWidth) {
+        _labelCol.style = {
+          width: search.labelWidth
+        };
+      }
 
-        if (c.valueType == 'dateTime') {
-          showTime = {
-            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: _labelCol
+      }), /*#__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), _extraProps2))));
+    } else if (c.valueType == 'upload') {
+      var _labelCol2 = {};
 
-        if (c.valueType == 'dateMonth') {
-          picker = {
-            picker: 'month'
-          };
-        }
+      if (search && search.labelWidth) {
+        _labelCol2.style = {
+          width: search.labelWidth
+        };
+      }
 
-        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: _labelCol2
+      }), /*#__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 == 'treeSelect') {
+      var _extraProps3 = {};
 
-        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: _labelCol4
-        }), /*#__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 _labelCol5 = {};
+      if (c.request) {
+        _extraProps3.request = c.request;
+      }
 
-        if (search && search.labelWidth) {
-          _labelCol5.style = {
-            width: search.labelWidth
-          };
-        }
+      var _labelCol3 = {};
 
-        var _showTime = {};
+      if (search && search.labelWidth) {
+        _labelCol3.style = {
+          width: search.labelWidth
+        };
+      }
 
-        if (c.valueType == 'dateTimeRange') {
-          _showTime = {
-            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: _labelCol3
+      }), /*#__PURE__*/React__default['default'].createElement(Index$7, _objectSpread2(_objectSpread2({
+        disabled: disabled,
+        placeholder: "\u8BF7\u9009\u62E9",
+        onLoad: function onLoad(opt) {}
+      }, c.fieldProps), _extraProps3))));
+    } else if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear'].includes(c.valueType)) {
+      var _labelCol4 = {};
+
+      if (search && search.labelWidth) {
+        _labelCol4.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: _labelCol5
-        }), /*#__PURE__*/React__default['default'].createElement(RangePicker$2, _objectSpread2(_objectSpread2({
-          disabled: disabled
-        }, _showTime), c.fieldProps))));
-      } else if (c.valueType === 'checkbox') {
-        var options = [];
+      var showTime = {};
+      var picker = {};
 
-        if (c.valueEnum) {
-          for (var key in c.valueEnum) {
-            var text = c.valueEnum[key].text;
-            options.push({
-              label: text,
-              value: key
-            });
+      if (c.valueType == 'dateTime') {
+        showTime = {
+          showTime: {
+            format: 'HH:mm'
           }
-        }
+        };
+      }
 
-        if (c.options) {
-          options = c.options;
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
+      if (c.valueType == 'dateMonth') {
+        picker = {
+          picker: 'month'
+        };
+      }
 
+      if (c.valueType == 'dateYear') {
+        picker = {
+          picker: 'year'
+        };
+      }
 
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
-        });
-        var _labelCol6 = {};
+      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: _labelCol4
+      }), /*#__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 _labelCol5 = {};
+
+      if (search && search.labelWidth) {
+        _labelCol5.style = {
+          width: search.labelWidth
+        };
+      }
 
-        if (search && search.labelWidth) {
-          _labelCol6.style = {
-            width: search.labelWidth
-          };
-        }
+      var _showTime = {};
 
-        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: _labelCol6
-        }), /*#__PURE__*/React__default['default'].createElement(Index$4.Group, _objectSpread2({
-          disabled: disabled,
-          options: options
-        }, c.fieldProps))));
-      } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
-        var _options = [];
+      if (c.valueType == 'dateTimeRange') {
+        _showTime = {
+          showTime: {
+            format: 'HH:mm'
+          }
+        };
+      }
 
-        if (c.options) {
-          _options = c.options;
+      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: _labelCol5
+      }), /*#__PURE__*/React__default['default'].createElement(RangePicker$2, _objectSpread2(_objectSpread2({
+        disabled: disabled
+      }, _showTime), 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.valueEnum) {
-          for (var _key in c.valueEnum) {
-            var _text = c.valueEnum[_key].text;
+      if (c.options) {
+        options = c.options;
+      } // if (columnsFieldsRef.current) {
+      //   columnsFieldsRef.current[c.dataIndex] = options;
+      // }
 
-            _options.push({
-              label: _text,
-              value: _key
-            });
-          }
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
 
+      setColumnsFields(function (preColumnsFields) {
+        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
+      });
+      var _labelCol6 = {};
 
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
-        });
-        var _labelCol7 = {};
+      if (search && search.labelWidth) {
+        _labelCol6.style = {
+          width: search.labelWidth
+        };
+      }
 
-        if (search && search.labelWidth) {
-          _labelCol7.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: _labelCol6
+      }), /*#__PURE__*/React__default['default'].createElement(Index$4.Group, _objectSpread2({
+        disabled: disabled,
+        options: options
+      }, c.fieldProps))));
+    } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
+      var _options = [];
+
+      if (c.options) {
+        _options = c.options;
+      }
 
-        var radioButtonProps = {};
+      if (c.valueEnum) {
+        for (var _key in c.valueEnum) {
+          var _text = c.valueEnum[_key].text;
 
-        if (c.valueType === 'radioButton') {
-          radioButtonProps = {
-            optionType: 'button',
-            buttonStyle: 'solid'
-          };
+          _options.push({
+            label: _text,
+            value: _key
+          });
         }
+      } // if (columnsFieldsRef.current) {
+      //   columnsFieldsRef.current[c.dataIndex] = options;
+      // }
 
-        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: _labelCol7
-        }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2(_objectSpread2({
-          disabled: disabled
-        }, radioButtonProps), {}, {
-          options: _options
-        }, c.fieldProps))));
-      } else if (c.valueType === 'switch') {
-        var _options2 = [];
 
-        if (c.valueEnum) {
-          for (var _key2 in c.valueEnum) {
-            var _text2 = c.valueEnum[_key2].text;
-
-            _options2.push({
-              label: _text2,
-              value: _key2
-            });
-          }
-        }
-
-        var _labelCol8 = {};
+      setColumnsFields(function (preColumnsFields) {
+        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
+      });
+      var _labelCol7 = {};
 
-        if (search && search.labelWidth) {
-          _labelCol8.style = {
-            width: search.labelWidth
-          };
-        } // if (columnsFieldsRef.current) {
-        //   columnsFieldsRef.current[c.dataIndex] = options;
-        // }
+      if (search && search.labelWidth) {
+        _labelCol7.style = {
+          width: search.labelWidth
+        };
+      }
 
+      var radioButtonProps = {};
 
-        setColumnsFields(function (preColumnsFields) {
-          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
-        });
-        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: _labelCol8
-        }), /*#__PURE__*/React__default['default'].createElement(WSwitch, _objectSpread2({
-          disabled: disabled
-        }, c.fieldProps))));
-      } else if (c.valueType === 'digit') {
-        var _labelCol9 = {};
+      if (c.valueType === 'radioButton') {
+        radioButtonProps = {
+          optionType: 'button',
+          buttonStyle: 'solid'
+        };
+      }
 
-        if (search && search.labelWidth) {
-          _labelCol9.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: _labelCol7
+      }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2(_objectSpread2({
+        disabled: disabled
+      }, radioButtonProps), {}, {
+        options: _options
+      }, c.fieldProps))));
+    } else if (c.valueType === 'switch') {
+      var _options2 = [];
+
+      if (c.valueEnum) {
+        for (var _key2 in c.valueEnum) {
+          var _text2 = c.valueEnum[_key2].text;
+
+          _options2.push({
+            label: _text2,
+            value: _key2
+          });
         }
+      }
 
-        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: _labelCol9
-        }), /*#__PURE__*/React__default['default'].createElement(NumericInput, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165\u53C2\u6570(double/int)"
-        }, c.fieldProps))));
-      } else if (c.renderFormItem) {
-        var _labelCol10 = {};
+      var _labelCol8 = {};
 
-        if (search && search.labelWidth) {
-          _labelCol10.style = {
-            width: search.labelWidth
-          };
-        }
+      if (search && search.labelWidth) {
+        _labelCol8.style = {
+          width: search.labelWidth
+        };
+      } // if (columnsFieldsRef.current) {
+      //   columnsFieldsRef.current[c.dataIndex] = options;
+      // }
 
-        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: _labelCol10
-        }), baseitem)) : null;
-      } else if (c.valueType === 'textarea') {
-        var _labelCol11 = {};
+      setColumnsFields(function (preColumnsFields) {
+        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
+      });
+      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: _labelCol8
+      }), /*#__PURE__*/React__default['default'].createElement(WSwitch, _objectSpread2({
+        disabled: disabled
+      }, c.fieldProps))));
+    } else if (c.valueType === 'digit') {
+      var _labelCol9 = {};
+
+      if (search && search.labelWidth) {
+        _labelCol9.style = {
+          width: search.labelWidth
+        };
+      }
 
-        if (search && search.labelWidth) {
-          _labelCol11.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: _labelCol9
+      }), /*#__PURE__*/React__default['default'].createElement(NumericInput, _objectSpread2({
+        disabled: disabled,
+        placeholder: "\u8BF7\u8F93\u5165\u53C2\u6570(double/int)"
+      }, c.fieldProps))));
+    } else if (c.renderFormItem) {
+      var _labelCol10 = {};
+
+      if (search && search.labelWidth) {
+        _labelCol10.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: _labelCol11
-        }), /*#__PURE__*/React__default['default'].createElement(Index.TextArea, _objectSpread2({
-          rows: 4,
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
-      } else if (c.valueType === 'inputNumber') {
-        var _labelCol12 = {};
+      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: _labelCol10
+      }), baseitem)) : null;
+    } else if (c.valueType === 'textarea') {
+      var _labelCol11 = {};
+
+      if (search && search.labelWidth) {
+        _labelCol11.style = {
+          width: search.labelWidth
+        };
+      }
 
-        if (search && search.labelWidth) {
-          _labelCol12.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: _labelCol11
+      }), /*#__PURE__*/React__default['default'].createElement(Index.TextArea, _objectSpread2({
+        rows: 4,
+        disabled: disabled,
+        placeholder: "\u8BF7\u8F93\u5165"
+      }, c.fieldProps))));
+    } else if (c.valueType === 'inputNumber') {
+      var _labelCol12 = {};
+
+      if (search && search.labelWidth) {
+        _labelCol12.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: _labelCol12
-        }), /*#__PURE__*/React__default['default'].createElement(WInputNumber, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
-      } else {
-        var _labelCol13 = {};
+      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: _labelCol12
+      }), /*#__PURE__*/React__default['default'].createElement(WInputNumber, _objectSpread2({
+        disabled: disabled,
+        placeholder: "\u8BF7\u8F93\u5165"
+      }, c.fieldProps))));
+    } else {
+      var _labelCol13 = {};
 
-        if (search && search.labelWidth) {
-          _labelCol13.style = {
-            width: search.labelWidth
-          };
-        }
+      if (search && search.labelWidth) {
+        _labelCol13.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: _labelCol13
-        }), /*#__PURE__*/React__default['default'].createElement(Index, _objectSpread2({
-          disabled: disabled,
-          placeholder: "\u8BF7\u8F93\u5165"
-        }, c.fieldProps))));
+      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: _labelCol13
+      }), /*#__PURE__*/React__default['default'].createElement(Index, _objectSpread2({
+        disabled: disabled,
+        placeholder: "\u8BF7\u8F93\u5165"
+      }, c.fieldProps))));
+    }
+  };
+
+  var filterForm = React.useMemo(function () {
+    return filterFormColumns.map(function (c) {
+      if (c.type == 'group') {
+        return c.groupNode(c.children.map(function (c) {
+          return renderItemForm(c);
+        }));
+      } else {
+        return renderItemForm(c);
       }
     });
   }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
@@ -11456,14 +11472,14 @@ var TabelCard = function TabelCard(props, ref) {
     var _actionRef$current6;
 
     setFormSearch(values);
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload();
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload(true);
   };
 
   var onReset = function onReset() {
     var _actionRef$current7;
 
     setFormSearch({});
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload();
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload(true);
   };
 
   React.useEffect(function () {
@@ -11553,7 +11569,13 @@ var TabelCard = function TabelCard(props, ref) {
     }),
     onSubmit: onSubmit,
     onReset: onReset,
-    columns: formSearchColumn
+    columns: formSearchColumn.reduce(function (pre, column) {
+      if (column.type == 'group') {
+        return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
+      } else {
+        return [].concat(_toConsumableArray(pre), [column]);
+      }
+    }, [])
   }), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2(_objectSpread2({
     actionRef: actionRef,
     rowKey: "id",
@@ -11588,7 +11610,13 @@ var TabelCard = function TabelCard(props, ref) {
       return request;
     }()
   } : {}), {}, {
-    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [_objectSpread2({
+    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray((columns || []).reduce(function (pre, column) {
+      if (column.type == 'group') {
+        return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
+      } else {
+        return [].concat(_toConsumableArray(pre), [column]);
+      }
+    }, [])), [_objectSpread2({
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',