From aaec68377b149587e437d1e19517be2798510c74 Mon Sep 17 00:00:00 2001
From: "zude.hzd" <zude.hzd@alibaba-inc.com>
Date: Tue, 3 Nov 2020 18:55:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20loadAsyncLibrary=E4=B9=8B=E5=90=8EbuildC?=
 =?UTF-8?q?omponents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/designer/src/builtin-simulator/host.ts       | 6 ++++--
 packages/editor-setters/src/function-setter/index.tsx | 4 +---
 packages/react-simulator-renderer/src/renderer.ts     | 7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 6f17c201d..5b95b05d9 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -260,8 +260,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     // wait 准备 iframe 内容、依赖库注入
     const renderer = await createSimulator(this, iframe, vendors);
 
-    // 加载异步Library
-    await renderer.loadAsyncLibrary(this.asycnLibraryMap);
+
     // TODO: !!! thinkof reload onloa
 
     // wait 业务组件被第一次消费，否则会渲染出错
@@ -270,6 +269,9 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     // wait 运行时上下文
     await this.injectionConsumer.waitFirstConsume();
 
+    // 加载异步Library
+    await renderer.loadAsyncLibrary(this.asycnLibraryMap);
+
     // step 5 ready & render
     renderer.run();
 
diff --git a/packages/editor-setters/src/function-setter/index.tsx b/packages/editor-setters/src/function-setter/index.tsx
index 20a6deb04..a9adebd6c 100644
--- a/packages/editor-setters/src/function-setter/index.tsx
+++ b/packages/editor-setters/src/function-setter/index.tsx
@@ -111,9 +111,7 @@ export default class FunctionSetter extends PureComponent<FunctionSetterProps> {
 
   parseFunctionName = (functionString: string) => {
     // 因为函数格式是固定的，所以可以按照字符换去匹配获取函数名
-    const funNameStr = functionString.split('this.')[1].split('.')[0];
-
-    return funNameStr;
+    return functionString.split('this.')[1]?.split('.')[0];
   };
 
   parseFunctionParam = (functionString:string) => {
diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts
index 936a010cb..35d53b161 100644
--- a/packages/react-simulator-renderer/src/renderer.ts
+++ b/packages/react-simulator-renderer/src/renderer.ts
@@ -42,7 +42,7 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
       if (this._libraryMap !== host.libraryMap || this._componentsMap !== host.designer.componentsMap) {
         this._libraryMap = host.libraryMap || {};
         this._componentsMap = host.designer.componentsMap;
-        // this.buildComponents();
+        this.buildComponents();
       }
 
       // sync designMode
@@ -141,10 +141,9 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
     return loader.load(asset);
   }
 
-  async loadAsyncLibrary(asycnLibraryMap) {
-    const promise = await loader.loadAsyncLibrary(asycnLibraryMap);
+  async loadAsyncLibrary(asyncLibraryMap) {
+    await loader.loadAsyncLibrary(asyncLibraryMap);
     this.buildComponents();
-    return promise;
   }
 
   private instancesMap = new Map<string, ReactInstance[]>();