@teamix/pro 1.2.4 → 1.2.8

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

@@ -0,0 +1,95 @@
+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; }
+
+import { Tree } from '@alicloudfe/components';
+import { baseClass } from '@teamix/utils';
+import React, { useEffect, useState } from 'react';
+var cls = baseClass('teamix-pro-sidebar-tree');
+
+var ProSidebarTree = function ProSidebarTree(props) {
+  var dataSourceProp = props.dataSource,
+      searchKey = props.searchKey; // 自动展开父节点。过滤时用
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      matchedKeys = _useState2[0],
+      setMatchedKeys = _useState2[1];
+
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      expandedKeys = _useState4[0],
+      setExpandedKeys = _useState4[1];
+
+  var _useState5 = useState(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []),
+      _useState6 = _slicedToArray(_useState5, 2),
+      dataSource = _useState6[0],
+      setDataSource = _useState6[1];
+
+  useEffect(function () {
+    filterDataSource(searchKey !== null && searchKey !== void 0 ? searchKey : '');
+  }, [searchKey]); // 过滤
+
+  var filterDataSource = function filterDataSource(value) {
+    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.key);
+        }
+
+        if (item.children && item.children.length) {
+          loop(item.children);
+        }
+      });
+    };
+
+    loop(dataSource);
+    setExpandedKeys(_toConsumableArray(matchedKeys));
+    setMatchedKeys(matchedKeys);
+  };
+
+  var filterTreeNode = function filterTreeNode(node) {
+    return matchedKeys && matchedKeys.indexOf(node.props.eventKey) > -1;
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls()
+  }, /*#__PURE__*/React.createElement(Tree, {
+    draggable: true,
+    defaultExpandAll: true,
+    isLabelBlock: true,
+    isNodeBlock: {
+      defaultPaddingLeft: 8,
+      indent: 16
+    },
+    dataSource: dataSource,
+    filterTreeNode: filterTreeNode,
+    expandedKeys: expandedKeys
+  }));
+};
+
+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,66 @@
+var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch"];
+
+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,
+      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({
+    searchOnChange: function searchOnChange(value) {
+      if (showSearch) {
+        _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
+        setSearchKey(value);
+      }
+    },
+    showSearch: showSearch
+  }, others), /*#__PURE__*/React.createElement(ProSidebarTree, {
+    dataSource: dataSource,
+    searchKey: searchKey
+  })));
+};
+
+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,51 @@
+/// <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;
+} & React.HTMLAttributes<HTMLElement> & ProSidebarContainerProps;
+/** 数据源定义 */
+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[];
+};
+/** 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;
+} & TreeProps;

package/es/sidebar/typing.js

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

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

@@ -100,7 +100,7 @@ var Layout = function Layout(props) {
   var renderPanelFilter = function renderPanelFilter() {
     var _dataFilter$schema2;
 
-    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) > 0) {
+    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('panel-filter'),
         style: {

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -78,27 +78,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
 
   useEffect(function () {
     setNewColumns(processColumns(columns));
-  }, [columns]); // useEffect(() => {
-  //   console.log("这个函数被触发");
-  //   setTimeout(() => {
-  //     setFullscreen(actionRef?.current?.getState?.().fullScreenState ?? false);
-  //   }, 0)
-  // }, [])
-  // // 销毁监听函数
-  // useEffect(() => {
-  //   return () => {
-  //     actionRef.current?.off?.('filterColumnIcon');
-  //   };
-  // }, []);
-  // // 监听全屏变化
-  // actionRef.current?.on?.(
-  //   (state: boolean) => {
-  //     setFullscreen(state);
-  //   },
-  //   'fullScreenState',
-  //   'filterColumnIcon',
-  // );
-  // 全选
+  }, [columns]); // 全选
 
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
@@ -297,9 +277,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       onOk: onChangeColumnsForDialog,
       onCancel: dialogOnClose,
       onClose: dialogOnClose,
-      style: {
-        width: '440px'
-      }
+      width: 480
     }, /*#__PURE__*/React.createElement(Row, {
       gutter: 20,
       wrap: true,

package/es/table/components/ToolBar/index.scss

@@ -67,8 +67,6 @@
       }
     }
   }
