From d7251f2035feb1f0d4912435fb345b198569e451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=85=E5=91=A8=E6=B6=9B?= <baozhoutao@hotoa.com>
Date: Tue, 14 Jul 2026 01:37:04 -0700
Subject: [PATCH] =?UTF-8?q?fix(plugin-gantt):=20#2482=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E8=A1=8C=E5=AE=9A=E4=BD=8D=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?;=E3=80=8C=E2=86=92=E3=80=8D=E8=AF=A6=E6=83=85=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=94=B9=E7=8B=AC=E7=AB=8B=E6=93=8D=E4=BD=9C=E6=A7=BD?=
 =?UTF-8?q?(=E4=B8=8D=E5=8E=8B=E7=BB=93=E6=9D=9F=E5=88=97=E3=80=8124px=20?=
 =?UTF-8?q?=E7=83=AD=E5=8C=BA)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/i18n/src/locales/en.ts               |  1 -
 packages/i18n/src/locales/zh.ts               |  1 -
 .../src/GanttView.enhancements.test.tsx       | 10 ++-
 packages/plugin-gantt/src/GanttView.tsx       | 68 ++++++++-----------
 .../plugin-gantt/src/useGanttTranslation.ts   |  1 -
 5 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/packages/i18n/src/locales/en.ts b/packages/i18n/src/locales/en.ts
