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

update

es6
guy 7 years ago
parent
650ba05679
commit
32aa16225d
5 changed files with 165 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      bi/widget.js
  2. 63
      dist/bundle.js
  3. 10
      dist/bundle.min.js
  4. 63
      dist/widget.js
  5. 63
      src/widget/multiselectlist/multiselectlist.js

63
bi/widget.js
Unescape View File

@ -10051,8 +10051,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
dynamic: false dynamic: false
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: { el: {}
}
}); });
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
self.storeValue = this.getValue(); self.storeValue = this.getValue();
@ -10107,21 +10106,33 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.Searcher.EVENT_PAUSE, eventName: BI.Searcher.EVENT_PAUSE,
action: function () { action: function () {
if (this.hasMatched()) {
var keyword = this.getKeyword(); var keyword = this.getKeyword();
if (this.hasMatched()) {
self._join({ self._join({
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: [keyword] value: [keyword]
}, function () { }, function () {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue); self.adapter.setValue(self.storeValue);
self._setStartValue(keyword); self._setStartValue(keyword);
assertShowValue(); assertShowValue();
self.adapter.populate();
self._setStartValue(""); self._setStartValue("");
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}) })
} else { } else {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue);
self.adapter.populate();
if (self.storeValue.type === BI.Selection.Multi) {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}
} }
} }
}, { }, {
@ -10153,7 +10164,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
} else { } else {
self._join(this.getValue(), function () {//安徽省 北京 self._join(this.getValue(), function () {
assertShowValue(); assertShowValue();
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
@ -10274,30 +10285,32 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { // if (!this._count) {
o.itemsCreator({ // o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_DATA_LENGTH // type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
}, function (res) { // }, function (res) {
self._count = res.count; // self._count = res.count;
adjust(); // adjust();
callback(); // callback();
}); // });
} else { // } else {
adjust(); adjust();
callback(); callback();
}
// }
function adjust() { function adjust() {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) { // if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.Multi, // type: BI.Selection.Multi,
value: [] // value: []
} // }
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) { // } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.All, // type: BI.Selection.All,
value: [] // value: []
} // }
} // }
} }
}, },

63
dist/bundle.js vendored
Unescape View File

@ -88530,8 +88530,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
dynamic: false dynamic: false
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: { el: {}
}
}); });
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
self.storeValue = this.getValue(); self.storeValue = this.getValue();
@ -88586,21 +88585,33 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.Searcher.EVENT_PAUSE, eventName: BI.Searcher.EVENT_PAUSE,
action: function () { action: function () {
if (this.hasMatched()) {
var keyword = this.getKeyword(); var keyword = this.getKeyword();
if (this.hasMatched()) {
self._join({ self._join({
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: [keyword] value: [keyword]
}, function () { }, function () {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue); self.adapter.setValue(self.storeValue);
self._setStartValue(keyword); self._setStartValue(keyword);
assertShowValue(); assertShowValue();
self.adapter.populate();
self._setStartValue(""); self._setStartValue("");
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}) })
} else { } else {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue);
self.adapter.populate();
if (self.storeValue.type === BI.Selection.Multi) {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}
} }
} }
}, { }, {
@ -88632,7 +88643,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
} else { } else {
self._join(this.getValue(), function () {//安徽省 北京 self._join(this.getValue(), function () {
assertShowValue(); assertShowValue();
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
@ -88753,30 +88764,32 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { // if (!this._count) {
o.itemsCreator({ // o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_DATA_LENGTH // type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
}, function (res) { // }, function (res) {
self._count = res.count; // self._count = res.count;
adjust(); // adjust();
callback(); // callback();
}); // });
} else { // } else {
adjust(); adjust();
callback(); callback();
}
// }
function adjust() { function adjust() {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) { // if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.Multi, // type: BI.Selection.Multi,
value: [] // value: []
} // }
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) { // } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.All, // type: BI.Selection.All,
value: [] // value: []
} // }
} // }
} }
}, },

