@teamix/pro 1.2.8 → 1.2.12

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/es/table/components/Filter/index.js

@@ -27,7 +27,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState } from 'react';
 import TeamixIcon from '@teamix/icon';
 import { Button, Dropdown, Menu } from '@alicloudfe/components';
-import { baseClass } from '@teamix/utils';
+import { baseClass, getMessage } from '@teamix/utils';
 import './index.scss';
 var CheckboxItem = Menu.CheckboxItem;
 var cls = baseClass('teamix-pro-table-toolbar-filter');
@@ -171,7 +171,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -214,27 +214,29 @@ 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$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$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);
       setVisible(false);
     }
-  }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(Button, {
+  }, getMessage('ok')), /*#__PURE__*/React.createElement(Button, {
     type: "normal",
     size: "small",
     className: cls({
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current8, _actionRef$current8$g, _actionRef$current8$g2, _actionRef$current9, _actionRef$current9$s, _actionRef$current10, _actionRef$current10$;
+      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$g = _actionRef$current8.getState) === null || _actionRef$current8$g === void 0 ? void 0 : (_actionRef$current8$g2 = _actionRef$current8$g.call(_actionRef$current8)) === null || _actionRef$current8$g2 === void 0 ? void 0 : _actionRef$current8$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
-      (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$s = _actionRef$current9.setFilterRules) === null || _actionRef$current9$s === void 0 ? void 0 : _actionRef$current9$s.call(_actionRef$current9, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''
       })));
-      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.filterDataSource) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
     }
-  }, "\u91CD\u7F6E")))));
+  }, getMessage('reset'))))));
 };
 
 export default Filter;

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

@@ -12,12 +12,16 @@
   }
   .teamix-pro-table-toolbar-filter-btn-box {
     display: flex;
-    justify-content: space-around;
+    justify-content: center;
     margin-top: 10px;
     padding-bottom: 5px;
+    padding-left: 4px;
+    padding-right: 4px;
   }
   .teamix-pro-table-toolbar-filter-btn.teamix-pro-table-toolbar-filter-btn {
-    width: 48px !important;
-    min-width: unset !important;
+    min-width: 48px !important;
+    &:first-child {
+      margin-right: 8px;
+    }
   }
 }

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

@@ -70,7 +70,16 @@ var Layout = function Layout(props) {
     var _mainAction$actions;
 
     if (_typeof(mainAction) === 'object' && (mainAction === null || mainAction === void 0 ? void 0 : (_mainAction$actions = mainAction.actions) === null || _mainAction$actions === void 0 ? void 0 : _mainAction$actions.length) > 0) {
-      // 默认 context
+      // 判断 actions 是否 visible 都为 false，是的话也不渲染
+      var isEmptyActions = mainAction === null || mainAction === void 0 ? void 0 : mainAction.actions.every(function (action) {
+        return (action === null || action === void 0 ? void 0 : action.visible) === false;
+      });
+
+      if (isEmptyActions) {
+        return;
+      } // 默认 context
+
+
       var defaultContext = {
         action: actionRef.current,
         rowSelection: rowSelection

package/es/table/index.js

@@ -33,7 +33,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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, useEffect, useRef, useMemo } from 'react';
-import { Table, Pagination, Message, Checkbox } from '@alicloudfe/components';
+import { Table, Pagination, Checkbox } from '@alicloudfe/components';
 import genProColumnToColumn from './utils/genProColumnToColumn';
 import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps } from '@teamix/utils';
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
@@ -481,8 +481,7 @@ var ProTable = function ProTable(props) {
 
       if (props.onError) {
         props.onError(error);
-      } else {
-        Message.error(error.toString());
+      } else {// Message.error(error.toString());
       } // 重新计算是否需要吸底
 
 
@@ -773,7 +772,7 @@ var ProTable = function ProTable(props) {
 
     }),
     ref: tableRef
-  }, renderTable(), footerSuctionState && footerSuction && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && renderFooter()));
+  }, renderTable(), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter()));
 };
 
 export default ProTable;

package/es/utils/components/tags/index.d.ts

@@ -0,0 +1,11 @@
+import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
+import './index.scss';
+export declare type ProTagItem = (TagProps | (CloseableProps & {
+    closable: true;
+})) & {
+    /**
+     * @deprecated 建议使用 children 代替
+     */
+    text?: string;
+};
+export declare const renderTags: (tags?: ProTagItem[] | undefined, size?: "small" | "large" | "medium" | undefined) => JSX.Element | null;

package/es/utils/components/tags/index.js

