diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json
index 34d8c490b..2caf8ae3f 100644
--- a/packages/demo/public/assets.json
+++ b/packages/demo/public/assets.json
@@ -264,7 +264,17 @@
         "component": {
           "isContainer": true,
           "isModel": true
-        }
+        },
+        "props": [
+          {
+            "name": "prefix",
+            "title": {
+              "type": "i18n",
+              "zh_CN": "前缀",
+              "en_US": "prefix"
+            }
+          }
+        ]
     }
     },
     {
@@ -635,7 +645,24 @@
           "name": "cell",
           "propType": "func"
         }
-      ]
+      ],
+      "configure": {
+        "props": {
+          "isExtends": true,
+          "override": [{
+            "name": "cell",
+            "setter": {
+              "componentName": "SlotSetter",
+              "props": {
+                "supportParams": true
+              }
+            },
+            "extraProps": {
+              "display": "block"
+            }
+          }]
+        }
+      }
     },
     {
       "componentName": "Badge",
@@ -957,7 +984,8 @@
       ],
       "configure": {
         "component": {
-          "isContainer": true
+          "isModel": true,
+          "rootSelector": "div.next-balloon"
         }
       }
     },
@@ -1241,7 +1269,22 @@
       "configure": {
         "component": {
           "isContainer": true
-        }
+        },
+        "props": [
+          {
+            "name": "maxNode",
+            "title": {
+              "label": "最大节点数",
+              "tip": "默认 100"
+            },
+            "setter": "NumberSetter"
+          },
+          {
+            "name": "separator",
+            "title": "分隔符",
+            "setter": "StringSetter"
+          }
+        ]
       }
     },
     {
@@ -1330,7 +1373,9 @@
       ],
       "configure": {
         "component": {
-          "isContainer": true
+          "isContainer": true,
+          "isModel": true,
+          "rootSelector": "div.MCBreadcrumb"
         }
       }
     },
@@ -1388,9 +1433,11 @@
         }
       ],
       "configure": {
-        "component": {
-          "isContainer": true
-        }
+        "props": [{
+          "name": "children",
+          "title": "文本内容",
+          "setter": "StringSetter"
+        }]
       }
     },
     {
@@ -1411,7 +1458,12 @@
         {
           "name": "children",
           "title": "内容",
-          "propType": "array"
+          "propType": "string"
+        },
+        {
+          "name": "icon",
+          "propType": "string",
+          "description": "自定义内联样式"
         },
         {
           "name": "type",
@@ -1462,13 +1514,14 @@
         },
         {
           "name": "loading",
-          "title": "是否 loading",
+          "title": "loading",
           "propType": "bool",
           "description": "设置按钮的载入状态",
           "defaultValue": false
         },
         {
           "name": "ghost",
+          "title": "ghost",
           "propType": {
             "type": "oneOf",
             "value": [
@@ -1483,18 +1536,21 @@
         },
         {
           "name": "text",
+          "title": "text",
           "propType": "bool",
           "description": "是否为文本按钮",
           "defaultValue": false
         },
         {
           "name": "warning",
+          "title": "warning",
           "propType": "bool",
           "description": "是否为警告按钮",
           "defaultValue": false
         },
         {
           "name": "disabled",
+          "title": "disabled",
           "propType": "bool",
           "description": "是否禁用",
           "defaultValue": false
@@ -1520,8 +1576,33 @@
         }
       ],
       "configure": {
-        "component": {
-          "isContainer": true
+        "props": {
+          "isExtends": true,
+          "override": [
+            {
+              "name": "icon",
+              "setter": "StringSetter",
+              "extraProps": {
+                "defaultValue": "success",
+                "onChange": {
+                  "type": "JSFunction",
+                  "value": "(val, field, editor) => {\n  field.nodes[0].children.import({\"componentName\": \"Icon\", \"props\": {\"type\": val, \"style\": {\"marginRight\": 5}}}, true); //field.top.setPropValue('children', [{\"componentName\": \"Icon\", \"props\": {\"type\": val}}, (field.top.getPropValue('children') || []).slice(-1)]);\n}"
+                }
+              }
+            },
+            {
+              "name": "children",
+              "setter": {
+                "componentName": "MixedSetter",
+                "props": {
+                  "setters": [
+                    "StringSetter",
+                    "ExpressionSetter"
+                  ]
+                }
+              }
+            }
+          ]
         }
       }
     },
@@ -1827,7 +1908,30 @@
           "name": "style",
           "propType": "object"
         }
-      ]
+      ],
+      "configure": {
+      "props": {
+        "isExtends": true,
+        "override": [
+          {
+            "name": "startValue",
+            "setter": "DateSetter"
+          },
+          {
+            "name": "defaultStartValue",
+            "setter": "DateSetter"
+          },
+          {
+            "name": "defaultEndValue",
+            "setter": "DateSetter"
+          },
+          {
+            "name": "endValue",
+            "setter": "DateSetter"
+          }
+        ]
+      }
+    }
     },
     {
       "componentName": "Card",
@@ -1843,30 +1947,13 @@
         "subName": ""
       },
       "props": [
-        {
-          "name": "prefix",
-          "propType": "string",
-          "defaultValue": "next-"
-        },
-        {
-          "name": "rtl",
-          "propType": "bool"
-        },
-        {
-          "name": "media",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          },
-          "description": "卡片的上的图片 / 视频"
-        },
         {
           "name": "title",
           "propType": {
             "type": "instanceOf",
             "value": "node"
           },
-          "description": "卡片的标题"
+          "description": "标题"
         },
         {
           "name": "subTitle",
@@ -1874,7 +1961,35 @@
             "type": "instanceOf",
             "value": "node"
           },
-          "description": "卡片的副标题"
+          "description": "副标题"
+        },
+        {
+          "name": "extra",
+          "propType": {
+            "type": "instanceOf",
+            "value": "node"
+          },
+          "description": "标题栏用户自定义内容"
+        },
+        {
+          "name": "showTitleBullet",
+          "propType": "bool",
+          "description": "标题的项目符号",
+          "defaultValue": true
+        },
+        {
+          "name": "showHeadDivider",
+          "propType": "bool",
+          "description": "头部分隔线",
+          "defaultValue": true
+        },
+        {
+          "name": "media",
+          "propType": {
+            "type": "instanceOf",
+            "value": "node"
+          },
+          "description": "顶部的图片/视频"
         },
         {
           "name": "actions",
@@ -1882,19 +1997,7 @@
             "type": "instanceOf",
             "value": "node"
           },
