@teamix/pro 1.2.9 → 1.2.13

package/es/form/ProForm/useFormDisplayValues.js

@@ -15,51 +15,57 @@ import { isArr, isPlainObj, getValueByValue } from '@teamix/utils';
 /**
  * 获取表单值的可显示值
  * @returns 如果某字段有dataSource，则返回value对应label
+ * @example const example = {
+    a: [
+        [{ b: 'a.0.0.b', c: 'a.0.0.c' }, { d: 'a.0.1.d' }],
+        { e: [{ f: { g: [{ h: 'a.1.e.0.f.g.0.h' }] } }, 'a.1.e.1'] },
+      ],
+  };
+  console.log(getDisplayValues(example));
  */
 
-var useFormDisplayValues = function useFormDisplayValues() {
-  var form = useForm();
-  var values = form.values; // 判断值的类型，递归获取每个值在该结构中的完整路径
+var getDisplayValues = function getDisplayValues(form, values) {
+  var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var displayValues; // 判断值的类型，递归获取每个值在该结构中的完整路径
 
-  var getDisplayValues = function getDisplayValues(values) {
-    var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    var displayValues;
+  if (isPlainObj(values)) {
+    displayValues = {};
+    Object.entries(values).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
 
-    if (isPlainObj(values)) {
-      displayValues = {};
-      Object.entries(values).forEach(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            key = _ref2[0],
-            value = _ref2[1];
+      var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
+      displayValues[key] = getDisplayValues(form, value, path);
+    });
+  } else if (isArr(values)) {
+    displayValues = []; // todo 如果对象或数组的值不再是对象或数组，并且找不到路径，判断为非复合组件，直接返回原始值
 
-        var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
-        displayValues[key] = getDisplayValues(value, path);
-      });
-    } else if (isArr(values)) {
-      displayValues = [];
-      values.map(function (value, index) {
-        var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
-        displayValues[index] = getDisplayValues(value, path);
-      });
-    } else {
-      // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
-      var address = form.indexes[prefix];
-      var field = form.query(address).take();
-      displayValues = getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, values) || values;
-    }
+    values.map(function (value, index) {
+      var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
+      displayValues[index] = getDisplayValues(form, value, path);
+    });
+  } else {
+    // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
+    var address = form.indexes[prefix];
+    var field = form.query(address).take();
+    displayValues = {
+      title: field === null || field === void 0 ? void 0 : field.title,
+      value: values,
+      displayValue: getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, values)
+    };
+  }
 
-    return displayValues;
-  }; // 测试样例
-  // const example = {
-  //   a: [
-  //     [{ b: 'a.0.0.b', c: 'a.0.0.c' }, { d: 'a.0.1.d' }],
-  //     { e: [{ f: { g: [{ h: 'a.1.e.0.f.g.0.h' }] } }, 'a.1.e.1'] },
-  //   ],
-  // };
-  // console.log(getDisplayValues(example));
+  return displayValues;
+};
 
+var useFormDisplayValues = function useFormDisplayValues() {
+  var form = useForm();
+  return getDisplayValues(form, form.values);
+};
 
-  return getDisplayValues(values);
+var getFormDisplayValues = function getFormDisplayValues(form) {
+  return getDisplayValues(form, form.values);
 };
 
-export default useFormDisplayValues;
+export { useFormDisplayValues, getFormDisplayValues };

package/es/form/SchemaForm/index.js

