feat: improve the workspace sleep scene

liujuping · JackLian · commit 059ffe0eaac7 · 2023-05-17T19:29:42.000+08:00
diff --git a/packages/workspace/src/window.ts b/packages/workspace/src/window.ts
@@ -51,9 +51,6 @@ export class EditorWindow implements IEditorWindow {
     this.title = config.title;
     this.icon = resource.icon;
     this.sleep = config.sleep;
-    if (!config.sleep) {
-      this.init();
-    }
   }
 
   async importSchema(schema: any) {
@@ -155,14 +152,15 @@ export class EditorWindow implements IEditorWindow {
       return;
     }
 
+    this.editorView.setActivate(true);
+
     if (!ignoreEmit) {
       this.emitter.emit('window.change.view.type', name);
 
       if (this.id === this.workspace.window.id) {
         this.workspace.emitChangeActiveEditorView();
       }
     }
-    this.editorView.setActivate(true);
   };
 
   get project() {
diff --git a/packages/workspace/src/workspace.ts b/packages/workspace/src/workspace.ts
@@ -115,7 +115,7 @@ export class Workspace implements IWorkspace {
     }
   }
 
-  initWindow() {
+  async initWindow() {
     if (!this.defaultResourceType || this.enableAutoOpenFirstWindow === false) {
       return;
     }
@@ -127,6 +127,7 @@ export class Workspace implements IWorkspace {
     this.window = new EditorWindow(resource, this, {
       title: resource.title,
     });
+    await this.window.init();
     this.editorWindowMap.set(this.window.id, this.window);
     this.windows = [...this.windows, this.window];
     this.emitChangeWindow();
@@ -196,6 +197,9 @@ export class Workspace implements IWorkspace {
     this.windows.splice(index, 1);
     if (this.window === window) {
       this.window = this.windows[index] || this.windows[index + 1] || this.windows[index - 1];
+      if (this.window.sleep) {
+        this.window.init();
+      }
       this.emitChangeActiveWindow();
     }
     this.emitChangeWindow();
@@ -206,10 +210,13 @@ export class Workspace implements IWorkspace {
     this.remove(index);
   }
 
-  openEditorWindowById(id: string) {
+  async openEditorWindowById(id: string) {
     const window = this.editorWindowMap.get(id);
     if (window) {
       this.window = window;
+      if (window.sleep) {
+        await window.init();
+      }
       this.emitChangeActiveWindow();
     }
   }
@@ -252,6 +259,7 @@ export class Workspace implements IWorkspace {
     this.editorWindowMap.set(window.id, window);
     if (!sleep) {
       this.window = window;
+      await this.window.init();
     }
     this.emitChangeWindow();
     this.emitChangeActiveWindow();

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,6 @@ export class EditorWindow implements IEditorWindow {`
`51`	`51`	`this.title = config.title;`
`52`	`52`	`this.icon = resource.icon;`
`53`	`53`	`this.sleep = config.sleep;`
`54`		`- if (!config.sleep) {`
`55`		`- this.init();`
`56`		`- }`
`57`	`54`	`}`
`58`	`55`
`59`	`56`	`async importSchema(schema: any) {`
`@@ -155,14 +152,15 @@ export class EditorWindow implements IEditorWindow {`
`155`	`152`	`return;`
`156`	`153`	`}`
`157`	`154`
	`155`	`+ this.editorView.setActivate(true);`
	`156`	`+`
`158`	`157`	`if (!ignoreEmit) {`
`159`	`158`	`this.emitter.emit('window.change.view.type', name);`
`160`	`159`
`161`	`160`	`if (this.id === this.workspace.window.id) {`
`162`	`161`	`this.workspace.emitChangeActiveEditorView();`
`163`	`162`	`}`
`164`	`163`	`}`
`165`		`- this.editorView.setActivate(true);`
`166`	`164`	`};`
`167`	`165`
`168`	`166`	`get project() {`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ export class Workspace implements IWorkspace {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`- initWindow() {`
	`118`	`+ async initWindow() {`
`119`	`119`	`if (!this.defaultResourceType \|\| this.enableAutoOpenFirstWindow === false) {`
`120`	`120`	`return;`
`121`	`121`	`}`
`@@ -127,6 +127,7 @@ export class Workspace implements IWorkspace {`
`127`	`127`	`this.window = new EditorWindow(resource, this, {`
`128`	`128`	`title: resource.title,`
`129`	`129`	`});`
	`130`	`+ await this.window.init();`
`130`	`131`	`this.editorWindowMap.set(this.window.id, this.window);`
`131`	`132`	`this.windows = [...this.windows, this.window];`
`132`	`133`	`this.emitChangeWindow();`
`@@ -196,6 +197,9 @@ export class Workspace implements IWorkspace {`
`196`	`197`	`this.windows.splice(index, 1);`
`197`	`198`	`if (this.window === window) {`
`198`	`199`	`this.window = this.windows[index] \|\| this.windows[index + 1] \|\| this.windows[index - 1];`
	`200`	`+ if (this.window.sleep) {`
	`201`	`+ this.window.init();`
	`202`	`+ }`
`199`	`203`	`this.emitChangeActiveWindow();`
`200`	`204`	`}`
`201`	`205`	`this.emitChangeWindow();`
`@@ -206,10 +210,13 @@ export class Workspace implements IWorkspace {`
`206`	`210`	`this.remove(index);`
`207`	`211`	`}`
`208`	`212`
`209`		`- openEditorWindowById(id: string) {`
	`213`	`+ async openEditorWindowById(id: string) {`
`210`	`214`	`const window = this.editorWindowMap.get(id);`
`211`	`215`	`if (window) {`
`212`	`216`	`this.window = window;`
	`217`	`+ if (window.sleep) {`
	`218`	`+ await window.init();`
	`219`	`+ }`
`213`	`220`	`this.emitChangeActiveWindow();`
`214`	`221`	`}`
`215`	`222`	`}`
`@@ -252,6 +259,7 @@ export class Workspace implements IWorkspace {`
`252`	`259`	`this.editorWindowMap.set(window.id, window);`
`253`	`260`	`if (!sleep) {`
`254`	`261`	`this.window = window;`
	`262`	`+ await this.window.init();`
`255`	`263`	`}`
`256`	`264`	`this.emitChangeWindow();`
`257`	`265`	`this.emitChangeActiveWindow();`