diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index 9a17cba61..f8a19a6e4 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -10,7 +10,6 @@ BI.Popover = BI.inherit(BI.Widget, { NORMAL: "normal", BIG: "big" }, - HEADER_HEIGHT: 40 }, _defaultConfig: function () { @@ -23,6 +22,7 @@ BI.Popover = BI.inherit(BI.Widget, { dynamic: false }, header: null, + headerHeight: 40, body: null, footer: null, closable: true // BI-40839 是否显示右上角的关闭按钮 @@ -61,7 +61,7 @@ BI.Popover = BI.inherit(BI.Widget, { }) : { type: "bi.label", cls: "bi-font-bold", - height: this._constant.HEADER_HEIGHT, + height: o.headerHeight, text: o.header, title: o.header, textAlign: "left" @@ -75,7 +75,7 @@ BI.Popover = BI.inherit(BI.Widget, { el: o.closable ? { type: "bi.icon_button", cls: "bi-message-close close-font", - height: this._constant.HEADER_HEIGHT, + height: o.headerHeight, handler: function () { self.close(); } @@ -84,9 +84,9 @@ BI.Popover = BI.inherit(BI.Widget, { }, width: 56 }], - height: this._constant.HEADER_HEIGHT + height: o.headerHeight }, - height: this._constant.HEADER_HEIGHT + height: o.headerHeight }, { el: o.logic.dynamic ? { type: "bi.vertical", diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index eb8bd6fe1..6e050ed81 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -15,6 +15,8 @@ export interface _Combo extends _Widget { getPopupPosition(): any; + adjustHeight(e?: MouseEvent): void; + toggle(): void; } diff --git a/typescript/base/single/button/button.node.ts b/typescript/base/single/button/button.node.ts index 5fcc4b5d5..f8a09ea65 100644 --- a/typescript/base/single/button/button.node.ts +++ b/typescript/base/single/button/button.node.ts @@ -1,11 +1,11 @@ import { _BasicButton } from "./button.basic"; export interface _NodeButton extends _BasicButton { - isOpened: () => void; + isOpened(): void; - setOpened: (b: boolean) => void; + setOpened(b: boolean): void; - triggerCollapse: () => void; + triggerCollapse(): void; - triggerExpand: () => void; + triggerExpand(): void; }