Skip to content

Commit

Permalink
Merge d5cffa3 into abe5a58
Browse files Browse the repository at this point in the history
  • Loading branch information
lvisei committed Jan 5, 2023
2 parents abe5a58 + d5cffa3 commit b55c0d5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/composite-layers/src/utils/index.ts
Expand Up @@ -9,7 +9,7 @@ export * from './keypress';
export const deepMergeLayerOptions = <O extends { source: any }>(options: Partial<O>, srcOptions: Partial<O>): O => {
const { source, ...restOptions } = options;
const { source: srcSource, ...restSrcOptions } = srcOptions;
const target = { ...deepMix(restOptions, restSrcOptions) };
const target = { ...deepMix({}, restOptions, restSrcOptions) };

// source 是实例的情况
if ((srcSource as any) instanceof Source) {
Expand Down

0 comments on commit b55c0d5

Please sign in to comment.