@teamix/pro 1.2.26 → 1.2.27

package/lib/form/ProForm/useFormDisplayValues.js

@@ -11,6 +11,10 @@ var _reactive = require("@formily/reactive");
 
 var _utils = require("@teamix/utils");
 
+var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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."); }
@@ -45,30 +49,17 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
   var getAddress = function getAddress(path) {
     return form.indexes[path];
-  }; // 判断布局、自增的值还是字段的值（字段值是对象、数组，内部的值特点为非数组、对象的叶子值，并且在form没有路径）
+  }; // 当前field
 
 
-  var isFieldValue = function isFieldValue(value, path) {
-    return !(0, _utils.isPlainObj)(value) && !(0, _utils.isArr)(value) && !getAddress(connectPath(path));
-  };
-
-  var isLayoutValue = function isLayoutValue(object) {
-    var _Object$entries$ = _slicedToArray(Object.entries(object)[0], 2),
-        key = _Object$entries$[0],
-        value = _Object$entries$[1];
-
-    return !isFieldValue(value, key);
-  };
-
-  var isArrayValue = function isArrayValue(array) {
-    return !isFieldValue(array[0], 0);
-  }; // 判断值的类型，递归获取每个值在该结构中的完整路径
+  var field = form.query(getAddress(prefix)).take(); // 是否真实字段值（自定义组件、布局组件、自增数组组件为非真实字段）
 