10
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

63
dist/widget.js vendored
Unescape View File

@ -10051,8 +10051,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
dynamic: false dynamic: false
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: { el: {}
}
}); });
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
self.storeValue = this.getValue(); self.storeValue = this.getValue();
@ -10107,21 +10106,33 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.Searcher.EVENT_PAUSE, eventName: BI.Searcher.EVENT_PAUSE,
action: function () { action: function () {
if (this.hasMatched()) {
var keyword = this.getKeyword(); var keyword = this.getKeyword();
if (this.hasMatched()) {
self._join({ self._join({
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: [keyword] value: [keyword]
}, function () { }, function () {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue); self.adapter.setValue(self.storeValue);
self._setStartValue(keyword); self._setStartValue(keyword);
assertShowValue(); assertShowValue();
self.adapter.populate();
self._setStartValue(""); self._setStartValue("");
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}) })
} else { } else {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue);
self.adapter.populate();
if (self.storeValue.type === BI.Selection.Multi) {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}
} }
} }
}, { }, {
@ -10153,7 +10164,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
} else { } else {
self._join(this.getValue(), function () {//安徽省 北京 self._join(this.getValue(), function () {
assertShowValue(); assertShowValue();
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
@ -10274,30 +10285,32 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { // if (!this._count) {
o.itemsCreator({ // o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_DATA_LENGTH // type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
}, function (res) { // }, function (res) {
self._count = res.count; // self._count = res.count;
adjust(); // adjust();
callback(); // callback();
}); // });
} else { // } else {
adjust(); adjust();
callback(); callback();
}
// }
function adjust() { function adjust() {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) { // if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.Multi, // type: BI.Selection.Multi,
value: [] // value: []
} // }
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) { // } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.All, // type: BI.Selection.All,
value: [] // value: []
} // }
} // }
} }
}, },

63
src/widget/multiselectlist/multiselectlist.js
Unescape View File

@ -29,8 +29,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
dynamic: false dynamic: false
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: { el: {}
}
}); });
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
self.storeValue = this.getValue(); self.storeValue = this.getValue();
@ -85,21 +84,33 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.Searcher.EVENT_PAUSE, eventName: BI.Searcher.EVENT_PAUSE,
action: function () { action: function () {
if (this.hasMatched()) {
var keyword = this.getKeyword(); var keyword = this.getKeyword();
if (this.hasMatched()) {
self._join({ self._join({
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: [keyword] value: [keyword]
}, function () { }, function () {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue); self.adapter.setValue(self.storeValue);
self._setStartValue(keyword); self._setStartValue(keyword);
assertShowValue(); assertShowValue();
self.adapter.populate();
self._setStartValue(""); self._setStartValue("");
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}) })
} else { } else {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter(); self._showAdapter();
self.adapter.setValue(self.storeValue);
self.adapter.populate();
if (self.storeValue.type === BI.Selection.Multi) {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}
} }
} }
}, { }, {
@ -131,7 +142,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
} else { } else {
self._join(this.getValue(), function () {//安徽省 北京 self._join(this.getValue(), function () {
assertShowValue(); assertShowValue();
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}); });
@ -252,30 +263,32 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_adjust: function (callback) { _adjust: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { // if (!this._count) {
o.itemsCreator({ // o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_DATA_LENGTH // type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
}, function (res) { // }, function (res) {
self._count = res.count; // self._count = res.count;
// adjust();
// callback();
// });
// } else {
adjust(); adjust();
callback(); callback();
});
} else { // }
adjust();
callback();
}
function adjust() { function adjust() {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) { // if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.Multi, // type: BI.Selection.Multi,
value: [] // value: []
} // }
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) { // } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = { // self.storeValue = {
type: BI.Selection.All, // type: BI.Selection.All,
value: [] // value: []
} // }
} // }
} }
}, },

Write Preview
Loading…
Cancel
Save