From edf3d7985429c0781ff7cd81204ced69178ba0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=87=E5=88=9A?= <247026287@qq.com>
Date: Wed, 16 Aug 2017 15:44:14 +0800
Subject: [PATCH] =?UTF-8?q?xAddress=EF=BC=9AAdd=20prop:show=20to=20control?=
 =?UTF-8?q?=20visibility=20(#1848)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/x-address/index.vue |  4 +++-
 src/components/x-address/metas.yml | 12 +++++++++++-
 src/demos/XAddress.vue             |  7 +++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/x-address/index.vue b/src/components/x-address/index.vue
index ec8223488..d010b8907 100755
--- a/src/components/x-address/index.vue
+++ b/src/components/x-address/index.vue
@@ -16,6 +16,7 @@
     :cancel-text="cancelText"
     :display-format="displayFormat"
     :popup-style="popupStyle"
+    :show="show"
     @on-shadow-change="onShadowChange">
       <template slot="title" scope="props">
         <slot name="title" :label-class="props.labelClass" :label-style="props.labelStyles" :label-title="props.title">
@@ -63,7 +64,8 @@ export default {
       type: Function,
       default: (val, names) => names
     },
-    popupStyle: Object
+    popupStyle: Object,
+    show: Boolean
   },
   created () {
     if (this.currentValue.length && this.rawValue) {
diff --git a/src/components/x-address/metas.yml b/src/components/x-address/metas.yml
index 29f64b9b0..6a9dd0609 100755
--- a/src/components/x-address/metas.yml
+++ b/src/components/x-address/metas.yml
@@ -107,6 +107,11 @@ props:
     type: Object
     en: popup style
     zh-CN: 弹窗样式，可以用于强制指定 z-index
+  show:
+    version: next
+    type: Boolean
+    en: popup show
+    zh-CN: 显示
 slots:
   title:
     version: v2.3.8
@@ -125,6 +130,11 @@ events:
     en: emits when picker value is changed
     zh-CN: picker 值变化时触发，即滑动 picker 时触发
 changes:
+  next:
+    en:
+      - '[feature] Add prop:show to control visibility'
+    zh-CN:
+      - '[feature] 新增 prop:show 控制是否显示'
   v2.5.6:
     en:
       - '[feature] Support event:on-shadow-change #1778'
@@ -176,4 +186,4 @@ changes:
       - '[fix] fix `label` styles not conform to `group` settings'
     zh-CN:
       - '[feature] 支持`value-text-align` #921 @linhaobin'
-      - '[fix] 修复`label`样式不受控于`group`属性的bug'
\ No newline at end of file
+      - '[fix] 修复`label`样式不受控于`group`属性的bug'
diff --git a/src/demos/XAddress.vue b/src/demos/XAddress.vue
index 7deab1d6e..5f74456a4 100755
--- a/src/demos/XAddress.vue
+++ b/src/demos/XAddress.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <group>
-      <x-address @on-hide="logHide" @on-show="logShow" :title="title" v-model="value" :list="addressData" @on-shadow-change="onShadowChange" placeholder="请选择地址" inline-desc="可以设置placeholder"></x-address>
+      <x-address @on-hide="logHide" @on-show="logShow" :title="title" v-model="value" :list="addressData" @on-shadow-change="onShadowChange" placeholder="请选择地址" inline-desc="可以设置placeholder" :show="showAddress"></x-address>
       <cell title="上面value值" :value="value"></cell>
     </group>
 
@@ -22,6 +22,7 @@
     </group>
     <br/>
     <div style="padding: 0 15px;">
+      <x-button type="primary" @click.native="showAddress=true">显示</x-button>
       <x-button type="primary" @click.native="changeData">改变数据（通过 id）</x-button>
       <x-button type="primary" @click.native="changeDataByLabels">改变数据（通过文字值）</x-button>
       <x-button type="primary" @click.native="changeDataByLabels2">改变数据（两级，通过文字值）</x-button>
@@ -64,7 +65,8 @@ export default {
       value3: ['广东省', '中山市', '--'],
       addressData: ChinaAddressV3Data,
       value4: [],
-      value5: ['广东省', '深圳 市', '南山区']
+      value5: ['广东省', '深圳 市', '南山区'],
+      showAddress: false
     }
   },
   methods: {
@@ -85,6 +87,7 @@ export default {
     },
     logHide (str) {
       console.log('on-hide', str)
+      this.showAddress = false
     },
     logShow (str) {
       console.log('on-show')