fan-standard-comp 4.0.4 → 4.0.6

package/es/FormComp/RenderItemGroup/index.d.ts

@@ -35,6 +35,7 @@ interface ItemGroupProps {
     doUpdateFormFields?: () => void;
     className?: string;
     columnCount?: 1 | 2 | 3 | 4;
+    parentNode?: string;
     [k: string]: any;
 }
 declare const RenderItemGroup: (props: ItemGroupProps) => any;

package/es/FormComp/RenderItemGroup/index.js

@@ -37,64 +37,13 @@ var RenderItemGroup = function RenderItemGroup(props) {
     _props$layout = props.layout,
     layout = _props$layout === void 0 ? "horizontal" : _props$layout,
     gutter = props.gutter,
-    columnCount = props.columnCount;
+    columnCount = props.columnCount,
+    parentNode = props.parentNode;
   var componentName = 'spec-item-group';
   var _useStyle = useStyle(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
     wrapSSR = _useStyle2[0],
     hashId = _useStyle2[1];
-  // 栅格数量
-  // const columnNumber: number = useMemo(() => {
-  //   // @ts-ignore
-  //   return general.modalSize[size].columnNumber || 1
-  // }, [size, columnCount])
-  /*
-    // 当前需要显示的前几条表单项
-    // const [showItemNumber, setShowItemNumber] = useState(0)
-    // 计算当前栅格数量，及对应的size
-    const columnNumberAndSize = useMemo(() => {
-      // 当前栅栅数量
-      let itemGroupSize = size || (layout === 'horizontal' ? 'xxlg' : 'md')
-      if (columnCount) {
-        // 有配置栅格数 1,2,3,4
-        switch (columnCount) {
-          case 1:
-            itemGroupSize = 'sm'
-            break;
-          case 2:
-            itemGroupSize = 'md'
-            break;
-          case 3:
-            itemGroupSize = 'lg'
-            break;
-          case 4:
-            itemGroupSize = 'xxlg'
-            break;
-        }
-      }
-      return {
-        // @ts-ignore
-        columnNumber: general.modalSize[itemGroupSize].columnNumber,
-        itemGroupSize, columnCount
-      }
-    }, [size, columnCount, layout])
-    useEffect(() => {
-      setShowItemNumber(columnNumberAndSize.columnNumber - 1)
-    }, [columnNumberAndSize, size])
-  
-    // 判断是否隐藏结构, display:'none'
-    const setItemHiddenNode = (item: any, index: number, collapsed: boolean, showItemNumber: number) => {
-      // updateFormFields()  // TODO 放这执行会报错,但是不加的话，切换栅格变化会导致收缩状态下隐藏的表单项未更新
-      if (item.filedName === 'filterAction') {
-        return {
-          isHidden: false
-        }
-      }
-      return {
-        // 栅格列为1时，显示1个表单项
-        isHidden: collapsed ? false : (showItemNumber === 0 ? index !== 0 : !(index < showItemNumber))
-      }
-    }*/
   var setColSpan = function setColSpan(display, modalSize, columnCount) {
     if (_typeof(display) === 'object' || display === 'block') {
       // 栅格数量为：1
@@ -139,6 +88,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
   // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
   // 还需要判断 layout为vertical还是horizontal
   var calculateFormLayout = useCallback(function (itemData) {
+    var _general$modalSize$md, _general$modalSize$md2, _general$modalSize$lg, _general$modalSize$lg2;
     var formLayout = {};
     // 当布局为 'inline' 时，不配置栅格结构
     if (layout === 'inline') {
@@ -153,11 +103,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
         }
       };
     } else {
-      var _general$modalSize;
+      var _general$modalSize, _general$modalSize2;
       // @ts-ignore
-      var sizeFormLayout = (_general$modalSize = general.modalSize) === null || _general$modalSize === void 0 ? void 0 : _general$modalSize[size].formLayout;
+      var sizeFormLayout = (_general$modalSize = general.modalSize) === null || _general$modalSize === void 0 || (_general$modalSize = _general$modalSize[size]) === null || _general$modalSize === void 0 ? void 0 : _general$modalSize[parentNode === 'standardFilter' && (size === 'md' || size === 'lg' || size === 'xlg') ? 'filterFormLayout' : 'formLayout'];
       // @ts-ignore
-      var sizeFormBlockLayout = general.modalSize[size].formBlockLayout;
+      var sizeFormBlockLayout = (_general$modalSize2 = general.modalSize) === null || _general$modalSize2 === void 0 || (_general$modalSize2 = _general$modalSize2[size]) === null || _general$modalSize2 === void 0 ? void 0 : _general$modalSize2[parentNode === 'standardFilter' && (size === 'md' || size === 'lg' || size === 'xlg') ? 'filterFormBlockLayout' : 'formBlockLayout'];
       // 优先级 displayLayout.side > displayLayout > general
       // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
       // 还需要判断 layout为vertical还是horizontal
@@ -169,12 +119,12 @@ var RenderItemGroup = function RenderItemGroup(props) {
             sizeFormBlockLayout = general.modalSize.sm.formBlockLayout;
             break;
           case 2:
-            sizeFormLayout = general.modalSize.md.formLayout;
-            sizeFormBlockLayout = general.modalSize.md.formBlockLayout;
+            sizeFormLayout = (_general$modalSize$md = general.modalSize.md) === null || _general$modalSize$md === void 0 ? void 0 : _general$modalSize$md[parentNode === 'standardFilter' ? 'filterFormLayout' : 'formLayout'];
+            sizeFormBlockLayout = (_general$modalSize$md2 = general.modalSize.md) === null || _general$modalSize$md2 === void 0 ? void 0 : _general$modalSize$md2[parentNode === 'standardFilter' ? 'filterFormBlockLayout' : 'formBlockLayout'];
             break;
           case 3:
-            sizeFormLayout = general.modalSize.lg.formLayout;
-            sizeFormBlockLayout = general.modalSize.lg.formBlockLayout;
+            sizeFormLayout = (_general$modalSize$lg = general.modalSize.lg) === null || _general$modalSize$lg === void 0 ? void 0 : _general$modalSize$lg[parentNode === 'standardFilter' ? 'filterFormLayout' : 'formLayout'];
+            sizeFormBlockLayout = (_general$modalSize$lg2 = general.modalSize.lg) === null || _general$modalSize$lg2 === void 0 ? void 0 : _general$modalSize$lg2[parentNode === 'standardFilter' ? 'filterFormBlockLayout' : 'formBlockLayout'];
             break;
           case 4:
             sizeFormLayout = general.modalSize.xxlg.formLayout;
@@ -198,7 +148,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
       }
     }
     return formLayout;
-  }, [size, layout, columnCount]);
+  }, [size, layout, columnCount, parentNode]);
 
   // 渲染表单控件
   var renderFormField = function renderFormField(field) {
@@ -251,14 +201,6 @@ var RenderItemGroup = function RenderItemGroup(props) {
       customRender = item.customRender,
       filedName = item.filedName; // 当前可传参的配置值
     if (layout === "horizontal" || layout === "vertical") {
-      // if (collapseable && layout === "horizontal") {
-      //   const { isHidden } = setItemHiddenNode(item, index, collapsed, showItemNumber)
-      //   item.isHidden = isHidden
-      //   item.style = { ...(item.style || {}), display: item.isHidden ? 'none' : 'block' }
-      //   // if (index < showItemNumber) {
-      //   //   console.log('===>>>>当前显示【常规表单项】=>>', item.filedName, '序号', index, '可显示数量', showItemNumber, collapsed)
-      //   // }
-      // }
       return /*#__PURE__*/React.createElement(Col, {
         key: index,
         span: item.colSpan || setColSpan(item.display, size, columnCount),
@@ -344,7 +286,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
   // 布局配置为horizontal或vertical
   : /*#__PURE__*/React.createElement(Row, {
     className: itemGroupCls,
-    gutter: layout === 'vertical' ? gutter || [20, 20] : gutter
+    gutter: layout === 'vertical' ? gutter || [16, 16] : gutter
   }, renderItemGroupNode())
   /* itemGroup = ReactNode则直接返回 */ : /*#__PURE__*/React.createElement("div", {
     className: itemGroupCls

package/es/FormComp/RenderItemGroup/style/index.js

@@ -28,7 +28,7 @@ var ItemGroupStyleFunc = function ItemGroupStyleFunc(prefix) {
         }
       },
       '.modalPanelTitle, .modal-grid-title': {
-        margin: "0 0 ".concat(token.marginMD, "px 0"),
+        margin: "0 0 ".concat(token.margin, "px 0"),
         // paddingBottom: token.paddingXS,
         borderBottom: "1px solid ".concat(token.colorBorder),
         fontSize: token.fontSize

package/es/StandardFilter/index.js

@@ -74,10 +74,14 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     isHideCount = _useState4[0],
     setIsHideCount = _useState4[1]; // 表单隐藏项数量值
-  var _useState5 = useState(false),
+  var _useState5 = useState(0),
     _useState6 = _slicedToArray(_useState5, 2),
-    collapsed = _useState6[0],
-    setCollapsed = _useState6[1];
+    additionalCount = _useState6[0],
+    setAdditionalCount = _useState6[1]; // 根据表单项配置dipslay或者colSpan，额外需要计算在内的栅格占用
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    collapsed = _useState8[0],
+    setCollapsed = _useState8[1];
   var componentName = 'spec-standard-filter';
   var _useStyle = useStyle(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -117,10 +121,40 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // 计算表单隐藏项(开启展开与收缩）
   var calculateHideCount = function calculateHideCount(filterFormRef, groups) {
     var _filterFormRef$curren;
+    var itemGroupSize = columnNumberAndSize.itemGroupSize,
+      columnNumber = columnNumberAndSize.columnNumber;
     var formValues = filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren = filterFormRef.current) === null || _filterFormRef$curren === void 0 ? void 0 : _filterFormRef$curren.getFieldValue();
-    setIsHideCount((groups || []).filter(function (item) {
+    // Rule1: 不包括isHidden跟isHide的数据
+    // Rule2：剩余的表单项中，查找是否有自定义配置 display='block' 或者colSpan的表单项
+    var notShowGroupItem = (groups || []).filter(function (item) {
       return (item === null || item === void 0 ? void 0 : item.isHidden) || (item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false);
-    }).length);
+    });
+    // 可显示的表单值
+    var showGroupItem = (groups || []).filter(function (item) {
+      return !(item !== null && item !== void 0 && item.isHidden || (item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false));
+    });
+    var showGroupWithSetting = showGroupItem.filter(function (item) {
+      return item.hasOwnProperty('colSpan');
+    });
+    var resultCount = notShowGroupItem.length;
+    var aCount = 0; // 需要再次额外新增的数量
+    if (showGroupWithSetting.length > 0) {
+      showGroupWithSetting.forEach(function (gItem) {
+        // colSpan 优先级更高
+        if (gItem.hasOwnProperty('colSpan')) {
+          // console.log('有配置了colSpan, 占用栅格数量', gItem.colSpan / (24 / columnNumber), '需要再额外减1', gItem.colSpan / (24 / columnNumber) - 1, Math.ceil(gItem.colSpan / (24 / columnNumber) - 1))
+          aCount += Math.ceil(gItem.colSpan / (24 / columnNumber) - 1); // 额外占用了
+          return;
+        }
+        // if (gItem.hasOwnProperty('display') && gItem.display === 'block' ) {
+        //   // TODO.计算会有问题
+        //   console.log('有配置了display=block', Math.ceil(24 / (24 / columnNumber) - 1))
+        //   aCount += columnNumber -1 // Math.ceil(24 / (24 / columnNumber) - 1)  // 额外占用了
+        // }
+      });
+    }
+    setAdditionalCount(aCount);
+    setIsHideCount(resultCount - aCount);
   };
 
   //  配置筛选按钮（确认与取消）
@@ -145,10 +179,13 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
       filedName: 'filterAction',
       display: {
         wrapperCol: {
-          // 占用的格子数按对应size配置的formItem(md下额外再新增1, 忘了为什么额外加了，先去除.20240619）
-          span: general.modalSize[itemGroupSize].formLayout.labelCol.span + general.modalSize[itemGroupSize].formLayout.wrapperCol.span // + (itemGroupSize === 'md' ? 1 : 0)
+          // 占用的格子数按对应size配置的formItem,如果是md则单独使用筛选的栅格配置
+          span: itemGroupSize === 'md' || itemGroupSize === 'lg' || itemGroupSize === 'xlg' ? general.modalSize[itemGroupSize].filterFormLayout.labelCol.span + general.modalSize[itemGroupSize].filterFormLayout.wrapperCol.span : general.modalSize[itemGroupSize].formLayout.labelCol.span + general.modalSize[itemGroupSize].formLayout.wrapperCol.span
         }
       },
+      style: {
+        // textAlign: 'right'
+      },
       protoFormItem: {
         style: {
           textAlign: filterFormLayout === 'horizontal' ? 'right' : 'left'
@@ -159,17 +196,17 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
       customRender: function customRender() {
         return /*#__PURE__*/React.createElement(FormItem, {
           noStyle: true
-        }, onFilterSearch && /*#__PURE__*/React.createElement(Button, _extends({
+        }, onFilterReset && /*#__PURE__*/React.createElement(Button, _extends({
           type: "primary",
-          htmlType: "submit"
-        }, confirmButtonProps), confirmText || '查询'), onFilterReset && /*#__PURE__*/React.createElement(Button, _extends({
+          onClick: handleReset,
+          ghost: true
+        }, cancelButtonProps), cancelText || '重置'), onFilterSearch && /*#__PURE__*/React.createElement(Button, _extends({
           type: "primary",
           style: {
             marginLeft: 8
           },
-          onClick: handleReset,
-          ghost: true
-        }, cancelButtonProps), cancelText || '重置'), filterFormLayout === 'horizontal' && collapseable && reFormItemGroup.length > columnNumberAndSize.columnNumber - 1 ? /*#__PURE__*/React.createElement(Button, {
+          htmlType: "submit"
+        }, confirmButtonProps), confirmText || '查询'), filterFormLayout === 'horizontal' && collapseable && reFormItemGroup.length > columnNumberAndSize.columnNumber - 1 ? /*#__PURE__*/React.createElement(Button, {
           type: 'link',
           onClick: function onClick() {
             return setCollapsed(!collapsed);
@@ -334,7 +371,8 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
         layout: filterFormLayout,
         form: filterFormRef,
         collapseable: collapseable,
-        collapsed: collapsed
+        collapsed: collapsed,
+        parentNode: 'standardFilter'
         // displayLayout={{labelCol: { span: 8 }, wrapperCol: { span: 16 },}}
         ,
         doUpdateFormFields: function doUpdateFormFields() {

package/es/StandardForm/StepForm.js

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -29,19 +30,20 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     formItemGroup = _providerConfig$props2 === void 0 ? [] : _providerConfig$props2,
     _providerConfig$props3 = _providerConfig$props.grid,
     grid = _providerConfig$props3 === void 0 ? 'md' : _providerConfig$props3,
-    layout = _providerConfig$props.layout,
+    _providerConfig$props4 = _providerConfig$props.layout,
+    layout = _providerConfig$props4 === void 0 ? 'horizontal' : _providerConfig$props4,
     onSubmit = _providerConfig$props.onSubmit,
-    _providerConfig$props4 = _providerConfig$props.actionAlign,
-    actionAlign = _providerConfig$props4 === void 0 ? 'center' : _providerConfig$props4,
+    _providerConfig$props5 = _providerConfig$props.actionAlign,
+    actionAlign = _providerConfig$props5 === void 0 ? 'center' : _providerConfig$props5,
     fieldStatus = _providerConfig$props.fieldStatus,
-    _providerConfig$props5 = _providerConfig$props.fieldSize,
-    fieldSize = _providerConfig$props5 === void 0 ? "middle" : _providerConfig$props5,
+    _providerConfig$props6 = _providerConfig$props.fieldSize,
+    fieldSize = _providerConfig$props6 === void 0 ? "middle" : _providerConfig$props6,
     initialValues = _providerConfig$props.initialValues,
     actionHide = _providerConfig$props.actionHide,
-    _providerConfig$props6 = _providerConfig$props.stepsConfig,
-    stepsConfig = _providerConfig$props6 === void 0 ? {
+    _providerConfig$props7 = _providerConfig$props.stepsConfig,
+    stepsConfig = _providerConfig$props7 === void 0 ? {
       current: 0
-    } : _providerConfig$props6,
+    } : _providerConfig$props7,
     stepClick = _providerConfig$props.stepClick,
     displayLayout = _providerConfig$props.displayLayout;
   var _useState = useState(),
@@ -214,7 +216,12 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onFinishFailed: function onFinishFailed() {
       // setFieldFailed(true)
     }
-  }, /*#__PURE__*/React.createElement(Steps, stepsConfig, formItemGroup.filter(function (fItem) {
+  }, /*#__PURE__*/React.createElement(Steps, _extends({
+    style: {
+      width: '80%',
+      margin: '0 auto'
+    }
+  }, stepsConfig), formItemGroup.filter(function (fItem) {
     return !fItem.hideStep;
   }).map(function (item, index) {
     return /*#__PURE__*/React.createElement(Step, {

package/es/StandardForm/style/index.js

@@ -40,10 +40,10 @@ var StandardFormStyleFunc = function StandardFormStyleFunc(prefix) {
       }
     }), '.spec-standard-form', {
       '.stepForm-content': {
-        margin: "".concat(token.marginMD, "px 0px"),
+        margin: "".concat(token.margin, "px 0px"),
         '&.stepForm-content-vertical': {
           '.standardForm-actions': {
-            marginTop: "".concat(token.marginMD, "px")
+            marginTop: "".concat(token.margin, "px")
           }
         }
       }

package/es/StandardModal/style/index.js

@@ -15,7 +15,12 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
   return createStyleHook(prefix, function (token) {
     var prefixCls = ".".concat(prefix);
     return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
-      '.ant-modal-body ': _objectSpread({}, scrollBar(token)),
+      '.ant-modal-body ': _objectSpread(_objectSpread({}, scrollBar(token)), {}, {
+        padding: "".concat(token.paddingXS, "px 0")
+      }),
+      '&.ant-modal .ant-modal-footer  .ant-btn + .ant-btn': {
+        marginInlineStart: token.marginXS
+      },
       '.modalForm': {
         '&.ant-form-horizontal .ant-form-item-label': {
           '> label': {
@@ -36,7 +41,7 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
         borderLeft: " 4px solid  ".concat(token.colorPrimary)
       }
     }), '.modalPanelTitle, .modal-grid-title', {
-      margin: "0 0 ".concat(token.marginMD, "px 0"),
+      margin: "0 0 ".concat(token.margin, "px 0"),
       paddingBottom: token.paddingXS,
       borderBottom: "1px solid ".concat(token.colorBorder)
     })];

package/es/StandardTable/index.js

@@ -160,10 +160,10 @@ var StandardTable = function StandardTable(props) {
     className: classNames(componentName, 'standard-table', className, hashId),
     bordered: false,
     title: title,
-    extra: /*#__PURE__*/React.createElement(RenderExtraButtonGroup, {
+    extra: batchButtonGroup || buttonGroup ? /*#__PURE__*/React.createElement(RenderExtraButtonGroup, {
       buttonGroup: buttonGroup,
       batchButtonGroup: batchButtonGroup
-    })
+    }) : null
   }, /*#__PURE__*/React.createElement(Table, _extends({
     rowKey: rowKey || 'id',
     rowSelection: rowSelection ? _objectSpread({

package/es/StandardTable/style/index.js

@@ -25,8 +25,8 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
     return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
       '.spec-standard-table': {},
       '.spec-pagination': {
-        padding: "".concat(token.paddingSM, "px 0 ").concat(token.paddingXs, "px 0"),
-        background: token.colorBgBase
+        // padding: `${token.paddingSM}px 0 ${token.paddingXS}px 0`,
+        // background: token.colorBgBase,
       },
       '.ant-table-body': _objectSpread({}, scrollBar(token)),
       '.spec-table-dropdown': {

package/es/StandardTable/style/index.less

@@ -7,19 +7,7 @@
 
   .spec-pagination {
     width: 100%;
-    margin-top: 0;
-    margin-bottom: 0;
-    //padding: @padding-sm 0 @padding-xs 0;
     text-align: right;
-    //background: @background-color-base;
-    border-radius: 0;
-
-    .ant-pagination-total-text {
-      float: left;
-      flex:1;
-      text-align: left;
-    }
-
     .ant-pagination-options-size-changer.ant-select {
       margin-right: 0
     }
@@ -54,11 +42,6 @@
   .ant-table-fixed-left .ant-table-thead > tr > th:first-child {
     padding: 0;
   }
-
-  .ant-table-body {
-    //.spec-scrollbar-base()
-  }
-
   .spec-table-dropdown {
     li a[disabled] {
       //color: @disabled-bg;
@@ -72,12 +55,6 @@
   //border-color: @error-color
 }
 
-.themeTech {
-  .standard-table .spec-pagination {
-    background: transparent;
-  }
-}
-
 .spec-pagination {
   .ant-pagination-total-text {
     float: left;
@@ -169,7 +146,6 @@
         }
       }
     }
-
     //.ant-table-tbody > tr.ant-table-expanded-row,
     //.ant-table-tbody > tr.ant-table-expanded-row:hover {
     //  background: #f9f9fb;

package/es/data/general.config.d.ts

@@ -105,6 +105,22 @@ declare const _default: {
                     span: number;
                 };
             };
+            filterFormLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
+            filterFormBlockLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
         };
         md: {
             columnNumber: number;
@@ -125,6 +141,22 @@ declare const _default: {
                     span: number;
                 };
             };
+            filterFormLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
+            filterFormBlockLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
         };
         lg: {
             columnNumber: number;
@@ -145,6 +177,22 @@ declare const _default: {
                     span: number;
                 };
             };
+            filterFormLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
+            filterFormBlockLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
         };
         xlg: {
             columnNumber: number;
@@ -165,6 +213,22 @@ declare const _default: {
                     span: number;
                 };
             };
+            filterFormLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
+            filterFormBlockLayout: {
+                labelCol: {
+                    span: number;
+                };
+                wrapperCol: {
+                    span: number;
+                };
+            };
         };
         xxlg: {
             columnNumber: number;

package/es/data/general.config.js

@@ -98,18 +98,34 @@ export default {
       width: 560,
       formLayout: {
         labelCol: {
-          span: 6
+          span: 7
         },
         wrapperCol: {
-          span: 14
+          span: 15
         }
       },
       formBlockLayout: {
         labelCol: {
-          span: 6
+          span: 7
         },
         wrapperCol: {
-          span: 14
+          span: 15
+        }
+      },
+      filterFormLayout: {
+        labelCol: {
+          span: 7
+        },
+        wrapperCol: {
+          span: 15
+        }
+      },
+      filterFormBlockLayout: {
+        labelCol: {
+          span: 7
+        },
+        wrapperCol: {
+          span: 15
         }
       }
     },
@@ -132,6 +148,22 @@ export default {
         wrapperCol: {
           span: 19
         }
+      },
+      filterFormLayout: {
+        labelCol: {
+          span: 8
+        },
+        wrapperCol: {
+          span: 16
+        }
+      },
+      filterFormBlockLayout: {
+        labelCol: {
+          span: 4
+        },
+        wrapperCol: {
+          span: 20
+        }
       }
     },
     // 宽度大，1000px下
@@ -154,6 +186,22 @@ export default {
         wrapperCol: {
           span: 21
         }
+      },
+      filterFormLayout: {
+        labelCol: {
+          span: 8
+        },
+        wrapperCol: {
+          span: 16
+        }
+      },
+      filterFormBlockLayout: {
+        labelCol: {
+          span: 4
+        },
+        wrapperCol: {
+          span: 20
+        }
       }
     },
     // 超级宽度大，1200px下
@@ -176,6 +224,22 @@ export default {
         wrapperCol: {
           span: 21
         }
+      },
+      filterFormLayout: {
+        labelCol: {
+          span: 8
+        },
+        wrapperCol: {
+          span: 16
+        }
+      },
+      filterFormBlockLayout: {
+        labelCol: {
+          span: 4
+        },
+        wrapperCol: {
+          span: 20
+        }
       }
     },
     xxlg: {

package/es/theme/index.js

@@ -5,7 +5,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { TinyColor } from '@ctrl/tinycolor';
 export var scrollBar = function scrollBar(token) {
   return _defineProperty(_defineProperty(_defineProperty({}, '&::-webkit-scrollbar-track-piece', {
-    background: new TinyColor('#c1c1c1').setAlpha(0.1).toRgbString() // new TinyColor(token.colorPrimary).setAlpha(0.1)
+    background: new TinyColor('#c1c1c1').setAlpha(0.02).toRgbString() // new TinyColor(token.colorPrimary).setAlpha(0.1)
   }), '&::-webkit-scrollbar', {
     width: '6px',
     height: '6px'

package/lib/FormComp/RenderItemGroup/index.d.ts

@@ -35,6 +35,7 @@ interface ItemGroupProps {
     doUpdateFormFields?: () => void;
     className?: string;
     columnCount?: 1 | 2 | 3 | 4;
+    parentNode?: string;
     [k: string]: any;
 }
 declare const RenderItemGroup: (props: ItemGroupProps) => any;