From 1f45b0502836b3045fe64b01a92444e3057d5888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= <rongbin.arb@alibaba-inc.com>
Date: Tue, 1 Sep 2020 12:47:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Esimulatorurl?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AEcdn=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8simulator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/demo/src/editor/config.js              | 6 ++++++
 packages/designer/src/builtin-simulator/host.ts | 4 ++--
 packages/plugin-designer/src/index.tsx          | 9 +++++++--
 packages/rax-simulator-renderer/package.json    | 2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/demo/src/editor/config.js b/packages/demo/src/editor/config.js
index 88d9b7248..7223c6031 100644
--- a/packages/demo/src/editor/config.js
+++ b/packages/demo/src/editor/config.js
@@ -120,6 +120,12 @@ export default {
     init: async function init(editor) {
       const assets = await editor.utils.get('./assets.json');
       editor.set('assets', assets);
+      const simulatorUrl = [
+        'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.css',
+        'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.js',
+      ];
+      editor.set('simulatorUrl', simulatorUrl);
+      // editor.set('renderEnv', 'rax');
 
       const schema = await editor.utils.get('./schema.json');
       editor.set('schema', schema);
diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 370892f17..20e417675 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -225,7 +225,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     const vendors = [
       // required & use once
       assetBundle(
-        this.get('environment') || this.renderEnv === 'rax' ? defaultRaxEnvironment : defaultEnvironment,
+        this.get('environment') || (this.renderEnv === 'rax' ? defaultRaxEnvironment : defaultEnvironment),
         AssetLevel.Environment,
       ),
       // required & use once
@@ -236,7 +236,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       assetBundle(this.theme, AssetLevel.Theme),
       // required & use once
       assetBundle(
-        this.get('simulatorUrl') || this.renderEnv === 'rax' ? 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 cc09a7310..c7ae58ae3 100644
--- a/packages/plugin-designer/src/index.tsx
+++ b/packages/plugin-designer/src/index.tsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import { Editor } from '@ali/lowcode-editor-core';
 import { DesignerView, Designer } from '@ali/lowcode-designer';
+import { Asset } from '@ali/lowcode-utils';
 import './index.scss';
 
 export interface PluginProps {
@@ -13,6 +14,7 @@ interface DesignerPluginState {
   extraEnvironment?: any[] | null;
   renderEnv?: string;
   device?: string;
+  simulatorUrl: Asset | null;
 }
 
 export default class DesignerPlugin extends PureComponent<PluginProps, DesignerPluginState> {
@@ -24,6 +26,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
     extraEnvironment: null,
     renderEnv: 'default',
     device: 'default',
+    simulatorUrl: null,
   };
 
   private _mounted = true;
@@ -39,6 +42,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
       const assets = await editor.onceGot('assets');
       const renderEnv = await editor.get('renderEnv');
       const device = await editor.get('device');
+      const simulatorUrl = await editor.get('simulatorUrl');
       if (!this._mounted) {
         return;
       }
@@ -49,6 +53,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
         extraEnvironment,
         renderEnv,
         device,
+        simulatorUrl,
       };
       this.setState(state);
     } catch (e) {
@@ -71,8 +76,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
 
   render(): React.ReactNode {
     const { editor } = this.props;
-    const { componentMetadatas, library, extraEnvironment, renderEnv, device } = this.state;
-
+    const { componentMetadatas, library, extraEnvironment, renderEnv, device, simulatorUrl } = this.state;
     if (!library || !componentMetadatas) {
       // TODO: use a Loading
       return null;
@@ -90,6 +94,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
           extraEnvironment,
           renderEnv,
           device,
+          simulatorUrl,
         }}
       />
     );
diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json
index 8d7ecbdfd..a44d95f6b 100644
--- a/packages/rax-simulator-renderer/package.json
+++ b/packages/rax-simulator-renderer/package.json
@@ -55,5 +55,5 @@
   "publishConfig": {
     "registry": "https://registry.npm.alibaba-inc.com"
   },
-  "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.4-0/build/index.html"
+  "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.5-0/build/index.html"
 }

From 08b93f9c0a946a659bcf6a8c58a8084394d57b0c Mon Sep 17 00:00:00 2001
From: "mark.ck" <mark.ck@alibaba-inc.com>
Date: Tue, 1 Sep 2020 14:08:37 +0800
Subject: [PATCH 2/2] fix: remove vision dependency from plugin-undo-redo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

undo-redo 插件移除 vison 相关依赖

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3629531

* fix: remove vision dependency from plugin-undo-redo
---
 packages/plugin-undo-redo/package.json  | 1 -
 packages/plugin-undo-redo/src/index.tsx | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/plugin-undo-redo/package.json b/packages/plugin-undo-redo/package.json
index 1a8a2cc51..5bfc4191b 100644
--- a/packages/plugin-undo-redo/package.json
+++ b/packages/plugin-undo-redo/package.json
@@ -24,7 +24,6 @@
     "@ali/lowcode-editor-skeleton": "^1.0.5-0",
     "@ali/lowcode-types": "^1.0.5-0",
     "@ali/lowcode-utils": "^1.0.5-0",
-    "@ali/ve-icons": "^4.1.14",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
diff --git a/packages/plugin-undo-redo/src/index.tsx b/packages/plugin-undo-redo/src/index.tsx
index 98bec6274..8357bf4e2 100644
--- a/packages/plugin-undo-redo/src/index.tsx
+++ b/packages/plugin-undo-redo/src/index.tsx
@@ -1,7 +1,6 @@
 import React, { PureComponent } from 'react';
 import { Editor } from '@ali/lowcode-editor-core';
-import Icon from '@ali/ve-icons';
-import { Button } from '@alifd/next';
+import { Button, Icon } from '@alifd/next';
 import { Designer } from '@ali/lowcode-designer';
 import { PluginProps } from '@ali/lowcode-types';
 
@@ -84,23 +83,21 @@ export default class UndoRedo extends PureComponent<IProps, IState> {
           size="medium"
           data-tip="撤销"
           data-dir="bottom"
-          className="ve-local-history-item"
           onClick={this.handleUndoClick}
           ghost
           disabled={!undoEnable}
         >
-          <Icon name="amindUndo" size="18px" />
+          <Icon type="houtui" />
         </Button>
         <Button
           size="medium"
           data-tip="恢复"
           data-dir="bottom"
-          className="ve-local-history-item"
           onClick={this.handleRedoClick}
           ghost
           disabled={!redoEnable}
         >
-          <Icon name="forward" size="18px" />
+          <Icon type="qianjin" />
         </Button>
       </div>
     );