Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~dailer/fineui

es6
dailer 6 years ago
parent
commit
c43ce7b15a
  1. 32
      dist/2.0/fineui.ie.js
  2. 38
      dist/2.0/fineui.ie.min.js
  3. 32
      dist/2.0/fineui.js
  4. 32
      dist/2.0/fineui.min.js
  5. 32
      dist/bundle.ie.js
  6. 38
      dist/bundle.ie.min.js
  7. 32
      dist/bundle.js
  8. 32
      dist/bundle.min.js
  9. 5
      dist/case.js
  10. 123
      dist/demo.js
  11. 32
      dist/fineui.ie.js
  12. 38
      dist/fineui.ie.min.js
  13. 32
      dist/fineui.js
  14. 32
      dist/fineui.min.js
  15. 32
      dist/fineui_without_jquery_polyfill.js
  16. 2
      dist/utils.min.js
  17. 27
      dist/widget.js
  18. 3
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  19. 2
      src/case/editor/editor.sign.js
  20. 3
      src/widget/downlist/popup.downlist.js

32
dist/2.0/fineui.ie.js vendored

@ -54392,6 +54392,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -54471,7 +54472,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -55811,7 +55812,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -55823,6 +55823,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },
@ -61599,6 +61600,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -68140,32 +68144,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust(); adjust();
callback(); callback();
});
} else {
adjust();
callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -68218,7 +68199,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

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

File diff suppressed because one or more lines are too long

32
dist/2.0/fineui.js vendored

@ -54796,6 +54796,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -54875,7 +54876,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -56215,7 +56216,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56227,6 +56227,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },
@ -62003,6 +62004,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -68544,32 +68548,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust(); adjust();
callback(); callback();
});
} else {
adjust();
callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -68622,7 +68603,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

32
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

32
dist/bundle.ie.js vendored

@ -54392,6 +54392,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -54471,7 +54472,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -55811,7 +55812,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -55823,6 +55823,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },
@ -61599,6 +61600,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -68140,32 +68144,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust(); adjust();
callback(); callback();
});
} else {
adjust();
callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -68218,7 +68199,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

38
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

32
dist/bundle.js vendored

@ -54796,6 +54796,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -54875,7 +54876,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -56215,7 +56216,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56227,6 +56227,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },
@ -62003,6 +62004,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -68544,32 +68548,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust(); adjust();
callback(); callback();
});
} else {
adjust();
callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -68622,7 +68603,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

32
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/case.js vendored

@ -4681,6 +4681,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -4760,7 +4761,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -6100,7 +6101,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -6112,6 +6112,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },

123
dist/demo.js vendored

