@opensumi/ide-main-layout 3.8.3-next-1742888942.0 → 3.8.3-next-1742981362.0

package/lib/browser/layout.service.d.ts

@@ -33,7 +33,38 @@ export declare class LayoutService extends WithEventBus implements IMainLayoutSe
     didMount(): void;
     storeState(service: TabbarService, currentId?: string): void;
     onThemeChange(e: ThemeChangedEvent): void;
-    restoreTabbarService: (service: TabbarService) => Promise<void>;
+    private initializeLayout;
+    private determineDefaultContainer;
+    private getRestorePanelContainer;
+    /**
+     * 是否是有效的模块
+     * @param panel
+     * @param location
+     * @returns
+     */
+    private isValidModule;
+    /**
+     * ContainerId 存在三种值类型，对应的处理模式如下：
+     * 1. undefined: 采用首个注册的容器作为当前 containerId
+     * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
+     * 3. '': 使用 defaultContainer 作为当前 containerId, 如果 defaultContainer 不存在，则清空
+     */
+    private updateContainerId;
+    /**
+     * 如果当前 containerId 未定义，则将相邻的 containerId 作为当前 containerId
+     * @param service
+     * @param defaultContainer
+     */
+    private handleUndefinedContainer;
+    /**
+     * 如果当前 containerId 已存在，则直接使用该 containerId 作为当前 containerId
+     * 若不存在，则将当前 containerId 移动到相应的 tabbar 中
+     * @param service
+     * @param currentId
+     * @param defaultContainer
+     * @returns
+     */
+    private handleExistingContainer;
     findTabbarServiceByContainerId(containerId: string): TabbarService | undefined;
     moveContainerTo(containerId: string, to: string): void;
     showDropAreaForContainer(containerId: string): void;

package/lib/browser/layout.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.service.d.ts","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"layout.service.d.ts","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":"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"}

package/lib/browser/layout.service.js

@@ -42,71 +42,6 @@ let LayoutService = class LayoutService extends ide_core_browser_1.WithEventBus
         this.customViews = new Map();
         this.debug = (0, ide_core_common_1.getDebugLogger)();
         this.viewReady = new ide_core_common_1.Deferred();
-        this.restoreTabbarService = async (service) => {
-            var _a;
-            this.state = (0, components_1.fixLayout)(this.layoutState.getState(layout_state_1.LAYOUT_STATE.MAIN, defaultLayoutState));
-            const { currentId, size } = this.state[service.location] || {};
-            service.prevSize = size;
-            let defaultContainer = service.visibleContainers[0] && service.visibleContainers[0].options.containerId;
-            const defaultPanels = this.appConfig.defaultPanels;
-            const restorePanel = defaultPanels && defaultPanels[service.location];
-            if (defaultPanels && restorePanel !== undefined) {
-                if (restorePanel) {
-                    if (service.containersMap.has(restorePanel)) {
-                        defaultContainer = restorePanel;
-                    }
-                    else {
-                        const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
-                        if (componentInfo &&
-                            ((_a = this.appConfig.layoutConfig[service.location]) === null || _a === void 0 ? void 0 : _a.modules) &&
-                            ~this.appConfig.layoutConfig[service.location].modules.indexOf(restorePanel)) {
-                            defaultContainer = componentInfo.options.containerId;
-                        }
-                        else {
-                            this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
-                        }
-                    }
-                }
-                else {
-                    defaultContainer = '';
-                }
-            }
-            /**
-             * ContainerId 存在三种值类型，对应的处理模式如下：
-             * 1. undefined: 采用首个注册的容器作为当前 containerId
-             * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
-             * 3. '': 直接清空当前 containerId，不展开相应的 viewContainer
-             */
-            if ((0, ide_core_common_1.isUndefined)(currentId)) {
-                if ((0, ide_core_common_1.isUndefined)(defaultContainer)) {
-                    // 默认采用首个注册的容器作为当前 containerId
-                    service.updateNextContainerId();
-                }
-                else {
-                    service.updateCurrentContainerId(defaultContainer);
-                }
-            }
-            else if (currentId && !this.isDropContainer(currentId)) {
-                if (service.containersMap.has(currentId)) {
-                    service.updateCurrentContainerId(currentId);
-                }
-                else {
-                    // 如果在别的 tabbar 中存在该 containerId，则将其移动到当前 tabbar
-                    if (this.findTabbarServiceByContainerId(currentId)) {
-                        this.moveContainerTo(currentId, service.location);
-                        service.updateCurrentContainerId(currentId);
-                    }
-                    else {
-                        service.updateCurrentContainerId(defaultContainer);
-                        // 等待后续新容器注册时，更新当前的 containerId
-                        service.updateNextContainerId(currentId);
-                    }
-                }
-            }
-            else if (currentId === '' || this.isDropContainer(currentId)) {
-                service.updateCurrentContainerId('');
-            }
-        };
         this.holdTabbarComponent = new Map();
         // 时序保证用，view先注册，container后注册同样需要触发更新
         this.tabbarUpdateSet = new Set();
