@teamix/pro 1.2.5 → 1.2.9

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

@@ -0,0 +1,77 @@
+var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage"];
+
+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; }
+
+import { Message } from '@alicloudfe/components';
+import { ProCard } from '../../../card';
+import ProField from '@teamix/pro-field';
+import { baseClass } from '@teamix/utils';
+import React from 'react';
+import './index.scss';
+var cls = baseClass('teamix-pro-sidebar-container');
+
+var ProSidebarContainer = function ProSidebarContainer(props) {
+  var children = props.children,
+      searchPlaceholder = props.searchPlaceholder,
+      _props$showSearch = props.showSearch,
+      showSearch = _props$showSearch === void 0 ? true : _props$showSearch,
+      _props$searchProps = props.searchProps,
+      searchProps = _props$searchProps === void 0 ? {} : _props$searchProps,
+      customSearch = props.customSearch,
+      searchOnChange = props.searchOnChange,
+      message = props.message,
+      _props$messageProps = props.messageProps,
+      messageProps = _props$messageProps === void 0 ? {} : _props$messageProps,
+      customMessage = props.customMessage,
+      others = _objectWithoutProperties(props, _excluded); // 渲染搜索区域
+
+
+  var renderSearch = function renderSearch() {
+    if (customSearch || showSearch) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: cls('search')
+      }, !!customSearch && customSearch, showSearch && /*#__PURE__*/React.createElement(ProField, _objectSpread({
+        mode: "edit",
+        type: "text",
+        placeholder: searchPlaceholder,
+        innerBeforeIcon: "search-line",
+        onChange: searchOnChange
+      }, searchProps)));
+    }
+
+    return null;
+  }; // 渲染通知区域
+
+
+  var renderNotice = function renderNotice() {
+    if (message || customMessage) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: cls('notice')
+      }, message && /*#__PURE__*/React.createElement(Message, _objectSpread({
+        type: "notice",
+        closeable: true
+      }, messageProps), message), !!customMessage && customMessage);
+    }
+
+    return null;
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls()
+  }, /*#__PURE__*/React.createElement(ProCard, _objectSpread({
+    bordered: false,
+    compacted: true
+  }, others), renderSearch(), renderNotice(), /*#__PURE__*/React.createElement("div", {
+    className: cls('context')
+  }, children)));
+};
+
+export default ProSidebarContainer;

package/es/sidebar/components/sidebar-container/index.scss

@@ -0,0 +1,18 @@
+.teamix-pro-sidebar-container {
+  min-width: 180px;
+
+  &-search {
+    margin-bottom: 8px;
+  }
+
+  &-search-has-message {
+    margin-bottom: 4px;
+  }
+
+  &-notice {
+    margin-bottom: 4px;
+  }
+
+  &-context {
+  }
+}

package/es/sidebar/components/tree/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { ProSidebarTreeProps } from '../../typing';
+declare const ProSidebarTree: React.FC<ProSidebarTreeProps>;
+export default ProSidebarTree;

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

