From 2c47a3443b8cd4ccea0eaa1363578c92c0525362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Tue, 4 Jul 2017 19:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=9D=A1=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Edirection=E5=92=8CactiveColor=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=AB=96=E7=9A=84?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=9D=A1=20(#49)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/examples-docs/steps.md     |  25 ++++
 packages/steps/src/step.vue     |  21 +++-
 packages/steps/src/steps.vue    |  22 +++-
 packages/vant-css/src/steps.css | 214 +++++++++++++++++++++-----------
 test/unit/specs/steps.spec.js   |  13 ++
 5 files changed, 213 insertions(+), 82 deletions(-)

diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md
index eebe46708..6fa81f664 100644
--- a/docs/examples-docs/steps.md
+++ b/docs/examples-docs/steps.md
@@ -111,6 +111,29 @@ export default {
 ```
 :::
 
+#### 竖式步骤条
+
+可以通过设置`direction`属性来改变步骤条的显示方式，可选值有`vertical/horizontal`。
+
+:::demo 只显示步骤条
+```html
+<van-steps direction="vertical" :active="0" active-color="#f60">
+  <van-step>
+    <h3>【城市】最新的物流状态之类的表述哈哈哈哈</h3>
+    <p>2016-07-12 12:12:12</p>
+  </van-step>
+  <van-step>
+    <h3>【城市】已经过了的物流状态我是折行我是折行我是折行联系电话：158630099999</h3>
+    <p>2016-07-12 12:12:12</p>
+  </van-step>
+  <van-step>
+    <h3>未发货</h3>
+    <p>2016-07-12 12:12:12</p>
+  </van-step>
+</van-steps>
+```
+:::
+
 ### 高级用法
 
 可以使用具名`slot`增加自定义内容，其中包含`icon`和`message-extra`。
@@ -137,6 +160,8 @@ export default {
 | iconClass | 当前步骤栏为icon添加的类 | `string`  |          |          |
 | title | 当前步骤从标题 | `string`  |          |          |
 | description | 当前步骤描述 | `string`  |          |          |
+| direction | 	显示方向 | `string`  |   `horizontal`       |      `vertical/horizontal`    |
+| activeColor | 	`active`状态时的颜色 | `string`  |   `#06bf04`       |        |
 
 ### Steps Slot
 
diff --git a/packages/steps/src/step.vue b/packages/steps/src/step.vue
index 5dd205e3d..39c800014 100644
--- a/packages/steps/src/step.vue
+++ b/packages/steps/src/step.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="van-step" :class="statusClass">
+  <div class="van-step" :class="stepClass">
     <div class="van-step__circle-container">
       <i class="van-step__circle" v-if="status !== 'process'"></i>
-      <i class="van-icon van-icon-checked" v-else></i>
+      <i class="van-icon van-icon-checked" :style="{ color: $parent.activeColor }" v-else></i>
     </div>
-    <p class="van-step__title">
+    <div class="van-step__title" :style="titleStyle">
       <slot></slot>
-    </p>
+    </div>
     <div class="van-step__line"></div>
   </div>
 </template>
@@ -30,9 +30,18 @@ export default {
         return 'process';
       }
     },
-    statusClass() {
+    stepClass() {
       const status = this.status;
-      return status ? 'van-step--' + status : '';
+      const statusClass = status ? 'van-step--' + status : '';
+      const directionClass = `van-step--${this.$parent.direction}`;
+      return [directionClass, statusClass];
+    },
+    titleStyle() {
+      if (this.status === 'process') {
+        return {
+          color: this.$parent.activeColor
+        };
+      }
     }
   }
 };
diff --git a/packages/steps/src/steps.vue b/packages/steps/src/steps.vue
index 2fd212148..bfca083fa 100644
--- a/packages/steps/src/steps.vue
+++ b/packages/steps/src/steps.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="van-steps" :class="`van-steps--${steps.length}`">
+  <div class="van-steps" :class="stepsClass">
     <div class="van-steps__status" v-if="title || description">
       <div class="van-steps__icon" v-if="icon || $slots.icon">
         <slot name="icon">
@@ -41,13 +41,31 @@ export default {
       default: ''
     },
     title: String,
-    description: String
+    description: String,
+    direction: {
+      type: String,
+      default: 'horizontal'
+    },
+    activeColor: {
+      type: String,
+      default: '#06bf04'
+    }
   },
 
   data() {
     return {
       steps: []
     };
+  },
+
+  computed: {
+    stepsClass() {
+      const direction = this.direction;
+      const lengthClass = `van-steps--${this.steps.length}`;
+      const directionClass = `van-steps--${direction}`;
+
+      return direction === 'horizontal' ? [lengthClass, directionClass] : [directionClass];
+    }
   }
 };
 </script>
diff --git a/packages/vant-css/src/steps.css b/packages/vant-css/src/steps.css
index f2b16ba8f..f5f25eddd 100644
--- a/packages/vant-css/src/steps.css
+++ b/packages/vant-css/src/steps.css
@@ -1,13 +1,32 @@
 @import './common/var.css';
 @import './mixins/ellipsis.css';
 @import './icon.css';
