Browse Source

Merge pull request #1146 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '72bd789103d580830c24a3e797ff3faab8146e3b':
  REPORT-22202 fix: 控件加配置
  build
  REPORT-22196 fix: 同外部setValue
  BI-51490 fix: 文本列表粘贴值逻辑和下拉框同步
es6
guy 5 years ago
parent
commit
5713211da4
  1. 71
      dist/2.0/fineui.ie.js
  2. 71
      dist/2.0/fineui.js
  3. 71
      dist/bundle.ie.js
  4. 71
      dist/bundle.js
  5. 71
      dist/fineui.ie.js
  6. 71
      dist/fineui.js
  7. 71
      dist/fineui_without_jquery_polyfill.js
  8. 71
      dist/widget.js
  9. 2
      src/component/treevaluechooser/combo.listtreevaluechooser.js
  10. 2
      src/widget/multilayerselecttree/multilayerselecttree.combo.js
  11. 2
      src/widget/multilayersingletree/multilayersingletree.combo.js
  12. 20
      src/widget/multiselectlist/multiselectlist.insert.js
  13. 20
      src/widget/multiselectlist/multiselectlist.insert.nobar.js
  14. 20
      src/widget/multiselectlist/multiselectlist.js
  15. 5
      src/widget/multitree/multi.tree.list.combo.js

71
dist/2.0/fineui.ie.js vendored

@ -68565,7 +68565,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -69747,7 +69747,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -74606,16 +74606,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -74716,8 +74714,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -74949,16 +74945,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75061,8 +75055,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75268,16 +75260,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75408,8 +75398,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -76380,7 +76368,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -76409,7 +76398,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -88153,6 +88142,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

71
dist/2.0/fineui.js vendored

@ -68969,7 +68969,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -70151,7 +70151,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -75010,16 +75010,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75120,8 +75118,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75353,16 +75349,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75465,8 +75459,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75672,16 +75664,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75812,8 +75802,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -76784,7 +76772,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -76813,7 +76802,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -88557,6 +88546,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

71
dist/bundle.ie.js vendored

@ -68565,7 +68565,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -69747,7 +69747,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -74606,16 +74606,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -74716,8 +74714,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -74949,16 +74945,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75061,8 +75055,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75268,16 +75260,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75408,8 +75398,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -76380,7 +76368,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -76409,7 +76398,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -88153,6 +88142,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

71
dist/bundle.js vendored

@ -68969,7 +68969,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -70151,7 +70151,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -75010,16 +75010,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75120,8 +75118,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75353,16 +75349,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75465,8 +75459,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75672,16 +75664,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75812,8 +75802,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -76784,7 +76772,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -76813,7 +76802,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -88557,6 +88546,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

71
dist/fineui.ie.js vendored

@ -68810,7 +68810,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -69992,7 +69992,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -74851,16 +74851,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -74961,8 +74959,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75194,16 +75190,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75306,8 +75300,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75513,16 +75505,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75653,8 +75643,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -76625,7 +76613,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -76654,7 +76643,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -88398,6 +88387,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

71
dist/fineui.js vendored

@ -69214,7 +69214,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -70396,7 +70396,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -75255,16 +75255,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75365,8 +75363,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75598,16 +75594,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -75710,8 +75704,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -75917,16 +75909,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -76057,8 +76047,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -77029,7 +77017,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -77058,7 +77047,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -88802,6 +88791,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

71
dist/fineui_without_jquery_polyfill.js vendored

@ -51513,7 +51513,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -52695,7 +52695,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -57554,16 +57554,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -57664,8 +57662,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -57897,16 +57893,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -58009,8 +58003,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -58216,16 +58208,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -58356,8 +58346,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -59328,7 +59316,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -59357,7 +59346,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -71101,6 +71090,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

71
dist/widget.js vendored

@ -6594,7 +6594,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -7776,7 +7776,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]
@ -12635,16 +12635,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -12745,8 +12743,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -12978,16 +12974,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -13090,8 +13084,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -13297,16 +13289,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -13437,8 +13427,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }
@ -14409,7 +14397,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -14438,7 +14427,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },
@ -26182,6 +26171,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

2
src/component/treevaluechooser/combo.listtreevaluechooser.js

@ -29,6 +29,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
text: o.text, text: o.text,
value: o.value, value: o.value,
watermark: o.watermark, watermark: o.watermark,
allowInsertValue: o.allowInsertValue,
allowEdit: o.allowEdit,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

2
src/widget/multilayerselecttree/multilayerselecttree.combo.js

@ -141,7 +141,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]

2
src/widget/multilayersingletree/multilayersingletree.combo.js

@ -144,7 +144,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM, eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
action: function () { action: function () {
var value = self.trigger.getSearcher().getKeyword(); var value = self.trigger.getSearcher().getKeyword();
self.combo.setValue(value); self.combo.setValue([value]);
self.combo.hideView(); self.combo.hideView();
} }
}] }]

20
src/widget/multiselectlist/multiselectlist.insert.js

@ -210,16 +210,14 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -320,8 +318,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }

20
src/widget/multiselectlist/multiselectlist.insert.nobar.js

@ -218,16 +218,14 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -330,8 +328,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }

20
src/widget/multiselectlist/multiselectlist.js

@ -192,16 +192,14 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_joinKeywords: function (keywords, callback) { _joinKeywords: function (keywords, callback) {
var self = this, o = this.options; var self = this, o = this.options;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
if (!this._allData) { // 和复选下拉框同步,allData做缓存是会爆炸的
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA,
}, function (ob) { keywords: keywords
self._allData = BI.map(ob.items, "value"); }, function (ob) {
digest(self._allData); var values = BI.map(ob.items, "value");
}); digest(values);
} else { });
digest(this._allData);
}
function digest (items) { function digest (items) {
var selectedMap = self._makeMap(items); var selectedMap = self._makeMap(items);
@ -332,8 +330,6 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, },
populate: function () { populate: function () {
this._count = null;
this._allData = null;
this.adapter.populate.apply(this.adapter, arguments); this.adapter.populate.apply(this.adapter, arguments);
this.trigger.populate.apply(this.trigger, arguments); this.trigger.populate.apply(this.trigger, arguments);
} }

5
src/widget/multitree/multi.tree.list.combo.js

@ -21,7 +21,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
height: 24, height: 24,
allowEdit: true allowEdit: true,
allowInsertValue: true
}); });
}, },
@ -50,7 +51,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: o.allowInsertValue ? "bi.multi_tree_search_insert_pane" : "bi.multi_tree_search_pane",
el: { el: {
type: "bi.list_part_tree" type: "bi.list_part_tree"
}, },

Loading…
Cancel
Save