@teamix/pro 1.1.36 → 1.1.40

package/lib/actions/index.d.ts

@@ -4,75 +4,82 @@ import { MenuButtonProps } from '@alicloudfe/components/types/menu-button';
 import { LinkAction } from './link';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
-import { ConfirmAction } from './confirm';
-import { DangerConfirmAction } from './danger-confirm';
-import { NoticeAction } from './notice';
-import { ErrorAction } from './error';
 import { DialogFormAction } from './dialog-form';
 import { DialogTableAction } from './dialog-table';
 import { DialogInfoAction } from './dialog-info';
-import { DrawerAction } from './drawer';
-import { DrawerFormAction } from './drawer-form';
-import { DrawerTableAction } from './drawer-table';
-import { DrawerInfoAction } from './drawer-info';
 import './index.scss';
-export declare type ActionConfig = ({
-    type: 'link';
-} & LinkAction) | ({
-    type: 'request';
-} & RequestAction) | ({
-    type: 'confirm';
-} & ConfirmAction) | ({
-    type: 'danger-confirm';
-} & DangerConfirmAction) | ({
-    type: 'notice';
-} & NoticeAction) | ({
-    type: 'error';
-} & ErrorAction) | ({
-    type: 'dialog';
-} & DialogAction) | ({
-    type: 'dialog-form';
+export declare type ProActionConfig = ({
+    type: 'dialog-form' | 'drawer-form';
 } & DialogFormAction) | ({
-    type: 'dialog-table';
+    type: 'dialog-table' | 'drawer-table';
 } & DialogTableAction) | ({
-    type: 'dialog-info';
+    type: 'dialog-info' | 'drawer-info';
 } & DialogInfoAction) | ({
-    type: 'drawer';
-} & DrawerAction) | ({
-    type: 'drawer-form';
-} & DrawerFormAction) | ({
-    type: 'drawer-table';
-} & DrawerTableAction) | ({
-    type: 'drawer-info';
-} & DrawerInfoAction);
+    type: 'dialog' | 'drawer' | 'confirm' | 'danger-confirm' | 'notice' | 'error';
+} & DialogAction) | ({
+    type: 'request';
+} & RequestAction) | ({
+    type: 'link';
+} & LinkAction);
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
-export declare const useAction: any;
-export interface IActionButton extends ButtonProps {
-    config?: ActionConfig;
+export declare function useAction(config?: ProActionConfig, context?: any): any;
+export interface ProActionButtonProps extends ButtonProps {
+    config?: ProActionConfig;
     visible?: any;
     disabled?: any;
     icon?: string;
     context?: any;
     onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
 }
-export declare const ActionButton: (props: IActionButton) => JSX.Element;
-export interface IActionMenuButton extends MenuButtonProps {
-    actions: ICommonActionButton[];
+export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
+export interface ProActionMenuButtonProps extends MenuButtonProps {
+    actions: ProActionProps[];
     visible?: any;
     icon?: string;
     context?: any;
 }
-export declare const ActionMenuButton: (props: IActionMenuButton) => JSX.Element;
-export declare type ICommonActionButton = IActionButton | IActionMenuButton;
-export declare type ActionGroupProps = {
+export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
+export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps;
+export declare type ProActionGroupProps = {
     type?: 'button' | 'text';
     context?: any;
-    actions: ICommonActionButton[];
+    actions: ProActionProps[];
     max?: number;
     moreText?: string;
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;
-export declare function ActionGroup(props: ActionGroupProps): JSX.Element;
-export declare type IProAction = ICommonActionButton;
-declare const ProAction: (props: IProAction) => JSX.Element;
+export declare function ProActionGroup(props: ProActionGroupProps): JSX.Element;
+declare const ProAction: (props: ProActionProps) => JSX.Element;
 export default ProAction;
+/**
+ * @deprecated 建议使用 ProActionGroup 代替
+ */
+export declare const ActionGroup: typeof ProActionGroup;
+/**
+ * @deprecated 建议使用 ProActionButton 代替
+ */
+export declare const ActionButton: (props: ProActionButtonProps) => JSX.Element;
+/**
+ * @deprecated 建议使用 ProActionMenuButton 代替
+ */
+export declare const ActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
+/**
+ * @deprecated 建议使用 ProActionConfig 代替
+ */
+export declare type ActionConfig = ProActionConfig;
+/**
+ * @deprecated 建议使用 ProActionButtonProps 代替
+ */
+export declare type IActionButton = ProActionButtonProps;
+/**
+ * @deprecated 建议使用 ProActionMenuButtonProps 代替
+ */
+export declare type IActionMenuButton = ProActionMenuButtonProps;
+/**
+ * @deprecated 建议使用 ProActionGroupProps 代替
+ */
+export declare type ActionGroupProps = ProActionGroupProps;
+/**
+ * @deprecated 建议使用 ProActionProps 代替
+ */
+export declare type ICommonActionButton = ProActionProps;

package/lib/actions/index.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ActionButton = void 0;
-exports.ActionGroup = ActionGroup;
-exports.default = exports.ActionMenuButton = void 0;
+exports.ProActionButton = exports.ActionMenuButton = exports.ActionGroup = exports.ActionButton = void 0;
+exports.ProActionGroup = ProActionGroup;
+exports.default = exports.ProActionMenuButton = void 0;
 exports.registerActionHandler = registerActionHandler;
-exports.useAction = void 0;
+exports.useAction = useAction;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -91,7 +91,7 @@ function registerActionHandler(id, extendActionId, defaultConfig) {
   });
 }
 
-var useAction = function useAction(config, context) {
+function useAction(config, context) {
   if (!config) {
     return {};
   }
@@ -164,9 +164,7 @@ var useAction = function useAction(config, context) {
   return useAction(_objectSpread(_objectSpread({
     type: registedAction.extendActionId
   }, registedAction.defaultConfig), others), context);
-};
-
-exports.useAction = useAction;
+}
 
 var buttonContent = function buttonContent(content, iconType, iconSize, context) {
   var renderedContent = typeof content === 'function' ? content(context) : content;
@@ -182,7 +180,7 @@ var buttonContent = function buttonContent(content, iconType, iconSize, context)
   }), renderedContent];
 };
 