index 7fe912453..c625a2901 100644
--- a/packages/i18n/src/locales/en.ts
+++ b/packages/i18n/src/locales/en.ts
@@ -415,7 +415,6 @@ const en = {
     row: {
       expand: 'Expand',
       collapse: 'Collapse',
-      locate: 'Locate on timeline',
       open: 'Open details',
     },
     aria: {
diff --git a/packages/i18n/src/locales/zh.ts b/packages/i18n/src/locales/zh.ts
index 64b149bb7..8a4a0888a 100644
--- a/packages/i18n/src/locales/zh.ts
+++ b/packages/i18n/src/locales/zh.ts
@@ -491,7 +491,6 @@ const zh = {
     row: {
       expand: '展开',
       collapse: '收起',
-      locate: '在甘特图上定位',
       open: '打开详情',
     },
     aria: {
diff --git a/packages/plugin-gantt/src/GanttView.enhancements.test.tsx b/packages/plugin-gantt/src/GanttView.enhancements.test.tsx
index 67cbcf1fc..9ab3bce75 100644
--- a/packages/plugin-gantt/src/GanttView.enhancements.test.tsx
+++ b/packages/plugin-gantt/src/GanttView.enhancements.test.tsx
@@ -86,10 +86,16 @@ describe('GanttView row click model (单击=Focus, 双击/「→」=详情)', ()
 
   it('the row 「→」 button opens detail and only renders with onTaskClick', () => {
     const onTaskClick = vi.fn();
-    const { getByTestId } = renderView([A()], { onTaskClick });
-    act(() => { fireEvent.click(getByTestId('gantt-row-open-a')); });
+    const { getByTestId, queryByTestId: q1 } = renderView([A()], { onTaskClick });
+    const openBtn = getByTestId('gantt-row-open-a');
+    act(() => { fireEvent.click(openBtn); });
     expect(onTaskClick).toHaveBeenCalledTimes(1);
     expect(onTaskClick.mock.calls[0][0].id).toBe('a');
+    // In-flow slot, not an absolute overlay — it must never cover the
+    // end-date column (#2482).
+    expect(openBtn.className).not.toContain('absolute');
+    // The hover locate icon is gone: a plain row click already locates.
+    expect(q1('gantt-row-locate-a')).toBeNull();
 
     const { queryByTestId } = renderView([makeTask('z', '2024-06-10T00:00:00.000Z', '2024-06-15T00:00:00.000Z')]);
     expect(queryByTestId('gantt-row-open-z')).toBeNull();
diff --git a/packages/plugin-gantt/src/GanttView.tsx b/packages/plugin-gantt/src/GanttView.tsx
index 8095990fc..b31c6dead 100644
--- a/packages/plugin-gantt/src/GanttView.tsx
+++ b/packages/plugin-gantt/src/GanttView.tsx
@@ -28,7 +28,6 @@ import {
   FileDown,
   Save,
   Lock,
-  Crosshair,
   RefreshCw,
   ArrowRight,
   QrCode,
@@ -2690,9 +2689,11 @@ export function GanttView({
       <style>{`
         .gantt-resize-handle:hover { background-color: rgba(255, 255, 255, 0.4); }
         .gantt-bar-hover:hover { filter: brightness(1.1); }
-        .gantt-locate-btn { opacity: 0; transition: opacity 0.15s ease; }
-        .group\\/task-row:hover .gantt-locate-btn { opacity: 0.6; }
-        .gantt-locate-btn:hover, .gantt-locate-btn:focus-visible { opacity: 1; }
+        .gantt-row-open-btn { opacity: 0; transition: opacity 0.15s ease; }
+        /* :where keeps the row-hover reveal at zero specificity so the
+           button's own :hover/:focus-visible full-opacity rule can win. */
+        :where(.group\\/task-row:hover) .gantt-row-open-btn { opacity: 0.6; }
+        .gantt-row-open-btn:hover, .gantt-row-open-btn:focus-visible { opacity: 1; }
         /* 定位闪烁: blink the located bar 3× with a thick ring + colored glow so
            it's hard to miss. The ring is an outline (not box-shadow) and the glow
            is a drop-shadow *filter* — both stay clear of the critical-path bar's
@@ -3276,45 +3277,30 @@ export function GanttView({
                     row.end.toLocaleDateString(dateLocale, { month: 'numeric', day: 'numeric' })
                   )}
                 </div>
-                {/* 定位到甘特图: scroll the timeline to this row's bar. Pinned to
-                    the row's right edge (flush with the chart divider) so it sits
-                    in a stable slot and never shifts the date column on hover. The
-                    `right` offset is inline because Tailwind's fractional `right-*`
-                    utilities aren't in the prebuilt CSS shipped to consumers. */}
-                {!isEditing && (
-                  <button
-                    type="button"
-                    title={t('gantt.row.locate')}
-                    aria-label={t('gantt.row.locate')}
-                    data-testid={`gantt-row-locate-${task.id}`}
-                    className="gantt-locate-btn hidden sm:block absolute top-1/2 -translate-y-1/2"
-                    style={{ right: onTaskClick ? 20 : 1 }}
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      scrollToTask(row.start, row.end, row.task.id);
-                    }}
-                  >
-                    <Crosshair className="w-3 h-3" />
-                  </button>
-                )}
                 {/* 跳转详情「→」: opens the detail drawer / page — the row click
                     itself is reserved for Focus-locate, so detail needs its own
-                    always-reachable affordance besides double-click. */}
-                {!isEditing && onTaskClick && (
-                  <button
-                    type="button"
-                    title={t('gantt.row.open')}
-                    aria-label={t('gantt.row.open')}
-                    data-testid={`gantt-row-open-${task.id}`}
-                    className="gantt-locate-btn hidden sm:block absolute top-1/2 -translate-y-1/2"
-                    style={{ right: 1 }}
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      onTaskClick(task);
-                    }}
-                  >
-                    <ArrowRight className="w-3 h-3" />
-                  </button>
+                    always-reachable affordance besides double-click. A dedicated
+                    flex slot (not an absolute overlay) so it never covers the
+                    end-date column; the slot persists during inline edit to
+                    avoid layout shift. */}
+                {onTaskClick && (
+                  <div className="w-6 shrink-0 hidden sm:block" style={{ marginLeft: 4 }}>
+                    {!isEditing && (
+                      <button
+                        type="button"
+                        title={t('gantt.row.open')}
+                        aria-label={t('gantt.row.open')}
+                        data-testid={`gantt-row-open-${task.id}`}
+                        className="gantt-row-open-btn h-6 w-6 rounded-md flex items-center justify-center hover:bg-accent text-muted-foreground hover:text-foreground"
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          onTaskClick(task);
+                        }}
+                      >
+                        <ArrowRight className="h-3.5 w-3.5" />
+                      </button>
+                    )}
+                  </div>
                 )}
                 {/* Row View/Edit/Delete stay reachable from the detail drawer
                     (double-click / 「→」 / context menu / Enter); inline edit is
diff --git a/packages/plugin-gantt/src/useGanttTranslation.ts b/packages/plugin-gantt/src/useGanttTranslation.ts
index fa39388fb..69624f43f 100644
--- a/packages/plugin-gantt/src/useGanttTranslation.ts
+++ b/packages/plugin-gantt/src/useGanttTranslation.ts
@@ -46,7 +46,6 @@ export const GANTT_DEFAULT_TRANSLATIONS: Record<string, string> = {
   'gantt.viewMode.year': 'Year',
   'gantt.row.expand': 'Expand',
   'gantt.row.collapse': 'Collapse',
-  'gantt.row.locate': 'Locate on timeline',
   'gantt.row.open': 'Open details',
   'gantt.aria.taskList': 'Task list',
   'gantt.tooltip.days': 'd',