@ -3,11 +3,34 @@ Demo = {
}; };
$(function () { $(function () {
var ref; var ref;
var AppRouter = BI.inherit(BI.Router, {
BI.each(Demo.CONFIG, function (index, item) {
!item.id && (item.id = item.value || item.text);
});
var tree = BI.Tree.transformToTreeFormat(Demo.CONFIG);
var obj = {
routes: { routes: {
"": "index" "": "index"
}, },
index: function () { index: function () {
Demo.showIndex = "demo.face";
}
};
BI.Tree.traversal(tree, function (index, node) {
if (!node.children || BI.isEmptyArray(node.children)) {
obj.routes[node.text] = node.text;
obj[node.text] = function () {
Demo.showIndex = node.value;
};
}
});
var AppRouter = BI.inherit(BI.Router, obj);
new AppRouter;
BI.history.start();
BI.createWidget({ BI.createWidget({
type: "demo.main", type: "demo.main",
ref: function (_ref) { ref: function (_ref) {
@ -16,10 +39,6 @@ $(function () {
}, },
element: "#wrapper" element: "#wrapper"
}); });
}
});
new AppRouter;
BI.history.start();
});Demo.Button = BI.inherit(BI.Widget, { });Demo.Button = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "demo-button" baseCls: "demo-button"
@ -2661,7 +2680,7 @@ BI.shortcut("demo.text_trigger", Demo.Func);Demo.Center = BI.inherit(BI.Widget,
self.tab = this; self.tab = this;
}, },
single: true, single: true,
showIndex: "demo.face", showIndex: Demo.showIndex,
cardCreator: function (v) { cardCreator: function (v) {
return BI.createWidget({ return BI.createWidget({
type: v type: v
@ -8101,8 +8120,23 @@ BI.shortcut("demo.face", Demo.Face);(function () {
props: { props: {
baseCls: "demo-main bi-background" baseCls: "demo-main bi-background"
}, },
_store: function () {
return BI.Stores.getStore("demo.store.main");
},
watch: {
activeCard: function (v) {
this.center.setValue(v);
}
},
beforeInit: function (cb) {
this.store.init(cb);
},
render: function () { render: function () {
var center; var self = this;
return { return {
type: "bi.border", type: "bi.border",
items: { items: {
@ -8113,7 +8147,7 @@ BI.shortcut("demo.face", Demo.Face);(function () {
listeners: [{ listeners: [{
eventName: Demo.North.EVENT_VALUE_CHANGE, eventName: Demo.North.EVENT_VALUE_CHANGE,
action: function (v) { action: function (v) {
center.setValue(v); self.store.handleTreeSelectChange(v);
} }
}] }]
} }
@ -8125,7 +8159,7 @@ BI.shortcut("demo.face", Demo.Face);(function () {
listeners: [{ listeners: [{
eventName: Demo.West.EVENT_VALUE_CHANGE, eventName: Demo.West.EVENT_VALUE_CHANGE,
action: function (v) { action: function (v) {
center.setValue(v); self.store.handleTreeSelectChange(v);
} }
}] }]
} }
@ -8134,7 +8168,7 @@ BI.shortcut("demo.face", Demo.Face);(function () {
el: { el: {
type: "demo.center", type: "demo.center",
ref: function (_ref) { ref: function (_ref) {
center = _ref; self.center = _ref;
} }
} }
} }
@ -8142,7 +8176,71 @@ BI.shortcut("demo.face", Demo.Face);(function () {
}; };
} }
}); });
BI.shortcut("demo.main", Demo.Main);Demo.North = BI.inherit(BI.Widget, { BI.shortcut("demo.main", Demo.Main);!(function () {
var Store = BI.inherit(Fix.Model, {
_init: function () {
},
state: function () {
return {
activeCard: Demo.showIndex
};
},
computed: {},
watch: {},
actions: {
init: function (cb) {
var tree = BI.Tree.transformToTreeFormat(Demo.CONFIG);
var traversal = function (array, callback) {
var t = [];
BI.some(array, function (i, item) {
var match = callback(i, item);
if (match) {
t.push(item.id);
}
var b = traversal(item.children, callback);
if (BI.isNotEmptyArray(b)) {
t = BI.concat([item.id], b);
}
});
return t;
};
var paths = traversal(tree, function (index, node) {
if (!node.children || BI.isEmptyArray(node.children)) {
if (node.value === Demo.showIndex) {
return true;
}
}
});
BI.each(Demo.CONFIG, function (index, item) {
if (BI.contains(paths, item.id)) {
item.open = true;
}
});
cb();
},
handleTreeSelectChange: function (v) {
this.model.activeCard = v;
var matched = BI.some(Demo.CONFIG, function (index, item) {
if (item.value === v) {
BI.history.navigate(item.text, {trigger: true});
return true;
}
});
if (!matched) {
BI.history.navigate("", {trigger: true});
}
}
}
});
BI.store("demo.store.main", Store);
})();Demo.North = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "demo-north" baseCls: "demo-north"
}, },
@ -8271,9 +8369,11 @@ BI.shortcut("demo.preview", Demo.Preview);Demo.West = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "demo-west bi-border-right bi-card" baseCls: "demo-west bi-border-right bi-card"
}, },
mounted: function () { mounted: function () {
this.searcher.setAdapter(this.tree); this.searcher.setAdapter(this.tree);
}, },
render: function () { render: function () {
var self = this; var self = this;
return { return {
@ -8317,6 +8417,7 @@ BI.shortcut("demo.preview", Demo.Preview);Demo.West = BI.inherit(BI.Widget, {
self.fireEvent(Demo.West.EVENT_VALUE_CHANGE, v); self.fireEvent(Demo.West.EVENT_VALUE_CHANGE, v);
} }
}], }],
value: Demo.showIndex,
items: Demo.CONFIG, items: Demo.CONFIG,
ref: function (ref) { ref: function (ref) {
self.tree = ref; self.tree = ref;

32
dist/fineui.ie.js vendored

@ -54637,6 +54637,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -54716,7 +54717,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -56056,7 +56057,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56068,6 +56068,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },
@ -61844,6 +61845,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -68385,32 +68389,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust(); adjust();
callback(); callback();
});
} else {
adjust();
callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -68463,7 +68444,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

38
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

32
dist/fineui.js vendored

@ -55041,6 +55041,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -55120,7 +55121,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -56460,7 +56461,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56472,6 +56472,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },
@ -62248,6 +62249,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -68789,32 +68793,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust(); adjust();
callback(); callback();
});
} else {
adjust();
callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -68867,7 +68848,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

32
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

32
dist/fineui_without_jquery_polyfill.js vendored

@ -38063,6 +38063,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -38142,7 +38143,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });
@ -39482,7 +39483,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -39494,6 +39494,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },
@ -45071,6 +45072,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -51612,32 +51616,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust(); adjust();
callback(); callback();
});
} else {
adjust();
callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -51690,7 +51671,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

27
dist/widget.js vendored

@ -2087,6 +2087,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
@ -8628,32 +8631,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust();
callback();
});
} else {
adjust(); adjust();
callback(); callback();
}
function adjust () { function adjust () {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
};
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
};
}
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
@ -8706,7 +8686,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

3
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -69,6 +69,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
value: o.value,
maxHeight: 252 maxHeight: 252
}, },
listeners: [{ listeners: [{
@ -148,7 +149,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, },
getValue: function () { getValue: function () {
var value = this.popup.getValue(); var value = this.combo.getValue();
return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]);
} }
}); });

2
src/case/editor/editor.sign.js

@ -134,7 +134,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -146,6 +145,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
} else { } else {
this.text.setValue(this.editor.getValue()); this.text.setValue(this.editor.getValue());
this.text.element.removeClass("bi-water-mark"); this.text.element.removeClass("bi-water-mark");
this.text.doRedMark(o.keyword);
} }
}, this)); }, this));
}, },

3
src/widget/downlist/popup.downlist.js

@ -87,6 +87,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) { BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) { if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group"; item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后,无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group"; item.cls = "down-list-group";
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;

Loading…
Cancel
Save