diff --git a/frontend/src/pages/CopyTradingOrders/MatchedOrdersTab.tsx b/frontend/src/pages/CopyTradingOrders/MatchedOrdersTab.tsx index 373054a..787f9d1 100644 --- a/frontend/src/pages/CopyTradingOrders/MatchedOrdersTab.tsx +++ b/frontend/src/pages/CopyTradingOrders/MatchedOrdersTab.tsx @@ -132,59 +132,60 @@ const MatchedOrdersTab: React.FC = ({ copyTradingId, acti } }, { - title: t('copyTradingOrders.sellOrderId') || '卖出订单ID', - dataIndex: 'sellOrderId', - key: 'sellOrderId', - width: isMobile ? 120 : 180, - render: (text: string) => { - const isAuto = isAutoGeneratedOrderId(text) + title: t('copyTradingOrders.orderId') || '订单ID', + dataIndex: 'orderId', + key: 'orderId', + width: isMobile ? 150 : 200, + render: (_: any, record: MatchedOrderInfo) => { + const buyOrderId = record.buyOrderId + const sellOrderId = record.sellOrderId + const isBuyAuto = isAutoGeneratedOrderId(buyOrderId) + const isSellAuto = isAutoGeneratedOrderId(sellOrderId) + return ( -
- - {isMobile - ? `${text.slice(0, 6)}...${text.slice(-4)}` - : `${text.slice(0, 8)}...${text.slice(-6)}` - } - - {!isAuto && ( -
- ) - } - }, - { - title: t('copyTradingOrders.buyOrderId') || '买入订单ID', - dataIndex: 'buyOrderId', - key: 'buyOrderId', - width: isMobile ? 120 : 180, - render: (text: string) => { - const isAuto = isAutoGeneratedOrderId(text) - return ( -
- - {isMobile - ? `${text.slice(0, 6)}...${text.slice(-4)}` - : `${text.slice(0, 8)}...${text.slice(-6)}` - } - - {!isAuto && ( -
+
+ + {t('copyTradingOrders.sell') || '卖出'}: + + + {isMobile + ? `${sellOrderId.slice(0, 6)}...${sellOrderId.slice(-4)}` + : `${sellOrderId.slice(0, 8)}...${sellOrderId.slice(-6)}` + } + + {!isSellAuto && ( +
) } @@ -347,50 +348,42 @@ const MatchedOrdersTab: React.FC = ({ copyTradingId, acti )} )} -
{t('copyTradingOrders.sellOrderId') || '卖出订单ID'}
-
- {order.sellOrderId.slice(0, 8)}...{order.sellOrderId.slice(-6)} - {!isAutoGeneratedOrderId(order.sellOrderId) && ( -
-
{t('copyTradingOrders.buyOrderId') || '买入订单ID'}
-
- {order.buyOrderId.slice(0, 8)}...{order.buyOrderId.slice(-6)} - {!isAutoGeneratedOrderId(order.buyOrderId) && ( -
+