From 70607415d992b3f5bda6a01dca91261d379bb60d Mon Sep 17 00:00:00 2001
From: "mario.gk" <mario.gk@alibaba-inc.com>
Date: Tue, 28 Jul 2020 22:31:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=8E=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B8=B2=E6=9F=93=E9=80=BB=E8=BE=91=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react-simulator-renderer/src/renderer.ts  | 39 +++++++------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts
index 399432aa0..ca6022274 100644
--- a/packages/react-simulator-renderer/src/renderer.ts
+++ b/packages/react-simulator-renderer/src/renderer.ts
@@ -213,21 +213,21 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
   }
 
   createComponent(schema: ComponentSchema): Component | null {
-    const _schema = {
+    let _schema: any = {
       ...schema,
     };
     _schema.methods = {};
     _schema.lifeCycles = {};
 
-    const processPropsSchema = (propsSchema: any, propsMap: any, node: any): any => {
+    const node = host.document.createNode(_schema);
+    _schema = node.export(TransformStage.Render);
+
+    const processPropsSchema = (propsSchema: any, propsMap: any): any => {
       if (!propsSchema) {
         return {};
       }
 
       let result = { ...propsSchema };
-      result = host.document.designer.transformProps(result, node, TransformStage.Init);
-      result = host.document.designer.transformProps(result, node, TransformStage.Upgrade);
-
       const reg = /^(?:this\.props|props)\.(\S+)$/;
       Object.keys(result).map((key: string) => {
         if (result[key].type === 'JSExpression') {
@@ -237,10 +237,12 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
             const propName = matched[1];
             result[key] = propsMap[propName];
           }
+        } else if (result[key].type === 'JSSlot') {
+          const schema = result[key].value;
+          result[key] = createElement(Ele, {schema, propsMap: {}});
         }
       });
 
-      result = host.document.designer.transformProps(result, node, TransformStage.Render);
       return result;
     };
 
@@ -249,8 +251,6 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
 
     class Ele extends React.Component<{ schema: any, propsMap: any }> {
       private isModal: boolean;
-      private node: any;
-      private renderProps: any;
 
       constructor(props: any){
         super(props);
@@ -259,20 +259,6 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
           this.isModal = true;
           return;
         }
-        this.node = host.document.createNode(props.schema);
-        this.renderProps = processPropsSchema(props.schema.props, props.propsMap, this.node);
-      }
-
-      shouldComponentUpdate(nextProps: any) {
-        if (this.isModal) {
-          return false;
-        }
-        const renderProps = processPropsSchema(nextProps.schema.props, nextProps.propsMap, this.node);
-        if (renderProps && this.renderProps && JSON.stringify({...renderProps, fieldId: ''}) === JSON.stringify({...this.renderProps, fieldId: ''})) {
-          return false;
-        }
-        this.renderProps = renderProps;
-        return true;
       }
 
       render() {
@@ -280,23 +266,24 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
           return null;
         }
         const { schema, propsMap } = this.props;
-        const { node } = this;
         const Com = componentsMap[schema.componentName];
         let children = null;
         if (schema.children && schema.children.length > 0) {
           children = schema.children.map((item: any) => createElement(Ele, {schema: item, propsMap}));
         }
+        const props = processPropsSchema(schema.props, propsMap);
+        const _leaf = host.document.createNode(schema);
 
-        return createElement(Com, { ...this.renderProps, _leaf: node }, children);
+        return createElement(Com, {...props, _leaf}, children);
       }
     }
 
     class Com extends React.Component {
       render() {
-        let children = null;
+        let children = [];
         const propsMap = this.props;
         if (_schema.children && Array.isArray(_schema.children)) {
-          children = _schema.children?.map((item: any) => createElement(Ele, {schema: item, propsMap}));
+          children = _schema.children.map((item: any) => createElement(Ele, {schema: item, propsMap}));
         }
         return createElement(React.Fragment, {}, children);
       }