@@ -0,0 +1,162 @@
+var _excluded = ["dataSource", "searchKey", "onSelect"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+import { Tree } from '@alicloudfe/components';
+import { baseClass, treeToList } from '@teamix/utils';
+import React, { isValidElement, useEffect, useState } from 'react';
+var cls = baseClass('teamix-pro-sidebar-tree');
+
+var ProSidebarTree = function ProSidebarTree(props) {
+  var dataSourceProp = props.dataSource,
+      searchKey = props.searchKey,
+      onSelect = props.onSelect,
+      others = _objectWithoutProperties(props, _excluded); // 自动展开父节点。过滤时用
+
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      autoExpandParent = _useState2[0],
+      setAutoExpandParent = _useState2[1];
+
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      matchedKeys = _useState4[0],
+      setMatchedKeys = _useState4[1];
+
+  var _useState5 = useState(),
+      _useState6 = _slicedToArray(_useState5, 2),
+      expandedKeys = _useState6[0],
+      setExpandedKeys = _useState6[1];
+
+  var _useState7 = useState(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []),
+      _useState8 = _slicedToArray(_useState7, 2),
+      dataSource = _useState8[0],
+      setDataSource = _useState8[1];
+
+  useEffect(function () {
+    getAllExpend();
+  }, []);
+  useEffect(function () {
+    filterDataSource(searchKey !== null && searchKey !== void 0 ? searchKey : '');
+  }, [searchKey]); // 获取全部展开节点key
+
+  var getAllExpend = function getAllExpend() {
+    var allKeys = treeToList(dataSource).map(function (item) {
+      return item.value;
+    });
+    setExpandedKeys(allKeys);
+  }; // 过滤
+
+
+  var filterDataSource = function filterDataSource(value) {
+    if (!value) {
+      setExpandedKeys([]);
+      getAllExpend();
+    }
+
+    value = value.trim();
+    var matchedKeys = [];
+
+    if (!value) {
+      matchedKeys = [];
+      return;
+    }
+
+    var loop = function loop(data) {
+      return data.forEach(function (item) {
+        if (item.label.indexOf(value) > -1) {
+          matchedKeys.push(item.value);
+        }
+
+        if (item.children && item.children.length) {
+          loop(item.children);
+        }
+      });
+    };
+
+    loop(dataSource);
+    setExpandedKeys(_toConsumableArray(matchedKeys));
+    setAutoExpandParent(true);
+    setMatchedKeys(matchedKeys);
+  };
+
+  var filterTreeNode = function filterTreeNode(node) {
+    return matchedKeys && matchedKeys.indexOf(node.props.eventKey) > -1;
+  }; // 节点展开回调
+
+
+  var handleExpand = function handleExpand(key) {
+    setExpandedKeys(key);
+    setAutoExpandParent(false);
+  }; // 渲染树节点
+
+
+  var renderTreeNode = function renderTreeNode(data) {
+    return data.map(function (item) {
+      return /*#__PURE__*/React.createElement(Tree.Node, {
+        key: item.value,
+        label: renderTreeNodeItem(item)
+      }, item.children && item.children.length > 0 && renderTreeNode(item.children));
+    });
+  }; // 渲染单个树节点 label
+
+
+  var renderTreeNodeItem = function renderTreeNodeItem(data) {
+    var node = /*#__PURE__*/React.createElement(React.Fragment, null, data.label);
+
+    if (data.tag) {
+      if ( /*#__PURE__*/isValidElement(data.tag)) {
+        node = /*#__PURE__*/React.createElement(React.Fragment, null, node, data.tag);
+      }
+    }
+
+    return node;
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls()
+  }, /*#__PURE__*/React.createElement(Tree, _objectSpread({
+    defaultExpandAll: true,
+    isLabelBlock: true,
+    isNodeBlock: {
+      defaultPaddingLeft: 8,
+      indent: 16
+    },
+    filterTreeNode: filterTreeNode,
+    expandedKeys: expandedKeys,
+    onExpand: handleExpand,
+    autoExpandParent: autoExpandParent,
+    onSelect: onSelect
+  }, others), renderTreeNode(dataSource)));
+};
+
+export default ProSidebarTree;

package/es/sidebar/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import './index.scss';
+import { ProSidebarProps } from './typing';
+declare const ProSidebar: React.FC<ProSidebarProps>;
+export default ProSidebar;

package/es/sidebar/index.js

@@ -0,0 +1,70 @@
+var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch", "onSelect", "treeProps", "cardProps"];
+
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+import React, { useState } from 'react';
+import './index.scss';
+import { baseClass } from '@teamix/utils';
+import ProSidebarContainer from './components/sidebar-container';
+import ProSidebarTree from './components/tree';
+var cls = baseClass('teamix-pro-sidebar');
+
+var ProSidebar = function ProSidebar(props) {
+  var dataSource = props.dataSource,
+      className = props.className,
+      style = props.style,
+      _searchOnChange = props.searchOnChange,
+      _props$showSearch = props.showSearch,
+      showSearch = _props$showSearch === void 0 ? true : _props$showSearch,
+      onSelect = props.onSelect,
+      treeProps = props.treeProps,
+      cardProps = props.cardProps,
+      others = _objectWithoutProperties(props, _excluded); // 搜索的关键词
+
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      searchKey = _useState2[0],
+      setSearchKey = _useState2[1];
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls(_defineProperty({
+      '': true
+    }, className, true)),
+    style: style
+  }, /*#__PURE__*/React.createElement(ProSidebarContainer, _objectSpread(_objectSpread({
+    searchOnChange: function searchOnChange(value) {
+      if (showSearch) {
+        _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
+        setSearchKey(value);
+      }
+    },
+    showSearch: showSearch
+  }, others), cardProps), /*#__PURE__*/React.createElement(ProSidebarTree, _objectSpread({
+    dataSource: dataSource,
+    searchKey: searchKey,
+    onSelect: onSelect
+  }, treeProps))));
+};
+
+export default ProSidebar;

