From ee1992c46e98b1c18f604ad9cf50179624f410df Mon Sep 17 00:00:00 2001 From: iapyang Date: Mon, 24 Aug 2020 17:34:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E4=B8=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/core/popup/demo.popover.js | 5 +++-- src/base/layer/layer.popover.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/demo/js/core/popup/demo.popover.js b/demo/js/core/popup/demo.popover.js index 2c02e30db..82a5e4a9d 100644 --- a/demo/js/core/popup/demo.popover.js +++ b/demo/js/core/popup/demo.popover.js @@ -169,14 +169,15 @@ Demo.Func = BI.inherit(BI.Widget, { }, { type: "bi.text_button", height: 30, - text: "弹出一个高度动态的popover层, 此弹出层指定size为small, 但是高度随内容自适应,自适应支持的最大高度为600px", + text: "弹出一个高度动态的popover层, 此弹出层指定size为small, 但是高度随内容自适应,自适应支持的最大高度为默认为600px", handler: function() { var id = "弹出层id1" BI.Popovers.create(id, { // String或者是json都行 header: "弹出层标题", logic: { - dynamic: true + dynamic: true, + maxHeight: 700, }, size: "small", body: { diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index 784062447..6269d1daa 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -16,7 +16,8 @@ BI.Popover = BI.inherit(BI.Widget, { baseCls: "bi-popover bi-card bi-border-radius", size: "normal", // small, normal, big logic: { - dynamic: false + dynamic: false, + maxHeight: 600, }, header: null, headerHeight: 40, @@ -155,7 +156,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 ? o.footerHeight + o.headerHeight : o.headerHeight); + var compareHeight = BI.clamp(height, size.height, o.logic.maxHeight || 600) - (o.footer ? o.footerHeight + o.headerHeight : o.headerHeight); this.body.element.height(compareHeight); } },