fan-standard-comp 4.0.3 → 4.0.5

package/lib/FormComp/RenderItemGroup/index.js

@@ -51,12 +51,6 @@ var RenderItemGroup = function RenderItemGroup(props) {
     _useStyle2 = _slicedToArray(_useStyle, 2),
     wrapSSR = _useStyle2[0],
     hashId = _useStyle2[1];
-  // 栅格数量
-  // const columnNumber: number = useMemo(() => {
-  //   // @ts-ignore
-  //   return general.modalSize[size].columnNumber || 1
-  // }, [size, columnCount])
-
   var setColSpan = function setColSpan(display, modalSize, columnCount) {
     if (_typeof(display) === 'object' || display === 'block') {
       // 栅格数量为：1
@@ -80,13 +74,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) {
@@ -215,7 +209,8 @@ var RenderItemGroup = function RenderItemGroup(props) {
     if (layout === "horizontal" || layout === "vertical") {
       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 +247,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 +258,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 +276,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
           return !itemIsHide(isHide, FormInstance.getFieldValue(), FormInstance) ? renderColFormItem(item, index, formLayout) : null;
         });
       }
+      // 常规表单项结构
       return renderColFormItem(item, index, formLayout);
     });
   };
@@ -322,7 +292,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
   // 布局配置为horizontal或vertical
   : /*#__PURE__*/_react.default.createElement(_antd.Row, {
     className: itemGroupCls,
-    gutter: layout === 'vertical' ? gutter || [20, 20] : gutter
+    gutter: layout === 'vertical' ? gutter || [16, 16] : gutter
   }, renderItemGroupNode())
   /* itemGroup = ReactNode则直接返回 */ : /*#__PURE__*/_react.default.createElement("div", {
     className: itemGroupCls

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

@@ -34,7 +34,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/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,12 +150,16 @@ 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）
+          span: _data.general.modalSize[itemGroupSize].formLayout.labelCol.span + _data.general.modalSize[itemGroupSize].formLayout.wrapperCol.span + (!collapseable && itemGroupSize === 'md' ? 1 : 0)
         }
       },
+      style: {
+        // textAlign: 'right'
+      },
       protoFormItem: {
         style: {
           textAlign: filterFormLayout === 'horizontal' ? 'right' : 'left'
@@ -135,20 +170,33 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       customRender: function customRender() {
         return /*#__PURE__*/_react.default.createElement(FormItem, {
           noStyle: true
-        }, onFilterSearch && /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+        }, onFilterReset && /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
           type: "primary",
-          htmlType: "submit"
-        }, confirmButtonProps), confirmText || '查询'), onFilterReset && /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+          onClick: handleReset,
+          ghost: true
+        }, cancelButtonProps), cancelText || '重置'), onFilterSearch && /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
           type: "primary",
           style: {
             marginLeft: 8
           },
-          onClick: handleReset,
-          ghost: true
-        }, cancelButtonProps), cancelText || '重置'));
+          htmlType: "submit"
+        }, confirmButtonProps), confirmText || '查询'), 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 +231,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 +262,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 +343,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/StandardForm/StepForm.js

@@ -38,19 +38,20 @@ var StepForm = /*#__PURE__*/_react.default.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 = (0, _react.useState)(),

package/lib/StandardForm/style/index.js

@@ -46,10 +46,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/lib/StandardModal/style/index.js

@@ -20,8 +20,14 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
   };
   return (0, _genStyleHook.createStyleHook)(prefix, function (token) {
     var prefixCls = ".".concat(prefix);
+    console.log('token', token);
     return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
-      '.ant-modal-body ': _objectSpread({}, (0, _index.scrollBar)(token)),
+      '.ant-modal-body ': _objectSpread(_objectSpread({}, (0, _index.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': {
@@ -42,7 +48,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/lib/StandardTable/index.js

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

package/lib/StandardTable/style/index.js

@@ -31,8 +31,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({}, (0, _index.scrollBar)(token)),
       '.spec-table-dropdown': {

package/lib/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/lib/data/general.config.js

@@ -104,18 +104,18 @@ var _default = exports.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
         }
       }
     },

package/lib/theme/index.js

@@ -11,7 +11,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); }
 var scrollBar = exports.scrollBar = function scrollBar(token) {
   return _defineProperty(_defineProperty(_defineProperty({}, '&::-webkit-scrollbar-track-piece', {
-    background: new _tinycolor.TinyColor('#c1c1c1').setAlpha(0.1).toRgbString() // new TinyColor(token.colorPrimary).setAlpha(0.1)
+    background: new _tinycolor.TinyColor('#c1c1c1').setAlpha(0.02).toRgbString() // new TinyColor(token.colorPrimary).setAlpha(0.1)
   }), '&::-webkit-scrollbar', {
     width: '6px',
     height: '6px'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",