chore: improve playground code

alibaba · Nov 23, 2021 · 6df7210 · 6df7210
1 parent 0f316ea
commit 6df7210
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/formily/antd/playground/widgets/MarkupSchemaWidget.tsx b/formily/antd/playground/widgets/MarkupSchemaWidget.tsx
@@ -10,7 +10,11 @@ export interface IMarkupSchemaWidgetProps {
 const transformToMarkupSchemaCode = (tree: TreeNode) => {
   const printAttribute = (node: TreeNode) => {
     if (!node) return ''
-    return `${Object.keys({ ...node.props, name: node.props.name || node.id })
+    const props = { ...node.props }
+    if (node.depth !== 0) {
+      props.name = node.props.name || node.id
+    }
+    return `${Object.keys(props)
       .map((key) => {
         if (
           key === 'x-designable-id' ||
@@ -20,7 +24,7 @@ const transformToMarkupSchemaCode = (tree: TreeNode) => {
           key === 'type'
         )
           return ''
-        const value = node.props[key]
+        const value = props[key]
         if (isPlainObj(value) && isEmpty(value)) return ''
         if (typeof value === 'string') return `${key}="${value}"`
         return `${key}={${JSON.stringify(value)}}`

diff --git a/formily/next/playground/widgets/MarkupSchemaWidget.tsx b/formily/next/playground/widgets/MarkupSchemaWidget.tsx
@@ -10,7 +10,11 @@ export interface IMarkupSchemaWidgetProps {
 const transformToMarkupSchemaCode = (tree: TreeNode) => {
   const printAttribute = (node: TreeNode) => {
     if (!node) return ''
-    return `${Object.keys({ ...node.props, name: node.props.name || node.id })
+    const props = { ...node.props }
+    if (node.depth !== 0) {
+      props.name = node.props.name || node.id
+    }
+    return `${Object.keys(props)
       .map((key) => {
         if (
           key === 'x-designable-id' ||