@@ -0,0 +1,50 @@
+var _excluded = ["text", "children", "closable"];
+
+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 React from 'react';
+import { Tag } from '@alicloudfe/components';
+import { baseClass } from '@teamix/utils';
+import './index.scss';
+var cls = baseClass('teamix-pro-tags');
+export var renderTags = function renderTags(tags, size) {
+  if (!tags || !tags.length) {
+    return null;
+  }
+
+  return /*#__PURE__*/React.createElement(Tag.Group, {
+    className: cls('')
+  }, tags.map(function (tag, i) {
+    // @ts-ignore
+    var text = tag.text,
+        children = tag.children,
+        closable = tag.closable,
+        others = _objectWithoutProperties(tag, _excluded);
+
+    if (closable) {
+      return /*#__PURE__*/React.createElement(Tag.Closeable, _objectSpread({
+        key: i,
+        size: size,
+        style: {
+          marginBottom: 0
+        }
+      }, others), text || children);
+    }
+
+    return /*#__PURE__*/React.createElement(Tag, _objectSpread({
+      key: i,
+      size: size,
+      style: {
+        marginBottom: 0
+      }
+    }, others), text || children);
+  }));
+};

package/es/utils/components/tags/index.scss

@@ -0,0 +1,12 @@
+.teamix-pro-tags {
+  display: inline-flex;
+  align-items: center;
+
+  & > div.next-tag {
+    margin-right: var(--s-2, 8px);
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+}

package/lib/actions/base.d.ts

@@ -1,13 +1,23 @@
+import { MaybePromise } from '@teamix/utils';
 export interface BaseAction {
+    /** 事件触发方式，默认是 onClick */
     trigger?: string;
-    onTrigger?: () => void;
-    onFinish?: (prams?: any) => any;
+    /** 事件发生时，是否执行 e.preventDefault() 方法 */
     preventDefault?: boolean;
+    /** 事件发生时，是否执行 e.stopPropagation() 方法 */
     stopPropagation?: boolean;
-    schema?: any;
-    component?: any;
+    /** 事件执行前的处理函数
+     * 如果返回 false 或者 Promise<false>，则停止 Action 执行。
+     * 如果返回 true 或者 Promise<true>，则正常执行 Action。
+     * 如果返回其他对象，则正常执行 Action，并把返回的对象放到接下来 Action 的上下文中。
+     */
+    beforeAction?: () => MaybePromise<any>;
+    /** 事件开始执行后的回调函数 */
+    onTrigger?: () => void;
+    /** 事件开始执行完毕的回调函数 */
+    onFinish?: (params?: any) => any;
 }
-export declare function eventHandler(action: BaseAction, onTrigger: () => void): {
-    [x: string]: (e: React.MouseEvent<HTMLElement>) => void;
+export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any) => void): {
+    [x: string]: (e: React.MouseEvent<HTMLElement>) => Promise<void>;
 };
 export default eventHandler;

package/lib/actions/base.js

@@ -6,27 +6,82 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.eventHandler = eventHandler;
 
+var _utils = require("@teamix/utils");
+
 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 eventHandler(action, onTrigger) {
+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 eventHandler(action, actionContext, onTrigger) {
   var _action$trigger = action.trigger,
       trigger = _action$trigger === void 0 ? 'onClick' : _action$trigger,
       preventDefault = action.preventDefault,
-      stopPropagation = action.stopPropagation;
-  return _defineProperty({}, "".concat(trigger), function _(e) {
-    var _action$onTrigger;
+      stopPropagation = action.stopPropagation,
+      beforeAction = action.beforeAction;
+  return _defineProperty({}, "".concat(trigger), function () {
+    var _2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
+      var _action$onTrigger;
 
-    if (preventDefault) {
-      e.preventDefault();
-    }
+      var beforeActionContext;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (preventDefault) {
+                e.preventDefault();
+              }
+
+              if (stopPropagation) {
+                e.stopPropagation();
+              }
+
+              if (!beforeAction) {
+                _context.next = 14;
+                break;
+              }
+
+              _context.prev = 3;
+              _context.next = 6;
+              return (0, _utils.resolveMaybePromiseMethod)(beforeAction, actionContext);
+
+            case 6:
+              beforeActionContext = _context.sent;
+              _context.next = 12;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](3);
+              beforeActionContext = false;
+
+            case 12:
+              if (!(beforeActionContext === false)) {
+                _context.next = 14;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 14:
+              onTrigger(Object.assign({}, beforeActionContext, actionContext));
+              (_action$onTrigger = action.onTrigger) === null || _action$onTrigger === void 0 ? void 0 : _action$onTrigger.call(action);
+
+            case 16:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[3, 9]]);
+    }));
 
-    if (stopPropagation) {
-      e.stopPropagation();
+    function _(_x) {
+      return _2.apply(this, arguments);
     }
 
-    onTrigger();
-    (_action$onTrigger = action.onTrigger) === null || _action$onTrigger === void 0 ? void 0 : _action$onTrigger.call(action);
-  });
+    return _;
+  }());
 }
 
 var _default = eventHandler;

package/lib/actions/confirm.d.ts

