Browse Source

Merging in latest from upstream (VISUAL/fineui:refs/heads/master)

* commit '4c47fa328d2292a9c8f1caeed70b6e0be0db540c':
  auto upgrade version to 2.0.20230113121657
  auto upgrade version to 2.0.20230112210841
  JSY-25995 feat: TextValueCombo 支持 EVENT_BEFORE_POPUPVIEW 事件监听
  REPORT-88341 fix: 【专题】【智能运维-平台日志】用户行为-操作用户和模板热度-被访问资源,在ie浏览器下无法点击
research/test
Dailer-刘荣歆 2 years ago
parent
commit
ef0d7027f7
  1. 2
      package.json
  2. 2
      src/case/combo/textvaluecombo/combo.textvalue.js
  3. 11
      src/core/platform/web/dom.js
  4. 1
      typescript/case/combo/combo.textvalue.ts

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20230109200447", "version": "2.0.20230113121657",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

2
src/case/combo/textvaluecombo/combo.textvalue.js

@ -130,6 +130,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: () => { action: () => {
changeTag = false; changeTag = false;
this.fireEvent(BI.TextValueCombo.EVENT_BEFORE_POPUPVIEW);
} }
}, { }, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
@ -209,5 +210,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
this.combo.populate(items); this.combo.populate(items);
} }
}); });
BI.TextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.TextValueCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.text_value_combo", BI.TextValueCombo); BI.shortcut("bi.text_value_combo", BI.TextValueCombo);

11
src/core/platform/web/dom.js

@ -745,13 +745,14 @@
* 获取position:fixed相对定位的元素的clientRect * 获取position:fixed相对定位的元素的clientRect
*/ */
getPositionRelativeContainingBlockRect: function (element) { getPositionRelativeContainingBlockRect: function (element) {
var positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(element); const positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(element);
var rect = positionRelativeElement.getBoundingClientRect(); const { top, right, bottom, left, width, height, x, y } = positionRelativeElement.getBoundingClientRect();
return { return {
...rect.toJSON(), top, right, bottom, left, width, height, x, y,
scaleX: rect.width / positionRelativeElement.offsetWidth, scaleX: width / positionRelativeElement.offsetWidth,
scaleY: rect.height / positionRelativeElement.offsetHeight scaleY: height / positionRelativeElement.offsetHeight,
}; };
}, },
}); });

1
typescript/case/combo/combo.textvalue.ts

@ -4,6 +4,7 @@ export declare class TextValueCombo extends Widget {
static xtype: string; static xtype: string;
static EVENT_CHANGE: string; static EVENT_CHANGE: string;
static EVENT_BEFORE_POPUPVIEW: string;
clear(): void; clear(): void;
setText(text: string): void; setText(text: string): void;

Loading…
Cancel
Save