diff --git a/src/views/Community/components/InvestmentCalendar.js b/src/views/Community/components/InvestmentCalendar.js index e22107da..380ba103 100644 --- a/src/views/Community/components/InvestmentCalendar.js +++ b/src/views/Community/components/InvestmentCalendar.js @@ -11,7 +11,6 @@ import { import dayjs from 'dayjs'; import ReactMarkdown from 'react-markdown'; import { eventService, stockService } from '../../../services/eventService'; -import TimelineChartModal from '../../../components/StockChart/TimelineChartModal'; import KLineChartModal from '../../../components/StockChart/KLineChartModal'; import { useSubscription } from '../../../hooks/useSubscription'; import SubscriptionUpgradeModal from '../../../components/SubscriptionUpgradeModal'; @@ -42,7 +41,6 @@ const InvestmentCalendar = () => { const [stockModalVisible, setStockModalVisible] = useState(false); const [selectedStocks, setSelectedStocks] = useState([]); const [stockQuotes, setStockQuotes] = useState({}); - const [timelineModalVisible, setTimelineModalVisible] = useState(false); const [klineModalVisible, setKlineModalVisible] = useState(false); const [selectedStock, setSelectedStock] = useState(null); const [selectedEventTime, setSelectedEventTime] = useState(null); // 记录事件时间 @@ -283,23 +281,26 @@ const InvestmentCalendar = () => { return sixDigitCode; }; - // 显示分时图 - const showTimeline = (stock, eventTime) => { - setSelectedStock({ - stock_code: addExchangeSuffix(stock[0]), // 添加交易所后缀 - stock_name: stock[1] - }); - setSelectedEventTime(eventTime); - setTimelineModalVisible(true); - }; - // 显示K线图 - const showKline = (stock, eventTime) => { + const showKline = (stock) => { + const stockCode = addExchangeSuffix(stock[0]); + + // 将 selectedDate 转换为 YYYY-MM-DD 格式(日K线只需要日期,不需要时间) + const formattedEventTime = selectedDate ? selectedDate.format('YYYY-MM-DD') : null; + + console.log('[InvestmentCalendar] 打开K线图:', { + originalCode: stock[0], + processedCode: stockCode, + stockName: stock[1], + selectedDate: selectedDate?.format('YYYY-MM-DD'), + formattedEventTime: formattedEventTime + }); + setSelectedStock({ - stock_code: addExchangeSuffix(stock[0]), // 添加交易所后缀 + stock_code: stockCode, // 添加交易所后缀 stock_name: stock[1] }); - setSelectedEventTime(eventTime); + setSelectedEventTime(formattedEventTime); setKlineModalVisible(true); }; @@ -666,26 +667,17 @@ const InvestmentCalendar = () => { }, { - title: '图表', - key: 'charts', - width: 150, + title: 'K线图', + key: 'kline', + width: 80, render: (_, record) => ( - - - - + ) }, { @@ -848,20 +840,6 @@ const InvestmentCalendar = () => { )} - {/* 分时图弹窗 */} - {selectedStock && ( - { - setTimelineModalVisible(false); - setSelectedStock(null); - setSelectedEventTime(null); - }} - stock={selectedStock} - eventTime={selectedEventTime} - /> - )} - {/* K线图弹窗 */} {selectedStock && (