@teamix/pro 1.5.0 → 1.6.0-beta.0

package/es/actions/index.js

@@ -1,34 +1,23 @@
 var _excluded = ["type"],
-    _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "disabled", "onClick", "tooltip", "disabledTooltip", "tooltipProps"],
-    _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
-    _excluded5 = ["context", "text"],
-    _excluded6 = ["key", "actions"],
-    _excluded7 = ["key", "config"],
-    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
-
+  _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "disabled", "onClick", "tooltip", "disabledTooltip", "tooltipProps"],
+  _excluded3 = ["loading"],
+  _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
+  _excluded5 = ["context", "text"],
+  _excluded6 = ["key", "actions"],
+  _excluded7 = ["key", "config"],
+  _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 import React from 'react';
 import cls from 'classnames';
 import { Button, MenuButton, Menu, Divider, Balloon } from '@alicloudfe/components';
@@ -62,116 +51,91 @@ export function useAction(config, context) {
   if (!config) {
     return {};
   }
-
   var type = config.type,
-      others = _objectWithoutProperties(config, _excluded);
-
+    others = _objectWithoutProperties(config, _excluded);
   if (type === 'request') {
     return useRequestAction(others, context);
   }
-
   if (type === 'link') {
     return useLinkAction(others, context);
   }
-
   if (type === 'dialog') {
     return useDialogAction(others, context);
   }
-
   if (type === 'confirm') {
     return useConfirmAction(others, context);
   }
-
   if (type === 'danger-confirm') {
     return useDangerConfirmAction(others, context);
   }
-
   if (type === 'notice') {
     return useNoticeAction(others, context);
   }
-
   if (type === 'error') {
     return useErrorAction(others, context);
   }
-
   if (type === 'dialog-form') {
     return useDialogFormAction(others, context);
   }
-
   if (type === 'dialog-table') {
     return useDialogTableAction(others, context);
   }
-
   if (type === 'dialog-info') {
     return useDialogInfoAction(others, context);
   }
-
   if (type === 'drawer') {
     return useDrawerAction(others, context);
   }
-
   if (type === 'drawer-form') {
     return useDrawerFormAction(others, context);
   }
-
   if (type === 'drawer-table') {
     return useDrawerTableAction(others, context);
   }
-
   if (type === 'drawer-info') {
     return useDrawerInfoAction(others, context);
   }
-
   if (type === 'pop-confirm') {
     return usePopConfirmAction(others, context);
   }
-
   if (type === 'danger-pop-confirm') {
     return useDangerPopConfirmAction(others, context);
   }
-
   var registedAction = RegistedActions.get(type);
-
   if (!registedAction) {
     return {};
   }
-
   return useAction(_objectSpread(_objectSpread({
     type: registedAction.extendActionId
   }, registedAction.defaultConfig), others), context);
 }
-
 var buttonContent = function buttonContent(content, iconType, iconSize, context) {
   var renderedContent = typeof content === 'function' ? content(context) : content;
-
   if (!iconType) {
     return renderedContent;
   }
-
   return [/*#__PURE__*/React.createElement(Icon, {
     type: iconType,
     size: iconSize,
     key: "teamix-button-icon"
   }), renderedContent];
 };
