fan-standard-comp 4.0.2 → 4.0.4

package/es/utils/filterPermission.d.ts

@@ -1,5 +1,5 @@
 declare const btnClickFunc: (fn: any, params?: {}) => any;
 declare const btnIsDisabled: (isDisabled: any, params?: {}) => any;
 declare const btnIsHide: (isHide: any, params?: {}) => any;
-declare const removeNoPermission: (array: any, permissionCodes: any, codes: any, params: any) => any[];
+declare const removeNoPermission: (array: any, permissionCodes: any, codesList: any, params: any) => any[];
 export { removeNoPermission, btnIsHide, btnIsDisabled, btnClickFunc };

package/es/utils/filterPermission.js

@@ -6,6 +6,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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); }
 // @ts-nocheck
 import _ from "lodash";
+import { funcCode } from "../data/index";
 // 按钮方法
 var btnClickFunc = function btnClickFunc(fn) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -52,7 +53,9 @@ var btnIsHide = function btnIsHide(isHide) {
   return isHide;
 };
 // 重新组合数据(排除不包含在permissionCodes内及isHide数据
-var removeNoPermission = function removeNoPermission(array, permissionCodes, codes, params) {
+var removeNoPermission = function removeNoPermission(array, permissionCodes, codesList, params) {
+  // 合并本地的codes
+  var codes = _.unionBy(codesList || [], funcCode.btnFuncCodes, 'code');
   return Array.isArray(array) && array.filter(function (item) {
     if (item.children) {
       item.children = removeNoPermission(item.children, permissionCodes, codes, params);

package/lib/ButtonGroup/index.js

@@ -13,8 +13,6 @@ var _icons = require("@ant-design/icons");
 var _filterPermission = require("../utils/filterPermission");
 var _styles = _interopRequireDefault(require("./styles"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _lodash = _interopRequireDefault(require("lodash"));
-var _index = require("../data/index");
 var _ConfigContext = require("../ConfigContext");
 var _excluded = ["code", "fn", "exName", "name", "children", "icon"],
   _excluded2 = ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams", "isHide"],
@@ -75,19 +73,11 @@ var ButtonGroup = function ButtonGroup(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     popRow = _useState4[0],
     setPopRow = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    resetList = _useState6[0],
-    setResetList = _useState6[1];
-  (0, _react.useEffect)(function () {
-    // codes在方法内，再合并默认的权限配置
-    // 合并本地的codes
-    var codesConcat = _lodash.default.unionBy(codes || [], _index.funcCode.btnFuncCodes, 'code');
-    // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
-    setResetList(_toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codesConcat, rowParams)) || []);
-    return function () {
-      setResetList([]);
-    };
+  // const [resetList, setResetList] = useState<any[]>([])
+  var resetList = (0, _react.useMemo)(function () {
+    //   // codes在方法内，再合并默认的权限配置
+    //   // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
+    return _toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codes, rowParams)) || [];
   }, [options, codes, permissionCodes]);
   (0, _react.useEffect)(function () {
     setPopVisibleIndex(-1);

package/lib/ButtonGroup/styles/index.js

@@ -30,18 +30,18 @@ var SpecButtonGroupTextStyle = function SpecButtonGroupTextStyle(prefixCls, toke
     }
   }, "& + ".concat(prefixCls, "-text"), {
     position: 'relative',
-    marginLeft: token.paddingSM,
-    '&:before': {
-      position: 'absolute',
-      content: '""',
-      top: '50%',
-      left: " calc(-".concat(token.paddingSM, "px / 2)"),
-      transform: 'translate(0, -50%)',
-      display: 'inline-block',
-      height: '.9em',
-      verticalAlign: 'middle',
-      borderLeft: "1px solid ".concat(token.colorBorder)
-    }
+    marginLeft: token.paddingSM
+    // '&:before': {
+    //   position: 'absolute',
+    //   content: '""',
+    //   top: '50%',
+    //   left:` calc(-${token.paddingSM}px / 2)`,
+    //   transform: 'translate(0, -50%)',
+    //   display: 'inline-block',
+    //   height: '.9em',
+    //   verticalAlign: 'middle',
+    //   borderLeft: `1px solid ${token.colorBorder}`
+    // }
   }));
 };
 var SpecButtonGroupStyleFunc = function SpecButtonGroupStyleFunc(prefix) {

package/lib/FormComp/RenderItemGroup/index.js

@@ -56,7 +56,53 @@ var RenderItemGroup = function RenderItemGroup(props) {
   //   // @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
@@ -80,13 +126,13 @@ var RenderItemGroup = function RenderItemGroup(props) {
     return 12;
   };
   var updateFormFields = function updateFormFields() {
+    // console.log('用于触发更新表单实例赋值')
     // if (newVal) form && form.setFieldsValue({ ...newVal })
     if (doUpdateFormFields) doUpdateFormFields(); // 用于触发更新表单实例赋值
   };
-
-  // useEffect(() => {
-  //   // updateFormFields()
-  // }, [form])
+  (0, _react.useEffect)(function () {
+    updateFormFields();
+  }, [form]);
 
   // 渲染隐藏指定控件
   var itemIsHide = function itemIsHide(isHide, getFieldsValue, FormInstance) {
@@ -213,9 +259,18 @@ 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.default.createElement(_antd.Col, {
         key: index,
-        span: item.colSpan || setColSpan(item.display, size, columnCount)
+        span: item.colSpan || setColSpan(item.display, size, columnCount),
+        style: item.style
       }, /*#__PURE__*/_react.default.createElement(FormItem, _extends({
         name: type !== 'custom' && filedName,
         className: (0, _classnames.default)(fieldStatus === 'viewOnly' ? 'form-item-view-only' : '', 'spec-item-group-form-item'),
@@ -252,34 +307,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
         type = item.type,
         _item$display = item.display,
         display = _item$display === void 0 ? 'side' : _item$display; // 当前可传参的配置值
-
       var formLayout = calculateFormLayout(item);
-      // if (displayLayout) {
-      //   // 如果未配置，则使用以下配置值
-      //   formLayout = { ...displayLayout }
-      // }
-      // 优先级 displayLayout.side > displayLayout > general
-      // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
-      // 还需要判断 layout为vertical还是horizontal
-      // @ts-ignore
-      // formLayout = displayLayout?.side || (displayLayout?.block ? general.modalSize[size].formLayout : ((!displayLayout || JSON.stringify(displayLayout) === '{}') ? general.modalSize[size].formLayout : displayLayout))
-      // if (item.hasOwnProperty('display')) {
-      //   if (typeof display === 'string') {
-      //     if (display === 'block') {
-      //       // @ts-ignore
-      //       formLayout = displayLayout?.block || general.modalSize[size].formBlockLayout
-      //     } else {
-      //       // 使用默认
-      //       // formLayout = displayLayout?.side || (displayLayout?.block ? general.modalSize[size].formLayout : displayLayout) || general.modalSize[size].formLayout
-      //     }
-      //   } else {
-      //     formLayout = item.display // 对象类型传值如： {labelCol: {span: 3},wrapperCol: {span: 8}} 优先级最高
-      //   }
-      // }
-      // // 当布局为 'inline' 时，不配置栅格结构
-      // if (layout === 'inline') {
-      //   formLayout = {}
-      // }
       // title标题或html渲染
       if (type === 'title' || type === 'html') {
         return /*#__PURE__*/_react.default.createElement(FormItem, {
@@ -290,7 +318,8 @@ var RenderItemGroup = function RenderItemGroup(props) {
           var _item$protoConfig;
           // isHide 返回为true则隐藏当前控件
           return !itemIsHide(isHide, FormInstance.getFieldValue(), FormInstance) ? /*#__PURE__*/_react.default.createElement(_antd.Col, {
-            span: item.colSpan || 24
+            span: item.colSpan || 24,
+            style: item.style
           }, type === 'title' ? /*#__PURE__*/_react.default.createElement("h3", _extends({}, item.protoConfig, {
             className: "modalPanelTitle ".concat((item === null || item === void 0 || (_item$protoConfig = item.protoConfig) === null || _item$protoConfig === void 0 ? void 0 : _item$protoConfig.className) || '')
           }), label) : label) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, null);
@@ -307,6 +336,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
           return !itemIsHide(isHide, FormInstance.getFieldValue(), FormInstance) ? renderColFormItem(item, index, formLayout) : null;
         });
       }
+      // 常规表单项结构
       return renderColFormItem(item, index, formLayout);
     });
   };

package/lib/StandardFilter/index.d.ts

@@ -22,6 +22,7 @@ export interface StandardFilterProps {
     colon?: boolean;
     dateFormatter?: 'dayjs' | 'string';
     itemGroupConfig?: object;
+    collapseable?: boolean;
     [k: string]: any;
 }
 declare const StandardFilter: React.ForwardRefExoticComponent<Omit<StandardFilterProps, "ref"> & React.RefAttributes<unknown>>;

package/lib/StandardFilter/index.js

@@ -13,6 +13,7 @@ var _data = require("../data/");
 require("./style/index.less");
 var _ConfigContext = require("../ConfigContext");
 var _FilterStyle = _interopRequireDefault(require("./style/FilterStyle"));
+var _SpecIcon = _interopRequireDefault(require("../SpecIcon"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -31,6 +32,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // @ts-nocheck
 var FormItem = _antd.Form.Item;
 var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _filterFormRef$curren4;
   var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
   var providerConfig = InitFanContext['StandardFilter'] || {}; // 使用上下文（全局配置）设置扩展的配置项
   var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
@@ -64,7 +66,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     filterBtnsStyle = _providerConfig$props.filterBtnsStyle,
     _providerConfig$props7 = _providerConfig$props.colon,
     colon = _providerConfig$props7 === void 0 ? true : _providerConfig$props7,
-    dateFormatter = _providerConfig$props.dateFormatter;
+    dateFormatter = _providerConfig$props.dateFormatter,
+    _providerConfig$props8 = _providerConfig$props.collapseable,
+    collapseable = _providerConfig$props8 === void 0 ? false : _providerConfig$props8;
   var filterFormRef = (0, _react.useRef)();
   // ref 的转发
   (0, _react.useImperativeHandle)(ref, function () {
@@ -78,7 +82,10 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     _useState4 = _slicedToArray(_useState3, 2),
     isHideCount = _useState4[0],
     setIsHideCount = _useState4[1]; // 表单隐藏项数量值
-
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    collapsed = _useState6[0],
+    setCollapsed = _useState6[1];
   var componentName = 'spec-standard-filter';
   var _useStyle = (0, _FilterStyle.default)(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -87,8 +94,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var filterFormLayout = (0, _react.useMemo)(function () {
     return formLayout || 'inline';
   }, [formLayout]);
-  //  配置筛选按钮（确认与取消）
-  var filterActionButtons = (0, _react.useMemo)(function () {
+
+  // 计算当前栅格数量，及对应的size
+  var columnNumberAndSize = (0, _react.useMemo)(function () {
     // 当前栅栅数量
     var itemGroupSize = (itemGroupConfig === null || itemGroupConfig === void 0 ? void 0 : itemGroupConfig.size) || (filterFormLayout === 'horizontal' ? 'xxlg' : 'md');
     if (itemGroupConfig !== null && itemGroupConfig !== void 0 && itemGroupConfig.columnCount) {
@@ -108,8 +116,31 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           break;
       }
     }
+    return {
+      columnNumber: _data.general.modalSize[itemGroupSize].columnNumber,
+      itemGroupSize: itemGroupSize
+    };
+  }, [itemGroupConfig, filterFormLayout]);
+
+  // 计算表单隐藏项(开启展开与收缩）
+  var calculateHideCount = function calculateHideCount(filterFormRef, groups) {
+    var _filterFormRef$curren;
+    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) {
+      return (item === null || item === void 0 ? void 0 : item.isHidden) || (item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false);
+    }).length);
+  };
+
+  //  配置筛选按钮（确认与取消）
+  var filterActionButtons = (0, _react.useMemo)(function () {
+    var itemGroupSize = columnNumberAndSize.itemGroupSize,
+      columnNumber = columnNumberAndSize.columnNumber;
     // 计算扣除栅格列数是否还有多余的项，用来判断筛选按钮的版式（初始化的时候，可能会受默认值内配置的isHide影响导致计算错误;或自定义表单控件组栅格影响）
-    var calculateTimes = (formItemGroup.length - isHideCount) % _data.general.modalSize[itemGroupSize].columnNumber;
+    // if (collapseable) {
+    //   columnNumber = collapsed ? columnNumber : (columnNumber === 1 ? columnNumber = 2 : columnNumber)
+    // }
+    var calculateTimes = (reFormItemGroup.length - isHideCount) % columnNumber;
+    // console.log('当前多余的数量', calculateTimes, '当前隐藏的控件数量isHideCount==>', isHideCount, itemGroupSize, 'columnNumber', columnNumber)
     // xs:1列  sm:1列   【span:24】
     // md:2列           【span:12】
     // lg:3列  xlg:3列  【span:8】
@@ -119,10 +150,11 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       label: '',
       type: 'custom',
       // display: 'block',
+      filedName: 'filterAction',
       display: {
         wrapperCol: {
-          // 占用的格子数按对应size配置的formItem(md下额外再新增1）
-          span: _data.general.modalSize[itemGroupSize].formLayout.labelCol.span + _data.general.modalSize[itemGroupSize].formLayout.wrapperCol.span + (itemGroupSize === 'md' ? 1 : 0)
+          // 占用的格子数按对应size配置的formItem(md下额外再新增1, 忘了为什么额外加了，先去除.20240619）
+          span: _data.general.modalSize[itemGroupSize].formLayout.labelCol.span + _data.general.modalSize[itemGroupSize].formLayout.wrapperCol.span // + (itemGroupSize === 'md' ? 1 : 0)
         }
       },
       protoFormItem: {
@@ -145,10 +177,23 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           },
           onClick: handleReset,
           ghost: true
-        }, cancelButtonProps), cancelText || '重置'));
+        }, cancelButtonProps), cancelText || '重置'), filterFormLayout === 'horizontal' && collapseable && reFormItemGroup.length > columnNumberAndSize.columnNumber - 1 ? /*#__PURE__*/_react.default.createElement(_antd.Button, {
+          type: 'link',
+          onClick: function onClick() {
+            return setCollapsed(!collapsed);
+          },
+          style: {
+            marginLeft: 8,
+            paddingInlineStart: 0,
+            paddingInlineEnd: 0
+          }
+        }, collapsed ? '收起' : '展开', /*#__PURE__*/_react.default.createElement(_SpecIcon.default, {
+          noPrefix: true,
+          name: collapsed ? 'speci-up' : 'speci-down'
+        })) : null);
       }
     })];
-  }, [confirmText, cancelText, filterFormLayout, reFormItemGroup, onFilterSearch, onFilterReset, itemGroupConfig, filterFormRef, isHideCount]);
+  }, [confirmText, cancelText, filterFormLayout, reFormItemGroup, onFilterSearch, onFilterReset, columnNumberAndSize, filterFormRef, isHideCount, collapseable, collapsed]);
 
   // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
   var updateFormFields = function updateFormFields(newVal, force) {
@@ -183,37 +228,29 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         })
       } */
     filterFormRef.current.setFieldsValue(_objectSpread(_objectSpread({}, resetValues), newVal || {})); // 直接清空表单的赋值
