From e871a76c97f1692cdcf5bf450896e7c0ae7b9257 Mon Sep 17 00:00:00 2001
From: airyland <airyland@qq.com>
Date: Thu, 16 Feb 2017 14:32:15 +0800
Subject: [PATCH] popup-picker: Fix on-change event. Close #934. v2.1.0-rc.50

---
 package.json                          | 2 +-
 src/components/popup-picker/index.vue | 3 ++-
 src/components/popup-picker/metas.yml | 4 ++++
 src/components/swipeout/metas.yml     | 5 +++++
 src/demos/PopupPicker.vue             | 5 ++++-
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 src/components/swipeout/metas.yml

diff --git a/package.json b/package.json
index c66759ab7..cfcfa73cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vux",
-  "version": "2.1.0-rc.49",
+  "version": "2.1.0-rc.50",
   "main": "index.js",
   "description": "Mobile web UI based on Vue and WeUI",
   "keywords": [
diff --git a/src/components/popup-picker/index.vue b/src/components/popup-picker/index.vue
index 2c4e97c84..3efaf73ca 100755
--- a/src/components/popup-picker/index.vue
+++ b/src/components/popup-picker/index.vue
@@ -166,7 +166,8 @@ export default {
       }
     },
     currentValue (val) {
-      this.$emit('input', val)
+      this.$emit('on-change', getObject(val))
+      this.$emit('input', getObject(val))
     },
     show (val) {
       this.showValue = val
diff --git a/src/components/popup-picker/metas.yml b/src/components/popup-picker/metas.yml
index 51b2f4c11..ea6da943f 100644
--- a/src/components/popup-picker/metas.yml
+++ b/src/components/popup-picker/metas.yml
@@ -43,3 +43,7 @@ events:
   on-hide:
     params: '`(closeType)` true表示confirm(选择确认), false表示其他情况的关闭'
     zh-CN: 弹窗关闭时触发
+changes:
+  v2.1.0-rc.50:
+    zh-CN:
+      - '[fix] 修复`on-change`事件没有触发 #934 @howyhuang'
\ No newline at end of file
diff --git a/src/components/swipeout/metas.yml b/src/components/swipeout/metas.yml
new file mode 100644
index 000000000..70afb4890
--- /dev/null
+++ b/src/components/swipeout/metas.yml
@@ -0,0 +1,5 @@
+icon: '&#xe641;'
+changes:
+  v2.1.0-rc.50:
+    zh-CN:
+      - '[feature] `swipeout`组件`beta`版本'
\ No newline at end of file
diff --git a/src/demos/PopupPicker.vue b/src/demos/PopupPicker.vue
index e12bd2b78..9d914086f 100755
--- a/src/demos/PopupPicker.vue
+++ b/src/demos/PopupPicker.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <group title="single column">
-      <popup-picker :title="title1" :data="list1" v-model="value1" @on-show="onShow" @on-hide="onHide"></popup-picker>
+      <popup-picker :title="title1" :data="list1" v-model="value1" @on-show="onShow" @on-hide="onHide" @on-change="onChange"></popup-picker>
     </group>
     <br>
     <div class="picker-buttons">
@@ -58,6 +58,9 @@ export default {
     XSwitch
   },
   methods: {
+    onChange (val) {
+      console.log('val change', val)
+    },
     changeList10 () {
       this.list1 = [['小米1', 'iPhone1', '华为1', '情怀1', '三星1', '其他1', '不告诉你1']]
     },