@teamix/pro 1.2.24 → 1.2.26

package/es/step/index.js

@@ -0,0 +1,101 @@
+var _excluded = ["mode", "items", "shape", "children"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 React, { useMemo } from 'react';
+import { Step, Timeline } from '@alicloudfe/components';
+import ProStepItem from './ProStepItem';
+
+var ProStep = function ProStep(props) {
+  var mode = props.mode,
+      items = props.items,
+      shape = props.shape,
+      children = props.children,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var current = props.current,
+      labelPlacement = props.labelPlacement,
+      readOnly = props.readOnly,
+      animation = props.animation,
+      size = props.size;
+  var fold = props.fold; // 判断渲染组件是不是 ProStepItem, 并返回筛选后的children
+
+  var renderChildren = useMemo(function () {
+    return React.Children.map(children, function (child, index) {
+      var childElement = child;
+      var displayName = childElement.type.displayName;
+
+      if (displayName === 'ProStepItem') {
+        return /*#__PURE__*/React.cloneElement(childElement, {
+          _size: size,
+          _mode: mode,
+          _index: index,
+          _current: current,
+          _shape: shape
+        });
+      } // 如果不是 ProStepItem
+
+
+      console.error('Warning: ProStep has a child which is not a ProStepItem component');
+    });
+  }, [children]); // 设置circle, 覆盖 dot 阻止重新渲染节点样式
+
+  var shapeMap = function shapeMap() {
+    if (shape === 'arrow') return 'arrow';
+    return 'circle';
+  }; // 渲染 ProStepItem
+
+
+  var renderItem = function renderItem() {
+    // 传递了 item 采用 item 渲染数组的方式
+    if (items) {
+      return items.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(ProStepItem, _objectSpread({
+          key: index,
+          _mode: mode,
+          _shape: shape,
+          _index: index,
+          _current: current,
+          _size: size
+        }, item));
+      });
+    } else {
+      return renderChildren;
+    }
+  }; // 渲染 ProStep
+
+
+  var renderProStep = function renderProStep() {
+    if (mode === 'ver') {
+      return /*#__PURE__*/React.createElement(Timeline, _objectSpread({
+        fold: fold
+      }, others), renderItem());
+    }
+
+    return /*#__PURE__*/React.createElement(Step, _objectSpread({
+      current: current,
+      shape: shapeMap(),
+      labelPlacement: labelPlacement,
+      readOnly: readOnly,
+      animation: animation
+    }, others), renderItem());
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "teamix-pro-step"
+  }, renderProStep());
+};
+
+ProStep.Item = ProStepItem;
+ProStep.defaultProps = {
+  mode: 'hoz'
+};
+export { ProStep, ProStepItem };

package/es/step/typing.d.ts

