fan-standard-comp 4.0.4 → 4.0.5

package/es/FormComp/RenderItemGroup/index.js

@@ -43,58 +43,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])
-  /*
-    // 当前需要显示的前几条表单项
-    // 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
@@ -251,14 +199,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 +284,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

@@ -145,10 +145,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情况下需要额外再新增1）
+          span: general.modalSize[itemGroupSize].formLayout.labelCol.span + general.modalSize[itemGroupSize].formLayout.wrapperCol.span + (!collapseable && itemGroupSize === 'md' ? 1 : 0)
         }
       },
+      style: {
+        // textAlign: 'right'
+      },
       protoFormItem: {
         style: {
           textAlign: filterFormLayout === 'horizontal' ? 'right' : 'left'
@@ -159,17 +162,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);

package/es/StandardForm/StepForm.js

@@ -29,19 +29,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(),

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

@@ -14,8 +14,14 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
   };
   return createStyleHook(prefix, function (token) {
     var prefixCls = ".".concat(prefix);
+    console.log('token', token);
     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 +42,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.js

@@ -98,18 +98,18 @@ 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
         }
       }
     },

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.js

@@ -51,58 +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])
-  /*
-    // 当前需要显示的前几条表单项
-    // 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
@@ -259,14 +207,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.default.createElement(_antd.Col, {
         key: index,
         span: item.colSpan || setColSpan(item.display, size, columnCount),
@@ -352,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.js

@@ -153,10 +153,13 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       filedName: 'filterAction',
       display: {
         wrapperCol: {
-          // 占用的格子数按对应size配置的formItem(md下额外再新增1, 忘了为什么额外加了，先去除.20240619）
-          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'
@@ -167,17 +170,17 @@ 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 || '重置'), filterFormLayout === 'horizontal' && collapseable && reFormItemGroup.length > columnNumberAndSize.columnNumber - 1 ? /*#__PURE__*/_react.default.createElement(_antd.Button, {
+          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);

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.4",
+  "version": "4.0.5",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",