@teamix/pro 1.1.37 → 1.2.0

package/lib/info/typing.d.ts

@@ -1,18 +1,16 @@
-import { IProFieldFormatterProps, IProFieldOptionItem, IProFieldProps, IProFieldType } from '../field';
-import { ActionGroupProps, IActionButton } from '../actions';
+import { ProFieldRenderProps, ProFieldDataSourceItem, ProFieldProps, ProFieldType } from '../field';
+import { ActionGroupProps, ProActionButtonProps } from '../actions';
 import { Method } from 'axios';
 import React from 'react';
-import { CardProps } from '../card';
+import { CommonRequestConfig } from '@teamix/utils';
+import { ProCardProps } from '../card';
 /** 列record函数 */
 declare type ProInfoCellFunProp = (value: any, record: any) => any;
-declare type FieldRenderProps = keyof IProFieldFormatterProps;
+declare type FieldRenderProps = keyof ProFieldRenderProps;
 declare type ProInfoCellRender = {
-    [key in FieldRenderProps]?: IProFieldFormatterProps[key] | ProInfoCellFunProp;
+    [key in FieldRenderProps]?: ProFieldRenderProps[key] | ProInfoCellFunProp;
 } | ((...other: any) => React.ReactNode);
-/** ProInfoBaseProps info 基础定义 */
-export declare type ProInfoBaseProps = {
-    /** ProColums 定义，取代 Table 的 columns */
-    columns: ProInfoItemProps[];
+export declare type PropInfoRequestProps = {
     /** 请求地址 */
     url?: string;
     /** 请求方法 */
@@ -31,6 +29,13 @@ export declare type ProInfoBaseProps = {
     onSuccess?: (res: any) => void;
     /** 内部请求失败时的回调 */
     onError?: (error: Error) => void;
+};
+export interface ProInfoRequestProps extends Partial<CommonRequestConfig> {
+}
+/** ProInfoBaseProps info 基础定义 */
+export declare type ProInfoBaseProps = {
+    /** ProColums 定义，取代 Table 的 columns */
+    columns: ProInfoColumnsProps[];
     /** ProInfo action 的引用，便于手动触发一些方法  */
     actionRef?: React.MutableRefObject<ProInfoActionType | undefined>;
     /** 标题区 推荐将header中的内容平铺到ProCard中。即将不支持此写法 */
@@ -40,10 +45,13 @@ export declare type ProInfoBaseProps = {
         [key: string]: any;
     };
     /** 布局值 */
-    layout?: BaseInfoLayoutProps;
-} & ProInfoHeaderProps;
-/** ProInfoItemProps info 单元格 定义 */
-export interface ProInfoItemProps {
+    layout?: ProBaseInfoLayoutProps;
+    /** 加载动画 */
+    loading?: boolean;
+} & ProInfoHeaderProps & ProInfoRequestProps;
+/** ProInfoColumnsProps info 单元格 定义 */
+export declare type ProInfoItemProps = ProInfoColumnsProps;
+export interface ProInfoColumnsProps {
     /** 标题 */
     title: string;
     /** 列表项展示的Tooltip */
@@ -53,11 +61,11 @@ export interface ProInfoItemProps {
      */
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
-    valueType?: IProFieldType;
+    valueType?: ProFieldType;
     /** 渲染单元格内容字段 */
     render?: ProInfoCellRender;
     /** 枚举值 */
-    dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
+    dataSource?: ProFieldDataSourceItem[] | ProInfoCellFunProp;
     /** 表头的筛选菜单项，当值为 true 时，自动使用 dataSource 生成 */
     filters?: boolean;
     /** 操作组配置 */
@@ -81,7 +89,7 @@ export interface ProInfoItemProps {
     /** 编辑请求成功提示文案 */
     successMessage?: string;
     /** 列 actions 配置 */
-    actions?: IActionButton[];
+    actions?: ProActionButtonProps[];
     /** 追加在列后 */
     extra?: React.ReactNode;
 }
@@ -96,31 +104,33 @@ export declare type IProProInfoItem = {
     /** 值 */
     value: React.ReactNode;
     /** 基础详情布局值 */
-    baseInfoLayout?: BaseInfoLayoutProps;
+    baseInfoLayout?: ProBaseInfoLayoutProps;
     /** 头部详情布局值 */
-    headerInfoLayout?: HeaderInfoLayoutProps;
+    headerInfoLayout?: ProHeaderInfoLayoutProps;
     /** loading 状态 */
     loading?: boolean;
-} & Pick<ProInfoItemProps, 'tooltip' | 'tooltipIcon'>;
+} & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon'>;
 /** header info 定义 */
 export declare type IProHeaderInfo = {
     /** 布局值 */
-    layout?: HeaderInfoLayoutProps;
+    layout?: ProHeaderInfoLayoutProps;
 } & Omit<ProInfoBaseProps, 'layout'>;
 /** table info 定义 */
 export declare type IProTableInfo = {
     /** 布局值 */
     layout?: TableInfoLayoutProps;
 } & Omit<ProInfoBaseProps, 'layout'>;
+declare type ProInfoBasePropsOmitLayout = Omit<ProInfoBaseProps, 'layout'>;
 /** ProInfo */
 export declare type ProInfoProps = {
     /** 布局值 */
-    layout?: TableInfoLayoutProps | HeaderInfoLayoutProps | BaseInfoLayoutProps;
+    layout?: TableInfoLayoutProps | ProHeaderInfoLayoutProps | ProBaseInfoLayoutProps;
     /** 类型 */
     type?: 'base' | 'header' | 'table';
-} & Omit<ProInfoBaseProps, 'layout'> & ProInfoTransparentBase;
+} & ProInfoBasePropsOmitLayout & ProInfoTransparentBase;
 export declare type IProHeaderInfoItem = {};
-export declare type BaseInfoLayoutProps = {
+export declare type BaseInfoLayoutProps = ProBaseInfoLayoutProps;
+export declare type ProBaseInfoLayoutProps = {
     span?: number;
     labelCol?: {
         span: number;
@@ -129,7 +139,8 @@ export declare type BaseInfoLayoutProps = {
         span: number;
     };
 };
-export declare type HeaderInfoLayoutProps = {
+export declare type headerInfoLayout = ProHeaderInfoLayoutProps;
+export declare type ProHeaderInfoLayoutProps = {
     /** label 间隔 */
     labelGutter?: number | string;
     /** 列数 宽度 */
@@ -137,31 +148,33 @@ export declare type HeaderInfoLayoutProps = {
 };
 /** infoGroup */
 export declare type ProInfoGroupProps = {
-    children?: React.ReactNode[] | React.ReactNode;
-} & Pick<ProInfoBaseProps, 'params' | 'method' | 'url' | 'onSuccess' | 'onError' | 'formatResult'>;
-export declare type TableInfoLayoutProps = {} & HeaderInfoLayoutProps;
+    children?: React.ReactNode[] | React.ReactNode | ProInfoBaseProps[];
+    /** 是否有有分割线 */
+    divider?: boolean;
+    /** 是否是紧凑模式 */
+    compacted?: ProCardProps['compacted'];
+    /** 背景颜色 */
+    backgroundColor?: ProCardProps['backgroundColor'];
+} & ProInfoRequestProps & React.HTMLAttributes<HTMLElement>;
+export declare type TableInfoLayoutProps = {} & ProHeaderInfoLayoutProps;
 export declare type InfoValueItemProps = {
-    infoItem: ProInfoItemProps;
+    infoItem: ProInfoColumnsProps;
     record: any;
     actionRef?: React.MutableRefObject<ProInfoActionType | undefined>;
     render?: ProInfoCellRender;
-    dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
-} & Omit<IProFieldProps, 'render' | 'dataSource'>;
-export declare type ProInfoHeaderProps = CardProps;
+    dataSource?: ProFieldDataSourceItem[] | ProInfoCellFunProp;
+} & Omit<ProFieldProps, 'render' | 'dataSource'>;
+export declare type ProInfoHeaderProps = Omit<ProCardProps, 'loading'>;
 /** ProInfoGroupContextProps */
 export declare type ProInfoGroupContextProps = {
     /** 因为其他数据都为异步。visible 只用作标识 */
     visible?: boolean;
     layout?: ProInfoBaseProps['layout'];
-    url?: ProInfoBaseProps['url'];
-    params?: ProInfoBaseProps['params'];
-    method?: ProInfoBaseProps['method'];
-    formatResult?: ProInfoBaseProps['formatResult'];
     size?: {
         width?: number;
         height?: number;
     };
-};
+} & ProInfoRequestProps;
 /** 基本透传类型 */
 export declare type ProInfoTransparentBase = {
     /**
@@ -181,4 +194,9 @@ export declare type ProInfoTransparentBase = {
     /** style */
     style?: React.CSSProperties;
 };
+export declare type ProInfoTransRequestResult = {
+    loading: boolean;
+    result: any;
+    refresh?: () => void;
+};
 export {};

package/lib/info/utils/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ProInfoActionType, ProInfoGroupContextProps, ProInfoItemProps } from '../typing';
+import { ProInfoActionType, ProInfoGroupContextProps, ProInfoColumnsProps } from '../typing';
 export declare function useActionType<T>(ref: React.MutableRefObject<ProInfoActionType | undefined>, action: ProInfoActionType): void;
 /** ProInfoGroupContext */
 export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps>;
@@ -9,4 +9,4 @@ export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps
  * @param dataSource
  * @returns
  */
-export declare function getDataIndexValue(dataIndex: ProInfoItemProps['dataIndex'], dataSource: object): any;
+export declare function getDataIndexValue(dataIndex: ProInfoColumnsProps['dataIndex'], dataSource: object): any;

package/lib/info/utils/utils.d.ts

@@ -1 +1 @@
-export declare function getLayout(width: number): "l" | "xs" | "xl" | "s" | "m";
+export declare function getLayout(width: number): "xs" | "xl" | "l" | "s" | "m";

package/lib/nocode/pages/renderer.js

@@ -66,7 +66,7 @@ var Loading = function Loading(props) {
       title: "",
       breadcrumb: []
     }),
-    content: /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Content, null)
+    content: /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Content, null)
   }, props));
 };
 

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

