From 50f3724ef82edbbc481be392ceb4f2e7a18772d2 Mon Sep 17 00:00:00 2001
From: Baobhan Sith <80159437+Heavrnl@users.noreply.github.com>
Date: Wed, 28 May 2025 10:02:44 +0800
Subject: [PATCH] update

---
 .../src/components/LayoutRenderer.vue         | 33 +++++++++++++++----
 packages/frontend/src/components/Terminal.vue | 17 ++++------
 .../src/composables/workspaceEvents.ts        |  4 ++-
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/packages/frontend/src/components/LayoutRenderer.vue b/packages/frontend/src/components/LayoutRenderer.vue
index e7a6ba1..d8f4d98 100644
--- a/packages/frontend/src/components/LayoutRenderer.vue
+++ b/packages/frontend/src/components/LayoutRenderer.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { ConnectionInfo } from '../stores/connections.store';
-import { computed, defineAsyncComponent, type PropType, type Component, ref, watch, onMounted, nextTick, type CSSProperties } from 'vue'; // Added nextTick and CSSProperties
+import { computed, defineAsyncComponent, type PropType, type Component, ref, watch, onMounted, onBeforeUnmount, nextTick, type CSSProperties } from 'vue'; // Added onBeforeUnmount, nextTick and CSSProperties
 import { useI18n } from 'vue-i18n';
-
+import { useWorkspaceEventSubscriber, useWorkspaceEventOff } from '../composables/workspaceEvents';
 import '@fortawesome/fontawesome-free/css/all.min.css';
 import { Splitpanes, Pane } from 'splitpanes';
 import { useLayoutStore, type LayoutNode, type PaneName } from '../stores/layout.store';
