diff --git a/dist/bundle.js b/dist/bundle.js index f87e65b84..5f1251543 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -104795,7 +104795,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList.superclass._init.apply(this, arguments); var self = this, o = this.options; - this.storeValue = o.value || {}; + this.storeValue = o.value; var assertShowValue = function () { BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); @@ -104851,14 +104851,14 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { eventName: BI.Searcher.EVENT_START, action: function () { self._showSearcherPane(); - self._setStartValue(""); + self._setStartValue(); this.setValue(BI.deepClone(self.storeValue)); } }, { eventName: BI.Searcher.EVENT_STOP, action: function () { self._showAdapter(); - self._setStartValue(""); + self._setStartValue(); self.adapter.setValue(self.storeValue); // 需要刷新回到初始界面,否则搜索的结果不能放在最前面 self.adapter.populate(); @@ -104880,7 +104880,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self._setStartValue(keyword); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); }); } else { @@ -104907,7 +104907,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self.adapter.setValue(self.storeValue); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); } else { self.adapter.setValue(self.storeValue); assertShowValue(); @@ -104917,18 +104917,9 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { } }, { eventName: BI.Searcher.EVENT_CHANGE, - action: function (value, obj) { - if (obj instanceof BI.MultiSelectBar) { - self._joinAll(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } else { - self._join(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } + action: function () { + self.storeValue = this.getValue(); + self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); } }] }); @@ -104971,9 +104962,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { this.trigger.stopEditing(); }, - _assertValue: function (val) { - val || (val = ""); - }, + _assertValue: function () {}, _makeMap: function (values) { return BI.makeObject(values || []); @@ -105081,7 +105070,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { // this.trigger.adjustView(); }, setValue: function (v) { - this.storeValue = v || ""; + this.storeValue = v; this.adapter.setValue(this.storeValue); this.trigger.setValue(this.storeValue); }, diff --git a/dist/fineui.js b/dist/fineui.js index 1f5bedd9a..06d47e07d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -105038,7 +105038,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList.superclass._init.apply(this, arguments); var self = this, o = this.options; - this.storeValue = o.value || {}; + this.storeValue = o.value; var assertShowValue = function () { BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); @@ -105094,14 +105094,14 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { eventName: BI.Searcher.EVENT_START, action: function () { self._showSearcherPane(); - self._setStartValue(""); + self._setStartValue(); this.setValue(BI.deepClone(self.storeValue)); } }, { eventName: BI.Searcher.EVENT_STOP, action: function () { self._showAdapter(); - self._setStartValue(""); + self._setStartValue(); self.adapter.setValue(self.storeValue); // 需要刷新回到初始界面,否则搜索的结果不能放在最前面 self.adapter.populate(); @@ -105123,7 +105123,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self._setStartValue(keyword); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); }); } else { @@ -105150,7 +105150,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self.adapter.setValue(self.storeValue); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); } else { self.adapter.setValue(self.storeValue); assertShowValue(); @@ -105160,18 +105160,9 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { } }, { eventName: BI.Searcher.EVENT_CHANGE, - action: function (value, obj) { - if (obj instanceof BI.MultiSelectBar) { - self._joinAll(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } else { - self._join(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } + action: function () { + self.storeValue = this.getValue(); + self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); } }] }); @@ -105214,9 +105205,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { this.trigger.stopEditing(); }, - _assertValue: function (val) { - val || (val = ""); - }, + _assertValue: function () {}, _makeMap: function (values) { return BI.makeObject(values || []); @@ -105324,7 +105313,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { // this.trigger.adjustView(); }, setValue: function (v) { - this.storeValue = v || ""; + this.storeValue = v; this.adapter.setValue(this.storeValue); this.trigger.setValue(this.storeValue); }, diff --git a/dist/widget.js b/dist/widget.js index c51c4d145..bb407cf36 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -17326,7 +17326,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList.superclass._init.apply(this, arguments); var self = this, o = this.options; - this.storeValue = o.value || {}; + this.storeValue = o.value; var assertShowValue = function () { BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); @@ -17382,14 +17382,14 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { eventName: BI.Searcher.EVENT_START, action: function () { self._showSearcherPane(); - self._setStartValue(""); + self._setStartValue(); this.setValue(BI.deepClone(self.storeValue)); } }, { eventName: BI.Searcher.EVENT_STOP, action: function () { self._showAdapter(); - self._setStartValue(""); + self._setStartValue(); self.adapter.setValue(self.storeValue); // 需要刷新回到初始界面,否则搜索的结果不能放在最前面 self.adapter.populate(); @@ -17411,7 +17411,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self._setStartValue(keyword); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); }); } else { @@ -17438,7 +17438,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self.adapter.setValue(self.storeValue); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); } else { self.adapter.setValue(self.storeValue); assertShowValue(); @@ -17448,18 +17448,9 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { } }, { eventName: BI.Searcher.EVENT_CHANGE, - action: function (value, obj) { - if (obj instanceof BI.MultiSelectBar) { - self._joinAll(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } else { - self._join(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } + action: function () { + self.storeValue = this.getValue(); + self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); } }] }); @@ -17502,9 +17493,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { this.trigger.stopEditing(); }, - _assertValue: function (val) { - val || (val = ""); - }, + _assertValue: function () {}, _makeMap: function (values) { return BI.makeObject(values || []); @@ -17612,7 +17601,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { // this.trigger.adjustView(); }, setValue: function (v) { - this.storeValue = v || ""; + this.storeValue = v; this.adapter.setValue(this.storeValue); this.trigger.setValue(this.storeValue); }, diff --git a/src/widget/singleselect/singleselectlist.insert.js b/src/widget/singleselect/singleselectlist.insert.js index c89709f2b..8aaeab5e9 100644 --- a/src/widget/singleselect/singleselectlist.insert.js +++ b/src/widget/singleselect/singleselectlist.insert.js @@ -15,7 +15,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList.superclass._init.apply(this, arguments); var self = this, o = this.options; - this.storeValue = o.value || {}; + this.storeValue = o.value; var assertShowValue = function () { BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); @@ -71,14 +71,14 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { eventName: BI.Searcher.EVENT_START, action: function () { self._showSearcherPane(); - self._setStartValue(""); + self._setStartValue(); this.setValue(BI.deepClone(self.storeValue)); } }, { eventName: BI.Searcher.EVENT_STOP, action: function () { self._showAdapter(); - self._setStartValue(""); + self._setStartValue(); self.adapter.setValue(self.storeValue); // 需要刷新回到初始界面,否则搜索的结果不能放在最前面 self.adapter.populate(); @@ -100,7 +100,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self._setStartValue(keyword); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); }); } else { @@ -127,7 +127,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { self.adapter.setValue(self.storeValue); assertShowValue(); self.adapter.populate(); - self._setStartValue(""); + self._setStartValue(); } else { self.adapter.setValue(self.storeValue); assertShowValue(); @@ -137,18 +137,9 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { } }, { eventName: BI.Searcher.EVENT_CHANGE, - action: function (value, obj) { - if (obj instanceof BI.MultiSelectBar) { - self._joinAll(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } else { - self._join(this.getValue(), function () { - assertShowValue(); - self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); - }); - } + action: function () { + self.storeValue = this.getValue(); + self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE); } }] }); @@ -191,9 +182,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { this.trigger.stopEditing(); }, - _assertValue: function (val) { - val || (val = ""); - }, + _assertValue: function () {}, _makeMap: function (values) { return BI.makeObject(values || []); @@ -301,7 +290,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, { // this.trigger.adjustView(); }, setValue: function (v) { - this.storeValue = v || ""; + this.storeValue = v; this.adapter.setValue(this.storeValue); this.trigger.setValue(this.storeValue); },