diff --git a/docs/markdown/v2-progress-tracking.md b/docs/markdown/v2-progress-tracking.md index 023820c33..931489198 100644 --- a/docs/markdown/v2-progress-tracking.md +++ b/docs/markdown/v2-progress-tracking.md @@ -31,11 +31,13 @@ ### Step -- [ ] 移除 icon 属性 -- [ ] 移除 title 属性 -- [ ] 移除 iconClass 属性 -- [ ] 移除 description 属性 -- [ ] 移除 message-extra 插槽 +- [x] 移除 icon 属性 +- [x] 移除 title 属性 +- [x] 移除 iconClass 属性 +- [x] 移除 description 属性 +- [x] 移除 message-extra 插槽 + +改动原因:步骤条顶部内容的通用性较低,不适合在组件内实现 ### Badge diff --git a/packages/steps/index.js b/packages/steps/index.js index 0c2e84fed..0e23fc694 100644 --- a/packages/steps/index.js +++ b/packages/steps/index.js @@ -1,16 +1,11 @@ import { use } from '../utils'; import { GREEN } from '../utils/color'; -import Icon from '../icon'; const [sfc, bem] = use('steps'); export default sfc({ props: { - icon: String, - title: String, active: Number, - iconClass: String, - description: String, direction: { type: String, default: 'horizontal' @@ -32,29 +27,9 @@ export default sfc({ }, render(h) { - const { icon, title, description, slots } = this; - - const StatusIcon = (slots('icon') || icon) && ( -
{slots('icon') || }
- ); - - const StatusMessage = ( -
-
{title}
-
{description}
-
- ); - return (
- {(title || description) && ( -
- {StatusIcon} - {StatusMessage} - {slots('message-extra')} -
- )} -
{slots()}
+
{this.slots()}
); } diff --git a/packages/steps/index.less b/packages/steps/index.less index 8fd232f17..9351b06f5 100644 --- a/packages/steps/index.less +++ b/packages/steps/index.less @@ -13,40 +13,10 @@ overflow: hidden; position: relative; padding-bottom: 22px; - - &.van-steps__items--alone { - padding-top: 10px; - } } } &--vertical { padding: 0 0 0 35px; } - - &__icon { - float: left; - margin-right: 10px; - } - - .van-icon { - font-size: 40px; - } - - &__message { - height: 40px; - margin: 15px 0; - } - - &__title { - font-size: 14px; - color: @text-color; - padding-top: 4px; - } - - &__desc { - font-size: 12px; - line-height: 1.5; - color: @gray-dark; - } } diff --git a/packages/steps/zh-CN.md b/packages/steps/zh-CN.md index dad4b5fae..153d09ecd 100644 --- a/packages/steps/zh-CN.md +++ b/packages/steps/zh-CN.md @@ -73,7 +73,6 @@ export default { | 参数 | 说明 | 类型 | 默认值 | 版本 | |------|------|------|------|------| | active | 当前步骤 | `Number` | 0 | - | -| title | 顶部描述栏标题 | `String` | - | - | | direction | 显示方向,可选值为 `vertical` | `String` | `horizontal` | - | | active-icon | 激活状态底部图标,可选值见 Icon 组件 | `String` | `checked` | 1.6.9 | | active-color | 激活状态颜色 | `String` | `#07c160` | - |