@teamix/pro 1.1.7 → 1.1.8

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -19,14 +19,16 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 /**
  * 筛选列
  */
-import { Button, Dropdown, Menu } from '@alicloudfe/components';
+import { Button, Dropdown, Menu, Dialog, Grid, Checkbox } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import { baseClass, getMessage } from '@teamix/utils';
 import React, { useState, useEffect } from 'react';
 import { cloneDeep } from '../../utils';
 import './index.scss';
-var CheckboxItem = Menu.CheckboxItem; // const { Tooltip } = Balloon;
-
+import { Ellipsis } from '@teamix/utils';
+var CheckboxItem = Menu.CheckboxItem;
+var Row = Grid.Row,
+    Col = Grid.Col;
 var cls = baseClass('teamix-pro-table-toolbar-filter-column');
 
 var processColumns = function processColumns(columns) {
@@ -126,6 +128,13 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       return item;
     });
     notifyTableRender(keyNewColumns);
+  }; // 修改：dialog
+
+
+  var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
+    var keyNewColumns = cloneDeep(newColumns);
+    notifyTableRender(keyNewColumns);
+    setDropdownVisible(false);
   }; // 向上
 
 
@@ -265,20 +274,71 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     })))));
   };
 
-  return renderDropdown(); // <Tooltip
-  //   trigger={renderDropdown()}
-  //   align={fullscreen ? 'b' : 't'}
-  //   popupProps={{
-  //     offset: fullscreen ? [5, 20] : [5, -18],
-  //     animation: { in: 'fadeIn', out: 'fadeOut' },
-  //     visible: tooltipVisible && !dropdownVisible,
-  //     onVisibleChange: (state) => {
-  //       setTooltipVisible(state);
-  //     },
-  //   }}
-  // >
-  //   {getMessage('customColumnSetting')}
-  // </Tooltip>
+  var renderDialog = function renderDialog() {
+    // 对话框关闭
+    var dialogOnClose = function dialogOnClose() {
+      setDropdownVisible(false);
+    };
+
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+      iconSize: "small",
+      className: "teamix-pro-table-toolbar-icon",
+      onClick: function onClick() {
+        setDropdownVisible(!dropdownVisible);
+      }
+    }, /*#__PURE__*/React.createElement(TeamixIcon, {
+      size: "small",
+      type: "set-line"
+    })), /*#__PURE__*/React.createElement(Dialog, {
+      title: getMessage('customColumnSetting'),
+      visible: dropdownVisible,
+      onOk: onChangeColumnsForDialog,
+      onCancel: dialogOnClose,
+      onClose: dialogOnClose,
+      style: {
+        width: '440px'
+      }
+    }, /*#__PURE__*/React.createElement(Row, {
+      gutter: 20,
+      wrap: true,
+      className: cls('row')
+    }, newColumns.map(function (item, index) {
+      var _newColumns$find2;
+
+      var dataIndex = item.dataIndex,
+          title = item.title,
+          columnFiltersDisabled = item.columnFiltersDisabled;
+      return /*#__PURE__*/React.createElement(Col, {
+        span: 8,
+        key: index,
+        className: cls('col')
+      }, /*#__PURE__*/React.createElement(Checkbox, {
+        checked: (_newColumns$find2 = newColumns.find(function (_ref5) {
+          var key = _ref5.dataIndex;
+          return key === dataIndex;
+        })) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
+        onChange: function onChange(check) {
+          var columnsList = cloneDeep(newColumns).map(function (item) {
+            if (item.dataIndex === dataIndex) {
+              item.columnFilters = check;
+            }
+
+            return item;
+          });
+          setNewColumns(columnsList);
+        },
+        disabled: columnFiltersDisabled
+      }, /*#__PURE__*/React.createElement(Ellipsis, {
+        tooltip: false
+      }, title)));
+    }))));
+  };
+
+  if (newColumns.length > 10) {
+    return renderDialog();
+  }
+
+  return renderDropdown();
 };
 
 export default FilterColumnIcon;

package/es/table/components/ToolBar/index.scss

@@ -66,8 +66,18 @@
       }
     }
   }
+
+  
+}
+.teamix-pro-table-toolbar-filter-column-col {
+  height: 28px;
+  .next-checkbox-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }
 
