From ac092e877ea558592e73074a444383e24db25700 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 10 Jul 2018 10:07:26 +0800
Subject: [PATCH] [bugfix] Area: fix test cases (#1451)

---
 .../test/__snapshots__/index.spec.js.snap     | 22 +++++++++----------
 packages/picker/PickerColumn.vue              |  6 ++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/area/test/__snapshots__/index.spec.js.snap b/packages/area/test/__snapshots__/index.spec.js.snap
index 7b122b0a8..339086e26 100644
--- a/packages/area/test/__snapshots__/index.spec.js.snap
+++ b/packages/area/test/__snapshots__/index.spec.js.snap
@@ -98,19 +98,19 @@ exports[`reset method 1`] = `
   <div class="van-picker__columns" style="height: 220px;">
     <div class="van-picker-column" style="height: 220px;">
       <ul style="line-height: 44px;">
-        <li class="van-ellipsis van-picker-column__item">北京市</li>
-        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">天津市</li>
+        <li class="van-ellipsis van-picker-column__item" style="height: 44px;">北京市</li>
+        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">天津市</li>
       </ul>
     </div>
     <div class="van-picker-column" style="height: 220px;">
       <ul style="line-height: 44px;">
-        <li class="van-ellipsis van-picker-column__item">天津市</li>
-        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">县</li>
+        <li class="van-ellipsis van-picker-column__item" style="height: 44px;">天津市</li>
+        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">县</li>
       </ul>
     </div>
     <div class="van-picker-column" style="height: 220px;">
       <ul style="line-height: 44px;">
-        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">蓟县</li>
+        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">蓟县</li>
       </ul>
     </div>
     <div class="van-hairline--top-bottom van-picker__frame" style="height: 44px;"></div>
@@ -129,20 +129,20 @@ exports[`reset method 2`] = `
   <div class="van-picker__columns" style="height: 220px;">
     <div class="van-picker-column" style="height: 220px;">
       <ul style="line-height: 44px;">
-        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">北京市</li>
-        <li class="van-ellipsis van-picker-column__item">天津市</li>
+        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">北京市</li>
+        <li class="van-ellipsis van-picker-column__item" style="height: 44px;">天津市</li>
       </ul>
     </div>
     <div class="van-picker-column" style="height: 220px;">
       <ul style="line-height: 44px;">
-        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">北京市</li>
-        <li class="van-ellipsis van-picker-column__item">县</li>
+        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">北京市</li>
+        <li class="van-ellipsis van-picker-column__item" style="height: 44px;">县</li>
       </ul>
     </div>
     <div class="van-picker-column" style="height: 220px;">
       <ul style="line-height: 44px;">
-        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">东城区</li>
-        <li class="van-ellipsis van-picker-column__item">西城区</li>
+        <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">东城区</li>
+        <li class="van-ellipsis van-picker-column__item" style="height: 44px;">西城区</li>
       </ul>
     </div>
     <div class="van-hairline--top-bottom van-picker__frame" style="height: 44px;"></div>
diff --git a/packages/picker/PickerColumn.vue b/packages/picker/PickerColumn.vue
index 570ae34e0..7c9ca2784 100644
--- a/packages/picker/PickerColumn.vue
+++ b/packages/picker/PickerColumn.vue
@@ -11,15 +11,14 @@
     <ul :style="wrapperStyle">
       <li
         v-for="(option, index) in options"
-        :key="index"
         v-html="getOptionText(option)"
+        :style="optionStyle"
         class="van-ellipsis"
         :class="b('item', {
           disabled: isDisabled(option),
           selected: index === currentIndex
         })"
         @click="setIndex(index, true)"
-        :style="itemStyle"
       />
     </ul>
   </div>
@@ -99,7 +98,8 @@ export default create({
         lineHeight: this.itemHeight + 'px'
       };
     },
-    itemStyle() {
+
+    optionStyle() {
       return {
         height: this.itemHeight + 'px'
       };