+@import './mixins/border_retina.css';
 
 @component-namespace van {
   @b steps {
     overflow: hidden;
-    padding: 0 10px;
     background-color: #fff;
 
+    @m horizontal {
+      padding: 0 10px;
+
+      .van-steps__items {
+        margin: 0 0 10px;
+        overflow: hidden;
+        position: relative;
+        padding-bottom: 22px;
+
+        &.van-steps__items--alone {
+          padding-top: 10px;
+        }
+      }
+    }
+
+    @m vertical {
+      padding: 0 0 0 35px;
+    }
+
     @m 4 {
       .van-step {
         width: 33.2%;
@@ -53,86 +72,94 @@
       max-height: 18px;
       @mixin multi-ellipsis 1;
     }
-
-    @e items {
-      margin: 0 0 10px;
-      overflow: hidden;
-      position: relative;
-      padding-bottom: 20px;
-
-      @m alone {
-        padding-top: 10px;
-      }
-    }
   }
 
   @b step {
     font-size: 14px;
-    float: left;
     position: relative;
     color: $c-gray-dark;
+    
+    @m horizontal {
+      float: left;
 
-    @m finish {
-      color: $c-black;
-
-      .van-step__circle,
-      .van-step__line {
-        background-color: $c-green;
+      &:first-child {
+        .van-step__title {
+          transform: none;
+          margin-left: 0;
+        }
       }
-    }
 
-    @m process {
-      color: $c-black;
+      &:last-child {
+        position: absolute;
+        right: 10px;
+        width: auto;
+
+        .van-step__title {
+          transform: none;
+          margin-left: 0;
+        }
+
+        .van-step__circle-container {
+          left: auto;
+          right: -9px;
+        }
+
+        .van-step__line {
+          width: 0;
+        }
+      }
 
       .van-step__circle-container {
-        top: 24px;
+        position: absolute;
+        top: 28px;
+        left: -8px;
+        padding: 0 8px;
+        background-color: #fff;
+        z-index: 1;
       }
 
-      .van-icon {
+      .van-step__title {
         font-size: 12px;
-        color: $c-green;
-        line-height: 1;
-        display: block;
-      }
-    }
-
-    &:first-child {
-      .van-step__title {
-        transform: none;
-        margin-left: 0;
-      }
-    }
-
-    &:last-child {
-      position: absolute;
-      right: 10px;
-      width: auto;
-
-      .van-step__title {
-        transform: none;
-        margin-left: 0;
-      }
-
-      .van-step__circle-container {
-        left: auto;
-        right: -9px;
+        transform: translate3d(-50%, 0, 0);
+        display: inline-block;
+        margin-left: 3px;
       }
 
       .van-step__line {
-        width: 0;
+        position: absolute;
+        left: 0px;
+        top: 30px;
+        width: 100%;
+        height: 1px;
+        background-color: $c-gray-light;
+      }
+
+      &.van-step--finish {
+        color: $c-black;
+
+        .van-step__circle,
+        .van-step__line {
+          background-color: $c-green;
+        }
+      }
+
+      &.van-step--process {
+        color: $c-black;
+
+        .van-step__circle-container {
+          top: 24px;
+        }
+
+        .van-icon {
+          font-size: 12px;
+          color: $c-green;
+          line-height: 1;
+          display: block;
+        }
       }
     }
 
-    .van-step__circle-container {
-      position: absolute;
-      top: 28px;
-      left: -8px;
-      padding: 0 8px;
-      background-color: #fff;
-      z-index: 1;
-    }
-
-    @e circle {
+    .van-step__circle {
       display: block;
       width: 5px;
       height: 5px;
@@ -140,20 +167,59 @@
       border-radius: 50%;
     }
 
-    @e title {
-      font-size: 12px;
-      transform: translate3d(-50%, 0, 0);
-      display: inline-block;
-      margin-left: 3px;
-    }
+    @m vertical {
+      float: none;
+      display: block;
+      font-size: 14px;
+      line-height: 18px;
+      padding: 10px 10px 10px 0;
 
-    @e line {
-      position: absolute;
-      left: 0px;
-      top: 30px;
-      width: 100%;
-      height: 1px;
-      background-color: $c-gray-light;
+      &::after {
+        @mixin border-retina (bottom);
+      }
+
+      &:first-child {
+        &::before {
+          content: '';
+          position: absolute;
+          width: 1px;
+          height: 20px;
+          background-color: #fff;
+          top: 0;
+          left: -15px;
+          z-index: 1;
+        }
+      }
+
+      &:last-child::after {
+        display: none;
+      }
+
+      .van-step__circle-container > i {
+        position: absolute;
+        z-index: 2;
+      }
+
+      .van-icon-checked {
+        top: 12px;
+        left: -20px;
+        line-height: 1;
+        font-size: 12px;
+      }
+
+      .van-step__circle {
+        top: 16px;
+        left: -17px;
+      }
+
+      .van-step__line {
+        position: absolute;
+        top: 0;
+        left: -15px;
+        width: 1px;
+        height: 100%;
+        background-color: $c-gray-light;
+      }
     }
   }
 }
diff --git a/test/unit/specs/steps.spec.js b/test/unit/specs/steps.spec.js
index 905971554..9416e8a21 100644
--- a/test/unit/specs/steps.spec.js
+++ b/test/unit/specs/steps.spec.js
@@ -21,8 +21,21 @@ describe('Steps', () => {
 
     const finishStep = wrapper.find('.van-step')[0];
     expect(finishStep.hasClass('van-step--finish')).to.be.true;
+    expect(finishStep.hasClass('van-step--horizontal')).to.be.true;
 
     const proccessStep = wrapper.find('.van-step')[1];
     expect(proccessStep.hasClass('van-step--process')).to.be.true;
   });
+
+  it('create a vertical step', () => {
+    wrapper = mount(Steps, {
+      propsData: {
+        direction: 'vertical'
+      }
+    });
+
+    expect(wrapper.hasClass('van-steps')).to.be.true;
+    expect(wrapper.hasClass('van-steps--vertical')).to.be.true;
+    expect(wrapper.data().steps.length).to.equal(0);
+  });
 });