@teamix/pro 1.1.35 → 1.1.39

package/es/info/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "url", "method", "formatResult", "params", "actionRef", "header", "onError", "className", "style", "columns", "layout", "dataSource"];
+var _excluded = ["type", "url", "method", "formatResult", "params", "actionRef", "header", "onError", "className", "style", "columns", "layout", "dataSource", "loading", "extra"];
 
 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; }
 
@@ -22,10 +22,10 @@ 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, { useContext, useEffect, useRef, useState } from 'react';
-import ProTableInfo from './components/TableInfo';
-import ProHeaderInfo from './components/HeaderInfo';
-import ProBaseInfo from './components/BaseInfo';
+import React, { isValidElement, useContext, useEffect, useRef, useState } from 'react';
+import ProTableInfo from './components/tableInfo';
+import ProHeaderInfo from './components/headerInfo';
+import ProBaseInfo from './components/baseInfo';
 import ProInfoGroup from './components/InfoGroup';
 import './index.scss';
 import { ProInfoGroupContext, useActionType } from './utils';
@@ -51,6 +51,8 @@ var ProInfo = function ProInfo(props) {
       columns = props.columns,
       layout = props.layout,
       dataSource = props.dataSource,
+      userLoading = props.loading,
+      extra = props.extra,
       others = _objectWithoutProperties(props, _excluded);
 
   var _useContext = useContext(ProInfoGroupContext),
@@ -127,19 +129,38 @@ var ProInfo = function ProInfo(props) {
       getData.run({});
     }
   });
+
+  var getExtra = function getExtra() {
+    if (!extra) {
+      return undefined;
+    }
+
+    if ( /*#__PURE__*/isValidElement(extra)) {
+      return extra;
+    }
+
+    return _objectSpread(_objectSpread({}, extra), {}, {
+      context: {
+        record: dataSource !== null && dataSource !== void 0 ? dataSource : getDataSource(getData.data)
+      }
+    });
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : ''),
     style: style
