@teamix/pro 1.2.8 → 1.2.9

package/es/actions/dialog-form.js

@@ -23,7 +23,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useEffect, createRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Loading } from '@alicloudfe/components';
 import ProForm, { createForm } from '../form';
@@ -136,7 +136,7 @@ export function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       others = _objectWithoutProperties(action, _excluded2);
 
-  var formRef = useRef();
+  var formRef = /*#__PURE__*/createRef();
   return useDialogAction(Object.assign({
     size: size,
     closeable: true,

package/es/actions/dialog.js

@@ -1,10 +1,5 @@
 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"];
-
-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); }); }; }
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign"];
 
 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; }
 
@@ -12,6 +7,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
@@ -32,7 +31,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import classnames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { Dialog, Drawer } from '@alicloudfe/components';
-import { getTargetValue, uuid, goToLink } from '@teamix/utils';
+import { getTargetValue, uuid, goToLink, getMessage } from '@teamix/utils';
 import ProForm, { createForm } from '../form';
 import { renderProMessage } from '../utils/message';
 import { eventHandler } from './base';
@@ -110,28 +109,20 @@ export 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 ? Drawer : Dialog;
-
-    var overlayClassName = overlayProps.className,
-        overlayOtherProps = _objectWithoutProperties(overlayProps, _excluded3);
-
     var dialogOnlyProps = {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
-      },
-      overlayProps: _objectSpread({
-        className: classnames('teamix-pro-action-dialog', overlayClassName, {
-          'has-footer-description': !!footerDescription
-        })
-      }, overlayOtherProps)
+      }
     };
-    var containerOtherProps = isDrawer ? {} : dialogOnlyProps;
+    var containerOtherProps = isDrawer ? {
+      okText: getMessage('ok'),
+      cancelText: getMessage('cancel')
+    } : dialogOnlyProps;
 
     var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
       if (footer instanceof Array || footer.component) {

package/es/actions/index.js

@@ -169,13 +169,15 @@ export var ProActionButton = function ProActionButton(props) {
   }, buttonProps), buttonContent(children, icon, iconSize, context));
 };
 
-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'
   });
@@ -184,30 +186,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.createElement(MenuButton.Item, _objectSpread({
-    key: key,
-    disabled: disabled
+  return /*#__PURE__*/React.createElement("div", _objectSpread({
+    className: cls('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.createElement(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.createElement(ProActionMenuButtonItem, {
+    action: action,
+    context: context
+  });
 }
 
 export var ProActionMenuButton = function ProActionMenuButton(props) {
@@ -222,7 +227,7 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/React.createElement(MenuButton, _objectSpread({
-    popupTriggerType: "click",
+    popupTriggerType: "hover",
     autoWidth: false,
     menuProps: {
       mode: 'popup',
@@ -233,8 +238,8 @@ export 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
 
@@ -338,9 +343,7 @@ export function ProActionGroup(props) {
     })
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: i
-    }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/React.createElement(Divider, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/React.createElement(Divider, {
       direction: "ver"
     }));
   }));

package/es/card/index.js

@@ -164,7 +164,6 @@ export var ProCard = function ProCard(props) {
     }
 
     if (element === null || element === void 0 ? void 0 : (_element$type2 = element.type) === null || _element$type2 === void 0 ? void 0 : _element$type2.isProCardDivider) {
-      console.log('isProCardDivider');
       return /*#__PURE__*/React.cloneElement(element, {
         style: dividerStyle
       });

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.7";
+declare const version = "1.2.8";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

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

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

@@ -1,3 +1,11 @@
+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."); }
@@ -18,35 +26,63 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 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 } from '@teamix/utils';
-import React, { useEffect, useState } from 'react';
+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; // 自动展开父节点。过滤时用
+      searchKey = props.searchKey,
+      onSelect = props.onSelect,
+      others = _objectWithoutProperties(props, _excluded); // 自动展开父节点。过滤时用
 
-  var _useState = useState(),
+
+  var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
-      matchedKeys = _useState2[0],
-      setMatchedKeys = _useState2[1];
+      autoExpandParent = _useState2[0],
+      setAutoExpandParent = _useState2[1];
 
   var _useState3 = useState(),
       _useState4 = _slicedToArray(_useState3, 2),
-      expandedKeys = _useState4[0],
-      setExpandedKeys = _useState4[1];
+      matchedKeys = _useState4[0],
+      setMatchedKeys = _useState4[1];
 
-  var _useState5 = useState(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []),
+  var _useState5 = useState(),
       _useState6 = _slicedToArray(_useState5, 2),
-      dataSource = _useState6[0],
-      setDataSource = _useState6[1];
+      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]); // 过滤
+  }, [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 = [];
 
@@ -58,7 +94,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
     var loop = function loop(data) {
       return data.forEach(function (item) {
         if (item.label.indexOf(value) > -1) {
-          matchedKeys.push(item.key);
+          matchedKeys.push(item.value);
         }
 
         if (item.children && item.children.length) {
@@ -69,27 +105,58 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
     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, {
-    draggable: true,
+  }, /*#__PURE__*/React.createElement(Tree, _objectSpread({
     defaultExpandAll: true,
     isLabelBlock: true,
     isNodeBlock: {
       defaultPaddingLeft: 8,
       indent: 16
     },
-    dataSource: dataSource,
     filterTreeNode: filterTreeNode,
-    expandedKeys: expandedKeys
-  }));
+    expandedKeys: expandedKeys,
+    onExpand: handleExpand,
+    autoExpandParent: autoExpandParent,
+    onSelect: onSelect
+  }, others), renderTreeNode(dataSource)));
 };
 
 export default ProSidebarTree;

package/es/sidebar/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch"];
+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; }
 