@@ -0,0 +1,96 @@
+import { ItemProps as StepItemProps } from '@alicloudfe/components/types/step';
+import { ItemProps as TimeLineItemProps } from '@alicloudfe/components/types/timeline';
+import { ReactNode } from 'react';
+import { ProTagItem } from '@teamix/utils';
+export declare type ProStepItemStatus = 'success' | 'fail' | 'process' | 'warning' | 'wait';
+export declare type ModeStatusFromProStep = {
+    _mode?: string | 'hoz' | 'ver';
+};
+export declare type FoldProps = {
+    foldArea: [number, number];
+    foldShow: boolean;
+};
+export declare type ProStepProps = HozStepProps | VerTimeLineProps;
+export declare type ProStepBaseProps = {
+    /** 步骤条：节点展示类型*/
+    shape?: 'icon' | 'arrow' | 'dot' | 'number';
+    /** style */
+    style?: React.CSSProperties;
+    /** className */
+    className?: string;
+} & React.HTMLAttributes<HTMLElement>;
+export interface HozStepProps extends ProStepBaseProps {
+    /** 当前组件的展示形式 */
+    mode?: 'hoz';
+    /** 内部渲染自组件 */
+    items?: HozStepItemProps[];
+    /** 步骤条：当前步骤 */
+    current?: number;
+    /** 步骤条: 横向布局时( direction 为 hoz )的内容排列*/
+    labelPlacement?: 'hoz' | 'ver';
+    /** 步骤条: 是否可读模式 */
+    readOnly?: boolean;
+    /** 步骤条: 是否开启动效 */
+    animation?: boolean;
+    /**dot 形态下切换size */
+    size?: 'normal' | 'small';
+}
+export interface VerTimeLineProps extends ProStepBaseProps {
+    /** 当前组件的展示形式 */
+    mode?: 'ver';
+    /** 内部渲染自组件 */
+    items?: VerStepItemProps[];
+    /** 时间线: 自定义折叠选项 */
+    fold?: FoldProps[];
+}
+export interface ProStepItemBaseProps {
+    /**步骤条：节点展示类型 */
+    _shape?: 'icon' | 'arrow' | 'dot' | 'number';
+    /**节点索引 */
+    _index?: number;
+    /**活跃节点 */
+    _current?: number;
+    /**节点状态 */
+    status?: string | ProStepItemStatus;
+    /**节点设置为 icon 图标 */
+    icon?: string;
+    /**节点的内容 */
+    content?: ReactNode;
+    /**节点标题 */
+    title?: ReactNode;
+    /**自定义渲染 */
+    dotRender?: (index?: number, status?: string) => ReactNode;
+    /**点击事件 */
+    onClick?: (index: number) => void;
+    /**百分比展示 */
+    percent?: number;
+    /**是否禁用当前节点 */
+    disabled?: boolean;
+}
+export interface HozStepItemProps extends ProStepItemBaseProps {
+    /**dot 形态下切换size */
+    _size?: 'normal' | 'small';
+}
+export interface VerStepItemProps extends ProStepItemBaseProps {
+    /**节点副标题，在 timeline 可以展示格式化后的时间 */
+    subTitle?: ReactNode;
+    /**节点对应描述 */
+    discription?: ReactNode;
+    /**节点的 tag */
+    tags?: ProTagItem[] | ReactNode;
+    /**左侧展示内容 */
+    timeLeft?: ReactNode;
+    /**头像 */
+    image?: string | ReactNode;
+    /**是否需要 animation 动画 */
+    animation?: boolean;
+    /**卡片是否可折叠 */
+    collapsible?: boolean;
+    /**默认是否折叠，用于非受控模式 */
+    defaultCollapsed?: boolean;
+    /**是否折叠，受控模式 */
+    collapsed?: boolean;
+    /**折叠状态改变的回调函数 */
+    onCollapse?: (collapsed: boolean) => void;
+}
+export declare type ProStepItemProps = (HozStepItemProps | VerStepItemProps) & React.HTMLAttributes<HTMLElement> & StepItemProps & TimeLineItemProps;

package/es/step/typing.js

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

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

@@ -150,8 +150,6 @@ var Filter = function Filter(props) {
         setVisible(!visible);
       }
     }),
-    //@ts-ignore
-    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -189,20 +187,7 @@ var Filter = function Filter(props) {
       } // 需要带上其他所有的信息
 
 