@@ -154,6 +89,115 @@ let LayoutService = class LayoutService extends ide_core_browser_1.WithEventBus
             statusBarBackground: (_e = theme.getColor('statusBar.background')) === null || _e === void 0 ? void 0 : _e.toString(),
         }));
     }
+    initializeLayout(service) {
+        // 1. 获取初始状态
+        this.state = (0, components_1.fixLayout)(this.layoutState.getState(layout_state_1.LAYOUT_STATE.MAIN, defaultLayoutState));
+        const { currentId, size } = this.state[service.location] || {};
+        service.prevSize = size;
+        // 2. 确定默认容器
+        const defaultContainer = this.determineDefaultContainer(service);
+        // 3. 更新当前容器ID
+        this.updateContainerId(service, currentId, defaultContainer);
+    }
+    determineDefaultContainer(service) {
+        var _a, _b;
+        // 获取默认可见容器
+        const defaultVisibleContainer = ((_b = (_a = service.visibleContainers[0]) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.containerId) || '';
+        // 如果没有配置默认面板，直接返回默认可见容器
+        const { defaultPanels } = this.appConfig;
+        if (!defaultPanels) {
+            return defaultVisibleContainer;
+        }
+        const restorePanel = defaultPanels[service.location];
+        // 如果明确设置为false，返回空字符串
+        if (!restorePanel) {
+            return '';
+        }
+        // 如果未定义，返回默认可见容器
+        if (restorePanel === undefined) {
+            return defaultVisibleContainer;
+        }
+        // 处理restorePanel字符串情况
+        return this.getRestorePanelContainer(service, restorePanel, service.location) || defaultVisibleContainer;
+    }
+    getRestorePanelContainer(service, restorePanel, location) {
+        var _a;
+        // 直接使用已存在的容器
+        if (service.containersMap.has(restorePanel)) {
+            return restorePanel;
+        }
+        // 尝试从 componentRegistry 获取容器
+        const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
+        if (componentInfo && this.isValidModule(restorePanel, location)) {
+            return ((_a = componentInfo.options) === null || _a === void 0 ? void 0 : _a.containerId) || '';
+        }
+        this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
+        return '';
+    }
+    /**
+     * 是否是有效的模块
+     * @param panel
+     * @param location
+     * @returns
+     */
+    isValidModule(panel, location) {
+        var _a;
+        const modules = (_a = this.appConfig.layoutConfig[location]) === null || _a === void 0 ? void 0 : _a.modules;
+        return modules ? modules.includes(panel) : false;
+    }
+    /**
+     * ContainerId 存在三种值类型，对应的处理模式如下：
+     * 1. undefined: 采用首个注册的容器作为当前 containerId
+     * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
+     * 3. '': 使用 defaultContainer 作为当前 containerId, 如果 defaultContainer 不存在，则清空
+     */
+    updateContainerId(service, currentId, defaultContainer) {
+        if ((0, ide_core_common_1.isUndefined)(currentId)) {
+            this.handleUndefinedContainer(service, defaultContainer);
+        }
+        else if (currentId && !this.isDropContainer(currentId)) {
+            this.handleExistingContainer(service, currentId, defaultContainer);
+        }
+        else {
+            service.updateCurrentContainerId(defaultContainer || '');
+        }
+    }
+    /**
+     * 如果当前 containerId 未定义，则将相邻的 containerId 作为当前 containerId
+     * @param service
+     * @param defaultContainer
+     */
+    handleUndefinedContainer(service, defaultContainer) {
+        if ((0, ide_core_common_1.isUndefined)(defaultContainer)) {
+            service.updateNextContainerId();
+        }
+        else {
+            service.updateCurrentContainerId(defaultContainer);
+        }
+    }
+    /**
+     * 如果当前 containerId 已存在，则直接使用该 containerId 作为当前 containerId
+     * 若不存在，则将当前 containerId 移动到相应的 tabbar 中
+     * @param service
+     * @param currentId
+     * @param defaultContainer
+     * @returns
+     */
+    handleExistingContainer(service, currentId, defaultContainer) {
+        if (service.containersMap.has(currentId)) {
+            service.updateCurrentContainerId(currentId);
+            return;
+        }
+        const tabbarService = this.findTabbarServiceByContainerId(currentId);
+        if (tabbarService) {
+            this.moveContainerTo(currentId, service.location);
+            service.updateCurrentContainerId(currentId);
+        }
+        else {
+            service.updateCurrentContainerId(defaultContainer);
+            service.updateNextContainerId(currentId);
+        }
+    }
     findTabbarServiceByContainerId(containerId) {
         let tabbarService;
         for (const value of this.tabbarServices.values()) {
@@ -282,7 +326,7 @@ let LayoutService = class LayoutService extends ide_core_browser_1.WithEventBus
             }));
             service.viewReady.promise
                 .then(() => service.restoreState())
