From 498278660112a52b7c6e608159d20920d6047e04 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: 星期六, 28 十一月 2020 14:27:26 +0800
Subject: [PATCH] fix(form): fix updateSchema error #100
---
src/utils/index.ts | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/utils/index.ts b/src/utils/index.ts
index f935959..d37797e 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,4 +1,5 @@
export const timestamp = () => +Date.now();
+import { isObject } from '/@/utils/is';
export const clamp = (n: number, min: number, max: number) => Math.min(max, Math.max(min, n));
export const noop = () => {};
export const now = () => Date.now();
@@ -40,10 +41,7 @@
export function deepMerge<T = any>(src: any, target: any): T {
let key: string;
for (key in target) {
- src[key] =
- src[key] && src[key].toString() === '[object Object]'
- ? deepMerge(src[key], target[key])
- : (src[key] = target[key]);
+ src[key] = isObject(src[key]) ? deepMerge(src[key], target[key]) : (src[key] = target[key]);
}
return src;
}
--
Gitblit v1.8.0