From 1d3ecc58206c794863da36b567b490d6520c942f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=95?=
 <Leopoldthecoder@users.noreply.github.com>
Date: Wed, 16 May 2018 13:18:02 +0800
Subject: [PATCH] Cascader: fix disabled items in filtered results (#11185)

---
 packages/cascader/src/main.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/cascader/src/main.vue b/packages/cascader/src/main.vue
index b861cd2ae..402569712 100644
--- a/packages/cascader/src/main.vue
+++ b/packages/cascader/src/main.vue
@@ -192,6 +192,9 @@ export default {
     childrenKey() {
       return this.props.children || 'children';
     },
+    disabledKey() {
+      return this.props.disabled || 'disabled';
+    },
     currentLabels() {
       let options = this.options;
       let labels = [];
@@ -332,7 +335,8 @@ export default {
           return {
             __IS__FLAT__OPTIONS: true,
             value: optionStack.map(item => item[this.valueKey]),
-            label: this.renderFilteredOptionLabel(value, optionStack)
+            label: this.renderFilteredOptionLabel(value, optionStack),
+            disabled: optionStack.some(item => item[this.disabledKey])
           };
         });
       } else {