-          "description": "卡片操作组，位置在卡片底部"
-        },
-        {
-          "name": "showTitleBullet",
-          "propType": "bool",
-          "description": "是否显示标题的项目符号",
-          "defaultValue": true
-        },
-        {
-          "name": "showHeadDivider",
-          "propType": "bool",
-          "description": "是否展示头部的分隔线",
-          "defaultValue": true
+          "description": "底部操作组"
         },
         {
           "name": "contentHeight",
@@ -1908,36 +2011,25 @@
           "description": "内容区域的固定高度",
           "defaultValue": 120
         },
-        {
-          "name": "extra",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          },
-          "description": "标题区域的用户自定义内容"
-        },
-        {
-          "name": "free",
-          "propType": "bool",
-          "description": "是否开启自由模式，开启后card 将使用子组件配合使用, 设置此项后 title, subtitle, 等等属性都将失效",
-          "defaultValue": false
-        },
         {
           "name": "className",
           "propType": "string"
         },
-        {
-          "name": "children",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          }
-        },
         {
           "name": "style",
           "propType": "object"
+        },
+        {
+          "name": "rtl",
+          "propType": "bool",
+          "description": "文本方向是从右向左"
         }
-      ]
+      ],
+      "configure": {
+        "component": {
+          "isContainer": true
+        }
+      }
     },
     {
       "componentName": "CardHeader",
@@ -3363,7 +3455,18 @@
           "name": "style",
           "propType": "object"
         }
-      ]
+      ],
+      "configure": {
+        "props": {
+          "isExtends": true,
+          "override": [
+            {
+              "name": "value",
+              "setter": "DateSetter"
+            }
+          ]
+        }
+      }
     },
     {
       "componentName": "RangePicker",
@@ -5616,13 +5719,6 @@
           "propType": "string",
           "description": "指定显示哪种图标"
         },
-        {
-          "name": "children",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          }
-        },
         {
           "name": "size",
           "propType": {
@@ -5655,10 +5751,6 @@
         {
           "name": "style",
           "propType": "object"
-        },
-        {
-          "name": "prefix",
-          "defaultValue": "next-"
         }
       ]
     },
@@ -5939,15 +6031,9 @@
         "subName": ""
       },
       "props": [
-        {
-          "name": "prefix",
-          "propType": "string",
-          "description": "样式前缀",
-          "defaultValue": "next-"
-        },
         {
           "name": "tip",
-          "propType": "any",
+          "propType": "string",
           "description": "自定义内容"
         },
         {
@@ -5959,7 +6045,7 @@
               "bottom"
             ]
           },
-          "description": "自定义内容位置\n@enumdesc 出现在动画右边, 出现在动画下面",
+          "description": "自定义内容位置",
           "defaultValue": "bottom"
         },
         {
@@ -5994,14 +6080,9 @@
           "description": "设置动画尺寸\n@description 仅仅对默认动画效果起作用\n@enumdesc 大号, 中号",
           "defaultValue": "large"
         },
-        {
-          "name": "indicator",
-          "propType": "any",
-          "description": "自定义动画"
-        },
         {
           "name": "color",
-          "propType": "string",
+          "propType": "color",
           "description": "动画颜色"
         },
         {
@@ -6009,26 +6090,19 @@
           "propType": "bool",
           "description": "全屏展示"
         },
-        {
-          "name": "children",
-          "propType": "any",
-          "description": "子元素"
-        },
         {
           "name": "inline",
+          "title": "inline",
           "propType": "bool",
           "description": "should loader be displayed inline",
           "defaultValue": true
-        },
-        {
-          "name": "rtl",
-          "propType": "bool"
-        },
-        {
-          "name": "animate",
-          "defaultValue": null
         }
-      ]
+      ],
+      "configure": {
+        "component": {
+          "isContainer": true
+        }
+      }
     },
     {
       "componentName": "Menu",
@@ -7036,16 +7110,6 @@
         "subName": ""
       },
       "props": [
-        {
-          "name": "prefix",
-          "propType": "string",
-          "defaultValue": "next-"
-        },
-        {
-          "name": "pure",
-          "propType": "bool",
-          "defaultValue": false
-        },
         {
           "name": "className",
           "propType": "string"
@@ -7054,6 +7118,12 @@
           "name": "style",
           "propType": "object"
         },
+        {
+          "name": "title",
+          "propType": "string",
+          "description": "标题",
+          "defaultValue": "标题"
+        },
         {
           "name": "type",
           "propType": {
@@ -7080,7 +7150,7 @@
               "toast"
             ]
           },
-          "description": "反馈外观",
+          "description": "外观",
           "defaultValue": "inline"
         },
         {
@@ -7092,31 +7162,20 @@
               "large"
             ]
           },
-          "description": "反馈大小",
+          "description": "尺寸",
           "defaultValue": "medium"
         },
-        {
-          "name": "title",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          },
-          "description": "标题"
-        },
         {
           "name": "children",
           "propType": {
-            "type": "instanceOf",
-            "value": "node"
+            "type": "oneOfType",
+            "value": [
+              "string",
+              "node"
+            ]
           },
           "description": "内容"
         },
-        {
-          "name": "defaultVisible",
-          "propType": "bool",
-          "description": "默认是否显示",
-          "defaultValue": true
-        },
         {
           "name": "visible",
           "propType": "bool",
@@ -7146,16 +7205,8 @@
         {
           "name": "animation",
           "propType": "bool",
-          "description": "是否开启展开收起动画",
+          "description": "收起动画",
           "defaultValue": true
-        },
-        {
-          "name": "locale",
-          "propType": "object"
-        },
-        {
-          "name": "rtl",
-          "propType": "bool"
         }
       ]
     },
