@teamix/pro 1.2.0 → 1.2.5

package/es/table/index.js

@@ -49,6 +49,7 @@ import { createForm, formilyReactive } from '../form';
 import { ProActionGroup } from '../actions';
 import debounce from 'lodash.debounce';
 import classNames from 'classnames';
+import ProPageContainer from '../page-container';
 export * from './typing';
 var cls = baseClass('teamix-pro-table');
 var toJS = formilyReactive.toJS;
@@ -236,10 +237,10 @@ var ProTable = function ProTable(props) {
 
   var dataFilterForm = useMemo(function () {
     return createForm();
-  }, []); // 获取内容区是否超出一屏（仅支持全家桶）
+  }, []); // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
   var getFooterSuctionState = function getFooterSuctionState() {
-    var containerDom = document.querySelector('.teamix-pro-page-container');
+    var containerDom = document.querySelector('.teamix-pro-page-container-scroll-container');
 
     if (containerDom) {
       var offsetHeight = containerDom.offsetHeight;
@@ -250,6 +251,11 @@ var ProTable = function ProTable(props) {
       } else {
         setFooterSuctionState(false);
       }
+    } else {
+      // 非全家桶用户暂时不判断滚动条逻辑
+      if (footerSuction) {
+        setFooterSuctionState(true);
+      }
     }
   }; // rowSelection 相关
 
@@ -365,7 +371,9 @@ var ProTable = function ProTable(props) {
       return _request(params);
     },
     request: function request(params) {
-      return _request(params);
+      if (dataFilterForm.validate()) {
+        _request(params);
+      }
     },
     reset: function reset() {
       var _actionRef$current, _actionRef$current$se;
@@ -652,7 +660,7 @@ var ProTable = function ProTable(props) {
   var renderFooterAction = function renderFooterAction() {
     var _footerAction$actions;
 
-    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) > 0) {
+    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) >= 0) {
       // 默认 context
       var defaultContext = {
         action: actionRef.current,
@@ -752,11 +760,11 @@ var ProTable = function ProTable(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: cls({
       '': true,
-      fullscreen: fullscreenState,
-      'footer-suction': footerSuctionState && footerSuction
+      fullscreen: fullscreenState // 'footer-suction': footerSuctionState && footerSuction,
+
     }),
     ref: tableRef
-  }, renderTable(), renderFooter()));
+  }, renderTable(), footerSuctionState && footerSuction && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && renderFooter()));
 };
 
 export default ProTable;

package/es/table/typing.d.ts

@@ -4,7 +4,7 @@
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
 import { IFilterProps } from '../form';
-import { ActionGroupProps, ProActionButtonProps } from '../actions';
+import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
@@ -50,7 +50,7 @@ export declare type ProTableColumnProps = {
     /** 表头的过滤菜单宽度 */
     filtersWidth?: string | number;
     /** 操作组配置 */
-    actionSchema?: ActionGroupProps;
+    actionSchema?: ProActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
@@ -99,7 +99,7 @@ export declare type ProTableProps = {
     /** 获取内置 rowSelection */
     getRowSelection?: (rowSelection: rowSelectionType) => void;
     /** 表格底部（左侧）配置 */
-    footerAction?: ActionGroupProps | React.ReactNode;
+    footerAction?: ProActionGroupProps | React.ReactNode;
     /** 筛选区自动搜索的防抖时间（毫秒） */
     filterDebounce?: number;
     /** ProTable action 的引用，便于手动触发一些方法  */
@@ -211,7 +211,7 @@ export declare type ProTableTopAreaProps = {
     /** 标题区 */
     header?: ProTableHeaderProps;
     /** 主操作区 */
-    mainAction?: ActionGroupProps | React.ReactNode;
+    mainAction?: ProActionGroupProps | React.ReactNode;
     /** 工具栏区 */
     toolBar?: boolean | ProTableToolBarItem[];
     /** 快捷操作区 */

package/lib/actions/dialog-component.js

@@ -10,6 +10,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _dialog = _interopRequireDefault(require("./dialog"));
 
+var _utils = require("./utils");
+
 var _excluded = ["schema", "component"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -30,7 +32,7 @@ function useDialogComponentAction(action, context) {
       others = _objectWithoutProperties(action, _excluded);
 
   return (0, _dialog.default)(Object.assign({
-    content: /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, schema)),
+    content: /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils.addContext)(schema, context))),
     closeable: true
   }, others), context);
 }

