From 21e28b4c52ed7c0c33ba1347e5f3c3b6565b0a70 Mon Sep 17 00:00:00 2001
From: airyland <airyland@qq.com>
Date: Sat, 7 Apr 2018 18:43:30 +0800
Subject: [PATCH] popup-picker: add prop:disabled #2594

---
 src/components/popup-picker/index.vue |  9 ++++++---
 src/components/popup-picker/metas.yml | 11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/popup-picker/index.vue b/src/components/popup-picker/index.vue
index 5dc05fbff..ead0757eb 100755
--- a/src/components/popup-picker/index.vue
+++ b/src/components/popup-picker/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="vux-cell-box">
-    <div class="weui-cell vux-tap-active weui-cell_access" @click="onClick" v-show="showCell">
+    <div class="weui-cell vux-tap-active" :class="{'weui-cell_access': !disabled}" @click="onClick" v-show="showCell">
       <div class="weui-cell__hd">
         <slot name="title" label-class="weui-label" :label-style="labelStyles" :label-title="title">
           <label class="weui-label" :class="labelClass" :style="labelStyles" v-if="title" v-html="title"></label>
@@ -141,7 +141,8 @@ export default {
     },
     columnWidth: Array,
     popupStyle: Object,
-    popupTitle: String
+    popupTitle: String,
+    disabled: Boolean
   },
   computed: {
     labelStyles () {
@@ -164,7 +165,9 @@ export default {
       return value2name(this.currentValue, this.data)
     },
     onClick () {
-      this.showValue = true
+      if (!this.disabled) {
+        this.showValue = true
+      }
     },
     onHide (type) {
       this.showValue = false
diff --git a/src/components/popup-picker/metas.yml b/src/components/popup-picker/metas.yml
index df4a363ee..7a2801615 100644
--- a/src/components/popup-picker/metas.yml
+++ b/src/components/popup-picker/metas.yml
@@ -67,6 +67,12 @@ props:
     type: String
     en: popup title
     zh-CN: 弹窗标题
+  disabled:
+    version: next
+    type: Boolean
+    default: false
+    en: whether disable selecting
+    zh-CN: 是否禁用选择
 slots:
   title:
     version: v2.3.7
@@ -90,6 +96,11 @@ events:
     en: emits when picker value is changed
     zh-CN: picker 值变化时触发，即滑动 picker 时触发
 changes:
+  next:
+    en:
+      - '[feature] add prop:disabled #2594'
+    zh-CN:
+      - '[feature] 支持属性 disabled #2594'
   v2.7.7:
     en:
       - '[fix] remove the first top line #2371'