@teamix/pro 1.2.22 → 1.2.27

package/es/step/index.js

@@ -0,0 +1,101 @@
+var _excluded = ["mode", "items", "shape", "children"];
+
+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; }
+
+import React, { useMemo } from 'react';
+import { Step, Timeline } from '@alicloudfe/components';
+import ProStepItem from './ProStepItem';
+
+var ProStep = function ProStep(props) {
+  var mode = props.mode,
+      items = props.items,
+      shape = props.shape,
+      children = props.children,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var current = props.current,
+      labelPlacement = props.labelPlacement,
+      readOnly = props.readOnly,
+      animation = props.animation,
+      size = props.size;
+  var fold = props.fold; // 判断渲染组件是不是 ProStepItem, 并返回筛选后的children
+
+  var renderChildren = useMemo(function () {
+    return React.Children.map(children, function (child, index) {
+      var childElement = child;
+      var displayName = childElement.type.displayName;
+
+      if (displayName === 'ProStepItem') {
+        return /*#__PURE__*/React.cloneElement(childElement, {
+          _size: size,
+          _mode: mode,
+          _index: index,
+          _current: current,
+          _shape: shape
+        });
+      } // 如果不是 ProStepItem
+
+
+      console.error('Warning: ProStep has a child which is not a ProStepItem component');
+    });
+  }, [children]); // 设置circle, 覆盖 dot 阻止重新渲染节点样式
+
+  var shapeMap = function shapeMap() {
+    if (shape === 'arrow') return 'arrow';
+    return 'circle';
+  }; // 渲染 ProStepItem
+
+
+  var renderItem = function renderItem() {
+    // 传递了 item 采用 item 渲染数组的方式
+    if (items) {
+      return items.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(ProStepItem, _objectSpread({
+          key: index,
+          _mode: mode,
+          _shape: shape,
+          _index: index,
+          _current: current,
+          _size: size
+        }, item));
+      });
+    } else {
+      return renderChildren;
+    }
+  }; // 渲染 ProStep
+
+
+  var renderProStep = function renderProStep() {
+    if (mode === 'ver') {
+      return /*#__PURE__*/React.createElement(Timeline, _objectSpread({
+        fold: fold
+      }, others), renderItem());
+    }
+
+    return /*#__PURE__*/React.createElement(Step, _objectSpread({
+      current: current,
+      shape: shapeMap(),
+      labelPlacement: labelPlacement,
+      readOnly: readOnly,
+      animation: animation
+    }, others), renderItem());
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "teamix-pro-step"
+  }, renderProStep());
+};
+
+ProStep.Item = ProStepItem;
+ProStep.defaultProps = {
+  mode: 'hoz'
+};
+export { ProStep, ProStepItem };

package/es/step/typing.d.ts

