@teamix/pro 1.2.29 → 1.2.33

package/es/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;
@@ -88,6 +88,8 @@ export interface QueryFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     /** 表单展示形式 */
     mode?: 'inline' | 'panel';
+    /** 面板模式下是否仅展示面板 */
+    purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
     /** 顶部筛选区前缀 */
@@ -112,6 +114,9 @@ export interface QueryFilterProps extends ProFormProps {
 /**
  * 兼容性导出
  */
+/**
+ * @deprecated 将在未来移除该组件，建议使用 QueryFilter 代替
+ */
 export interface IFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     onFilter?: (values: any) => void;

package/es/index.d.ts

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

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './step';
-var version = '1.2.29';
+var version = '1.2.33';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProStep, hooks, nocode, templates, utils };

package/es/info/components/InfoValueItem/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context"];
+var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context", "props"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -8,12 +8,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -26,6 +20,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
@@ -52,6 +52,7 @@ var InfoValueItem = function InfoValueItem(props) {
       actionRef = props.actionRef,
       dataSource = props.dataSource,
       context = props.context,
+      fieldProps = props.props,
       others = _objectWithoutProperties(props, _excluded);
 
   var dataIndex = infoItem.dataIndex,
@@ -65,7 +66,8 @@ var InfoValueItem = function InfoValueItem(props) {
       _infoItem$successMess = infoItem.successMessage,
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
-      extra = infoItem.extra; // 获取处理过的 render
+      extra = infoItem.extra,
+      valueType = infoItem.valueType; // 获取处理过的 render
 
   var getRender = function getRender() {
     var _processRenderFunctio;
@@ -77,7 +79,31 @@ var InfoValueItem = function InfoValueItem(props) {
     }
 
     var newRender = processBuriedPoint((_processRenderFunctio = processRenderFunction(render !== null && render !== void 0 ? render : {}, value, record)) !== null && _processRenderFunctio !== void 0 ? _processRenderFunctio : {}, value, record);
+
+    if (valueType === 'selectGroup') {
+      newRender = _objectSpread(_objectSpread({
+        maxShowNumber: 'auto',
+        foldText: 'more'
+      }, newRender), {}, {
+        ellipsis: false
+      });
+    }
+
     return newRender;
+  };
+
+  var getFieldProps = function getFieldProps() {
+    if (valueType === 'selectGroup') {
+      return _objectSpread({
+        valueAlias: {
+          value: 'TagValue',
+          key: 'TagKey'
+        },
+        layout: 'compact'
+      }, fieldProps);
+    }
+
+    return fieldProps;
   }; // 获取处理过的 dataSource
 
 
@@ -275,12 +301,12 @@ var InfoValueItem = function InfoValueItem(props) {
       onMouseLeave: function onMouseLeave() {
         setEditVisible(false);
       }
-    }, /*#__PURE__*/React.createElement(ProField, _objectSpread({
+    }, /*#__PURE__*/React.createElement(ProField, _objectSpread(_objectSpread({
       type: type,
       value: value,
       render: getRender(),
       dataSource: getDataSource()
-    }, others)), /*#__PURE__*/React.createElement(PopConfirm, {
+    }, others), getFieldProps())), /*#__PURE__*/React.createElement(PopConfirm, {
       visible: popConfirmVisible,
       content: renderContent(),
       triggerType: "click",
@@ -307,12 +333,12 @@ var InfoValueItem = function InfoValueItem(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: cls('item-value')
-  }, /*#__PURE__*/React.createElement(ProField, _objectSpread({
+  }, /*#__PURE__*/React.createElement(ProField, _objectSpread(_objectSpread({
     type: type,
     value: value,
     render: getRender(),
     dataSource: getDataSource()
-  }, others)), renderAction(), extra && extra);
+  }, others), getFieldProps())), renderAction(), extra && extra);
 };
 
 export default InfoValueItem;

package/es/info/components/InfoValueItem/index.scss

@@ -20,6 +20,7 @@
   &-item-value {
     display: flex;
     align-items: center;
+    width: 100%;
   }
   
 }

package/es/info/components/ProInfoItem/index.js