package/es/sidebar/index.scss

@@ -0,0 +1,3 @@
+.teamix-pro-sidebar {
+  color: var(--color-brand1-6);
+}

package/es/sidebar/typing.d.ts

@@ -0,0 +1,64 @@
+/// <reference types="react" />
+import { MessageProps } from '@alifd/next/types/message';
+import { TreeProps } from '@alifd/next/types/tree';
+import { ProCardProps, ProFieldProps } from '..';
+/** ProSidebar 定义 */
+export declare type ProSidebarProps = {
+    /** 数据源 */
+    dataSource?: ProSidebarDataSource;
+    /** 节点点击回调 */
+    onSelect?: TreeProps['onSelect'];
+    /** 树配置 */
+    treeProps?: TreeProps;
+    /** 卡片配置 */
+    cardProps?: ProCardProps;
+} & Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> & Omit<ProSidebarContainerProps, 'onSelect'>;
+/** 数据源定义 */
+export declare type ProSidebarDataSource = ProSidebarDataSourceItem[];
+export declare type ProSidebarDataSourceItem = {
+    /** 展示值 */
+    label?: React.ReactNode;
+    /** 绑定值 */
+    value?: any;
+    /** icon */
+    icon?: React.ReactNode;
+    /** 标签 */
+    tag?: React.ReactNode;
+    /** 右侧操作、状态区 */
+    extra?: React.ReactNode;
+    /** 子项 */
+    children?: ProSidebarDataSourceItem[];
+};
+/** tag 定义 */
+export declare type ProSidebarDataSourceTag = {
+    /** 显示值 */
+    value: string;
+};
+/** sidebar 容器定义 */
+export declare type ProSidebarContainerProps = {
+    children?: React.ReactNode;
+    /** 搜索输入提示 */
+    searchPlaceholder?: string;
+    /** 搜索输入其他参数 ProField 参数 */
+    searchProps?: ProFieldProps;
+    /** 是否展示搜索框 */
+    showSearch?: boolean;
+    /** 自定义搜索 */
+    customSearch?: React.ReactNode;
+    /** 搜索框变化的回调函数 */
+    searchOnChange?: (value: any) => void;
+    /** 通知提示消息区域 */
+    message?: React.ReactNode;
+    /** 自定义消息通知区域 */
+    customMessage?: React.ReactNode;
+    /** 消息通知区域的其他参数 */
+    messageProps?: MessageProps;
+} & ProCardProps;
+/** ProSidebarTree 内容定义 */
+export declare type ProSidebarTreeProps = {
+    dataSource?: ProSidebarDataSource;
+    /** 搜索过滤关键词 */
+    searchKey?: string;
+    /** 节点点击回调 */
+    onChange?: ProSidebarProps['onChange'];
+} & TreeProps;

package/es/sidebar/typing.js

@@ -0,0 +1 @@
+export {};

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
@@ -97,6 +97,7 @@ var ProTable = function ProTable(props) {
       getRowSelection = props.getRowSelection,
       primaryKey = props.primaryKey,
       footerAction = props.footerAction,
+      footer = props.footer,
       url = props.url,
       pageKey = props.pageKey,
       pageSizeKey = props.pageSizeKey,
@@ -722,7 +723,7 @@ var ProTable = function ProTable(props) {
       }
     }
 
-    if (showPagination || footerAction) {
+    if (showPagination) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection
@@ -751,6 +752,14 @@ var ProTable = function ProTable(props) {
           return onChangePaginationSize(number);
         }
       }, props.paginationProps))));
+    } else if (!showPagination) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: cls('footer', {
+          'footer-has-rowSelection': rowSelection
+        })
+      }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
+        className: cls('footer-right-wrapper')
+      }, showSkeleton ? /*#__PURE__*/React.createElement(Skeleton.Footer.Pagination, null) : footer));
     }
   };
 

package/es/table/index.scss

