From 0ea76a746fac8ea8e7b999d42434c468c85d6372 Mon Sep 17 00:00:00 2001
From: liujuping <liujup@foxmail.com>
Date: Sun, 10 Apr 2022 10:54:40 +0800
Subject: [PATCH] fix: project.exportSchema api lack stage param & setAssets
 should be a async fn

---
 packages/designer/src/project/project.ts | 6 +++---
 packages/renderer-core/src/hoc/leaf.tsx  | 2 +-
 packages/shell/src/material.ts           | 4 ++--
 packages/shell/src/project.ts            | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/designer/src/project/project.ts b/packages/designer/src/project/project.ts
index 15cefd83f..70e209206 100644
--- a/packages/designer/src/project/project.ts
+++ b/packages/designer/src/project/project.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from 'events';
 import { obx, computed, makeObservable, action } from '@alilc/lowcode-editor-core';
 import { Designer } from '../designer';
 import { DocumentModel, isDocumentModel, isPageSchema } from '../document';
-import { ProjectSchema, RootSchema } from '@alilc/lowcode-types';
+import { ProjectSchema, RootSchema, TransformStage } from '@alilc/lowcode-types';
 import { ISimulatorHost } from '../simulator';
 
 export class Project {
@@ -52,12 +52,12 @@ export class Project {
   /**
    * 获取项目整体 schema
    */
-  getSchema(): ProjectSchema {
+  getSchema(stage: TransformStage = TransformStage.Render): ProjectSchema {
     return {
       ...this.data,
       // TODO: future change this filter
       componentsMap: this.currentDocument?.getComponentsMap(),
-      componentsTree: this.documents.filter((doc) => !doc.isBlank()).map((doc) => doc.schema),
+      componentsTree: this.documents.filter((doc) => !doc.isBlank()).map((doc) => doc.export(stage)),
       i18n: this.i18n,
     };
   }
diff --git a/packages/renderer-core/src/hoc/leaf.tsx b/packages/renderer-core/src/hoc/leaf.tsx
index 8d9681362..5177845cc 100644
--- a/packages/renderer-core/src/hoc/leaf.tsx
+++ b/packages/renderer-core/src/hoc/leaf.tsx
@@ -238,7 +238,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
       const {
         hidden = false,
         condition = true,
-      } = this.leaf?.schema || {};
+      } = this.leaf?.export(TransformStage.Render) || {};
       return {
         nodeChildren: null,
         childrenInState: false,
diff --git a/packages/shell/src/material.ts b/packages/shell/src/material.ts
index 1e11ee21a..c491fb374 100644
--- a/packages/shell/src/material.ts
+++ b/packages/shell/src/material.ts
@@ -34,8 +34,8 @@ export default class Material {
    * @param assets
    * @returns
    */
-  setAssets(assets: AssetsJson) {
-    return this[editorSymbol].setAssets(assets);
+  async setAssets(assets: AssetsJson) {
+    return await this[editorSymbol].setAssets(assets);
   }
 
   /**
diff --git a/packages/shell/src/project.ts b/packages/shell/src/project.ts
index 7bcc90095..297bc320f 100644
--- a/packages/shell/src/project.ts
+++ b/packages/shell/src/project.ts
@@ -103,8 +103,8 @@ export default class Project {
    * 导出 project
    * @returns
    */
-  exportSchema() {
-    return this[projectSymbol].getSchema();
+  exportSchema(stage: TransformStage = TransformStage.Render) {
+    return this[projectSymbol].getSchema(stage);
   }
 
   /**