@@ -7627,24 +7678,6 @@
         "subName": ""
       },
       "props": [
-        {
-          "name": "prefix",
-          "propType": "string",
-          "description": "样式前缀",
-          "defaultValue": "next-"
-        },
-        {
-          "name": "type",
-          "propType": {
-            "type": "oneOf",
-            "value": [
-              "normal",
-              "inline"
-            ]
-          },
-          "description": "设置类型\n@enumdesc 普通, 内联",
-          "defaultValue": "normal"
-        },
         {
           "name": "size",
           "propType": {
@@ -7657,6 +7690,18 @@
           "description": "大小",
           "defaultValue": "medium"
         },
+        {
+          "name": "type",
+          "propType": {
+            "type": "oneOf",
+            "value": [
+              "normal",
+              "inline"
+            ]
+          },
+          "description": "设置类型",
+          "defaultValue": "normal"
+        },
         {
           "name": "value",
           "propType": "number",
@@ -7674,13 +7719,7 @@
         },
         {
           "name": "step",
-          "propType": {
-            "type": "oneOfType",
-            "value": [
-              "number",
-              "string"
-            ]
-          },
+          "propType": "number",
           "description": "步长",
           "defaultValue": 1
         },
@@ -7701,6 +7740,57 @@
           "propType": "bool",
           "description": "自动焦点"
         },
+        {
+          "name": "max",
+          "propType": "number",
+          "description": "最大值",
+          "defaultValue": null
+        },
+        {
+          "name": "min",
+          "propType": "number",
+          "description": "最小值",
+          "defaultValue": null
+        },
+        {
+          "name": "format",
+          "propType": "func",
+          "description": "格式化当前值"
+        },
+        {
+          "name": "upBtnProps",
+          "propType": "object",
+          "description": "增加按钮的props"
+        },
+        {
+          "name": "downBtnProps",
+          "propType": "object",
+          "description": "减少按钮的props"
+        },
+        {
+          "name": "label",
+          "propType": "string",
+          "description": "内联 label"
+        },
+        {
+          "name": "innerAfter",
+          "propType": "string",
+          "description": "inner after"
+        },
+        {
+          "name": "rtl",
+          "propType": "bool"
+        },
+        {
+          "name": "isPreview",
+          "propType": "bool",
+          "description": "是否为预览态"
+        },
+        {
+          "name": "renderPreview",
+          "propType": "func",
+          "description": "预览态模式下渲染的内容\n@param {number} value 评分值"
+        },
         {
           "name": "onChange",
           "propType": "func",
@@ -7730,18 +7820,6 @@
           "name": "onDisabled",
           "propType": "func"
         },
-        {
-          "name": "max",
-          "propType": "number",
-          "description": "最大值",
-          "defaultValue": null
-        },
-        {
-          "name": "min",
-          "propType": "number",
-          "description": "最小值",
-          "defaultValue": null
-        },
         {
           "name": "className",
           "propType": "string",
@@ -7751,74 +7829,23 @@
           "name": "style",
           "propType": "object",
           "description": "自定义内联样式"
-        },
-        {
-          "name": "state",
-          "propType": {
-            "type": "oneOf",
-            "value": [
-              "error"
-            ]
-          }
-        },
-        {
-          "name": "format",
-          "propType": "func",
-          "description": "格式化当前值\n@param {Number} value\n@return {String|Number}"
-        },
-        {
-          "name": "upBtnProps",
-          "propType": "object",
-          "description": "增加按钮的props"
-        },
-        {
-          "name": "downBtnProps",
-          "propType": "object",
-          "description": "减少按钮的props"
-        },
-        {
-          "name": "label",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          },
-          "description": "内联 label"
-        },
-        {
-          "name": "innerAfter",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          },
-          "description": "inner after"
-        },
-        {
-          "name": "rtl",
-          "propType": "bool"
-        },
-        {
-          "name": "isPreview",
-          "propType": "bool",
-          "description": "是否为预览态"
-        },
-        {
-          "name": "renderPreview",
-          "propType": "func",
-          "description": "预览态模式下渲染的内容\n@param {number} value 评分值"
-        },
-        {
-          "name": "device",
-          "propType": {
-            "type": "oneOf",
-            "value": [
-              "phone",
-              "tablet",
-              "desktop"
-            ]
-          },
-          "description": "预设屏幕宽度"
         }
-      ]
+      ],
+      "configure": {
+        "props": {
+          "isExtends": true,
+          "override": [
+            {
+              "name": "upBtnProps",
+              "setter": "JsonSetter"
+            },
+            {
+              "name": "downBtnProps",
+              "setter": "JsonSetter"
+            }
+          ]
+        }
+      }
     },
     {
       "componentName": "Pagination",
@@ -8140,53 +8167,35 @@
           "propType": "string",
           "description": "自定义类名"
         },
-        {
-          "name": "id",
-          "propType": "string",
-          "description": "组件input的id"
-        },
         {
           "name": "style",
           "propType": "object",
           "description": "自定义内敛样式"
         },
+        {
+          "name": "id",
+          "propType": "string",
+          "description": "input元素id"
+        },
         {
           "name": "checked",
           "propType": "bool",
-          "description": "设置radio是否选中"
+          "description": "是否选中"
         },
         {
           "name": "defaultChecked",
           "propType": "bool",
-          "description": "设置radio是否默认选中"
+          "description": "是否默认选中"
         },
         {
           "name": "label",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          },
+          "propType": "string",
           "description": "通过属性配置label"
         },
-        {
-          "name": "onChange",
-          "propType": "func",
-          "description": "状态变化时触发的事件\n@param {Boolean} checked 是否选中\n@param {Event} e Dom 事件对象"
-        },
-        {
-          "name": "onMouseEnter",
-          "propType": "func",
-          "description": "鼠标进入enter事件\n@param {Event} e Dom 事件对象"
-        },
-        {
-          "name": "onMouseLeave",
-          "propType": "func",
-          "description": "鼠标离开事件\n@param {Event} e Dom 事件对象"
-        },
         {
           "name": "disabled",
           "propType": "bool",
-          "description": "radio是否被禁用"
+          "description": "是否被禁用"
         },
         {
           "name": "value",
@@ -8198,7 +8207,7 @@
               "bool"
             ]
           },
