Browse Source

Pull request #1445: 无jira任务,popover底部高度可调

Merge in VISUAL/fineui from ~GUYI/fineui:master to master

* commit 'c38c43e588fa926c5899db67b5638c476660fa0b':
  无jira任务,修改concat描述
  无jira任务,popover底部高度可调
es6
Guyi 4 years ago
parent
commit
47fb6a2935
  1. 7
      src/base/layer/layer.popover.js
  2. 2
      typescript/core/base.ts

7
src/base/layer/layer.popover.js

@ -25,6 +25,7 @@ BI.Popover = BI.inherit(BI.Widget, {
headerHeight: 40, headerHeight: 40,
body: null, body: null,
footer: null, footer: null,
footerHeight: 44,
closable: true // BI-40839 是否显示右上角的关闭按钮 closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
@ -122,9 +123,9 @@ BI.Popover = BI.inherit(BI.Widget, {
right: 20, right: 20,
bottom: 0 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) { if (o.logic.dynamic) {
var size = this._calculateSize(); var size = this._calculateSize();
var height = this.element.height(); 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); this.body.element.height(compareHeight);
} }
}, },

2
typescript/core/base.ts

@ -85,7 +85,7 @@ export interface _base {
lastObject: (obj: object) => any; lastObject: (obj: object) => any;
concat: (obj1: any, obj2: any) => any; concat: (obj1: any, obj2: any, ...args: any[]) => any;
backEach: (obj: any, predicate: Function, context?: any) => boolean; backEach: (obj: any, predicate: Function, context?: any) => boolean;

Loading…
Cancel
Save