From cadcd91968eeea9f8b90196b5c6adf16b9323cf8 Mon Sep 17 00:00:00 2001 From: thomasyonug <563473579@qq.com> Date: Thu, 2 Mar 2017 21:33:17 +0800 Subject: [PATCH 1/2] cascader:bug fix #3191. when menuIndex = 0 edge case --- packages/cascader/src/menu.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/cascader/src/menu.vue b/packages/cascader/src/menu.vue index ec4e763e4..e00196a4c 100644 --- a/packages/cascader/src/menu.vue +++ b/packages/cascader/src/menu.vue @@ -74,7 +74,11 @@ if (item.__IS__FLAT__OPTIONS) { this.activeValue = item.value; } else { - this.activeValue.splice(menuIndex, this.activeValue.length - 1, item.value); + if (menuIndex) { + this.activeValue.splice(menuIndex, this.activeValue.length - 1, item.value); + } else { + this.activeValue = [item.value]; + } } this.$emit('pick', this.activeValue); }, @@ -168,4 +172,4 @@ ); } }; - \ No newline at end of file + From cbf3a9e1f664577c9ef372b1e6309d97b32f4088 Mon Sep 17 00:00:00 2001 From: thomasyonug <563473579@qq.com> Date: Sun, 5 Mar 2017 22:43:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=B5=8C=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/cascader/src/menu.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/cascader/src/menu.vue b/packages/cascader/src/menu.vue index e00196a4c..8958bf0c6 100644 --- a/packages/cascader/src/menu.vue +++ b/packages/cascader/src/menu.vue @@ -73,12 +73,10 @@ select(item, menuIndex) { if (item.__IS__FLAT__OPTIONS) { this.activeValue = item.value; + } else if (menuIndex) { + this.activeValue.splice(menuIndex, this.activeValue.length - 1, item.value); } else { - if (menuIndex) { - this.activeValue.splice(menuIndex, this.activeValue.length - 1, item.value); - } else { - this.activeValue = [item.value]; - } + this.activeValue = [item.value]; } this.$emit('pick', this.activeValue); },