@teamix/pro 1.2.34 → 1.3.2

package/lib/table/typing.d.ts

@@ -3,13 +3,12 @@
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
-import { QueryFilterProps } from '../form';
+import { QueryFilterProps, ProFormType } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
 import React from 'react';
-import type { Form as FormType } from '@formily/core';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
 declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
@@ -102,7 +101,7 @@ export declare type ProTableProps = {
     /** 内置 rowSelection 变化时的回调 */
     onChangeRowSelection?: (selectedRowKeys: string[]) => void;
     /** 获取内置 rowSelection */
-    getRowSelection?: (rowSelection: rowSelectionType) => void;
+    getRowSelection?: (rowSelection: innerRowSelectionType) => void;
     /** 表格底部（左侧）配置 */
     footerAction?: ProActionGroupProps | React.ReactNode;
     /** 表格底部（右层）配置 */
@@ -130,10 +129,14 @@ export declare type ProTableProps = {
         data: any[];
         total?: number;
     }>;
+    /** 翻页时是否保留之前批量选择数据 */
+    reserveSelectedRecords?: boolean;
     /** 默认漏斗过滤条件 */
     defaultFilterParams?: {
         [key: string]: any[] | any;
     };
+    /** 禁用掉批量选择中的全选 */
+    disableSelectAll?: boolean;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -159,6 +162,8 @@ export declare type ProTableActionType = {
     fullScreen?: () => boolean;
     /** 设置显示列 */
     setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
+    /** 表格尺寸 */
+    size?: 'small' | 'medium';
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */
@@ -189,9 +194,11 @@ export declare type ProTableActionType = {
     /** 重置翻页器为1，不发送请求 */
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
-    dataFilterForm?: FormType;
-    normalDataFilterForm?: FormType;
-    fullscreenDataFilterForm?: FormType;
+    dataFilterForm?: ProFormType;
+    /** 用于在 mount 的时候获取到表单 ref */
+    dataFilterFormRef?: React.MutableRefObject<ProFormType>;
+    normalDataFilterForm?: ProFormType;
+    fullscreenDataFilterForm?: ProFormType;
     filterEnableRef?: any;
     /** 表格当前的数据 */
     data?: any[];

package/lib/table/utils/columnRender.js

@@ -171,6 +171,12 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
         }
       }, props);
     }
+
+    if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
+      newRender = _objectSpread(_objectSpread({}, newRender), {}, {
+        ellipsis: false
+      });
+    }
   } // 渲染操作组
 
 

package/lib/timeline/ProTimeLineItem/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { ProTimeLineItemProps } from '../typing';
+import './index.scss';
+declare const ProTimeLineItem: React.FC<ProTimeLineItemProps>;
+export default ProTimeLineItem;

package/lib/{step/ProStepItem/components/VerStepItem → timeline/ProTimeLineItem}/index.js

@@ -17,7 +17,7 @@ var _utils = require("@teamix/utils");
 
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
-var _excluded = ["_index", "_shape", "status", "image", "icon", "title", "subTitle", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender", "onClick", "percent", "disabled"];
+var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -50,10 +50,11 @@ 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; }
 
 var TimelineItem = _components.Timeline.Item;
-var cls = (0, _utils.baseClass)('teamix-pro-step');
+var cls = (0, _utils.baseClass)('teamix-pro-timeline');
 