@@ -49,12 +49,13 @@ const props = defineProps({
 
 
 
-// --- Setup ---
 const layoutStore = useLayoutStore();
 const sessionStore = useSessionStore();
-const fileEditorStore = useFileEditorStore(); // <-- Initialize FileEditorStore
-const settingsStore = useSettingsStore(); // +++ Initialize SettingsStore +++
-const { t } = useI18n(); // <-- Get translation function
+const fileEditorStore = useFileEditorStore(); 
+const settingsStore = useSettingsStore(); 
+const { t } = useI18n();
+const subscribeToWorkspaceEvent = useWorkspaceEventSubscriber();
+const unsubscribeFromWorkspaceEvent = useWorkspaceEventOff();
 
 // +++ Appearance Store Refs +++
 const appearanceStore = useAppearanceStore();
@@ -366,6 +367,14 @@ const getIconClasses = (paneName: PaneName): string[] => {
 
 // --- Sidebar Resize Logic ---
 onMounted(() => {
+  const handleStabilizedTerminalResize = ({ sessionId, width, height }: { sessionId: string; width: number; height: number }) => {
+    if (props.layoutNode.component === 'terminal' && sessionId === props.activeSessionId && customHtmlLayerRef.value) {
+      customHtmlLayerRef.value.style.width = `${width}px`;
+      customHtmlLayerRef.value.style.height = `${height}px`;
+    }
+  };
+  subscribeToWorkspaceEvent('terminal:stabilizedResize', handleStabilizedTerminalResize);
+
 
 
   // Left Sidebar Resize
@@ -465,6 +474,18 @@ watch(terminalCustomHTML, (newHtmlContent, oldHtmlContent) => {
 }, { immediate: true });
 
 
+onBeforeUnmount(() => {
+  const handleStabilizedTerminalResizeHandler = ({ sessionId, width, height }: { sessionId: string; width: number; height: number }) => {
+    if (props.layoutNode.component === 'terminal' && sessionId === props.activeSessionId && customHtmlLayerRef.value) {
+      customHtmlLayerRef.value.style.width = `${width}px`;
+      customHtmlLayerRef.value.style.height = `${height}px`;
+    }
+  };
+  unsubscribeFromWorkspaceEvent('terminal:stabilizedResize', handleStabilizedTerminalResizeHandler); // Use the same handler reference if possible
+});
+
+
+
 </script>
 
 <template>
diff --git a/packages/frontend/src/components/Terminal.vue b/packages/frontend/src/components/Terminal.vue
index 4ff44f3..087bc3d 100644
--- a/packages/frontend/src/components/Terminal.vue
+++ b/packages/frontend/src/components/Terminal.vue
@@ -98,12 +98,9 @@ const debouncedEmitResize = debounce((term: Terminal) => {
         // *** 尝试在发送 resize 后强制刷新终端显示 ***
         try {
             term.refresh(0, term.rows - 1); // Refresh entire viewport
-            console.log(`[Terminal ${props.sessionId}] Terminal refreshed after debounced resize.`);
         } catch (e) {
             console.warn(`[Terminal ${props.sessionId}] Terminal refresh failed:`, e);
         }
-    } else {
-        console.log(`[Terminal ${props.sessionId}] Debounced resize skipped (inactive).`);
     }
 }, 150); // 150ms 防抖延迟
 
@@ -116,9 +113,13 @@ const fitAndEmitResizeNow = (term: Terminal) => {
         if (terminalRef.value.offsetHeight > 0 && terminalRef.value.offsetWidth > 0) {
             fitAddon?.fit();
             const dimensions = { cols: term.cols, rows: term.rows };
-            console.log(`[Terminal ${props.sessionId}] Immediate resize emit:`, dimensions);
             emitWorkspaceEvent('terminal:resize', { sessionId: props.sessionId, dims: dimensions });
-
+            // 发出稳定尺寸事件
+            if (terminalRef.value) {
+              const stableWidth = terminalRef.value.offsetWidth;
+              const stableHeight = terminalRef.value.offsetHeight;
+              emitWorkspaceEvent('terminal:stabilizedResize', { sessionId: props.sessionId, width: stableWidth, height: stableHeight });
+            }
 
             
             // 使用 nextTick 确保 fit() 的效果已反映，再触发 resize
@@ -316,16 +317,12 @@ onMounted(() => {
 
             if (rectHeight > 0 && rectWidth > 0) {
                 try {
-                  // console.log(`[TerminalResizeObserver sessionId=${props.sessionId}] Before fitAddon.fit(). Current xterm_cols: ${terminal.cols}, xterm_rows: ${terminal.rows}`);
                   fitAddon?.fit();
-                  // console.log(`[TerminalResizeObserver sessionId=${props.sessionId}] After fitAddon.fit(). New xterm_cols: ${terminal.cols}, xterm_rows: ${terminal.rows}`);
-                  
                   debouncedEmitResize(terminal); // This will log the cols/rows after debouncing
+                  emitWorkspaceEvent('terminal:stabilizedResize', { sessionId: props.sessionId, width: roundedWidth, height: roundedHeight });
                  } catch (e) {
                     console.warn(`[TerminalResizeObserver sessionId=${props.sessionId}] Fit addon or debouncedEmitResize failed:`, e);
                  }
-            } else {
-              console.log(`[TerminalResizeObserver sessionId=${props.sessionId}] Skipped fit/emit due to zero height/width in contentRect. Rect: ${rectWidth.toFixed(2)}w x ${rectHeight.toFixed(2)}h`);
             }
         });
         // Observe only if initially active (or becomes active later)
diff --git a/packages/frontend/src/composables/workspaceEvents.ts b/packages/frontend/src/composables/workspaceEvents.ts
index 718acc8..96e14ad 100644
--- a/packages/frontend/src/composables/workspaceEvents.ts
+++ b/packages/frontend/src/composables/workspaceEvents.ts
@@ -11,7 +11,9 @@ export type WorkspaceEventPayloads = {
   'terminal:ready': { sessionId: string; terminal: XtermTerminal; searchAddon: any };
   'terminal:sendCommand': { command: string; sessionId?: string }; // sessionId 可选，用于指定目标，默认为 active
   'terminal:clear': void; // sessionId 可选，默认为 active
-  'terminal:scrollToBottomRequest': { sessionId: string }; 
+  'terminal:scrollToBottomRequest': { sessionId: string };
+  'terminal:stabilizedResize': { sessionId: string; width: number; height: number }; // 用于传递稳定后的尺寸
+
 
   // Editor Events
   'editor:closeTab': { tabId: string };