@@ -22,7 +22,8 @@ var ProInfoItem = function ProInfoItem(prop) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls()
     }, /*#__PURE__*/React.createElement(Row, {
-      gutter: 10
+      gutter: 10,
+      className: cls('base-row')
     }, /*#__PURE__*/React.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')
@@ -37,7 +38,7 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('value')
     }, loading && /*#__PURE__*/React.createElement("div", {
       className: cls('base-skeleton-box')
-    }, /*#__PURE__*/React.createElement(ProSkeletonRaw.Info.Item, null)), !loading && /*#__PURE__*/React.createElement("div", null, value))));
+    }, /*#__PURE__*/React.createElement(ProSkeletonRaw.Info.Item, null)), !loading && value)));
   }
 
   if (headerInfoLayout) {
@@ -45,7 +46,9 @@ var ProInfoItem = function ProInfoItem(prop) {
         labelGutter = _headerInfoLayout$lab === void 0 ? '16px' : _headerInfoLayout$lab;
     return /*#__PURE__*/React.createElement("div", {
       className: cls()
-    }, /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement(Row, {
+      className: cls('header-row')
+    }, /*#__PURE__*/React.createElement("div", {
       className: cls('header-label')
     }, /*#__PURE__*/React.createElement(LabelIconTip, {
       label: label,

package/es/info/components/ProInfoItem/index.scss

@@ -17,6 +17,15 @@ $item-padding-bottom: 8px;
 .teamix-pro-field-info-form-item {
   width: 100%;
   padding-bottom: $item-padding-bottom;
+
+  &-header-row {
+    display: flex;
+    align-items: center;
+  }
+  &-base-row {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .teamix-pro-field-info-form-item-label {

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

@@ -73,7 +73,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
           infoItem: item,
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
           actionRef: actionRef,
-          context: context
+          context: context,
+          props: item.props
         }),
         baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
         tooltip: item.tooltip,
@@ -84,7 +85,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(Row, {
     wrap: true,
-    className: "teamix-pro-info-content-row"
+    className: "teamix-pro-info-content-row",
+    gutter: 20
   }, renderContent()));
 };
 

package/es/info/components/headerInfo/index.js

@@ -50,7 +50,8 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
           dataSource: item.dataSource,
           infoItem: item,
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
-          actionRef: actionRef
+          actionRef: actionRef,
+          props: item.props
         }),
         headerInfoLayout: layout !== null && layout !== void 0 ? layout : defaultLayout,
         tooltip: item.tooltip,

package/es/info/components/tableInfo/index.js

@@ -65,7 +65,8 @@ var ProTableInfo = function ProTableInfo(props) {
       dataSource: item.dataSource,
       infoItem: item,
       record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
-      actionRef: actionRef
+      actionRef: actionRef,
+      props: item.props
     });
   };
 

package/es/info/index.scss

@@ -1,4 +1,6 @@
+@import '../common.scss';
 .teamix-pro-info {
+  @include hybridcloud-scrollbar;
   color: var(--color-brand1-6);
 
   .teamix-pro-info-content-row {

package/es/info/typing.d.ts

@@ -94,6 +94,8 @@ export interface ProInfoColumnsProps {
     actions?: ProActionButtonProps[];
     /** 追加在列后 */
     extra?: React.ReactNode;
+    /** 其他 ProField 配置 */
+    props?: any;
 }
 export declare type ProInfoActionType = {
     /** 刷新Info */
@@ -168,6 +170,7 @@ export declare type InfoValueItemProps = {
     render?: ProInfoCellRender;
     dataSource?: ProFieldDataSourceItem[] | ProInfoCellFunProp;
     context?: object;
+    props?: any;
 } & Omit<ProFieldProps, 'render' | 'dataSource'>;
 export declare type ProInfoHeaderProps = Omit<ProCardProps, 'loading'>;
 /** ProInfoGroupContextProps */

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

@@ -51,10 +51,10 @@ var Filter = function Filter(props) {
       setVisible = _useState4[1];
 
   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);
   }, []); // 获取过滤项
 
@@ -172,7 +172,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
 
@@ -187,7 +187,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,
@@ -220,10 +220,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/es/table/components/Layout/index.js

@@ -56,12 +56,27 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
+  }; // 渲染 addonAfter
+
+
+  var renderAddonAfter = function renderAddonAfter() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: cls('addon-after-wrapper')
+    }, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
+      actionRef: actionRef,
+      quickAction: extra,
+      rowSelection: rowSelection
+    }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
+      actionRef: actionRef
+    }, otherProps)));
   }; // 渲染新版 QueryFilter
 
 
   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__*/isValidElement(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
         // 自定义渲染内容
@@ -81,15 +96,9 @@ var Layout = function Layout(props) {
           },
           panelContent: dataFilter.content,
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, 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.createElement(QueryFilter, _objectSpread({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
@@ -106,15 +115,19 @@ var Layout = function Layout(props) {
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       }
+    } else if (mainAction) {
+      // 没传 dataFilter 但是传了 mainAction
+      return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+        addonBefore: renderMainAction(),
+        addonAfter: renderAddonAfter()
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+        addonAfter: renderAddonAfter()
+      });
     }
   }; // 区域组合渲染
 
