fix(core): fix move down throw errors and fix null assign merge throw…

… errors (#961)
alibaba · Jul 12, 2020 · 854feec · 854feec
1 parent 905aa97
commit 854feec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/core/src/externals.ts b/packages/core/src/externals.ts
@@ -1041,7 +1041,7 @@ export const createFormExternals = (
       },
       moveDown(index: number) {
         const len = toArr(getValue()).length
-        return mutators.move(index, index + 1 > len ? 0 : index + 1)
+        return mutators.move(index, index + 1 >= len ? 0 : index + 1)
       },
       validate(opts?: IFormExtendedValidateFieldOptions) {
         return validate(

diff --git a/packages/shared/src/merge.ts b/packages/shared/src/merge.ts
@@ -90,8 +90,8 @@ function propertyIsUnsafe(target, key) {
 
 function mergeObject(target: any, source: any, options: Options) {
   const destination = options.assign ? target : {}
-
-  if (!options.assign && options.isMergeableObject(target)) {
+  if (!options.isMergeableObject(target)) return target
+  if (!options.assign) {
     getKeys(target).forEach(function(key) {
       destination[key] = cloneUnlessOtherwiseSpecified(target[key], options)
     })