+  var isFieldValue = Object.keys(_fieldTypeMap.default).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
 
   if (!(0, _utils.isSignificative)(values)) {
     displayValues = {};
-  } else if ((0, _utils.isPlainObj)(values) && isLayoutValue(values)) {
-    // 如果值是对象且是布局对象的值
+  } else if ((0, _utils.isPlainObj)(values) && !isFieldValue) {
+    // 如果值是布局对象的值
     displayValues = {};
     Object.entries(values).forEach(function (_ref) {
       var _ref2 = _slicedToArray(_ref, 2),
@@ -77,8 +68,10 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
       displayValues[key] = getDisplayValues(form, value, connectPath(key));
     });
-  } else if ((0, _utils.isArr)(values) && isArrayValue(values)) {
-    // 如果值是数组且是自增数组的值
+  } else if ((0, _utils.isArr)(values) && !isFieldValue) {
+    // 如果值是自增数组的值
+    // ArrayItems为字符串数组时，由于form.indexes中对应address为最后一个组件，无法正常获取displayName
+    // 例如：arrayItemsString.0: "arrayItemsString.0.ArrayItemsRemove"
     displayValues = [];
     values.map(function (value, index) {
       displayValues[index] = getDisplayValues(form, value, connectPath(index));
@@ -87,14 +80,14 @@ var getDisplayValues = function getDisplayValues(form, values) {
     var _values$value;
 
     // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
-    var field = form.query(getAddress(prefix)).take();
-    var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象
+    var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象，例如Select的useDetailValue
 
+    var displayValue = (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, realValue);
     displayValues = {
       title: field === null || field === void 0 ? void 0 : field.title,
       component: field === null || field === void 0 ? void 0 : field.component[0],
-      value: realValue,
-      displayValue: (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, realValue)
+      value: values,
+      displayValue: displayValue
     };
   }
 

package/lib/form/SchemaForm/adapterType.js

@@ -53,6 +53,7 @@ var typeMap = (_typeMap = {
   MultipleTagPicker: 'array',
   Range: 'string',
   Search: 'array',
+  SelectGroup: 'array',
   ArrayCollapse: 'array',
   ArrayCards: 'array',
   ArrayTable: 'array',

package/lib/form/fieldTypeMap.js

@@ -43,7 +43,8 @@ var fieldTypeMap = {
   TagPicker: 'tagPicker',
   MultipleTagPicker: 'multipleTagPicker',
   Range: 'range',
-  Search: 'search'
+  Search: 'search',
+  SelectGroup: 'selectGroup'
 };
 var _default = fieldTypeMap;
 exports.default = _default;

package/lib/form/index.d.ts

@@ -97,7 +97,8 @@ declare const formilyReact: {
     useFieldSchema: () => originalFormilyReact.Schema<any, any, any, any, any, any, any, any, any>;
     useFormEffects: (effects?: ((form: import("@formily/core").Form<any>) => void) | undefined) => void;
 };
-export { formilyReact };
+import { customComponent } from './ProForm/customComponent';
+export { formilyReact, customComponent };
 /**
  * 导出常用formily内容
  */
@@ -110,7 +111,8 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
  */
 import { AdvancedFilter, SimpleFilter } from './Filter';
 import { QueryFilter } from './Filter/index2';
-export { AdvancedFilter, SimpleFilter, QueryFilter };
+import { QueryFilterLayout } from './Filter/Layout';
+export { AdvancedFilter, SimpleFilter, QueryFilter, QueryFilterLayout };
 /**
  * 导出 ProForm 组件，支持快速搭建表单
  */

package/lib/form/index.js

@@ -22,9 +22,11 @@ var _exportNames = {
   formilyTeamix: true,
   FormConsumer: true,
   useForm: true,
+  customComponent: true,
   AdvancedFilter: true,
   SimpleFilter: true,
-  QueryFilter: true
+  QueryFilter: true,
+  QueryFilterLayout: true
 };
 Object.defineProperty(exports, "AdvancedFilter", {
   enumerable: true,
@@ -74,6 +76,12 @@ Object.defineProperty(exports, "QueryFilter", {
     return _index.QueryFilter;
   }
 });
+Object.defineProperty(exports, "QueryFilterLayout", {
+  enumerable: true,
+  get: function get() {
+    return _Layout.QueryFilterLayout;
+  }
+});
 Object.defineProperty(exports, "SimpleFilter", {
   enumerable: true,
   get: function get() {
@@ -86,6 +94,12 @@ Object.defineProperty(exports, "createForm", {
     return _formilyCore.createForm;
   }
 });
+Object.defineProperty(exports, "customComponent", {
+  enumerable: true,
+  get: function get() {
+    return _customComponent.customComponent;
+  }
+});
 exports.formilyTeamix = exports.formilyReactive = exports.formilyReact = exports.formilyCore = exports.default = void 0;
 Object.defineProperty(exports, "registerFormats", {
   enumerable: true,
@@ -150,10 +164,14 @@ var _useFormDisplayValues = require("./ProForm/useFormDisplayValues");
 
 var _useFieldRequest = _interopRequireDefault(require("./ProForm/useFieldRequest"));
 
+var _customComponent = require("./ProForm/customComponent");
+
 var _Filter = require("./Filter");
 
 var _index = require("./Filter/index2");
 
+var _Layout = require("./Filter/Layout");
+
 var _ProForm = _interopRequireDefault(require("./ProForm"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/form/typing.d.ts

@@ -10,7 +10,7 @@ declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
 export interface ProFormInitializeItem {
     (item: ProFormSchemaItem, props?: any): ProFormSchemaItem;
 }
-declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search';
+declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup';
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
@@ -70,20 +70,44 @@ export interface FilterProps extends ProFormProps {
     onReset?: (payload?: any) => void;
     onResetClick?: () => void;
 }
+export interface QueryFilterLayoutProps {
+    prefixCls?: string;
+    className?: string;
+    addonBefore?: ReactNode;
+    addonAfter?: ReactNode;
+    inlineContent?: ReactNode;
+    panelContent?: ReactNode;
+    count?: number;
+    expand?: boolean;
+    onExpand?: (expand: boolean) => void;
+}
 export interface QueryFilterProps extends ProFormProps {
     /**
      * @deprecated triggerType已弃用
      */
     triggerType?: 'keydown' | 'change' | 'submit';
+    /** 表单展示形式 */
     mode?: 'inline' | 'panel';
+    /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
+    /** 顶部筛选区后缀 */
     addonAfter?: ReactNode;
+    /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
+    /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
+    /** onChange事件的防抖时间 */
+    filterDebounce?: number;
+    /** 表单初始化（含异步默认值）后回调函数 */
     onInit?: (values: any) => boolean;
+    /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
+    /** 表单重置回调函数 */
     onReset?: (payload?: any) => void;
+    /** 高级筛选按钮切换 */
+    onExpand?: (expand: boolean) => void;
 }
 /**
  * 兼容性导出

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.26";
+declare const version = "1.2.27";
 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.26';
+var version = '1.2.27';
 exports.version = version;

package/lib/info/index.scss

@@ -1,6 +1,6 @@
 .teamix-pro-info {
   color: var(--color-brand1-6);
-  
+
   .teamix-pro-info-content-row {
     width: 100%;
   }

package/lib/nocode/pages/renderer.js

@@ -37,7 +37,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 

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

@@ -9,10 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("@teamix/utils");
 
-var _components = require("@alicloudfe/components");
-
-var _icon = _interopRequireDefault(require("@teamix/icon"));
-
 var _actions = require("../../../actions");
 
 var _form = require("../../../form");
@@ -21,11 +17,9 @@ var _ToolBar = _interopRequireDefault(require("../ToolBar"));
 
 var _QuickAction = _interopRequireDefault(require("../QuickAction"));
 
-var _lodash = _interopRequireDefault(require("lodash.isempty"));
-
 require("./index.scss");
 
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterForm", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -41,24 +35,11 @@ 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; }
 
 var cls = (0, _utils.baseClass)('teamix-pro-table-layout');
-var toJS = _form.formilyReactive.toJS;
 
 var Layout = function Layout(props) {
   var header = props.header,
@@ -66,27 +47,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;
-
-  var _useState = (0, _react.useState)((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) || false),
-      _useState2 = _slicedToArray(_useState, 2),
-      expand = _useState2[0],
-      setExpand = _useState2[1];
+      otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      hasDot = _useState4[0],
-      setHasDot = _useState4[1];
-
-  (0, _react.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;
@@ -112,96 +76,66 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
-  }; // 渲染 mode='inline' 数据过滤区
-
+  }; // 渲染新版 QueryFilter
 
-  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.default.createElement("div", {
-        className: cls('inline-filter')
-      }, /*#__PURE__*/_react.default.createElement(_form.SimpleFilter, _objectSpread({
-        form: dataFilterForm
-      }, dataFilter)));
-    }
-  }; // 渲染 mode='panel' 数据过滤区
-
-
-  var renderPanelFilter = function renderPanelFilter() {
+  var renderQueryFilter = function renderQueryFilter() {
     if (dataFilter) {
-      var _dataFilter$schema2;
+      var _dataFilter$schema;
 
       if ( /*#__PURE__*/(0, _react.isValidElement)(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
-        // 自定义渲染内容，当 `schema=[]` 时生效
-        return /*#__PURE__*/_react.default.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.default.createElement("div", {
-          className: cls('panel-filter'),
-          style: {
-            display: expand ? 'block' : 'none'
-          }
-        }, /*#__PURE__*/_react.default.createElement(_form.AdvancedFilter, _objectSpread({
-          form: dataFilterForm
-        }, dataFilter)));
+        // 自定义渲染内容
+        return /*#__PURE__*/_react.default.createElement(_form.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.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)))
+        }, 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.default.createElement(_form.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.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)))
+        }, 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 !(0, _lodash.default)(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.default.createElement(_components.Badge, {
-          dot: true,
-          className: cls('filter-btn')
-        }, /*#__PURE__*/_react.default.createElement(_components.Button, {
-          onClick: handleBtnClick,
-          style: {
-            minWidth: 'unset'
-          }
-        }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-          type: expand ? 'up-line' : 'filter-line'
-        }), (0, _utils.getMessage)('filter')));
-      } else return /*#__PURE__*/_react.default.createElement(_components.Button, {
-        onClick: handleBtnClick,
-        className: cls('filter-btn'),
-        style: {
-          minWidth: 'unset'
-        }
-      }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-        type: expand ? 'up-line' : 'filter-line'
-      }), (0, _utils.getMessage)('filter'));
-    }
   }; // 区域组合渲染
 
 
@@ -217,61 +151,21 @@ var Layout = function Layout(props) {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }))), /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('left')
-      }, mainAction && renderMainAction(), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('right')
-      }, /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      }))), renderQueryFilter());
     } else if (header && !mainAction) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), renderQueryFilter())));
     } else if (!header && mainAction) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('left')