@@ -2,6 +2,6 @@ import { DialogAction } from './dialog';
 export interface ConfirmAction extends DialogAction {
 }
 export declare function useConfirmAction(action: DialogAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useConfirmAction;

package/lib/actions/danger-confirm.d.ts

@@ -2,6 +2,6 @@ import { DialogAction } from './dialog';
 export interface DangerConfirmAction extends DialogAction {
 }
 export declare function useDangerConfirmAction(action: DialogAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDangerConfirmAction;

package/lib/actions/dialog-component.d.ts

@@ -5,6 +5,6 @@ export interface DialogComponentAction extends DialogAction {
     component: React.FC<any>;
 }
 export declare function useDialogComponentAction(action: DialogComponentAction, context?: any): {
-    [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDialogComponentAction;

package/lib/actions/dialog-form.d.ts

@@ -17,6 +17,6 @@ export interface DialogFormAction extends DialogAction {
     schema: ProFormSchema | ProFormProps;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
-    [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDialogFormAction;

package/lib/actions/dialog-form.js

@@ -159,18 +159,18 @@ 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,
-    content: function content() {
+    content: function content(contentContext) {
       var dialogFormProps = {
         initialValues: initialValues,
         initialRequest: initialRequest,
         schema: schema,
         size: size,
         formProps: formProps,
-        context: context
+        context: contentContext
       };
       return /*#__PURE__*/_react.default.createElement(DialogForm, _objectSpread({
         formRef: formRef

package/lib/actions/dialog-info.d.ts

@@ -4,6 +4,6 @@ export interface DialogInfoAction extends DialogAction {
     schema: ProInfoProps;
 }
 export declare function useDialogInfoAction(action: DialogInfoAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDialogInfoAction;

package/lib/actions/dialog-table.d.ts

@@ -4,6 +4,6 @@ export interface DialogTableAction extends DialogAction {
     schema: ProTableProps;
 }
 export declare function useDialogTableAction(action: DialogTableAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDialogTableAction;

package/lib/actions/dialog.d.ts

@@ -21,8 +21,12 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     afterContent?: React.ReactNode;
     /** 弹窗页脚描述区，位于按钮组的对面 */
     footerDescription?: React.ReactNode | ProFormSchema | ProFormSchemaItem;
+    /** 弹窗内容组件的 schema */
+    schema?: any;
+    /** 弹窗内容区的组件 */
+    component?: any;
 }
-export declare function useDialogAction(action: DialogAction, context?: any): {
-    [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
+export declare function useDialogAction(action: DialogAction, actionContext?: any): {
+    [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDialogAction;

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", "className"];
 
 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; }
@@ -94,7 +93,7 @@ function getFooterAlignClass(isDrawer, align) {
 } // 弹窗 -> 请求（点击确认，发送数据请求）
 
 
-function useDialogAction(action, context) {
+function useDialogAction(action, actionContext) {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -103,7 +102,7 @@ function useDialogAction(action, context) {
   var footerDescriptionRef = (0, _react.useRef)();
   var history = (0, _reactRouterDom.useHistory)();
 
-  var onActionStart = function onActionStart() {
+  var onActionStart = function onActionStart(context) {
     var url = action.url,
         method = action.method,
         params = action.params,
@@ -135,28 +134,21 @@ function useDialogAction(action, context) {
         message = _getTargetValue.message,
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
-        _getTargetValue$overl = _getTargetValue.overlayProps,
-        overlayProps = _getTargetValue$overl === void 0 ? {} : _getTargetValue$overl,
+        className = _getTargetValue.className,
         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) {
@@ -265,14 +257,17 @@ function useDialogAction(action, context) {
         className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
       }, renderDialogFooterDescription(footerDescription))),
       closeable: !loading,
-      footerAlign: footerAlign
+      footerAlign: footerAlign,
+      className: (0, _classnames.default)('teamix-pro-action-dialog', {
+        'has-footer-description': !!footerDescription
+      })
     }, containerOtherProps), containerProps);
 
     var ret = container.show(quickShowProps);
     store.hide = ret.hide;
   };
 
-  return _objectSpread({}, (0, _base.eventHandler)(action, onActionStart));
+  return _objectSpread({}, (0, _base.eventHandler)(action, actionContext, onActionStart));
 }
 
 var _default = useDialogAction;

package/lib/actions/drawer-form.d.ts

@@ -1,6 +1,6 @@
 import { DialogFormAction } from './dialog-form';
 export declare type DrawerFormAction = DialogFormAction;
 export declare function useDrawerFormAction(action: DrawerFormAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDrawerFormAction;

package/lib/actions/drawer-info.d.ts

@@ -1,6 +1,6 @@
 import { DialogInfoAction } from './dialog-info';
 export declare type DrawerInfoAction = DialogInfoAction;
 export declare function useDrawerInfoAction(action: DrawerInfoAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDrawerInfoAction;

package/lib/actions/drawer-table.d.ts

@@ -1,6 +1,6 @@
 import { DialogTableAction } from './dialog-table';
 export declare type DrawerTableAction = DialogTableAction;
 export declare function useDrawerTableAction(action: DrawerTableAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDrawerTableAction;