From 44bdda1187d6f5420dbd75e74f44bf7c11a7ea4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Mon, 21 Sep 2020 17:05:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=20checkId=20=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD,=20=E5=9C=A8=20setSchema=20?= =?UTF-8?q?=E6=97=B6=E5=85=B3=E9=97=AD,=20=E9=81=BF=E5=85=8D=20id=20?= =?UTF-8?q?=E8=A2=AB=E4=B8=8D=E6=96=AD=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/document-model.ts | 4 ++-- packages/designer/src/document/node/node-children.ts | 2 +- packages/designer/src/project/project.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index fab7bb49e..2b3059fea 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -193,7 +193,7 @@ export class DocumentModel { /** * 根据 schema 创建一个节点 */ - createNode(data: GetDataType): T { + createNode(data: GetDataType, checkId: boolean = true): T { let schema: any; if (isDOMText(data) || isJSExpression(data)) { schema = { @@ -205,7 +205,7 @@ export class DocumentModel { } let node: Node | null = null; - if (this.inited) { + if (this.inited && checkId) { schema.id = null; } if (schema.id) { diff --git a/packages/designer/src/document/node/node-children.ts b/packages/designer/src/document/node/node-children.ts index 1a3be57f0..724522a95 100644 --- a/packages/designer/src/document/node/node-children.ts +++ b/packages/designer/src/document/node/node-children.ts @@ -51,7 +51,7 @@ export class NodeChildren { node = child; node.import(item); } else { - node = this.owner.document.createNode(item); + node = this.owner.document.createNode(item, checkId); } children[i] = node; } diff --git a/packages/designer/src/project/project.ts b/packages/designer/src/project/project.ts index fa2024525..f15227f04 100644 --- a/packages/designer/src/project/project.ts +++ b/packages/designer/src/project/project.ts @@ -40,7 +40,7 @@ export class Project { */ setSchema(schema?: ProjectSchema) { const doc = this.documents.find((doc) => doc.actived); - doc && doc.import(schema?.componentsTree[0]); + doc && doc.import(schema?.componentsTree[0], false); } /**