From 55649319b58e516a2f8af5edeccf79452eff8f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 20 Dec 2018 15:33:57 +0800
Subject: [PATCH] fix #4998 , ref #4472
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

由于 #4472 的 pr，导致了 #5021 和 #4998 的bug
---
 src/components/cascader/caspanel.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 3e5e8f9d..7b5829dd 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -77,14 +77,16 @@
 
                 // return value back recursion  // 向上递归，设置临时选中值（并非真实选中）
                 const backItem = this.getBaseItem(item);
-                // #5021
-                if (this.changeOnSelect) {
-                    this.tmpItem = backItem;
-                    this.emitUpdate([backItem]);
-                } else if (backItem.label !== this.tmpItem.label || backItem.value !== this.tmpItem.value) {
+                // #5021 for this.changeOnSelect，加 if 是因为 #4472
+                if (
+                    this.changeOnSelect ||
+                    (backItem.label !== this.tmpItem.label || backItem.value !== this.tmpItem.value) ||
+                    (backItem.label === this.tmpItem.label && backItem.value === this.tmpItem.value)
+                ) {
                     this.tmpItem = backItem;
                     this.emitUpdate([backItem]);
                 }
+
                 if (item.children && item.children.length){
                     this.sublist = item.children;
                     this.dispatch('Cascader', 'on-result-change', {