fix: 修复错误修改DefaultOptions问题

wjgogogo · wjgogogo · commit 0292735e37b2 · 2021-12-16T22:32:12.000+08:00
diff --git a/packages/s2-core/__tests__/unit/utils/merge.spec.ts b/packages/s2-core/__tests__/unit/utils/merge.spec.ts
@@ -19,6 +19,14 @@ describe('merge test', () => {
     });
   });
 
+  test('should return new object', () => {
+    const obj = { name: 'name' };
+    const result = customMerge(obj, { age: 100 });
+
+    expect(obj).toEqual({ name: 'name' });
+    expect(result).toEqual({ name: 'name', age: 100 });
+  });
+
   test('should get safety data config', () => {
     expect(getSafetyDataConfig(null)).toStrictEqual({
       data: [],
diff --git a/packages/s2-core/src/sheet-type/spread-sheet.ts b/packages/s2-core/src/sheet-type/spread-sheet.ts
@@ -9,7 +9,6 @@ import {
   isEmpty,
   isFunction,
   isString,
-  merge,
   once,
 } from 'lodash';
 import { hideColumnsByThunkGroup } from '@/utils/hide-columns';
@@ -366,15 +365,18 @@ export abstract class SpreadSheet extends EE {
    */
   public setThemeCfg(themeCfg: ThemeCfg) {
     const theme = themeCfg?.theme || {};
-    this.theme = merge({}, getTheme({ ...themeCfg, spreadsheet: this }), theme);
+    this.theme = customMerge(
+      getTheme({ ...themeCfg, spreadsheet: this }),
+      theme,
+    );
   }
 
   /**
    * Update pagination config which store in {@see options}
    * @param pagination
    */
   public updatePagination(pagination: Pagination) {
-    this.options = merge({}, this.options, {
+    this.options = customMerge(this.options, {
       pagination,
     });
 
@@ -406,7 +408,7 @@ export abstract class SpreadSheet extends EE {
       return;
     }
 
-    this.options = merge({}, this.options, { width, height });
+    this.options = customMerge(this.options, { width, height });
     // resize the canvas
     this.container.changeSize(width, height);
   }
@@ -446,8 +448,7 @@ export abstract class SpreadSheet extends EE {
    */
   public updateScrollOffset(offsetConfig: OffsetConfig): void {
     this.facet.updateScrollOffset(
-      merge(
-        {},
+      customMerge(
         {
           offsetX: {
             value: undefined,
diff --git a/packages/s2-core/src/utils/merge.ts b/packages/s2-core/src/utils/merge.ts
@@ -1,4 +1,4 @@
-import { isArray, isEmpty, merge, mergeWith } from 'lodash';
+import { isArray, isEmpty, mergeWith } from 'lodash';
 import { DEFAULT_OPTIONS } from '../common/constant/options';
 import { S2DataConfig, S2Options } from '@/common/interface';
 import { DEFAULT_DATA_CONFIG } from '@/common/constant/dataConfig';
@@ -11,11 +11,11 @@ export const customMerge = (...objects: unknown[]) => {
   };
   const args = [...objects, customize] as [unknown, unknown];
 
-  return mergeWith(...args);
+  return mergeWith({}, ...args);
 };
 
 export const getSafetyDataConfig = (dataConfig: Partial<S2DataConfig>) => {
-  const result = merge({}, DEFAULT_DATA_CONFIG, dataConfig) as S2DataConfig;
+  const result = customMerge(DEFAULT_DATA_CONFIG, dataConfig) as S2DataConfig;
 
   // 自定义树和数值为空的场景, 关闭 数值置于列头
   if (
@@ -28,4 +28,4 @@ export const getSafetyDataConfig = (dataConfig: Partial<S2DataConfig>) => {
 };
 
 export const getSafetyOptions = (options: Partial<S2Options>) =>
-  merge({}, DEFAULT_OPTIONS, options);
+  customMerge(DEFAULT_OPTIONS, options);
diff --git a/packages/s2-core/src/utils/text.ts b/packages/s2-core/src/utils/text.ts
@@ -6,10 +6,10 @@ import {
   isNumber,
   isString,
   memoize,
-  merge,
   toString,
   values,
 } from 'lodash';
+import { customMerge } from '@/utils/merge';
 import { CellCfg, MultiData } from '@/common/interface';
 import { S2Options } from '@/common/interface/s2Options';
 import { DefaultCellTheme } from '@/common/interface/theme';
@@ -302,7 +302,7 @@ const getStyle = (
     : derivedMeasureText?.mainDown || dataCellTheme.icon.downIconColor;
   if (isDerivedMeasure) {
     const isUp = getDataState(value);
-    return merge(style, {
+    return customMerge(style, {
       fill: isUp ? upFill : downFill,
     });
   }
diff --git a/packages/s2-core/src/utils/tooltip.ts b/packages/s2-core/src/utils/tooltip.ts
@@ -22,7 +22,6 @@ import {
   mapKeys,
   every,
   isObject,
-  merge,
 } from 'lodash';
 import * as CSS from 'csstype';
 import { Event as CanvasEvent } from '@antv/g-canvas';
diff --git a/packages/s2-react/src/hooks/usePaginationEffect.ts b/packages/s2-react/src/hooks/usePaginationEffect.ts
@@ -1,7 +1,7 @@
 import React from 'react';
-import { isEmpty, merge } from 'lodash';
+import { isEmpty } from 'lodash';
 import type { SpreadSheet, S2Options } from '@antv/s2';
-import { getSafetyOptions } from '@antv/s2';
+import { getSafetyOptions, customMerge } from '@antv/s2';
 
 export const usePaginationEffect = (
   s2: SpreadSheet,
@@ -13,7 +13,7 @@ export const usePaginationEffect = (
     if (!s2 || isEmpty(options?.pagination)) {
       return;
     }
-    const newOptions = merge({}, options, {
+    const newOptions = customMerge(options, {
       pagination: {
         current,
         pageSize,