-                .then(() => this.restoreTabbarService(service))
+                .then(() => this.initializeLayout(service))
                 .catch((err) => {
                 this.logger.error(`[TabbarService:${location}] restore state error`, err);
             });

package/lib/browser/layout.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.service.js","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"layout.service.js","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-main-layout",
-  "version": "3.8.3-next-1742888942.0",
+  "version": "3.8.3-next-1742981362.0",
   "description": "@opensumi/ide-main-layout",
   "files": [
     "lib",
@@ -18,14 +18,14 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-components": "3.8.3-next-1742888942.0",
-    "@opensumi/ide-core-browser": "3.8.3-next-1742888942.0",
-    "@opensumi/ide-core-common": "3.8.3-next-1742888942.0",
-    "@opensumi/ide-theme": "3.8.3-next-1742888942.0"
+    "@opensumi/ide-components": "3.8.3-next-1742981362.0",
+    "@opensumi/ide-core-browser": "3.8.3-next-1742981362.0",
+    "@opensumi/ide-core-common": "3.8.3-next-1742981362.0",
+    "@opensumi/ide-theme": "3.8.3-next-1742981362.0"
   },
   "devDependencies": {
-    "@opensumi/ide-dev-tool": "3.8.3-next-1742888942.0",
-    "@opensumi/ide-monaco": "3.8.3-next-1742888942.0"
+    "@opensumi/ide-dev-tool": "3.8.3-next-1742981362.0",
+    "@opensumi/ide-monaco": "3.8.3-next-1742981362.0"
   },
-  "gitHead": "32faed75df13071e626bd47154c53b573806567d"
+  "gitHead": "cd0ab83b96d80b093af5fbd6763decad3cd66448"
 }

package/src/browser/layout.service.ts

@@ -172,65 +172,122 @@ export class LayoutService extends WithEventBus implements IMainLayoutService {
     );
   }
 
