From 17346c7a09e1e78107b6e28c0e375940c8f8f986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= <rongbin.arb@alibaba-inc.com>
Date: Tue, 14 Jul 2020 11:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EsimulatorProps=20renderEnv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/designer/src/builtin-simulator/host.ts | 8 ++++++--
 packages/plugin-designer/src/index.tsx          | 9 +++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index b2d42710b..f52797bca 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -112,6 +112,10 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
 
   readonly designer = this.document.designer;
 
+  @computed get renderEnv(): string {
+    return this.get('renderEnv') || 'default';
+  }
+
   @computed get device(): string {
     return this.get('device') || 'default';
   }
@@ -221,7 +225,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     const vendors = [
       // required & use once
       assetBundle(
-        this.get('environment') || this.device === 'default' ? defaultRaxEnvironment : defaultEnvironment,
+        this.get('environment') || this.renderEnv === 'rax' ? defaultRaxEnvironment : defaultEnvironment,
         AssetLevel.Environment,
       ),
       // required & use once
@@ -232,7 +236,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       assetBundle(this.theme, AssetLevel.Theme),
       // required & use once
       assetBundle(
-        this.get('simulatorUrl') || this.device === 'default' ? defaultRaxSimulatorUrl : defaultSimulatorUrl,
+        this.get('simulatorUrl') || this.renderEnv === 'rax' ? defaultRaxSimulatorUrl : defaultSimulatorUrl,
         AssetLevel.Runtime,
       ),
     ];
diff --git a/packages/plugin-designer/src/index.tsx b/packages/plugin-designer/src/index.tsx
index aac7dab28..5d68132e2 100644
--- a/packages/plugin-designer/src/index.tsx
+++ b/packages/plugin-designer/src/index.tsx
@@ -11,6 +11,7 @@ interface DesignerPluginState {
   componentMetadatas?: any[] | null;
   library?: any[] | null;
   extraEnvironment?: any[] | null;
+  renderEnv?: string;
 }
 
 export default class DesignerPlugin extends PureComponent<PluginProps, DesignerPluginState> {
@@ -20,6 +21,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
     componentMetadatas: null,
     library: null,
     extraEnvironment: null,
+    renderEnv: 'default',
   };
 
   private _mounted = true;
@@ -32,6 +34,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
   private async setupAssets() {
     const { editor } = this.props;
     const assets = await editor.onceGot('assets');
+    const renderEnv = await editor.onceGot('renderEnv');
     if (!this._mounted) {
       return;
     }
@@ -40,9 +43,10 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
       componentMetadatas: components || [],
       library: packages || [],
       extraEnvironment,
+      renderEnv,
     };
     this.setState(state);
-  };
+  }
 
   componentWillUnmount() {
     this._mounted = false;
@@ -59,7 +63,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
 
   render(): React.ReactNode {
     const { editor } = this.props;
-    const { componentMetadatas, library, extraEnvironment } = this.state;
+    const { componentMetadatas, library, extraEnvironment, renderEnv } = this.state;
 
     if (!library || !componentMetadatas) {
       // TODO: use a Loading
@@ -76,6 +80,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
         simulatorProps={{
           library,
           extraEnvironment,
+          renderEnv,
         }}
       />
     );