-      var rules = (_actionRef$current$ge5 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge5 !== void 0 ? _actionRef$current$ge5 : {};
-      var params = Object.fromEntries([].concat(_toConsumableArray(Object.entries(rules).map(function (_ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
-            k = _ref6[0],
-            v = _ref6[1];
-
-        if (v) {
-          return [k, v.params];
-        }
-
-        return null;
-      })), [[column.dataIndex, param]]).filter(function (item) {
-        return item && (item === null || item === void 0 ? void 0 : item[1]);
-      })); // 再设置所有的列筛选状态
+      var rules = (_actionRef$current$ge5 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge5 !== void 0 ? _actionRef$current$ge5 : {}; // 再设置所有的列筛选状态
 
       (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
@@ -220,7 +205,7 @@ var Filter = function Filter(props) {
         } // 发送请求
 
 
-        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+        (_actionRef$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, _defineProperty({}, targetPageKey, 1));
         (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
 
         (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);

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", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType"];
+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", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -40,7 +40,7 @@ import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessag
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
-import { emit, initActionRef, useActionType } from './utils';
+import { emit, initActionRef, processDefaultFilter, useActionType } from './utils';
 import getTableProps from './utils/getTableProps';
 import getTableSortIcons from './utils/getTableSortIcons';
 import useTableSelection from './utils/useTableSelection';
@@ -164,6 +164,7 @@ var ProTable = function ProTable(props) {
       customRequest = props.customRequest,
       _props$filterColumnTy = props.filterColumnType,
       filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
+      defaultFilterParams = props.defaultFilterParams,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -632,6 +633,9 @@ var ProTable = function ProTable(props) {
     }
 
     if (requestWhenMount) {
+      // 在请求发送之前 处理漏斗默认数据
+      processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
+
       _request();
     }
 
@@ -786,7 +790,7 @@ var ProTable = function ProTable(props) {
 
       var targetActions = footerAction.actions.map(function (action) {
         return _objectSpread(_objectSpread({}, action), {}, {
-          disabled: action.disabled || selectedCount === 0
+          disabled: (action === null || action === void 0 ? void 0 : action.disabled) || selectedCount === 0
         });
       });
 

package/es/table/typing.d.ts

@@ -3,7 +3,7 @@
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
-import { QueryFilterProps } from '../form';
+import { IFilterProps } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
@@ -125,6 +125,10 @@ export declare type ProTableProps = {
         data: any[];
         total?: number;
     }>;
+    /** 默认漏斗过滤条件 */
+    defaultFilterParams?: {
+        [key: string]: any[] | any;
+    };
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -215,12 +219,17 @@ export declare type ProTableActionTypeState = {
     [key: string]: any;
 };
 export declare type ProTableDataFilterProps = {
+    /** 展示形式 */
+    mode?: 'inline' | 'panel';
+    /** mode='panel' 时是否默认展开 */
+    expand?: boolean;
+    /** 搜索时是否传入值为undefined的参数，默认不传 */
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
     /** 自定义内容 */
     content?: React.ReactNode;
-} & QueryFilterProps;
+} & IFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {
     /** 标题区 */

package/es/table/utils/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
+import { ProTableProps, ProTableColumnProps } from '..';
 export declare function initActionRef(): void;
 /** table 组件内监听 不对外暴露 */
 export declare function on(fun: any, key: string): void;
@@ -9,3 +10,9 @@ export declare function off(key: string): void;
 export declare function emit(key: string, ...args: any): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+export declare function processDefaultFilter(columns: ProTableColumnProps[], ref: React.MutableRefObject<ProTableActionType | undefined>, defaultFilterParams: ProTableProps['defaultFilterParams']): void;

package/es/table/utils/index.js

@@ -173,4 +173,40 @@ export function useActionType(ref, action) {
 }
 export function cloneDeep(obj) {
   return cloneDeepLodash(obj);
+}
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+
+export function processDefaultFilter(columns, ref, defaultFilterParams) {
+  columns.forEach(function (column) {
+    var _column$dataIndex$toS, _column$dataIndex;
+
+    var defaultRules = defaultFilterParams === null || defaultFilterParams === void 0 ? void 0 : defaultFilterParams[(_column$dataIndex$toS = column === null || column === void 0 ? void 0 : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.toString()) !== null && _column$dataIndex$toS !== void 0 ? _column$dataIndex$toS : ''];
+
+    if (defaultRules) {
+      var _ref$current$getState, _ref$current, _ref$current$getState2, _ref$current$getState3, _ref$current2, _ref$current2$setFilt;
+
+      var params = '';
+      var rules = [];
+
+      if (Array.isArray(defaultRules)) {
+        params = defaultRules.join(',');
+        rules = defaultRules;
+      } else {
+        params = defaultRules;
+        rules = [defaultRules];
+      } // 需要带上其他所有的信息
+
+
+      var otherRules = (_ref$current$getState = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : (_ref$current$getState2 = _ref$current.getState) === null || _ref$current$getState2 === void 0 ? void 0 : (_ref$current$getState3 = _ref$current$getState2.call(_ref$current)) === null || _ref$current$getState3 === void 0 ? void 0 : _ref$current$getState3.filterRules) !== null && _ref$current$getState !== void 0 ? _ref$current$getState : {}; // 再设置所有的列筛选状态
+
+      (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : (_ref$current2$setFilt = _ref$current2.setFilterRules) === null || _ref$current2$setFilt === void 0 ? void 0 : _ref$current2$setFilt.call(_ref$current2, _objectSpread(_objectSpread({}, otherRules), {}, _defineProperty({}, column.dataIndex, {
+        rules: rules,
+        params: params
+      })));
+    }
+  });
 }

package/es/utils/index.d.ts

@@ -1,2 +1,3 @@
 import * as utils from '@teamix/utils';
+export * from '@teamix/utils';
 export default utils;

package/es/utils/index.js

@@ -1,2 +1,3 @@
 import * as utils from '@teamix/utils';
+export * from '@teamix/utils';
 export default utils;

package/lib/actions/dialog.js

@@ -255,7 +255,7 @@ function useDialogAction(action, actionContext) {
     })), _objectSpread2), containerProps), containerOtherProps);
 
     var ret = container.show(quickShowProps);
-    store.hide = ret.hide;
+    store.hide = ret ? ret.hide || ret.close : function () {};
   };
 
   return _objectSpread({}, (0, _base.eventHandler)(action, actionContext, onActionStart));