-  restoreTabbarService = async (service: TabbarService) => {
+  private initializeLayout(service: TabbarService) {
+    // 1. 获取初始状态
     this.state = fixLayout(this.layoutState.getState(LAYOUT_STATE.MAIN, defaultLayoutState));
-
     const { currentId, size } = this.state[service.location] || {};
     service.prevSize = size;
-    let defaultContainer = service.visibleContainers[0] && service.visibleContainers[0].options!.containerId;
-    const defaultPanels = this.appConfig.defaultPanels;
-    const restorePanel = defaultPanels && defaultPanels[service.location];
-    if (defaultPanels && restorePanel !== undefined) {
-      if (restorePanel) {
-        if (service.containersMap.has(restorePanel)) {
-          defaultContainer = restorePanel;
-        } else {
-          const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
-          if (
-            componentInfo &&
-            this.appConfig.layoutConfig[service.location]?.modules &&
-            ~this.appConfig.layoutConfig[service.location].modules.indexOf(restorePanel)
-          ) {
-            defaultContainer = componentInfo.options!.containerId;
-          } else {
-            this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
-          }
-        }
-      } else {
-        defaultContainer = '';
-      }
+
+    // 2. 确定默认容器
+    const defaultContainer = this.determineDefaultContainer(service);
+
+    // 3. 更新当前容器ID
+    this.updateContainerId(service, currentId, defaultContainer);
+  }
+
+  private determineDefaultContainer(service: TabbarService): string {
+    // 获取默认可见容器
+    const defaultVisibleContainer = service.visibleContainers[0]?.options?.containerId || '';
+
+    // 如果没有配置默认面板，直接返回默认可见容器
+    const { defaultPanels } = this.appConfig;
+    if (!defaultPanels) {
+      return defaultVisibleContainer;
+    }
+
+    const restorePanel = defaultPanels[service.location];
+    // 如果明确设置为false，返回空字符串
+    if (!restorePanel) {
+      return '';
+    }
+    // 如果未定义，返回默认可见容器
+    if (restorePanel === undefined) {
+      return defaultVisibleContainer;
+    }
+
+    // 处理restorePanel字符串情况
+    return this.getRestorePanelContainer(service, restorePanel, service.location) || defaultVisibleContainer;
+  }
+
+  private getRestorePanelContainer(service: TabbarService, restorePanel: string, location: string): string {
+    // 直接使用已存在的容器
+    if (service.containersMap.has(restorePanel)) {
+      return restorePanel;
     }
-    /**
-     * ContainerId 存在三种值类型，对应的处理模式如下：
-     * 1. undefined: 采用首个注册的容器作为当前 containerId
-     * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
-     * 3. '': 直接清空当前 containerId，不展开相应的 viewContainer
-     */
+
+    // 尝试从 componentRegistry 获取容器
+    const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
+    if (componentInfo && this.isValidModule(restorePanel, location)) {
+      return componentInfo.options?.containerId || '';
+    }
+
+    this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
+    return '';
+  }
+
+  /**
+   * 是否是有效的模块
+   * @param panel
+   * @param location
+   * @returns
+   */
+  private isValidModule(panel: string, location: string): boolean {
+    const modules = this.appConfig.layoutConfig[location]?.modules;
+    return modules ? modules.includes(panel) : false;
+  }
+
+  /**
+   * ContainerId 存在三种值类型，对应的处理模式如下：
+   * 1. undefined: 采用首个注册的容器作为当前 containerId
+   * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
+   * 3. '': 使用 defaultContainer 作为当前 containerId, 如果 defaultContainer 不存在，则清空
+   */
+  private updateContainerId(service: TabbarService, currentId: string | undefined, defaultContainer: string) {
     if (isUndefined(currentId)) {
-      if (isUndefined(defaultContainer)) {
-        // 默认采用首个注册的容器作为当前 containerId
-        service.updateNextContainerId();
-      } else {
-        service.updateCurrentContainerId(defaultContainer);
-      }
+      this.handleUndefinedContainer(service, defaultContainer);
     } else if (currentId && !this.isDropContainer(currentId)) {
-      if (service.containersMap.has(currentId)) {
-        service.updateCurrentContainerId(currentId);
-      } else {
-        // 如果在别的 tabbar 中存在该 containerId，则将其移动到当前 tabbar
-        if (this.findTabbarServiceByContainerId(currentId)) {
-          this.moveContainerTo(currentId, service.location);
-          service.updateCurrentContainerId(currentId);
-        } else {
-          service.updateCurrentContainerId(defaultContainer);
-          // 等待后续新容器注册时，更新当前的 containerId
-          service.updateNextContainerId(currentId);
-        }
-      }
-    } else if (currentId === '' || this.isDropContainer(currentId)) {
-      service.updateCurrentContainerId('');
+      this.handleExistingContainer(service, currentId, defaultContainer);
+    } else {
+      service.updateCurrentContainerId(defaultContainer || '');
     }
-  };
+  }
+
+  /**
+   * 如果当前 containerId 未定义，则将相邻的 containerId 作为当前 containerId
+   * @param service
+   * @param defaultContainer
+   */
+  private handleUndefinedContainer(service: TabbarService, defaultContainer: string) {
+    if (isUndefined(defaultContainer)) {
+      service.updateNextContainerId();
+    } else {
+      service.updateCurrentContainerId(defaultContainer);
+    }
+  }
+
+  /**
+   * 如果当前 containerId 已存在，则直接使用该 containerId 作为当前 containerId
+   * 若不存在，则将当前 containerId 移动到相应的 tabbar 中
+   * @param service
+   * @param currentId
+   * @param defaultContainer
+   * @returns
+   */
+  private handleExistingContainer(service: TabbarService, currentId: string, defaultContainer: string) {
+    if (service.containersMap.has(currentId)) {
+      service.updateCurrentContainerId(currentId);
+      return;
+    }
+
+    const tabbarService = this.findTabbarServiceByContainerId(currentId);
+    if (tabbarService) {
+      this.moveContainerTo(currentId, service.location);
+      service.updateCurrentContainerId(currentId);
+    } else {
+      service.updateCurrentContainerId(defaultContainer);
+      service.updateNextContainerId(currentId);
+    }
+  }
 
   findTabbarServiceByContainerId(containerId: string): TabbarService | undefined {
     let tabbarService: undefined | TabbarService;
@@ -376,7 +433,7 @@ export class LayoutService extends WithEventBus implements IMainLayoutService {
       );
       service.viewReady.promise
         .then(() => service.restoreState())
-        .then(() => this.restoreTabbarService(service))
+        .then(() => this.initializeLayout(service))
         .catch((err) => {
           this.logger.error(`[TabbarService:${location}] restore state error`, err);
         });