-var ActionButton = function ActionButton(props) {
+var ProActionButton = function ProActionButton(props) {
   var config = props.config,
       icon = props.icon,
       _props$iconSize = props.iconSize,
@@ -206,7 +204,7 @@ var ActionButton = function ActionButton(props) {
   }, buttonProps), buttonContent(children, icon, iconSize, context));
 };
 
-exports.ActionButton = ActionButton;
+exports.ProActionButton = ProActionButton;
 
 function renderMenuButtonItem(item, key, context) {
   var config = item.config,
@@ -249,7 +247,7 @@ function renderCommonActionButtonMenuItem(action, key, context) {
   return renderMenuButtonItem(action, key, context);
 }
 
-var ActionMenuButton = function ActionMenuButton(props) {
+var ProActionMenuButton = function ProActionMenuButton(props) {
   var icon = props.icon,
       iconSize = props.iconSize,
       label = props.label,
@@ -277,7 +275,7 @@ var ActionMenuButton = function ActionMenuButton(props) {
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
 
-exports.ActionMenuButton = ActionMenuButton;
+exports.ProActionMenuButton = ProActionMenuButton;
 
 function formatGroupActions(actions, max, moreConfig) {
   var MAX = max < 1 ? MAX_ACTTIONS : max;
@@ -300,19 +298,13 @@ function renderCommonActionButton(button, context, isTypeText) {
   var buttonProps = _objectSpread({
     context: Object.assign({}, context, buttonContext),
     text: text || isTypeText
-  }, others); // @ts-ignore
-
+  }, others);
 
   if (!button.actions) {
-    return (
-      /*#__PURE__*/
-      // @ts-ignore
-      _react.default.createElement(ActionButton, _objectSpread({}, buttonProps))
-    );
-  } // @ts-ignore
-
+    return /*#__PURE__*/_react.default.createElement(ProActionButton, _objectSpread({}, buttonProps));
+  }
 
-  return /*#__PURE__*/_react.default.createElement(ActionMenuButton, _objectSpread({}, buttonProps));
+  return /*#__PURE__*/_react.default.createElement(ProActionMenuButton, _objectSpread({}, buttonProps));
 }
 
 function getDefaultMoreButton(type, moreText) {
@@ -339,9 +331,7 @@ function getDefaultMoreButton(type, moreText) {
 var MAX_ACTTIONS = 4;
 
 function getActionConfig(action, context) {
-  // @ts-ignore
   if (action.actions) {
-    // @ts-ignore
     var actions = action.actions,
         _others = _objectWithoutProperties(action, _excluded6);
 
@@ -350,8 +340,7 @@ function getActionConfig(action, context) {
         return getActionConfig(a, context);
       })
     }, (0, _utils.getTargetValue)(_others, context));
-  } // @ts-ignore
-
+  }
 
   var config = action.config,
       others = _objectWithoutProperties(action, _excluded7);
@@ -361,7 +350,7 @@ function getActionConfig(action, context) {
   }, (0, _utils.getTargetValue)(others, context));
 }
 
