@teamix/pro 1.2.32 → 1.3.0

package/lib/table/components/Layout/index.js

@@ -76,6 +76,19 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
+  }; // 渲染 addonAfter
+
+
+  var renderAddonAfter = function renderAddonAfter() {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('addon-after-wrapper')
+    }, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
+      actionRef: actionRef,
+      quickAction: extra,
+      rowSelection: rowSelection
+    }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
+      actionRef: actionRef
+    }, otherProps)));
   }; // 渲染新版 QueryFilter
 
 
@@ -103,13 +116,7 @@ var Layout = function Layout(props) {
           },
           panelContent: dataFilter.content,
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
         return /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
@@ -128,27 +135,18 @@ var Layout = function Layout(props) {
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
-        className: "mb8",
         addonBefore: renderMainAction(),
-        addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-          actionRef: actionRef,
-          quickAction: extra,
-          rowSelection: rowSelection
-        }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-          actionRef: actionRef
-        }, otherProps)))
+        addonAfter: renderAddonAfter()
+      });
+    } else {
+      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+        addonAfter: renderAddonAfter()
       });
     }
   }; // 区域组合渲染
@@ -168,11 +166,19 @@ var Layout = function Layout(props) {
         rowSelection: rowSelection
       }))), renderQueryFilter());
     } else if (header && !mainAction) {
+      var _dataFilter$schema3, _dataFilter$schema4;
+
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), renderQueryFilter())));
+      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
+        className: cls('right')
+      }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
+        actionRef: actionRef,
+        quickAction: extra,
+        rowSelection: rowSelection
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
     } else if (!header && mainAction) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

package/lib/table/components/Layout/index.scss

@@ -37,4 +37,11 @@ $prefix: 'teamix-pro-table-layout';
     padding: 16px;
     background: var(--panel-filter-bg, var(--color-fill1-2));
   }
+  &-main-action {
+    margin-bottom: 8px;
+  }
+  &-addon-after-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }

package/lib/table/components/Pagination/index.js

