@teamix/pro 1.2.35 → 1.3.0

package/es/{step → timeline}/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["mode", "items", "shape", "children"];
+var _excluded = ["items", "comment", "shape", "fold", "children"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -11,91 +11,67 @@ 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; }
 
 import React, { useMemo } from 'react';
-import { Step, Timeline } from '@alicloudfe/components';
-import ProStepItem from './ProStepItem';
-
-var ProStep = function ProStep(props) {
-  var mode = props.mode,
-      items = props.items,
+import { Timeline } from '@alicloudfe/components';
+import ProTimeLineItem from './ProTimeLineItem';
+import { baseClass } from '@teamix/utils';
+import classNames from 'classnames';
+import './index.scss';
+var cls = baseClass('teamix-pro-timeline');
+
+var ProTimeline = function ProTimeline(props) {
+  var items = props.items,
+      comment = props.comment,
       shape = props.shape,
+      fold = props.fold,
       children = props.children,
-      others = _objectWithoutProperties(props, _excluded);
+      others = _objectWithoutProperties(props, _excluded); // 判断渲染组件是不是 ProTimelineItem, 并返回筛选后的children
 
-  var current = props.current,
-      labelPlacement = props.labelPlacement,
-      readOnly = props.readOnly,
-      animation = props.animation,
-      size = props.size;
-  var fold = props.fold; // 判断渲染组件是不是 ProStepItem, 并返回筛选后的children
 
   var renderChildren = useMemo(function () {
-    return React.Children.map(children, function (child, index) {
+    return React.Children.map(children, function (child) {
       var childElement = child;
       var displayName = childElement.type.displayName;
 
-      if (displayName === 'ProStepItem') {
+      if (displayName === 'ProTimeLineItem') {
         return /*#__PURE__*/React.cloneElement(childElement, {
-          _size: size,
-          _mode: mode,
-          _index: index,
-          _current: current,
-          _shape: shape
+          _shape: shape,
+          _comment: comment
         });
-      } // 如果不是 ProStepItem
+      }
 
-
-      console.error('Warning: ProStep has a child which is not a ProStepItem component');
+      console.error('Warning: ProTimeline has a child which is not a ProTimelineItem component');
     });
-  }, [children]); // 设置circle, 覆盖 dot 阻止重新渲染节点样式
-
-  var shapeMap = function shapeMap() {
-    if (shape === 'arrow') return 'arrow';
-    return 'circle';
-  }; // 渲染 ProStepItem
-
+  }, [children]);
 
   var renderItem = function renderItem() {
     // 传递了 item 采用 item 渲染数组的方式
     if (items) {
       return items.map(function (item, index) {
-        return /*#__PURE__*/React.createElement(ProStepItem, _objectSpread({
+        return /*#__PURE__*/React.createElement(ProTimeLineItem, _objectSpread({
           key: index,
-          _mode: mode,
           _shape: shape,
-          _index: index,
-          _current: current,
-          _size: size
+          _comment: comment
         }, item));
       });
     } else {
       return renderChildren;
     }
-  }; // 渲染 ProStep
-
+  }; // 渲染 ProTimelineItem
 
-  var renderProStep = function renderProStep() {
-    if (mode === 'ver') {
-      return /*#__PURE__*/React.createElement(Timeline, _objectSpread({
-        fold: fold
-      }, others), renderItem());
-    }
 
-    return /*#__PURE__*/React.createElement(Step, _objectSpread({
-      current: current,
-      shape: shapeMap(),
-      labelPlacement: labelPlacement,
-      readOnly: readOnly,
-      animation: animation
+  var renderProTimeline = function renderProTimeline() {
+    return /*#__PURE__*/React.createElement(Timeline, _objectSpread({
+      fold: fold
     }, others), renderItem());
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "teamix-pro-step"
-  }, renderProStep());
+    className: classNames(cls({
+      '': true,
+      comment: comment
+    }))
+  }, renderProTimeline());
 };
 
-ProStep.Item = ProStepItem;
-ProStep.defaultProps = {
-  mode: 'hoz'
-};
-export { ProStep, ProStepItem };
+ProTimeline.Item = ProTimeLineItem;
+export { ProTimeline, ProTimeLineItem };

package/es/timeline/index.scss

@@ -0,0 +1,7 @@
+.teamix-pro-timeline{
+    &-comment {
+        .next-timeline-item-done .next-timeline-item-timeline{
+            height: 0;
+        }
+    }
+}

package/es/timeline/typing.d.ts

@@ -0,0 +1,101 @@
+import { ReactNode } from 'react';
+import { ProTagItem } from '@teamix/utils';
+export declare type ProTimeLineItemStatus = 'success' | 'fail' | 'process' | 'warning' | 'wait';
+export declare type FoldProps = {
+    /**
+     * 折叠区域
+     */
+    foldArea: [number, number];
+    /**
+     * 是否展示折叠图标
+     */
+    foldShow: boolean;
+};
+export declare type ProTimeLineProps = {
+    /**
+     * 时间线：节点展示类型
+     */
+    shape?: 'circle' | 'dot';
+    /**
+     * 内部渲染自组件
+     */
+    items?: ProTimeLineItemProps[];
+    /**
+     * 时间线: 自定义折叠选项
+     */
+    fold?: FoldProps[];
+    /**
+     * 是否为评论型 timeline
+     */
+    comment?: boolean;
+};
+export declare type ProTimeLineItemProps = {
+    /**
+     * 是否为评论型 timeline
+     */
+    _comment?: boolean;
+    /**
+     * 时间线：节点展示类型
+     */
+    _shape?: 'circle' | 'dot';
+    /**
+     * 节点状态
+     */
+    status?: string | ProTimeLineItemStatus;
+    /**
+     * 图标
+     */
+    icon?: string;
+    /**
+     * 节点的内容
+     */
+    content?: ReactNode;
+    /**
+     * 节点标题
+     */
+    title?: ReactNode;
+    /**
+     * 自定义渲染
+     */
+    dotRender?: (index?: number, status?: string) => ReactNode;
+    /**
+     * 节点副标题
+     */
+    subTitle?: ReactNode;
+    /**
+     * 节点对应描述
+     */
+    discription?: ReactNode;
+    /**
+     * 节点的标签
+     */
+    tags?: ProTagItem[] | ReactNode;
+    /**
+     * 左侧展示时间
+     */
+    timeLeft?: ReactNode;
+    /**
+     * 头像
+     */
+    image?: string | ReactNode;
+    /**
+     * animation 动画
+     */
+    animation?: boolean;
+    /**
+     * 卡片是否可折叠
+     */
+    collapsible?: boolean;
+    /**
+     * 默认是否折叠，用于非受控模式
+     */
+    defaultCollapsed?: boolean;
+    /**
+     * 是否折叠，受控模式
+     */
+    collapsed?: boolean;
+    /**
+     * 折叠状态改变的回调函数
+     */
+    onCollapse?: (collapsed: boolean) => void;
+};

package/lib/form/Filter/AdvancedFilter.js

@@ -17,7 +17,7 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 
 var _utils2 = require("../utils");
 
-var _excluded = ["schema", "onSubmit", "onReset", "onResetClick", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"];
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "forceClear"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -54,12 +54,12 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var schema = props.schema,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
-      onResetClick = props.onResetClick,
       layout = props.layout,
       labelAlign = props.labelAlign,
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
       wrapperCol = props.wrapperCol,
+      forceClear = props.forceClear,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = (0, _utils.usePrefixCls)('', {
@@ -90,7 +90,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
-              onClick: onResetClick,
+              forceClear: !!forceClear,
               children: (0, _utils.getMessage)('reset')
             }
           }, {
@@ -105,7 +105,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }]
       }])
     }];