package/lib/actions/index.d.ts

@@ -26,25 +26,27 @@ export declare type ProActionConfig = ({
 } & LinkAction);
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare function useAction(config?: ProActionConfig, context?: any): any;
-export interface ProActionButtonProps extends ButtonProps {
-    key?: string | number;
+export interface ProActionButtonProps extends ProActionCommonProps, ButtonProps {
     config?: ProActionConfig;
-    visible?: any;
     disabled?: any;
     icon?: string;
-    context?: any;
     onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
-export interface ProActionMenuButtonProps extends MenuButtonProps {
+export interface ProActionCommonProps {
     key?: string | number;
-    actions: ProActionProps[];
     visible?: any;
-    icon?: string;
     context?: any;
 }
+export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
+    actions: ProActionProps[];
+    icon?: string;
+}
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
-export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps;
+export interface ProActionDividerProps extends ProActionCommonProps {
+    type: 'divider';
+}
+export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps | ProActionDividerProps;
 export declare type ProActionGroupProps = {
     /** 操作组类型：按钮、文字按钮 */
     type?: 'button' | 'text';
@@ -59,7 +61,9 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | ProActionButtonProps;
+    more?: string | (ProActionButtonProps & {
+        noArrow?: boolean;
+    });
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/lib/actions/index.js

@@ -58,9 +58,10 @@ var _excluded = ["type"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["key", "actions"],
-    _excluded7 = ["key", "config"],
-    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
+    _excluded6 = ["noArrow", "className"],
+    _excluded7 = ["key", "actions"],
+    _excluded8 = ["key", "config"],
+    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -248,6 +249,12 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
 };
 
 function renderCommonActionButtonMenuItem(action, key, context) {
+  if (action.type === 'divider') {
+    return /*#__PURE__*/_react.default.createElement(_components.Menu.Divider, {
+      key: key
+    });
+  }
+
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
@@ -292,27 +299,48 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
-}; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+}; // 超出 max，则折叠起来
 
 
 exports.ProActionMenuButton = ProActionMenuButton;
 
-function formatGroupActions(actions, max, moreConfig) {
-  var MAX = max < 1 ? MAX_ACTTIONS : max;
-
-  if (actions.length <= MAX) {
+function foldExtraActions(actions, max, moreConfig) {
+  if (actions.length <= max) {
     return actions;
   }
 
-  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({
+  return [].concat(_toConsumableArray(actions.slice(0, max - 1)), [_objectSpread(_objectSpread({
     key: '__teamix_pro_action_group_more_btn'
   }, moreConfig), {}, {
-    actions: actions.slice(MAX - 1)
+    actions: actions.slice(max - 1)
   })]);
+} // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+// divider 不计数
+
+
+function formatGroupActions(actions, max, moreConfig) {
+  var MAX = max < 1 ? MAX_ACTTIONS : max;
+  var count = 0;
+  var index = 0;
+
+  for (; index < actions.length && count < MAX; index++) {
+    if (actions[index].type !== 'divider') {
+      count += 1;
+    }
+  }
+
+  return foldExtraActions(actions, Math.max(index, MAX), moreConfig);
 } // 渲染一个 button 或者 menu button
 
 
 function renderCommonActionButton(button, context, isTypeText) {
+  if (button.type === 'divider') {
+    return /*#__PURE__*/_react.default.createElement(_components.Divider, {
+      key: button.key,
+      direction: "ver"
+    });
+  }
+
   var buttonContext = button.context,
       text = button.text,
       others = _objectWithoutProperties(button, _excluded5);
@@ -330,18 +358,35 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var moreConfig = typeof more === 'string' ? {
-    children: more
-  } : more;
+  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: (0, _utils.getMessage)('more')
   } : {
     icon: 'more-line',
     // iconSize: 'small',
     autoWidth: false,
-    className: 'teamix-pro-actions-text-menu-btn-no-arrow'
+    className: noArrowClassName
   };
-  return Object.assign(defaultConfig, moreConfig);
+
+  if (!more) {
+    return defaultConfig;
+  }
+
+  var moreConfig = typeof more === 'string' ? {
+    children: more
+  } : more;
+
+  if (type === 'button') {
+    return Object.assign(defaultConfig, moreConfig);
+  }
+
+  var noArrow = moreConfig.noArrow,
+      className = moreConfig.className,
+      others = _objectWithoutProperties(moreConfig, _excluded6);
+
+  return _objectSpread({
+    className: (0, _classnames.default)(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
+  }, others);
 }
 
 var MAX_ACTTIONS = 4;
@@ -358,7 +403,7 @@ function getActionConfig(action, index, context) {
   if (action.actions) {
     var _key = action.key,
         actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded6);
+        _others = _objectWithoutProperties(action, _excluded7);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -370,7 +415,7 @@ function getActionConfig(action, index, context) {
 
   var key = action.key,
       config = action.config,
-      others = _objectWithoutProperties(action, _excluded7);
+      others = _objectWithoutProperties(action, _excluded8);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -391,7 +436,7 @@ function ProActionGroup(props) {
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
       className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded8);
+      containerProps = _objectWithoutProperties(props, _excluded9);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {

package/lib/actions/index.scss

@@ -2,12 +2,23 @@
   display: flex;
   align-items: center;
   flex-wrap: wrap;
+
+  & > .next-divider {
+    & + .next-divider {
+      display: none;
+    }
+  }
+
   &.teamix-pro-actions-type-button {
     & > button {
       &:not(:last-child) {
         margin-right: var(--s-2);
       }
     }
+    & > .next-divider {
+      margin-left: 0;
+      margin-right: var(--s-2);
+    }
   }
 
   &.teamix-pro-actions-type-text:not(.teamix-pro-actions-divider) {
@@ -109,4 +120,4 @@
       }
     }
   }
-}
+}