From d8221dbfe7cc7d075056aafadad23b37481a72d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= <lihao.ylh@alibaba-inc.com>
Date: Wed, 19 Aug 2020 16:40:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=20c?=
 =?UTF-8?q?urrentPage=20=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/designer/src/document/document-model.ts | 5 ++++-
 packages/editor-preset-vision/src/pages.ts       | 9 ++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

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<RootNode>(
       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;
   }
 })