-  }, [schema, onReset, onResetClick]);
+  }, [schema, onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return {
       breakpoints: [990],

package/lib/form/Filter/LightFilter.js

@@ -11,13 +11,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _reactive = require("@formily/reactive");
-
 var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -46,24 +44,32 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var filterValue = (0, _react.useRef)(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-light'
-  }); // input类组件的按钮
-
-  var onBtnClick = (0, _react.useCallback)(function () {
-    onChange && onChange((0, _reactive.toJS)(form.values));
-  }, [form]); // 筛选提交切换
+  });
+  (0, _react.useEffect)(function () {
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = filterValue.current;
+    }
+  }, []); // 筛选提交切换
 
   var onFilterChange = (0, _react.useCallback)(function (value) {
     filterValue.current = value;
-  }, [form]); // onChange
 
-  var onCurrentChange = (0, _react.useCallback)(function (values) {
-    onChange && onChange(_defineProperty({}, filterValue.current, values[filterValue.current]));
-  }, [onChange, filterValue.current]);
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = value;
+    }
+  }, [form]); // 实际输出onFilter
+
+  var onFilter = (0, _react.useCallback)(function () {
+    var key = filterValue.current;
+    var value = form.values[key];
+    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value));
+  }, [onChange]);
   var LightSchema = (0, _react.useMemo)(function () {
     return [{
       component: 'LightFilter',
@@ -71,7 +77,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         defaultFilterValue: defaultFilterValue,
         onFilterChange: onFilterChange,
         buttonProps: {
-          onClick: onBtnClick
+          onClick: onFilter
         }
       },
       children: schema
@@ -83,7 +89,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }
       }
     }];
-  }, [schema, onBtnClick, onFilterChange, defaultFilterValue]);
+  }, [schema, onFilter, onFilterChange, defaultFilterValue]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
     className: (0, _classnames.default)(prefixCls, props.className),
@@ -92,7 +98,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     breakpoints: [],
     bordered: false,
     onSubmit: onSubmit,
-    onChange: onCurrentChange
+    onChange: onFilter
   }));
 });
 var _default = LightFilter;