diff --git a/packages/fineui/dist/font/iconfont.eot b/packages/fineui/dist/font/iconfont.eot
index d546c0852..4d687da28 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 0b8884829..376406180 100644
--- a/packages/fineui/dist/font/iconfont.svg
+++ b/packages/fineui/dist/font/iconfont.svg
@@ -14,6 +14,12 @@
/>
+
+
+
+
+
+
@@ -92,17 +98,17 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/packages/fineui/dist/font/iconfont.ttf b/packages/fineui/dist/font/iconfont.ttf
index 8a6a119ee..f244d53da 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 299ff37ab..f866bc389 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 044ee253e..78fc1dbb9 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/core/1.lodash.js b/packages/fineui/src/core/1.lodash.js
index ca3a3ade0..2658bdf48 100644
--- a/packages/fineui/src/core/1.lodash.js
+++ b/packages/fineui/src/core/1.lodash.js
@@ -6142,6 +6142,30 @@
return (array && array.length) ? baseUniq(array, baseIteratee(iteratee, 2)) : [];
}
+ /**
+ * This method is like `uniq` except that it accepts `comparator` which
+ * is invoked to compare elements of `array`. The order of result values is
+ * determined by the order they occur in the array. The comparator is invoked
+ * with two arguments: (arrVal, othVal).
+ *
+ * @since 4.0.0
+ * @category Array
+ * @param {Array} array The array to inspect.
+ * @param {Function} [comparator] The comparator invoked per element.
+ * @returns {Array} Returns the new duplicate free array.
+ * @see uniq, uniqBy
+ * @example
+ *
+ * const objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 2 }]
+ *
+ * uniqWith(objects, isEqual)
+ * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+ */
+ function uniqWith(array, comparator) {
+ comparator = typeof comparator === 'function' ? comparator : undefined;
+ return (array && array.length) ? baseUniq(array, undefined, comparator) : [];
+ }
+
/**
* This method is like `_.zip` except that it accepts an array of grouped
* elements and creates an array regrouping the elements to their pre-zip
@@ -10041,6 +10065,7 @@
lodash.union = union;
lodash.uniq = uniq;
lodash.uniqBy = uniqBy;
+ lodash.uniqWith = uniqWith;
lodash.unzip = unzip;
lodash.values = values;
lodash.without = without;
diff --git a/packages/fineui/src/core/2.base.js b/packages/fineui/src/core/2.base.js
index 15502e37b..fe0c611f2 100644
--- a/packages/fineui/src/core/2.base.js
+++ b/packages/fineui/src/core/2.base.js
@@ -482,6 +482,7 @@ _.each(
"take",
"takeRight",
"uniqBy",
+ "uniqWith"
],
name => {
lodashFns[name] = _apply(name);
@@ -510,6 +511,7 @@ export const range = lodashFns.range;
export const take = lodashFns.take;
export const takeRight = lodashFns.takeRight;
export const uniqBy = lodashFns.uniqBy;
+export const uniqWith = lodashFns.uniqWith;
export const findIndex = lodashFns.findIndex;
export const findLastIndex = lodashFns.findLastIndex;
@@ -972,7 +974,7 @@ export let nextTick = /*!PURE*/(function () {
pending = true;
timerFunc();
}
-
+
if (!cb && typeof Promise !== "undefined") {
return new Promise((resolve, reject) => {
_resolve = resolve;
@@ -983,7 +985,7 @@ export let nextTick = /*!PURE*/(function () {
export const setNextTick = (fn) => {
nextTick = fn;
-}
+}
// 数字相关方法
_.each(["random"], name => {
diff --git a/packages/fineui/src/widget/multiselect/loader.js b/packages/fineui/src/widget/multiselect/loader.js
index f39c35ef7..933c96e43 100644
--- a/packages/fineui/src/widget/multiselect/loader.js
+++ b/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");
}
diff --git a/packages/fineui/typescript/core/base.ts b/packages/fineui/typescript/core/base.ts
index 10d9794ec..07b481d34 100644
--- a/packages/fineui/typescript/core/base.ts
+++ b/packages/fineui/typescript/core/base.ts
@@ -172,6 +172,8 @@ export declare function uniq(array: T[], isSorted?: boolean, iteratee?: any,
export declare function uniqBy(array: T[], iteratee?: any, context?: any): T[];
+export declare function uniqWith(array: T[], comparator?: any): T[];
+
// 对象相关方法
export declare function keys(object: object): string[];