-
-  
 }
 .teamix-pro-table-toolbar-filter-column-col {
   height: 28px;
@@ -78,7 +76,6 @@
   }
 }
 
-
 // fullscreen
 .teamix-pro-table-full-screen {
   width: 100vw;

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); }
 
@@ -49,6 +49,7 @@ import { createForm, formilyReactive } from '../form';
 import { ProActionGroup } from '../actions';
 import debounce from 'lodash.debounce';
 import classNames from 'classnames';
+import ProPageContainer from '../page-container';
 export * from './typing';
 var cls = baseClass('teamix-pro-table');
 var toJS = formilyReactive.toJS;
@@ -96,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,
@@ -236,10 +238,10 @@ var ProTable = function ProTable(props) {
 
   var dataFilterForm = useMemo(function () {
     return createForm();
-  }, []); // 获取内容区是否超出一屏（仅支持全家桶）
+  }, []); // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
   var getFooterSuctionState = function getFooterSuctionState() {
-    var containerDom = document.querySelector('.teamix-pro-page-container');
+    var containerDom = document.querySelector('.teamix-pro-page-container-scroll-container');
 
     if (containerDom) {
       var offsetHeight = containerDom.offsetHeight;
@@ -250,6 +252,11 @@ var ProTable = function ProTable(props) {
       } else {
         setFooterSuctionState(false);
       }
+    } else {
+      // 非全家桶用户暂时不判断滚动条逻辑
+      if (footerSuction) {
+        setFooterSuctionState(true);
+      }
     }
   }; // rowSelection 相关
 
@@ -365,7 +372,9 @@ var ProTable = function ProTable(props) {
       return _request(params);
     },
     request: function request(params) {
-      return _request(params);
+      if (dataFilterForm.validate()) {
+        _request(params);
+      }
     },
     reset: function reset() {
       var _actionRef$current, _actionRef$current$se;
@@ -652,7 +661,7 @@ var ProTable = function ProTable(props) {
   var renderFooterAction = function renderFooterAction() {
     var _footerAction$actions;
 
-    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) > 0) {
+    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) >= 0) {
       // 默认 context
       var defaultContext = {
         action: actionRef.current,
@@ -714,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
@@ -743,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));
     }
   };
 
@@ -752,11 +769,11 @@ var ProTable = function ProTable(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: cls({
       '': true,
-      fullscreen: fullscreenState,
-      'footer-suction': footerSuctionState && footerSuction
+      fullscreen: fullscreenState // 'footer-suction': footerSuctionState && footerSuction,
+
     }),
     ref: tableRef
-  }, renderTable(), renderFooter()));
+  }, renderTable(), footerSuctionState && footerSuction && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && renderFooter()));
 };
 
 export default ProTable;

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

@@ -4,7 +4,7 @@
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
 import { IFilterProps } from '../form';
-import { ActionGroupProps, ProActionButtonProps } from '../actions';
+import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
@@ -50,7 +50,7 @@ export declare type ProTableColumnProps = {
     /** 表头的过滤菜单宽度 */
     filtersWidth?: string | number;
     /** 操作组配置 */
-    actionSchema?: ActionGroupProps;
+    actionSchema?: ProActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
@@ -99,7 +99,9 @@ export declare type ProTableProps = {
     /** 获取内置 rowSelection */
     getRowSelection?: (rowSelection: rowSelectionType) => void;
     /** 表格底部（左侧）配置 */
-    footerAction?: ActionGroupProps | React.ReactNode;
+    footerAction?: ProActionGroupProps | React.ReactNode;
+    /** 表格底部（右层）配置 */
+    footer?: React.ReactNode;
     /** 筛选区自动搜索的防抖时间（毫秒） */
     filterDebounce?: number;
     /** ProTable action 的引用，便于手动触发一些方法  */
@@ -211,7 +213,7 @@ export declare type ProTableTopAreaProps = {
     /** 标题区 */
     header?: ProTableHeaderProps;
     /** 主操作区 */
-    mainAction?: ActionGroupProps | React.ReactNode;
+    mainAction?: ProActionGroupProps | React.ReactNode;
     /** 工具栏区 */
     toolBar?: boolean | ProTableToolBarItem[];
     /** 快捷操作区 */

package/lib/actions/dialog-component.js

@@ -10,6 +10,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _dialog = _interopRequireDefault(require("./dialog"));
 
+var _utils = require("./utils");
+
 var _excluded = ["schema", "component"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -30,7 +32,7 @@ function useDialogComponentAction(action, context) {
       others = _objectWithoutProperties(action, _excluded);
 
   return (0, _dialog.default)(Object.assign({
-    content: /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, schema)),
+    content: /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils.addContext)(schema, context))),
     closeable: true
   }, others), context);
 }