-  }, /*#__PURE__*/React.createElement(ProCard, _objectSpread(_objectSpread({
+  }, /*#__PURE__*/React.createElement(ProCard, _objectSpread(_objectSpread(_objectSpread({
     compacted: true,
     hoveredShadow: false,
     bordered: false,
     backgroundColor: "transparent"
-  }, header), others), type === 'table' && /*#__PURE__*/React.createElement(ProTableInfo, {
+  }, header), others), {}, {
+    extra: getExtra()
+  }), type === 'table' && /*#__PURE__*/React.createElement(ProTableInfo, {
     dataSource: dataSource,
     columns: columns,
-    loading: loading || getData.loading,
+    loading: userLoading || loading || getData.loading,
     result: getDataSource(getData.data),
     actionRef: actionRef,
     layout: layout
@@ -147,7 +168,7 @@ var ProInfo = function ProInfo(props) {
     dataSource: dataSource,
     columns: columns,
     header: header,
-    loading: loading || getData.loading,
+    loading: userLoading || loading || getData.loading,
     result: getDataSource(getData.data),
     actionRef: actionRef,
     layout: layout,
@@ -155,7 +176,7 @@ var ProInfo = function ProInfo(props) {
   }), type === 'base' && /*#__PURE__*/React.createElement(ProBaseInfo, {
     dataSource: dataSource,
     columns: columns,
-    loading: loading || getData.loading,
+    loading: userLoading || loading || getData.loading,
     result: getDataSource(getData.data),
     actionRef: actionRef,
     layout: layout,

package/es/info/typing.d.ts

@@ -41,6 +41,8 @@ export declare type ProInfoBaseProps = {
     };
     /** 布局值 */
     layout?: BaseInfoLayoutProps;
+    /** 加载动画 */
+    loading?: boolean;
 } & ProInfoHeaderProps;
 /** ProInfoItemProps info 单元格 定义 */
 export interface ProInfoItemProps {
@@ -147,7 +149,7 @@ export declare type InfoValueItemProps = {
     render?: ProInfoCellRender;
     dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
 } & Omit<IProFieldProps, 'render' | 'dataSource'>;
-export declare type ProInfoHeaderProps = CardProps;
+export declare type ProInfoHeaderProps = Omit<CardProps, 'loading'>;
 /** ProInfoGroupContextProps */
 export declare type ProInfoGroupContextProps = {
     /** 因为其他数据都为异步。visible 只用作标识 */

package/es/page-header/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
 import { ActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -12,11 +13,14 @@ export interface LinkItem {
     text: string;
     onClick?: (e?: React.MouseEvent<Element, MouseEvent>) => void;
 }
-export interface TagItem {
-    type?: 'normal' | 'primary';
-    color?: string;
-    text: string;
-}
+export declare type TagItem = (TagProps | (CloseableProps & {
+    closable: true;
+})) & {
+    /**
+     * @deprecated 建议使用 children 代替
+     */
+    text?: string;
+};
 declare type Color = 'blue' | 'green' | 'orange' | 'red' | 'yellow' | string;
 export interface DataItem {
     title: string;

package/es/page-header/index.js

@@ -1,4 +1,5 @@
-var _excluded = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+var _excluded = ["text", "children", "closable"],
+    _excluded2 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
 
 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; }
 
@@ -66,15 +67,29 @@ var renderTags = function renderTags(tags) {
   return /*#__PURE__*/React.createElement(Tag.Group, {
     className: cls('tags')
   }, tags.map(function (tag, i) {
-    return /*#__PURE__*/React.createElement(Tag, {
+    // @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: "large",
+        style: {
+          marginBottom: 0
+        }
+      }, others), text || children);
+    }
+
+    return /*#__PURE__*/React.createElement(Tag, _objectSpread({
       key: i,
       size: "large",
-      type: tag.type,
-      color: tag.color,
       style: {
         marginBottom: 0
       }
-    }, tag.text);
+    }, others), text || children);
   }));
 };
 
@@ -159,7 +174,7 @@ var PageHeader = function PageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
-      others = _objectWithoutProperties(props, _excluded);
+      others = _objectWithoutProperties(props, _excluded2);
 
   var history = useHistory();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;

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

@@ -35,7 +35,9 @@ var RadioItem = Menu.RadioItem;
 
 var Filter = function Filter(props) {
   var column = props.column,
-      actionRef = props.actionRef; // 选中过滤项
+      actionRef = props.actionRef;
+  var _column$filtersWidth = column.filtersWidth,
+      filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth; // 选中过滤项
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -154,7 +156,10 @@ var Filter = function Filter(props) {
       return setVisible(false);
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: cls()
+    className: cls(),
+    style: {
+      width: filtersWidth
+    }
   }, /*#__PURE__*/React.createElement(Menu, null, renderSelect(), /*#__PURE__*/React.createElement("div", {
     className: cls({
       'btn-box': true

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

@@ -1,5 +1,5 @@
 .teamix-pro-table-toolbar-filter {
-  width: 130px;
+  min-width: 130px;
   max-height: 350px;
   overflow-y: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));

package/es/table/typing.d.ts

@@ -47,6 +47,8 @@ export declare type ProColumnProps = {
     filtersMode?: 'single' | 'multiple';
     /** 表头的过滤菜单项在搜索之前的参数操作 */
     beforeFilter?: (rules: string[]) => string;
+    /** 表头的过滤菜单宽度 */
+    filtersWidth?: string | number;
     /** 操作组配置 */
     actionSchema?: ActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */

package/lib/actions/dialog.d.ts

@@ -1,14 +1,23 @@
 import React from 'react';
 import { QuickShowConfig } from '@alicloudfe/components/types/dialog';
 import { quickShowDrawerProps } from '@alicloudfe/components/types/drawer';
+import { IFormSchema, IFormSchemaItem } from '../form';
 import { RequestAction } from './request';
 export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShowConfig, 'onError' | 'type'>, Omit<quickShowDrawerProps, 'trigger' | 'animation' | 'height' | 'locale' | 'onOk' | 'onCancel' | 'onError'> {
+    /** 点击「确认按钮」后的数据请求地址，非必填，不填就不发请求 */
     url?: string;
+    /** 弹窗类型，支持普通弹窗和抽屉两种模式，默认为普通弹窗 */
     dialogType?: 'dialog' | 'drawer';
+    /** 弹窗快捷调用类型 */
     dialogQuickShowType?: 'alert' | 'confirm';
+    /** 弹窗消息类型 */
     messageType?: 'success' | 'warning' | 'error' | 'notice' | 'help' | 'loading';
+    /** 位于弹窗内容上方的自定义内容区 */
     beforeContent?: React.ReactNode;
+    /** 位于弹窗内容下方的自定义内容区 */
     afterContent?: React.ReactNode;
+    /** 弹窗页脚描述区，位于按钮组的对面 */
+    footerDescription?: React.ReactNode | IFormSchema | IFormSchemaItem;
 }
 export declare function useDialogAction(action: DialogAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;

package/lib/actions/dialog.js

@@ -10,18 +10,25 @@ exports.useDialogAction = useDialogAction;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _reactRouterDom = require("react-router-dom");
 
 var _components = require("@alicloudfe/components");
 
 var _utils = require("@teamix/utils");
 
+var _form = _interopRequireWildcard(require("../form"));
+
 var _base = require("./base");
 
 var _request = require("./request");
 
 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"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "footerDescription", "footerAlign", "overlayProps"],
+    _excluded3 = ["className"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -31,16 +38,16 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 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; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -59,6 +66,27 @@ function addContextForReactNode(content, context) {
   }
 
   return content;
+}
+
+var FooterForm = function FooterForm(props) {
+  var schema = props.schema,
+      context = props.context,
+      formRef = props.formRef;
+  var form = (0, _form.createForm)();
+  (0, _react.useEffect)(function () {
+    formRef.current = form;
+  }, []);
+  return /*#__PURE__*/_react.default.createElement(_form.default, {
+    layout: "inline",
+    feedbackLayout: "none",
+    form: form,
+    schema: (0, _utils.getTargetValue)(schema, context)
+  });
+};
+
+function getFooterAlignClass(isDrawer, align) {
+  var footerAlign = align ? align : isDrawer ? 'left' : 'right';
+  return "footer-align-".concat(footerAlign);
 } // 弹窗 -> 请求（点击确认，发送数据请求）
 
 
@@ -68,8 +96,10 @@ function useDialogAction(action, context) {
       loading = _useState2[0],
       setLoading = _useState2[1];
 
+  var footerDescriptionRef = (0, _react.useRef)();
   var history = (0, _reactRouterDom.useHistory)();
-  return _objectSpread({}, (0, _base.eventHandler)(action, function () {
+
+  var onActionStart = function onActionStart() {
     var url = action.url,
         method = action.method,
         params = action.params,
@@ -98,19 +128,54 @@ function useDialogAction(action, context) {
         link = _getTargetValue.link,
         beforeContent = _getTargetValue.beforeContent,
         afterContent = _getTargetValue.afterContent,
-        dialogOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+        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 dialogMethod = dialogType === 'drawer' ? _components.Drawer : _components.Dialog;
-    var dialogProps = dialogType === 'drawer' ? {} : {
+    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 renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
+      if (footer instanceof Array || footer.component) {
+        var _schema = footer instanceof Array ? footer : [footer];
+
+        return /*#__PURE__*/_react.default.createElement(FooterForm, {
+          formRef: footerDescriptionRef,
+          context: context,
+          schema: [{
+            component: 'FormFlex',
+            children: _schema
+          }]
+        });
       }
+
+      return footer;
     };
 
     var onOk = function onOk() {
       return new Promise( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve) {
+          var _footerDescriptionRef;
+
+          var footerDescriptionValues, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
@@ -130,29 +195,33 @@ function useDialogAction(action, context) {
 
                 case 5:
                   setLoading(true);
-                  _context.prev = 6;
-                  _context.next = 9;
-                  return (0, _request.doRequest)(action, context, history);
-
-                case 9:
+                  footerDescriptionValues = Object.assign({}, footerDescriptionRef === null || footerDescriptionRef === void 0 ? void 0 : (_footerDescriptionRef = footerDescriptionRef.current) === null || _footerDescriptionRef === void 0 ? void 0 : _footerDescriptionRef.values);
+                  _context.prev = 7;
+                  requestContext = Object.assign({
+                    footer: footerDescriptionValues
+                  }, context);
+                  _context.next = 11;
+                  return (0, _request.doRequest)(action, requestContext, history, footerDescriptionValues);
+
+                case 11:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 18;
+                  _context.next = 20;
                   break;
 
-                case 13:
-                  _context.prev = 13;
-                  _context.t0 = _context["catch"](6);
+                case 15:
+                  _context.prev = 15;
+                  _context.t0 = _context["catch"](7);
                   setLoading(false);
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 18:
+                case 20:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[6, 13]]);
+          }, _callee, null, [[7, 15]]);
         }));
 
         return function (_x) {
@@ -176,7 +245,7 @@ function useDialogAction(action, context) {
     var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
       key: (0, _utils.uuid)()
     }, componentProps)) : addContextForReactNode(content, dialogContext);
-    var ret = dialogMethod.show(_objectSpread(_objectSpread({
+    var ret = container.show(_objectSpread(_objectSpread({
       // @ts-ignore
       onOk: onOk,
       title: addContextForReactNode(title, dialogContext),
@@ -184,11 +253,16 @@ function useDialogAction(action, context) {
         className: "teamix-pro-dialog-before-content"
       }, beforeContent), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
         className: "teamix-pro-dialog-after-content"
-      }, afterContent)),
-      closeable: !loading
-    }, dialogProps), dialogOtherProps));
+      }, afterContent), footerDescription && /*#__PURE__*/_react.default.createElement("div", {
+        className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
+      }, renderDialogFooterDescription(footerDescription))),
+      closeable: !loading,
+      footerAlign: footerAlign
+    }, containerOtherProps), containerProps));
     store.hide = ret.hide;
-  }));
+  };
+
+  return _objectSpread({}, (0, _base.eventHandler)(action, onActionStart));
 }
 
 var _default = useDialogAction;

package/lib/actions/index.scss

@@ -29,6 +29,31 @@
   }
 }
 
