From 775725d3f7efe2359d0ba48127e36bfcf5d8f38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Tue, 18 Aug 2020 19:29:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20currentPage.id=20=E8=BF=94=E5=9B=9E=20fo?= =?UTF-8?q?rmUuid=20fix:=20=E5=B0=86=20engine-design-mode=20=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=E6=B8=B2=E6=9F=93=20iframe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/builtin-simulator/create-simulator.ts | 2 +- packages/designer/src/document/document-model.ts | 2 ++ packages/editor-preset-vision/src/flags.ts | 2 +- packages/editor-preset-vision/src/index.ts | 5 ----- packages/editor-preset-vision/src/pages.ts | 1 + packages/types/src/schema.ts | 1 + 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/designer/src/builtin-simulator/create-simulator.ts b/packages/designer/src/builtin-simulator/create-simulator.ts index 7bca2aec1..ab20d4fa1 100644 --- a/packages/designer/src/builtin-simulator/create-simulator.ts +++ b/packages/designer/src/builtin-simulator/create-simulator.ts @@ -75,7 +75,7 @@ export function createSimulator( .join(''); doc.open(); - doc.write(` + doc.write(` ${styleFrags} ${scriptFrags}`); doc.close(); diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 77f3cee83..dbd9f5713 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -105,6 +105,8 @@ export class DocumentModel { if (!schema) { this._blank = true; + } else { + this.id = project.getSchema()?.id || this.id; } this.rootNode = this.createNode( diff --git a/packages/editor-preset-vision/src/flags.ts b/packages/editor-preset-vision/src/flags.ts index f89478d80..5e6174ff0 100644 --- a/packages/editor-preset-vision/src/flags.ts +++ b/packages/editor-preset-vision/src/flags.ts @@ -16,7 +16,7 @@ export class Flags { constructor() { this.emitter = new EventEmitter(); - this.flags = ['design-mode']; + this.flags = []; domReady(() => { this.ready = true; diff --git a/packages/editor-preset-vision/src/index.ts b/packages/editor-preset-vision/src/index.ts index c619514e0..358ced1fe 100644 --- a/packages/editor-preset-vision/src/index.ts +++ b/packages/editor-preset-vision/src/index.ts @@ -30,11 +30,6 @@ import Symbols from './symbols'; import './vision.less'; function init(container?: Element) { - //TODO: dirty fix - // 之前的组件库依赖了这个样式，临时fix一下。 - // 取决于预览模式是否保留。 - document.documentElement.classList.add('engine-design-mode'); - if (!container) { container = document.createElement('div'); document.body.appendChild(container); diff --git a/packages/editor-preset-vision/src/pages.ts b/packages/editor-preset-vision/src/pages.ts index c8f70147d..65b2cd05c 100644 --- a/packages/editor-preset-vision/src/pages.ts +++ b/packages/editor-preset-vision/src/pages.ts @@ -52,6 +52,7 @@ const pages = Object.assign(project, { version: '1.0.0', componentsMap: [], componentsTree, + id: pages[0].id, }, true); // FIXME: 根本原因应该是 propStash 导致的，这样可以避免页面加载之后就被标记为 isModified diff --git a/packages/types/src/schema.ts b/packages/types/src/schema.ts index d3e74f6ea..0356e6c2b 100644 --- a/packages/types/src/schema.ts +++ b/packages/types/src/schema.ts @@ -83,6 +83,7 @@ export interface ProjectSchema { constants?: JSONObject; css?: string; dataSource?: DataSource; + id?: string; } export function isNodeSchema(data: any): data is NodeSchema {