diff --git a/packages/fineui/dist/font/iconfont.eot b/packages/fineui/dist/font/iconfont.eot
index 224ca0343..e56e41dd6 100644
Binary files a/packages/fineui/dist/font/iconfont.eot and b/packages/fineui/dist/font/iconfont.eot differ
diff --git a/packages/fineui/dist/font/iconfont.svg b/packages/fineui/dist/font/iconfont.svg
index 268b5cb8d..89f2dc635 100644
--- a/packages/fineui/dist/font/iconfont.svg
+++ b/packages/fineui/dist/font/iconfont.svg
@@ -14,6 +14,54 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -104,7 +152,7 @@
-
+
@@ -216,7 +264,7 @@
-
+
@@ -394,11 +442,11 @@
-
+
-
+
@@ -416,9 +464,9 @@
-
+
-
+
@@ -452,9 +500,9 @@
-
+
-
+
@@ -586,9 +634,9 @@
-
+
-
+
@@ -1306,7 +1354,7 @@
-
+
@@ -1504,7 +1552,7 @@
-
+
@@ -2114,7 +2162,7 @@
-
+
diff --git a/packages/fineui/dist/font/iconfont.ttf b/packages/fineui/dist/font/iconfont.ttf
index 743021ccc..bcc7a160b 100644
Binary files a/packages/fineui/dist/font/iconfont.ttf and b/packages/fineui/dist/font/iconfont.ttf differ
diff --git a/packages/fineui/dist/font/iconfont.woff b/packages/fineui/dist/font/iconfont.woff
index ada633840..20647a0f5 100644
Binary files a/packages/fineui/dist/font/iconfont.woff and b/packages/fineui/dist/font/iconfont.woff differ
diff --git a/packages/fineui/dist/font/iconfont.woff2 b/packages/fineui/dist/font/iconfont.woff2
index 2a5f9019d..06ee43b3a 100644
Binary files a/packages/fineui/dist/font/iconfont.woff2 and b/packages/fineui/dist/font/iconfont.woff2 differ
diff --git a/packages/fineui/src/widget/multiselect/loader.js b/packages/fineui/src/widget/multiselect/loader.js
index c3aa3ffa3..db341ce95 100644
--- a/packages/fineui/src/widget/multiselect/loader.js
+++ b/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();
+ }
+ }
}
}