From bc09a3753c44cb03afa5e9ece78791f331f42753 Mon Sep 17 00:00:00 2001
From: "2569718930@qq.com" <2569718930@qq.com>
Date: Fri, 17 Apr 2026 20:40:17 +0800
Subject: [PATCH] Fix today analysis modal routing

---
 .../dashboard/FutureForecastModal.tsx          | 18 +++++++++++++-----
 .../components/dashboard/PanelSections.tsx     | 10 +++++++++-
 frontend/hooks/useDashboardStore.tsx           | 18 ++++++++++++++++++
 frontend/lib/dashboard-types.ts                |  3 +++
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/frontend/components/dashboard/FutureForecastModal.tsx b/frontend/components/dashboard/FutureForecastModal.tsx
index 8cbdf4c0..7d145fbe 100644
--- a/frontend/components/dashboard/FutureForecastModal.tsx
+++ b/frontend/components/dashboard/FutureForecastModal.tsx
@@ -287,12 +287,18 @@ function getTrendMetricVisual(metric: {
   return null;
 }
 
-function DailyTemperatureChart({ dateStr }: { dateStr: string }) {
+function DailyTemperatureChart({
+  dateStr,
+  forceToday = false,
+}: {
+  dateStr: string;
+  forceToday?: boolean;
+}) {
   const store = useDashboardStore();
   const { locale, t } = useI18n();
   const detail = store.selectedDetail;
   const view = detail ? getFutureModalView(detail, dateStr, locale) : null;
-  const isToday = detail ? dateStr === detail.local_date : false;
+  const isToday = forceToday || (detail ? dateStr === detail.local_date : false);
   const todayChartData = useMemo(
     () => (detail && isToday ? getTemperatureChartData(detail, locale) : null),
     [detail, isToday, locale],
@@ -711,7 +717,9 @@ export function FutureForecastModal() {
     };
   }, [dateStr, detail]);
 
-  const isToday = dateStr === detail.local_date;
+  const isToday =
+    store.forecastModalMode === "today" ||
+    (store.forecastModalMode == null && dateStr === detail.local_date);
   const detailDepth = detail.detail_depth || "full";
   const isFullDetailReady = detailDepth === "full";
   const isStructureSyncing = store.loadingState.futureDeep || !isFullDetailReady;
@@ -1713,7 +1721,7 @@ export function FutureForecastModal() {
                           : "今日气温路径（锚点观测 + 模型）"}
                       </h3>
                     </div>
-                    <DailyTemperatureChart dateStr={dateStr} />
+                    <DailyTemperatureChart dateStr={dateStr} forceToday={isToday} />
                     <div className="future-v2-chart-thresholds">
                       <span>{locale === "en-US" ? "Base" : "基准"} · {baseCaseBucket || "--"}</span>
                       <span>{locale === "en-US" ? "Upside" : "上修"} · {intradayMeteorology.upside_bucket || "--"}</span>
@@ -1891,7 +1899,7 @@ export function FutureForecastModal() {
 
                 <section className="future-modal-section">
                   <h3>{t("future.targetTempTrend")}</h3>
-                  <DailyTemperatureChart dateStr={dateStr} />
+                  <DailyTemperatureChart dateStr={dateStr} forceToday={isToday} />
                 </section>
 
                 <div className="future-modal-grid">
diff --git a/frontend/components/dashboard/PanelSections.tsx b/frontend/components/dashboard/PanelSections.tsx
index 825c7166..ade0f3f2 100644
--- a/frontend/components/dashboard/PanelSections.tsx
+++ b/frontend/components/dashboard/PanelSections.tsx
@@ -1020,7 +1020,11 @@ export function ForecastTable() {
           daily.map((day, index) => {
             const isToday = day.date === data.local_date || index === 0;
             const isSelected =
-              store.futureModalDate === day.date ||
+              (isToday &&
+                store.forecastModalMode === "today" &&
+                Boolean(store.futureModalDate)) ||
+              (store.forecastModalMode !== "today" &&
+                store.futureModalDate === day.date) ||
               store.selectedForecastDate === day.date;
             return (
               <button
@@ -1033,6 +1037,10 @@ export function ForecastTable() {
                 )}
                 onClick={() => {
                   startTransition(() => {
+                    if (isToday) {
+                      store.openTodayModal();
+                      return;
+                    }
                     store.openFutureModal(day.date);
                   });
                 }}
diff --git a/frontend/hooks/useDashboardStore.tsx b/frontend/hooks/useDashboardStore.tsx
index 8edd5375..e3ca2b07 100644
--- a/frontend/hooks/useDashboardStore.tsx
+++ b/frontend/hooks/useDashboardStore.tsx
@@ -23,6 +23,7 @@ import {
   CityListItem,
   CitySummary,
   DashboardState,
+  ForecastModalMode,
   HistoryPoint,
   HistoryPayload,
   HistoryPayloadMeta,
@@ -40,6 +41,7 @@ interface DashboardStoreValue extends DashboardState {
     force?: boolean,
     depth?: "panel" | "nearby" | "full",
   ) => Promise<CityDetail>;
+  forecastModalMode: ForecastModalMode | null;
   futureModalDate: string | null;
   loadCities: () => Promise<void>;
   openFutureModal: (dateStr: string, forceRefresh?: boolean) => Promise<void>;
@@ -323,6 +325,8 @@ export function DashboardStoreProvider({
     string | null
   >(null);
   const [futureModalDate, setFutureModalDate] = useState<string | null>(null);
+  const [forecastModalMode, setForecastModalMode] =
+    useState<ForecastModalMode | null>(null);
   const [isMapInteracting, setIsMapInteracting] = useState(false);
   const [loadingState, setLoadingState] = useState<LoadingState>(
     getInitialLoadingState,
@@ -761,6 +765,7 @@ export function DashboardStoreProvider({
     setIsPanelOpen(true);
     setSelectedForecastDate(null);
     setFutureModalDate(null);
+    setForecastModalMode(null);
 
     const summaryPromise = !citySummariesRef.current[cityName]
       ? ensureCitySummary(cityName).catch(() => null)
@@ -1007,6 +1012,7 @@ export function DashboardStoreProvider({
       closeFutureModal: () => {
         modalOpenSeqRef.current += 1;
         setFutureModalDate(null);
+        setForecastModalMode(null);
       },
       closeHistory: () =>
         setHistoryState((current) => ({ ...current, isOpen: false })),
@@ -1014,6 +1020,7 @@ export function DashboardStoreProvider({
         setIsPanelOpen(false);
       },
       ensureCityDetail,
+      forecastModalMode,
       futureModalDate,
       historyState,
       isPanelOpen,
@@ -1048,9 +1055,16 @@ export function DashboardStoreProvider({
           "market",
           dateStr,
         );
+        const todayDate =
+          cachedDetail?.local_date ||
+          cachedDetail?.forecast?.daily?.[0]?.date ||
+          null;
+        const modalMode: ForecastModalMode =
+          todayDate && dateStr === todayDate ? "today" : "future";
 
         setSelectedForecastDate(dateStr);
         setFutureModalDate(dateStr);
+        setForecastModalMode(modalMode);
         if (!hasMarketCachedDetail || forceRefresh) {
           void ensureCityDetail(cityName, forceRefresh, "market").catch(() => {});
         }
@@ -1109,6 +1123,7 @@ export function DashboardStoreProvider({
         if (targetDate) {
           setSelectedForecastDate(targetDate);
           setFutureModalDate(targetDate);
+          setForecastModalMode("today");
         }
         if (!proAccess.subscriptionActive) return;
         const needsDetailRefresh =
@@ -1136,12 +1151,14 @@ export function DashboardStoreProvider({
             if (!isLatestModalRequest()) return;
             setSelectedForecastDate(detail.local_date);
             setFutureModalDate(detail.local_date);
+            setForecastModalMode("today");
           })
           .catch(() => {
             if (!isLatestModalRequest()) return;
             if (cachedDetail?.local_date) {
               setSelectedForecastDate(cachedDetail.local_date);
               setFutureModalDate(cachedDetail.local_date);
+              setForecastModalMode("today");
             }
           })
           .finally(() => {
@@ -1170,6 +1187,7 @@ export function DashboardStoreProvider({
       cities,
       cityDetailsByName,
       citySummariesByName,
+      forecastModalMode,
       futureModalDate,
       historyState,
       isPanelOpen,
diff --git a/frontend/lib/dashboard-types.ts b/frontend/lib/dashboard-types.ts
index dfa4da25..da3f8299 100644
--- a/frontend/lib/dashboard-types.ts
+++ b/frontend/lib/dashboard-types.ts
@@ -606,6 +606,8 @@ export interface ProAccessState {
   error: string | null;
 }
 
+export type ForecastModalMode = "today" | "future";
+
 export interface DashboardState {
   cities: CityListItem[];
   cityDetailsByName: Record<string, CityDetail>;
@@ -613,6 +615,7 @@ export interface DashboardState {
   selectedCity: string | null;
   isPanelOpen: boolean;
   selectedForecastDate: string | null;
+  forecastModalMode: ForecastModalMode | null;
   loadingState: LoadingState;
   historyState: HistoryState;
   proAccess: ProAccessState;