package/lib/actions/dialog-form.js

@@ -22,6 +22,8 @@ var _request = require("./request");
 
 var _dialog = _interopRequireDefault(require("./dialog"));
 
+var _utils2 = require("./utils");
+
 var _excluded = ["schema"],
     _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish"];
 
@@ -141,7 +143,7 @@ var DialogForm = function DialogForm(props) {
   }, /*#__PURE__*/_react.default.createElement(_form.default, _objectSpread(_objectSpread({
     form: form,
     schema: (0, _utils.getTargetValue)(formSchema, context)
-  }, getDefaultFormPropsByDialogSize(size)), (0, _utils.getTargetValue)(others, context))));
+  }, getDefaultFormPropsByDialogSize(size)), (0, _utils2.addContext)((0, _utils.getTargetValue)(others, context), context))));
 };
 
 function useDialogFormAction(action, context) {

package/lib/actions/dialog.js

@@ -26,6 +26,8 @@ var _base = require("./base");
 
 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"];
@@ -247,7 +249,7 @@ function useDialogAction(action, context) {
     });
     var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
       key: (0, _utils.uuid)()
-    }, componentProps)) : addContextForReactNode(content, dialogContext);
+    }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread({
       // @ts-ignore

package/lib/actions/index.js

@@ -265,7 +265,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       triggerType: 'hover'
     },
     popupProps: {
-      shouldUpdatePosition: true
+      v2: true
     },
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)

package/lib/actions/utils.d.ts

@@ -0,0 +1 @@
+export declare function addContext(props?: any, context?: any): any;

package/lib/actions/utils.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addContext = addContext;
+var _excluded = ["context"];
+
+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 addContext(props, context) {
+  if (!props) {
+    return {
+      context: context
+    };
+  }
+
+  var propsContext = props.context,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var mergedContext = Object.assign({}, propsContext, context);
+  return _objectSpread({
+    context: mergedContext
+  }, others);
+}

package/lib/card/card-container.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { ProCardProps } from './index';
+/**
+ * @deprecated 建议使用 ProCardProps 代替
+ */
+export declare type ProCardContainerProps = ProCardProps;
+/**
+ * @deprecated 建议使用 ProCard 代替
+ */
+export declare const ProCardContainer: React.FC<ProCardContainerProps>;
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+export declare const CardContainer: React.FC<ProCardProps>;
+/**
+ * @deprecated 建议使用 ProCardContainerProps 代替
+ */
+export declare type CardContainerProps = ProCardContainerProps;

package/lib/card/card-container.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ProCardContainer = exports.CardContainer = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _index = require("./index");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+/**
+ * @deprecated 建议使用 ProCard 代替
+ */
+var ProCardContainer = function ProCardContainer(props) {
+  return /*#__PURE__*/_react.default.createElement(_index.ProCard, _objectSpread({}, props));
+};
+
+exports.ProCardContainer = ProCardContainer;
+ProCardContainer.defaultProps = {
+  compacted: true,
+  direction: 'column'
+};
+/**
+ * @deprecated 建议使用 ProCardContainer 代替
+ */
+
+var CardContainer = ProCardContainer;
+exports.CardContainer = CardContainer;

package/lib/card/divider.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+declare const ProCardDivider: {
+    (props: React.HTMLAttributes<HTMLElement>): JSX.Element;
+    isProCardDivider: boolean;
+};
+export default ProCardDivider;

package/lib/card/divider.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+var ProCardDivider = function ProCardDivider(props) {
+  return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
+    className: "teamix-pro-card-divider"
+  }, props));
+};
+
+ProCardDivider.isProCardDivider = true;
+var _default = ProCardDivider;
+exports.default = _default;

package/lib/card/index.d.ts

@@ -1,59 +1,86 @@
 import React from 'react';
-import { ActionGroupProps } from '../actions';
+import { ProActionGroupProps } from '../actions';
 import './index.scss';
