diff --git a/src/components/ellipsis/ellipsis.vue b/src/components/ellipsis/ellipsis.vue index 85d50f1cb..309afd2e8 100644 --- a/src/components/ellipsis/ellipsis.vue +++ b/src/components/ellipsis/ellipsis.vue @@ -157,7 +157,7 @@ let height = this.height; // 当 height 未定义,且 lines 定义时,计算真实高度,否则使用 this.height if (!height && this.lines) { - const lineHeight = parseInt(getStyle($el, 'lineHeight'), 10); + const lineHeight = parseFloat(getStyle($el, 'lineHeight'), 10); height = lineHeight * this.lines; } diff --git a/src/components/tree/tree.vue b/src/components/tree/tree.vue index 5947e3bd0..882d3ee57 100644 --- a/src/components/tree/tree.vue +++ b/src/components/tree/tree.vue @@ -194,7 +194,10 @@ } if (node[this.childrenKey]) { node[this.childrenKey].forEach(child => { - this.updateTreeDown(child, changes); + if(child.disabled) + this.updateTreeDown(child, {checked: false, indeterminate: false}); + else + this.updateTreeDown(child, changes); }); } },