+.teamix-pro-dialog-footer-description {
+  position: absolute;
+  z-index: 5;
+  display: flex;
+  align-items: center;
+  bottom: var(--dialog-footer-padding-top, 16px);
+  height: var(--btn-size-m-height, 32px);
+
+  &.footer-align-right {
+    left: var(--dialog-footer-padding-left-right, 20px);
+  }
+  &.footer-align-center {
+    left: var(--dialog-footer-padding-left-right, 20px);
+  }
+  &.footer-align-left {
+    right: var(--dialog-footer-padding-left-right, 20px);
+  }
+}
+
+.teamix-pro-action-dialog.has-footer-description {
+  .next-message {
+    position: static;
+  }
+}
+
 .teamix-pro-dialog-before-content {
   margin-bottom: var(--s-2);
 }
@@ -40,3 +65,9 @@
 .next-menu-divider + .next-menu-divider {
   display: none;
 }
+
+.next-dialog-body {
+  .teamix-pro-form {
+    margin-bottom: -20px;
+  }
+}

package/lib/actions/link.js

@@ -8,6 +8,8 @@ exports.useLinkAction = useLinkAction;
 
 var _utils = require("@teamix/utils");
 
+var _reactRouterDom = require("react-router-dom");
+
 var _base = require("./base");
 
 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; }
