Browse Source

Merge pull request #905 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master

* commit '2ab08ae68357f4413fdaad6db346d2b97608a702':
  BI-44142 fix: "bi.text_value_combo"trigger的text也可以接受函数
  BI-44142 fix: 调整一下"bi.search_text_value_combo",使text接收回调函数
es6
Zhenfei.Li 6 years ago
parent
commit
e72df9e8ed
  1. 7
      dist/2.0/fineui.ie.js
  2. 54
      dist/2.0/fineui.ie.min.js
  3. 7
      dist/2.0/fineui.js
  4. 2
      dist/2.0/fineui.min.css
  5. 44
      dist/2.0/fineui.min.js
  6. 11
      dist/base.js
  7. 7
      dist/bundle.ie.js
  8. 54
      dist/bundle.ie.min.js
  9. 7
      dist/bundle.js
  10. 2
      dist/bundle.min.css
  11. 44
      dist/bundle.min.js
  12. 4
      dist/case.js
  13. 16
      dist/core.js
  14. 4
      dist/fineui.css
  15. 7
      dist/fineui.ie.js
  16. 54
      dist/fineui.ie.min.js
  17. 7
      dist/fineui.js
  18. 2
      dist/fineui.min.css
  19. 44
      dist/fineui.min.js
  20. 15
      dist/fineui_without_jquery_polyfill.js
  21. 6
      dist/utils.min.js
  22. 2
      src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
  23. 2
      src/case/trigger/trigger.text.select.js

7
dist/2.0/fineui.ie.js vendored

@ -38890,7 +38890,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -54648,7 +54649,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -59398,7 +59399,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

54
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/2.0/fineui.js vendored

@ -39294,7 +39294,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -55052,7 +55053,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -59802,7 +59803,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

44
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/base.js vendored

@ -3427,7 +3427,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -6149,7 +6150,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap;
this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
},
@ -10067,8 +10068,10 @@ BI.Input = BI.inherit(BI.Single, {
})
.on("input propertychange", function (e) {
// 输入内容全选并直接删光,如果按键没放开就失去焦点不会触发keyup,被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发(class的变化也算)
if (BI.isNotNull(keyCode)) {
// 其中propertychange在元素属性发生改变的时候就会触发 是为了兼容IE8
// 通过keyCode判断会漏掉输入法点击输入(右键粘贴暂缓)
var originalEvent = e.originalEvent;
if (BI.isNull(originalEvent.propertyName) || originalEvent.propertyName === "value") {
keyCode = null;
inputEventValid = true;
self._keydown_ = true;

7
dist/bundle.ie.js vendored

@ -38890,7 +38890,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -54648,7 +54649,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -59398,7 +59399,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

54
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -39294,7 +39294,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -55052,7 +55053,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -59802,7 +59803,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

44
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/case.js vendored

@ -4914,7 +4914,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -9664,7 +9664,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

16
dist/core.js vendored

@ -19976,7 +19976,7 @@ BI.prepares.push(function () {
var i, direct;
var leftRight = [], topBottom = [];
var isNeedAdaptHeight = false, tbFirst = false, lrFirst = false;
var left, top, pos;
var left, top, pos, firstDir = directions[0];
for (i = 0; i < directions.length; i++) {
direct = directions[i];
switch (direct) {
@ -20086,39 +20086,45 @@ BI.prepares.push(function () {
}
}
// 此处为四个方向放不下时挑空间最大的方向去放置, 也就是说我设置了弹出方向为"bottom,left",
// 最后发现实际弹出方向可能是"top,left",那么此时外界获取popup的方向应该是"top,left"
switch (directions[0]) {
case "left":
case "right":
if (BI.DOM.isRightSpaceLarger(combo)) {
left = BI.DOM.getRightAdaptPosition(combo, popup, extraWidth).left;
firstDir = "right";
} else {
left = BI.DOM.getLeftAdaptPosition(combo, popup, extraWidth).left;
firstDir = "left";
}
if (topBottom[0] === "bottom") {
pos = BI.DOM.getTopAlignPosition(combo, popup, extraHeight, needAdaptHeight);
pos.left = left;
pos.dir = directions[0] + ",bottom";
pos.dir = firstDir + ",bottom";
return pos;
}
pos = BI.DOM.getBottomAlignPosition(combo, popup, extraHeight, needAdaptHeight);
pos.left = left;
pos.dir = directions[0] + ",top";
pos.dir = firstDir + ",top";
return pos;
default :
if (BI.DOM.isBottomSpaceLarger(combo)) {
pos = BI.DOM.getBottomAdaptPosition(combo, popup, extraHeight, needAdaptHeight);
firstDir = "bottom";
} else {
pos = BI.DOM.getTopAdaptPosition(combo, popup, extraHeight, needAdaptHeight);
firstDir = "top";
}
if (leftRight[0] === "right") {
left = BI.DOM.getLeftAlignPosition(combo, popup, extraWidth, needAdaptHeight).left;
pos.left = left;
pos.dir = directions[0] + ",right";
pos.dir = firstDir + ",right";
return pos;
}
left = BI.DOM.getRightAlignPosition(combo, popup, extraWidth).left;
pos.left = left;
pos.dir = directions[0] + ",left";
pos.dir = firstDir + ",left";
return pos;
}
},

4
dist/fineui.css vendored

@ -3572,12 +3572,14 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-color: #ffffff;
opacity: 1;
}
.bi-checkbox.disabled .checkbox-content {
background-color: #d0d4da;
}
.bi-checkbox.disabled .checkbox-content:after {
opacity: 0;
}
.bi-checkbox.disabled.active .checkbox-content {
border-color: #e8eaed;
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1;

7
dist/fineui.ie.js vendored

@ -39135,7 +39135,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -54893,7 +54894,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -59643,7 +59644,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

54
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.js vendored

@ -39539,7 +39539,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -55297,7 +55298,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -60047,7 +60048,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

44
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

15
dist/fineui_without_jquery_polyfill.js vendored

@ -27057,7 +27057,8 @@ BI.Combo = BI.inherit(BI.Widget, {
},
showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) {
// 减少popup 调整宽高的次数
if (this.isEnabled() && this.combo.isEnabled() && !this.isViewVisible()) {
this._popupView(e);
}
},
@ -29779,7 +29780,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap;
this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
},
@ -33072,8 +33073,10 @@ BI.Input = BI.inherit(BI.Single, {
})
.on("input propertychange", function (e) {
// 输入内容全选并直接删光,如果按键没放开就失去焦点不会触发keyup,被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发(class的变化也算)
if (BI.isNotNull(keyCode)) {
// 其中propertychange在元素属性发生改变的时候就会触发 是为了兼容IE8
// 通过keyCode判断会漏掉输入法点击输入(右键粘贴暂缓)
var originalEvent = e.originalEvent;
if (BI.isNull(originalEvent.propertyName) || originalEvent.propertyName === "value") {
keyCode = null;
inputEventValid = true;
self._keydown_ = true;
@ -38304,7 +38307,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},
@ -42855,7 +42858,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

6
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

@ -77,7 +77,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

2
src/case/trigger/trigger.text.select.js

@ -43,7 +43,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) {
return result.join(",");
} else {
return o.text;
return BI.isFunction(o.text) ? o.text() : o.text;
}
},

Loading…
Cancel
Save