-var VerStepItem = function VerStepItem(props) {
-  var _index = props._index,
+var ProTimeLineItem = function ProTimeLineItem(props) {
+  var _props$_comment = props._comment,
+      _comment = _props$_comment === void 0 ? false : _props$_comment,
       _shape = props._shape,
       status = props.status,
       image = props.image,
@@ -70,9 +71,6 @@ var VerStepItem = function VerStepItem(props) {
       collapsed = props.collapsed,
       onCollapse = props.onCollapse,
       dotRender = props.dotRender,
-      _onClick = props.onClick,
-      percent = props.percent,
-      disabled = props.disabled,
       others = _objectWithoutProperties(props, _excluded);
   /** 内容去折叠相关 */
 
@@ -99,12 +97,12 @@ var VerStepItem = function VerStepItem(props) {
 
 
   var formatTime = function formatTime(time) {
-    if (typeof time === 'string') return (0, _utils.dateFormat)(time, '', 'YYYY年MM月DD日 hh:mm:ss');
+    if (typeof time === 'string') return (0, _utils.dateFormat)(time, '', 'YYYY-MM-DD hh:mm:ss');
     return time;
   };
 
   var formatShape = function formatShape() {
-    if (['dot', 'icon', 'number'].includes(_shape)) return _shape;
+    if (['dot', 'circle'].includes(_shape)) return _shape;
     return 'dot';
   };
 
@@ -112,8 +110,17 @@ var VerStepItem = function VerStepItem(props) {
     if (['success', 'fail', 'process', 'warning', 'wait'].includes(status)) return status;
     return 'wait';
   };
-  /**对元素进行渲染 */
+  /**一些复用常数 */
+
 
+  var circle = formatShape() === 'circle';
+  var dot = formatShape() === 'dot';
+  var process = formatStatus() === 'process';
+  var success = formatStatus() === 'success';
+  var error = formatStatus() === 'fail';
+  var warning = formatStatus() === 'warning';
+  var wait = formatStatus() === 'wait';
+  /**对元素进行渲染 */
 
   var renderImage = function renderImage() {
     if (typeof image === 'string') {
@@ -139,28 +146,18 @@ var VerStepItem = function VerStepItem(props) {
       className: (0, _classnames.default)(cls({
         'time-left': true,
         'time-left-dot': dot,
-        'time-left-circle': circle_icon || circle_number
+        'time-left-circle': circle
       }))
     }, formatTime(timeLeft));
   }, [_shape, timeLeft]);
-  /**一些复用常数 */
-
-  var circle_icon = formatShape() === 'icon';
-  var circle_number = formatShape() === 'number';
-  var dot = formatShape() === 'dot';
-  var process = formatStatus() === 'process' && !disabled;
-  var success = formatStatus() === 'success' && !disabled;
-  var error = formatStatus() === 'fail' && !disabled;
-  var warning = formatStatus() === 'warning' && !disabled;
-  var wait = formatStatus() === 'wait' && !disabled;
   var renderTitle = (0, _react.useCallback)(function () {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)(cls({
         wrapper: true,
         'wrapper-dot': dot && !timeLeft,
-        'wrapper-circle': (circle_icon || circle_number) && !timeLeft,
+        'wrapper-circle': circle && !timeLeft,
         'wrapper-time-left-dot': dot && timeLeft,
-        'wrapper-time-left-circle': (circle_icon || circle_number) && timeLeft
+        'wrapper-time-left-circle': circle && timeLeft
       }))
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)(cls('wrapper-left'))
@@ -182,9 +179,7 @@ var VerStepItem = function VerStepItem(props) {
       className: (0, _classnames.default)(cls('wrapper-right-top'))
     }, title && /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)(cls({
-        'wrapper-right-top-title-info-normal': true,
-        'wrapper-right-top-title-info-active': process,
-        'wrapper-right-top-title-info-disabled': disabled
+        'wrapper-right-top-title-info': true
       }))
     }, title), tags && /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)(cls('wrapper-right-top-tag-info'))
@@ -200,47 +195,45 @@ var VerStepItem = function VerStepItem(props) {
         'wrapper-right-content-info-open': showContent
       }))
     }, content))));
