From 8563f11bd5596aa94e2324aa188a00ca501bbdbd Mon Sep 17 00:00:00 2001 From: Guyi Date: Thu, 20 Aug 2020 19:57:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8Cpopover?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E9=AB=98=E5=BA=A6=E5=8F=AF=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/layer/layer.popover.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index f8a19a6e4..f90f8193b 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -25,6 +25,7 @@ BI.Popover = BI.inherit(BI.Widget, { headerHeight: 40, body: null, footer: null, + footerHeight: 44, closable: true // BI-40839 是否显示右上角的关闭按钮 }); }, @@ -122,9 +123,9 @@ BI.Popover = BI.inherit(BI.Widget, { right: 20, bottom: 0 }], - height: 44 + height: o.footerHeight }, - height: 44 + height: o.footerHeight }); } @@ -154,7 +155,7 @@ BI.Popover = BI.inherit(BI.Widget, { if (o.logic.dynamic) { var size = this._calculateSize(); var height = this.element.height(); - var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44); + var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? o.footerHeight + o.headerHeight : o.headerHeight); this.body.element.height(compareHeight); } },