package/lib/actions/dialog-form.js

@@ -22,6 +22,8 @@ var _request = require("./request");
 
 var _dialog = _interopRequireDefault(require("./dialog"));
 
+var _utils2 = require("./utils");
+
 var _excluded = ["schema"],
     _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish"];
 
@@ -141,7 +143,7 @@ var DialogForm = function DialogForm(props) {
   }, /*#__PURE__*/_react.default.createElement(_form.default, _objectSpread(_objectSpread({
     form: form,
     schema: (0, _utils.getTargetValue)(formSchema, context)
-  }, getDefaultFormPropsByDialogSize(size)), (0, _utils.getTargetValue)(others, context))));
+  }, getDefaultFormPropsByDialogSize(size)), (0, _utils2.addContext)((0, _utils.getTargetValue)(others, context), context))));
 };
 
 function useDialogFormAction(action, context) {

package/lib/actions/dialog.js

@@ -26,6 +26,8 @@ var _base = require("./base");
 
 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"];
@@ -247,7 +249,7 @@ function useDialogAction(action, context) {
     });
     var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
       key: (0, _utils.uuid)()
-    }, componentProps)) : addContextForReactNode(content, dialogContext);
+    }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread({
       // @ts-ignore

package/lib/actions/index.js

@@ -259,13 +259,14 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
-    popupTriggerType: "hover",
+    popupTriggerType: "click",
+    autoWidth: false,
     menuProps: {
       mode: 'popup',
       triggerType: 'hover'
     },
     popupProps: {
-      shouldUpdatePosition: true
+      v2: true
     },
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)

package/lib/actions/index.scss

@@ -85,4 +85,7 @@
   .teamix-pro-form {
     margin-bottom: -20px;
   }
+  .teamix-pro-table .teamix-pro-form {
+    margin-bottom: 0px;
+  }
 }

package/lib/actions/utils.d.ts

@@ -0,0 +1 @@
+export declare function addContext(props?: any, context?: any): any;

package/lib/actions/utils.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addContext = addContext;
+var _excluded = ["context"];
+
+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; }
+
+function addContext(props, context) {
+  if (!props) {
+    return {
+      context: context
+    };
+  }
+
+  var propsContext = props.context,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var mergedContext = Object.assign({}, propsContext, context);
+  return _objectSpread({
+    context: mergedContext
+  }, others);
+}

package/lib/card/card-container.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { ProCardProps } from './index';
+/**
+ * @deprecated 建议使用 ProCardProps 代替
+ */
+export declare type ProCardContainerProps = ProCardProps;
+/**
+ * @deprecated 建议使用 ProCard 代替
+ */
+export declare const ProCardContainer: React.FC<ProCardContainerProps>;
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+export declare const CardContainer: React.FC<ProCardProps>;
+/**
+ * @deprecated 建议使用 ProCardContainerProps 代替
+ */
+export declare type CardContainerProps = ProCardContainerProps;

package/lib/card/card-container.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ProCardContainer = exports.CardContainer = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _index = require("./index");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+/**
+ * @deprecated 建议使用 ProCard 代替
+ */
+var ProCardContainer = function ProCardContainer(props) {
+  return /*#__PURE__*/_react.default.createElement(_index.ProCard, _objectSpread({}, props));
+};
+
+exports.ProCardContainer = ProCardContainer;
+ProCardContainer.defaultProps = {
+  compacted: true,
+  direction: 'column'
+};
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+
+var CardContainer = ProCardContainer;
+exports.CardContainer = CardContainer;

package/lib/card/divider.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+declare const ProCardDivider: {
+    (props: React.HTMLAttributes<HTMLElement>): JSX.Element;
+    isProCardDivider: boolean;
+};
+export default ProCardDivider;