-    updateCalculate(filterFormRef.current.getFieldsValue());
-    if (getFormFields) getFormFields(filterFormRef.current.getFieldsValue(), filterFormRef);
+    forceUpdateForm();
   };
   // 强制更新表单值，用于赋初始化实例值
   var forceUpdateForm = (0, _react.useCallback)(function () {
     var formValues = filterFormRef.current.getFieldsValue();
-    // if (Object.prototype.hasOwnProperty.call(formValues, false)) {
-    //   delete formValues.false // TODO 自定义结构会莫名的出来一个false字段
-    // }
-    updateCalculate(formValues); // 更新当前表单数量，排除被隐藏的值
-    if (getFormFields) getFormFields(filterFormRef.current.getFieldsValue(), filterFormRef);
-  }, [dateFormatter, formItemGroup]);
-  // 计算表单隐藏项
-  var updateCalculate = (0, _react.useCallback)(function (formValues) {
-    setIsHideCount(reFormItemGroup.filter(function (item) {
-      return item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false;
-    }).length);
+    if (Object.prototype.hasOwnProperty.call(formValues, false)) {
+      delete formValues.false; // 自定义结构会莫名的出来一个false字段
+    }
+    calculateHideCount(filterFormRef, reFormItemGroup); // 更新当前表单数量，排除被隐藏的值
+    if (getFormFields) getFormFields(formValues, filterFormRef);
   }, [reFormItemGroup, filterFormRef]);
   var handleSearch = function handleSearch(values) {
     if (Object.prototype.hasOwnProperty.call(values, false)) {
-      delete values.false; // TODO 自定义结构会莫名的出来一个false字段
+      delete values.false; // 自定义结构会莫名的出来一个false字段
     }
-    var resultValues = dateFormatter === 'string' ? (0, _utils.UtilValueFormat)(values, formItemGroup) : values;
-    console.log('格式化前数据', values);
-    console.log('格式化后数据', resultValues);
+    var resultValues = dateFormatter === 'string' ? (0, _utils.UtilValueFormat)(values, reFormItemGroup) : values;
+    // console.log('格式化前数据', values)
+    // console.log('格式化后数据', resultValues)
     if (onFilterSearch) {
       onFilterSearch(_objectSpread({}, resultValues));
     }
   };
   var handleReset = function handleReset() {
-    var _filterFormRef$curren;
     // 使用此方法，表单校验无法清空掉
     // const resetValues = this.filterFormRef.current.getFieldsValue()
     // Object.keys(resetValues).forEach((item) => {
@@ -222,20 +259,78 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     // this.filterFormRef.current.setFieldsValue({ ...resetValues }) // 直接清空表单的赋值
     filterFormRef.current.resetFields();
     setReFormItemGroup(formItemGroup); // 重新渲染列表
-    updateCalculate(filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren = filterFormRef.current) === null || _filterFormRef$curren === void 0 ? void 0 : _filterFormRef$curren.getFieldsValue());
+    calculateHideCount(filterFormRef, reFormItemGroup);
     if (onFilterReset) {
       var _filterFormRef$curren2;
       onFilterReset(filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren2 = filterFormRef.current) === null || _filterFormRef$curren2 === void 0 ? void 0 : _filterFormRef$curren2.getFieldsValue());
     }
   };