-function ActionGroup(props) {
+function ProActionGroup(props) {
   var _props$type3 = props.type,
       type = _props$type3 === void 0 ? 'button' : _props$type3,
       _props$divider = props.divider,
@@ -383,8 +372,8 @@ function ActionGroup(props) {
   });
   var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, moreText));
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
-    className: (0, _classnames.default)('teamix-pro-actions', type, className, {
-      divider: divider
+    className: (0, _classnames.default)('teamix-pro-actions', "teamix-pro-actions-type-".concat(type), className, {
+      'teamix-pro-actions-divider': type === 'button' ? false : divider
     })
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
@@ -401,4 +390,22 @@ var ProAction = function ProAction(props) {
 };
 
 var _default = ProAction;
-exports.default = _default;
+/**
+ * @deprecated 建议使用 ProActionGroup 代替
+ */
+
+exports.default = _default;
+var ActionGroup = ProActionGroup;
+/**
+ * @deprecated 建议使用 ProActionButton 代替
+ */
+
+exports.ActionGroup = ActionGroup;
+var ActionButton = ProActionButton;
+/**
+ * @deprecated 建议使用 ProActionMenuButton 代替
+ */
+
+exports.ActionButton = ActionButton;
+var ActionMenuButton = ProActionMenuButton;
+exports.ActionMenuButton = ActionMenuButton;

package/lib/actions/index.scss

@@ -2,7 +2,7 @@
   display: flex;
   align-items: center;
   flex-wrap: wrap;
-  &.button {
+  &.teamix-pro-actions-type-button {
     & > button {
       &:not(:last-child) {
         margin-right: var(--s-2);
@@ -10,7 +10,7 @@
     }
   }
 
-  &.text:not(.divider) {
+  &.teamix-pro-actions-type-text:not(.teamix-pro-actions-divider) {
     & > button {
       &:not(:last-child) {
         margin-right: var(--s-4);
@@ -29,10 +29,45 @@
   }
 }
 
+.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);
 }
 
+.teamix-pro-dialog-message {
+  margin-bottom: var(--s-2);
+
+  &+.next-loading {
+    .teamix-pro-form {
+      margin-top: 20px;
+    }
+  }
+}
+
 .teamix-pro-dialog-after-content {
   margin-top: var(--s-2);
 }
@@ -40,3 +75,14 @@
 .next-menu-divider + .next-menu-divider {
   display: none;
 }
+
+.next-dialog-body {
+  .teamix-pro-dialog-footer-description {
+    .teamix-pro-form {
+      margin-bottom: 0;
+    }
+  }
+  .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) {

package/lib/card/index.d.ts

@@ -1,13 +1,13 @@
 import React from 'react';
 import { ActionGroupProps } from '../actions';
 import './index.scss';
-export declare type CardContainerProps = {
+export declare type ProCardContainerProps = {
     direction?: 'row' | 'column' | 'row-reverse' | 'column-reverse';
     spacing?: [number, number] | number;
     wrap?: boolean;
 } & React.HTMLAttributes<HTMLElement>;
-export declare const CardContainer: React.FC<CardContainerProps>;
-export interface CardProps {
+export declare const ProCardContainer: React.FC<ProCardContainerProps>;
+export interface ProCardProps {
     /** 内容部分 */
     children?: React.ReactNode;
     /**卡片标题 */
@@ -43,5 +43,17 @@ export interface CardProps {
     /**卡片内容样式 */
     contentStyle?: React.CSSProperties;
 }
-declare const Card: React.FC<CardProps>;
-export default Card;
+declare const ProCard: React.FC<ProCardProps>;
+export default ProCard;
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+export declare const CardContainer: React.FC<ProCardContainerProps>;
+/**
+ * @deprecated 建议使用 ProCardProps 代替
+ */
+export declare type CardProps = ProCardProps;
+/**
+ * @deprecated 建议使用 ProCardContainerProps 代替
+ */
+export declare type CardContainerProps = ProCardContainerProps;

package/lib/card/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.CardContainer = void 0;
+exports.default = exports.ProCardContainer = exports.CardContainer = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -59,7 +59,7 @@ function getColClassAndStyle(col) {
   };
 }
 
-var CardContainer = function CardContainer(props) {
+var ProCardContainer = function ProCardContainer(props) {
   var children = props.children,
       style = props.style,
       className = props.className,
@@ -108,8 +108,8 @@ var CardContainer = function CardContainer(props) {
   }, childrenModified);
 };
 
-exports.CardContainer = CardContainer;
-CardContainer.defaultProps = {
+exports.ProCardContainer = ProCardContainer;
+ProCardContainer.defaultProps = {
   spacing: 16,
   direction: 'column'
 };
@@ -120,7 +120,7 @@ var renderExtra = function renderExtra(extra) {
   }
 
   if (extra.actions instanceof Array) {
-    return /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread({}, extra), {}, {
+    return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({}, extra), {}, {
       type: "text"
     }));
   }
@@ -128,7 +128,7 @@ var renderExtra = function renderExtra(extra) {
   return extra;
 };
 
-var Card = function Card(props) {
+var ProCard = function ProCard(props) {
   var children = props.children,
       title = props.title,
       subTitle = props.subTitle,
@@ -157,7 +157,7 @@ var Card = function Card(props) {
     component: "img",
     src: image
   }), (title || extra) && /*#__PURE__*/_react.default.createElement(_components.Card.Header, {
-    title: loading ? /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Card.Title, null) : title,
+    title: loading ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Title, null) : title,
     subTitle: !loading && subTitle,
     extra: !loading && renderExtra(extra)
   }), divider && /*#__PURE__*/_react.default.createElement(_components.Card.Divider, null), /*#__PURE__*/_react.default.createElement(_components.Card.Content, {
@@ -165,14 +165,20 @@ var Card = function Card(props) {
       centered: centered
     }),
     style: contentStyle
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Card.Content, null), !loading && children));
+  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Content, null), !loading && children));
 };
 
-Card.defaultProps = {
+ProCard.defaultProps = {
   bordered: true,
   hoveredShadow: false
 }; // @ts-ignore
 
-Card.isProCard = true;
-var _default = Card;
-exports.default = _default;
+ProCard.isProCard = true;
+var _default = ProCard;
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+
+exports.default = _default;
+var CardContainer = ProCardContainer;
+exports.CardContainer = CardContainer;