-  }, [_shape, timeLeft, image, disabled, title, tags, subTitle, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
-  /** 重新渲染 node 节点 */
+  }, [_shape, timeLeft, image, title, tags, subTitle, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
+  /**
+   * 重新渲染 timeline 节点
+   * */
 
   var renderNode = (0, _react.useCallback)(function () {
-    // 渲染 dot 节点
+    // shape 取 dot
     var renderDot = function renderDot() {
       return !icon ? /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(cls({
-          'ver-step-item-render-wrapper-dot': true,
-          'ver-step-item-render-wrapper-dot-disabled': disabled,
-          'ver-step-item-render-wrapper-dot-process': process,
-          'ver-step-item-render-wrapper-dot-success': success,
-          'ver-step-item-render-wrapper-dot-error': error,
-          'ver-step-item-render-wrapper-dot-warning': warning,
-          'ver-step-item-render-wrapper-dot-wait': wait
+          'item-render-wrapper-dot': true,
+          'item-render-wrapper-dot-process': process,
+          'item-render-wrapper-dot-success': success,
+          'item-render-wrapper-dot-error': error,
+          'item-render-wrapper-dot-warning': warning,
+          'item-render-wrapper-dot-wait': wait
         }))
       }) : /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(cls({
-          'ver-step-item-render-wrapper-icon-disabled': disabled,
-          'ver-step-item-render-wrapper-icon-process': process,
-          'ver-step-item-render-wrapper-icon-success': success,
-          'ver-step-item-render-wrapper-icon-error': error,
-          'ver-step-item-render-wrapper-icon-warning': warning,
-          'ver-step-item-render-wrapper-icon-wait': wait
+          'item-render-wrapper-icon-process': process,
+          'item-render-wrapper-icon-success': success,
+          'item-render-wrapper-icon-error': error,
+          'item-render-wrapper-icon-warning': warning,
+          'item-render-wrapper-icon-wait': wait
         }))
       }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
         type: icon,
         size: "small"
       }));
-    }; // 渲染 circle 节点
+    }; // shape 取 circle
 
 
     var renderCircle = function renderCircle() {
       if (dotRender) return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)(cls('ver-step-item-render-wrapper'))
+        className: (0, _classnames.default)(cls('item-render-wrapper'))
       }, dotRender());
 
-      var renderIconOrNumber = function renderIconOrNumber() {
-        if (percent) return /*#__PURE__*/_react.default.createElement("div", {
-          className: (0, _classnames.default)(cls('ver-step-item-render-wrapper-circle-percent'))
-        }, percent, "%");
+      var renderCircleItem = function renderCircleItem() {
+        // 有传入 icon 渲染 icon
         if (icon) return /*#__PURE__*/_react.default.createElement(_components.Icon, {
           type: icon,
           size: "small"
@@ -257,33 +250,30 @@ var VerStepItem = function VerStepItem(props) {
           type: "exclamation-line",
           size: "small"
         });
-        if (process && circle_icon) return /*#__PURE__*/_react.default.createElement(_icon.default, {
+        if (process && circle) return /*#__PURE__*/_react.default.createElement(_icon.default, {
           type: "loading-line",
           size: "small"
         });
-        if (wait && circle_icon) return /*#__PURE__*/_react.default.createElement(_icon.default, {
+        return /*#__PURE__*/_react.default.createElement(_icon.default, {
           type: "more-line",
           size: "small"
         });
-        return _index + 1;
       };
 
       return /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(cls({
-          'ver-step-item-render-wrapper-circle': true,
-          'ver-step-item-render-wrapper-circle-disabled': disabled,
-          'ver-step-item-render-wrapper-circle-process': process,
-          'ver-step-item-render-wrapper-circle-success': success,
-          'ver-step-item-render-wrapper-circle-error': error,
-          'ver-step-item-render-wrapper-circle-warning': warning,
-          'ver-step-item-render-wrapper-circle-wait': wait,
-          'ver-step-item-render-wrapper-percent-color': percent
+          'item-render-wrapper-circle': true,
+          'item-render-wrapper-circle-process': process,
+          'item-render-wrapper-circle-success': success,
+          'item-render-wrapper-circle-error': error,
+          'item-render-wrapper-circle-warning': warning,
+          'item-render-wrapper-circle-wait': wait
         }))
-      }, renderIconOrNumber());
+      }, renderCircleItem());
     };
 
     var renderStateNode = function renderStateNode() {
-      if (circle_icon || circle_number) {
+      if (circle) {
         return renderCircle();
       }
 
@@ -291,17 +281,13 @@ var VerStepItem = function VerStepItem(props) {
     };
 
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames.default)(cls('ver-step-item'))
+      className: (0, _classnames.default)(cls('item'))
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)(cls({
-        'ver-step-item-render-wrapper': true,
-        'ver-step-item-render-wrapper-disabled': disabled
-      })),
-      onClick: function onClick() {
-        return disabled !== null && disabled !== void 0 ? disabled : _onClick === null || _onClick === void 0 ? void 0 : _onClick(_index);
-      }
-    }, renderStateNode()));
-  }, [_index, _shape, icon, disabled, status, percent, dotRender]);
+        'item-render-wrapper': true
+      }))
+    }, !_comment && renderStateNode()));
+  }, [_shape, icon, status, dotRender]);
   return /*#__PURE__*/_react.default.createElement(TimelineItem, _objectSpread({
     title: renderTitle(),
     dot: renderNode(),
@@ -310,6 +296,6 @@ var VerStepItem = function VerStepItem(props) {
   }, others));
 };
 
