@@ -258,27 +316,40 @@ function MapCityDetailPanel({ detail }: { detail: CityDetail | null }) {
);
}
- const cityName = getLocalizedCityName(
- detail.name,
- detail.display_name || detail.name,
+ if (loading && !detail) {
+ return (
+
+ );
+ }
+
+ const displayCityName = getLocalizedCityName(
+ detail?.name || summary?.name || selectedCityName || "",
+ detail?.display_name || summary?.display_name || selectedCityName || "",
locale,
);
- const tempSymbol = detail.temp_symbol || "°C";
- const currentTemp = detail.current?.temp;
+ const tempSymbol = detail?.temp_symbol || summary?.temp_symbol || "°C";
+ const currentTemp = detail?.current?.temp ?? summary?.current?.temp ?? null;
const dayHigh =
- detail.current?.max_so_far ??
- detail.airport_current?.max_so_far ??
- detail.airport_primary?.max_so_far ??
+ detail?.current?.max_so_far ??
+ detail?.airport_current?.max_so_far ??
+ detail?.airport_primary?.max_so_far ??
null;
const airportLabel = getLocalizedAirportName(
- detail.name,
- detail.risk?.airport || detail.risk?.icao || "",
+ detail?.name || summary?.name || selectedCityName || "",
+ detail?.risk?.airport || detail?.risk?.icao || summary?.icao || "",
locale,
);
const peakLabel =
- Number.isFinite(Number(detail.peak?.first_h)) && Number.isFinite(Number(detail.peak?.last_h))
- ? `${String(Number(detail.peak?.first_h)).padStart(2, "0")}:00-${String(
- Number(detail.peak?.last_h) + 1,
+ Number.isFinite(Number(detail?.peak?.first_h)) && Number.isFinite(Number(detail?.peak?.last_h))
+ ? `${String(Number(detail?.peak?.first_h)).padStart(2, "0")}:00-${String(
+ Number(detail?.peak?.last_h) + 1,
).padStart(2, "0")}:00`
: "--";
@@ -287,7 +358,7 @@ function MapCityDetailPanel({ detail }: { detail: CityDetail | null }) {
-
{cityName}
+
{displayCityName}
{airportLabel || (isEn ? "Airport anchor pending" : "机场锚点待确认")}
@@ -315,7 +386,7 @@ function MapCityDetailPanel({ detail }: { detail: CityDetail | null }) {
{isEn ? "Local Time" : "当前时间"}
- {detail.local_time || "--"}
+ {detail?.local_time || summary?.local_time || "--"}
{isEn ? "Current Temp" : "当前温度"}
@@ -336,7 +407,7 @@ function MapCityDetailPanel({ detail }: { detail: CityDetail | null }) {
{isEn ? "DEB Forecast" : "DEB 预测"}
- {detail.deb?.prediction != null
+ {detail?.deb?.prediction != null
? formatTemperatureValue(detail.deb.prediction, tempSymbol)
: "--"}
@@ -405,11 +476,30 @@ function DetailPanel({
);
const scoreClass = scoreTone(displayRow.final_score);
const phaseMeta = getWindowPhaseMeta(displayRow, locale);
+ const analysisDetail =
+ store.selectedDetail?.name?.toLowerCase() === row.city.toLowerCase()
+ ? store.selectedDetail
+ : store.cityDetailsByName[row.city] || null;
+ const [showInlineAnalysis, setShowInlineAnalysis] = useState(false);
+ const analysisLoading = Boolean(
+ showInlineAnalysis &&
+ row.city &&
+ !analysisDetail &&
+ store.loadingState.cityDetail,
+ );
+
+ useEffect(() => {
+ setShowInlineAnalysis(false);
+ }, [row.id]);
const openTodayAnalysis = async () => {
if (!row.city) return;
+ if (showInlineAnalysis && analysisDetail) {
+ setShowInlineAnalysis(false);
+ return;
+ }
+ setShowInlineAnalysis(true);
await store.selectCity(row.city);
- await store.openTodayModal();
};
return (
@@ -457,6 +547,29 @@ function DetailPanel({
+ {showInlineAnalysis && (
+
+
+ {isEn ? "Today's Intraday Analysis" : "今日日内分析"}
+
+ {analysisLoading ? (
+
+ {isEn ? "Loading model spread card..." : "正在加载模型分歧卡片..."}
+
+ ) : analysisDetail ? (
+
+ ) : (
+
+ {isEn ? "No intraday model card available yet." : "当前还没有可展示的日内模型卡片。"}
+
+ )}
+
+ )}
+
{isEn ? "Current Context" : "当前概况"}
@@ -835,12 +948,17 @@ function ScanTerminalScreen() {
const [detailLoadingId, setDetailLoadingId] = useState
(null);
const [activeSection, setActiveSection] = useState("terminal");
const [activeView, setActiveView] = useState("list");
+ const [mapSelectedCityName, setMapSelectedCityName] = useState(null);
const deferredRows = useDeferredValue(terminalData?.rows || []);
+ const timeSortedRows = useMemo(
+ () => sortRowsByUserTime(deferredRows),
+ [deferredRows],
+ );
const selectedRow = useMemo(() => {
- if (!deferredRows.length) return null;
- return deferredRows.find((row) => row.id === selectedRowId) || deferredRows[0] || null;
- }, [deferredRows, selectedRowId]);
+ if (!timeSortedRows.length) return null;
+ return timeSortedRows.find((row) => row.id === selectedRowId) || timeSortedRows[0] || null;
+ }, [timeSortedRows, selectedRowId]);
const fetchTerminal = async (filters: FilterState, force = false) => {
setLoading(true);
@@ -854,7 +972,7 @@ function ScanTerminalScreen() {
if (current && response.rows.some((row) => row.id === current)) {
return current;
}
- return response.top_signal?.id || response.rows[0]?.id || null;
+ return sortRowsByUserTime(response.rows)[0]?.id || response.top_signal?.id || null;
});
});
} catch (fetchError) {
@@ -905,8 +1023,16 @@ function ScanTerminalScreen() {
}, [selectedRow, detailByRowId]);
const selectedDetail = selectedRow ? detailByRowId[selectedRow.id] : null;
- const mapFocusedDetail = store.selectedDetail;
- const mapFocusedCity = store.selectedCity;
+ const mapFocusedCity = mapSelectedCityName || store.selectedCity;
+ const mapFocusedDetail =
+ mapFocusedCity && store.selectedDetail?.name?.toLowerCase() === mapFocusedCity.toLowerCase()
+ ? store.selectedDetail
+ : mapFocusedCity
+ ? store.cityDetailsByName[mapFocusedCity] || null
+ : null;
+ const mapFocusedSummary = mapFocusedCity
+ ? store.citySummariesByName[mapFocusedCity] || null
+ : null;
const resolvedView: ContentView =
activeSection === "markets"
? "map"
@@ -916,21 +1042,32 @@ function ScanTerminalScreen() {
const renderMainView = () => {
if (activeSection === "portfolio") {
- return ;
+ return ;
}
if (activeSection === "monitor") {
- return ;
+ return ;
}
if (activeSection === "settings") {
return ;
}
if (resolvedView === "map") {
- return ;
+ return (
+
+
+
+
+
+ {locale === "en-US"
+ ? `Monitoring ${store.cities.length} cities on the original map canvas.`
+ : `正在用原地图画布监控 ${store.cities.length} 个城市。`}
+
+