fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #627 in VISUAL/fineui from ~GUY/fineui:master to master 

* commit '2e73ed8fbda49685c9f5466aa0afba0a7dca8ebe':
  update
es6
guy 6 years ago
parent
fc90e7cead 2e73ed8fbd
commit
447a490359
10 changed files with 118 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      dist/base.js
  2. 22
      dist/bundle.js
  3. 62
      dist/bundle.min.js
  4. 12
      dist/core.js
  5. 22
      dist/fineui.js
  6. 62
      dist/fineui.min.js
  7. 22
      dist/fineui_without_jquery_polyfill.js
  8. 2
      dist/utils.min.js
  9. 10
      src/base/combination/combo.js
  10. 12
      src/core/func/function.js

10
dist/base.js vendored
Unescape View File

@ -3156,7 +3156,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -3177,7 +3177,7 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
this.element.removeClass(this.options.comboClass); this.element.removeClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
@ -3190,8 +3190,8 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight(); this.adjustHeight();
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); BI.Widget._renderEngine(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
@ -3359,7 +3359,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}, },
destroy: function () { destroy: function () {
$(document).unbind("mousedown." + this.getName()) BI.Widget._renderEngine(document).unbind("mousedown." + this.getName())
.unbind("mousewheel." + this.getName()) .unbind("mousewheel." + this.getName())
.unbind("mouseenter." + this.getName()) .unbind("mouseenter." + this.getName())
.unbind("mousemove." + this.getName()) .unbind("mousemove." + this.getName())

22
dist/bundle.js vendored
Unescape View File

@ -28019,7 +28019,7 @@ BI.extend(BI.DOM, {
}, },
isExist: function (obj) { isExist: function (obj) {
return $("body").find(obj.element).length > 0; return BI.Widget._renderEngine("body").find(obj.element).length > 0;
}, },
// 预加载图片 // 预加载图片
@ -28195,7 +28195,7 @@ BI.extend(BI.DOM, {
}, },
getTextSizeWidth: function (text, fontSize) { getTextSizeWidth: function (text, fontSize) {
var span = $("<span></span>").addClass("text-width-span").appendTo($("body")); var span = BI.Widget._renderEngine("<span></span>").addClass("text-width-span").appendTo($("body"));
if (fontSize == null) { if (fontSize == null) {
fontSize = 12; fontSize = 12;
@ -28213,11 +28213,11 @@ BI.extend(BI.DOM, {
// 获取滚动条的宽度 // 获取滚动条的宽度
getScrollWidth: function () { getScrollWidth: function () {
if (this._scrollWidth == null) { if (this._scrollWidth == null) {
var ul = $("<div>").width(50).height(50).css({ var ul = BI.Widget._renderEngine("<div>").width(50).height(50).css({
position: "absolute", position: "absolute",
top: "-9999px", top: "-9999px",
overflow: "scroll" overflow: "scroll"
}).appendTo($("body")); }).appendTo("body");
this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth; this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;
ul.destroy(); ul.destroy();
} }
@ -28227,7 +28227,7 @@ BI.extend(BI.DOM, {
getImage: function (param, fillStyle, backgroundColor) { getImage: function (param, fillStyle, backgroundColor) {
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
var ratio = 2; var ratio = 2;
$("body").append(canvas); BI.Widget._renderEngine("body").append(canvas);
var w = BI.DOM.getTextSizeWidth(param, 14) + 6; var w = BI.DOM.getTextSizeWidth(param, 14) + 6;
canvas.width = w * ratio; canvas.width = w * ratio;
canvas.height = 24 * ratio; canvas.height = 24 * ratio;
@ -28237,7 +28237,7 @@ BI.extend(BI.DOM, {
ctx.fillStyle = fillStyle || "#3D4D66"; ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle"; ctx.textBaseline = "middle";
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); BI.Widget._renderEngine(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高 // IE可以放大缩小所以要固定最大最小宽高
return { return {
@ -38384,7 +38384,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -38405,7 +38405,7 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
this.element.removeClass(this.options.comboClass); this.element.removeClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
@ -38418,8 +38418,8 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight(); this.adjustHeight();
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); BI.Widget._renderEngine(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
@ -38587,7 +38587,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}, },
destroy: function () { destroy: function () {
$(document).unbind("mousedown." + this.getName()) BI.Widget._renderEngine(document).unbind("mousedown." + this.getName())
.unbind("mousewheel." + this.getName()) .unbind("mousewheel." + this.getName())
.unbind("mouseenter." + this.getName()) .unbind("mouseenter." + this.getName())
.unbind("mousemove." + this.getName()) .unbind("mousemove." + this.getName())

62
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/core.js vendored
Unescape View File

@ -28019,7 +28019,7 @@ BI.extend(BI.DOM, {
}, },
isExist: function (obj) { isExist: function (obj) {
return $("body").find(obj.element).length > 0; return BI.Widget._renderEngine("body").find(obj.element).length > 0;
}, },
// 预加载图片 // 预加载图片
@ -28195,7 +28195,7 @@ BI.extend(BI.DOM, {
}, },
getTextSizeWidth: function (text, fontSize) { getTextSizeWidth: function (text, fontSize) {
var span = $("<span></span>").addClass("text-width-span").appendTo($("body")); var span = BI.Widget._renderEngine("<span></span>").addClass("text-width-span").appendTo($("body"));
if (fontSize == null) { if (fontSize == null) {
fontSize = 12; fontSize = 12;
@ -28213,11 +28213,11 @@ BI.extend(BI.DOM, {
// 获取滚动条的宽度 // 获取滚动条的宽度
getScrollWidth: function () { getScrollWidth: function () {
if (this._scrollWidth == null) { if (this._scrollWidth == null) {
var ul = $("<div>").width(50).height(50).css({ var ul = BI.Widget._renderEngine("<div>").width(50).height(50).css({
position: "absolute", position: "absolute",
top: "-9999px", top: "-9999px",
overflow: "scroll" overflow: "scroll"
}).appendTo($("body")); }).appendTo("body");
this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth; this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;
ul.destroy(); ul.destroy();
} }
@ -28227,7 +28227,7 @@ BI.extend(BI.DOM, {
getImage: function (param, fillStyle, backgroundColor) { getImage: function (param, fillStyle, backgroundColor) {
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
var ratio = 2; var ratio = 2;
$("body").append(canvas); BI.Widget._renderEngine("body").append(canvas);
var w = BI.DOM.getTextSizeWidth(param, 14) + 6; var w = BI.DOM.getTextSizeWidth(param, 14) + 6;
canvas.width = w * ratio; canvas.width = w * ratio;
canvas.height = 24 * ratio; canvas.height = 24 * ratio;
@ -28237,7 +28237,7 @@ BI.extend(BI.DOM, {
ctx.fillStyle = fillStyle || "#3D4D66"; ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle"; ctx.textBaseline = "middle";
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); BI.Widget._renderEngine(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高 // IE可以放大缩小所以要固定最大最小宽高
return { return {

22
dist/fineui.js vendored
Unescape View File

@ -28258,7 +28258,7 @@ BI.extend(BI.DOM, {
}, },
isExist: function (obj) { isExist: function (obj) {
return $("body").find(obj.element).length > 0; return BI.Widget._renderEngine("body").find(obj.element).length > 0;
}, },
// 预加载图片 // 预加载图片
@ -28434,7 +28434,7 @@ BI.extend(BI.DOM, {
}, },
getTextSizeWidth: function (text, fontSize) { getTextSizeWidth: function (text, fontSize) {
var span = $("<span></span>").addClass("text-width-span").appendTo($("body")); var span = BI.Widget._renderEngine("<span></span>").addClass("text-width-span").appendTo($("body"));
if (fontSize == null) { if (fontSize == null) {
fontSize = 12; fontSize = 12;
@ -28452,11 +28452,11 @@ BI.extend(BI.DOM, {
// 获取滚动条的宽度 // 获取滚动条的宽度
getScrollWidth: function () { getScrollWidth: function () {
if (this._scrollWidth == null) { if (this._scrollWidth == null) {
var ul = $("<div>").width(50).height(50).css({ var ul = BI.Widget._renderEngine("<div>").width(50).height(50).css({
position: "absolute", position: "absolute",
top: "-9999px", top: "-9999px",
overflow: "scroll" overflow: "scroll"
}).appendTo($("body")); }).appendTo("body");
this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth; this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;
ul.destroy(); ul.destroy();
} }
@ -28466,7 +28466,7 @@ BI.extend(BI.DOM, {
getImage: function (param, fillStyle, backgroundColor) { getImage: function (param, fillStyle, backgroundColor) {
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
var ratio = 2; var ratio = 2;
$("body").append(canvas); BI.Widget._renderEngine("body").append(canvas);
var w = BI.DOM.getTextSizeWidth(param, 14) + 6; var w = BI.DOM.getTextSizeWidth(param, 14) + 6;
canvas.width = w * ratio; canvas.width = w * ratio;
canvas.height = 24 * ratio; canvas.height = 24 * ratio;
@ -28476,7 +28476,7 @@ BI.extend(BI.DOM, {
ctx.fillStyle = fillStyle || "#3D4D66"; ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle"; ctx.textBaseline = "middle";
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); BI.Widget._renderEngine(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高 // IE可以放大缩小所以要固定最大最小宽高
return { return {
@ -38623,7 +38623,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -38644,7 +38644,7 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
this.element.removeClass(this.options.comboClass); this.element.removeClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
@ -38657,8 +38657,8 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight(); this.adjustHeight();
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); BI.Widget._renderEngine(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
@ -38826,7 +38826,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}, },
destroy: function () { destroy: function () {
$(document).unbind("mousedown." + this.getName()) BI.Widget._renderEngine(document).unbind("mousedown." + this.getName())
.unbind("mousewheel." + this.getName()) .unbind("mousewheel." + this.getName())
.unbind("mouseenter." + this.getName()) .unbind("mouseenter." + this.getName())
.unbind("mousemove." + this.getName()) .unbind("mousemove." + this.getName())

62
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

22
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -17813,7 +17813,7 @@ BI.extend(BI.DOM, {
}, },
isExist: function (obj) { isExist: function (obj) {
return $("body").find(obj.element).length > 0; return BI.Widget._renderEngine("body").find(obj.element).length > 0;
}, },
// 预加载图片 // 预加载图片
@ -17989,7 +17989,7 @@ BI.extend(BI.DOM, {
}, },
getTextSizeWidth: function (text, fontSize) { getTextSizeWidth: function (text, fontSize) {
var span = $("<span></span>").addClass("text-width-span").appendTo($("body")); var span = BI.Widget._renderEngine("<span></span>").addClass("text-width-span").appendTo($("body"));
if (fontSize == null) { if (fontSize == null) {
fontSize = 12; fontSize = 12;
@ -18007,11 +18007,11 @@ BI.extend(BI.DOM, {
// 获取滚动条的宽度 // 获取滚动条的宽度
getScrollWidth: function () { getScrollWidth: function () {
if (this._scrollWidth == null) { if (this._scrollWidth == null) {
var ul = $("<div>").width(50).height(50).css({ var ul = BI.Widget._renderEngine("<div>").width(50).height(50).css({
position: "absolute", position: "absolute",
top: "-9999px", top: "-9999px",
overflow: "scroll" overflow: "scroll"
}).appendTo($("body")); }).appendTo("body");
this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth; this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;
ul.destroy(); ul.destroy();
} }
@ -18021,7 +18021,7 @@ BI.extend(BI.DOM, {
getImage: function (param, fillStyle, backgroundColor) { getImage: function (param, fillStyle, backgroundColor) {
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
var ratio = 2; var ratio = 2;
$("body").append(canvas); BI.Widget._renderEngine("body").append(canvas);
var w = BI.DOM.getTextSizeWidth(param, 14) + 6; var w = BI.DOM.getTextSizeWidth(param, 14) + 6;
canvas.width = w * ratio; canvas.width = w * ratio;
canvas.height = 24 * ratio; canvas.height = 24 * ratio;
@ -18031,7 +18031,7 @@ BI.extend(BI.DOM, {
ctx.fillStyle = fillStyle || "#3D4D66"; ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle"; ctx.textBaseline = "middle";
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); BI.Widget._renderEngine(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高 // IE可以放大缩小所以要固定最大最小宽高
return { return {
@ -27010,7 +27010,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -27031,7 +27031,7 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
this.element.removeClass(this.options.comboClass); this.element.removeClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
@ -27044,8 +27044,8 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight(); this.adjustHeight();
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); BI.Widget._renderEngine(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
@ -27213,7 +27213,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}, },
destroy: function () { destroy: function () {
$(document).unbind("mousedown." + this.getName()) BI.Widget._renderEngine(document).unbind("mousedown." + this.getName())
.unbind("mousewheel." + this.getName()) .unbind("mousewheel." + this.getName())
.unbind("mouseenter." + this.getName()) .unbind("mouseenter." + this.getName())
.unbind("mousemove." + this.getName()) .unbind("mousemove." + this.getName())

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
src/base/combination/combo.js
Unescape View File

@ -263,7 +263,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -284,7 +284,7 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
this.element.removeClass(this.options.comboClass); this.element.removeClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
@ -297,8 +297,8 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight(); this.adjustHeight();
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); BI.Widget._renderEngine(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
@ -466,7 +466,7 @@ BI.Combo = BI.inherit(BI.Widget, {
}, },
destroy: function () { destroy: function () {
$(document).unbind("mousedown." + this.getName()) BI.Widget._renderEngine(document).unbind("mousedown." + this.getName())
.unbind("mousewheel." + this.getName()) .unbind("mousewheel." + this.getName())
.unbind("mouseenter." + this.getName()) .unbind("mouseenter." + this.getName())
.unbind("mousemove." + this.getName()) .unbind("mousemove." + this.getName())

12
src/core/func/function.js
Unescape View File

@ -100,7 +100,7 @@ BI.extend(BI.DOM, {
}, },
isExist: function (obj) { isExist: function (obj) {
return $("body").find(obj.element).length > 0; return BI.Widget._renderEngine("body").find(obj.element).length > 0;
}, },
// 预加载图片 // 预加载图片
@ -276,7 +276,7 @@ BI.extend(BI.DOM, {
}, },
getTextSizeWidth: function (text, fontSize) { getTextSizeWidth: function (text, fontSize) {
var span = $("<span></span>").addClass("text-width-span").appendTo($("body")); var span = BI.Widget._renderEngine("<span></span>").addClass("text-width-span").appendTo($("body"));
if (fontSize == null) { if (fontSize == null) {
fontSize = 12; fontSize = 12;
@ -294,11 +294,11 @@ BI.extend(BI.DOM, {
// 获取滚动条的宽度 // 获取滚动条的宽度
getScrollWidth: function () { getScrollWidth: function () {
if (this._scrollWidth == null) { if (this._scrollWidth == null) {
var ul = $("<div>").width(50).height(50).css({ var ul = BI.Widget._renderEngine("<div>").width(50).height(50).css({
position: "absolute", position: "absolute",
top: "-9999px", top: "-9999px",
overflow: "scroll" overflow: "scroll"
}).appendTo($("body")); }).appendTo("body");
this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth; this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;
ul.destroy(); ul.destroy();
} }
@ -308,7 +308,7 @@ BI.extend(BI.DOM, {
getImage: function (param, fillStyle, backgroundColor) { getImage: function (param, fillStyle, backgroundColor) {
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
var ratio = 2; var ratio = 2;
$("body").append(canvas); BI.Widget._renderEngine("body").append(canvas);
var w = BI.DOM.getTextSizeWidth(param, 14) + 6; var w = BI.DOM.getTextSizeWidth(param, 14) + 6;
canvas.width = w * ratio; canvas.width = w * ratio;
canvas.height = 24 * ratio; canvas.height = 24 * ratio;
@ -318,7 +318,7 @@ BI.extend(BI.DOM, {
ctx.fillStyle = fillStyle || "#3D4D66"; ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle"; ctx.textBaseline = "middle";
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); BI.Widget._renderEngine(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高 // IE可以放大缩小所以要固定最大最小宽高
return { return {

Write Preview
Loading…
Cancel
Save