@@ -13,6 +13,7 @@ $fullscreenPadding: 24px;
   --checkbox-semi-select-icon-content: '\ead5';
   &-footer {
     padding: 8px 0;
+    width: 100%;
   }
   &-footer-fixed {
     position: fixed;

package/es/table/typing.d.ts

@@ -100,6 +100,8 @@ export declare type ProTableProps = {
     getRowSelection?: (rowSelection: rowSelectionType) => void;
     /** 表格底部（左侧）配置 */
     footerAction?: ProActionGroupProps | React.ReactNode;
+    /** 表格底部（右层）配置 */
+    footer?: React.ReactNode;
     /** 筛选区自动搜索的防抖时间（毫秒） */
     filterDebounce?: number;
     /** ProTable action 的引用，便于手动触发一些方法  */

package/lib/actions/dialog-form.js

@@ -159,7 +159,7 @@ function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       others = _objectWithoutProperties(action, _excluded2);
 
-  var formRef = (0, _react.useRef)();
+  var formRef = /*#__PURE__*/(0, _react.createRef)();
   return (0, _dialog.default)(Object.assign({
     size: size,
     closeable: true,

package/lib/actions/dialog.js

@@ -29,8 +29,7 @@ var _request = require("./request");
 var _utils2 = require("./utils");
 
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "overlayProps"],
-    _excluded3 = ["className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -38,16 +37,16 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 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; }
@@ -135,28 +134,20 @@ function useDialogAction(action, context) {
         message = _getTargetValue.message,
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
-        _getTargetValue$overl = _getTargetValue.overlayProps,
-        overlayProps = _getTargetValue$overl === void 0 ? {} : _getTargetValue$overl,
         containerProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
     var isDrawer = dialogType === 'drawer';
     var container = isDrawer ? _components.Drawer : _components.Dialog;
-
-    var overlayClassName = overlayProps.className,
-        overlayOtherProps = _objectWithoutProperties(overlayProps, _excluded3);
-
     var dialogOnlyProps = {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
-      },
-      overlayProps: _objectSpread({
-        className: (0, _classnames.default)('teamix-pro-action-dialog', overlayClassName, {
-          'has-footer-description': !!footerDescription
-        })
-      }, overlayOtherProps)
+      }
     };
-    var containerOtherProps = isDrawer ? {} : dialogOnlyProps;
+    var containerOtherProps = isDrawer ? {
+      okText: (0, _utils.getMessage)('ok'),
+      cancelText: (0, _utils.getMessage)('cancel')
+    } : dialogOnlyProps;
 
     var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
       if (footer instanceof Array || footer.component) {

package/lib/actions/index.js

@@ -206,13 +206,15 @@ var ProActionButton = function ProActionButton(props) {
 
 exports.ProActionButton = ProActionButton;
 
-function renderMenuButtonItem(item, key, context) {
-  var config = item.config,
-      btnContext = item.context,
-      _onClick2 = item.onClick,
-      children = item.children,
-      icon = item.icon,
-      disabled = item.disabled;
+var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
+  var action = props.action,
+      context = props.context;
+  var config = action.config,
+      btnContext = action.context,
+      _onClick2 = action.onClick,
+      children = action.children,
+      icon = action.icon,
+      disabled = action.disabled;
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
@@ -221,30 +223,33 @@ function renderMenuButtonItem(item, key, context) {
       loading = _useAction.loading,
       menuItemProps = _objectWithoutProperties(_useAction, _excluded3);
 
-  var buttonProps = _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
+  var buttonProps = disabled ? {} : _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
     onClick: function onClick(e) {
       return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
-  return /*#__PURE__*/_react.default.createElement(_components.MenuButton.Item, _objectSpread({
-    key: key,
-    disabled: disabled
+  return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
+    className: (0, _classnames.default)('teamix-pro-action-menu-item', 'next-menu-item', {
+      'next-disabled': disabled
+    })
   }, buttonProps), buttonContent(children, icon, undefined, context));
-}
+};
 
-function renderCommonActionButtonMenuItem(action, key, context) {
+function renderCommonActionButtonMenuItem(action, context) {
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
     return /*#__PURE__*/_react.default.createElement(_components.Menu.SubMenu, {
-      key: key,
       label: menuBtn.label || menuBtn.children
     }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, j, context);
+      return renderCommonActionButtonMenuItem(a, context);
     }));
   }
 
-  return renderMenuButtonItem(action, key, context);
+  return /*#__PURE__*/_react.default.createElement(ProActionMenuButtonItem, {
+    action: action,
+    context: context
+  });
 }
 
 var ProActionMenuButton = function ProActionMenuButton(props) {
@@ -260,6 +265,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
 
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
     popupTriggerType: "hover",
+    autoWidth: false,
     menuProps: {
       mode: 'popup',
       triggerType: 'hover'
@@ -269,8 +275,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
     },
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
-  }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, i, context);
+  }, others), actions.map(function (action) {
+    return renderCommonActionButtonMenuItem(action, context);
   }));
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
@@ -377,9 +383,7 @@ function ProActionGroup(props) {
     })
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
-      key: i
-    }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
       direction: "ver"
     }));
   }));