Browse Source

Pull request #1486: 无JIRA任务 bubble位置顺序,上、下、右、左

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

* commit '6e53e6ae6f039c83ff009bd37009011ab258a48c':
  bugfix
master
guy 4 years ago
parent
commit
db61fa8f8e
  1. 30
      src/core/controller/controller.bubbles.js

30
src/core/controller/controller.bubbles.js

@ -185,23 +185,23 @@ BI.BubblesController = BI.inherit(BI.Controller, {
this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset}); this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
if (!BI.DOM.isTopSpaceEnough(context, this.get(name), adjustYOffset)) { if (!BI.DOM.isTopSpaceEnough(context, this.get(name), adjustYOffset)) {
this.get(name).invisible(); this.get(name).invisible();
if (!this.storeBubbles[name]["left"]) { if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30, fixed); this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
} }
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: container, element: container,
items: [{ items: [{
el: this.storeBubbles[name]["left"] el: this.storeBubbles[name]["bottom"]
}] }]
}); });
this.set(name, this.storeBubbles[name]["left"]); this.set(name, this.storeBubbles[name]["bottom"]);
var position = this._getLeftPosition(name, context, offsetStyle); var position = this._getBottomPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left - adjustXOffset, top: position.top - adjustYOffset}); this.get(name).element.css({left: position.left + adjustXOffset, top: position.top + adjustYOffset});
if (!BI.DOM.isLeftSpaceEnough(context, this.get(name), adjustXOffset)) { if (!BI.DOM.isBottomSpaceEnough(context, this.get(name), adjustYOffset)) {
this.get(name).invisible(); this.get(name).invisible();
if (!this.storeBubbles[name]["right"]) { if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30, fixed); this.storeBubbles[name]["right"] = this._createBubble("right", text, level);
} }
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
@ -215,21 +215,21 @@ BI.BubblesController = BI.inherit(BI.Controller, {
this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset}); this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
if (!BI.DOM.isRightSpaceEnough(context, this.get(name), adjustXOffset)) { if (!BI.DOM.isRightSpaceEnough(context, this.get(name), adjustXOffset)) {
this.get(name).invisible(); this.get(name).invisible();
if (!this.storeBubbles[name]["bottom"]) { if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level, null, fixed); this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
} }
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: container, element: container,
items: [{ items: [{
el: this.storeBubbles[name]["bottom"] el: this.storeBubbles[name]["left"]
}] }]
}); });
this.set(name, this.storeBubbles[name]["bottom"]); this.set(name, this.storeBubbles[name]["left"]);
var position = this._getBottomPosition(name, context, offsetStyle); var position = this._getLeftPosition(name, context, offsetStyle);
this.get(name).element.css({ this.get(name).element.css({
left: position.left + adjustXOffset, left: position.left - adjustXOffset,
top: position.top + adjustYOffset top: position.top - adjustYOffset
}); });
} }
} }

Loading…
Cancel
Save