@teamix/pro 1.4.0 → 1.4.3

package/es/form/ProForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
+var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "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; }
 
@@ -11,8 +11,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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, { memo, useMemo } from 'react';
-import cls from 'classnames';
-import { usePrefixCls, getLanguage, getGlobalConfig } from '@teamix/utils';
+import { usePrefixCls, cls, getLanguage, getGlobalConfig } from '@teamix/utils';
 import { createForm, onFieldValueChange, onFormValuesChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { toJS } from '@formily/reactive';
 import { Form, Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
@@ -26,7 +25,6 @@ import SchemaForm from '../SchemaForm';
 import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
 import useInitialRequest from './useInitialRequest';
-import useFieldSchema from './useFieldSchema';
 import validateLocale from '../locales/validate';
 import './index.scss';
 registerValidateLocale(validateLocale);
@@ -78,6 +76,8 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
       validateFirst = _ref.validateFirst,
+      schema = _ref.schema,
+      children = _ref.children,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   // 获取全局配置
@@ -90,14 +90,11 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       validateFirst: validateFirst
     });
   }, []);
-  var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form'
-  });
+  var prefixCls = usePrefixCls('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
 
-  var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
     context: context
-  }); // context需要实名不能解构
-
+  });
 
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), ProFieldComponents);
 
@@ -120,7 +117,6 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       wrapperCol: mergeArrayValue([24], wrapperCol)
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
-  var schema = useFieldSchema(otherProps);
   useMemo(function () {
     // 配置表单默认值
     if (initialValues) {
@@ -159,7 +155,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
     }
   }, [onChange]);
   return /*#__PURE__*/React.createElement(Form, _objectSpread(_objectSpread(_objectSpread({
-    className: cls(prefixCls, className)
+    className: cls(prefixCls(), className)
   }, otherProps), getTeamixLayout), {}, {
     form: form,
     onAutoSubmit: onAutoSubmit,
@@ -168,15 +164,8 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
     schema: schema,
     scope: mergedScope,
     components: mergedComponents
-  }) : null, otherProps === null || otherProps === void 0 ? void 0 : otherProps.children);
+  }) : null, children);
 });
