@teamix/pro 1.3.16 → 1.4.1

package/lib/form/Filter/useBindUrl.js

@@ -62,20 +62,20 @@ var _default = function _default(bindUrl, functions, formRef) {
   }; // 通过 useUrlState 获取 url 上的参数和 url 配置方法
 
 
-  var _useUrlState = (0, _hooks.useUrlState)(undefined, initializeBindUrl(bindUrl)),
-      _useUrlState2 = _slicedToArray(_useUrlState, 2),
-      urlState = _useUrlState2[0],
-      setUrlState = _useUrlState2[1]; // 输出配置url参数的函数
+  var _ref4 = bindUrl ? (0, _hooks.useUrlState)(undefined, initializeBindUrl((0, _utils.isPlainObj)(bindUrl) ? bindUrl : {})) : [],
+      _ref5 = _slicedToArray(_ref4, 2),
+      urlState = _ref5[0],
+      setUrlState = _ref5[1]; // 输出配置url参数的函数
 
 
-  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref4) {
-    var _ref5 = _slicedToArray(_ref4, 2),
-        key = _ref5[0],
-        fun = _ref5[1];
+  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref6) {
+    var _ref7 = _slicedToArray(_ref6, 2),
+        key = _ref7[0],
+        fun = _ref7[1];
 
     prev[key] = function (values) {
       fun === null || fun === void 0 ? void 0 : fun(values);
-      setUrlState(values);
+      setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(values);
     };
 
     return prev;
@@ -85,12 +85,12 @@ var _default = function _default(bindUrl, functions, formRef) {
     if (urlState) {
       var _Object$entries2;
 
-      (_Object$entries2 = Object.entries(urlState)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref6) {
+      (_Object$entries2 = Object.entries(urlState)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref8) {
         var _form$query2;
 
-        var _ref7 = _slicedToArray(_ref6, 2),
-            key = _ref7[0],
-            value = _ref7[1];
+        var _ref9 = _slicedToArray(_ref8, 2),
+            key = _ref9[0],
+            value = _ref9[1];
 
         var field = (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
 

package/lib/form/ProForm/index.d.ts

@@ -1,4 +1,5 @@
-import type { ComposedProForm } from '../typing';
+import React from 'react';
+import type { ProFormProps } from '../typing';
 import './index.scss';
-declare const ProForm: ComposedProForm;
+declare const ProForm: React.FC<ProFormProps>;
 export default ProForm;

package/lib/form/ProForm/index.js

@@ -9,8 +9,6 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _utils = require("@teamix/utils");
 
 var _core = require("@formily/core");
@@ -39,13 +37,11 @@ var _useAutoSubmit = _interopRequireDefault(require("./useAutoSubmit"));
 
 var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 
-var _useFieldSchema = _interopRequireDefault(require("./useFieldSchema"));
-
 var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -112,6 +108,8 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
       validateFirst = _ref.validateFirst,
+      schema = _ref.schema,
+      children = _ref.children,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   // 获取全局配置
@@ -124,9 +122,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       validateFirst: validateFirst
     });
   }, []);
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form');
 
   var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
     context: context
@@ -154,7 +150,6 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
-  var schema = (0, _useFieldSchema.default)(otherProps);
   (0, _react.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {
@@ -193,7 +188,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     }
   }, [onChange]);
   return /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
-    className: (0, _classnames.default)(prefixCls, className)
+    className: (0, _utils.cls)(prefixCls(), className)
   }, otherProps), getTeamixLayout), {}, {
     form: form,
     onAutoSubmit: onAutoSubmit,
@@ -202,15 +197,8 @@ var ProForm = /*#__PURE__*/(0, _react.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.default.createElement(_react.default.Fragment, null);
-};
-
-Field.displayName = 'ProFormField';
-ProForm.Field = Field;
 ProForm.defaultProps = {
   colon: false,
   labelAlign: 'left',

package/lib/form/SchemaForm/initializeSelectTable.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _utils = require("@teamix/utils");
 
 var _pureGenProColumnToColumn = _interopRequireDefault(require("../../table/utils/pureGenProColumnToColumn"));
@@ -96,15 +94,13 @@ var initialize = function initialize(item) {
   var _item$children = item.children,
       children = _item$children === void 0 ? [] : _item$children,
       props = item.props;
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-select-table-column-tree'
-  });
+  var prefixCls = (0, _utils.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: (0, _classnames.default)(column.className, prefixCls)
+        className: (0, _utils.cls)(prefixCls(), column.className)
       });
     }
 

package/lib/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/lib/index.d.ts

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

package/lib/index.js

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

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

@@ -63,7 +63,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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-info');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-info');
 var toJS = _form.formilyReactive.toJS;
 
 var InfoValueItem = function InfoValueItem(props) {

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

@@ -13,11 +13,13 @@ var _utils = require("@teamix/utils");
 
 var _react = _interopRequireDefault(require("react"));
 
+var _field = require("../../../field");
+
 require("./index.scss");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-field-info-form-item');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-field-info-form-item');
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
 
@@ -41,9 +43,9 @@ var ProInfoItem = function ProInfoItem(prop) {
     }, /*#__PURE__*/_react.default.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')
