feat(workspace): update removeEditorWindow api

liujuping · JackLian · commit 547bbf4ddc03 · 2023-08-23T15:04:14.000+08:00
diff --git a/docs/docs/api/workspace.md b/docs/docs/api/workspace.md
@@ -107,7 +107,16 @@ openEditorWindowById(id: string): void;
 &#31227;&#38500;&#35270;&#22270;&#31383;&#21475;
 
 ```typescript
+/**
+ * &#31227;&#38500;&#35270;&#22270;&#31383;&#21475;
+ * @deprecated
+ */
 removeEditorWindow(resourceName: string, id: string): void;
+
+/**
+ * &#31227;&#38500;&#35270;&#22270;&#31383;&#21475;
+ */
+removeEditorWindow(resource: Resource): void;
 ```
 
 ### removeEditorWindowById
diff --git a/packages/shell/src/api/workspace.ts b/packages/shell/src/api/workspace.ts
@@ -76,8 +76,12 @@ export class Workspace implements IPublicApiWorkspace {
     this[workspaceSymbol].openEditorWindowById(id);
   }
 
-  removeEditorWindow(resourceName: string, id: string) {
-    this[workspaceSymbol].removeEditorWindow(resourceName, id);
+  removeEditorWindow() {
+    if (typeof arguments[0] === 'string') {
+      this[workspaceSymbol].removeEditorWindow(arguments[0], arguments[1]);
+    } else {
+      this[workspaceSymbol].removeEditorWindowByResource(arguments[0]?.[resourceSymbol]);
+    }
   }
 
   removeEditorWindowById(id: string) {
diff --git a/packages/types/src/shell/api/workspace.ts b/packages/types/src/shell/api/workspace.ts
@@ -42,9 +42,17 @@ export interface IPublicApiWorkspace<
   /** &#36890;&#36807;&#35270;&#22270; id &#25171;&#24320;&#31383;&#21475; */
   openEditorWindowById(id: string): void;
 
-  /** &#31227;&#38500;&#35270;&#22270;&#31383;&#21475; */
+  /**
+   * &#31227;&#38500;&#35270;&#22270;&#31383;&#21475;
+   * @deprecated
+   */
   removeEditorWindow(resourceName: string, id: string): void;
 
+  /**
+   * &#31227;&#38500;&#35270;&#22270;&#31383;&#21475;
+   */
+  removeEditorWindow(resource: Resource): void;
+
   /** &#36890;&#36807;&#35270;&#22270; id &#31227;&#38500;&#31383;&#21475; */
   removeEditorWindowById(id: string): void;
 
diff --git a/packages/workspace/src/workspace.ts b/packages/workspace/src/workspace.ts
@@ -22,7 +22,7 @@ const CHANGE_EVENT = 'resource.list.change';
 export interface IWorkspace extends Omit<IPublicApiWorkspace<
   LowCodePluginManager,
   IEditorWindow
->, 'resourceList' | 'plugins'> {
+>, 'resourceList' | 'plugins' | 'openEditorWindow' | 'removeEditorWindow'> {
   readonly registryInnerPlugin: (designer: IDesigner, editor: Editor, plugins: IPublicApiPlugins) => Promise<IPublicTypeDisposable>;
 
   readonly shellModelFactory: IShellModelFactory;
@@ -52,6 +52,18 @@ export interface IWorkspace extends Omit<IPublicApiWorkspace<
   emitChangeActiveEditorView(): void;
 
   openEditorWindowByResource(resource: IResource, sleep: boolean): Promise<void>;
+
+  /**
+   * @deprecated
+   */
+  removeEditorWindow(resourceName: string, id: string): void;
+
+  removeEditorWindowByResource(resource: IResource): void;
+
+  /**
+   * @deprecated
+   */
+  openEditorWindow(name: string, title: string, options: Object, viewName?: string, sleep?: boolean): Promise<void>;
 }
 
 export class Workspace implements IWorkspace {
@@ -213,7 +225,12 @@ export class Workspace implements IWorkspace {
   }
 
   removeEditorWindow(resourceName: string, id: string) {
-    const index = this.windows.findIndex(d => (d.resource?.name === resourceName && d.title === id));
+    const index = this.windows.findIndex(d => (d.resource?.name === resourceName && (d.title === id || d.resource.id === id)));
+    this.remove(index);
+  }
+
+  removeEditorWindowByResource(resource: IResource) {
+    const index = this.windows.findIndex(d => (d.resource?.id === resource.id));
     this.remove(index);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,12 @@ export class Workspace implements IPublicApiWorkspace {`
`76`	`76`	`this[workspaceSymbol].openEditorWindowById(id);`
`77`	`77`	`}`
`78`	`78`
`79`		`- removeEditorWindow(resourceName: string, id: string) {`
`80`		`- this[workspaceSymbol].removeEditorWindow(resourceName, id);`
	`79`	`+ removeEditorWindow() {`
	`80`	`+ if (typeof arguments[0] === 'string') {`
	`81`	`+ this[workspaceSymbol].removeEditorWindow(arguments[0], arguments[1]);`
	`82`	`+ } else {`
	`83`	`+ this[workspaceSymbol].removeEditorWindowByResource(arguments[0]?.[resourceSymbol]);`
	`84`	`+ }`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`removeEditorWindowById(id: string) {`
-Original file line number
+Diff line change
   /** 通过视图 id 打开窗口 */
   openEditorWindowById(id: string): void;
 -  /** 移除视图窗口 */
 +  /**
 +   * 移除视图窗口
 +   * @deprecated
 +   */
   removeEditorWindow(resourceName: string, id: string): void;
 +  /**
 +   * 移除视图窗口
 +   */
 +  removeEditorWindow(resource: Resource): void;
++
   /** 通过视图 id 移除窗口 */
   removeEditorWindowById(id: string): void;