-          "description": "radio 的value"
+          "description": "value"
         },
         {
           "name": "name",
@@ -8214,21 +8223,28 @@
         {
           "name": "renderPreview",
           "propType": "func",
-          "description": "预览态模式下渲染的内容\n@param {number} value 评分值"
+          "description": "预览态模式下渲染的内容"
         },
         {
-          "name": "tabIndex",
-          "defaultValue": 0
+          "name": "onChange",
+          "propType": "func",
+          "description": "状态变化时触发的事件\n@param {Boolean} checked 是否选中\n@param {Event} e Dom 事件对象"
         },
         {
-          "name": "prefix",
-          "defaultValue": "next-"
+          "name": "onMouseEnter",
+          "propType": "func",
+          "description": "鼠标进入enter事件\n@param {Event} e Dom 事件对象"
+        },
+        {
+          "name": "onMouseLeave",
+          "propType": "func",
+          "description": "鼠标离开事件\n@param {Event} e Dom 事件对象"
         }
       ]
     },
     {
-      "componentName": "RadioGroup",
-      "title": "RadioGroup",
+      "componentName": "Radio.Group",
+      "title": "Radio.Group",
       "docUrl": "",
       "screenshot": "",
       "npm": {
@@ -8240,12 +8256,6 @@
         "subName": "Group"
       },
       "props": [
-        {
-          "name": "prefix",
-          "propType": "string",
-          "description": "样式类名的品牌前缀",
-          "defaultValue": "next-"
-        },
         {
           "name": "className",
           "propType": "string",
@@ -8261,6 +8271,31 @@
           "propType": "string",
           "description": "name"
         },
+        {
+          "name": "size",
+          "propType": {
+            "type": "oneOf",
+            "value": [
+              "large",
+              "medium",
+              "small"
+            ]
+          },
+          "description": "尺寸",
+          "defaultValue": "medium"
+        },
+
+        {
+          "name": "shape",
+          "propType": {
+            "type": "oneOf",
+            "value": [
+              "normal",
+              "button"
+            ]
+          },
+          "description": "展示形态"
+        },
         {
           "name": "value",
           "propType": {
@@ -8271,7 +8306,7 @@
               "bool"
             ]
           },
-          "description": "radio group的选中项的值"
+          "description": "选中项的值"
         },
         {
           "name": "defaultValue",
@@ -8283,52 +8318,23 @@
               "bool"
             ]
           },
-          "description": "radio group的默认值"
+          "description": "默认值"
         },
         {
           "name": "component",
-          "propType": {
-            "type": "oneOfType",
-            "value": [
-              "string",
-              "func"
-            ]
-          },
+          "propType": "string",
           "description": "设置标签类型",
           "defaultValue": "div"
         },
-        {
-          "name": "onChange",
-          "propType": "func",
-          "description": "选中值改变时的事件\n@param {String/Number} value 选中项的值\n@param {Event} e Dom 事件对象"
-        },
         {
           "name": "disabled",
           "propType": "bool",
-          "description": "表示radio被禁用"
+          "description": "是否被禁用"
         },
         {
-          "name": "shape",
-          "propType": {
-            "type": "oneOf",
-            "value": [
-              "button"
-            ]
-          },
-          "description": "可以设置成 button 展示形状\n@enumdesc 按钮状"
-        },
-        {
-          "name": "size",
-          "propType": {
-            "type": "oneOf",
-            "value": [
-              "large",
-              "medium",
-              "small"
-            ]
-          },
-          "description": "与 `shape` 属性配套使用，shape设为button时有效\n@enumdesc 大, 中, 小",
-          "defaultValue": "medium"
+          "name": "dataSource",
+          "propType": "object",
+          "description": "可选项列表"
         },
         {
           "name": "itemDirection",
@@ -8339,7 +8345,7 @@
               "ver"
             ]
           },
-          "description": "子项目的排列方式\n- hoz: 水平排列 (default)\n- ver: 垂直排列",
+          "description": "子项目的排列方式",
           "defaultValue": "hoz"
         },
         {
@@ -8352,8 +8358,25 @@
           "name": "renderPreview",
           "propType": "func",
           "description": "预览态模式下渲染的内容\n@param {number} value 评分值"
+        },
+        {
+          "name": "onChange",
+          "propType": "func",
+          "description": "选中值改变时的事件\n@param {String/Number} value 选中项的值\n@param {Event} e Dom 事件对象"
         }
-      ]
+      ],
+      "configure": {
+        "component": {
+          "isContainer": true
+        },
+        "props": {
+          "isExtends": true,
+          "override": [{
+            "name": "dataSource",
+            "setter": "JsonSetter"
+          }]
+        }
+      }
     },
     {
       "componentName": "Range",
@@ -8936,7 +8959,7 @@
         {
           "name": "itemRender",
           "propType": "func",
-          "description": "渲染 MenuItem 内容的方法\n@param {Object} item 渲染节点的item\n@param {String} searchValue 搜索关键字（如果开启搜索）\n@return {ReactNode} item node"
+          "description": "渲染 Menu.Item 内容的方法\n@param {Object} item 渲染节点的item\n@param {String} searchValue 搜索关键字（如果开启搜索）\n@return {ReactNode} item node"
         },
         {
           "name": "notFoundContent",
@@ -10496,10 +10519,7 @@
         },
         {
           "name": "label",
-          "propType": {
-            "type": "instanceOf",
-            "value": "node"
-          },
+          "propType": "string",
           "description": "按钮的文案"
         },
         {
@@ -10706,7 +10726,22 @@
           "name": "style",
           "propType": "object"
         }
-      ]
+      ],
+      "configure": {
+        "props": {
+          "isExtends": true,
+          "override": [
+            {
+              "name": "defaultValue",
+              "setter": "TimePicker"
+            },
+            {
+              "name": "value",
+              "setter": "TimePicker"
+            }
+          ]
+        }
+      }
     },
     {
       "componentName": "Timeline",
@@ -11758,7 +11793,7 @@
     },
     {
       "componentName": "Typography.Text",
-      "title": "Typography.Text",
+      "title": "Text",
       "docUrl": "",
       "screenshot": "",
       "npm": {
@@ -11771,9 +11806,8 @@
       },
       "props": [
         {
-          "name": "prefix",
-          "propType": "string",
-          "defaultValue": "next-"
+          "name": "children",
+          "propType": "string"
         },
         {
           "name": "delete",
@@ -11808,29 +11842,32 @@
         {
           "name": "component",
           "propType": {
-            "type": "instanceOf",
-            "value": "elementType"
+            "type": "oneOf",
+            "value": [
+              "span",
+              "H1",
+              "H2",
+              "H3",
+              "H4"
+            ]
           },
           "description": "设置标签类型",
           "defaultValue": "span"
         },
-        {
-          "name": "children",
-          "propType": "string"
-        },
-        {
-          "name": "rtl",
-          "propType": "bool",
-          "defaultValue": false
-        },
         {
           "name": "style",
           "propType": "object"
         }
       ],
       "configure": {
-        "component": {
-          "isContainer": true
+        "props": {
+          "isExtends": true,
+          "override": [
+            {
+              "name": "children",
+              "setter": "TextAreaSetter"
+            }
+          ]
         }
       }
     },
@@ -12737,7 +12774,8 @@
               "screenshot": "",
               "schema": {
                 "componentName": "Dropdown",
-                "props": {}
+                "props": {  "trigger": [{    "componentName": "Button",    "props": {      "type": "primary"    },    "children": "确定"  }],  "triggerType": "click"},
+                "children": [{  "componentName": "Menu",  "props": {    "style": {      "width": 200    }  },  "children": [{    "componentName": "Menu.Item",    "props": {},    "children": "Option 1"  }, {    "componentName": "Menu.Item",    "props": {      "disabled": false    },    "children": "option 2"  }, {    "componentName": "Menu.Item",    "props": {      "disabled": false    },    "children": "option 3"  }]}]
               }
             }
           ]
