@teamix/pro 1.2.8 → 1.2.12

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.7';
+var version = '1.2.11';
 exports.version = version;

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

@@ -1,6 +1,7 @@
 import React from 'react';
-import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
 import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
+import { LinkPath } from '@teamix/utils';
+import { ProTagItem } from '../utils/components/tags';
 import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -10,14 +11,7 @@ export interface ProPageHeaderBreadcrumbItem extends ItemProps {
      */
     text?: string;
 }
-export declare type ProPageHeaderTagItem = (TagProps | (CloseableProps & {
-    closable: true;
-})) & {
-    /**
-     * @deprecated 建议使用 children 代替
-     */
-    text?: string;
-};
+export declare type ProPageHeaderTagItem = ProTagItem;
 declare type Color = 'blue' | 'green' | 'orange' | 'red' | 'yellow' | string;
 export declare type ProPageHeaderDataItem = {
     title: string;
@@ -25,20 +19,35 @@ export declare type ProPageHeaderDataItem = {
     color?: Color;
 } & React.HTMLAttributes<HTMLElement>;
 export declare type ProPageHeaderProps = {
+    /** 标题 */
     title?: React.ReactNode;
+    /** 描述 */
     description?: React.ReactNode;
-    icon?: string;
+    /** 图标 */
+    icon?: React.ReactNode;
+    /** 图标颜色 */
     iconColor?: Color;
+    /** 图标背景类型 */
     iconBackgroundType?: 'circle' | 'square';
+    /** 图标背景色 */
     iconBackgroundColor?: Color;
-    goback?: string | boolean;
+    /** 返回按钮配置 */
+    goback?: boolean | LinkPath | ((e: React.MouseEvent) => void);
+    /** 背景图 */
     image?: string;
+    /** 加载中 */
     loading?: boolean;
+    /** 面包屑配置 */
     breadcrumb?: ProPageHeaderBreadcrumbItem[];
+    /** 额外信息区配置 */
     extra?: ProActionGroupProps | React.ReactNode;
+    /** 操作区配置 */
     operation?: ProActionGroupProps | React.ReactNode;
+    /** 标签组 */
     tags?: ProPageHeaderTagItem[];
+    /** 数据概览项 */
     data?: ProPageHeaderDataItem[];
+    /** 底部详情 */
     info?: ProInfoProps | React.ReactNode;
 } & Omit<React.HTMLAttributes<HTMLElement>, 'title'>;
 declare const ProPageHeader: React.FC<ProPageHeaderProps>;

package/lib/page-header/index.js

@@ -17,6 +17,8 @@ var _components = require("@alicloudfe/components");
 
 var _utils = require("@teamix/utils");
 
+var _tags = require("../utils/components/tags");
+
 var _actions = require("../actions");
 
 var _skeleton = require("../skeleton");
@@ -26,9 +28,8 @@ var _info = _interopRequireDefault(require("../info"));
 require("./index.scss");
 
 var _excluded = ["text", "children"],
-    _excluded2 = ["text", "children", "closable"],
-    _excluded3 = ["color", "title", "num", "className"],
-    _excluded4 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+    _excluded2 = ["color", "title", "num", "className"],
+    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -83,40 +84,6 @@ var renderActionGroup = function renderActionGroup(group, defaultProps) {
   return group;
 };
 
-var renderTags = function renderTags(tags) {
-  if (!tags) {
-    return null;
-  }
-
-  return /*#__PURE__*/_react.default.createElement(_components.Tag.Group, {
-    className: cls('tags')
-  }, tags.map(function (tag, i) {
-    // @ts-ignore
-    var text = tag.text,
-        children = tag.children,
-        closable = tag.closable,
-        others = _objectWithoutProperties(tag, _excluded2);
-
-    if (closable) {
-      return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, _objectSpread({
-        key: i,
-        size: "large",
-        style: {
-          marginBottom: 0
-        }
-      }, others), text || children);
-    }
-
-    return /*#__PURE__*/_react.default.createElement(_components.Tag, _objectSpread({
-      key: i,
-      size: "large",
-      style: {
-        marginBottom: 0
-      }
-    }, others), text || children);
-  }));
-};
-
 var isPresetColor = function isPresetColor(color) {
   if (!color) {
     return false;
@@ -154,7 +121,7 @@ var renderData = function renderData(data) {
         title = item.title,
         num = item.num,
         customClassName = item.className,
-        others = _objectWithoutProperties(item, _excluded3);
+        others = _objectWithoutProperties(item, _excluded2);
 
     var _getColorAndStyle = getColorAndStyle(color),
         className = _getColorAndStyle.className,
@@ -202,7 +169,7 @@ var ProPageHeader = function ProPageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
-      others = _objectWithoutProperties(props, _excluded4);
+      others = _objectWithoutProperties(props, _excluded3);
 
   var history = (0, _reactRouterDom.useHistory)();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;
@@ -220,12 +187,22 @@ var ProPageHeader = function ProPageHeader(props) {
         iconClass = _getColorAndStyle2.className,
         iconStyle = _getColorAndStyle2.style;
 
-    var onBack = function onBack() {
+    var onBack = function onBack(e) {
+      if (!goback) {
+        return;
+      }
+
+      if (typeof goback === 'function') {
+        goback(e);
+        return;
+      }
+
       if (goback === true) {
         history.go(-1);
-      } else if (typeof goback === 'string') {
-        history.push && history.push(goback);
+        return;
       }
+
+      (0, _utils.goToLink)(goback, history);
     };
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, goback && /*#__PURE__*/_react.default.createElement(_icon.default, {
@@ -233,14 +210,14 @@ var ProPageHeader = function ProPageHeader(props) {
       onClick: onBack,
       type: "return-line",
       size: "large"
-    }), icon && /*#__PURE__*/_react.default.createElement(_icon.default, {
+    }), icon && (typeof icon === 'string' ? /*#__PURE__*/_react.default.createElement(_icon.default, {
       className: (0, _classnames2.default)(iconClass, cls('title-icon')),
       style: iconStyle,
       type: icon,
       size: "large"
-    }), /*#__PURE__*/_react.default.createElement("span", {
+    }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon)), /*#__PURE__*/_react.default.createElement("span", {
       className: cls('title-name')
-    }, title), renderTags(tags));
+    }, title), (0, _tags.renderTags)(tags, 'large'));
   };
 
   return /*#__PURE__*/_react.default.createElement("header", _objectSpread({

package/lib/page-header/index.scss

@@ -124,17 +124,6 @@ $prefix: 'teamix-pro-page-header';
     cursor: pointer;
   }
 
-  .#{$prefix}-tags {
-    display: inline-flex;
-    align-items: center;
-
-    & > div {
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-  }
-
   .#{$prefix}-color {
     &-blue {
       color: var(--color-notice-5);

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

@@ -13,10 +13,18 @@ var _utils = require("@teamix/utils");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _excluded = ["dataSource", "searchKey", "onSelect"];
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -37,32 +45,60 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 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-sidebar-tree');
 
 var ProSidebarTree = function ProSidebarTree(props) {
   var dataSourceProp = props.dataSource,
-      searchKey = props.searchKey; // 自动展开父节点。过滤时用
+      searchKey = props.searchKey,
+      onSelect = props.onSelect,
+      others = _objectWithoutProperties(props, _excluded); // 自动展开父节点。过滤时用
 
-  var _useState = (0, _react.useState)(),
+
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      matchedKeys = _useState2[0],
-      setMatchedKeys = _useState2[1];
+      autoExpandParent = _useState2[0],
+      setAutoExpandParent = _useState2[1];
 
   var _useState3 = (0, _react.useState)(),
       _useState4 = _slicedToArray(_useState3, 2),
-      expandedKeys = _useState4[0],
-      setExpandedKeys = _useState4[1];
+      matchedKeys = _useState4[0],
+      setMatchedKeys = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []),
+  var _useState5 = (0, _react.useState)(),
       _useState6 = _slicedToArray(_useState5, 2),
-      dataSource = _useState6[0],
-      setDataSource = _useState6[1];
+      expandedKeys = _useState6[0],
+      setExpandedKeys = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []),
+      _useState8 = _slicedToArray(_useState7, 2),
+      dataSource = _useState8[0],
+      setDataSource = _useState8[1];
 
+  (0, _react.useEffect)(function () {
+    getAllExpend();
+  }, []);
   (0, _react.useEffect)(function () {
     filterDataSource(searchKey !== null && searchKey !== void 0 ? searchKey : '');
-  }, [searchKey]); // 过滤
+  }, [searchKey]); // 获取全部展开节点key
+
+  var getAllExpend = function getAllExpend() {
+    var allKeys = (0, _utils.treeToList)(dataSource).map(function (item) {
+      return item.value;
+    });
+    setExpandedKeys(allKeys);
+  }; // 过滤
+
 
   var filterDataSource = function filterDataSource(value) {
+    if (!value) {
+      setExpandedKeys([]);
+      getAllExpend();
+    }
+
     value = value.trim();
     var matchedKeys = [];
 
@@ -74,7 +110,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
     var loop = function loop(data) {
       return data.forEach(function (item) {
         if (item.label.indexOf(value) > -1) {
-          matchedKeys.push(item.key);
+          matchedKeys.push(item.value);
         }
 
         if (item.children && item.children.length) {
@@ -85,27 +121,58 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
     loop(dataSource);
     setExpandedKeys(_toConsumableArray(matchedKeys));
+    setAutoExpandParent(true);
     setMatchedKeys(matchedKeys);
   };
 
   var filterTreeNode = function filterTreeNode(node) {
     return matchedKeys && matchedKeys.indexOf(node.props.eventKey) > -1;
+  }; // 节点展开回调
+
+
+  var handleExpand = function handleExpand(key) {
+    setExpandedKeys(key);
+    setAutoExpandParent(false);
+  }; // 渲染树节点
+
+
+  var renderTreeNode = function renderTreeNode(data) {
+    return data.map(function (item) {
+      return /*#__PURE__*/_react.default.createElement(_components.Tree.Node, {
+        key: item.value,
+        label: renderTreeNodeItem(item)
+      }, item.children && item.children.length > 0 && renderTreeNode(item.children));
+    });
+  }; // 渲染单个树节点 label
+
+
+  var renderTreeNodeItem = function renderTreeNodeItem(data) {
+    var node = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.label);
+
+    if (data.tag) {
+      if ( /*#__PURE__*/(0, _react.isValidElement)(data.tag)) {
+        node = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, node, data.tag);
+      }
+    }
+
+    return node;
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: cls()
-  }, /*#__PURE__*/_react.default.createElement(_components.Tree, {
-    draggable: true,
+  }, /*#__PURE__*/_react.default.createElement(_components.Tree, _objectSpread({
     defaultExpandAll: true,
     isLabelBlock: true,
     isNodeBlock: {
       defaultPaddingLeft: 8,
       indent: 16
     },
-    dataSource: dataSource,
     filterTreeNode: filterTreeNode,
-    expandedKeys: expandedKeys
-  }));
+    expandedKeys: expandedKeys,
+    onExpand: handleExpand,
+    autoExpandParent: autoExpandParent,
+    onSelect: onSelect
+  }, others), renderTreeNode(dataSource)));
 };
 
 var _default = ProSidebarTree;