+
+  // 判断是否隐藏结构, display:'none'
+  var setItemHiddenNode = function setItemHiddenNode(item, index, collapsed, showItemNumber) {
+    // console.log('判断是否隐藏结构==>当前执行序号', index, showItemNumber)
+    if (item.filedName === 'filterAction') {
+      return {
+        isHidden: false
+      };
+    }
+    return {
+      // 栅格列为1时，显示1个表单项
+      isHidden: collapsed ? false : showItemNumber === 0 ? index !== 0 : !(index < showItemNumber)
+    };
+  };
+  // 渲染隐藏指定控件
+  var itemIsHide = function itemIsHide(isHide, getFieldsValue, FormInstance) {
+    if (typeof isHide === 'function') {
+      return isHide(getFieldsValue, FormInstance, 'default');
+    }
+    return isHide || false;
+  };
+  var updateGroupByCollapsed = function updateGroupByCollapsed(groups, formValues) {
+    // console.log('判断当前是否需要按展开与收缩显示对应的表单项')
+    var showItemNumber = columnNumberAndSize.columnNumber - 1;
+    return new Promise(function (resolve, reject) {
+      if (Array.isArray(groups)) {
+        resolve(groups.map(function (item, index) {
+          if (collapseable && filterFormLayout === "horizontal") {
+            var _setItemHiddenNode = setItemHiddenNode(item, index, collapsed, showItemNumber),
+              isHidden = _setItemHiddenNode.isHidden;
+            item.isHidden = isHidden;
+            item.style = _objectSpread(_objectSpread({}, item.style || {}), {}, {
+              display: item.isHidden ? 'none' : 'block'
+            });
+            if (item.hasOwnProperty('isHide') && itemIsHide(item.isHide, formValues, filterFormRef)) {
+              showItemNumber++;
+              item.isHidden = true;
+              // console.log('当前是结构是隐藏未渲染,跳到下个序号', showItemNumber)
+            }
+          }
+          return _objectSpread({}, item);
+        }));
+      } else {
+        resolve(groups);
+      }
+    });
+  };
+  (0, _react.useEffect)(function () {
+    // 初始化表单数据数据
+    if (collapseable && filterFormLayout === "horizontal") {
+      var _filterFormRef$curren3;
+      var formValues = filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren3 = filterFormRef.current) === null || _filterFormRef$curren3 === void 0 ? void 0 : _filterFormRef$curren3.getFieldValue();
+      updateGroupByCollapsed(formItemGroup, formValues).then(function (groups) {
+        setReFormItemGroup(groups);
+        calculateHideCount(filterFormRef, groups);
+      });
+    } else {
+      setReFormItemGroup(formItemGroup);
+    }
+  }, [formItemGroup, collapseable, filterFormLayout, collapsed, columnNumberAndSize === null || columnNumberAndSize === void 0 ? void 0 : columnNumberAndSize.columnNumber, itemGroupConfig, filterFormRef, filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren4 = filterFormRef.current) === null || _filterFormRef$curren4 === void 0 ? void 0 : _filterFormRef$curren4.getFieldValue()]);
   (0, _react.useEffect)(function () {
     if (initialValues && JSON.stringify(initialValues) !== '{}') {
       updateFormFields(initialValues, true);
     }
   }, [initialValues]);