@@ -12850,8 +12888,17 @@
                       "dataIndex": "id",
                       "cell": {
                         "type": "JSSlot",
-                        "value": "123",
-                        "params": []
+                        "params": ["value", "index", "record"],
+                        "value": [{
+                          "componentName": "Button",
+                          "props": {
+                            "type": "primary",
+                            "children": [{
+                              "type": "JSExpression",
+                              "value": "this.value"
+                            }]
+                          }
+                        }]
                       }
                     }
                   },
@@ -12927,48 +12974,33 @@
         {
           "componentName": "Card",
           "title": "卡片",
-          "icon": "",
+          "icon": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_card.png",
           "package": "@alife/next",
           "library": "Next",
           "snippets": [
             {
               "screenshot": "https://img.alicdn.com/tfs/TB1CHN3u4z1gK0jSZSgXXavwpXa-112-64.png",
-              "label": "普通型",
+              "title": "普通型",
               "schema": {
                 "componentName": "Card",
-                "props": {},
-                "children": [
-                  {
-                    "componentName": "CardContent"
-                  }
-                ]
+                "props": {
+                  "title": "普通型卡片"
+                },
+                "children": []
               }
             },
             {
               "screenshot": "https://img.alicdn.com/tfs/TB1.Ut6u4D1gK0jSZFKXXcJrVXa-112-64.png",
-              "label": "自定义",
+              "title": "自定义",
               "schema": {
                 "componentName": "Card",
                 "props": {
-                  "__slot__extra": true,
+                  "title": "自定义卡片",
                   "extra": {
-                    "type": "JSBlock",
-                    "value": {
-                      "componentName": "Slot",
-                      "props": {
-                        "slotName": "extra",
-                        "slotTitle": "自定义内容"
-                      },
-                      "condition": true,
-                      "children": []
-                    }
+                    "type": "JSSlot"
                   }
                 },
-                "children": [
-                  {
-                    "componentName": "CardContent"
-                  }
-                ]
+                "children": []
               }
             }
           ]
@@ -13108,13 +13140,8 @@
               "schema": {
                 "componentName": "Menu.Item",
                 "props": {
-                  "parentMode": "inline",
-                  "type": "item",
-                  "component": "",
-                  "disabled": true,
-                  "className": "",
-                  "needIndent": ""
-                }
+                },
+                "children": "Option"
               }
             }
           ]
@@ -13358,6 +13385,7 @@
               "schema": {
                 "componentName": "Balloon",
                 "props": {
+                  "visible": true,
                   "prefix": "next-",
                   "size": "medium",
                   "type": "normal",
@@ -13368,7 +13396,13 @@
                     0
                   ],
                   "triggerType": "hover",
-                  "autoFocus": true
+                  "autoFocus": true,
+                  "trigger": {
+                    "componentName": "Avatar",
+                    "props": {
+                      "icon": "success"
+                    }
+                  }
                 }
               }
             }
@@ -13438,11 +13472,11 @@
               "schema": {
                 "componentName": "Message",
                 "props": {
-                  "prefix": "next-",
+                  "title": "标题",
                   "type": "success",
                   "shape": "inline",
                   "size": "medium",
-                  "defaultVisible": true,
+                  "visible": true,
                   "animation": true
                 }
               }
@@ -13680,16 +13714,16 @@
         },
         {
           "componentName": "Typography",
-          "title": "排版",
+          "title": "Text",
           "icon": "",
           "package": "@alife/next",
           "library": "Next",
           "snippets": [
             {
-              "title": "排版",
+              "title": "Text",
               "screenshot": "",
               "schema": {
-                "componentName": "Typography",
+                "componentName": "Typography.Text",
                 "props": {
                   "component": "span",
                   "children": "基于 Ali-Lowcode-Engine 快速打造高生产力的低代码研发平台"
@@ -13717,10 +13751,33 @@
               "schema": {
                 "componentName": "Breadcrumb",
                 "props": {
-                  "prefix": "next-",
                   "maxNode": 100,
-                  "component": "nav"
-                }
+                  "component": "nav",
+                  "style": {
+                    "margin": 10,
+                    "padding": 5
+                  }
+                },
+                "children": [
+                  {
+                    "componentName": "Breadcrumb.Item",
+                    "props": {
+                      "children": "一级"
+                    }
+                  },
+                  {
+                    "componentName": "Breadcrumb.Item",
+                    "props": {
+                      "children": "二级"
+                    }
+                  },
+                  {
+                    "componentName": "Breadcrumb.Item",
+                    "props": {
+                      "children": "三级"
+                    }
+                  }
+                ]
               }
             }
           ]
@@ -14128,6 +14185,23 @@
             }
           ]
         },