+
 // fullscreen
 .teamix-pro-table-full-screen {
   width: 100vw;

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "quickAction", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "quickAction", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
@@ -50,8 +50,8 @@ import debounce from 'lodash.debounce';
 import classNames from 'classnames';
 export * from './typing'; // 导出 ProActions 组件
 
-export * from '../actions';
-import { useSize } from 'ahooks';
+export * from '../actions'; // import { useSize } from 'ahooks';
+
 var cls = baseClass('teamix-pro-table');
 var toJS = formilyReactive.toJS;
 /**
@@ -127,6 +127,10 @@ var ProTable = function ProTable(props) {
       filterDebounce = _props$filterDebounce === void 0 ? 300 : _props$filterDebounce,
       _props$footerSuction = props.footerSuction,
       footerSuction = _props$footerSuction === void 0 ? false : _props$footerSuction,
+      _props$autoRefresh = props.autoRefresh,
+      autoRefresh = _props$autoRefresh === void 0 ? function () {
+    return false;
+  } : _props$autoRefresh,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -177,8 +181,15 @@ var ProTable = function ProTable(props) {
   var _useState15 = useState('medium'),
       _useState16 = _slicedToArray(_useState15, 2),
       size = _useState16[0],
-      _setSize = _useState16[1]; // 获取header高度，用作全屏吸底吸顶高度计算
+      _setSize = _useState16[1];
+
+  var _useState17 = useState(true),
+      _useState18 = _slicedToArray(_useState17, 2),
+      showLoading = _useState18[0],
+      setShowLoading = _useState18[1]; // 存储定时器 id
+
 
+  var autoRefreshTimerRef = useRef(); // 获取header高度，用作全屏吸底吸顶高度计算
 
   var getHeaderHeight = function getHeaderHeight() {
     var _tableDom$getElements, _tableDom$getElements2;
@@ -199,30 +210,30 @@ var ProTable = function ProTable(props) {
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
-  var _useState17 = useState(0),
-      _useState18 = _slicedToArray(_useState17, 2),
-      headerHeight = _useState18[0],
-      setHeaderHeight = _useState18[1]; // 全屏显示 className
-
-
-  var _useState19 = useState(false),
+  var _useState19 = useState(0),
       _useState20 = _slicedToArray(_useState19, 2),
-      fullscreenState = _useState20[0],
-      setFullscreenState = _useState20[1]; // 父元素位置。用作非全屏模式下的吸底
+      headerHeight = _useState20[0],
+      setHeaderHeight = _useState20[1]; // 全屏显示 className
 
 
-  var _useState21 = useState(),
+  var _useState21 = useState(false),
       _useState22 = _slicedToArray(_useState21, 2),
-      parentPosition = _useState22[0],
-      setParentPosition = _useState22[1];
+      fullscreenState = _useState22[0],
+      setFullscreenState = _useState22[1]; // 父元素位置。用作非全屏模式下的吸底
+
+
+  var _useState23 = useState(),
+      _useState24 = _slicedToArray(_useState23, 2),
+      parentPosition = _useState24[0],
+      setParentPosition = _useState24[1];
   /** 筛选区域 form */
 
 
   var dataFilterForm = useMemo(function () {
     return createForm();
   }, []); // 获取表格大小
-
-  var tableSize = useSize(tableRef); // 获取父元素位置
+  // const tableSize = useSize(tableRef);
+  // 获取父元素位置
 
   var getParentPosition = function getParentPosition() {
     // 暂时仅支持使用全家桶
@@ -236,12 +247,12 @@ var ProTable = function ProTable(props) {
       });
     }
   }; // 监听表格大小动态改变吸底footer大小
+  // useEffect(() => {
+  //   getParentPosition();
+  // }, [tableSize]);
+  // rowSelection 相关
 
 
-  useEffect(function () {
-    getParentPosition();
-  }, [tableSize]); // rowSelection 相关
-
   var rowSelectionHook = useTableSelection(_objectSpread(_objectSpread({}, propsRowSelection), {}, {
     onChange: onChangeRowSelection
   }), primaryKey);
