Pull request #259432: REPORT-112276 & REPORT-112276

Merge in DEC/fineui from ~HANS/fineui:feature/x to feature/x

* commit '7a884527b7d17c9c8539c39a57cad7cba6d5edd3':
  REPORT-112276 公共数据取数简道云数据连接部分适配 补充下ts类型
  REPORT-112276 公共数据取数简道云数据连接部分适配 引用lodash.uniqWith

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;

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 => {

packages/fineui/typescript/core/base.ts

@@ -172,6 +172,8 @@ export declare function uniq<T>(array: T[], isSorted?: boolean, iteratee?: any,
 
 export declare function uniqBy<T>(array: T[], iteratee?: any, context?: any): T[];
 
+export declare function uniqWith<T>(array: T[], comparator?: any): T[];
+
 // 对象相关方法
 export declare function keys(object: object): string[];