@@ -62,6 +62,7 @@ export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
+  // 创建 SchemaField
   var SchemaField = useMemo(function () {
     return createSchemaField({
       components: _objectSpread(_objectSpread({}, ProFieldComponents), {}, {
@@ -92,15 +93,15 @@ export default /*#__PURE__*/memo(function (_ref) {
         Text: Text
       })
     });
-  }, []); // 合并schema中request的scope
+  }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = useMemo(function () {
     return _objectSpread({}, scope);
-  }, [scope]); // 格式化schema
+  }, [scope]); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {
     var schemaProperties = {};
-    schema.forEach(function (item) {
+    schema === null || schema === void 0 ? void 0 : schema.forEach(function (item) {
       var newItem = warning(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -236,15 +237,15 @@ export default /*#__PURE__*/memo(function (_ref) {
     });
     return schemaProperties;
   }, [mergedScope]);
-  var schemaPro = useMemo(function () {
+  var proFormSchema = useMemo(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, []); // console.log(schemaPro);
+  }, []); // console.log(proFormSchema);
 
   return /*#__PURE__*/React.createElement(SchemaField, {
-    schema: schemaPro,
+    schema: proFormSchema,
     components: components,
     scope: mergedScope
   });

package/es/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/es/form/index.js

@@ -19,7 +19,7 @@ export { _formilyReactive as formilyReactive };
 import * as _formilyTeamix from '@teamix/formily';
 export { _formilyTeamix as formilyTeamix };
 import * as originalFormilyReact from '@formily/react';
-import useFormDisplayValues from './ProForm/useFormDisplayValues';
+import { useFormDisplayValues } from './ProForm/useFormDisplayValues';
 import useFieldRequest from './ProForm/useFieldRequest';
 
 var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
@@ -40,7 +40,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/es/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/es/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/es/index.js

@@ -27,7 +27,7 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table'; // export * from './sidebar';
 
-var version = '1.2.8';
+var version = '1.2.12';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 hooks, nocode, templates, utils };

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

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

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

@@ -1,7 +1,6 @@
 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 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; }
 
@@ -17,8 +16,9 @@ import React from 'react';
 import { useHistory } from 'react-router-dom';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
-import { Breadcrumb, Tag } from '@alicloudfe/components';
-import { baseClass } from '@teamix/utils';
+import { Breadcrumb } from '@alicloudfe/components';
+import { baseClass, goToLink } from '@teamix/utils';
+import { renderTags } from '../utils/components/tags';
 import { ProActionGroup } from '../actions';
 import { ProSkeletonRaw } from '../skeleton';
 import ProInfo from '../info';
@@ -64,40 +64,6 @@ var renderActionGroup = function renderActionGroup(group, defaultProps) {
   return group;
 };
 
-var renderTags = function renderTags(tags) {
-  if (!tags) {
-    return null;
-  }
-
-  return /*#__PURE__*/React.createElement(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.createElement(Tag.Closeable, _objectSpread({
-        key: i,
-        size: "large",
-        style: {
-          marginBottom: 0
-        }
-      }, others), text || children);
-    }
-
-    return /*#__PURE__*/React.createElement(Tag, _objectSpread({
-      key: i,
-      size: "large",
-      style: {
-        marginBottom: 0
-      }
-    }, others), text || children);
-  }));
-};
-
 var isPresetColor = function isPresetColor(color) {
   if (!color) {
     return false;
@@ -135,7 +101,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,
@@ -183,7 +149,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 = useHistory();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;
@@ -201,12 +167,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;
       }
+
+      goToLink(goback, history);
     };
 
     return /*#__PURE__*/React.createElement(React.Fragment, null, goback && /*#__PURE__*/React.createElement(TeamixIcon, {
@@ -214,14 +190,14 @@ var ProPageHeader = function ProPageHeader(props) {
       onClick: onBack,
       type: "return-line",
       size: "large"
-    }), icon && /*#__PURE__*/React.createElement(TeamixIcon, {
+    }), icon && (typeof icon === 'string' ? /*#__PURE__*/React.createElement(TeamixIcon, {
       className: classnames(iconClass, cls('title-icon')),
       style: iconStyle,
       type: icon,
       size: "large"
-    }), /*#__PURE__*/React.createElement("span", {
+    }) : /*#__PURE__*/React.createElement(React.Fragment, null, icon)), /*#__PURE__*/React.createElement("span", {
       className: cls('title-name')
-    }, title), renderTags(tags));
+    }, title), renderTags(tags, 'large'));
   };
 
   return /*#__PURE__*/React.createElement("header", _objectSpread({

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

@@ -27,7 +27,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState } from 'react';
 import TeamixIcon from '@teamix/icon';
 import { Button, Dropdown, Menu } from '@alicloudfe/components';
-import { baseClass } from '@teamix/utils';
+import { baseClass, getMessage } from '@teamix/utils';
 import './index.scss';
 var CheckboxItem = Menu.CheckboxItem;
 var cls = baseClass('teamix-pro-table-toolbar-filter');
@@ -171,7 +171,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
 
@@ -214,27 +214,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.createElement(Button, {
+  }, getMessage('ok')), /*#__PURE__*/React.createElement(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")))));
+  }, getMessage('reset'))))));
 };
 
 export default Filter;

package/es/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/es/table/components/Layout/index.js

@@ -70,7 +70,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