fix: 数组内部子元素校验失效 (#126)

jd-opensource · Jan 15, 2022 · 6f0a89e · 6f0a89e
1 parent fa75163
commit 6f0a89e
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 11 deletions.
diff --git a/packages/utils/__tests__/combine.ts b/packages/utils/__tests__/combine.ts
@@ -41,6 +41,12 @@ import {
   unitedSchema as verify7,
   parsedSchema as test7,
 } from '../__testsdata__/datePicker.schema'
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import {
+  unitedSchema as verify8,
+  parsedSchema as test8,
+} from '../__testsdata__/array.schema'
 
 describe('combine', () => {
   test('test dataPicker.schema', () => {
@@ -81,4 +87,8 @@ describe('combine', () => {
     const data = combine(test6.dataSchema, test6.uiSchema)
     expect(data).toStrictEqual(verify6)
   })
+  test('test array.schema.js', () => {
+    const data = combine(test8.dataSchema, test8.uiSchema)
+    expect(data).toStrictEqual(verify8)
+  })
 })
diff --git a/packages/utils/__tests__/parse.ts b/packages/utils/__tests__/parse.ts
@@ -41,6 +41,12 @@ import {
   unitedSchema as test7,
   parsedSchema as verify7,
 } from '../__testsdata__/datePicker.schema'
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import {
+  unitedSchema as test8,
+  parsedSchema as verify8,
+} from '../__testsdata__/array.schema'
 
 describe('parseUnitedSchema', () => {
   test('test datePicker.schema.js', () => {
@@ -77,4 +83,9 @@ describe('parseUnitedSchema', () => {
     const data = parseUnitedSchema(test6)
     expect(data).toStrictEqual(verify6)
   })
+
+  test('test array.schema.js', () => {
+    const data = parseUnitedSchema(test8)
+    expect(data).toStrictEqual(verify8)
+  })
 })
diff --git a/packages/utils/__testsdata__/array.schema.js b/packages/utils/__testsdata__/array.schema.js
@@ -0,0 +1,86 @@
+export const unitedSchema = {
+  validateTime: 'change',
+  type: 'object',
+  theme: 'antd',
+  schema: [
+    {
+      validateTime: 'submit',
+      type: 'array',
+      title: '数组容器',
+      ui: {
+        type: 'array',
+        mode: 'add',
+        addTitle: '添加一行数据',
+      },
+      items: {
+        validateTime: 'submit',
+        type: 'string',
+        title: '输入框',
+        minLength: 2,
+        errMsg: {
+          minLength: '2',
+        },
+        ui: {
+          type: 'text',
+          style: {
+            width: '100%',
+          },
+        },
+      },
+      fieldKey: 'array_g6NF65',
+    },
+  ],
+}
+
+export const parsedSchema = {
+  dataSchema: {
+    validateTime: 'change',
+    type: 'object',
+    properties: {
+      array_g6NF65: {
+        validateTime: 'submit',
+        type: 'array',
+        title: '数组容器',
+        items: {
+          validateTime: 'submit',
+          type: 'string',
+          title: '输入框',
+          minLength: 2,
+          errorMessage: {
+            minLength: '2',
+          },
+        },
+      },
+    },
+  },
+  uiSchema: {
+    theme: 'antd',
+    order: ['array_g6NF65'],
+    properties: {
+      array_g6NF65: {
+        type: 'array',
+        mode: 'add',
+        addTitle: '添加一行数据',
+        order: ['$container'],
+        properties: {
+          $container: {
+            type: 'text',
+            style: {
+              width: '100%',
+            },
+          },
+        },
+      },
+    },
+  },
+  typePath: {
+    array_g6NF65: {
+      fatherKey: '',
+      type: 'array',
+    },
+    'array_g6NF65.$container': {
+      fatherKey: 'array_g6NF65',
+      type: 'string',
+    },
+  },
+}
diff --git a/packages/utils/src/schemaHandle/parse.ts b/packages/utils/src/schemaHandle/parse.ts
@@ -116,20 +116,30 @@ function recursiveParse(
               if (currLevelDataSchema.required) {
                 currLevelDataSchema.required.push(fieldKey)
               }
-              currLevelDataSchema.errorMessage.required[fieldKey] = item[key]
+              if (currLevelDataSchema.errorMessage) {
+                currLevelDataSchema.errorMessage.required[fieldKey] = item[key]
+              }
             }
             break
           case 'errMsg':
-            judgeAndRegister(
-              currLevelDataSchema,
-              'object',
-              containerKey,
-              fieldKey
-            )
+            if (fieldKey !== '$container') {
+              judgeAndRegister(
+                currLevelDataSchema,
+                'object',
+                containerKey,
+                fieldKey
+              )
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              currLevelDataSchema[containerKey][fieldKey].errorMessage =
+                item[key]
+            } else {
+              judgeAndRegister(currLevelDataSchema, 'object', containerKey)
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              currLevelDataSchema[containerKey].errorMessage = item[key]
+            }
             // 兜底报错信息解析
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            currLevelDataSchema[containerKey][fieldKey].errorMessage = item[key]
             break
           default:
             if (key !== 'fieldKey') {

diff --git a/packages/utils/src/schemaHandle/types.ts b/packages/utils/src/schemaHandle/types.ts
@@ -74,7 +74,7 @@ export type DataSchema = {
   properties?: Map
   items?: Array<Map> | Map
   required?: Array<string | number>
-  errorMessage: {
+  errorMessage?: {
     required: Map
     properties?: Map
     items?: Map