@@ -353,6 +364,25 @@ var ProTable = function ProTable(props) {
 
   if (propsActionRef) {
     propsActionRef.current = actionRef.current;
+  }
+
+  function onFormatResult(next) {
+    var _next$data;
+
+    props.onFormatResult && props.onFormatResult(next);
+    var time = autoRefresh ? autoRefresh(next.data) : false;
+
+    if (Number.isInteger(time) && time >= 1000) {
+      autoRefreshTimerRef.current = setTimeout(function () {
+        // 自动刷新不显示 loading
+        _request({}, true);
+      }, Number(time));
+    } // 设置 dataSource、total
+
+
+    setData(next.data || []);
+    setTotal(next.total || ((_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length));
+    setShowSkeleton(false);
   } // 请求表格数据工具函数
 
 
@@ -383,16 +413,6 @@ var ProTable = function ProTable(props) {
         }
       }
 
-      function onFormatResult(next) {
-        var _next$data;
-
-        props.onFormatResult && props.onFormatResult(next); // 设置 dataSource、total
-
-        setData(next.data || []);
-        setTotal(next.total || ((_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length));
-        setShowSkeleton(false);
-      }
-
       if (nextData instanceof Promise) {
         nextData.then(function (res) {
           onFormatResult(res);
@@ -414,10 +434,12 @@ var ProTable = function ProTable(props) {
     }
   }); // 请求函数
 
-  function _request(params) {
+  function _request(params, noLoading) {
     var _actionRef$current, _actionRef$current$se, _objectSpread2;
 
-    // 请求前需要优先清空列过滤条件
+    var nextShowLoading = !noLoading;
+    nextShowLoading !== showLoading && setShowLoading(nextShowLoading); // 请求前需要优先清空列过滤条件
+
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setFilterRules) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, {});
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
@@ -426,7 +448,11 @@ var ProTable = function ProTable(props) {
     var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams) : _objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams)), params));
 
     if (requestData) {
-      // console.log('requestData', requestData);
+      if (autoRefreshTimerRef.current) {
+        clearTimeout(autoRefreshTimerRef.current);
+        autoRefreshTimerRef.current = null;
+      }
+
       getData.run(requestData);
     }
   }
