diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 77f3cee83..239560c35 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -107,6 +107,9 @@ export class DocumentModel { this._blank = true; } + // 兼容 vision + this.id = project.getSchema()?.id || this.id; + this.rootNode = this.createNode( schema || { componentName: 'Page', @@ -145,7 +148,7 @@ export class DocumentModel { * 生成唯一id */ nextId() { - return this.id + (++this.seqId).toString(36).toLocaleLowerCase(); + return (this.id.slice(-10) + (++this.seqId).toString(36)).toLocaleLowerCase(); } /** diff --git a/packages/editor-preset-vision/src/pages.ts b/packages/editor-preset-vision/src/pages.ts index 06bbd957b..b79c7a3ba 100644 --- a/packages/editor-preset-vision/src/pages.ts +++ b/packages/editor-preset-vision/src/pages.ts @@ -86,12 +86,7 @@ const pages = Object.assign(project, { page.active(); }, getCurrentPage() { - if (!project.currentDocument) { - return null; - } - const currentPage = { ...project.currentDocument, id: project.getSchema().id }; - Object.setPrototypeOf(currentPage, Object.getPrototypeOf(project.currentDocument || {})); - return currentPage; + return project.currentDocument; }, onPagesChange() { // noop @@ -106,7 +101,7 @@ const pages = Object.assign(project, { Object.defineProperty(pages, 'currentPage', { get() { - return pages.getCurrentPage(); + return project.currentDocument; } })