From dd64fccef8b2e5f12996ee2742bfca3d80354d73 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 28 Feb 2022 14:23:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?KERNEL-9882=20popover=E7=9A=84gap=20&&=20to?= =?UTF-8?q?ast=E6=88=90=E5=8A=9F=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi.lessconfig.json | 1 + src/base/layer/layer.popover.js | 11 +++++------ src/less/resource/font.less | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bi.lessconfig.json b/bi.lessconfig.json index e1e853591..1a367603b 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -18,6 +18,7 @@ "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA", "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479", "@color-bi-background-tooltip-success": "#2E3A4D", + "@color-bi-text-header-background": "f2f4f7", "@color-bi-border-tooltip-success": "#2E3A4D", "@color-bi-background-toast-success": "#FFFFFF", "@color-bi-background-toast-warning": "#FFFFFF", diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index 9109a9a4e..bce738ef3 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -27,7 +27,7 @@ BI.Popover = BI.inherit(BI.Widget, { footerHeight: 44, closable: true, // BI-40839 是否显示右上角的关闭按钮 bodyHgap: BI.SIZE_CONSANTS.H_GAP_SIZE, - bodyTgap: 10 + bodyTgap: BI.SIZE_CONSANTS.V_GAP_SIZE }; }, @@ -109,10 +109,10 @@ BI.Popover = BI.inherit(BI.Widget, { }, items: [{ el: o.body - }] - }, - hgap: o.bodyHgap, - tgap: o.bodyTgap + }], + hgap: o.bodyHgap, + tgap: o.bodyTgap + } } : { el: { type: "bi.absolute", @@ -143,7 +143,6 @@ BI.Popover = BI.inherit(BI.Widget, { } return BI.extend({ - type: o.logic.dynamic ? "bi.vertical" : "bi.vtape", items: items, width: this._getSuitableWidth(size.width) }, o.logic.dynamic ? { diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 6c7b3994d..7e7e4e91c 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -83,7 +83,7 @@ //toast .font(toast-error-font, @font-tip-error, @color-bi-color-toast-error); -.font(toast-success-font, @font-tip-success, @color-bi-color-toast-error); +.font(toast-success-font, @font-tip-success, @color-bi-color-toast-success); .font(toast-warning-font, @font-tip-warning, @color-bi-color-toast-warning); .font(toast-message-font, @font-tip-message, @color-bi-color-toast-normal); From 5af6f0de7c98d818ede8a1a6b10bcb38e0d83a34 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 28 Feb 2022 15:08:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi.lessconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bi.lessconfig.json b/bi.lessconfig.json index 1a367603b..f7f3acf9b 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -18,7 +18,7 @@ "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA", "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479", "@color-bi-background-tooltip-success": "#2E3A4D", - "@color-bi-text-header-background": "f2f4f7", + "@color-bi-text-header-background": "#f2f4f7", "@color-bi-border-tooltip-success": "#2E3A4D", "@color-bi-background-toast-success": "#FFFFFF", "@color-bi-background-toast-warning": "#FFFFFF", From a664e9ae40ee29d8a473b830a85142e8b83ea83d Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 28 Feb 2022 15:21:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=86=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi.lessconfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bi.lessconfig.json b/bi.lessconfig.json index f7f3acf9b..d4042b18d 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -8,7 +8,7 @@ "@color-light-gray": "#ECEEF3", "@color-light-gray-theme-dark": "#292F45", "@border-color-dark-line": "#2E3A4D", - "@color-sliver-theme-dark": "363E55", + "@color-sliver-theme-dark": "#363E55", "@border-color-disabled": "#E7E8EB", "@color-bi-background-active-radio": "transparent", @@ -18,7 +18,7 @@ "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA", "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479", "@color-bi-background-tooltip-success": "#2E3A4D", - "@color-bi-text-header-background": "#f2f4f7", + "@color-bi-text-header-background": "#647185", "@color-bi-border-tooltip-success": "#2E3A4D", "@color-bi-background-toast-success": "#FFFFFF", "@color-bi-background-toast-warning": "#FFFFFF", From 0d58fe4cf130bca3b3bc112f4292072889ab7dcd Mon Sep 17 00:00:00 2001 From: data Date: Tue, 1 Mar 2022 11:33:06 +0800 Subject: [PATCH 4/4] auto upgrade version to 2.0.20220301113302 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8edf6ab3b..9d61f2208 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220228152213", + "version": "2.0.20220301113302", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",