From 16ec4f78d13c3692382200d27344d7e333a005af Mon Sep 17 00:00:00 2001 From: Treecat Date: Thu, 20 Oct 2022 14:24:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=97=A0jira=20fix:=20=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=B8=8Bbutton=E7=9A=84=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/buttons/button.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 25296c846..a8da2e32b 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -76,12 +76,10 @@ var hasBorder = false if (BI.isNumber(o.height)) { if (!isVertical(o.iconPosition)) { - if (o.clear || o.block || o.light) { - lineHeight = o.height; - } else { + if (!(o.clear && o.block && o.light)) { hasBorder = true; - lineHeight = o.height; } + lineHeight = o.height; } else { lineHeight = textHeight; } From 045a2b6521b2eccf1ced8e2281ff8969de27aa7c Mon Sep 17 00:00:00 2001 From: data Date: Thu, 20 Oct 2022 18:44:45 +0800 Subject: [PATCH 2/7] auto upgrade version to 2.0.20221020184420 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c550f66c6..5ff7391ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221020141659", + "version": "2.0.20221020184420", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 2d549c3422fd97f1aedfd02e674e2d744f170e7c Mon Sep 17 00:00:00 2001 From: data Date: Fri, 21 Oct 2022 12:04:51 +0800 Subject: [PATCH 3/7] auto upgrade version to 2.0.20221021120445 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ff7391ba..72375009b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221020184420", + "version": "2.0.20221021120445", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 6507dd2d34f95103cecf82d3cdf5b6adb0f2aed7 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 21 Oct 2022 13:08:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96useContex?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/constant/var.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/constant/var.js b/src/core/constant/var.js index fc89511f5..cad439772 100644 --- a/src/core/constant/var.js +++ b/src/core/constant/var.js @@ -19,8 +19,8 @@ BI._.extend(BI, { if (!BI.isNumber(pix)) { return pix; } - if (BI.pixUnit === "px" && BI.pixRatio === 1) { - return (pix - (border || 0)) / BI.pixRatio + BI.pixUnit; + if (BI.pixUnit === "px") { + return (pix - (border || 0)) / BI.pixRatio; } var length = pix / BI.pixRatio + BI.pixUnit; if (border > 0) { From 8398fae0317d4985c4c82bc0188438c788629ece Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 21 Oct 2022 13:32:40 +0800 Subject: [PATCH 5/7] =?UTF-8?q?KERNEL-13158:=20=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/constant/var.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/constant/var.js b/src/core/constant/var.js index cad439772..fc89511f5 100644 --- a/src/core/constant/var.js +++ b/src/core/constant/var.js @@ -19,8 +19,8 @@ BI._.extend(BI, { if (!BI.isNumber(pix)) { return pix; } - if (BI.pixUnit === "px") { - return (pix - (border || 0)) / BI.pixRatio; + if (BI.pixUnit === "px" && BI.pixRatio === 1) { + return (pix - (border || 0)) / BI.pixRatio + BI.pixUnit; } var length = pix / BI.pixRatio + BI.pixUnit; if (border > 0) { From 70571d7c64e394d7ce90e0c97a96f9b7ad66bdcc Mon Sep 17 00:00:00 2001 From: data Date: Fri, 21 Oct 2022 13:34:50 +0800 Subject: [PATCH 6/7] auto upgrade version to 2.0.20221021133442 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72375009b..b78c14202 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221021120445", + "version": "2.0.20221021133442", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 89ca5b379331e68af8356a6ef603764ec493bf87 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 21 Oct 2022 13:54:30 +0800 Subject: [PATCH 7/7] auto upgrade version to 2.0.20221021135419 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b78c14202..3e7accb86 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221021133442", + "version": "2.0.20221021135419", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",