@@ -0,0 +1,96 @@
+import { ItemProps as StepItemProps } from '@alicloudfe/components/types/step';
+import { ItemProps as TimeLineItemProps } from '@alicloudfe/components/types/timeline';
+import { ReactNode } from 'react';
+import { ProTagItem } from '@teamix/utils';
+export declare type ProStepItemStatus = 'success' | 'fail' | 'process' | 'warning' | 'wait';
+export declare type ModeStatusFromProStep = {
+    _mode?: string | 'hoz' | 'ver';
+};
+export declare type FoldProps = {
+    foldArea: [number, number];
+    foldShow: boolean;
+};
+export declare type ProStepProps = HozStepProps | VerTimeLineProps;
+export declare type ProStepBaseProps = {
+    /** 步骤条：节点展示类型*/
+    shape?: 'icon' | 'arrow' | 'dot' | 'number';
+    /** style */
+    style?: React.CSSProperties;
+    /** className */
+    className?: string;
+} & React.HTMLAttributes<HTMLElement>;
+export interface HozStepProps extends ProStepBaseProps {
+    /** 当前组件的展示形式 */
+    mode?: 'hoz';
+    /** 内部渲染自组件 */
+    items?: HozStepItemProps[];
+    /** 步骤条：当前步骤 */
+    current?: number;
+    /** 步骤条: 横向布局时( direction 为 hoz )的内容排列*/
+    labelPlacement?: 'hoz' | 'ver';
+    /** 步骤条: 是否可读模式 */
+    readOnly?: boolean;
+    /** 步骤条: 是否开启动效 */
+    animation?: boolean;
+    /**dot 形态下切换size */
+    size?: 'normal' | 'small';
+}
+export interface VerTimeLineProps extends ProStepBaseProps {
+    /** 当前组件的展示形式 */
+    mode?: 'ver';
+    /** 内部渲染自组件 */
+    items?: VerStepItemProps[];
+    /** 时间线: 自定义折叠选项 */
+    fold?: FoldProps[];
+}
+export interface ProStepItemBaseProps {
+    /**步骤条：节点展示类型 */
+    _shape?: 'icon' | 'arrow' | 'dot' | 'number';
+    /**节点索引 */
+    _index?: number;
+    /**活跃节点 */
+    _current?: number;
+    /**节点状态 */
+    status?: string | ProStepItemStatus;
+    /**节点设置为 icon 图标 */
+    icon?: string;
+    /**节点的内容 */
+    content?: ReactNode;
+    /**节点标题 */
+    title?: ReactNode;
+    /**自定义渲染 */
+    dotRender?: (index?: number, status?: string) => ReactNode;
+    /**点击事件 */
+    onClick?: (index: number) => void;
+    /**百分比展示 */
+    percent?: number;
+    /**是否禁用当前节点 */
+    disabled?: boolean;
+}
+export interface HozStepItemProps extends ProStepItemBaseProps {
+    /**dot 形态下切换size */
+    _size?: 'normal' | 'small';
+}
+export interface VerStepItemProps extends ProStepItemBaseProps {
+    /**节点副标题，在 timeline 可以展示格式化后的时间 */
+    subTitle?: ReactNode;
+    /**节点对应描述 */
+    discription?: ReactNode;
+    /**节点的 tag */
+    tags?: ProTagItem[] | ReactNode;
+    /**左侧展示内容 */
+    timeLeft?: ReactNode;
+    /**头像 */
+    image?: string | ReactNode;
+    /**是否需要 animation 动画 */
+    animation?: boolean;
+    /**卡片是否可折叠 */
+    collapsible?: boolean;
+    /**默认是否折叠，用于非受控模式 */
+    defaultCollapsed?: boolean;
+    /**是否折叠，受控模式 */
+    collapsed?: boolean;
+    /**折叠状态改变的回调函数 */
+    onCollapse?: (collapsed: boolean) => void;
+}
+export declare type ProStepItemProps = (HozStepItemProps | VerStepItemProps) & React.HTMLAttributes<HTMLElement> & StepItemProps & TimeLineItemProps;

package/es/step/typing.js

@@ -0,0 +1 @@
+export {};

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

@@ -150,8 +150,6 @@ var Filter = function Filter(props) {
         setVisible(!visible);
       }
     }),
-    //@ts-ignore
-    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -189,20 +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 params = Object.fromEntries([].concat(_toConsumableArray(Object.entries(rules).map(function (_ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
-            k = _ref6[0],
-            v = _ref6[1];
-
-        if (v) {
-          return [k, v.params];
-        }
-
-        return null;
-      })), [[column.dataIndex, param]]).filter(function (item) {
-        return item && (item === null || item === void 0 ? void 0 : item[1]);
-      })); // 再设置所有的列筛选状态
+      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 : {}; // 再设置所有的列筛选状态
 
       (_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,7 +205,7 @@ var Filter = function Filter(props) {
         } // 发送请求
 
 
-        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _defineProperty({}, targetPageKey, 1));
         (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
 
         (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);

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

@@ -1,4 +1,4 @@
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterForm", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
 
 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; }
 
