Browse Source

Merge pull request #259424 in DEC/fineui from final/11.0 to release/11.0

* commit '40d5174afb364726df15246ad7e9789224e87494':
  BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
  update font
research/test
superman 11 months ago
parent
commit
e2930cfcad
  1. BIN
      packages/fineui/dist/font/iconfont.eot
  2. 36
      packages/fineui/dist/font/iconfont.svg
  3. BIN
      packages/fineui/dist/font/iconfont.ttf
  4. BIN
      packages/fineui/dist/font/iconfont.woff
  5. BIN
      packages/fineui/dist/font/iconfont.woff2
  6. 20
      packages/fineui/src/widget/multiselect/loader.js

BIN
packages/fineui/dist/font/iconfont.eot vendored

Binary file not shown.

36
packages/fineui/dist/font/iconfont.svg vendored

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 1010 KiB

After

Width:  |  Height:  |  Size: 1015 KiB

BIN
packages/fineui/dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
packages/fineui/dist/font/iconfont.woff vendored

Binary file not shown.

BIN
packages/fineui/dist/font/iconfont.woff2 vendored

Binary file not shown.

20
packages/fineui/src/widget/multiselect/loader.js

@ -73,14 +73,14 @@ export class MultiSelectInnerLoader extends Widget {
if (this.cachItems && this.cachItems.length > 0) {
this.next.setLoaded();
const items = this._composeItems(this.cachItems.slice(0, 100));
this.addItems(items);
this.cachItems = this.cachItems.slice(100);
this.addItems(items);
return;
}
o.itemsCreator.apply(this, [
{ times: ++this.times },
function() {
function () {
self.next.setLoaded();
self.addItems(...arguments);
}
@ -105,7 +105,7 @@ export class MultiSelectInnerLoader extends Widget {
],
value: o.value,
});
this.button_group.on(Controller.EVENT_CHANGE, function(type, value, obj) {
this.button_group.on(Controller.EVENT_CHANGE, function (type, value, obj) {
if (type === Events.CLICK) {
const node = self.cachGroup.getNodeByValue(value);
if (node) {
@ -158,12 +158,12 @@ export class MultiSelectInnerLoader extends Widget {
});
o.isDefaultInit &&
isEmpty(o.items) &&
nextTick(
bind(function() {
o.isDefaultInit && isEmpty(o.items) && this._populate();
}, this)
);
isEmpty(o.items) &&
nextTick(
bind(function () {
o.isDefaultInit && isEmpty(o.items) && this._populate();
}, this)
);
}
hasNext() {
@ -221,7 +221,7 @@ export class MultiSelectInnerLoader extends Widget {
if (arguments.length === 0 && isFunction(o.itemsCreator)) {
o.itemsCreator.apply(this, [
{ times: 1 },
function(items, keyword) {
function (items, keyword) {
if (arguments.length === 0) {
throw new Error("object already registered");
}

Loading…
Cancel
Save