@@ -1,19 +1,16 @@
 import React from 'react';
 import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
-import { ActionGroupProps } from '../actions';
+import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
+import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
-export interface BreadcrumbItem {
-    link?: string;
-    text: string;
-}
-export interface LinkItem {
-    link?: string;
-    icon?: string;
-    text: string;
-    onClick?: (e?: React.MouseEvent<Element, MouseEvent>) => void;
+export interface ProPageHeaderBreadcrumbItem extends ItemProps {
+    /**
+     * @deprecated 建议使用 children 代替
+     */
+    text?: string;
 }
-export declare type TagItem = (TagProps | (CloseableProps & {
+export declare type ProPageHeaderTagItem = (TagProps | (CloseableProps & {
     closable: true;
 })) & {
     /**
@@ -22,12 +19,12 @@ export declare type TagItem = (TagProps | (CloseableProps & {
     text?: string;
 };
 declare type Color = 'blue' | 'green' | 'orange' | 'red' | 'yellow' | string;
-export interface DataItem {
+export declare type ProPageHeaderDataItem = {
     title: string;
     num: number;
     color?: Color;
-}
-export declare type PageHeaderProps = {
+} & React.HTMLAttributes<HTMLElement>;
+export declare type ProPageHeaderProps = {
     title?: React.ReactNode;
     description?: React.ReactNode;
     icon?: string;
@@ -37,12 +34,28 @@ export declare type PageHeaderProps = {
     goback?: string | boolean;
     image?: string;
     loading?: boolean;
-    breadcrumb?: BreadcrumbItem[];
-    extra?: ActionGroupProps | React.ReactNode;
-    operation?: ActionGroupProps | React.ReactNode;
-    tags?: TagItem[];
-    data?: DataItem[];
+    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 PageHeader: React.FC<PageHeaderProps>;
-export default PageHeader;
+declare const ProPageHeader: React.FC<ProPageHeaderProps>;
+export default ProPageHeader;
+/**
+ * @deprecated 建议使用 ProPageHeaderBreadcrumbItem 代替
+ */
+export declare type BreadcrumbItem = ProPageHeaderBreadcrumbItem;
+/**
+ * @deprecated 建议使用 ProPageHeaderTagItem 代替
+ */
+export declare type TagItem = ProPageHeaderTagItem;
+/**
+ * @deprecated 建议使用 ProPageHeaderDataItem 代替
+ */
+export declare type DataItem = ProPageHeaderDataItem;
+/**
+ * @deprecated 建议使用 ProPageHeaderProps 代替
+ */
+export declare type PageHeaderProps = ProPageHeaderProps;

package/lib/page-header/index.js

@@ -25,30 +25,35 @@ var _info = _interopRequireDefault(require("../info"));
 
 require("./index.scss");
 
-var _excluded = ["text", "children", "closable"],
-    _excluded2 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+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"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
-
 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-page-header');
 
 var renderNav = function renderNav(breadcrumbs) {
   if (breadcrumbs && breadcrumbs.length) {
     return /*#__PURE__*/_react.default.createElement(_components.Breadcrumb, null, breadcrumbs.map(function (b, i) {
-      return /*#__PURE__*/_react.default.createElement(_components.Breadcrumb.Item, {
-        key: i,
-        link: b.link
-      }, b.text);
+      var text = b.text,
+          children = b.children,
+          others = _objectWithoutProperties(b, _excluded);
+
+      return /*#__PURE__*/_react.default.createElement(_components.Breadcrumb.Item, _objectSpread({
+        key: i
+      }, others), text || children);
     }));
   }
 
@@ -70,7 +75,7 @@ var renderActionGroup = function renderActionGroup(group, defaultProps) {
         type: buttonType
       }, item);
     });
-    return /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread(_objectSpread({}, defaultProps), actionGroup), {}, {
+    return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread(_objectSpread({}, defaultProps), actionGroup), {}, {
       actions: actions
     }));
   }
@@ -90,7 +95,7 @@ var renderTags = function renderTags(tags) {
     var text = tag.text,
         children = tag.children,
         closable = tag.closable,
-        others = _objectWithoutProperties(tag, _excluded);
+        others = _objectWithoutProperties(tag, _excluded2);
 
     if (closable) {
       return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, _objectSpread({
@@ -145,26 +150,30 @@ var renderData = function renderData(data) {
   }
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.map(function (item, i) {
-    var _getColorAndStyle = getColorAndStyle(item.color),
+    var color = item.color,
+        title = item.title,
+        num = item.num,
+        customClassName = item.className,
+        others = _objectWithoutProperties(item, _excluded3);
+
+    var _getColorAndStyle = getColorAndStyle(color),
         className = _getColorAndStyle.className,
         style = _getColorAndStyle.style;
 
-    return /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
       key: i,
-      className: cls('data-item')
-    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames2.default)(cls('data-item'), customClassName)
+    }, others), /*#__PURE__*/_react.default.createElement("div", {
       className: cls('data-item-title')
-    }, item.title), /*#__PURE__*/_react.default.createElement("div", {
+    }, title), /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames2.default)(cls('data-item-num'), className),
       style: style
-    }, item.num));
+    }, num));
   }));
 };
 
 var renderInfo = function renderInfo(info) {
-  // @ts-ignore
   if (info === null || info === void 0 ? void 0 : info.columns) {
-    // @ts-ignore
     return /*#__PURE__*/_react.default.createElement(_info.default, _objectSpread({
       type: "header"
     }, info));
@@ -173,7 +182,7 @@ var renderInfo = function renderInfo(info) {
   return info;
 };
 
-var PageHeader = function PageHeader(props) {
+var ProPageHeader = function ProPageHeader(props) {
   var title = props.title,
       description = props.description,
       icon = props.icon,
@@ -193,7 +202,7 @@ var PageHeader = function PageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
-      others = _objectWithoutProperties(props, _excluded2);
+      others = _objectWithoutProperties(props, _excluded4);
 
   var history = (0, _reactRouterDom.useHistory)();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;
@@ -243,7 +252,7 @@ var PageHeader = function PageHeader(props) {
     className: cls('section')
   }, /*#__PURE__*/_react.default.createElement("nav", {
     className: cls('nav')
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Header.Nav, null), !loading && renderNav(breadcrumb)), /*#__PURE__*/_react.default.createElement("section", {
+  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Header.Nav, null), !loading && renderNav(breadcrumb)), /*#__PURE__*/_react.default.createElement("section", {
     className: cls('extra')
   }, !loading && renderActionGroup(extra, {
     type: 'text',
@@ -256,18 +265,18 @@ var PageHeader = function PageHeader(props) {
     className: cls('left')
   }, /*#__PURE__*/_react.default.createElement("section", {
     className: cls('title')
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Header.Title, null), !loading && renderTitle()), description !== undefined && /*#__PURE__*/_react.default.createElement("section", {
+  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Header.Title, null), !loading && renderTitle()), description !== undefined && /*#__PURE__*/_react.default.createElement("section", {
     className: cls('description')
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Header.Description, null), !loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, description))), /*#__PURE__*/_react.default.createElement("section", {
+  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Header.Description, null), !loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, description))), /*#__PURE__*/_react.default.createElement("section", {
     className: cls('right')
   }, data && !loading && /*#__PURE__*/_react.default.createElement("section", {
     className: cls('data')
   }, renderData(data)), /*#__PURE__*/_react.default.createElement("section", {
     className: cls('operation')
-  }, !loading && renderActionGroup(operation)))), info && !loading && /*#__PURE__*/_react.default.createElement("section", {
+  }, !loading && renderActionGroup(operation)))), info && /*#__PURE__*/_react.default.createElement("section", {
     className: (0, _classnames2.default)(cls('section'), cls('info'))
-  }, renderInfo(info)), children);
+  }, !loading && renderInfo(info), loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Info.Header, null)), children);
 };
 