package/lib/sidebar/index.js

@@ -17,7 +17,7 @@ var _sidebarContainer = _interopRequireDefault(require("./components/sidebar-con
 
 var _tree = _interopRequireDefault(require("./components/tree"));
 
-var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch"];
+var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch", "onSelect", "treeProps", "cardProps"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -56,6 +56,9 @@ var ProSidebar = function ProSidebar(props) {
       _searchOnChange = props.searchOnChange,
       _props$showSearch = props.showSearch,
       showSearch = _props$showSearch === void 0 ? true : _props$showSearch,
+      onSelect = props.onSelect,
+      treeProps = props.treeProps,
+      cardProps = props.cardProps,
       others = _objectWithoutProperties(props, _excluded); // 搜索的关键词
 
 
@@ -69,7 +72,7 @@ var ProSidebar = function ProSidebar(props) {
       '': true
     }, className, true)),
     style: style
-  }, /*#__PURE__*/_react.default.createElement(_sidebarContainer.default, _objectSpread({
+  }, /*#__PURE__*/_react.default.createElement(_sidebarContainer.default, _objectSpread(_objectSpread({
     searchOnChange: function searchOnChange(value) {
       if (showSearch) {
         _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
@@ -77,10 +80,11 @@ var ProSidebar = function ProSidebar(props) {
       }
     },
     showSearch: showSearch
-  }, others), /*#__PURE__*/_react.default.createElement(_tree.default, {
+  }, others), cardProps), /*#__PURE__*/_react.default.createElement(_tree.default, _objectSpread({
     dataSource: dataSource,
-    searchKey: searchKey
-  })));
+    searchKey: searchKey,
+    onSelect: onSelect
+  }, treeProps))));
 };
 
 var _default = ProSidebar;