@@ -435,6 +461,12 @@ var ProTable = function ProTable(props) {
     if (requestWhenMount) {
       _request();
     }
+
+    return function () {
+      if (autoRefreshTimerRef.current) {
+        clearTimeout(autoRefreshTimerRef.current);
+      }
+    };
   }, []);
 
   function onSort(dataIndex, order) {
@@ -480,7 +512,7 @@ var ProTable = function ProTable(props) {
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
         columns: genProColumnToColumn(filteredColumns, showSkeleton, actionRef),
-        loading: !showSkeleton && (getData.loading || props.loading),
+        loading: showLoading && !showSkeleton && (getData.loading || props.loading),
         className: classNames('teamix-pro-table', tableClassName, {
           'with-row-select': rowSelection
         }),

package/es/table/typing.d.ts

@@ -103,8 +103,10 @@ export declare type ProTableProps = {
     skeletonSize?: number;
     /** 表格主题 className */
     tableClassName?: string;
-    /** 非全屏模式下是否吸底 默认状态下取用 ProPageContainer 作为参照物。如果传入了Dom，则取用Dom作为参照物 */
+    /** 非全屏模式下是否吸底 默认状态下取用 ProPageContainer 作为参照物。如果传入了 Dom，则取用 Dom 作为参照物 */
     footerSuction?: boolean | Element;
+    /** 当满足条件时开启自动刷新，返回值为自动刷新间隔时间，如果返回 0 或 false 则停止自动刷新，每次触发翻页、搜索都将重置时间 */
+    autoRefresh?: (dataSource: any[]) => number | boolean;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/lib/form/Components/ProField/index.d.ts

@@ -139,6 +139,14 @@ declare const _default: React.ForwardRefExoticComponent<(Partial<import("@teamix
     type: "search";
 } & {
     children?: React.ReactNode;
+}> | Partial<import("@teamix/pro-field/lib/components/FieldTagFilter").IProFieldTagFilter & {
+    type: "tagFilter";
+} & {
+    children?: React.ReactNode;
+}> | Partial<import("@teamix/pro-field/lib/components/FieldMenuSelect").IProFieldMenuSelect & {
+    type: "menuSelect";
+} & {
+    children?: React.ReactNode;
 }> | Pick<Partial<{
     [key: string]: any;
     type: string;

package/lib/form/ProForm/index.js

@@ -9,6 +9,8 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _core = require("@formily/core");
 
 var _reactive = require("@formily/reactive");
@@ -25,7 +27,7 @@ var _utils2 = require("../utils");
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "schema", "scope", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed"];
+var _excluded = ["form", "initialValues", "schema", "scope", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -59,11 +61,13 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onChange = _ref.onChange,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
+      className = _ref.className,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   var form = (0, _react.useMemo)(function () {
     return outerForm || (0, _core.createForm)();
   }, []);
+  var prefix = 'teamix-pro-form';
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints ? {
       breakpoints: breakpoints,
@@ -107,7 +111,11 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   return outerForm === false ?
   /*#__PURE__*/
   // 特殊表单，无需渲染form实例，例如FormDialog等
-  _react.default.createElement(_formily.FormLayout, _objectSpread(_objectSpread({}, otherProps), getTeamixLayout), formChildren) : /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({}, otherProps), getTeamixLayout), {}, {
+  _react.default.createElement(_formily.FormLayout, _objectSpread(_objectSpread({
+    className: (0, _classnames.default)(prefix, className)
+  }, otherProps), getTeamixLayout), formChildren) : /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
+    className: (0, _classnames.default)(prefix, className)
+  }, otherProps), getTeamixLayout), {}, {
     form: form,
     onAutoSubmit: onSubmit,
     onAutoSubmitFailed: onSubmitFailed

package/lib/form/ProForm/index.scss

@@ -1,6 +1,13 @@
 @import '~@alifd/next/lib/core/index-noreset.scss';
 
 $form-item-cls: #{$css-prefix}formily-item;
+$teamix-pro-form: teamix-pro-form;
+
+.#{$teamix-pro-form} {
+  .next-affix {
+    top: auto !important; // todo 待pro-page-containe修复后移除
+  }
+}
 
 // FormItem 样式重写
 .#{$form-item-cls} {
@@ -38,6 +45,7 @@ $form-item-cls: #{$css-prefix}formily-item;
         .teamix-pro-field-radio,
         .teamix-pro-field-switch,
         .teamix-pro-field-colorradio,
+        .teamix-pro-field-range,
         .#{$css-prefix}btn-text {
           line-height: var(--form-element-medium-height, 32px);
         }
@@ -91,6 +99,9 @@ $form-item-cls: #{$css-prefix}formily-item;
   .#{$form-item-cls}-extra {
     color: var(--color-text1-8, #848484);
   }
+  .#{$form-item-cls}-error-help {
+    color: var(--color-error-5, #e84738);
+  }
 
   // 前缀 后缀
   .#{$form-item-cls}-control {
@@ -224,14 +235,16 @@ $inset-font-weight-medium: calc(
   }
 }
 
-.#{$css-prefix}formily-button-group-sticky {
-  margin-top: var(--form-element-medium-height, 32px);
-  padding: 12px 16px 12px 24px;
-  border: 0;
-  background: var(--color-fill1-1, #fff);
+.#{$teamix-pro-form}-button-affix.#{$css-prefix}affix {
+  left: 0;
+  right: 0;
+  width: 100% !important;
+  height: 56px !important;
+  padding-left: 24px;
+  background: var(--color-fill1-1, #fff) !important;
   box-shadow: 0 -1px 5px 0 rgba(38, 38, 38, 0.14);
   .#{$css-prefix}formily-button-group {
-    margin-top: 0;
+    margin-bottom: 12px;
   }
 }
 
@@ -252,3 +265,17 @@ $inset-font-weight-medium: calc(
     }
   }
 }
+
+// ArrayItems
+.#{$css-prefix}formily-array-items {
+  .#{$css-prefix}formily-grid-layout {
+    > div:last-child {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+    }
+  }
+  .#{$css-prefix}formily-array-base-remove {
+    cursor: pointer;
+  }
+}

package/lib/form/SchemaForm/adapterType.js

@@ -48,6 +48,8 @@ var typeMap = (_typeMap = {
   ColorRadio: 'string',
   IconPicker: 'string',
   JsonInput: 'object',
+  TagPicker: 'array',
+  Range: 'string',
   Search: 'array',
   ArrayCollapse: 'array',
   ArrayCards: 'array',

package/lib/form/SchemaForm/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@formily/react");
 
+var _components = require("@alicloudfe/components");
+
 var _formily = require("@teamix/formily");
 
 var _ProField = _interopRequireDefault(require("../Components/ProField"));
@@ -96,7 +98,6 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
       components: {
-        Upload: _formily.Upload,
         ProField: _ProField.default,
         FormLayout: _formily.FormLayout,
         FormItem: _formily.FormItem,
@@ -120,7 +121,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         EditablePopover: _Editable.EditablePopover,
         FormGroup: _FormGroup.default,
         Search: _Search.default,
-        QueryFilter: _QueryFilter.default
+        QueryFilter: _QueryFilter.default,
+        Upload: _formily.Upload,
+        Affix: _components.Affix
       }
     });
   }, []); // 合并schema中request的scope
