feat(fr): 数组子项默认值设置 close alibaba#679

Alpsli · Feb 24, 2022 · 3a79e76 · 3a79e76
1 parent e803b19
commit 3a79e76
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/docs/form-render/advanced/listDisplay.md b/docs/form-render/advanced/listDisplay.md
@@ -37,6 +37,7 @@ const schema = {
             type: 'string',
             enum: ['a', 'b', 'c'],
             enumNames: ['早', '中', '晚'],
+            default: 'a'
           },
           obj: {
             title: '对象',
@@ -46,6 +47,7 @@ const schema = {
                 title: '简单输入框',
                 type: 'string',
                 required: true,
+                default: '卡片列表'
               },
               select1: {
                 title: '单选',

diff --git a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/index.js b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/index.js
@@ -2,7 +2,7 @@
 import React from 'react';
 import { get } from 'lodash-es';
 import { useStore, useTools } from '../../../hooks';
-import { getDataPath } from '../../../utils';
+import { getDataPath, getSchemaFromFlatten, generateDataSkeleton } from '../../../utils';
 import './list.less';
 import SimpleList from './SimpleList';
 import CardList from './CardList';
@@ -43,7 +43,9 @@ const RenderList = ({
   };
 
   const addItem = () => {
-    const newList = [...displayList, {}];
+    const _schema = getSchemaFromFlatten(flatten, parentId);
+    const [newItem] = generateDataSkeleton(_schema) || [{}];
+    const newList = [...displayList, newItem];
     const newIndex = newList.length - 1;
     onItemChange(dataPath, newList);
     return newIndex;

diff --git a/packages/form-render/src/form-render-core/src/utils.js b/packages/form-render/src/form-render-core/src/utils.js
@@ -736,19 +736,22 @@ export const generateDataSkeleton = (schema, formData) => {
       const childSchema = schema.properties[key];
       const childData = _formData[key];
       const childResult = generateDataSkeleton(childSchema, childData);
-      result[key] = childResult;
+      if (childResult !== undefined) {
+        result[key] = childResult;
+      }
     });
   } else if (_formData !== undefined) {
     // result = _formData;
+  } else if (schema.default !== undefined) {
+    result = clone(schema.default);
+  } else if (isListType(schema)) {
+    const childData = generateDataSkeleton(schema.items);
+    result = childData && [childData];
+  } else if (schema.type === 'boolean' && !schema.widget) {
+    // result = false;
+    result = undefined;
   } else {
-    if (schema.default !== undefined) {
-      result = clone(schema.default);
-    } else if (schema.type === 'boolean' && !schema.widget) {
-      // result = false;
-      result = undefined;
-    } else {
-      result = undefined;
-    }
+    result = undefined;
   }
   return result;
 };