diff --git a/packages/cascader-panel/src/cascader-node.vue b/packages/cascader-panel/src/cascader-node.vue index 9cbb3b329f..360f588b66 100644 --- a/packages/cascader-panel/src/cascader-node.vue +++ b/packages/cascader-panel/src/cascader-node.vue @@ -205,20 +205,19 @@ const disabled = !checkStrictly && isDisabled; const events = { on: {} }; - if (!isLeaf) { - if (expandTrigger === 'click') { - events.on.click = this.handleExpand; - } else { - events.on.mouseenter = e => { - this.handleExpand(); - this.$emit('expand', e); - }; - events.on.focus = e => { - this.handleExpand(); - this.$emit('expand', e); - }; - } - } else if (!isDisabled && !checkStrictly && !multiple) { + if (expandTrigger === 'click') { + events.on.click = this.handleExpand; + } else { + events.on.mouseenter = e => { + this.handleExpand(); + this.$emit('expand', e); + }; + events.on.focus = e => { + this.handleExpand(); + this.$emit('expand', e); + }; + } + if (isLeaf && !isDisabled && !checkStrictly && !multiple) { events.on.click = this.handleCheckChange; } diff --git a/packages/cascader-panel/src/cascader-panel.vue b/packages/cascader-panel/src/cascader-panel.vue index 1d80416677..53645f2c3a 100644 --- a/packages/cascader-panel/src/cascader-panel.vue +++ b/packages/cascader-panel/src/cascader-panel.vue @@ -2,7 +2,8 @@
@@ -300,6 +301,9 @@ export default { }, watch: { + disabled() { + this.computePresentContent(); + }, value(val) { if (!isEqual(val, this.checkedValue)) { this.checkedValue = val; diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue index fbe9b00ddf..b4b35926c6 100644 --- a/packages/input/src/input.vue +++ b/packages/input/src/input.vue @@ -61,6 +61,7 @@ -
-
+