-var _default = PageHeader;
+var _default = ProPageHeader;
 exports.default = _default;

package/lib/page-header/index.scss

@@ -32,6 +32,7 @@ $prefix: 'teamix-pro-page-header';
   .#{$prefix}-info {
     padding-top: var(--s-2, 8px);
     margin-bottom: 0;
+    flex-direction: column;
   }
 
   .#{$prefix}-title {
@@ -62,7 +63,7 @@ $prefix: 'teamix-pro-page-header';
 
   .#{$prefix}-description {
     margin: var(--s-2, 8px) 0;
-    color: var(--color-text1-8, #848484);
+    color: var(--color-text1-2, #5a5a5a);
   }
 
   .#{$prefix}-data {

package/lib/table/components/EmptyContent/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

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

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _result = _interopRequireDefault(require("@teamix/result"));
+
+var _utils = require("@teamix/utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/** ProTable 空状态 */
+var _default = function _default() {
+  return /*#__PURE__*/_react.default.createElement(_result.default, {
+    theme: "hybridcloud-container",
+    img: "noData",
+    title: (0, _utils.getMessage)('noData')
+  });
+};
+
+exports.default = _default;

package/lib/table/components/Filter/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import './index.scss';
-import { ProColumnProps, ProTableActionType } from '../../typing';
+import { ProTableColumnProps, ProTableActionType } from '../../typing';
 declare type ProTableFilterProps = {
-    column: ProColumnProps;
+    column: ProTableColumnProps;
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
 };
 declare const Filter: React.FC<ProTableFilterProps>;

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

@@ -55,7 +55,9 @@ var RadioItem = _components.Menu.RadioItem;
 
 var Filter = function Filter(props) {
   var column = props.column,
-      actionRef = props.actionRef; // 选中过滤项
+      actionRef = props.actionRef;
+  var _column$filtersWidth = column.filtersWidth,
+      filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth; // 选中过滤项
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -174,7 +176,10 @@ var Filter = function Filter(props) {
       return setVisible(false);
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: cls()
+    className: cls(),
+    style: {
+      width: filtersWidth
+    }
   }, /*#__PURE__*/_react.default.createElement(_components.Menu, null, renderSelect(), /*#__PURE__*/_react.default.createElement("div", {
     className: cls({
       'btn-box': true
@@ -186,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$current4$r, _actionRef$current5, _actionRef$current5$s;
+      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$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,14 +219,22 @@ var Filter = function Filter(props) {
         return null;
       })), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item === null || item === void 0 ? void 0 : item[1]);
-      })); // 先发送请求。因为这会置空组件的列筛选状态
+      }));
+      var targetPageKey = 'currentPage';
+      var pageInfo = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.pageInfo;
+
+      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+      } // 再设置所有的列筛选状态
 
