From af7e7fe9dfe13e20de228c6062e8ff9e86ede345 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Fri, 21 Aug 2020 00:07:15 +0800
Subject: [PATCH] breaking change(Picker): update values param

---
 docs/markdown/migrate-from-v2.zh-CN.md |  4 ++++
 src/picker/demo/index.vue              |  2 --
 src/picker/index.js                    | 22 ++--------------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/docs/markdown/migrate-from-v2.zh-CN.md b/docs/markdown/migrate-from-v2.zh-CN.md
index a774165a6..0b3df3f62 100644
--- a/docs/markdown/migrate-from-v2.zh-CN.md
+++ b/docs/markdown/migrate-from-v2.zh-CN.md
@@ -133,3 +133,7 @@ export default {
   },
 };
 ```
+
+### Picker 参数调整
+
+在 Picker 的级联选择下，confirm/change 事件返回的回调参数将包含为完整的选项对象。
diff --git a/src/picker/demo/index.vue b/src/picker/demo/index.vue
index d4734be36..2f4fb4889 100644
--- a/src/picker/demo/index.vue
+++ b/src/picker/demo/index.vue
@@ -34,8 +34,6 @@
         show-toolbar
         :title="t('title')"
         :columns="t('cascadeColumns')"
-        @cancel="onCancel"
-        @confirm="onConfirm"
       />
     </demo-block>
 
diff --git a/src/picker/index.js b/src/picker/index.js
index 5234906fa..f70aac9f8 100644
--- a/src/picker/index.js
+++ b/src/picker/index.js
@@ -110,16 +110,7 @@ export default createComponent({
       if (this.dataType === 'text') {
         this.$emit(event, this.getColumnValue(0), this.getColumnIndex(0));
       } else {
-        let values = this.getValues();
-
-        // compatible with old version of wrong parameters
-        // should be removed in next major version
-        // see: https://github.com/youzan/vant/issues/5905
-        if (this.dataType === 'cascade') {
-          values = values.map((item) => item[this.valueKey]);
-        }
-
-        this.$emit(event, values, this.getIndexes());
+        this.$emit(event, this.getValues(), this.getIndexes());
       }
     },
 
@@ -151,16 +142,7 @@ export default createComponent({
           this.getColumnIndex(0)
         );
       } else {
-        let values = this.getValues();
-
-        // compatible with old version of wrong parameters
-        // should be removed in next major version
-        // see: https://github.com/youzan/vant/issues/5905
-        if (this.dataType === 'cascade') {
-          values = values.map((item) => item[this.valueKey]);
-        }
-
-        this.$emit('change', this, values, columnIndex);
+        this.$emit('change', this, this.getValues(), columnIndex);
       }
     },