package/lib/sidebar/typing.d.ts

@@ -6,7 +6,13 @@ import { ProCardProps, ProFieldProps } from '..';
 export declare type ProSidebarProps = {
     /** 数据源 */
     dataSource?: ProSidebarDataSource;
-} & React.HTMLAttributes<HTMLElement> & ProSidebarContainerProps;
+    /** 节点点击回调 */
+    onSelect?: TreeProps['onSelect'];
+    /** 树配置 */
+    treeProps?: TreeProps;
+    /** 卡片配置 */
+    cardProps?: ProCardProps;
+} & Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> & Omit<ProSidebarContainerProps, 'onSelect'>;
 /** 数据源定义 */
 export declare type ProSidebarDataSource = ProSidebarDataSourceItem[];
 export declare type ProSidebarDataSourceItem = {
@@ -23,6 +29,11 @@ export declare type ProSidebarDataSourceItem = {
     /** 子项 */
     children?: ProSidebarDataSourceItem[];
 };
+/** tag 定义 */
+export declare type ProSidebarDataSourceTag = {
+    /** 显示值 */
+    value: string;
+};
 /** sidebar 容器定义 */
 export declare type ProSidebarContainerProps = {
     children?: React.ReactNode;
@@ -48,4 +59,6 @@ export declare type ProSidebarTreeProps = {
     dataSource?: ProSidebarDataSource;
     /** 搜索过滤关键词 */
     searchKey?: string;
+    /** 节点点击回调 */
+    onChange?: ProSidebarProps['onChange'];
 } & TreeProps;

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

@@ -191,7 +191,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -234,27 +234,29 @@ var Filter = function Filter(props) {
       }))); // 发送请求
 
       (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7);
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
+
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setVisible(false);
     }