-      (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$r = _actionRef$current4.request) === null || _actionRef$current4$r === void 0 ? void 0 : _actionRef$current4$r.call(_actionRef$current4, _objectSpread({}, params)); // 再设置所有的列筛选状态
 
       (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$s = _actionRef$current5.setFilterRules) === null || _actionRef$current5$s === void 0 ? void 0 : _actionRef$current5$s.call(_actionRef$current5, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
         params: param
-      })));
+      }))); // 发送请求
+
+      (_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);
       setVisible(false);
     }
   }, "\u786E\u5B9A"), /*#__PURE__*/_react.default.createElement(_components.Button, {
@@ -231,15 +244,15 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current6, _actionRef$current6$g, _actionRef$current6$g2, _actionRef$current7, _actionRef$current7$s, _actionRef$current8, _actionRef$current8$f;
+      var _actionRef$current$ge6, _actionRef$current8, _actionRef$current8$g, _actionRef$current8$g2, _actionRef$current9, _actionRef$current9$s, _actionRef$current10, _actionRef$current10$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getState) === null || _actionRef$current6$g === void 0 ? void 0 : (_actionRef$current6$g2 = _actionRef$current6$g.call(_actionRef$current6)) === null || _actionRef$current6$g2 === void 0 ? void 0 : _actionRef$current6$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$s = _actionRef$current7.setFilterRules) === null || _actionRef$current7$s === void 0 ? void 0 : _actionRef$current7$s.call(_actionRef$current7, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      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, {
         rules: [],
         params: ''
       })));
