fix: 修复errorMessage在对象数组未透传问题

jd-opensource · Jan 20, 2022 · d69d1d6 · d69d1d6
1 parent 5f0f211
commit d69d1d6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/utils/__testsdata__/array.schema.js b/packages/utils/__testsdata__/array.schema.js
@@ -12,6 +12,10 @@ export const unitedSchema = {
         mode: 'add',
         addTitle: '添加一行数据',
       },
+      minItems: 1,
+      errMsg: {
+        minItems: '最小1',
+      },
       items: {
         validateTime: 'submit',
         type: 'string',
@@ -41,6 +45,10 @@ export const parsedSchema = {
         validateTime: 'submit',
         type: 'array',
         title: '数组容器',
+        minItems: 1,
+        errorMessage: {
+          minItems: '最小1',
+        },
         items: {
           validateTime: 'submit',
           type: 'string',

diff --git a/packages/utils/src/schemaHandle/combine.ts b/packages/utils/src/schemaHandle/combine.ts
@@ -46,12 +46,14 @@ function valueClone({
     }
   }
 
-  if (
-    dataType &&
-    !['object', 'array'].includes(dataType) &&
-    Object.hasOwnProperty.call(rawObj, 'errorMessage')
-  ) {
+  if (dataType && Object.hasOwnProperty.call(rawObj, 'errorMessage')) {
     targetObj.errMsg = deepClone(rawObj.errorMessage)
+    if (targetObj.errMsg.required) {
+      delete targetObj.errMsg.required
+      if (Object.keys(targetObj.errMsg).length === 0) {
+        delete targetObj.errMsg
+      }
+    }
   }
 }
 
@@ -74,7 +76,6 @@ function recursionCombine(
     rawObj: dataSchema,
     dataType: dataSchema.type,
   })
-
   // uiSchema非空时进行拷贝
   if (!isEmpty(uiSchema)) {
     // 填充ui属性，用于存放uiSchema