@@ -291,7 +294,8 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [formatSchema, schema]);
+  }, [formatSchema, schema]); // console.log(schemaPro);
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(SchemaField, {
     schema: schemaPro,
     components: components,

package/lib/form/SchemaForm/initializeArrayIcon.js

@@ -10,7 +10,8 @@ var _react = _interopRequireDefault(require("react"));
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _excluded = ["component", "props"],
-    _excluded2 = ["icon"];
+    _excluded2 = ["icon"],
+    _excluded3 = ["text", "type"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -54,7 +55,11 @@ var initialize = function initialize(item) {
   return _objectSpread(_objectSpread({}, other), {}, {
     component: component,
     props: _objectSpread({
-      icon: function icon(props) {
+      icon: function icon(_ref) {
+        var text = _ref.text,
+            type = _ref.type,
+            props = _objectWithoutProperties(_ref, _excluded3);
+
         return /*#__PURE__*/_react.default.createElement(_icon.default, _objectSpread(_objectSpread({}, props), {}, {
           type: iconType,
           size: "small"

package/lib/form/SchemaForm/initializeFormButton.js

@@ -4,8 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["component", "props"],
-    _excluded2 = ["props", "component"];
+var _excluded = ["sticky"];
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -13,10 +16,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 var buttonTextMap = {
   Submit: '提交',
   Reset: '重置'
@@ -24,58 +23,56 @@ var buttonTextMap = {
 
 var initializeButton = function initializeButton(item) {
   var component = item.component,
-      props = item.props,
-      otherProps = _objectWithoutProperties(item, _excluded);
-
-  return _objectSpread({
+      _item$props = item.props,
+      props = _item$props === void 0 ? {} : _item$props;
+  return _objectSpread(_objectSpread({}, item), {}, {
     component: component,
     props: _objectSpread({
       children: buttonTextMap[component]
     }, props)
-  }, otherProps);
+  });
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      component = item.component,
-      otherProps = _objectWithoutProperties(item, _excluded2);
+  var component = item.component,
+      _item$props2 = item.props,
+      props = _item$props2 === void 0 ? {} : _item$props2,
+      _item$decoratorProps = item.decoratorProps,
+      decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps;
 
   var sticky = props.sticky,
-      align = props.align,
-      gutter = props.gutter;
-  var alignProps = align ? {
-    align: align
-  } : {};
-  var gutterProps = gutter ? {
-    gutter: gutter
-  } : {};
+      otherProps = _objectWithoutProperties(props, _excluded); // 单个按钮
+
 
   if (component && ['Submit', 'Reset'].includes(component)) {
     return initializeButton(item);
   }
 
-  var decoratorTemp = {
-    title: ' ',
+  var commonMode = _objectSpread(_objectSpread({
+    title: ' '
+  }, item), {}, {
+    component: component,
+    props: otherProps,
     decorator: 'FormButtonGroup.FormItem',
-    decoratorProps: {
+    decoratorProps: _objectSpread({
       inset: false
-    },
-    props: _objectSpread(_objectSpread({}, alignProps), gutterProps)
-  };
+    }, decoratorProps)
+  }); // 吸底模式
+
 
   if (sticky) {
-    decoratorTemp = {
-      title: '',
-      decorator: 'FormButtonGroup.Sticky',
-      decoratorProps: _objectSpread({}, alignProps),
-      props: _objectSpread({}, gutterProps)
+    return {
+      component: 'Affix',
+      props: {
+        offsetBottom: 0,
+        className: 'teamix-pro-form-button-affix'
+      },
+      children: [commonMode]
     };
-  }
+  } // 普通模式
+
 
-  return _objectSpread(_objectSpread({
-    component: component
-  }, decoratorTemp), otherProps);
+  return commonMode;
 };
 
 var _default = initialize;