@@ -8,35 +8,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(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."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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; }
 
-import React, { useEffect, useState, isValidElement } from 'react';
+import React, { isValidElement } from 'react';
 import { Header, baseClass } from '@teamix/utils';
-import { Button, Badge } from '@alicloudfe/components';
-import TeamixIcon from '@teamix/icon';
 import { ProActionGroup } from '../../../actions';
-import { SimpleFilter, AdvancedFilter, formilyReactive } from '../../../form';
-import { getMessage } from '@teamix/utils';
+import { QueryFilter, QueryFilterLayout } from '../../../form';
 import ToolBar from '../ToolBar';
 import QuickAction from '../QuickAction';
-import isEmpty from 'lodash.isempty';
 import './index.scss';
 var cls = baseClass('teamix-pro-table-layout');
-var toJS = formilyReactive.toJS;
 
 var Layout = function Layout(props) {
   var header = props.header,
@@ -44,27 +27,10 @@ var Layout = function Layout(props) {
       extra = props.extra,
       actionRef = props.actionRef,
       dataFilter = props.dataFilter,
-      dataFilterForm = props.dataFilterForm,
+      dataFilterFormRef = props.dataFilterFormRef,
       rowSelection = props.rowSelection,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
-  var mode = dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode;
+      otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
-  var _useState = useState((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) || false),
-      _useState2 = _slicedToArray(_useState, 2),
-      expand = _useState2[0],
-      setExpand = _useState2[1];
-
-  var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      hasDot = _useState4[0],
-      setHasDot = _useState4[1];
-
-  useEffect(function () {
-    if (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) {
-      setExpand(dataFilter.expand);
-    }
-  }, [dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand]); // 渲染主操作区
 
   var renderMainAction = function renderMainAction() {
     var _mainAction$actions;
@@ -90,95 +56,66 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
-  }; // 渲染 mode='inline' 数据过滤区
-
-
-  var renderInlineFilter = function renderInlineFilter() {
-    var _dataFilter$schema;
-
-    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) > 0) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: cls('inline-filter')
-      }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread({
-        form: dataFilterForm
-      }, dataFilter)));
-    }
-  }; // 渲染 mode='panel' 数据过滤区
+  }; // 渲染新版 QueryFilter
 
 
-  var renderPanelFilter = function renderPanelFilter() {
+  var renderQueryFilter = function renderQueryFilter() {
     if (dataFilter) {
-      var _dataFilter$schema2;
+      var _dataFilter$schema;
 
       if ( /*#__PURE__*/isValidElement(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
-        return /*#__PURE__*/React.createElement("div", {
-          className: cls('panel-filter'),
-          style: {
-            display: expand ? 'block' : 'none'
-          }
-        }, dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content);
-      } 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("div", {
-          className: cls('panel-filter'),
-          style: {
-            display: expand ? 'block' : 'none'
-          }
-        }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread({
-          form: dataFilterForm
-        }, dataFilter)));
+        // 自定义渲染内容
+        return /*#__PURE__*/React.createElement(QueryFilterLayout, _objectSpread({
+          onExpand: function onExpand(expand) {
+            // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
+            setTimeout(function () {
+              var _actionRef$current, _actionRef$current$ge;
+
+              if ((_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge = _actionRef$current.getState) === null || _actionRef$current$ge === void 0 ? void 0 : _actionRef$current$ge.call(_actionRef$current).fullScreenState) {
+                var _actionRef$current2, _actionRef$current2$r;
+
+                (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$r = _actionRef$current2.resetTableMaxBodyHeight) === null || _actionRef$current2$r === void 0 ? void 0 : _actionRef$current2$r.call(_actionRef$current2);
+              }
+            });
+            (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
+          },
+          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)))
+        }, 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) {
+        return /*#__PURE__*/React.createElement(QueryFilter, _objectSpread({
+          formRef: dataFilterFormRef,
+          onExpand: function onExpand(expand) {
+            // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
+            setTimeout(function () {
+              var _actionRef$current3, _actionRef$current3$g;
+
+              if ((_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$g.call(_actionRef$current3).fullScreenState) {
+                var _actionRef$current4, _actionRef$current4$r;
+
+                (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$r = _actionRef$current4.resetTableMaxBodyHeight) === null || _actionRef$current4$r === void 0 ? void 0 : _actionRef$current4$r.call(_actionRef$current4);
+              }
+            });
+            (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)))
+        }, dataFilter));
       }
     }
-  }; // 渲染过滤器按钮
-
-
-  var renderFilterBtn = function renderFilterBtn() {
-    var handleBtnClick = function handleBtnClick() {
-      setExpand(!expand);
-      var filterValues = Object.values(toJS(dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values)).filter(function (v) {
-        return !isEmpty(v);
-      }); // console.log('filterValues', filterValues);
-
-      if (filterValues && (filterValues === null || filterValues === void 0 ? void 0 : filterValues.length) > 0) {
-        setHasDot(true);
-      } else {
-        setHasDot(false);
-      } // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
-
-
-      setTimeout(function () {
-        var _actionRef$current, _actionRef$current$ge;
-
-        if ((_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge = _actionRef$current.getState) === null || _actionRef$current$ge === void 0 ? void 0 : _actionRef$current$ge.call(_actionRef$current).fullScreenState) {
-          var _actionRef$current2, _actionRef$current2$r;
-
-          (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$r = _actionRef$current2.resetTableMaxBodyHeight) === null || _actionRef$current2$r === void 0 ? void 0 : _actionRef$current2$r.call(_actionRef$current2);
-        }
-      });
-    };
-
-    if (mode === 'panel') {
-      if (expand === false && hasDot) {
-        return /*#__PURE__*/React.createElement(Badge, {
-          dot: true,
-          className: cls('filter-btn')
-        }, /*#__PURE__*/React.createElement(Button, {
-          onClick: handleBtnClick,
-          style: {
-            minWidth: 'unset'
-          }
-        }, /*#__PURE__*/React.createElement(TeamixIcon, {
-          type: expand ? 'up-line' : 'filter-line'
-        }), getMessage('filter')));
-      } else return /*#__PURE__*/React.createElement(Button, {
-        onClick: handleBtnClick,
-        className: cls('filter-btn'),
-        style: {
-          minWidth: 'unset'
-        }
-      }, /*#__PURE__*/React.createElement(TeamixIcon, {
-        type: expand ? 'up-line' : 'filter-line'
-      }), getMessage('filter'));
-    }
   }; // 区域组合渲染
 
 