@@ -64,6 +64,13 @@ var _default = function _default(props) {
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
 
+  (0, _react.useEffect)(function () {
+    // size='mini' 模式下 current 受控
+    if (responsiveProps === 'mini') {
+      setCurrentPage(current);
+    }
+  }, [current]);
+
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
@@ -100,6 +107,9 @@ var _default = function _default(props) {
         text: true,
         onMouseEnter: function onMouseEnter() {
           return setVisible(true);
+        },
+        style: {
+          lineHeight: '18px'
         }
       }, (0, _utils.getMessage)('total', {
         total: total

package/lib/table/components/ToolBar/Fullscreen.js

@@ -25,7 +25,8 @@ var FullScreen = function FullScreen(props) {
       actionRef = props.actionRef;
   var _actionRef$current = actionRef.current,
       normalDataFilterForm = _actionRef$current.normalDataFilterForm,
-      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm;
+      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm,
+      filterEnableRef = _actionRef$current.filterEnableRef;
 
   var closeByESC = function closeByESC(e) {
     if (visible && e.code === 'Escape') {
@@ -44,12 +45,38 @@ var FullScreen = function FullScreen(props) {
   }, [visible, actionRef]);
 
   var afterClose = function afterClose() {
-    normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 关闭全屏后，表单值未变化，开启普通表单onFilter
+      filterEnableRef.current.normal = true;
+    } else {
+      // 关闭全屏后，表单值有变化，修改表单值
+      normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values);
+    } // 关闭全屏后，关闭全屏表单onFilter
+
+
+    filterEnableRef.current.fullscreen = false;
   }; // 全屏开启之后
 
 
   var afterOpen = function afterOpen() {
-    fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 全屏后，表单值未变化，开启全屏表单onFilter
+      filterEnableRef.current.fullscreen = true;
+    } else {
+      // 全屏后，表单值变化，修改表单值
+      fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.setValues(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values);
+    } // 全屏后，关闭普通表单onFilter
+
+
+    filterEnableRef.current.normal = false; // 消息提示
 
     _components.Message.show({
       type: 'notice',

package/lib/table/components/ToolBar/index.scss

@@ -1,6 +1,7 @@
 .teamix-pro-table-toolbar {
   width: 100%;
   text-align: right;
+  margin-bottom: 8px;
 }
 .teamix-pro-table-toolbar-custom {
   display: inline-block;

package/lib/table/index.js

@@ -165,7 +165,7 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 
 var ProTable = function ProTable(props) {
-  var _rowSelection$selecte, _dataFilterForm4;
+  var _rowSelection$selecte;
 
   var header = props.header,
       className = props.className,
@@ -331,16 +331,21 @@ var ProTable = function ProTable(props) {
   var _useState27 = (0, _react.useState)(false),
       _useState28 = _slicedToArray(_useState27, 2),
       fullscreenState = _useState28[0],
-      setFullscreenState = _useState28[1]; // 非全屏状态下的
+      setFullscreenState = _useState28[1]; // 切换全屏搜索开关
 
 
+  var filterEnableRef = (0, _react.useRef)({
+    fullscreen: false,
+    normal: true
+  }); // 非全屏状态下的
+
   var normalDataFilterFormRef = (0, _react.useRef)();
   var fullscreenDataFilterFormRef = (0, _react.useRef)();
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
-  var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
+  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef; // let dataFilterForm = dataFilterFormRef.current;
+  // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
   var _useState29 = (0, _react.useState)(false),
       _useState30 = _slicedToArray(_useState29, 2),
@@ -549,12 +554,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current4, _actionRef$current4$s, _dataFilterForm;
+      var _actionRef$current4, _actionRef$current4$s, _dataFilterFormRef$cu;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, {});
-      (_dataFilterForm = dataFilterForm) === null || _dataFilterForm === void 0 ? void 0 : _dataFilterForm.reset();
+      (_dataFilterFormRef$cu = dataFilterFormRef.current) === null || _dataFilterFormRef$cu === void 0 ? void 0 : _dataFilterFormRef$cu.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -576,9 +581,11 @@ var ProTable = function ProTable(props) {
       pageSize: pageSize
     },
     data: data,
-    dataFilterForm: dataFilterForm,
+    dataFilterForm: dataFilterFormRef.current,
+    dataFilterFormRef: dataFilterFormRef,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
+    filterEnableRef: filterEnableRef,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
@@ -667,8 +674,8 @@ var ProTable = function ProTable(props) {
     }
   }); // 请求函数
 
-  function _request(params, noLoading) {
-    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
+  function _request(params, noLoading, filterParams) {
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -681,7 +688,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) === null || _dataFilterForm2 === void 0 ? void 0 : _dataFilterForm2.values); // 列过滤请求参数
+    var dataFilterParams = filterParams !== null && filterParams !== void 0 ? filterParams : (_dataFilterFormRef$cu2 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu2 === void 0 ? void 0 : _dataFilterFormRef$cu2.values; // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$g = _actionRef$current5.getFilterRules) === null || _actionRef$current5$g === void 0 ? void 0 : _actionRef$current5$g.call(_actionRef$current5)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -732,31 +739,24 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
-    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
+    var _propsDataFilter$sche, _propsDataFilter$sche2;
 
+    // 监听 浏览器变化 更吸底状态
     if (footerSuction) {
       getFooterSuctionState();
 
       window.onresize = function () {
         getFooterSuctionState();
       };
-    }
+    } // 如果不传 dataFilter，则在这里初始化请求
 
-    if (propsDataFilter) {
-      var _dataFilterForm3;
 
-      if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
-        // 在请求发送之前 处理漏斗默认数据
-        (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
+    var hasDataFilter = (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$sche = propsDataFilter.schema) === null || _propsDataFilter$sche === void 0 ? void 0 : _propsDataFilter$sche.length) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$sche2 = propsDataFilter.schema) === null || _propsDataFilter$sche2 === void 0 ? void 0 : _propsDataFilter$sche2.length) > 0;
 
-        _request();
-      }
-    } else {
-      if (requestWhenMount) {
-        (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
+    if (requestWhenMount && !hasDataFilter) {
+      (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
 
-        _request();
-      }
+      _request();
     }
 
     return function () {
@@ -770,7 +770,7 @@ var ProTable = function ProTable(props) {
 
       actionRef.current = undefined;
     };
-  }, [(_dataFilterForm4 = dataFilterForm) === null || _dataFilterForm4 === void 0 ? void 0 : _dataFilterForm4.id]);
+  }, []);
 
   function onSort(dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
@@ -782,26 +782,45 @@ var ProTable = function ProTable(props) {
 
 
   var dataFilter = _objectSpread(_objectSpread({
-    mode: 'inline'
+    mode: 'inline',
+    forceClear: true
   }, propsDataFilter), {}, {
+    onInit: function onInit(values) {
+      // 表单初始化请求处理
+      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
+      !fullscreenState && _request({}, false, values);
+      return true;
+    },
     onFilter: function onFilter(values) {
       var _actionRef$current6, _actionRef$current6$c;
 
+      // 全屏状态，判断全屏表单onFilter是否禁用
+      if (fullscreenState && !filterEnableRef.current.fullscreen) {
+        filterEnableRef.current.fullscreen = true;
+        return;
+      } // 非全屏状态，判断普通表单onFiler是否禁用
+
+
+      if (!fullscreenState && !filterEnableRef.current.normal) {
+        filterEnableRef.current.normal = true;
+        return;
+      }
+
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values)); // 搜索变化时，暂时先清空选择
 
       (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
       setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
-    onReset: function onReset() {
-      var _dataFilterForm5;
+    onReset: function onReset(values) {
+      var _dataFilterFormRef$cu3;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      (_dataFilterForm5 = dataFilterForm) === null || _dataFilterForm5 === void 0 ? void 0 : _dataFilterForm5.reset();
+      (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      _request(_defineProperty({}, targetPageKey, 1), false, values);
     }
   });
 

package/lib/table/typing.d.ts

@@ -190,8 +190,11 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 用于在 mount 的时候获取到表单 ref */
+    dataFilterFormRef?: React.MutableRefObject<FormType>;
     normalDataFilterForm?: FormType;
     fullscreenDataFilterForm?: FormType;
+    filterEnableRef?: any;
     /** 表格当前的数据 */
     data?: any[];
 } & ProTableActionTypeMutations;

package/lib/table/utils/columnRender.js

@@ -239,7 +239,7 @@ var processRenderFunction = function processRenderFunction() {
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
   // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
-  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick'];
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick', 'extra', 'prefixExtra'];
   return Object.fromEntries(Object.entries(render).map(function (_ref3) {
     var _ref4 = _slicedToArray(_ref3, 2),
         k = _ref4[0],

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;