mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 13:39:24 +08:00
* fix: add license code * fix: bug * fix: bug * fix: upgrade * fix: improve * chore: add copyright information to the file header * fix: d.ts bug * fix: bug * fix: e2e bug * fix: merge main --------- Co-authored-by: chenos <chenlinxh@gmail.com>
20 lines
555 B
TypeScript
20 lines
555 B
TypeScript
/**
|
|
* This file is part of the NocoBase (R) project.
|
|
* Copyright (c) 2020-2024 NocoBase Co., Ltd.
|
|
* Authors: NocoBase Team.
|
|
*
|
|
* This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
|
|
* For more information, please refer to: https://www.nocobase.com/agreement.
|
|
*/
|
|
|
|
import deepmerge from 'deepmerge';
|
|
|
|
const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
|
|
|
|
export function merge(obj1: any, obj2: any, opts?: any) {
|
|
return deepmerge(obj1, obj2, {
|
|
arrayMerge: overwriteMerge,
|
|
...opts,
|
|
});
|
|
}
|