+        {
+          "componentName": "Radio.Group",
+          "title": "单选框组",
+          "icon": "",
+          "package": "@alife/next",
+          "library": "Next",
+          "snippets": [
+            {
+              "title": "单选框组",
+              "screenshot": "https://alifd.oss-cn-hangzhou.aliyuncs.com/fusion-cool/icons/icon-light/ic_light_radio.png",
+              "schema": {
+                "componentName": "Radio.Group",
+                "props": {}
+              }
+            }
+          ]
+        },
         {
           "componentName": "Range",
           "title": "区段选择器",
diff --git a/packages/demo/public/index.html b/packages/demo/public/index.html
index 32d4da9b4..2e3d7eb63 100644
--- a/packages/demo/public/index.html
+++ b/packages/demo/public/index.html
@@ -14,8 +14,8 @@
     </script>
     <script src="https://g.alicdn.com/platform/c/??react15-polyfill/0.0.1/dist/index.js,lodash/4.6.1/lodash.min.js,immutable/3.7.6/dist/immutable.min.js,natty-storage/2.0.2/dist/natty-storage.min.js,natty-fetch/2.6.0/dist/natty-fetch.pc.min.js,tinymce/4.2.5/tinymce-full.js"></script>
     <script src="https://g.alicdn.com/mylib/moment/2.24.0/min/moment.min.js"></script>
-    <link rel="stylesheet" href="https://alifd.alicdn.com/npm/@alifd/next/1.11.6/next.min.css" />
-    <script src="https://unpkg.alibaba-inc.com/@alifd/next@1.18.17/dist/next.min.js"></script>
+    <link rel="stylesheet" href="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.css" />
+    <script src="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.js"></script>
     <link rel="stylesheet" href="/css/editor-preset-vision.css" />
     <script>
       window.pageConfig = {
diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 6ca5910e3..35fb749a0 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -755,7 +755,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
 
     // fix target : 浏览器事件响应目标
     if (!e.target || notMyEvent) {
-      e.target = this.contentDocument!.elementFromPoint(e.canvasX!, e.canvasY!);
+      e.target = this.contentDocument?.elementFromPoint(e.canvasX!, e.canvasY!);
     }
 
     // documentModel : 目标文档
diff --git a/packages/editor-setters/src/index.tsx b/packages/editor-setters/src/index.tsx
index a428e4b5f..df88e2b95 100644
--- a/packages/editor-setters/src/index.tsx
+++ b/packages/editor-setters/src/index.tsx
@@ -1,19 +1,30 @@
 import { registerSetter } from '@ali/lowcode-editor-core';
-import { DatePicker, Input, Radio, Select, Switch, NumberPicker } from '@alifd/next';
+import { isJSExpression } from '@ali/lowcode-types';
+import { DatePicker, TimePicker, Input, Radio, Select, Switch, NumberPicker } from '@alifd/next';
 import ExpressionSetter from './expression-setter';
 import ColorSetter from './color-setter';
 import JsonSetter from './json-setter';
 import EventsSetter from './events-setter';
 import StyleSetter from './style-setter';
-
+import React, { Component } from 'react';
 export const StringSetter = {
   component: Input,
-  defaultProps: { placeholder: '请输入' },
+  defaultProps: { placeholder: '请输入', style: { maxWidth: 180 } },
   title: 'StringSetter',
   recommend: true,
 };
 export const NumberSetter = NumberPicker;
-export const BoolSetter = Switch;
+export class BoolSetter extends Component {
+
+  render() {
+    const { onChange, value, defaultValue } = this.props;
+    return <Switch checked={value || defaultValue} onChange={
+      val => {
+        onChange(val)
+      }
+    }/>;
+  }
+}
 export const SelectSetter = Select;
 
 // suggest: 做成 SelectSetter 一种变体
@@ -24,7 +35,12 @@ export const RadioGroupSetter = {
   },
 };
 // suggest: 做成 StringSetter 的一个参数，
-export const TextAreaSetter = Input.TextArea;
+export const TextAreaSetter = {
+  component: Input.TextArea,
+  defaultProps: { placeholder: '请输入', style: { maxWidth: 180 } },
+  title: 'TextAreaSetter',
+  recommend: true,
+};
 export const DateSetter = DatePicker;
 export const DateYearSetter = DatePicker.YearPicker;
 export const DateMonthSetter = DatePicker.MonthPicker;
@@ -32,6 +48,29 @@ export const DateRangeSetter = DatePicker.RangePicker;
 
 export { ExpressionSetter, EventsSetter };
 
+class StringDateSetter extends Component {
+
+  render() {
+    const { onChange, editor } = this.props;
+    return <DatePicker onChange={
+      val => {
+        onChange(val.format())
+      }
+    }/>;
+  }
+}
+class StringTimePicker extends Component {
+
+  render() {
+    const { onChange, editor } = this.props;
+    return <TimePicker onChange={
+      val => {
+        onChange(val.format('HH:mm:ss'))
+      }
+    }/>;
+  }
+}
+
 const builtinSetters: any = {
   StringSetter,
   NumberSetter,
@@ -39,13 +78,18 @@ const builtinSetters: any = {
   SelectSetter,
   ExpressionSetter: {
     component: ExpressionSetter,
+    condition: (field: any) => {
+      const v = field.getValue();
+      return v == null || isJSExpression(v);
+    },
     defaultProps: { placeholder: '请输入表达式' },
     title: '表达式输入',
     recommend: true,
   },
   RadioGroupSetter,
   TextAreaSetter,
-  DateSetter,
+  DateSetter: StringDateSetter,
+  TimePicker: StringTimePicker,
   DateYearSetter,
   DateMonthSetter,
   DateRangeSetter,
diff --git a/packages/editor-skeleton/src/components/array-setter/index.tsx b/packages/editor-skeleton/src/components/array-setter/index.tsx
index 6b3d458e0..997237e9e 100644
--- a/packages/editor-skeleton/src/components/array-setter/index.tsx
+++ b/packages/editor-skeleton/src/components/array-setter/index.tsx
@@ -72,11 +72,18 @@ export class ListSetter extends Component<ArraySetterProps, ArraySetterState> {
 
   onSort(sortedIds: Array<string | number>) {
     const { itemsMap } = this.state;
+    const { onChange } = this.props;
     const items = sortedIds.map((id, index) => {
       const item = itemsMap.get(id)!;
-      item.setKey(index);
+      // item.setKey(index);
       return item;
     });
+
+    const values = items.map((item) => {
+      return item.getValue();
+    });
+    console.log('values',values);
+    onChange(values);
     this.setState({
       items,
     });
@@ -253,6 +260,7 @@ export default class ArraySetter extends Component<{
     }
 
     if (mode === 'popup' || forceInline) {
+
       const title = (
         <Fragment>
           编辑：
@@ -270,6 +278,7 @@ export default class ArraySetter extends Component<{
         }
         this.pipe = (this.context as PopupPipe).create({ width });
       }
+
       this.pipe.send(<TableSetter key={field.id} {...props} columns={columns} />, title);
       return (
         <Button
diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index 5b75bddfa..5685926f8 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -8,7 +8,10 @@ import { SettingField, isSettingField, SettingTopEntry, SettingEntry } from '@al
 import { isSetterConfig, CustomView } from '@ali/lowcode-types';
 import { intl } from '../../locale';
 import { Skeleton } from 'editor-skeleton/src/skeleton';
-
+function transformStringToFunction(str) {
+  if (typeof str !== 'string') return str;
+  return new Function(`"use strict"; return ${str}`)();
+}
 @observer
 class SettingFieldView extends Component<{ field: SettingField }> {
   render() {
@@ -60,7 +63,10 @@ class SettingFieldView extends Component<{ field: SettingField }> {
     }
 
     // todo: error handling
-
+    let _onChange = extraProps?.onChange?.value;
+    if (extraProps && extraProps.onChange && extraProps.onChange.type === 'JSFunction') {
+      _onChange = transformStringToFunction(extraProps.onChange.value);
+    }
     return createField(
       {
         meta: field?.componentMeta?.npm || field?.componentMeta?.componentName || '',
@@ -85,6 +91,7 @@ class SettingFieldView extends Component<{ field: SettingField }> {
             value,
           });
           field.setValue(value);
+          if(_onChange) _onChange(value, field);
         },
         onInitial: () => {
           if (initialValue == null) {
diff --git a/packages/editor-skeleton/src/register-defaults.ts b/packages/editor-skeleton/src/register-defaults.ts
index b18decb13..c3ac74378 100644
--- a/packages/editor-skeleton/src/register-defaults.ts
+++ b/packages/editor-skeleton/src/register-defaults.ts
@@ -7,7 +7,7 @@ import { isPlainObject } from '@ali/lowcode-utils';
 import parseProps from './transducers/parse-props';
 import addonCombine from './transducers/addon-combine';
 import SlotSetter from './components/slot-setter';
-import { isJSSlot } from '@ali/lowcode-types';
+import { isJSSlot, isJSExpression } from '@ali/lowcode-types';
 
 registerSetter('ArraySetter', {
   component: ArraySetter,
@@ -27,7 +27,7 @@ registerSetter('ObjectSetter', {
   title: 'ObjectSetter', // TODO
   condition: (field: any) => {
     const v = field.getValue();
-    return v == null || isPlainObject(v);
+    return v == null || (isPlainObject(v) && !isJSExpression(v) && !isJSSlot(v));
   },
   initialValue: {},
   recommend: true,
diff --git a/packages/editor-skeleton/src/transducers/parse-props.ts b/packages/editor-skeleton/src/transducers/parse-props.ts
index 850624b86..618a7d100 100644
--- a/packages/editor-skeleton/src/transducers/parse-props.ts
+++ b/packages/editor-skeleton/src/transducers/parse-props.ts
@@ -90,20 +90,20 @@ function propTypeToSetter(propType: PropType): SetterType {
         initialValue: dataSource[0] ? dataSource[0].value : null,
       };
 
-    // case 'element':
-    // case 'node': // TODO: use Mixin
-    //   return {
-    //     // slotSetter
-    //     componentName: 'NodeSetter',
-    //     props: {
-    //       mode: typeName,
-    //     },
-    //     isRequired,
-    //     initialValue: {
-    //       type: 'JSSlot',
-    //       value: '',
-    //     },
-    //   };
+    case 'element':
+    case 'node': // TODO: use Mixin
+      return {
+        // slotSetter
+        componentName: 'SlotSetter',
+        props: {
+          mode: typeName,
+        },
+        isRequired,
+        initialValue: {
+          type: 'JSSlot',
+          value: [],
+        },
+      };
     case 'shape':
     case 'exact':
       const items = ((propType as any).value || []).map((item: any) => propConfigToFieldConfig(item));
@@ -164,12 +164,11 @@ function propTypeToSetter(propType: PropType): SetterType {
         componentName: 'MixedSetter',
         props: {
           // TODO:
-          // setters: (propType as OneOfType).value.map(item => propTypeToSetter(item)),
+          setters: (propType as OneOfType).value.map(item => propTypeToSetter(item)),
         },
         isRequired,
       };
   }
-
   return {
     componentName: 'MixedSetter',
     isRequired,
diff --git a/packages/plugin-sample-preview/src/index.scss b/packages/plugin-sample-preview/src/index.scss
index 05253bf0b..d623acdd5 100644
--- a/packages/plugin-sample-preview/src/index.scss
+++ b/packages/plugin-sample-preview/src/index.scss
@@ -1,3 +1,9 @@
 .lowcode-plugin-sample-preview {
   padding: 10px 4px;
 }
+
+.lowcode-plugin-sample-preview-content {
+  width: 80vw;
+  height: 80vh;
+  min-height: 300px;
+}
\ No newline at end of file
diff --git a/packages/plugin-sample-preview/src/index.tsx b/packages/plugin-sample-preview/src/index.tsx
index c5cb139b2..27cb93fcc 100644
--- a/packages/plugin-sample-preview/src/index.tsx
+++ b/packages/plugin-sample-preview/src/index.tsx
@@ -40,15 +40,10 @@ const SamplePreview = ({ editor }: PluginProps) => {
       <Button type="primary" onClick={handleClick}>
         预览
       </Button>
-      <Dialog
-        visible={visible}
-        footer={false}
-        onClose={handleClose}
-      >
-        {visible && <ReactRenderer 
-          schema={schema}
-          components={components}
-        />}
+      <Dialog visible={visible} footer={false} onClose={handleClose}>
+        {visible &&
+          <ReactRenderer className="lowcode-plugin-sample-preview-content" schema={schema} components={components} />
+        }
       </Dialog>
     </div>
   );
diff --git a/packages/react-renderer/demo/compose.md b/packages/react-renderer/demo/compose.md
new file mode 100644
index 000000000..c432f3e97
--- /dev/null
+++ b/packages/react-renderer/demo/compose.md
@@ -0,0 +1,37 @@
+---
+title: 复杂组件
+order: 2
+---
+
+````jsx
+import React, { PureComponent } from 'react';
+import ReactDOM from 'react-dom';
+import ReactRenderer from '@ali/lowcode-react-renderer';
+import schema from './schemas/compose';
+import components from './config/components/index';
+import utils from './config/utils';
+import constants from './config/constants';
+
+class Demo extends PureComponent {
+  static displayName = 'renderer-demo';
+  render() {
+    return (
+      <div className="demo">
+        <ReactRenderer
+          key={schema.fileName}
+          schema={schema}
+          components={components}
+          appHelper={{
+            utils,
+            constants
+          }}
+        />
+      </div>
+    );
+  }
+}
+
+ReactDOM.render((
+  <Demo />
+), mountNode);
+````
diff --git a/packages/react-renderer/demo/schemas/compose.js b/packages/react-renderer/demo/schemas/compose.js
new file mode 100644
index 000000000..213362d25
--- /dev/null
+++ b/packages/react-renderer/demo/schemas/compose.js
@@ -0,0 +1,33 @@
+/* eslint-disable */
+export default {
+  componentName: 'Page',
+  fileName: 'compose',
+  props: {
+  },
+  children: [
+    {
+      "componentName": "Dropdown",
+      "props": {  "trigger": [{    "componentName": "Button",    "props": {      "type": "primary"    },    "children": "确定"  }],  "triggerType": "click"},
+      "children": [{  "componentName": "Menu",  "props": {    "style": {      "width": 200    }  },  "children": [{    "componentName": "MenuItem",    "props": {},    "children": "Option 1"  }, {    "componentName": "MenuItem",    "props": {      "disabled": false    },    "children": "option 2"  }, {    "componentName": "MenuItem",    "props": {      "disabled": false    },    "children": "option 3"  }]}]
+    },
+    {
+      "componentName": "Menu",
+      "props": {
+        "style": {
+          "width": 200
+        }
+      },
+      "children": [{
+        "componentName": "MenuItem",
+        "props": {
+        },
+        "children": "Option 1"
+      }, {
+        "componentName": "MenuItem",
+        "props": {
+        },
+        "children": "Option 2"
+      }]
+    }
+  ]
+};
diff --git a/packages/react-renderer/package.json b/packages/react-renderer/package.json
index 55b847f74..b529d7274 100644
--- a/packages/react-renderer/package.json
+++ b/packages/react-renderer/package.json
@@ -27,7 +27,7 @@
     "@ali/b3-one": "^0.0.17",
     "@ali/bzb-request": "^2.6.0-beta.13",
     "@ali/lib-mtop": "^2.5.1",
-    "@alifd/next": "^1.18.17",
+    "@alifd/next": "^1.19.17",
     "debug": "^4.1.1",
     "events": "^3.0.0",
     "fetch-jsonp": "^1.1.3",
diff --git a/packages/react-renderer/src/index.js b/packages/react-renderer/src/index.js
index 37885f905..75ceb844c 100644
--- a/packages/react-renderer/src/index.js
+++ b/packages/react-renderer/src/index.js
@@ -37,7 +37,7 @@ class FaultComponent extends PureComponent {
 class NotFoundComponent extends PureComponent {
   render() {
     console.error('component not found', this.props);
-    return <Div {...this.props} />;
+  return <Div {...this.props} >{this.props.children || 'Component Not Found'}</Div>;
   }
 }
 
@@ -45,7 +45,7 @@ function isReactClass(obj) {
   return obj && obj.prototype && (obj.prototype.isReactComponent || obj.prototype instanceof Component);
 }
 
-export default class Renderer extends PureComponent {
+export default class Renderer extends Component {
   static dislayName = 'renderer';
   static propTypes = {
     appHelper: PropTypes.object,
diff --git a/packages/react-renderer/src/renderer/base.jsx b/packages/react-renderer/src/renderer/base.jsx
index f5f68837f..c0f9bff6a 100644
--- a/packages/react-renderer/src/renderer/base.jsx
+++ b/packages/react-renderer/src/renderer/base.jsx
@@ -199,14 +199,13 @@ export default class BaseRender extends PureComponent {
     if (!schema || !schema.props) {
       return schema?.children;
     }
-    let _children = schema.children;
-    if (!_children) return schema.props.children;
-    if (schema.props.children && schema.props.children.length) {
-      if (Array.isArray(schema.props.children)) {
-        _children = Array.isArray(_children) ? _children.concat(schema.props.children) : schema.props.children.unshift(_children);
-      } else {
-        Array.isArray(_children) && _children.push(schema.props.children) || (_children = [_children] && _children.push(schema.props.children));
-      }
+    if (!schema.children) return schema.props.children;
+    if (!schema.props.children) return schema.children;
+    var _children = [].concat(schema.children);
+    if (Array.isArray(schema.props.children)) {
+      _children = _children.concat(schema.props.children);
+    } else {
+      _children.push(schema.props.children);
     }
     return _children;
   };
@@ -233,9 +232,13 @@ export default class BaseRender extends PureComponent {
       if (!schema) return null;
       const { __appHelper: appHelper, __components: components = {} } =
         this.props || {};
+
       if (isJSExpression(schema)) {
         return parseExpression(schema, self);
       }
+      if (isJSSlot(schema)) {
+        return this.__createVirtualDom(schema.value, self, parentInfo);
+      }
       if (typeof schema === 'string') return schema;
       if (typeof schema === 'number' || typeof schema === 'boolean') {
         return schema.toString();
@@ -246,7 +249,7 @@ export default class BaseRender extends PureComponent {
           this.__createVirtualDom(item, self, parentInfo, item && item.__ctx && item.__ctx.lunaKey ? '' : idx),
         );
       }
-
+      // FIXME
       const _children = this.getSchemaChildren(schema);
       //解析占位组件
       if (schema.componentName === 'Flagment' && _children) {
@@ -349,6 +352,9 @@ export default class BaseRender extends PureComponent {
         props.key = idx;
       }
       props.__id = schema.id;
+      if (!props.key) {
+        props.key = props.__id;
+      }
       const renderComp = (props) => {
         return engine.createElement(
           Comp,
diff --git a/packages/react-renderer/src/utils/index.js b/packages/react-renderer/src/utils/index.js
index 19332fa96..229ca8b91 100644
--- a/packages/react-renderer/src/utils/index.js
+++ b/packages/react-renderer/src/utils/index.js
@@ -64,7 +64,7 @@ const ENV = {
 export function isSchema(schema, ignoreArr) {
   if (isEmpty(schema)) return false;
   // Leaf 组件也返回 true
-  if (schema.componentName === 'Leaf') return true;
+  if (schema.componentName === 'Leaf' || schema.componentName === 'Slot') return true;
   if (!ignoreArr && Array.isArray(schema)) return schema.every((item) => isSchema(item));
   return !!(schema.componentName && schema.props && (typeof schema.props === 'object' || isJSExpression(schema.props)));
 }