-      }, mainAction && renderMainAction(), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {
-      if (!dataFilterForm && !extra) {
+      if (!dataFilterFormRef && !extra) {
         return null;
       }
 
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('left')
-      }, mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
     }
   };
 

package/lib/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/lib/table/components/Pagination/index.js

@@ -79,6 +79,7 @@ var _default = function _default(props) {
     onChange: propsOnChange,
     total: total,
     pageSize: pageSize,
+    current: current,
     shape: 'arrow-only',
     pageSizeList: pageSizeList,
     pageSizeSelector: pageSizeSelector,

package/lib/table/components/ToolBar/FullScreenIcon.js

@@ -44,17 +44,11 @@ var FullScreenIcon = function FullScreenIcon(props) {
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      fullscreen = _useState4[0],
-      setFullscreen = _useState4[1]; // 点击全屏
+      fullscreen = _useState2[0],
+      setFullscreen = _useState2[1]; // 点击全屏
 
 
   var allScreenHandle = function allScreenHandle() {
-    setVisible(false);
     setTimeout(function () {
       var _actionRef$current, _actionRef$current$fu;
 
@@ -72,7 +66,8 @@ var FullScreenIcon = function FullScreenIcon(props) {
   }, []); // 监听全屏变化
 
   (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$o = _actionRef$current3.on) === null || _actionRef$current3$o === void 0 ? void 0 : _actionRef$current3$o.call(_actionRef$current3, function (state) {
-    setFullscreen(state);
+    // console.log('dataFilterForm', actionRef.current?.dataFilterForm);
+    setFullscreen(state); // actionRef.current?.dataFilterForm?.setValues(formValues);
   }, 'fullScreenState', 'fullscreenIcon');
   return /*#__PURE__*/_react.default.createElement(_components.Button, {
     iconSize: "small",