-  }, "\u786E\u5B9A"), /*#__PURE__*/_react.default.createElement(_components.Button, {
+  }, (0, _utils.getMessage)('ok')), /*#__PURE__*/_react.default.createElement(_components.Button, {
     type: "normal",
     size: "small",
     className: cls({
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current8, _actionRef$current8$g, _actionRef$current8$g2, _actionRef$current9, _actionRef$current9$s, _actionRef$current10, _actionRef$current10$;
+      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$g = _actionRef$current8.getState) === null || _actionRef$current8$g === void 0 ? void 0 : (_actionRef$current8$g2 = _actionRef$current8$g.call(_actionRef$current8)) === null || _actionRef$current8$g2 === void 0 ? void 0 : _actionRef$current8$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
-      (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$s = _actionRef$current9.setFilterRules) === null || _actionRef$current9$s === void 0 ? void 0 : _actionRef$current9$s.call(_actionRef$current9, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''
       })));
-      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.filterDataSource) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
     }
-  }, "\u91CD\u7F6E")))));
+  }, (0, _utils.getMessage)('reset'))))));
 };
 
 var _default = Filter;

package/lib/table/components/Filter/index.scss

@@ -12,12 +12,16 @@
   }
   .teamix-pro-table-toolbar-filter-btn-box {
     display: flex;
-    justify-content: space-around;
+    justify-content: center;
     margin-top: 10px;
     padding-bottom: 5px;
+    padding-left: 4px;
+    padding-right: 4px;
   }
   .teamix-pro-table-toolbar-filter-btn.teamix-pro-table-toolbar-filter-btn {
-    width: 48px !important;
-    min-width: unset !important;
+    min-width: 48px !important;
+    &:first-child {
+      margin-right: 8px;
+    }
   }
 }

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