@@ -133,11 +146,19 @@ var Layout = function Layout(props) {
         rowSelection: rowSelection
       }))), renderQueryFilter());
     } else if (header && !mainAction) {
+      var _dataFilter$schema3, _dataFilter$schema4;
+
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/React.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), renderQueryFilter())));
+      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter()), /*#__PURE__*/React.createElement("div", {
+        className: cls('right')
+      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
+        actionRef: actionRef,
+        quickAction: extra,
+        rowSelection: rowSelection
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter())));
     } else if (!header && mainAction) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

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

@@ -37,4 +37,11 @@ $prefix: 'teamix-pro-table-layout';
     padding: 16px;
     background: var(--panel-filter-bg, var(--color-fill1-2));
   }
+  &-main-action {
+    margin-bottom: 8px;
+  }
+  &-addon-after-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }

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

@@ -11,25 +11,21 @@ var FullScreen = function FullScreen(props) {
       normalDataFilterForm = _actionRef$current.normalDataFilterForm,
       fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm;
 
-  function closeByESC(e) {
+  var closeByESC = function closeByESC(e) {
     if (visible && e.code === 'Escape') {
-      var _actionRef$current2, _actionRef$current2$s, _actionRef$current3, _actionRef$current3$f;
+      var _actionRef$current2, _actionRef$current2$f;
 
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setFullScreenState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, false);
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$f = _actionRef$current3.fullScreen) === null || _actionRef$current3$f === void 0 ? void 0 : _actionRef$current3$f.call(_actionRef$current3);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.fullScreen) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2);
     }
-  } // 监听esc按钮
+  }; // 监听esc按钮
 
 
   useEffect(function () {
-    var _actionRef$current4, _actionRef$current4$s;
-
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFullScreenState) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, visible);
     window.addEventListener('keydown', closeByESC);
     return function () {
       window.removeEventListener('keydown', closeByESC);
     };
-  }, [visible]);
+  }, [visible, actionRef]);
 
   var afterClose = function afterClose() {
     normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
@@ -67,9 +63,9 @@ var FullScreen = function FullScreen(props) {
       zIndex: 999
     },
     onRequestClose: function onRequestClose() {
-      var _actionRef$current5, _actionRef$current5$f;
+      var _actionRef$current3, _actionRef$current3$f;
 
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$f = _actionRef$current5.fullScreen) === null || _actionRef$current5$f === void 0 ? void 0 : _actionRef$current5$f.call(_actionRef$current5);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$f = _actionRef$current3.fullScreen) === null || _actionRef$current3$f === void 0 ? void 0 : _actionRef$current3$f.call(_actionRef$current3);
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "teamix-pro-table-full-screen"

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

@@ -1,6 +1,7 @@
 .teamix-pro-table-toolbar {
   width: 100%;
   text-align: right;
+  margin-bottom: 8px;
 }
 .teamix-pro-table-toolbar-custom {
   display: inline-block;