From 1b97bea3049d186e87e6da909eb1b5ba09949a0d Mon Sep 17 00:00:00 2001 From: MuttonYung <55025557+MuttonYung@users.noreply.github.com> Date: Wed, 30 Nov 2022 22:00:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20ellipsis=E7=BB=84=E4=BB=B6=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E7=BC=BA=E5=B0=91=E5=B0=8F=E6=95=B0=E8=80=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=83=A8=E5=88=86=E5=AD=97=E5=8F=B7(?= =?UTF-8?q?=E5=A6=822.7rem)=E7=BC=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ellipsis/ellipsis.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 34aa411fff61b546e57c5b78636c6e1384acf44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=9C=94=E5=B0=A7?= Date: Tue, 13 Dec 2022 17:10:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=8E=B0=E5=9C=A8disabled=E7=9A=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=8D=E8=83=BD=E8=A2=AB=E7=88=B6=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E9=80=89=E4=B8=AD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tree/tree.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); }); } },