From 8de2a9d799e77db051a845591f5904aa6a207df0 Mon Sep 17 00:00:00 2001
From: "mark.ck" <mark.ck@alibaba-inc.com>
Date: Mon, 27 Jul 2020 14:27:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20container=20=E7=BB=84=E4=BB=B6=E5=8F=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20children=EF=BC=9B=202.=20schema.children?=
 =?UTF-8?q?=20=E5=92=8C=20props.children=20=E5=86=85=E5=AE=B9=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/demo/public/assets.json              | 72 ++++++++++++-------
 packages/demo/public/schema.json              |  8 +--
 .../src/transducers/parse-props.ts            |  1 +
 .../src/renderer-view.tsx                     | 10 ++-
 4 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json
index 2de653885..1d4ada11d 100644
--- a/packages/demo/public/assets.json
+++ b/packages/demo/public/assets.json
@@ -188,8 +188,9 @@
           "propType": "object"
         },
         {
-          "name": "columns",
-          "propType": "array"
+          "name": "children",
+          "propType": "array",
+          "description": "列"
         },
         {
           "name": "emptyContent",
@@ -1077,10 +1078,8 @@
         },
         {
           "name": "children",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          }
+          "description": "内容",
+          "propType": "array"
         },
         {
           "name": "style",
@@ -1239,17 +1238,19 @@
         },
         {
           "name": "children",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          }
+          "propType": "array"
         },
         {
           "name": "style",
           "propType": "object",
           "description": "自定义内联样式"
         }
-      ]
+      ],
+      "configure": {
+        "component": {
+          "isContainer": true
+        }
+      }
     },
     {
       "componentName": "Button.Group",
@@ -4120,8 +4121,14 @@
         {
           "name": "children",
           "propType": {
-            "type": "instanceOf",
-            "value": "node"
+            "type": "oneOfType",
+            "value": [
+              "bool",
+              {
+                "type": "instanceOf",
+                "value": "node"
+              }
+            ]
           },
           "description": "内容"
         },
@@ -4284,8 +4291,10 @@
         }
       ],
       "configure": {
-        "isContainer": true,
-        "isModel": true
+        "component": {
+          "isContainer": true,
+          "isModel": true
+        }
       }
     },
     {
@@ -10510,11 +10519,24 @@
           "propType": "func",
           "description": "接收 children 自定义渲染列表"
         },
+        {
+          "name": "dataSource",
+          "propType": "array"
+        },
         {
           "name": "style",
           "propType": "object"
         }
-      ]
+      ],
+      "configure": {
+        "props": {
+          "isExtends": true,
+          "override": [{
+            "name": "dataSource",
+            "setter": "JsonSetter"
+          }]
+        }
+      }
     },
     {
       "componentName": "Tree",
@@ -12706,9 +12728,9 @@
                   "type": "primary",
                   "size": "large",
                   "htmlType": "button",
-                  "component": "button"
-                },
-                "children": "提交"
+                  "component": "button",
+                  "children": ["提交"]
+                }
               }
             }
           ]
@@ -12952,12 +12974,12 @@
               "schema": {
                 "componentName": "Breadcrumb.Item",
                 "props": {
-                  "prefix": "next-"
-                },
-                "children": [
-                  "222",
-                  "222111"
-                ]
+                  "prefix": "next-",
+                  "children": [
+                    "222",
+                    "222111"
+                  ]
+                }
               }
             }
           ]
diff --git a/packages/demo/public/schema.json b/packages/demo/public/schema.json
index 065d5eabb..fcf89ccd0 100644
--- a/packages/demo/public/schema.json
+++ b/packages/demo/public/schema.json
@@ -456,13 +456,9 @@
                   "type":"JSExpression",
                   "value":"this.state.isShowDialog"
               },
-              "children":{
-                  "type":"JSSlot"
-              },
+
               "title":"标题",
-              "footer":{
-                  "type":"JSSlot"
-              },
+
               "events":[
               ]
           }
diff --git a/packages/editor-skeleton/src/transducers/parse-props.ts b/packages/editor-skeleton/src/transducers/parse-props.ts
index 0bf803e41..10e153924 100644
--- a/packages/editor-skeleton/src/transducers/parse-props.ts
+++ b/packages/editor-skeleton/src/transducers/parse-props.ts
@@ -211,6 +211,7 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp
     ) {
       if (component.isContainer !== false) {
         component.isContainer = true;
+        props.push(propConfigToFieldConfig(prop));
         return;
       }
     }
diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx
index 5adf162b4..e1945d853 100644
--- a/packages/react-simulator-renderer/src/renderer-view.tsx
+++ b/packages/react-simulator-renderer/src/renderer-view.tsx
@@ -142,10 +142,18 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> {
             });
             console.info('menuprops', viewProps);
           }
+          let _children = leaf?.isContainer() ? (children == null ? [] : Array.isArray(children) ? children : [children]) : children;
+          if (props.children && props.children.length) {
+            if (Array.isArray(props.children)) {
+              _children = Array.isArray(_children) ? _children.concat(props.children) : props.children.unshift(_children);
+            } else {
+              Array.isArray(_children) && _children.push(props.children) || (_children = [_children].push(props.children));
+            }
+          }
           return createElement(
             getDeviceView(Component, device, designMode),
             viewProps,
-            leaf?.isContainer() ? (children == null ? [] : Array.isArray(children) ? children : [children]) : children,
+            _children,
           );
         }}
         onCompGetRef={(schema: any, ref: ReactInstance | null) => {