-export declare type ProCardContainerProps = {
-    direction?: 'row' | 'column' | 'row-reverse' | 'column-reverse';
-    spacing?: [number, number] | number;
-    wrap?: boolean;
-} & React.HTMLAttributes<HTMLElement>;
-export declare const ProCardContainer: React.FC<ProCardContainerProps>;
-export interface ProCardProps {
+export * from './card-container';
+export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 'title'> {
     /** 内容部分 */
     children?: React.ReactNode;
     /**卡片标题 */
     title?: React.ReactNode;
     /**卡片副标题 */
     subTitle?: React.ReactNode;
-    /**额外信息区域，位于卡片右上角，可以配置一些常用轻量操作 */
-    extra?: React.ReactNode | ActionGroupProps;
-    /**卡片背景图 */
+    /** 标题右侧图标 hover 提示信息 */
+    tooltip?: React.ReactNode;
+    /** 标题右侧图标 */
+    tooltipIcon?: React.ReactNode;
+    /** 标题右侧描述 */
+    description?: React.ReactNode;
+    /** 额外信息区域，位于卡片右上角，可以配置一些常用轻量操作 */
+    extra?: React.ReactNode | ProActionGroupProps;
+    /** 卡片操作区域，位于卡片最下方，可以配置一些常用轻量操作 */
+    actions?: React.ReactNode | ProActionGroupProps;
+    /** 卡片背景图 */
     image?: string;
-    /**卡片标题下方是否有分割线 */
+    /** 卡片标题下方是否有分割线 */
     divider?: boolean;
-    /**卡片是否有边框 */
+    /** 卡片是否有边框 */
     bordered?: boolean;
-    /**卡片在hovers时是否有阴影 */
+    /**
+     * @deprecated 已经没有这个效果了，将在下一个 minor 版本移除
+     */
     hoveredShadow?: boolean;
-    /**卡片是否为紧凑模式，紧凑模式下卡片无内边距 */
+    /** 卡片是否为紧凑模式，紧凑模式下卡片没有内边距和边框 */
     compacted?: boolean;
-    /**卡片内容是否居中展示 */
+    /** 卡片内容是否居中展示 */
     centered?: boolean;
-    /**加载中状态 */
+    /** 加载中状态 */
     loading?: boolean;
-    /**背景色 */
+    /** 背景色 */
     backgroundColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent';
-    /**卡片嵌套使用的模式下，卡片占父卡片内容区域的栅格数量 */
+    /** 内容区栅格排列 flex 方向，仅仅在卡片嵌套模式下生效 */
+    direction?: 'row' | 'column' | 'row-reverse' | 'column-reverse';
+    /** 内容区栅格的间距，仅仅在卡片嵌套模式下生效 */
+    spacing?: [number, number] | number;
+    /** 内容区栅格超出部分是否换行展示，仅仅在卡片嵌套模式下生效 */
+    wrap?: boolean;
+    /** 卡片嵌套使用的模式下，子卡片分隔 */
+    split?: 'horizontal' | 'vertical';
+    /** 卡片嵌套使用的模式下，卡片占父卡片内容区域的栅格数量 */
     col?: number | string;
-    /**卡片 class */
+    /** 卡片是否可折叠 */
+    collapsible?: boolean;
+    /** 默认是否折叠，用于非受控模式 */
+    defaultCollapsed?: boolean;
+    /** 是否折叠，受控模式 */
+    collapsed?: boolean;
+    /** 折叠状态改变的回调函数 */
+    onCollapse?: (collapsed: boolean) => void;
+    /** 卡片 class */
     className?: string;
-    /**卡片样式 */
+    /** 卡片样式 */
     style?: React.CSSProperties;
-    /**卡片内容 class */
+    /** 卡片内容 class */
     contentClassName?: string;
-    /**卡片内容样式 */
+    /** 卡片内容样式 */
     contentStyle?: React.CSSProperties;
+    /** 上下文 */
+    context?: any;
 }
-declare const ProCard: React.FC<ProCardProps>;
+export declare const ProCard: {
+    (props: ProCardProps): JSX.Element;
+    defaultProps: {
+        bordered: boolean;
+        spacing: number;
+        direction: string;
+    };
+    Divider: {
+        (props: React.HTMLAttributes<HTMLElement>): JSX.Element;
+        isProCardDivider: boolean;
+    };
+    isProCard: boolean;
+};
 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;