@@ -17,9 +19,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 useLinkAction(action, context) {
-  var linkAction = (0, _utils.getTargetValue)(action, context);
+  var history = (0, _reactRouterDom.useHistory)();
   return _objectSpread({}, (0, _base.eventHandler)(action, function () {
-    (0, _utils.goToLink)(linkAction);
+    var linkAction = (0, _utils.getTargetValue)(action, context);
+    (0, _utils.goToLink)(linkAction, history);
   }));
 }
 

package/lib/actions/request.d.ts

@@ -2,7 +2,7 @@ import { CommonRequestConfig } from '@teamix/utils';
 import { BaseAction } from './base';
 export interface RequestAction extends CommonRequestConfig, BaseAction {
 }
-export declare function doRequest(action: RequestAction, context?: any, history?: any): Promise<unknown>;
+export declare function doRequest(action: RequestAction, context?: any, history?: any, extraParams?: any): Promise<unknown>;
 export declare function useRequestAction(action: RequestAction, context?: any): {
     loading: boolean;
 };

package/lib/actions/request.js

@@ -41,14 +41,14 @@ 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; }
 
 // action 里的数据请求都默认是 post 类型
-function doRequest(action, context, history) {
+function doRequest(action, context, history, extraParams) {
   var _action$method = action.method,
       method = _action$method === void 0 ? 'post' : _action$method,
       others = _objectWithoutProperties(action, _excluded);
 
   return (0, _utils.doCommonRequest)(_objectSpread({
     method: method
-  }, others), context, history);
+  }, others), context, history, extraParams);
 }
 
 function useRequestAction(action, context) {