Browse Source

Pull request #3596: BI-128988 fix: 【来源PT项目】文本过滤组件文本列表勾选状态异常

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '97366af1464ac0192ccf4e5baaed37f348d6a792':
  BI-128988 fix: 【来源PT项目】文本过滤组件文本列表勾选状态异常
  无JIRA update font
  BI-128856 fix: 【6.0.11.1final】仪表板编辑界面,复合过滤组件设置过滤不能实时生效
research/test
Dailer-刘荣歆 1 year ago
parent
commit
da60173b2e
  1. BIN
      packages/fineui/dist/font/iconfont.eot
  2. 74
      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. 21
      packages/fineui/src/widget/multiselect/loader.js

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

Binary file not shown.

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

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 898 KiB

After

Width:  |  Height:  |  Size: 922 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.

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

@ -192,6 +192,11 @@ export class MultiSelectInnerLoader extends Widget {
this.next.setEnd();
}
}
// cacheGroup渲染的是全量的,如果这次加载更多add的items是从cacheItems里面拿的,那不用再add了
if (this.cachItems.length > 0) {
this.button_group.addItems(...arguments);
return;
}
const renderEngine = Widget._renderEngine;
Widget.registerRenderEngine(Element.renderEngine);
this.cachGroup.addItems(...arguments);
@ -220,13 +225,6 @@ export class MultiSelectInnerLoader extends Widget {
this.times = 1;
this.count = 0;
this.count += items.length;
if (isObject(this.next)) {
if (this.hasNext()) {
this.next.setLoaded();
} else {
this.next.invisible();
}
}
return true;
}
@ -243,6 +241,15 @@ export class MultiSelectInnerLoader extends Widget {
this.cachGroup.populate.call(this.cachGroup, items, keyword);
Widget.registerRenderEngine(renderEngine);
this.button_group.populate.call(this.button_group, items.slice(0, firstItemsCount), keyword);
// hasNext依赖的是cacheItems计算,所以从_populate挪到populate里面
if (isObject(this.next)) {
if (this.hasNext()) {
this.next.setLoaded();
} else {
this.next.invisible();
}
}
}
}

Loading…
Cancel
Save