-      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$f = _actionRef$current8.filterDataSource) === null || _actionRef$current8$f === void 0 ? void 0 : _actionRef$current8$f.call(_actionRef$current8, column.dataIndex); // setVisible(!visible);
+      (_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);
     }
   }, "\u91CD\u7F6E")))));
 };

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

@@ -1,5 +1,5 @@
 .teamix-pro-table-toolbar-filter {
-  width: 130px;
+  min-width: 130px;
   max-height: 350px;
   overflow-y: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));

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

@@ -99,7 +99,7 @@ var Layout = function Layout(props) {
       };
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('main-action')
-      }, /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread({}, mainAction), {}, {
+      }, /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({}, mainAction), {}, {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;

package/lib/table/components/QuickAction/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { IActionButton } from '../../../actions';
+import { ProActionButtonProps } from '../../../actions';
 import { ProTableActionType, innerRowSelectionType, rowSelectionType } from '../../typing';
 interface QuickActionProps {
-    quickAction?: IActionButton | React.ReactNode | React.ReactNode[];
+    quickAction?: ProActionButtonProps | React.ReactNode | React.ReactNode[];
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
     rowSelection?: innerRowSelectionType | rowSelectionType;
 }

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

@@ -24,7 +24,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 var QuickAction = function QuickAction(props) {
   var quickAction = props.quickAction,
       actionRef = props.actionRef,
-      rowSelection = props.rowSelection; // 如果传对象的话，默认为主要文字类型的 ActionButton
+      rowSelection = props.rowSelection; // 如果传对象的话，默认为主要文字类型的 ProActionButton
 
   if (_typeof(quickAction) === 'object') {
     // 默认 context

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

@@ -60,6 +60,7 @@ var FullScreen = function FullScreen(props) {
     canCloseByOutSideClick: false,
     align: "cc cc",
     cache: true,
+    v2: false,
     disableScroll: true,
     shouldUpdatePosition: true,
     animation: {