@@ -36,6 +36,9 @@ var ProSidebar = function ProSidebar(props) {
       _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); // 搜索的关键词
 
 
@@ -49,7 +52,7 @@ var ProSidebar = function ProSidebar(props) {
       '': true
     }, className, true)),
     style: style
-  }, /*#__PURE__*/React.createElement(ProSidebarContainer, _objectSpread({
+  }, /*#__PURE__*/React.createElement(ProSidebarContainer, _objectSpread(_objectSpread({
     searchOnChange: function searchOnChange(value) {
       if (showSearch) {
         _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
@@ -57,10 +60,11 @@ var ProSidebar = function ProSidebar(props) {
       }
     },
     showSearch: showSearch
-  }, others), /*#__PURE__*/React.createElement(ProSidebarTree, {
+  }, others), cardProps), /*#__PURE__*/React.createElement(ProSidebarTree, _objectSpread({
     dataSource: dataSource,
-    searchKey: searchKey
-  })));
+    searchKey: searchKey,
+    onSelect: onSelect
+  }, treeProps))));
 };
 
 export default ProSidebar;

package/es/sidebar/typing.d.ts

@@ -6,7 +6,13 @@ import { ProCardProps, ProFieldProps } from '..';
 export declare type ProSidebarProps = {
     /** 数据源 */
     dataSource?: ProSidebarDataSource;
-} & React.HTMLAttributes<HTMLElement> & ProSidebarContainerProps;
+    /** 节点点击回调 */
+    onSelect?: TreeProps['onSelect'];
+    /** 树配置 */
+    treeProps?: TreeProps;
+    /** 卡片配置 */
+    cardProps?: ProCardProps;
+} & Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> & Omit<ProSidebarContainerProps, 'onSelect'>;
 /** 数据源定义 */
 export declare type ProSidebarDataSource = ProSidebarDataSourceItem[];
 export declare type ProSidebarDataSourceItem = {
@@ -23,6 +29,11 @@ export declare type ProSidebarDataSourceItem = {
     /** 子项 */
     children?: ProSidebarDataSourceItem[];
 };
+/** tag 定义 */
+export declare type ProSidebarDataSourceTag = {
+    /** 显示值 */
+    value: string;
+};
 /** sidebar 容器定义 */
 export declare type ProSidebarContainerProps = {
     children?: React.ReactNode;
@@ -48,4 +59,6 @@ export declare type ProSidebarTreeProps = {
     dataSource?: ProSidebarDataSource;
     /** 搜索过滤关键词 */
     searchKey?: string;
+    /** 节点点击回调 */
+    onChange?: ProSidebarProps['onChange'];
 } & TreeProps;

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) {
@@ -259,7 +264,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
-    popupTriggerType: "click",
+    popupTriggerType: "hover",
     autoWidth: false,
     menuProps: {
       mode: 'popup',
@@ -270,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
 
@@ -378,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"
     }));
   }));

package/lib/card/index.js

@@ -199,7 +199,6 @@ var ProCard = function ProCard(props) {
     }
 
     if (element === null || element === void 0 ? void 0 : (_element$type2 = element.type) === null || _element$type2 === void 0 ? void 0 : _element$type2.isProCardDivider) {
-      console.log('isProCardDivider');
       return /*#__PURE__*/_react.default.cloneElement(element, {
         style: dividerStyle
       });

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.7";
+declare const version = "1.2.8";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.7';
+var version = '1.2.8';
 exports.version = version;