@teamix/pro 1.2.27 → 1.2.31

package/es/table/utils/index.js

@@ -16,129 +16,76 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import cloneDeepLodash from 'lodash.clonedeep'; // 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
-
-var state = {
-  fullScreenState: false,
-  filterRules: {},
-  filterColumns: []
-};
-
-var _initState = cloneDeepLodash(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
-
-
-var callback = {
-  fullScreenState: {}
-};
-var initCallback = cloneDeepLodash(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
-
-var tableCallback = {}; // 组件内监听事件
-// 组件内对全局状态的更改
-
-var mutations = {
-  getState: function getState() {
-    return state;
-  },
-  setState: function setState(key, value) {
-    state[key] = value;
-    useOn(key, value);
-
-    if (mutations.hasOwnProperty(key)) {
-      mutations[key] = value;
-    }
-  },
-  initState: function initState() {
-    state = cloneDeepLodash(_initState);
-  },
-  filterColumns: state.filterColumns,
-  setFullScreenState: function setFullScreenState(fullScreenState) {
-    state.fullScreenState = fullScreenState;
-    useOn('fullScreenState', fullScreenState);
-  },
-
-  /**
-   * 设置筛选列规则
-   * @param rules 规则
-   * @param dataIndex column.dataIndex
-   */
-  setFilterRules: function setFilterRules(rules) {
-    state.filterRules = rules;
-  },
-
-  /**
-   * 获取筛选规则。为params
-   */
-  getFilterRules: function getFilterRules() {
-    var result = {};
-
-    if (state.filterRules) {
-      result = Object.entries(state.filterRules).map(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            k = _ref2[0],
-            v = _ref2[1];
-
-        return _defineProperty({}, k, v.params);
-      }).reduce(function (acc, cur) {
-        acc = _objectSpread(_objectSpread({}, acc), cur);
-        return acc;
-      }, {});
-    }
+import cloneDeepLodash from 'lodash.clonedeep'; // 所有 ProTable 组件公用一套组件内事件转发机制
+
+var tableCallback = {}; // 组件内对全局状态的更改
+
+var getMutations = function getMutations(actionRef) {
+  var _actionRef$current2, _actionRef$current2$g, _actionRef$current2$g2;
+
+  return {
+    setFullScreenState: function setFullScreenState(fullScreenState) {
+      var _actionRef$current, _actionRef$current$se;
+
+      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'fullScreenState', fullScreenState);
+    },
+    filterColumns: (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$g = _actionRef$current2.getState) === null || _actionRef$current2$g === void 0 ? void 0 : (_actionRef$current2$g2 = _actionRef$current2$g.call(_actionRef$current2)) === null || _actionRef$current2$g2 === void 0 ? void 0 : _actionRef$current2$g2.filterColumns,
+
+    /**
+     * 设置筛选列规则
+     * @param rules 规则
+     * @param dataIndex column.dataIndex
+     */
+    setFilterRules: function setFilterRules(rules) {
+      var _actionRef$current3, _actionRef$current3$s;
+
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterRules', rules);
+    },
+
+    /**
+     * 获取筛选规则。为params
+     */
+    getFilterRules: function getFilterRules() {
+      var _actionRef$current4, _actionRef$current4$g;
+
+      var result = {};
+      var filterRules = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getState) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4).filterRules;
+
+      if (filterRules) {
+        result = Object.entries(filterRules).map(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+
+          return _defineProperty({}, k, v.params);
+        }).reduce(function (acc, cur) {
+          acc = _objectSpread(_objectSpread({}, acc), cur);
+          return acc;
+        }, {});
+      }
 
-    return result;
-  },
-
-  /**
-   * 绑定监听函数
-   * @param fun 监听函数
-   * @param state 需要监听的state
-   * @param name 监听名（作为销毁唯一id使用）
-   */
-  on: function on(fun, state, name) {
-    if (!callback[state]) {
-      callback[state] = {};
+      return result;
     }
-
-    callback[state][name] = fun;
-  },
-  off: function off(name) {
-    callback = Object.fromEntries(Object.entries(callback).map(function (_ref4) {
-      var _ref5 = _slicedToArray(_ref4, 2),
-          k = _ref5[0],
-          v = _ref5[1];
-
-      var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref6) {
-        var _ref7 = _slicedToArray(_ref6, 1),
-            k = _ref7[0];
-
-        return k !== name;
-      }));
-      return [k, filterV];
-    }));
-  }
+  };
 }; // 调用绑定的监听函数
 
