feat: workspace add some features

liujuping · JackLian · commit ee80fb12b864 · 2023-05-16T18:42:29.000+08:00
diff --git a/packages/editor-core/src/config.ts b/packages/editor-core/src/config.ts
@@ -150,6 +150,11 @@ const VALID_ENGINE_OPTIONS = {
     description: '应用级设计模式下，自动打开第一个窗口',
     default: true,
   },
+  enableWorkspaceMode: {
+    type: 'boolean',
+    description: '是否开启应用级设计模式',
+    default: false,
+  },
 };
 
 const getStrictModeValue = (engineOptions: IPublicTypeEngineOptions, defaultValue: boolean): boolean => {
diff --git a/packages/shell/src/api/workspace.ts b/packages/shell/src/api/workspace.ts
@@ -42,8 +42,8 @@ export class Workspace implements IPublicApiWorkspace {
     this[workspaceSymbol].registerResourceType(resourceTypeModel);
   }
 
-  openEditorWindow(resourceName: string, title: string, extra: object, viewName?: string, sleep?: boolean): void {
-    this[workspaceSymbol].openEditorWindow(resourceName, title, extra, viewName, sleep);
+  async openEditorWindow(resourceName: string, title: string, extra: object, viewName?: string, sleep?: boolean): Promise<void> {
+    await this[workspaceSymbol].openEditorWindow(resourceName, title, extra, viewName, sleep);
   }
 
   openEditorWindowById(id: string) {
diff --git a/packages/types/src/shell/api/workspace.ts b/packages/types/src/shell/api/workspace.ts
@@ -30,7 +30,7 @@ export interface IPublicApiWorkspace<
   registerResourceType(resourceTypeModel: IPublicTypeResourceType): void;
 
   /** 打开视图窗口 */
-  openEditorWindow(resourceName: string, title: string, extra: Object, viewName?: string, sleep?: boolean): void;
+  openEditorWindow(resourceName: string, title: string, extra: Object, viewName?: string, sleep?: boolean): Promise<void>;
 
   /** 通过视图 id 打开窗口 */
   openEditorWindowById(id: string): void;
@@ -47,6 +47,12 @@ export interface IPublicApiWorkspace<
   /** active 窗口变更事件 */
   onChangeActiveWindow(fn: () => void): IPublicTypeDisposable;
 
+  /**
+   * active 视图变更事件
+   * @since v1.1.7
+   */
+  onChangeActiveEditorView(fn: () => void): IPublicTypeDisposable;
+
   /**
    * window 下的所有视图 renderer ready 事件
    * @since v1.1.7
diff --git a/packages/types/src/shell/model/plugin-context.ts b/packages/types/src/shell/model/plugin-context.ts
@@ -13,7 +13,7 @@ import {
   IPublicApiWorkspace,
 } from '../api';
 import { IPublicEnumPluginRegisterLevel } from '../enum';
-import { IPublicModelEngineConfig } from './';
+import { IPublicModelEngineConfig, IPublicModelEditorView } from './';
 
 export interface IPublicModelPluginContext {
 
@@ -107,6 +107,8 @@ export interface IPublicModelPluginContext {
    * @since v1.1.7
    */
   get registerLevel(): IPublicEnumPluginRegisterLevel;
+
+  get editorWindow(): IPublicModelEditorView;
 }
 
 /**
diff --git a/packages/workspace/src/workspace.ts b/packages/workspace/src/workspace.ts
@@ -128,7 +128,7 @@ export class Workspace implements IWorkspace {
       title: resource.title,
     });
     this.editorWindowMap.set(this.window.id, this.window);
-    this.windows.push(this.window);
+    this.windows = [...this.windows, this.window];
     this.emitChangeWindow();
     this.emitChangeActiveWindow();
   }
@@ -214,7 +214,7 @@ export class Workspace implements IWorkspace {
     }
   }
 
-  openEditorWindow(name: string, title: string, options: Object, viewType?: string, sleep?: boolean) {
+  async openEditorWindow(name: string, title: string, options: Object, viewType?: string, sleep?: boolean) {
     if (this.window && !this.window?.initReady && !sleep) {
       this.windowQueue.push({
         name, title, options, viewType,
@@ -230,7 +230,7 @@ export class Workspace implements IWorkspace {
     if (filterWindows && filterWindows.length) {
       this.window = filterWindows[0];
       if (!sleep && this.window.sleep) {
-        this.window.init();
+        await this.window.init();
       } else {
         this.checkWindowQueue();
       }

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ export class Workspace implements IPublicApiWorkspace {`
`42`	`42`	`this[workspaceSymbol].registerResourceType(resourceTypeModel);`
`43`	`43`	`}`
`44`	`44`
`45`		`- openEditorWindow(resourceName: string, title: string, extra: object, viewName?: string, sleep?: boolean): void {`
`46`		`- this[workspaceSymbol].openEditorWindow(resourceName, title, extra, viewName, sleep);`
	`45`	`+ async openEditorWindow(resourceName: string, title: string, extra: object, viewName?: string, sleep?: boolean): Promise<void> {`
	`46`	`+ await this[workspaceSymbol].openEditorWindow(resourceName, title, extra, viewName, sleep);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`openEditorWindowById(id: string) {`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ export class Workspace implements IWorkspace {`
`128`	`128`	`title: resource.title,`
`129`	`129`	`});`
`130`	`130`	`this.editorWindowMap.set(this.window.id, this.window);`
`131`		`- this.windows.push(this.window);`
	`131`	`+ this.windows = [...this.windows, this.window];`
`132`	`132`	`this.emitChangeWindow();`
`133`	`133`	`this.emitChangeActiveWindow();`
`134`	`134`	`}`
`@@ -214,7 +214,7 @@ export class Workspace implements IWorkspace {`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
`217`		`- openEditorWindow(name: string, title: string, options: Object, viewType?: string, sleep?: boolean) {`
	`217`	`+ async openEditorWindow(name: string, title: string, options: Object, viewType?: string, sleep?: boolean) {`
`218`	`218`	`if (this.window && !this.window?.initReady && !sleep) {`
`219`	`219`	`this.windowQueue.push({`
`220`	`220`	`name, title, options, viewType,`
`@@ -230,7 +230,7 @@ export class Workspace implements IWorkspace {`
`230`	`230`	`if (filterWindows && filterWindows.length) {`
`231`	`231`	`this.window = filterWindows[0];`
`232`	`232`	`if (!sleep && this.window.sleep) {`
`233`		`- this.window.init();`
	`233`	`+ await this.window.init();`
`234`	`234`	`} else {`
`235`	`235`	`this.checkWindowQueue();`
`236`	`236`	`}`