Browse Source

Pull request #259433: 无jira fix:解决冲突

Merge in DEC/fineui from ~OLIVER.CHEN/dec-fineui:feature/x to feature/x

* commit '02f1cc1c2401fd00c1f116ed8f6166af923e9442':
  REPORT-112276 公共数据取数简道云数据连接部分适配 补充下ts类型
  REPORT-112276 公共数据取数简道云数据连接部分适配 引用lodash.uniqWith
  BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
  update font
master
Oliver.Chen-陈润桐 11 months ago
parent
commit
a9ff10b3b6
  1. BIN
      packages/fineui/dist/font/iconfont.eot
  2. 18
      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. 2
      packages/fineui/src/widget/multiselect/loader.js

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

Binary file not shown.

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

File diff suppressed because one or more lines are too long

Before

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

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

@ -73,8 +73,8 @@ export class MultiSelectInnerLoader extends Widget {
if (this.cachItems && this.cachItems.length > 0) { if (this.cachItems && this.cachItems.length > 0) {
this.next.setLoaded(); this.next.setLoaded();
const items = this._composeItems(this.cachItems.slice(0, 100)); const items = this._composeItems(this.cachItems.slice(0, 100));
this.addItems(items);
this.cachItems = this.cachItems.slice(100); this.cachItems = this.cachItems.slice(100);
this.addItems(items);
return; return;
} }

Loading…
Cancel
Save