-  (0, _react.useEffect)(function () {
-    setReFormItemGroup(formItemGroup);
-  }, [formItemGroup]);
+
   // / 表单列表组 formItemGroup 类型为数组或者React.Node
   var renderFormItemGroup = function renderFormItemGroup() {
     if (Array.isArray(reFormItemGroup)) {
@@ -245,7 +340,9 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         size: filterFormLayout === 'horizontal' ? 'xxlg' : 'md' // size决定栅格排列数量(4列排版）
         ,
         layout: filterFormLayout,
-        form: filterFormRef
+        form: filterFormRef,
+        collapseable: collapseable,
+        collapsed: collapsed
         // displayLayout={{labelCol: { span: 8 }, wrapperCol: { span: 16 },}}
         ,
         doUpdateFormFields: function doUpdateFormFields() {

package/lib/StandardModal/index.js

@@ -82,20 +82,17 @@ var StandardModal = function StandardModal(props) {
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     modalForm = _Form$useForm2[0];
-  var _useState = (0, _react.useState)(),
+  // const [modalFormRef, setModalFormRef] = useState<any>();  // <---- set the ref when Form Rendered(使用此方法会出现溢出事件）
+  var _useState = (0, _react.useState)(0),
     _useState2 = _slicedToArray(_useState, 2),
-    modalFormRef = _useState2[0],
-    setModalFormRef = _useState2[1]; // <---- set the ref when Form Rendered
-  var _useState3 = (0, _react.useState)(0),
-    _useState4 = _slicedToArray(_useState3, 2),
-    bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1];
+    bodyMaxHeight = _useState2[0],
+    setBodyMaxHeight = _useState2[1];
 
   // setTabFormChild
-  var _useState5 = (0, _react.useState)(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    formChild = _useState6[0],
-    setFormChild = _useState6[1]; // <---- set the ref when Form Rendered
+  var _useState3 = (0, _react.useState)(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formChild = _useState4[0],
+    setFormChild = _useState4[1]; // <---- set the ref when Form Rendered
 
   // 按钮栏是否有显示（默认显示）
   var hasFooterBar = (0, _react.useMemo)(function () {
@@ -171,7 +168,7 @@ var StandardModal = function StandardModal(props) {
   };
   // fill Form when modal open 此处可解决获取  Form.useForm  warning
   (0, _react.useEffect)(function () {
-    if (visible && modalFormRef) {
+    if (visible && modalForm) {
       // <---- check ref before use the form instance
       if (initialValues && _typeof(initialValues) === 'object') {
         initialValues && modalForm.setFieldsValue(_objectSpread({}, initialValues));
@@ -181,7 +178,7 @@ var StandardModal = function StandardModal(props) {
     // if (!visible && modalFormRef) {
     //   clearAllFieldsValue() // 清空表单传参数
     // }
-  }, [modalFormRef, visible]);
+  }, [modalForm, visible]);
   (0, _react.useEffect)(function () {
     if (visible) {
       initBodyMaxHeight();
@@ -427,8 +424,12 @@ var StandardModal = function StandardModal(props) {
   // 内容渲染
   var renderChildrenNodes = function renderChildrenNodes() {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/_react.default.createElement(_antd.Form, {
-      layout: formLayout,
-      ref: setModalFormRef,
+      layout: formLayout
+      // ref={(formInstance)=> {
+      //   // console.log('formInstance', formInstance)
+      //   // setModalFormRef(formInstance)
+      // }}
+      ,
       form: modalForm,
       onFinish: handleSubmit,
       hideRequiredMark: fieldStatus === 'viewOnly' || hideRequiredMark

package/lib/StandardTable/index.js

@@ -64,7 +64,7 @@ var StandardTable = function StandardTable(props) {
     rest = _objectWithoutProperties(_providerConfig$props, _excluded);
   // 加上类型修复 TS:2322 报警
   var resetColumns = [_objectSpread(_objectSpread({
-    width: 62,
+    width: 76,
     align: 'center',
     title: '序号',
     key: 'orderNum',
@@ -92,7 +92,7 @@ var StandardTable = function StandardTable(props) {
         otherColumn = columnsConfig.otherColumn;
       if (colItem.type === 'action') {
         var _colItem, _colItem2, _colItem3;
-        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 120 : 80);
+        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 130 : 80);
         colItem.align = ((_colItem2 = colItem) === null || _colItem2 === void 0 ? void 0 : _colItem2.align) || (action === null || action === void 0 ? void 0 : action.align) || 'center';
         colItem.title = ((_colItem3 = colItem) === null || _colItem3 === void 0 ? void 0 : _colItem3.title) || (action === null || action === void 0 ? void 0 : action.title) || '操作';
         colItem.key = 'control';
@@ -176,7 +176,7 @@ var StandardTable = function StandardTable(props) {
   }, /*#__PURE__*/_react.default.createElement(_antd.Table, _extends({
     rowKey: rowKey || 'id',
     rowSelection: rowSelection ? _objectSpread({
-      columnWidth: 46
+      columnWidth: 56
     }, rowSelection) : rowSelection,
     dataSource: list,
     pagination: !pagination ? false : paginationProps,