-var _default = /*#__PURE__*/(0, _react.memo)(VerStepItem);
-
+ProTimeLineItem.displayName = 'ProTimeLineItem';
+var _default = ProTimeLineItem;
 exports.default = _default;

package/lib/{step/ProStepItem/components/VerStepItem → timeline/ProTimeLineItem}/index.scss

@@ -1,4 +1,8 @@
-.teamix-pro-step {
+.theme-hybridcloud-dark {
+    --wait-bg-color: #4d4d4d;
+}
+
+.teamix-pro-timeline {
     /** 修改了一些基础组件样式*/
     .next-timeline-item-has-left-content > .next-timeline-item-left-content p {
         font-family: var(--font-size-body-1, 12px);
@@ -23,6 +27,9 @@
         margin-left: var(--s-26);
     }
 
+    /**
+     *  title 区域样式
+     */
     &-wrapper {
         overflow: hidden;
         &-dot {
@@ -91,25 +98,12 @@
                 justify-content: left;
                 align-items: center;
                 height: var(--s-7);
+                margin-bottom: -4px;
 
                 &-title-info {
-                    &-normal {
-                        font-size: var(--font-size-body-2, 14px);
-                        color: var(--color-text1-3, #333333);
-                    }
-
-                    &-small {
-                        font-size: var(--font-size-body-1, 12px);
-                        color: var(--color-text1-3, #333333);
-                    }
-
-                    &-active {
-                        font-weight: 500;
-                        color: var(--color-text1-4, #1a1a1a);
-                    }
-                    &-disabled {
-                        color: var(--color-text1-1, #ccc);
-                    }
+                    font-weight: 500;
+                    font-size: var(--font-size-body-2, 14px);
+                    color: var(--color-text1-3, #333333);
                 }
 
                 &-tag-info {
@@ -125,11 +119,10 @@
             &-discribe-info {
                 font-family: var(--font-size-body-1, 12px);
                 color: var(--color-text1-2, #5a5a5a);
-                margin-top: 1px;
+                margin-bottom: var(--s-1);
             }
 
             &-content-info {
-                margin-top: var(--s-2);
                 &-close {
                     display: none;
                 }
@@ -139,10 +132,10 @@
             }
         }
     }
-}
-
-.teamix-pro-step {
-    &-ver-step-item {
+    /**
+     *  节点样式
+     */
+    &-item {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -152,63 +145,43 @@
             display: flex;
             justify-content: center;
             align-items: center;
-            cursor: pointer;
-            &-disabled {
-                cursor: not-allowed;
-            }
 
             &-dot {
                 width: var(--s-2);
                 height: var(--s-2);
                 border-radius: 50%;
 
-                &-disabled {
-                    background-color: transparent;
-                    background: transparent;
-                    color: var(--color-line1-3, #ccc);
-                    border: 1px solid var(--color-line1-3, #ccc);
-                }
-
                 &-process {
-                    background: var(--color-notice-5, #0064c8);
-                    background-color: var(--color-notice-5, #0064c8);
+                    background: var(--color-notice-4, #2a7dd1);
                 }
                 &-success {
-                    background: var(--color-notice-7, #589ad8);
-                    background-color: var(--color-notice-7, #589ad8);
+                    background: var(--color-success-4, #43bf7d);
                 }
                 &-error {
-                    background: var(--color-error-5, #e84738);
-                    background-color: var(--color-error-5, #e84738);
+                    background: var(--color-error-4, #ed675a);
                 }
                 &-warning {
-                    background: var(--color-warning-5, #f98e1a);
-                    background-color: var(--color-warning-5, #f98e1a);
+                    background: var(--color-warning-4, #ffa544);
                 }
                 &-wait {
-                    background: var(--color-line1-3, #ccc);
-                    background-color: var(--color-line1-3, #ccc);
+                    background: var(--wait-bg-color, var(--color-line1-5));
                 }
             }
             &-icon {
-                &-disabled {
-                    color: var(--color-line1-3, #ccc);
-                }
-
                 &-process {
-                    color: var(--color-notice-5, #0064c8);
+                    color: var(--color-notice-4, #2a7dd1);
                 }
                 &-success {
-                    color: var(--color-notice-7, #589ad8);
+                    color: var(--color-success-4, #43bf7d);
                 }
                 &-error {
-                    color: var(--color-error-5, #e84738);
+                    color: var(--color-error-4, #ed675a);
                 }
                 &-warning {
-                    color: var(--color-warning-5, #f98e1a);
+                    color: var(--color-warning-4, #ffa544);
                 }
                 &-wait {
-                    color: var(--color-line1-3, #ccc);
+                    color: var(--wait-bg-color, var(--color-line1-5));
                 }
             }
 
@@ -219,59 +192,34 @@
                 display: flex;
                 justify-content: center;
                 align-items: center;
-                &-disabled {
-                    background-color: transparent;
-                    background: transparent;
-                    color: var(--color-line1-3, #ccc);
-                    border: 1px solid var(--color-line1-3, #ccc);
-                }
                 &-process {
                     color: var(--color-white, #fff);
                     background: var(--color-notice-5, #0064c8);
-                    background-color: var(--color-notice-5, #0064c8);
                 }
                 &-success {
-                    color: var(--color-notice-5, #0064c8);
-                    background: var(--color-brand1-2, #cae3fd);
-                    background-color: var(--color-brand1-2, #cae3fd);
+                    color: var(--color-success-4, #43bf7d);
+                    background: var(--color-success-2, #cdf8e1);
                 }
                 &-error {
                     color: var(--color-error-5, #e84738);
                     background: var(--color-error-2, #fcceca);
-                    background-color: var(--color-error-2, #fcceca);
                 }
                 &-warning {
                     color: var(--color-warning-5, #f98e1a);
                     background: var(--color-warning-2, #ffe0bf);
-                    background-color: var(--color-warning-2, #ffe0bf);
                 }
                 &-wait {
-                    color: var(--color-black, #000);
+                    color: var(--wait-bg-color, var(--color-line1-5));
                     background: var(--color-fill1-3, #eaeaea);
-                    background-color: var(--color-fill1-3, #eaeaea);
                 }
             }
-
-            &-percent-color {
-                width: var(--s-5);
-                height: var(--s-5);
-                border-radius: 50%;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                background: transparent;
-                background-color: transparent;
-                color: var(--color-notice-5, #0064c8);
-                font-family: var(--font-size-body-1, 12px);
-                word-break: normal;
-                white-space: nowrap;
-                border: 1px solid var(--color-line1-2, #d9d9d9);
-            }
         }
     }
-}
 
-.teamix-pro-step {
+    /**
+     *  左侧时间样式
+     */
+
     &-time-left {
         display: block;
         margin-top: -2px;

package/lib/timeline/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { ProTimeLineProps } from './typing';
+import ProTimeLineItem from './ProTimeLineItem';
+import './index.scss';
+interface ProTimelineProperties {
+    /** ProTimeLineItem */
+    Item: typeof ProTimeLineItem;
+}
+declare const ProTimeline: React.FC<ProTimeLineProps> & ProTimelineProperties;
+export { ProTimeline, ProTimeLineItem };