merge: merge master&&rebuild docs

packages/card/src/card.vue

@@ -7,7 +7,7 @@
           <h4 v-text="title" class="zan-card__title"></h4>
         </slot>
         <slot name="desc">
-          <p v-if="desc" v-text="desc" class="zan-card__title"></p>
+          <p v-if="desc" v-text="desc" class="zan-card__desc"></p>
         </slot>
         <slot name="tags"></slot>
       </div>

packages/picker/src/picker-column.vue

@@ -6,7 +6,7 @@
         class="zan-picker-column__item"
         :class="{ 'zan-picker-column__item--selected': item === currentValue }"
         :style="{ height: itemHeight + 'px', lineHeight: itemHeight + 'px' }">
-        {{item}}
+        {{ typeof item === 'object' && item[valueKey] ? item[valueKey] : item }}
       </div>
     </div>
   </div>
@@ -52,7 +52,8 @@ export default {
       type: Number,
       default: DEFAULT_ITEM_HEIGHT
     },
-    value: {}
+    value: {},
+    valueKey: String
   },
 
   data() {

packages/picker/src/picker.vue

@@ -14,7 +14,8 @@
         :class-name="item.className"
         :itemHeight="itemHeight"
         :visible-item-count="visibleItemCount"
-        @change="columnValueChange">
+        :value-key="valueKey"
+        @change="columnValueChange(index)">
       </picker-column>
       <div class="zan-picker-center-highlight" :style="{ height: itemHeight + 'px', marginTop: -itemHeight / 2 + 'px' }"></div>
     </div>
@@ -63,7 +64,8 @@ export default {
     showToolbar: {
       type: Boolean,
       default: false
-    }
+    },
+    valueKey: String
   },
 
   computed: {
@@ -81,16 +83,16 @@ export default {
 
   methods: {
     handlePickerCancel() {
-      this.$emit('cancel');
+      this.$emit('cancel', this.values);
     },
     handlePickerConfirm() {
-      this.$emit('confirm');
+      this.$emit('confirm', this.values);
     },
     /**
      * 处理列`change`事件
      */
-    columnValueChange() {
-      this.$emit('change', this, this.values);
+    columnValueChange(index) {
+      this.$emit('change', this, this.values, index);
     },
 
     /**

packages/zanui-css/src/card.css

@@ -2,7 +2,8 @@
 
 @component-namespace zan {
   @b card {
-    padding: 5px 15px;
+    padding: 5px 15px 5px 115px;
+    height: 90px;
     background: #FAFAFA;
     overflow: hidden;
     position: relative;
@@ -13,15 +14,17 @@
     }
 
     @e img {
-      float: left;
       width: 90px;
       height: 90px;
       border: 0;
+      position: absolute;
+      top: 5px;
+      left: 15px;
     }
 
     @e content {
-      margin-left: 100px;
       display: table;
+      width: 100%;
 
       @when center {
         display: table;
@@ -45,6 +48,7 @@
       color: #333;
       max-height: 40px;
       margin-bottom: 5px;
+      word-break: break-all;
       @mixin multi-ellipsis 2;
     }
 
@@ -52,6 +56,7 @@
       font-size: 12px;
       color: #666;
       max-height: 20px;
+      word-break: break-all;
       @mixin multi-ellipsis 1;
     }