@@ -194,61 +131,21 @@ var Layout = function Layout(props) {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }))), /*#__PURE__*/React.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/React.createElement("div", {
-        className: cls('left')
-      }, mainAction && renderMainAction(), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      }))), renderQueryFilter());
     } else if (header && !mainAction) {
       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)), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), renderQueryFilter())));
     } else if (!header && mainAction) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/React.createElement("div", {
-        className: cls('left')
-      }, mainAction && renderMainAction(), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {
-      if (!dataFilterForm && !extra) {
+      if (!dataFilterFormRef && !extra) {
         return null;
       }
 
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/React.createElement("div", {
-        className: cls('left')
-      }, mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     }
   };
 

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

@@ -9,9 +9,10 @@ $prefix: 'teamix-pro-table-layout';
     display: flex;
     justify-content: space-between;
     margin-bottom: 8px;
-    &:not(:first-child) {
-      margin-top: 8px;
-    }
+    // margin-bottom: 8px;
+    // &:not(:first-child) {
+    //   margin-top: 8px;
+    // }
   }
   &-left {
     display: flex;

package/es/table/components/Pagination/index.d.ts

@@ -1,4 +1,7 @@
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
+import { responsivePaginationType } from '../../typing';
 import './index.scss';
-declare const _default: (props: PaginationProps) => JSX.Element;
+declare const _default: (props: PaginationProps & {
+    responsivePaginationType?: responsivePaginationType;
+}) => JSX.Element;
 export default _default;