-var useOn = function useOn(state) {
-  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    args[_key - 1] = arguments[_key];
+
+export function actionRefUseStateOn(callback, state) {
+  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+    args[_key - 2] = arguments[_key];
   }
 
   if (callback[state]) {
-    Object.entries(callback[state]).forEach(function (_ref8) {
-      var _ref9 = _slicedToArray(_ref8, 2),
-          k = _ref9[0],
-          v = _ref9[1];
+    Object.entries(callback[state]).forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+          k = _ref5[0],
+          v = _ref5[1];
 
       if (v) {
         v === null || v === void 0 ? void 0 : v.apply(void 0, args);
       }
     });
   }
-}; // 初始化 actionRef
-
-
-export function initActionRef() {
-  state = cloneDeepLodash(_initState);
-  callback = cloneDeepLodash(initCallback);
 }
 /** table 组件内监听 不对外暴露 */
 
@@ -165,12 +112,14 @@ export function emit(key) {
     fun.apply(void 0, args);
   }
 }
-export function useActionType(ref, action) {
-  // 合并自定义事件
-  var userAction = _objectSpread(_objectSpread({}, action), mutations);
+export function initActionRef(ref, action) {
+  var userAction = _objectSpread(_objectSpread({}, action), getMutations(ref));
 
   ref.current = userAction;
 }
+export function useActionType(ref, action) {
+  ref.current = _objectSpread(_objectSpread({}, ref.current), action);
+}
 export function cloneDeep(obj) {
   return cloneDeepLodash(obj);
 }

package/lib/actions/index.d.ts

@@ -41,6 +41,7 @@ export interface ProActionCommonProps {
 export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
     actions: ProActionProps[];
     icon?: string;
+    noArrow?: boolean;
 }
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export interface ProActionDividerProps extends ProActionCommonProps {
@@ -61,9 +62,7 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | (ProActionButtonProps & {
-        noArrow?: boolean;
-    });
+    more?: string | Omit<ProActionMenuButtonProps, 'actions'>;
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/lib/actions/index.js

@@ -56,12 +56,11 @@ require("./index.scss");
 var _excluded = ["type"],
     _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
     _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
+    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["noArrow", "className"],
-    _excluded7 = ["key", "actions"],
-    _excluded8 = ["key", "config"],
-    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -282,6 +281,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       context = props.context,
       _props$type2 = props.type,
       type = _props$type2 === void 0 ? 'primary' : _props$type2,
+      className = props.className,
+      noArrow = props.noArrow,
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
@@ -295,7 +296,10 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       v2: true
     },
     type: type,
-    label: buttonContent(label || children, icon, iconSize, context)
+    label: buttonContent(label || children, icon, iconSize, context),
+    className: (0, _classnames.default)(className, {
+      'teamix-pro-actions-text-menu-btn-no-arrow': noArrow
+    })
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
@@ -358,14 +362,12 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: (0, _utils.getMessage)('more')
   } : {
     icon: 'more-line',
-    // iconSize: 'small',
     autoWidth: false,
-    className: noArrowClassName
+    noArrow: true
   };
 
   if (!more) {
@@ -380,13 +382,7 @@ function getDefaultMoreButton(type, more) {
     return Object.assign(defaultConfig, moreConfig);
   }
 
-  var noArrow = moreConfig.noArrow,
-      className = moreConfig.className,
-      others = _objectWithoutProperties(moreConfig, _excluded6);
-
-  return _objectSpread({
-    className: (0, _classnames.default)(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
-  }, others);
+  return moreConfig;
 }
 
 var MAX_ACTTIONS = 4;
@@ -403,7 +399,7 @@ function getActionConfig(action, index, context) {
   if (action.actions) {
     var _key = action.key,
         actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded7);
+        _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -415,7 +411,7 @@ function getActionConfig(action, index, context) {
 
   var key = action.key,
       config = action.config,
-      others = _objectWithoutProperties(action, _excluded8);
+      others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -436,7 +432,7 @@ function ProActionGroup(props) {
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
       className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded9);
+      containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {

package/lib/form/Filter/SimpleFilter.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // 初始化Search组件，内置部分属性
 var initializeSearch = function initializeSearch(schema) {
-  var searchName;
+  var searchName = '';
   var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
       searchName = item.name;
@@ -104,6 +104,13 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
   }, [searchName, searchValue.current]);
+  (0, _react.useEffect)(function () {
+    var _props$form$initialVa, _props$form$initialVa2;
+
+    // 处理Search组件，缓存input的默认值
+    var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) === null || _props$form$initialVa === void 0 ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) === null || _props$form$initialVa2 === void 0 ? void 0 : _props$form$initialVa2[1];
+    searchValue.current = (0, _utils.isValid)(searchDefaultValue) ? searchDefaultValue : '';
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: simpleSchema,

package/lib/form/typing.d.ts

@@ -24,7 +24,7 @@ export interface ProFormSchemaItem {
     name?: string;
     description?: React.ReactNode;
     title?: string;
-    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | 'ProField' | any;
+    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | any;
     props?: AnyObject | any;
     decorator?: string | null;
     decoratorProps?: AnyObject;

package/lib/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.27";
+declare const version = "1.2.31";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.27';
+var version = '1.2.31';
 exports.version = version;

package/lib/info/components/baseInfo/index.js

@@ -103,7 +103,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(Row, {
     wrap: true,
-    className: "teamix-pro-info-content-row"
+    className: "teamix-pro-info-content-row",
+    gutter: 20
   }, renderContent()));
 };
 

package/lib/table/components/Filter/index.js

@@ -70,10 +70,10 @@ var Filter = function Filter(props) {
       setVisible = _useState4[1];
 
   (0, _react.useEffect)(function () {
-    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4;
+    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4, _actionRef$current$ge5;
 
     // 从全局状态中读取上次存储的条件
-    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current).filterRules) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3[column.dataIndex]) === null || _actionRef$current$ge4 === void 0 ? void 0 : _actionRef$current$ge4.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
+    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current)) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3.filterRules) === null || _actionRef$current$ge4 === void 0 ? void 0 : (_actionRef$current$ge5 = _actionRef$current$ge4[column.dataIndex]) === null || _actionRef$current$ge5 === void 0 ? void 0 : _actionRef$current$ge5.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
     setSelected(rules);
   }, []); // 获取过滤项
 
