PullRequest: 113 fix: 组件重新渲染时序问题

Author: 轻游

packages/acr/src/modules/merge-request/merge-request.contribution.ts

@@ -44,26 +44,7 @@ export class MergeRequestContribution
   }
 
   onDidStart() {
-    // 重新载入会导致组件未注册 临时修复
-    const tabbarService = this.layoutService.getTabbarService(SlotLocation.left);
-    const componentRegistry =
-      this.componentRegistry.getComponentRegistryInfo(MergeRequestExplorerId);
-    if (componentRegistry) {
-      tabbarService.registerContainer(MergeRequestExplorerId, componentRegistry);
-      const state = this.layoutState.getState(LAYOUT_STATE.MAIN, {});
-      let currentId: string,
-        size: number = 0,
-        show = true;
-      for (const key in state) {
-        if (key === SlotLocation.left) {
-          currentId = state[key]?.currentId;
-          size = state[key]?.size || 0;
-          show = currentId ? true : false;
-        }
-      }
-      this.layoutService.toggleSlot(SlotLocation.left, show, size);
-    }
-    // 重新载入 titleMenu有缓存 需将其重置
+    // TODO 重新载入 titleMenu有缓存 需将其重置
     disposableCollection.push((injector) => {
       const accordionService: AccordionService = injector
         .get(IMainLayoutService)

packages/core/src/client/index.ts

@@ -30,6 +30,7 @@ import { EditorEmptyContribution } from './editor-empty/editor-empty.contributio
 import { WelcomeContribution } from './welcome/welcome.contributon';
 import { FileSchemeContribution } from './file-scheme/index.contribution';
 import { PreferenceSettingContribution } from './preference/preference.setting.contribution';
+import { LayoutRestoreContributation } from './layout/index.contribution';
 
 import {
   MonacoCodeService,
@@ -71,6 +72,7 @@ export class ClientModule extends BrowserModule {
     FileSchemeContribution,
     SearchContribution,
     PreferenceSettingContribution,
+    LayoutRestoreContributation,
     {
       token: MonacoCodeService,
       useValue: codeServiceEditor,

packages/core/src/client/layout/index.contribution.ts

@@ -0,0 +1,39 @@
+import { Autowired } from '@opensumi/di';
+import {
+  CommandRegistry,
+  SlotLocation,
+  ClientAppContribution,
+  AppConfig,
+  ComponentRegistry,
+} from '@opensumi/ide-core-browser';
+import { Domain } from '@opensumi/ide-core-common';
+import { IMainLayoutService } from '@opensumi/ide-main-layout';
+
+@Domain(ClientAppContribution)
+//TODO 组件卸载重新渲染 渲染时注册container 会有时序问题 临时修复
+export class LayoutRestoreContributation implements ClientAppContribution {
+  @Autowired(AppConfig)
+  private appConfig: AppConfig;
+  @Autowired(IMainLayoutService)
+  layoutService: IMainLayoutService;
+  @Autowired(ComponentRegistry)
+  componentRegistry: ComponentRegistry;
+  async onDidStart() {
+    const layoutConfig = this.appConfig.layoutConfig;
+    const layoutDirection = [SlotLocation.left, SlotLocation.bottom, SlotLocation.right];
+    layoutDirection.forEach((direction) => {
+      const tabbarService = this.layoutService.getTabbarService(direction);
+      layoutConfig[direction]?.modules.forEach((module) => {
+        const componentRegistry = this.componentRegistry.getComponentRegistryInfo(module);
+        if (componentRegistry) {
+          tabbarService.registerContainer(
+            componentRegistry.options!.containerId,
+            componentRegistry
+          );
+        }
+      });
+      // @ts-ignore
+      this.layoutService.restoreTabbarService(tabbarService);
+    });
+  }
+}