Fix bug in vue object merge

CzBiX · CzBiX · commit 408facb70786 · 2021-08-08T13:04:42.000+08:00
diff --git a/src/utils/vue-object-merge.ts b/src/utils/vue-object-merge.ts
@@ -6,7 +6,7 @@ import { isPlainObject } from 'lodash';
 export const stateMerge = function(state: any, value: any, propName?: string, ignoreNull?: boolean) {
 	if (isPlainObject(state) && (propName == null || propName in state)) {
 		const o = propName == null ? state : state[propName];
-		if (o != null) {
+		if (o != null && isPlainObject(value)) {
 			for (const prop in value) {
 				stateMerge(o, value[prop], prop, ignoreNull);
 			}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { isPlainObject } from 'lodash';`
`6`	`6`	`export const stateMerge = function(state: any, value: any, propName?: string, ignoreNull?: boolean) {`
`7`	`7`	`if (isPlainObject(state) && (propName == null \|\| propName in state)) {`
`8`	`8`	`const o = propName == null ? state : state[propName];`
`9`		`- if (o != null) {`
	`9`	`+ if (o != null && isPlainObject(value)) {`
`10`	`10`	`for (const prop in value) {`
`11`	`11`	`stateMerge(o, value[prop], prop, ignoreNull);`
`12`	`12`	`}`