-
 export var ProActionButton = function ProActionButton(props) {
   var config = props.config,
-      icon = props.icon,
-      _props$iconSize = props.iconSize,
-      iconSize = _props$iconSize === void 0 ? 'medium' : _props$iconSize,
-      _props$type = props.type,
-      type = _props$type === void 0 ? 'primary' : _props$type,
-      context = props.context,
-      children = props.children,
-      visible = props.visible,
-      disabled = props.disabled,
-      _onClick = props.onClick,
-      tooltip = props.tooltip,
-      disabledTooltip = props.disabledTooltip,
-      tooltipProps = props.tooltipProps,
-      others = _objectWithoutProperties(props, _excluded2);
-
+    icon = props.icon,
+    _props$iconSize = props.iconSize,
+    iconSize = _props$iconSize === void 0 ? 'medium' : _props$iconSize,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 'primary' : _props$type,
+    context = props.context,
+    children = props.children,
+    visible = props.visible,
+    disabled = props.disabled,
+    _onClick = props.onClick,
+    tooltip = props.tooltip,
+    disabledTooltip = props.disabledTooltip,
+    tooltipProps = props.tooltipProps,
+    others = _objectWithoutProperties(props, _excluded2);
   var actionProps = useAction(config, context);
   var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({
     disabled: disabled
@@ -182,46 +146,42 @@ export var ProActionButton = function ProActionButton(props) {
   }) : _objectSpread(_objectSpread({
     disabled: disabled
   }, actionProps), others);
-  var content = /*#__PURE__*/React.createElement(Button, _objectSpread({
+  var content = /*#__PURE__*/React.createElement(Button, _extends({
     type: type
   }, buttonProps), buttonContent(children, icon, iconSize, context));
-
   var baseToolTipProps = _objectSpread({
     triggerType: 'hover',
     align: 't',
     trigger: content
   }, tooltipProps);
-
   if (tooltip || disabledTooltip) {
     if (tooltip && !disabledTooltip) {
       if (!disabled) {
-        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, baseToolTipProps, tooltip);
       }
     } else if (!tooltip && disabledTooltip) {
       if (disabled) {
-        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, baseToolTipProps, disabledTooltip);
       }
     } else if (tooltip && disabledTooltip) {
       var showToolTip = disabled ? disabledTooltip : tooltip;
-      content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+      content = /*#__PURE__*/React.createElement(Balloon.Tooltip, baseToolTipProps, showToolTip);
     }
   }
-
   return content;
 };
-
 var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
   var action = props.action,
-      context = props.context;
+    context = props.context;
   var config = action.config,
-      btnContext = action.context,
-      _onClick2 = action.onClick,
-      children = action.children,
-      icon = action.icon,
-      disabled = action.disabled,
-      tooltip = action.tooltip,
-      disabledTooltip = action.disabledTooltip,
-      tooltipProps = action.tooltipProps;
+    btnContext = action.context,
+    _onClick2 = action.onClick,
+    children = action.children,
+    icon = action.icon,
+    disabled = action.disabled,
+    tooltip = action.tooltip,
+    disabledTooltip = action.disabledTooltip,
+    tooltipProps = action.tooltipProps;
   var basePrefix = usePrefixCls('', {
     base: true
   });
@@ -229,53 +189,45 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
-
   var _useAction = useAction(menuItemActionConfig, btnContext || context),
-      loading = _useAction.loading,
-      menuItemProps = _objectWithoutProperties(_useAction, _excluded3);
-
+    loading = _useAction.loading,
+    menuItemProps = _objectWithoutProperties(_useAction, _excluded3);
   var buttonProps = disabled ? {} : _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
     onClick: function onClick(e) {
       return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
   var content = buttonContent(children, icon, undefined, context);
-
   var baseToolTipProps = _objectSpread({
     triggerType: 'hover',
     align: 't',
     trigger: content
   }, tooltipProps);
-
   if (tooltip || disabledTooltip) {
     if (tooltip && !disabledTooltip) {
       if (!disabled) {
-        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, baseToolTipProps, tooltip);
       }
     } else if (!tooltip && disabledTooltip) {
       if (disabled) {
-        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+        content = /*#__PURE__*/React.createElement(Balloon.Tooltip, baseToolTipProps, disabledTooltip);
       }
     } else if (tooltip && disabledTooltip) {
       var showToolTip = disabled ? disabledTooltip : tooltip;
-      content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+      content = /*#__PURE__*/React.createElement(Balloon.Tooltip, baseToolTipProps, showToolTip);
     }
   }
-
-  return /*#__PURE__*/React.createElement("div", _objectSpread({
+  return /*#__PURE__*/React.createElement("div", _extends({
     className: cls(_defineProperty({}, basePrefix('disabled'), disabled), basePrefix('menu-item'), prefixCls('menu-item'))
   }, buttonProps), content);
 };
-
 function renderCommonActionButtonMenuItem(action, key, context) {
   if (action.type === 'divider') {
     return /*#__PURE__*/React.createElement(Menu.Divider, {
       key: key
     });
   }
-
   var menuBtn = action;
-
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
     return /*#__PURE__*/React.createElement(Menu.SubMenu, {
       key: key,
@@ -284,28 +236,25 @@ function renderCommonActionButtonMenuItem(action, key, context) {
       return renderCommonActionButtonMenuItem(a, a.key, context);
     }));
   }
-
   return /*#__PURE__*/React.createElement(ProActionMenuButtonItem, {
     key: key,
     action: action,
     context: context
   });
 }
-
 export var ProActionMenuButton = function ProActionMenuButton(props) {
   var icon = props.icon,
-      iconSize = props.iconSize,
-      label = props.label,
-      actions = props.actions,
-      children = props.children,
-      context = props.context,
-      _props$type2 = props.type,
-      type = _props$type2 === void 0 ? 'primary' : _props$type2,
-      className = props.className,
-      noArrow = props.noArrow,
-      others = _objectWithoutProperties(props, _excluded4);
-
-  return /*#__PURE__*/React.createElement(MenuButton, _objectSpread({
+    iconSize = props.iconSize,
+    label = props.label,
+    actions = props.actions,
+    children = props.children,
+    context = props.context,
+    _props$type2 = props.type,
+    type = _props$type2 === void 0 ? 'primary' : _props$type2,
+    className = props.className,
+    noArrow = props.noArrow,
+    others = _objectWithoutProperties(props, _excluded4);
+  return /*#__PURE__*/React.createElement(MenuButton, _extends({
     popupTriggerType: "hover",
     autoWidth: false,
     menuProps: {
@@ -323,37 +272,34 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
-}; // 超出 max，则折叠起来
-
+};
+// 超出 max，则折叠起来
 function foldExtraActions(actions, max, moreConfig) {
   if (actions.length <= max) {
     return actions;
   }
-
   return [].concat(_toConsumableArray(actions.slice(0, max - 1)), [_objectSpread(_objectSpread({
     key: '__teamix_pro_action_group_more_btn'
   }, moreConfig), {}, {
     actions: actions.slice(max - 1)
   })]);
-} // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
-// divider 不计数
-
+}
 
+// 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+// divider 不计数
 function formatGroupActions(actions, max, moreConfig) {
   var MAX = max < 1 ? MAX_ACTTIONS : max;
   var count = 0;
   var index = 0;
-
   for (; index < actions.length && count < MAX; index++) {
     if (actions[index].type !== 'divider') {
       count += 1;
     }
   }
-
   return foldExtraActions(actions, Math.max(index, MAX), moreConfig);
-} // 渲染一个 button 或者 menu button
-
+}
 
+// 渲染一个 button 或者 menu button
 function renderCommonActionButton(button, context, isTypeText) {
   if (button.type === 'divider') {
     return /*#__PURE__*/React.createElement(Divider, {
@@ -361,23 +307,19 @@ function renderCommonActionButton(button, context, isTypeText) {
       direction: "ver"
     });
   }
-
-  var buttonContext = button.context,
-      text = button.text,
-      others = _objectWithoutProperties(button, _excluded5);
-
+  var _ref = button,
+    buttonContext = _ref.context,
+    text = _ref.text,
+    others = _objectWithoutProperties(_ref, _excluded5);
   var buttonProps = _objectSpread({
     context: Object.assign({}, context, buttonContext),
     text: text || isTypeText
   }, others);
-
   if (!button.actions) {
-    return /*#__PURE__*/React.createElement(ProActionButton, _objectSpread({}, buttonProps));
+    return /*#__PURE__*/React.createElement(ProActionButton, buttonProps);
   }
-
-  return /*#__PURE__*/React.createElement(ProActionMenuButton, _objectSpread({}, buttonProps));
+  return /*#__PURE__*/React.createElement(ProActionMenuButton, buttonProps);
 }
-
 function getDefaultMoreButton(type, more) {
   var defaultConfig = type === 'button' ? {
     children: getMessage('more')
@@ -386,38 +328,30 @@ function getDefaultMoreButton(type, more) {
     autoWidth: false,
     noArrow: true
   };
-
   if (!more) {
     return defaultConfig;
   }
-
   var moreConfig = typeof more === 'string' ? {
     children: more
   } : more;
-
   if (type === 'button') {
     return Object.assign(defaultConfig, moreConfig);
   }
-
   return moreConfig;
 }
-
 var MAX_ACTTIONS = 4;
-
 function getKey(index, key) {
   if (key !== undefined) {
     return key;
   }
-
   return "__teamix_pro_action_key_".concat(index);
 }
-
 function getActionConfig(action, index, context) {
   if (action.actions) {
-    var _key = action.key,
-        actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded6);
-
+    var _ref2 = action,
+      _key = _ref2.key,
+      actions = _ref2.actions,
+      _others = _objectWithoutProperties(_ref2, _excluded6);
     return _objectSpread({
       key: getKey(index, _key),
       actions: actions.map(function (a, j) {
@@ -427,32 +361,29 @@ function getActionConfig(action, index, context) {
       })
     }, getTargetValue(_others, context));
   }
-
-  var key = action.key,
-      config = action.config,
-      others = _objectWithoutProperties(action, _excluded7);
-
+  var _ref3 = action,
+    key = _ref3.key,
+    config = _ref3.config,
+    others = _objectWithoutProperties(_ref3, _excluded7);
   return _objectSpread({
     key: getKey(index, key),
     config: config
   }, getTargetValue(others, context));
 }
-
 export function ProActionGroup(props) {
   var _props$type3 = props.type,
-      type = _props$type3 === void 0 ? 'button' : _props$type3,
-      _props$divider = props.divider,
-      divider = _props$divider === void 0 ? true : _props$divider,
-      _props$max = props.max,
-      max = _props$max === void 0 ? MAX_ACTTIONS : _props$max,
-      moreText = props.moreText,
-      more = props.more,
-      context = props.context,
-      _props$actions = props.actions,
-      actions = _props$actions === void 0 ? [] : _props$actions,
-      className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded8);
-
+    type = _props$type3 === void 0 ? 'button' : _props$type3,
+    _props$divider = props.divider,
+    divider = _props$divider === void 0 ? true : _props$divider,
+    _props$max = props.max,
+    max = _props$max === void 0 ? MAX_ACTTIONS : _props$max,
+    moreText = props.moreText,
+    more = props.more,
+    context = props.context,
+    _props$actions = props.actions,
+    actions = _props$actions === void 0 ? [] : _props$actions,
+    className = props.className,
+    containerProps = _objectWithoutProperties(props, _excluded8);
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {
     return getActionConfig(action, index, context);
@@ -460,7 +391,7 @@ export function ProActionGroup(props) {
     return action.visible !== false;
   });
   var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, more || moreText));
-  return /*#__PURE__*/React.createElement("div", _objectSpread({
+  return /*#__PURE__*/React.createElement("div", _extends({
     className: cls('teamix-pro-actions', "teamix-pro-actions-type-".concat(type), className, {
       'teamix-pro-actions-divider': type === 'button' ? false : divider
     })
@@ -473,24 +404,26 @@ export function ProActionGroup(props) {
     }));
   }));
 }
-
 var ProAction = function ProAction(props) {
   return renderCommonActionButton(props);
 };
-
 export default ProAction;
+
 /**
  * @deprecated 建议使用 ProActionGroup 代替
  */
-
 export var ActionGroup = ProActionGroup;
+
 /**
  * @deprecated 建议使用 ProActionButton 代替
  */
-
 export var ActionButton = ProActionButton;
+
 /**
  * @deprecated 建议使用 ProActionMenuButton 代替
  */
+export var ActionMenuButton = ProActionMenuButton;
 
-export var ActionMenuButton = ProActionMenuButton;
+/**
+ * @deprecated 建议使用 ProActionConfig 代替
+ */

package/es/actions/link.js

@@ -1,17 +1,14 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { getTargetValue, goToLink } from '@teamix/utils';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from '@teamix/router';
 import { eventHandler } from './base';
 export function useLinkAction(action, actionContext) {
-  var history = useHistory();
+  var navigate = useNavigate();
   return _objectSpread({}, eventHandler(action, actionContext, function (context) {
     var linkAction = getTargetValue(action, context);
-    goToLink(linkAction, history);
+    goToLink(linkAction, navigate);
   }));
 }
 export default useLinkAction;

package/es/actions/request.js

@@ -1,56 +1,40 @@
 var _excluded = ["method"],
-    _excluded2 = ["onFinish"];
-
+  _excluded2 = ["onFinish"];
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 import { useState } from 'react';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from '@teamix/router';
 import { doCommonRequest } from '@teamix/utils';
-import { eventHandler } from './base'; // action 里的数据请求都默认是 post 类型
-
+import { eventHandler } from './base';
+// action 里的数据请求都默认是 post 类型
 export function doRequest(action, context, history, extraParams) {
   var _action$method = action.method,
-      method = _action$method === void 0 ? 'post' : _action$method,
-      others = _objectWithoutProperties(action, _excluded);
-
+    method = _action$method === void 0 ? 'post' : _action$method,
+    others = _objectWithoutProperties(action, _excluded);
   return doCommonRequest(_objectSpread({
     method: method
   }, others), context, history, extraParams);
 }
 export function useRequestAction(action, actionContext) {
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      loading = _useState2[0],
-      setLoading = _useState2[1];
-
-  var history = useHistory();
-
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var navigate = useNavigate();
   var onFinish = action.onFinish,
-      others = _objectWithoutProperties(action, _excluded2);
-
+    others = _objectWithoutProperties(action, _excluded2);
   return _objectSpread(_objectSpread({}, eventHandler(action, actionContext, function (context) {
     setLoading(true);
-    doRequest(_objectSpread({}, others), context, history).then(function () {
+    doRequest(_objectSpread({}, others), context, navigate).then(function () {
       setLoading(false);
       onFinish && onFinish();
     }).catch(function () {

package/es/actions/utils.js

@@ -1,25 +1,17 @@
 var _excluded = ["context"];
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 export function addContext(props, context) {
   if (!props) {
     return {
       context: context
     };
   }
-
   var propsContext = props.context,
-      others = _objectWithoutProperties(props, _excluded);
-
+    others = _objectWithoutProperties(props, _excluded);
   var mergedContext = Object.assign({}, propsContext, context);
   return _objectSpread({
     context: mergedContext