diff --git a/bi/base.js b/bi/base.js index 511fb732d7..2aedadb450 100644 --- a/bi/base.js +++ b/bi/base.js @@ -19759,6 +19759,8 @@ BI.Tooltip = BI.inherit(BI.Tip, { extraCls: "bi-tooltip", text: "", level: "success",//success或warning + stopEvent: false, + stopPropagation: false, height: 20 }) }, @@ -19767,9 +19769,8 @@ BI.Tooltip = BI.inherit(BI.Tip, { var self = this, o = this.options; this.element.addClass("tooltip-" + o.level); var fn = function (e) { - e.stopPropagation(); - e.stopEvent(); - return false; + o.stopPropagation && e.stopPropagation(); + o.stopEvent && e.stopEvent(); }; this.element.bind({ "click": fn, diff --git a/bi/core.js b/bi/core.js index 744231b761..46433d2bdf 100644 --- a/bi/core.js +++ b/bi/core.js @@ -4512,11 +4512,12 @@ BI.Widget = BI.inherit(BI.OB, { setVisible: function (visible) { if (visible === true) { this.options.invisible = false; - this.element.show(); + //用this.element.show()会把display属性改成block + this.element.css("display", ""); this._mount(); } else if (visible === false) { this.options.invisible = true; - this.element.hide(); + this.element.css("display", "none"); } this.fireEvent(BI.Events.VIEW, visible); }, @@ -16173,6 +16174,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, { type: "bi.tooltip", text: text, level: level, + stopEvent: true, height: this._const.height }); }, diff --git a/docs/base.js b/docs/base.js index 511fb732d7..2aedadb450 100644 --- a/docs/base.js +++ b/docs/base.js @@ -19759,6 +19759,8 @@ BI.Tooltip = BI.inherit(BI.Tip, { extraCls: "bi-tooltip", text: "", level: "success",//success或warning + stopEvent: false, + stopPropagation: false, height: 20 }) }, @@ -19767,9 +19769,8 @@ BI.Tooltip = BI.inherit(BI.Tip, { var self = this, o = this.options; this.element.addClass("tooltip-" + o.level); var fn = function (e) { - e.stopPropagation(); - e.stopEvent(); - return false; + o.stopPropagation && e.stopPropagation(); + o.stopEvent && e.stopEvent(); }; this.element.bind({ "click": fn, diff --git a/docs/core.js b/docs/core.js index 429e62f8ff..1ad16266ec 100644 --- a/docs/core.js +++ b/docs/core.js @@ -14507,11 +14507,12 @@ BI.Widget = BI.inherit(BI.OB, { setVisible: function (visible) { if (visible === true) { this.options.invisible = false; - this.element.show(); + //用this.element.show()会把display属性改成block + this.element.css("display", ""); this._mount(); } else if (visible === false) { this.options.invisible = true; - this.element.hide(); + this.element.css("display", "none"); } this.fireEvent(BI.Events.VIEW, visible); }, @@ -21260,6 +21261,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, { type: "bi.tooltip", text: text, level: level, + stopEvent: true, height: this._const.height }); }, diff --git a/src/base/single/tip/tip.tooltip.js b/src/base/single/tip/tip.tooltip.js index 8d947f6c2e..64dd0c594c 100644 --- a/src/base/single/tip/tip.tooltip.js +++ b/src/base/single/tip/tip.tooltip.js @@ -15,6 +15,8 @@ BI.Tooltip = BI.inherit(BI.Tip, { extraCls: "bi-tooltip", text: "", level: "success",//success或warning + stopEvent: false, + stopPropagation: false, height: 20 }) }, @@ -23,9 +25,8 @@ BI.Tooltip = BI.inherit(BI.Tip, { var self = this, o = this.options; this.element.addClass("tooltip-" + o.level); var fn = function (e) { - e.stopPropagation(); - e.stopEvent(); - return false; + o.stopPropagation && e.stopPropagation(); + o.stopEvent && e.stopEvent(); }; this.element.bind({ "click": fn, diff --git a/src/core/controller/controller.tooltips.js b/src/core/controller/controller.tooltips.js index 4f0c21dc48..c470722b5e 100644 --- a/src/core/controller/controller.tooltips.js +++ b/src/core/controller/controller.tooltips.js @@ -26,6 +26,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, { type: "bi.tooltip", text: text, level: level, + stopEvent: true, height: this._const.height }); }, diff --git a/src/core/widget.js b/src/core/widget.js index 2cd8c3b52f..af3aed4ca5 100644 --- a/src/core/widget.js +++ b/src/core/widget.js @@ -208,11 +208,12 @@ BI.Widget = BI.inherit(BI.OB, { setVisible: function (visible) { if (visible === true) { this.options.invisible = false; - this.element.show(); + //用this.element.show()会把display属性改成block + this.element.css("display", ""); this._mount(); } else if (visible === false) { this.options.invisible = true; - this.element.hide(); + this.element.css("display", "none"); } this.fireEvent(BI.Events.VIEW, visible); },