windy 8 years ago
parent
commit
62068ed13c
  1. 11
      bi/base.js
  2. 6
      bi/core.js
  3. 11
      docs/base.js
  4. 6
      docs/core.js
  5. 4
      src/base/combination/combo.js
  6. 7
      src/base/single/tip/tip.tooltip.js
  7. 1
      src/core/controller/controller.tooltips.js
  8. 4
      src/core/func/dom.js
  9. 1
      src/core/widget.js

11
bi/base.js

@ -2935,7 +2935,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}
}
}, BI.EVENT_RESPONSE_TIME, true);
self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function(e){
self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function (e) {
debounce(e);
st(e);
});
@ -3051,7 +3051,7 @@ BI.Combo = BI.inherit(BI.Widget, {
break;
case "top":
case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
break;
case "left":
case "left,bottom":
@ -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,

6
bi/core.js

@ -4512,6 +4512,7 @@ BI.Widget = BI.inherit(BI.OB, {
setVisible: function (visible) {
if (visible === true) {
this.options.invisible = false;
//用this.element.show()会把display属性改成block
this.element.css("display", "");
this._mount();
} else if (visible === false) {
@ -16186,6 +16187,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
type: "bi.tooltip",
text: text,
level: level,
stopEvent: true,
height: this._const.height
});
},
@ -17068,7 +17070,9 @@ BI.extend(jQuery, {
}
break;
}
popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
if(needAdaptHeight === true) {
popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
}
return position;
}
});/**

11
docs/base.js

@ -2935,7 +2935,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}
}
}, BI.EVENT_RESPONSE_TIME, true);
self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function(e){
self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function (e) {
debounce(e);
st(e);
});
@ -3051,7 +3051,7 @@ BI.Combo = BI.inherit(BI.Widget, {
break;
case "top":
case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
break;
case "left":
case "left,bottom":
@ -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,

6
docs/core.js

@ -14507,6 +14507,7 @@ BI.Widget = BI.inherit(BI.OB, {
setVisible: function (visible) {
if (visible === true) {
this.options.invisible = false;
//用this.element.show()会把display属性改成block
this.element.css("display", "");
this._mount();
} else if (visible === false) {
@ -21260,6 +21261,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
type: "bi.tooltip",
text: text,
level: level,
stopEvent: true,
height: this._const.height
});
},
@ -22567,7 +22569,9 @@ BI.extend(jQuery, {
}
break;
}
popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
if(needAdaptHeight === true) {
popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
}
return position;
}
});/**

4
src/base/combination/combo.js

@ -132,7 +132,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}
}
}, BI.EVENT_RESPONSE_TIME, true);
self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function(e){
self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function (e) {
debounce(e);
st(e);
});
@ -248,7 +248,7 @@ BI.Combo = BI.inherit(BI.Widget, {
break;
case "top":
case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
break;
case "left":
case "left,bottom":

7
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,

1
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
});
},

4
src/core/func/dom.js

@ -577,7 +577,9 @@ BI.extend(jQuery, {
}
break;
}
popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
if(needAdaptHeight === true) {
popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
}
return position;
}
});

1
src/core/widget.js

@ -208,6 +208,7 @@ BI.Widget = BI.inherit(BI.OB, {
setVisible: function (visible) {
if (visible === true) {
this.options.invisible = false;
//用this.element.show()会把display属性改成block
this.element.css("display", "");
this._mount();
} else if (visible === false) {

Loading…
Cancel
Save