@teamix/pro 1.2.9 → 1.2.13

package/lib/form/index.d.ts

@@ -35,39 +35,39 @@ declare const formilyReact: {
         <Decorator extends originalFormilyReact.JSXComponent, Component extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.ISchemaFieldProps<Decorator, Component, import("@formily/core").ObjectField<Decorator, Component>>): JSX.Element;
         displayName: string;
         Markup: {
-            <Decorator_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaMarkupFieldProps<Components, Component_1, Decorator_1>): JSX.Element;
+            <Decorator_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaMarkupFieldProps<Components, Component_1, Decorator_1>): JSX.Element;
             displayName: string;
         };
         String: {
-            <Decorator_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_2, Decorator_2>): JSX.Element;
+            <Decorator_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_2, Decorator_2>): JSX.Element;
             displayName: string;
         };
         Object: {
-            <Decorator_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_3, Decorator_3>): JSX.Element;
+            <Decorator_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_3, Decorator_3>): JSX.Element;
             displayName: string;
         };
         Array: {
-            <Decorator_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_4, Decorator_4>): JSX.Element;
+            <Decorator_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_4, Decorator_4>): JSX.Element;
             displayName: string;
         };
         Boolean: {
-            <Decorator_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_5, Decorator_5>): JSX.Element;
+            <Decorator_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_5, Decorator_5>): JSX.Element;
             displayName: string;
         };
         Date: {
-            <Decorator_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_6, Decorator_6>): JSX.Element;
+            <Decorator_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_6, Decorator_6>): JSX.Element;
             displayName: string;
         };
         DateTime: {
-            <Decorator_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_7, Decorator_7>): JSX.Element;
+            <Decorator_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_7, Decorator_7>): JSX.Element;
             displayName: string;
         };
         Void: {
-            <Decorator_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_8, Decorator_8>): JSX.Element;
+            <Decorator_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_8, Decorator_8>): JSX.Element;
             displayName: string;
         };
         Number: {
-            <Decorator_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_9, Decorator_9>): JSX.Element;
+            <Decorator_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>, Component_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "propTypes" | "contextTypes" | "defaultProps" | "displayName">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_9, Decorator_9>): JSX.Element;
             displayName: string;
         };
     };
@@ -108,7 +108,8 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
 /**
  * 导出 Filter 组件
  */