@@ -92,7 +92,16 @@ var Layout = function Layout(props) {
     var _mainAction$actions;
 
     if (_typeof(mainAction) === 'object' && (mainAction === null || mainAction === void 0 ? void 0 : (_mainAction$actions = mainAction.actions) === null || _mainAction$actions === void 0 ? void 0 : _mainAction$actions.length) > 0) {
-      // 默认 context
+      // 判断 actions 是否 visible 都为 false，是的话也不渲染
+      var isEmptyActions = mainAction === null || mainAction === void 0 ? void 0 : mainAction.actions.every(function (action) {
+        return (action === null || action === void 0 ? void 0 : action.visible) === false;
+      });
+
+      if (isEmptyActions) {
+        return;
+      } // 默认 context
+
+
       var defaultContext = {
         action: actionRef.current,
         rowSelection: rowSelection

package/lib/table/index.js

@@ -525,8 +525,7 @@ var ProTable = function ProTable(props) {
 
       if (props.onError) {
         props.onError(error);
-      } else {
-        _components.Message.error(error.toString());
+      } else {// Message.error(error.toString());
       } // 重新计算是否需要吸底
 
 
@@ -817,7 +816,7 @@ var ProTable = function ProTable(props) {
 
     }),
     ref: tableRef
-  }, renderTable(), footerSuctionState && footerSuction && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && renderFooter()));
+  }, renderTable(), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter()));
 };
 
 var _default = ProTable;

package/lib/utils/components/tags/index.d.ts

@@ -0,0 +1,11 @@
+import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
+import './index.scss';
+export declare type ProTagItem = (TagProps | (CloseableProps & {
+    closable: true;
+})) & {
+    /**
+     * @deprecated 建议使用 children 代替
+     */
+    text?: string;
+};
+export declare const renderTags: (tags?: ProTagItem[] | undefined, size?: "small" | "large" | "medium" | undefined) => JSX.Element | null;

package/lib/utils/components/tags/index.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.renderTags = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _components = require("@alicloudfe/components");
+
+var _utils = require("@teamix/utils");
+
+require("./index.scss");
+
+var _excluded = ["text", "children", "closable"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var cls = (0, _utils.baseClass)('teamix-pro-tags');
+
+var renderTags = function renderTags(tags, size) {
+  if (!tags || !tags.length) {
+    return null;
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_components.Tag.Group, {
+    className: cls('')
+  }, tags.map(function (tag, i) {
+    // @ts-ignore
+    var text = tag.text,
+        children = tag.children,
+        closable = tag.closable,
+        others = _objectWithoutProperties(tag, _excluded);
+
+    if (closable) {
+      return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, _objectSpread({
+        key: i,
+        size: size,
+        style: {
+          marginBottom: 0
+        }
+      }, others), text || children);
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_components.Tag, _objectSpread({
+      key: i,
+      size: size,
+      style: {
+        marginBottom: 0
+      }
+    }, others), text || children);
+  }));
+};
+
+exports.renderTags = renderTags;

package/lib/utils/components/tags/index.scss

@@ -0,0 +1,12 @@
+.teamix-pro-tags {
+  display: inline-flex;
+  align-items: center;
+
+  & > div.next-tag {
+    margin-right: var(--s-2, 8px);
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+}