diff --git a/packages/step/index.js b/packages/step/index.js
index f53a14eab..45929231d 100644
--- a/packages/step/index.js
+++ b/packages/step/index.js
@@ -24,7 +24,7 @@ export default sfc({
render(h) {
const { status } = this;
- const { activeColor, direction } = this.$parent;
+ const { activeIcon, activeColor, direction } = this.$parent;
const titleStyle = status === 'process' && { color: activeColor };
return (
@@ -36,7 +36,7 @@ export default sfc({
{status !== 'process' ? (
) : (
-
2016-07-12 12:40
@@ -58,7 +73,8 @@ export default { | icon-class | Icon class | `String` | - | | title | Title | `String` | - | | description | Description | `String` | - | -| direction | Can be set to `horizontal` `vertical` | `String` | `horizontal` | +| direction | Can be set to `vertical` | `String` | `horizontal` | +| active-icon | Active icon name | `String` | `checked` | | active-color | Active step color | `String` | `#07c160` | ### Steps Slot diff --git a/packages/steps/index.js b/packages/steps/index.js index 48c4dfc0a..0c2e84fed 100644 --- a/packages/steps/index.js +++ b/packages/steps/index.js @@ -18,6 +18,10 @@ export default sfc({ activeColor: { type: String, default: GREEN + }, + activeIcon: { + type: String, + default: 'checked' } }, diff --git a/packages/steps/test/__snapshots__/demo.spec.js.snap b/packages/steps/test/__snapshots__/demo.spec.js.snap index 65551e268..1194cf2e9 100644 --- a/packages/steps/test/__snapshots__/demo.spec.js.snap +++ b/packages/steps/test/__snapshots__/demo.spec.js.snap @@ -29,15 +29,42 @@ exports[`renders demo correctly 1`] = ` +2016-07-12 12:40
2016-07-12 12:40
@@ -55,11 +73,12 @@ export default { | 参数 | 说明 | 类型 | 默认值 | 版本 | |------|------|------|------|------| | active | 当前步骤 | `Number` | 0 | - | -| title | 描述栏标题 | `String` | - | - | -| description | 描述栏文字 | `String` | - | - | -| icon | 描述栏图标 | `String` | - | - | -| icon-class | 图标额外类名 | `String` | - | - | +| title | 顶部描述栏标题 | `String` | - | - | +| description | 顶部描述栏文字 | `String` | - | - | +| icon | 顶部描述栏图标 | `String` | - | - | +| icon-class | 顶部描述栏图标额外类名 | `String` | - | - | | direction | 显示方向,可选值为 `vertical` | `String` | `horizontal` | - | +| active-icon | 激活状态底部图标,可选值见 Icon 组件 | `String` | `checked` | 1.6.9 | | active-color | 激活状态颜色 | `String` | `#07c160` | - | ### Steps Slot