@@ -191,7 +191,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -206,7 +206,7 @@ var Filter = function Filter(props) {
       } // 需要带上其他所有的信息
 
 
-      var rules = (_actionRef$current$ge5 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge5 !== void 0 ? _actionRef$current$ge5 : {}; // 再设置所有的列筛选状态
+      var rules = (_actionRef$current$ge6 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {}; // 再设置所有的列筛选状态
 
       (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
@@ -239,10 +239,10 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
+      var _actionRef$current$ge7, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      var rules = (_actionRef$current$ge7 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge7 !== void 0 ? _actionRef$current$ge7 : {};
       (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''

package/lib/table/components/Layout/index.js

@@ -80,8 +80,10 @@ var Layout = function Layout(props) {
 
 
   var renderQueryFilter = function renderQueryFilter() {
-    if (dataFilter) {
-      var _dataFilter$schema;
+    var _dataFilter$schema;
+
+    if (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) {
+      var _dataFilter$schema2;
 
       if ( /*#__PURE__*/(0, _react.isValidElement)(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
         // 自定义渲染内容
@@ -109,7 +111,7 @@ var Layout = function Layout(props) {
             actionRef: actionRef
           }, otherProps)))
         }, dataFilter));
-      } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) >= 0) {
+      } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
         return /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
@@ -135,6 +137,19 @@ var Layout = function Layout(props) {
           }, otherProps)))
         }, dataFilter));
       }
+    } else if (mainAction) {
+      // 没传 dataFilter 但是传了 mainAction
+      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+        className: "mb8",
+        addonBefore: renderMainAction(),
+        addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
+          actionRef: actionRef,
+          quickAction: extra,
+          rowSelection: rowSelection
+        }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
+          actionRef: actionRef
+        }, otherProps)))
+      });
     }
   }; // 区域组合渲染