-
-var Field = function Field() {
-  return /*#__PURE__*/React.createElement(React.Fragment, null);
-};
-
-Field.displayName = 'ProFormField';
-ProForm.Field = Field;
 ProForm.defaultProps = {
   colon: false,
   labelAlign: 'left',

package/es/form/SchemaForm/initializeSelectTable.js

@@ -22,8 +22,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import cls from 'classnames';
-import { usePrefixCls, isStr, isPlainObj, isArr } from '@teamix/utils';
+import { usePrefixCls, cls, isStr, isPlainObj, isArr } from '@teamix/utils';
 import pureGenProColumnToColumn from '../../table/utils/pureGenProColumnToColumn';
 /**
  * 将可被 ProForm 识别的上下文转换为仅被 ProTable 识别的上下文
@@ -85,15 +84,13 @@ var initialize = function initialize(item) {
   var _item$children = item.children,
       children = _item$children === void 0 ? [] : _item$children,
       props = item.props;
-  var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form-select-table-column-tree'
-  });
+  var prefixCls = usePrefixCls('teamix-pro-form-select-table-column-tree');
   var columns = props === null || props === void 0 ? void 0 : (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.map(function (value, index) {
     var column = adapterContext(value);
 
     if ((props === null || props === void 0 ? void 0 : props.isTree) && index === 0) {
       return _objectSpread(_objectSpread({}, column), {}, {
-        className: cls(column.className, prefixCls)
+        className: cls(prefixCls(), column.className)
       });
     }
 

package/es/form/typing.d.ts

@@ -78,9 +78,6 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
     onInitialComplete?: (form: FormType) => void;
 }
-export declare type ComposedProForm = React.FC<ProFormProps> & {
-    Field?: React.FC<any>;
-};
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;

package/es/index.d.ts

@@ -27,5 +27,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.17";
+declare const version = "1.4.3";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -29,9 +29,8 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table';
 export * from './sidebar';
-export * from './utils'; // export * from './sidebar';
-
+export * from './utils';
 export * from './timeline';
-var version = '1.3.17';
+var version = '1.4.3';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

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

@@ -32,14 +32,14 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import TeamixIcon from '@teamix/icon';
 import ProField from '../../../field';
-import { baseClass, getTargetValue, request } from '@teamix/utils';
+import { usePrefixCls, getTargetValue, request } from '@teamix/utils';
 import PopConfirm from '@teamix/pop-confirm';
 import React, { useMemo, useState } from 'react';
 import './index.scss';
 import ProForm, { createForm, formilyReactive } from '../../../form';
 import { Message } from '@alicloudfe/components';
 import { ProActionGroup } from '../../../actions';
-var cls = baseClass('teamix-pro-info');
+var cls = usePrefixCls('teamix-pro-info');
 var toJS = formilyReactive.toJS;
 
 var InfoValueItem = function InfoValueItem(props) {

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

@@ -1,9 +1,10 @@
 import { Grid } from '@alicloudfe/components';
 import { ProSkeletonRaw } from '../../..';
-import { baseClass, Ellipsis, LabelIconTip } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React from 'react';
+import { Ellipsis, LabelIconTip } from '../../../field';
 import './index.scss';
-var cls = baseClass('teamix-pro-field-info-form-item');
+var cls = usePrefixCls('teamix-pro-field-info-form-item');
 var Row = Grid.Row,
     Col = Grid.Col;
 

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

@@ -20,7 +20,7 @@ import React, { useMemo } from 'react';
 import './index.scss';
 import { Table } from '@alicloudfe/components';
 import './index.scss';
-import { LabelIconTip } from '@teamix/utils';
+import { LabelIconTip } from '../../../field';
 import InfoValueItem from '../InfoValueItem';
 import { ProSkeletonRaw } from '../../..';
 import { getDataIndexValue } from '../../utils';

package/es/nocode/pages/editor.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import SVG from '@teamix/svg';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import { PagePlayground } from './playground';
 import { PageMap, PageDefaultInitialValues } from '.';
-var cls = baseClass('teamix-pro-pager');
+var cls = usePrefixCls('teamix-pro-pager');
 export var PageEditor = function PageEditor(props) {
   var type = props.type,
       initialValues = props.initialValues,

package/es/nocode/pages/playground.js

@@ -21,12 +21,12 @@ import { Balloon } from '@alicloudfe/components';
 import { useDebounceFn } from '@teamix/hooks';
 import Icon from '@teamix/icon';
 import SVG from '@teamix/svg';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import { useAction } from '../../actions';
 import { initConfigurator } from '../configurators';
 import { ComponentConfiguratorMap } from '../configurators/map';
 import { PlayGroundLayout } from '../playground';
-var cls = baseClass('teamix-nocode');
+var cls = usePrefixCls('teamix-nocode');
 export var PagePlayground = function PagePlayground(props) {
   var _useState = useState(undefined),
       _useState2 = _slicedToArray(_useState, 2),

package/es/nocode/pages/renderer.js

@@ -38,9 +38,9 @@ import SVG from '@teamix/svg';
 import PageContainer from '../../page-container';
 import PageHeader from '../../page-header';
 import { ProSkeletonRaw } from '../../skeleton';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import { PageMap } from '.';
-var cls = baseClass('teamix-nocode');
+var cls = usePrefixCls('teamix-nocode');
 
 var Loading = function Loading(props) {
   return /*#__PURE__*/React.createElement(PageContainer, _objectSpread({

package/es/nocode/playground.js

@@ -17,10 +17,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useMemo } from 'react';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import { useDebounceFn } from '@teamix/hooks';
 import { initConfigurator } from './configurators';
-var cls = baseClass('teamix-nocode-playground');
+var cls = usePrefixCls('teamix-nocode-playground');
 export var PlayGroundLayout = function PlayGroundLayout(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: cls()

package/es/page-header/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
-import { LinkPath, ProTagItem, CapsuleTabType } from '@teamix/utils';
+import { LinkPath } from '@teamix/utils';
+import { CapsuleTabType, ProTagItem } from '../field';
 import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';

package/es/page-header/index.js

@@ -17,12 +17,13 @@ import { useHistory } from 'react-router-dom';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
 import { Breadcrumb, Balloon } from '@alicloudfe/components';
-import { baseClass, goToLink, renderTags, isPresetColor, getColor, getColorClassName, getBackgroundColorClassName, CapsuleTab } from '@teamix/utils';
+import { usePrefixCls, goToLink, isPresetColor, getColor, getColorClassName, getBackgroundColorClassName } from '@teamix/utils';
+import { CapsuleTab, renderTags } from '../field';
 import { ProActionGroup } from '../actions';
 import { ProSkeletonRaw } from '../skeleton';
 import ProInfo from '../info';
 import './index.scss';
-var cls = baseClass('teamix-pro-page-header');
+var cls = usePrefixCls('teamix-pro-page-header');
 var Tooltip = Balloon.Tooltip;
 
 var renderNav = function renderNav(breadcrumbs) {

package/es/sidebar/components/sidebar-container/index.js

@@ -33,11 +33,11 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { Button, MenuButton, Message } from '@alicloudfe/components';
 import { ProCard } from '../../../card';
 import ProField from '@teamix/pro-field';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React, { useEffect, useRef, useState } from 'react';
 import './index.scss';
 import TeamixIcon from '@teamix/icon';
-var cls = baseClass('teamix-pro-sidebar-container');
+var cls = usePrefixCls('teamix-pro-sidebar-container');
 
 var ProSidebarContainer = function ProSidebarContainer(props) {
   var children = props.children,

package/es/sidebar/components/tree/index.js

@@ -33,7 +33,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 { Tree } from '@alicloudfe/components';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React, { useEffect, useMemo, useState } from 'react';
 import { renderTreeNode, renderTreeNodeDependenceValue } from '../tree-node';
 import './index.scss';
@@ -42,7 +42,7 @@ import { filterTreeData, getAllNodeKey, getTreeLevelKey, loop } from '../../util
 import { useUpdateEffect } from '@teamix/hooks';
 import { useActionType } from '../../utils/action-ref';
 import cloneDeep from 'lodash.clonedeep';
-var cls = baseClass('teamix-pro-sidebar-tree');
+var cls = usePrefixCls('teamix-pro-sidebar-tree');
 
 var ProSidebarTree = function ProSidebarTree(props) {
   var _ref;

package/es/sidebar/components/tree-node/components/HoverTooltip/index.js

@@ -17,10 +17,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Balloon } from '@alicloudfe/components';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React, { useEffect, useState } from 'react';
 import './index.scss';
-var cls = baseClass('teamix-pro-hover-tooltip');
+var cls = usePrefixCls('teamix-pro-hover-tooltip');
 
 var ProHoverTooltip = function ProHoverTooltip(props) {
   var trigger = props.trigger,

package/es/sidebar/components/tree-node/components/IconAction/index.js

@@ -18,11 +18,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import TeamixIcon from '@teamix/icon';
 import { useAction } from '../../../../..';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React, { useState } from 'react';
 import ProHoverTooltip from '../HoverTooltip';
 import './index.scss';
-var cls = baseClass('teamix-pro-sidebar-icon-action');
+var cls = usePrefixCls('teamix-pro-sidebar-icon-action');
 
 var ProIconAction = function ProIconAction(props) {
   var _popupProps$wrapperCl;

package/es/sidebar/components/tree-node/components/IconSwitch/index.js

@@ -11,11 +11,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import TeamixIcon from '@teamix/icon';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React, { isValidElement, useEffect, useState } from 'react';
 import ProHoverTooltip from '../HoverTooltip';
 import './index.scss';
-var cls = baseClass('teamix-pro-icon-switch');
+var cls = usePrefixCls('teamix-pro-icon-switch');
 
 var ProIconSwitch = function ProIconSwitch(props) {
   var visibleProp = props.visible,

package/es/sidebar/components/tree-node/index.js

@@ -26,13 +26,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Tree } from '@alicloudfe/components';
 import { ProActionGroup } from '../../../actions';
-import { baseClass, renderTags } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React, { isValidElement, useState } from 'react';
-import ProField from '@teamix/pro-field';
+import ProField, { renderTags } from '@teamix/pro-field';
 import ProIconAction from './components/IconAction';
 import ProIconSwitch from './components/IconSwitch';
 import ProHoverTooltip from './components/HoverTooltip';
-var cls = baseClass('teamix-pro-sidebar-tree');
+var cls = usePrefixCls('teamix-pro-sidebar-tree');
 
 var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
   var tag = props.tag,

package/es/sidebar/index.js

@@ -24,7 +24,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React, { useEffect, useRef, useState } from 'react';
 import './index.scss';
-import { baseClass, doCommonRequest } from '@teamix/utils';
+import { usePrefixCls, doCommonRequest } from '@teamix/utils';
 import ProSidebarContainer from './components/sidebar-container';
 import ProSidebarTree from './components/tree';
 import { getTreeLevel, ProSkeletonRaw } from '..';
@@ -32,7 +32,7 @@ import { useActionType } from './utils/action-ref';
 import debounce from 'lodash.debounce';
 export * from './typing';
 export * from './utils';
-var cls = baseClass('teamix-pro-sidebar');
+var cls = usePrefixCls('teamix-pro-sidebar');
 
 var ProSidebar = function ProSidebar(props) {
   var selectedKeys = props.selectedKeys,

package/es/sidebar/typing.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
 import { MessageProps } from '@alifd/next/types/message';
 import { TreeProps } from '@alifd/next/types/tree';
-import { CommonRequestConfig, ProTagItem } from '@teamix/utils';
+import { CommonRequestConfig } from '@teamix/utils';
+import { ProTagItem } from '../field';
 import { ProActionConfig, ProCardProps, ProFieldProps, ProFieldRenderProps, ProFieldType } from '..';
 /** ProSidebar 定义 */
 export declare type ProSidebarProps = {

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

@@ -28,10 +28,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState } from 'react';
 import TeamixIcon from '@teamix/icon';
 import { Button, Dropdown, Menu } from '@alicloudfe/components';
-import { baseClass, getMessage } from '@teamix/utils';
+import { usePrefixCls, getMessage } from '@teamix/utils';
 import './index.scss';
 var CheckboxItem = Menu.CheckboxItem;
-var cls = baseClass('teamix-pro-table-toolbar-filter');
+var cls = usePrefixCls('teamix-pro-table-toolbar-filter');
 var RadioItem = Menu.RadioItem;
 
 var Filter = function Filter(props) {

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

@@ -1,4 +1,4 @@
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "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; }
 
@@ -13,13 +13,14 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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, { isValidElement } from 'react';
-import { Header, baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
+import { Header } from '../../../field';
 import { ProActionGroup } from '../../../actions';
 import { QueryFilter, QueryFilterLayout } from '../../../form';
 import ToolBar from '../ToolBar';
 import QuickAction from '../QuickAction';
 import './index.scss';
-var cls = baseClass('teamix-pro-table-layout');
+var cls = usePrefixCls('teamix-pro-table-layout');
 
 var Layout = function Layout(props) {
   var header = props.header,
@@ -28,6 +29,7 @@ var Layout = function Layout(props) {
       actionRef = props.actionRef,
       dataFilter = props.dataFilter,
       dataFilterFormRef = props.dataFilterFormRef,
+      afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
@@ -99,7 +101,7 @@ var Layout = function Layout(props) {
           addonAfter: renderAddonAfter()
         }, dataFilter));
       } 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({
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(QueryFilter, _objectSpread({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
@@ -116,7 +118,9 @@ var Layout = function Layout(props) {
           },
           addonBefore: renderMainAction(),
           addonAfter: renderAddonAfter()
-        }, dataFilter));
+        }, dataFilter)), afterDataFilter && /*#__PURE__*/React.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction

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

@@ -25,10 +25,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 // 自适应宽度的翻页器
 import React, { useState, useEffect } from 'react';
 import { Pagination, Balloon, Select, Button, Input, Icon } from '@alicloudfe/components';
-import { getMessage, baseClass, usePrefixCls } from '@teamix/utils';
+import { getMessage, cls, usePrefixCls } from '@teamix/utils';
 import { useResponsiveProps } from '@teamix/hooks';
 import './index.scss';
-var cls = baseClass('teamix-pro-pagination');
 export default (function (props) {
   var className = props.className,
       propsOnChange = props.onChange,
@@ -42,6 +41,11 @@ export default (function (props) {
       responsivePaginationType = props.responsivePaginationType,
       otherProps = _objectWithoutProperties(props, _excluded);
 
+  var basePrefix = usePrefixCls('', {
+    base: true
+  });
+  var prefixCls = usePrefixCls('teamix-pro-pagination');
+
   var _useResponsiveProps = useResponsiveProps([480, 590, 700], ['mini', 'small', 'simple', 'normal']),
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
@@ -97,11 +101,11 @@ export default (function (props) {
         total: total
       }))
     }, /*#__PURE__*/React.createElement("div", {
-      className: cls('custom-total-content')
+      className: prefixCls('custom-total-content')
     }, /*#__PURE__*/React.createElement("div", {
       className: "title"
     }, getMessage('pageSize')), /*#__PURE__*/React.createElement(Select, {
-      className: cls('custom-page-size-selector'),
+      className: prefixCls('custom-page-size-selector'),
       dataSource: pageSizeList,
       defaultValue: pageSize,
       followTrigger: true,
@@ -158,9 +162,9 @@ export default (function (props) {
     };
 
     return /*#__PURE__*/React.createElement("div", {
-      className: cls('custom-jumper')
+      className: prefixCls('custom-jumper')
     }, /*#__PURE__*/React.createElement(Button, {
-      className: "".concat(usePrefixCls(), "prev ").concat(usePrefixCls(), "pagination-item"),
+      className: basePrefix('prev', 'pagination-item'),
       onClick: handlePrevClick,
       disabled: Number(currentPage) <= 1
     }, /*#__PURE__*/React.createElement(Icon, {
@@ -182,7 +186,7 @@ export default (function (props) {
         marginRight: 4
       }
     }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/React.createElement(Button, {
-      className: "".concat(usePrefixCls(), "next ").concat(usePrefixCls(), "pagination-item"),
+      className: basePrefix('next', 'pagination-item'),
       onClick: handleNextClick,
       //@ts-ignore
       disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -200,7 +204,7 @@ export default (function (props) {
         }, otherProps));
       } else {
         return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(cls('custom-mini-pagination'), "  ").concat(usePrefixCls(), "pagination")
+          className: cls(basePrefix('pagination'), prefixCls('custom-mini-pagination'))
         }, customTotalRender(total), customJumpRender());
       }
     }
@@ -249,7 +253,7 @@ export default (function (props) {
     // 用于获取翻页器响应式 ref
     React.createElement("div", {
       ref: paginationWrapperRef,
-      className: cls('wrapper')
+      className: prefixCls('wrapper')
     }, renderPagination())
   );
 });

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

@@ -15,11 +15,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 import { Button, Dropdown, Menu } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
-import { baseClass, getMessage } from '@teamix/utils';
+import { usePrefixCls, getMessage } from '@teamix/utils';
 import React, { useState } from 'react';
 import './index.scss';
 var RadioItem = Menu.RadioItem;
-var cls = baseClass('teamix-pro-table-toolbar-icon');
+var cls = usePrefixCls('teamix-pro-table-toolbar-icon');
 
 var DensityIcon = function DensityIcon(props) {
   var _actionRef$current;

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

@@ -29,29 +29,23 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  */
 import { Button, Dropdown, Menu, Dialog, Grid, Checkbox } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
-import { baseClass, getMessage } from '@teamix/utils';
+import { usePrefixCls, getMessage, getGlobalConfig } from '@teamix/utils';
 import React, { useState, useEffect } from 'react';
 import { cloneDeep, off, on } from '../../utils';
+import { Ellipsis } from '../../../field';
 import './index.scss';
-import { Ellipsis, getCookie } from '@teamix/utils';
 var CheckboxItem = Menu.CheckboxItem;
 var Row = Grid.Row,
     Col = Grid.Col;
-var cls = baseClass('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
-
-var isRoot = getCookie('organizationId') === '1';
+var cls = usePrefixCls('teamix-pro-table-toolbar-filter-column');
 
 var processColumns = function processColumns(columns) {
-  if (isRoot) {
-    // root 组织下不显示标签管理
-    columns = columns.filter(function (item) {
-      return item.valueType !== 'selectGroup';
-    });
-  } // hidden 为 true 时不展示
+  var _getGlobalConfig;
 
+  var globalFilterColumns = (_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns; // hidden 为 true 时不展示
 
   columns = columns.filter(function (item) {
-    return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
+    return (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
   });
   return columns.map(function (item) {
     if (item.columnFilters === false) {

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

@@ -15,10 +15,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 import { Button } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import React, { useEffect, useState } from 'react';
 import './index.scss';
-var cls = baseClass('teamix-pro-table-toolbar-icon');
+var cls = usePrefixCls('teamix-pro-table-toolbar-icon');
 
 var FullScreenIcon = function FullScreenIcon(props) {
   var _actionRef$current3, _actionRef$current3$o;

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

@@ -3,10 +3,10 @@
  */
 import { Button, Balloon } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
-import { baseClass, getMessage } from '@teamix/utils';
+import { usePrefixCls, getMessage } from '@teamix/utils';
 import React from 'react';
 import './index.scss';
-var cls = baseClass('teamix-pro-table-toolbar-icon');
+var cls = usePrefixCls('teamix-pro-table-toolbar-icon');
 
 var LayoutIcon = function LayoutIcon(props) {
   var actionRef = props.actionRef; // const [fullscreen, setFullscreen] = useState<boolean>(false);