-    }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
+    }, /*#__PURE__*/_react.default.createElement(_field.Ellipsis, {
       tooltip: label
-    }, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
+    }, /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
       label: label,
       tooltip: tooltip,
       icon: tooltipIcon
@@ -64,7 +66,7 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('header-row')
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: cls('header-label')
-    }, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
+    }, /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
       label: label,
       tooltip: tooltip,
       icon: tooltipIcon

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

@@ -13,13 +13,13 @@ require("./index.scss");
 
 var _components = require("@alicloudfe/components");
 
-var _utils = require("@teamix/utils");
+var _field = require("../../../field");
 
 var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
 
 var _2 = require("../../..");
 
-var _utils2 = require("../../utils");
+var _utils = require("../../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -80,7 +80,7 @@ var ProTableInfo = function ProTableInfo(props) {
 
     return /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
       type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-      value: (0, _utils2.getDataIndexValue)(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
+      value: (0, _utils.getDataIndexValue)(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
       render: item.render,
       dataSource: item.dataSource,
       infoItem: item,
@@ -129,7 +129,7 @@ var ProTableInfo = function ProTableInfo(props) {
       var itemData = filterColumns.map(function (item, index) {
         var _item$title, _data;
 
-        var data = (_data = {}, _defineProperty(_data, "label_".concat(index), /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
+        var data = (_data = {}, _defineProperty(_data, "label_".concat(index), /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
           label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
           tooltip: item.tooltip,
           icon: item.tooltipIcon

package/lib/nocode/pages/editor.js

@@ -17,7 +17,7 @@ var _ = require(".");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-pager');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-pager');
 
 var PageEditor = function PageEditor(props) {
   var type = props.type,

package/lib/nocode/pages/playground.js

@@ -51,7 +51,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.baseClass)('teamix-nocode');
+var cls = (0, _utils.usePrefixCls)('teamix-nocode');
 
 var PagePlayground = function PagePlayground(props) {
   var _useState = (0, _react.useState)(undefined),

package/lib/nocode/pages/renderer.js

@@ -57,7 +57,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-var cls = (0, _utils.baseClass)('teamix-nocode');
+var cls = (0, _utils.usePrefixCls)('teamix-nocode');
 
 var Loading = function Loading(props) {
   return /*#__PURE__*/_react.default.createElement(_pageContainer.default, _objectSpread({

package/lib/nocode/playground.js

@@ -37,7 +37,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.baseClass)('teamix-nocode-playground');
+var cls = (0, _utils.usePrefixCls)('teamix-nocode-playground');
 
 var PlayGroundLayout = function PlayGroundLayout(props) {
   return /*#__PURE__*/_react.default.createElement("div", {

package/lib/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/lib/page-header/index.js

@@ -17,6 +17,8 @@ var _components = require("@alicloudfe/components");
 
 var _utils = require("@teamix/utils");
 
+var _field = require("../field");
+
 var _actions = require("../actions");
 
 var _skeleton = require("../skeleton");
@@ -41,7 +43,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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-page-header');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-page-header');
 var Tooltip = _components.Balloon.Tooltip;
 
 var renderNav = function renderNav(breadcrumbs) {
@@ -145,7 +147,7 @@ var renderInfo = function renderInfo(info) {
 
 var renderTabs = function renderTabs(tabs) {
   if (tabs) {
-    return /*#__PURE__*/_react.default.createElement(_utils.CapsuleTab, _objectSpread({}, tabs));
+    return /*#__PURE__*/_react.default.createElement(_field.CapsuleTab, _objectSpread({}, tabs));
   }
 
   return null;
@@ -229,7 +231,7 @@ var ProPageHeader = function ProPageHeader(props) {
         size: "xs"
       })),
       align: "t"
-    }, titleTooltip)), (0, _utils.renderTags)(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
+    }, titleTooltip)), (0, _field.renderTags)(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
   };
 
   return /*#__PURE__*/_react.default.createElement("header", _objectSpread({

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

@@ -59,7 +59,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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-sidebar-container');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-sidebar-container');
 
 var ProSidebarContainer = function ProSidebarContainer(props) {
   var children = props.children,

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

@@ -65,7 +65,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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-sidebar-tree');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-sidebar-tree');
 
 var ProSidebarTree = function ProSidebarTree(props) {
   var _ref;

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

@@ -37,7 +37,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-hover-tooltip');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-hover-tooltip');
 
 var ProHoverTooltip = function ProHoverTooltip(props) {
   var trigger = props.trigger,

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

@@ -43,7 +43,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-sidebar-icon-action');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-sidebar-icon-action');
 
 var ProIconAction = function ProIconAction(props) {
   var _popupProps$wrapperCl;

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

@@ -35,7 +35,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-icon-switch');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-icon-switch');
 
 var ProIconSwitch = function ProIconSwitch(props) {
   var visibleProp = props.visible,

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

@@ -15,7 +15,7 @@ var _utils = require("@teamix/utils");
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _proField = _interopRequireDefault(require("@teamix/pro-field"));
+var _proField = _interopRequireWildcard(require("@teamix/pro-field"));
 
 var _IconAction = _interopRequireDefault(require("./components/IconAction"));
 
@@ -55,7 +55,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-sidebar-tree');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-sidebar-tree');
 
 var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
   var tag = props.tag,
@@ -217,7 +217,7 @@ var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
     render: getFieldRender()
   }, fieldProps)), tag && /*#__PURE__*/_react.default.createElement("span", {
     className: cls('item-context-tag')
-  }, (0, _utils.renderTags)(getTags(tag)))), /*#__PURE__*/_react.default.createElement("div", {
+  }, (0, _proField.renderTags)(getTags(tag)))), /*#__PURE__*/_react.default.createElement("div", {
     className: cls('item-content-extra')
   }, renderExtra()));
 }; // 渲染树节点

package/lib/sidebar/index.js

@@ -81,7 +81,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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-sidebar');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-sidebar');
 
 var ProSidebar = function ProSidebar(props) {
   var selectedKeys = props.selectedKeys,

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

@@ -50,7 +50,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var CheckboxItem = _components.Menu.CheckboxItem;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-filter');
 var RadioItem = _components.Menu.RadioItem;
 
 var Filter = function Filter(props) {

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

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("@teamix/utils");
 
+var _field = require("../../../field");
+
 var _actions = require("../../../actions");
 
 var _form = require("../../../form");
@@ -39,7 +41,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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-table-layout');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-layout');
 
 var Layout = function Layout(props) {
   var header = props.header,
@@ -158,7 +160,7 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
+      }, header && /*#__PURE__*/_react.default.createElement(_field.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
         actionRef: actionRef,
@@ -172,7 +174,7 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
+      }, header && /*#__PURE__*/_react.default.createElement(_field.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
         actionRef: actionRef,

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

@@ -45,8 +45,6 @@ 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-pagination');
-
 var _default = function _default(props) {
   var className = props.className,
       propsOnChange = props.onChange,
@@ -60,6 +58,11 @@ var _default = function _default(props) {
       responsivePaginationType = props.responsivePaginationType,
       otherProps = _objectWithoutProperties(props, _excluded);
 
+  var basePrefix = (0, _utils.usePrefixCls)('', {
+    base: true
+  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-pagination');
+
   var _useResponsiveProps = (0, _hooks.useResponsiveProps)([480, 590, 700], ['mini', 'small', 'simple', 'normal']),
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
@@ -115,11 +118,11 @@ var _default = function _default(props) {
         total: total
       }))
     }, /*#__PURE__*/_react.default.createElement("div", {
-      className: cls('custom-total-content')
+      className: prefixCls('custom-total-content')
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "title"
     }, (0, _utils.getMessage)('pageSize')), /*#__PURE__*/_react.default.createElement(_components.Select, {
-      className: cls('custom-page-size-selector'),
+      className: prefixCls('custom-page-size-selector'),
       dataSource: pageSizeList,
       defaultValue: pageSize,
       followTrigger: true,
@@ -176,9 +179,9 @@ var _default = function _default(props) {
     };
 
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: cls('custom-jumper')
+      className: prefixCls('custom-jumper')
     }, /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "".concat((0, _utils.usePrefixCls)(), "prev ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
+      className: basePrefix('prev', 'pagination-item'),
       onClick: handlePrevClick,
       disabled: Number(currentPage) <= 1
     }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
@@ -200,7 +203,7 @@ var _default = function _default(props) {
         marginRight: 4
       }
     }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "".concat((0, _utils.usePrefixCls)(), "next ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
+      className: basePrefix('next', 'pagination-item'),
       onClick: handleNextClick,
       //@ts-ignore
       disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -218,7 +221,7 @@ var _default = function _default(props) {
         }, otherProps));
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
-          className: "".concat(cls('custom-mini-pagination'), "  ").concat((0, _utils.usePrefixCls)(), "pagination")
+          className: (0, _utils.cls)(basePrefix('pagination'), prefixCls('custom-mini-pagination'))
         }, customTotalRender(total), customJumpRender());
       }
     }
@@ -267,7 +270,7 @@ var _default = function _default(props) {
     // 用于获取翻页器响应式 ref
     _react.default.createElement("div", {
       ref: paginationWrapperRef,
-      className: cls('wrapper')
+      className: prefixCls('wrapper')
     }, renderPagination())
   );
 };

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

@@ -36,7 +36,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var RadioItem = _components.Menu.RadioItem;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-icon');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-icon');
 
 var DensityIcon = function DensityIcon(props) {
   var _actionRef$current;

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

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _utils2 = require("../../utils");
 
+var _field = require("../../../field");
+
 require("./index.scss");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -54,21 +56,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var CheckboxItem = _components.Menu.CheckboxItem;
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
-
-var isRoot = (0, _utils.getCookie)('organizationId') === '1';
+var cls = (0, _utils.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 = (0, _utils.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) {
@@ -399,7 +395,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
           setNewColumns(columnsList);
         },
         disabled: columnFiltersDisabled
-      }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
+      }, /*#__PURE__*/_react.default.createElement(_field.Ellipsis, {
         tooltip: title
       }, title)));
     }))));