-import { AdvancedFilter, SimpleFilter, QueryFilter } from './Filter';
+import { AdvancedFilter, SimpleFilter } from './Filter';
+import { QueryFilter } from './Filter/index2';
 export { AdvancedFilter, SimpleFilter, QueryFilter };
 /**
  * 导出 ProForm 组件，支持快速搭建表单

package/lib/form/index.js

@@ -71,7 +71,7 @@ Object.defineProperty(exports, "FormTab", {
 Object.defineProperty(exports, "QueryFilter", {
   enumerable: true,
   get: function get() {
-    return _Filter.QueryFilter;
+    return _index.QueryFilter;
   }
 });
 Object.defineProperty(exports, "SimpleFilter", {
@@ -146,12 +146,14 @@ exports.formilyTeamix = _formilyTeamix;
 
 var originalFormilyReact = _interopRequireWildcard(require("@formily/react"));
 
-var _useFormDisplayValues = _interopRequireDefault(require("./ProForm/useFormDisplayValues"));
+var _useFormDisplayValues = require("./ProForm/useFormDisplayValues");
 
 var _useFieldRequest = _interopRequireDefault(require("./ProForm/useFieldRequest"));
 
 var _Filter = require("./Filter");
 
+var _index = require("./Filter/index2");
+
 var _ProForm = _interopRequireDefault(require("./ProForm"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -168,7 +170,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
   useFieldRequest: _useFieldRequest.default,
-  useFormDisplayValues: _useFormDisplayValues.default
+  useFormDisplayValues: _useFormDisplayValues.useFormDisplayValues
 });
 
 exports.formilyReact = formilyReact;

package/lib/form/typing.d.ts

@@ -2,6 +2,7 @@ import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
 import { CommonRequestConfig } from '@teamix/utils';
+import React from 'react';
 interface AnyObject {
     [propName: string]: any;
 }
@@ -64,6 +65,8 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
 export interface QueryFilterProps extends ProFormProps {
+    addonBefore?: ReactNode;
+    addonAfter?: ReactNode;
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.8";
+declare const version = "1.2.12";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

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.8';
+var version = '1.2.12';
 exports.version = version;

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

@@ -35,7 +35,9 @@ var ProInfoItem = function ProInfoItem(prop) {
         wrapperCol = baseInfoLayout.wrapperCol;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls()
-    }, /*#__PURE__*/_react.default.createElement(Row, null, /*#__PURE__*/_react.default.createElement(Col, {
+    }, /*#__PURE__*/_react.default.createElement(Row, {
+      gutter: 10
+    }, /*#__PURE__*/_react.default.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')
     }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {

package/lib/nocode/pages/renderer.d.ts

@@ -1,7 +1,7 @@
 import { PageProps } from '../../page-container';
-import { PageMap, PageType } from '.';
+import { PageMap } from '.';
 export interface PageRendererProps<T = any> extends PageProps<T> {
-    type?: PageType;
+    type?: any;
     error?: any;
     title?: string;
     pageMap?: PageMap;

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/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

@@ -393,7 +393,11 @@ var ProTable = function ProTable(props) {
     }
   }, [propsActionRef]);
   (0, _react.useEffect)(function () {
-    setFilteredColumns(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []));
+    var _actionRef$current, _actionRef$current$se;
+
+    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
+    setFilteredColumns(columns);
+    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
   }, [propsColumns]); // 绑定 Actions
 
   (0, _utils2.useActionType)(actionRef, {
@@ -407,7 +411,11 @@ var ProTable = function ProTable(props) {
       return state;
     },
     setColumn: function setColumn(newColumns) {
-      setFilteredColumns(processColumns(newColumns));
+      var _actionRef$current2, _actionRef$current2$s;
+
+      var columns = processColumns(newColumns);
+      setFilteredColumns(columns);
+      (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
     },
     setSize: function setSize(mode) {
       _setSize(mode);
@@ -421,11 +429,11 @@ var ProTable = function ProTable(props) {
       }
     },
     reset: function reset() {
-      var _actionRef$current, _actionRef$current$se;
+      var _actionRef$current3, _actionRef$current3$s;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
-      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setFilterRules) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, {});
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
       dataFilterForm.reset();
       setCurrentPage(1);
 
@@ -525,8 +533,7 @@ var ProTable = function ProTable(props) {
 
       if (props.onError) {
         props.onError(error);
-      } else {
-        _components.Message.error(error.toString());
+      } else {// Message.error(error.toString());
       } // 重新计算是否需要吸底
 
 
@@ -537,7 +544,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _actionRef$current$ge, _actionRef$current2, _actionRef$current2$g, _objectSpread2;
+    var _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -552,7 +559,7 @@ var ProTable = function ProTable(props) {
 
     var dataFilterParams = toJS(dataFilterForm.values); // 列过滤请求参数
 
-    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$g = _actionRef$current2.getFilterRules) === null || _actionRef$current2$g === void 0 ? void 0 : _actionRef$current2$g.call(_actionRef$current2)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
+    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
     var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
 
@@ -639,7 +646,10 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
 
       if (dataFilterForm.validate()) {
-        setCurrentPage(1);
+        setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
+        // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
+        // if (mode === 'inline') {
+        // }
 
         _request(_defineProperty({}, targetPageKey, 1));
       }
@@ -817,7 +827,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/table/typing.d.ts

@@ -180,6 +180,8 @@ export declare type ProTableActionType = {
 export declare type ProTableActionTypeMutations = {
     /** 获取state状态 */
     getState?: () => ProTableActionTypeState;
+    /** 设置state状态 */
+    setState?: (key: string, value: any) => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */
@@ -192,11 +194,15 @@ export declare type ProTableActionTypeMutations = {
     getFilterRules?: () => object;
     /** 重新计算表格maxHeight高度 */
     resetTableMaxBodyHeight?: () => void;
+    /** 列筛选规则 */
+    filterColumns?: any[];
 };
 /** action Mutations 定义 */
 export declare type ProTableActionTypeState = {
     fullScreenState: boolean;
     filterRules: ProTableColumnsFilterRulesItem;
+    filterColumns: ProTableColumnProps[];
+    [key: string]: any;
 };
 export declare type ProTableDataFilterProps = {
     /** 展示形式 */

package/lib/table/utils/columnRender.js

@@ -47,8 +47,45 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 增加了 icon 的功能 render title
  */
 var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
+  var filterMode = item.filterMode,
+      filters = item.filters,
+      dataIndex = item.dataIndex,
+      dataSource = item.dataSource;
+
+  var getItemLable = function getItemLable() {
+    if (filterMode !== 'multiple') {
+      var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2;
+
+      var selectedItem = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : _actionRef$current$ge2.call(_actionRef$current).filterRules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
+
+      if (Object.keys(selectedItem).length > 0) {
+        var _selectedItem$dataInd;
+
+        if ((_selectedItem$dataInd = selectedItem[dataIndex]) === null || _selectedItem$dataInd === void 0 ? void 0 : _selectedItem$dataInd.params) {
+          var _targetFilters$find;
+
+          // 找到对应的 label
+          var targetFilters = filters !== null && filters !== void 0 ? filters : [];
+
+          if (filters === true) {
+            targetFilters = dataSource !== null && dataSource !== void 0 ? dataSource : [];
+          }
+
+          var label = (_targetFilters$find = targetFilters.find(function (item) {
+            var _selectedItem$dataInd2;
+
+            return item.value === ((_selectedItem$dataInd2 = selectedItem[dataIndex]) === null || _selectedItem$dataInd2 === void 0 ? void 0 : _selectedItem$dataInd2.params);
+          })) === null || _targetFilters$find === void 0 ? void 0 : _targetFilters$find.label;
+          return "".concat(item.title, " (").concat(label, ")");
+        }
+      }
+    }
+
+    return item.title;
+  };
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
-    label: item.title,
+    label: getItemLable(),
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/_react.default.createElement(_Filter.default, {