feat: 添加关键字过滤功能并优化市场 slug 处理

主要变更：
1. 关键字过滤功能
   - 添加关键字过滤模式（白名单/黑名单/禁用）
   - 支持关键字列表配置（JSON 存储）
   - 实现关键字匹配逻辑（不区分大小写）
   - 数据库迁移：V20__add_keyword_filter.sql

2. 市场 slug 优化
   - 区分显示用 slug 和跳转用 eventSlug
   - 添加 event_slug 字段到 markets 表（V21__add_event_slug_to_markets.sql）
   - 从 events[0].slug 获取跳转用的 slug 并存入数据库
   - 减少 API 请求，提高性能

3. UI 优化
   - 将创建/编辑跟单配置改为 Modal 方式
   - 删除独立的 CopyTradingAdd 和 CopyTradingEdit 页面
   - 更新前端跳转逻辑，优先使用 eventSlug

4. API 响应优化
   - 更新 MarketResponse 添加 events 字段
   - 统一从 events[0].slug 获取跳转用的 slug
   - 更新所有相关服务使用新的 slug 获取逻辑

backend/src/main/kotlin/com/wrbug/polymarketbot/api/PolymarketGammaApi.kt

@@ -28,6 +28,23 @@ interface PolymarketGammaApi {
     ): Response<List<MarketResponse>>
 }
 
+/**
+ * 事件响应（从 MarketResponse.events 解析）
+ */
+data class EventResponse(
+    val id: String? = null,
+    val ticker: String? = null,
+    val slug: String,
+    val title: String,
+    val category: String? = null,
+    val active: Boolean? = null,
+    val closed: Boolean? = null,
+    val archived: Boolean? = null,
+    val startDate: String? = null,
+    val endDate: String? = null,
+    val createdAt: String? = null
+)
+
 /**
  * 市场响应（根据 Gamma API 文档）
  */
@@ -54,6 +71,7 @@ data class MarketResponse(
     val lastTradePrice: Double? = null,
     val bestBid: Double? = null,
     val bestAsk: Double? = null,
+    val events: List<EventResponse>? = null,  // 事件列表（从 events[0] 获取 slug）
     // 以下字段可能存在于响应中，但不在标准文档中
     val clobTokenIds: String? = null,  // CLOB token IDs（可能是 JSON 字符串或数组）
     val clob_token_ids: String? = null  // 下划线格式（兼容不同 API 版本）

backend/src/main/kotlin/com/wrbug/polymarketbot/dto/AccountDto.kt

@@ -125,7 +125,8 @@ data class AccountPositionDto(
     val proxyAddress: String,
     val marketId: String,
     val marketTitle: String?,
-    val marketSlug: String?,
+    val marketSlug: String?,  // 显示用的 slug
+    val eventSlug: String? = null,  // 跳转用的 slug（从 events[0].slug 获取）
     val marketIcon: String?,  // 市场图标 URL
     val side: String,  // 结果名称（如 "YES", "NO", "Pakistan" 等）
     val outcomeIndex: Int? = null,  // 结果索引（0, 1, 2...），用于计算 tokenId

backend/src/main/kotlin/com/wrbug/polymarketbot/dto/CopyTradingDto.kt

@@ -37,6 +37,9 @@ data class CopyTradingCreateRequest(
     // 最大仓位配置
     val maxPositionValue: String? = null,  // 最大仓位金额（USDC），NULL表示不启用
     val maxPositionCount: Int? = null,  // 最大仓位数量，NULL表示不启用
+    // 关键字过滤配置
+    val keywordFilterMode: String? = null,  // 关键字过滤模式：DISABLED（不启用）、WHITELIST（白名单）、BLACKLIST（黑名单）
+    val keywords: List<String>? = null,  // 关键字列表，当keywordFilterMode为DISABLED时为null
     // 新增配置字段
     val configName: String? = null,  // 配置名（可选）
     val pushFailedOrders: Boolean? = null  // 推送失败订单（可选）
@@ -71,6 +74,9 @@ data class CopyTradingUpdateRequest(
     // 最大仓位配置
     val maxPositionValue: String? = null,  // 最大仓位金额（USDC），NULL表示不启用
     val maxPositionCount: Int? = null,  // 最大仓位数量，NULL表示不启用
+    // 关键字过滤配置
+    val keywordFilterMode: String? = null,  // 关键字过滤模式：DISABLED（不启用）、WHITELIST（白名单）、BLACKLIST（黑名单）
+    val keywords: List<String>? = null,  // 关键字列表，当keywordFilterMode为DISABLED时为null
     // 新增配置字段
     val configName: String? = null,  // 配置名（可选，但提供时必须非空）
     val pushFailedOrders: Boolean? = null  // 推送失败订单（可选）
@@ -142,6 +148,9 @@ data class CopyTradingDto(
     // 最大仓位配置
     val maxPositionValue: String? = null,  // 最大仓位金额（USDC），NULL表示不启用
     val maxPositionCount: Int? = null,  // 最大仓位数量，NULL表示不启用
+    // 关键字过滤配置
+    val keywordFilterMode: String? = null,  // 关键字过滤模式：DISABLED（不启用）、WHITELIST（白名单）、BLACKLIST（黑名单）
+    val keywords: List<String>? = null,  // 关键字列表，当keywordFilterMode为DISABLED时为null
     // 新增配置字段
     val configName: String? = null,  // 配置名（可选）
     val pushFailedOrders: Boolean = false,  // 推送失败订单（默认关闭）

backend/src/main/kotlin/com/wrbug/polymarketbot/dto/CopyTradingStatisticsDto.kt

@@ -41,7 +41,8 @@ data class BuyOrderInfo(
     val leaderTradeId: String,
     val marketId: String,
     val marketTitle: String? = null,  // 市场名称
-    val marketSlug: String? = null,  // 市场 slug（用于构建 URL）
+    val marketSlug: String? = null,  // 市场 slug（用于显示）
+    val eventSlug: String? = null,  // 跳转用的 slug（从 events[0].slug 获取）
     val marketCategory: String? = null,  // 市场分类（sports, crypto 等）
     val side: String,
     val quantity: String,
@@ -61,7 +62,8 @@ data class SellOrderInfo(
     val leaderTradeId: String,
     val marketId: String,
     val marketTitle: String? = null,  // 市场名称
-    val marketSlug: String? = null,  // 市场 slug（用于构建 URL）
+    val marketSlug: String? = null,  // 市场 slug（用于显示）
+    val eventSlug: String? = null,  // 跳转用的 slug（从 events[0].slug 获取）
     val marketCategory: String? = null,  // 市场分类（sports, crypto 等）
     val side: String,
     val quantity: String,
@@ -79,7 +81,8 @@ data class MatchedOrderInfo(
     val buyOrderId: String,
     val marketId: String? = null,  // 市场ID（从买入订单获取）
     val marketTitle: String? = null,  // 市场名称
-    val marketSlug: String? = null,  // 市场 slug（用于构建 URL）
+    val marketSlug: String? = null,  // 市场 slug（用于显示）
+    val eventSlug: String? = null,  // 跳转用的 slug（从 events[0].slug 获取）
     val marketCategory: String? = null,  // 市场分类（sports, crypto 等）
     val matchedQuantity: String,
     val buyPrice: String,
@@ -142,7 +145,8 @@ data class MarketOrderStats(
 data class MarketOrderGroup(
     val marketId: String,
     val marketTitle: String?,
-    val marketSlug: String?,
+    val marketSlug: String?,  // 显示用的 slug
+    val eventSlug: String? = null,  // 跳转用的 slug（从 events[0].slug 获取）
     val marketCategory: String?,
     val stats: MarketOrderStats,
     val orders: List<Any>  // BuyOrderInfo, SellOrderInfo 或 MatchedOrderInfo 的列表

backend/src/main/kotlin/com/wrbug/polymarketbot/dto/MarketDto.kt

@@ -25,7 +25,8 @@ data class MarketDto(
     val liquidityNum: Double?,
     val bestBid: Double?,
     val bestAsk: Double?,
-    val lastTradePrice: Double?
+    val lastTradePrice: Double?,
+    val events: List<MarketDto>? = null  // 事件列表（从 events[0] 获取 slug）
 )
 
 /**
@@ -37,9 +38,9 @@ data class OutcomeDto(
 )
 
 /**
- * 事件 DTO
+ * 事件 DTO（用于其他 API 调用）
  */
-data class EventDto(
+data class EventListDto(
     val id: String,
     val title: String,
     val category: String,
@@ -55,7 +56,7 @@ data class SeriesDto(
     val id: String,
     val title: String,
     val category: String,
-    val events: List<EventDto>?,
+    val events: List<EventListDto>?,
     val createdAt: Long?  // 时间戳（毫秒）
 )
 
@@ -70,4 +71,3 @@ data class CommentDto(
     val createdAt: Long,  // 时间戳（毫秒）
     val user: String?
 )
-

backend/src/main/kotlin/com/wrbug/polymarketbot/entity/CopyTrading.kt

@@ -91,6 +91,13 @@ data class CopyTrading(
     @Column(name = "max_position_count")
     val maxPositionCount: Int? = null,  // 最大仓位数量，NULL表示不启用
     
+    // 关键字过滤配置
+    @Column(name = "keyword_filter_mode", nullable = false, length = 20)
+    val keywordFilterMode: String = "DISABLED",  // 关键字过滤模式：DISABLED（不启用）、WHITELIST（白名单）、BLACKLIST（黑名单）
+    
+    @Column(name = "keywords", columnDefinition = "JSON")
+    val keywords: String? = null,  // 关键字列表（JSON数组），例如：["NBA", "足球", "NBA总决赛"]，当keywordFilterMode为DISABLED时为NULL
+    
     // 新增配置字段
     @Column(name = "config_name", length = 255)
     val configName: String? = null,  // 配置名（可选）

backend/src/main/kotlin/com/wrbug/polymarketbot/entity/Market.kt

@@ -22,7 +22,10 @@ data class Market(
     val title: String,  // 市场名称（question）
     
     @Column(name = "slug", length = 200)
-    val slug: String? = null,  // 市场slug
+    val slug: String? = null,  // 市场slug（用于显示）
+    
+    @Column(name = "event_slug", length = 200)
+    val eventSlug: String? = null,  // 跳转用的 slug（从 events[0].slug 获取）
     
     @Column(name = "category", length = 50)
     val category: String? = null,  // 市场分类

backend/src/main/kotlin/com/wrbug/polymarketbot/service/accounts/AccountService.kt

@@ -8,6 +8,7 @@ import com.wrbug.polymarketbot.util.RetrofitFactory
 import com.wrbug.polymarketbot.util.toSafeBigDecimal
 import com.wrbug.polymarketbot.util.eq
 import com.wrbug.polymarketbot.util.JsonUtils
+import com.wrbug.polymarketbot.util.getEventSlug
 import com.wrbug.polymarketbot.service.common.PolymarketClobService
 import com.wrbug.polymarketbot.service.common.BlockchainService
 import com.wrbug.polymarketbot.service.common.PolymarketApiKeyService
@@ -656,7 +657,8 @@ class AccountService(
                                     proxyAddress = account.proxyAddress,
                                     marketId = pos.conditionId ?: "",
                                     marketTitle = pos.title ?: "",
-                                    marketSlug = pos.slug ?: "",
+                                    marketSlug = pos.slug ?: "",  // 显示用的 slug
+                                    eventSlug = pos.eventSlug,  // 跳转用的 slug（从 events[0].slug 获取）
                                     marketIcon = pos.icon,  // 市场图标
                                     side = pos.outcome ?: "",
                                     outcomeIndex = pos.outcomeIndex,  // 添加 outcomeIndex
@@ -949,7 +951,6 @@ class AccountService(
                             }
                             
                             val marketTitle = marketInfo?.question ?: request.marketId
-                            val marketSlug = marketInfo?.slug
                             
                             // 获取当前语言设置（从 LocaleContextHolder）
                             val locale = try {
@@ -962,7 +963,7 @@ class AccountService(
                                 orderId = orderId,
                                 marketTitle = marketTitle,
                                 marketId = request.marketId,
-                                marketSlug = marketSlug,
+                                marketSlug = marketInfo.getEventSlug(),  // 跳转用的 slug
                                 side = request.side,
                                 price = sellPrice,  // 直接传递卖出价格
                                 size = sellQuantity.toPlainString(),  // 直接传递卖出数量
@@ -1017,7 +1018,6 @@ class AccountService(
                             }
                             
                             val marketTitle = marketInfo?.question ?: request.marketId
-                            val marketSlug = marketInfo?.slug
                             
                             // 获取当前语言设置（从 LocaleContextHolder）
                             val locale = try {
@@ -1029,7 +1029,7 @@ class AccountService(
                             telegramNotificationService?.sendOrderFailureNotification(
                                 marketTitle = marketTitle,
                                 marketId = request.marketId,
-                                marketSlug = marketSlug,
+                                marketSlug = marketInfo.getEventSlug(),  // 跳转用的 slug
                                 side = request.side,
                                 outcome = null,  // 失败时可能没有 outcome
                                 price = if (request.orderType == "LIMIT") sellPrice.toString() else "MARKET",
@@ -1075,7 +1075,6 @@ class AccountService(
                         }
                         
                         val marketTitle = marketInfo?.question ?: request.marketId
-                        val marketSlug = marketInfo?.slug
                         
                         // 获取当前语言设置（从 LocaleContextHolder）
                         val locale = try {
@@ -1090,7 +1089,7 @@ class AccountService(
                         telegramNotificationService?.sendOrderFailureNotification(
                             marketTitle = marketTitle,
                             marketId = request.marketId,
-                            marketSlug = marketSlug,
+                            marketSlug = marketInfo.getEventSlug(),  // 跳转用的 slug
                             side = request.side,
                             outcome = null,  // 失败时可能没有 outcome
                             price = if (request.orderType == "LIMIT") sellPrice.toString() else "MARKET",

backend/src/main/kotlin/com/wrbug/polymarketbot/service/common/MarketService.kt

@@ -5,6 +5,7 @@ import com.wrbug.polymarketbot.api.PolymarketGammaApi
 import com.wrbug.polymarketbot.entity.Market
 import com.wrbug.polymarketbot.repository.MarketRepository
 import com.wrbug.polymarketbot.util.RetrofitFactory
+import com.wrbug.polymarketbot.util.getEventSlug
 import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
@@ -151,11 +152,17 @@ class MarketService(
         return try {
             val existingMarket = marketRepository.findByMarketId(marketId)
             
+            // 保存原来的 slug（用于显示）
+            val slug = marketResponse.slug
+            // 保存跳转用的 slug（从 events[0].slug 获取）
+            val eventSlug = marketResponse.getEventSlug()
+            
             val market = if (existingMarket != null) {
                 // 更新现有市场信息
                 existingMarket.copy(
                     title = marketResponse.question ?: existingMarket.title,
-                    slug = marketResponse.slug ?: existingMarket.slug,
+                    slug = slug ?: existingMarket.slug,
+                    eventSlug = eventSlug ?: existingMarket.eventSlug,
                     category = marketResponse.category ?: existingMarket.category,
                     icon = marketResponse.icon ?: existingMarket.icon,
                     image = marketResponse.image ?: existingMarket.image,
@@ -170,14 +177,17 @@ class MarketService(
                 Market(
                     marketId = marketId,
                     title = marketResponse.question ?: marketId,
-                    slug = marketResponse.slug,
+                    slug = slug,
+                    eventSlug = eventSlug,
                     category = marketResponse.category,
                     icon = marketResponse.icon,
                     image = marketResponse.image,
                     description = marketResponse.description,
                     active = marketResponse.active ?: true,
                     closed = marketResponse.closed ?: false,
-                    archived = marketResponse.archived ?: false
+                    archived = marketResponse.archived ?: false,
+                    createdAt = System.currentTimeMillis(),
+                    updatedAt = System.currentTimeMillis()
                 )
             }
             

backend/src/main/kotlin/com/wrbug/polymarketbot/service/copytrading/configs/CopyTradingFilterService.kt

@@ -6,6 +6,7 @@ import com.wrbug.polymarketbot.util.gt
 import com.wrbug.polymarketbot.util.lt
 import com.wrbug.polymarketbot.util.multi
 import com.wrbug.polymarketbot.util.toSafeBigDecimal
+import com.wrbug.polymarketbot.util.JsonUtils
 import org.slf4j.LoggerFactory
 import com.wrbug.polymarketbot.service.common.PolymarketClobService
 import com.wrbug.polymarketbot.service.accounts.AccountService
@@ -20,7 +21,8 @@ import java.math.BigDecimal
 class CopyTradingFilterService(
     private val clobService: PolymarketClobService,
     private val accountService: AccountService,
-    private val copyOrderTrackingRepository: CopyOrderTrackingRepository
+    private val copyOrderTrackingRepository: CopyOrderTrackingRepository,
+    private val jsonUtils: JsonUtils
 ) {
     
     private val logger = LoggerFactory.getLogger(CopyTradingFilterService::class.java)
@@ -32,6 +34,7 @@ class CopyTradingFilterService(
      * @param tradePrice Leader 交易价格，用于价格区间检查
      * @param copyOrderAmount 跟单金额（USDC），用于仓位检查，如果为null则不进行仓位检查
      * @param marketId 市场ID，用于仓位检查（按市场过滤仓位）
+     * @param marketTitle 市场标题，用于关键字过滤
      * @return 过滤结果
      */
     suspend fun checkFilters(
@@ -39,9 +42,18 @@ class CopyTradingFilterService(
         tokenId: String,
         tradePrice: BigDecimal? = null,  // Leader 交易价格，用于价格区间检查
         copyOrderAmount: BigDecimal? = null,  // 跟单金额（USDC），用于仓位检查
-        marketId: String? = null  // 市场ID，用于仓位检查（按市场过滤仓位）
+        marketId: String? = null,  // 市场ID，用于仓位检查（按市场过滤仓位）
+        marketTitle: String? = null  // 市场标题，用于关键字过滤
     ): FilterResult {
-        // 1. 价格区间检查（如果配置了价格区间）
+        // 1. 关键字过滤检查（如果配置了关键字过滤）
+        if (copyTrading.keywordFilterMode != null && copyTrading.keywordFilterMode != "DISABLED") {
+            val keywordCheck = checkKeywordFilter(copyTrading, marketTitle)
+            if (!keywordCheck.isPassed) {
+                return keywordCheck
+            }
+        }
+        
+        // 2. 价格区间检查（如果配置了价格区间）
         if (tradePrice != null) {
             val priceRangeCheck = checkPriceRange(copyTrading, tradePrice)
             if (!priceRangeCheck.isPassed) {
@@ -49,7 +61,7 @@ class CopyTradingFilterService(
             }
         }
         
-        // 2. 检查是否需要获取订单簿
+        // 3. 检查是否需要获取订单簿
         // 只有在配置了需要订单簿的过滤条件时才获取
         val needOrderbook = copyTrading.maxSpread != null || copyTrading.minOrderDepth != null
         
@@ -58,7 +70,7 @@ class CopyTradingFilterService(
             return FilterResult.passed()
         }
         
-        // 3. 获取订单簿（仅在需要时，只请求一次）
+        // 4. 获取订单簿（仅在需要时，只请求一次）
         val orderbookResult = clobService.getOrderbookByTokenId(tokenId)
         if (!orderbookResult.isSuccess) {
             val error = orderbookResult.exceptionOrNull()
@@ -68,7 +80,7 @@ class CopyTradingFilterService(
         val orderbook = orderbookResult.getOrNull()
             ?: return FilterResult.orderbookEmpty()
         
-        // 4. 买一卖一价差过滤（如果配置了）
+        // 5. 买一卖一价差过滤（如果配置了）
         if (copyTrading.maxSpread != null) {
             val spreadCheck = checkSpread(copyTrading, orderbook)
             if (!spreadCheck.isPassed) {
@@ -76,7 +88,7 @@ class CopyTradingFilterService(
             }
         }
         
-        // 5. 订单深度过滤（如果配置了，检查所有方向）
+        // 6. 订单深度过滤（如果配置了，检查所有方向）
         if (copyTrading.minOrderDepth != null) {
             val depthCheck = checkOrderDepth(copyTrading, orderbook)
             if (!depthCheck.isPassed) {
@@ -84,7 +96,7 @@ class CopyTradingFilterService(
             }
         }
         
-        // 6. 仓位检查（如果配置了最大仓位限制且提供了跟单金额和市场ID）
+        // 7. 仓位检查（如果配置了最大仓位限制且提供了跟单金额和市场ID）
         if (copyOrderAmount != null && marketId != null) {
             val positionCheck = checkPositionLimits(copyTrading, copyOrderAmount, marketId)
             if (!positionCheck.isPassed) {
@@ -95,6 +107,65 @@ class CopyTradingFilterService(
         return FilterResult.passed(orderbook)
     }
     
+    /**
+     * 检查关键字过滤
+     * @param copyTrading 跟单配置
+     * @param marketTitle 市场标题
+     * @return 过滤结果
+     */
+    private fun checkKeywordFilter(
+        copyTrading: CopyTrading,
+        marketTitle: String?
+    ): FilterResult {
+        // 如果未启用关键字过滤，直接通过
+        if (copyTrading.keywordFilterMode == null || copyTrading.keywordFilterMode == "DISABLED") {
+            return FilterResult.passed()
+        }
+        
+        // 如果没有市场标题，无法进行关键字过滤，为了安全起见，不通过
+        if (marketTitle.isNullOrBlank()) {
+            return FilterResult.keywordFilterFailed("市场标题为空，无法进行关键字过滤")
+        }
+        
+        // 解析关键字列表
+        val keywords = jsonUtils.parseStringArray(copyTrading.keywords)
+        if (keywords.isEmpty()) {
+            // 如果关键字列表为空，白名单模式不通过，黑名单模式通过
+            return if (copyTrading.keywordFilterMode == "WHITELIST") {
+                FilterResult.keywordFilterFailed("白名单模式但关键字列表为空")
+            } else {
+                FilterResult.passed()
+            }
+        }
+        
+        // 将市场标题转换为小写，用于不区分大小写的匹配
+        val titleLower = marketTitle.lowercase()
+        
+        // 检查市场标题是否包含任意关键字
+        val containsKeyword = keywords.any { keyword ->
+            titleLower.contains(keyword.lowercase())
+        }
+        
+        // 根据过滤模式决定是否通过
+        return when (copyTrading.keywordFilterMode) {
+            "WHITELIST" -> {
+                if (containsKeyword) {
+                    FilterResult.passed()
+                } else {
+                    FilterResult.keywordFilterFailed("白名单模式：市场标题不包含任何关键字。市场标题：$marketTitle，关键字列表：${keywords.joinToString(", ")}")
+                }
+            }
+            "BLACKLIST" -> {
+                if (containsKeyword) {
+                    FilterResult.keywordFilterFailed("黑名单模式：市场标题包含关键字。市场标题：$marketTitle，匹配的关键字：${keywords.filter { titleLower.contains(it.lowercase()) }.joinToString(", ")}")
+                } else {
+                    FilterResult.passed()
+                }
+            }
+            else -> FilterResult.passed()
+        }
+    }
+    
     /**
      * 检查价格区间
      * @param copyTrading 跟单配置

backend/src/main/kotlin/com/wrbug/polymarketbot/service/copytrading/configs/CopyTradingService.kt

@@ -9,6 +9,8 @@ import com.wrbug.polymarketbot.repository.CopyTradingRepository
 import com.wrbug.polymarketbot.repository.CopyTradingTemplateRepository
 import com.wrbug.polymarketbot.repository.LeaderRepository
 import com.wrbug.polymarketbot.service.copytrading.monitor.CopyTradingMonitorService
+import com.google.gson.Gson
+import com.wrbug.polymarketbot.util.JsonUtils
 import com.wrbug.polymarketbot.util.toSafeBigDecimal
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
@@ -24,7 +26,9 @@ class CopyTradingService(
     private val accountRepository: AccountRepository,
     private val templateRepository: CopyTradingTemplateRepository,
     private val leaderRepository: LeaderRepository,
-    private val monitorService: CopyTradingMonitorService
+    private val monitorService: CopyTradingMonitorService,
+    private val jsonUtils: JsonUtils,
+    private val gson: Gson
 ) {
     
     private val logger = LoggerFactory.getLogger(CopyTradingService::class.java)
@@ -88,7 +92,9 @@ class CopyTradingService(
                     minPrice = request.minPrice?.toSafeBigDecimal() ?: template.minPrice,
                     maxPrice = request.maxPrice?.toSafeBigDecimal() ?: template.maxPrice,
                     maxPositionValue = request.maxPositionValue?.toSafeBigDecimal(),
-                    maxPositionCount = request.maxPositionCount
+                    maxPositionCount = request.maxPositionCount,
+                    keywordFilterMode = request.keywordFilterMode ?: "DISABLED",
+                    keywords = convertKeywordsToJson(request.keywords)
                 )
             } else {
                 // 手动输入（所有字段必须提供）
@@ -116,7 +122,9 @@ class CopyTradingService(
                     minPrice = request.minPrice?.toSafeBigDecimal(),
                     maxPrice = request.maxPrice?.toSafeBigDecimal(),
                     maxPositionValue = request.maxPositionValue?.toSafeBigDecimal(),
-                    maxPositionCount = request.maxPositionCount
+                    maxPositionCount = request.maxPositionCount,
+                    keywordFilterMode = request.keywordFilterMode ?: "DISABLED",
+                    keywords = convertKeywordsToJson(request.keywords)
                 )
             }
             
@@ -145,6 +153,8 @@ class CopyTradingService(
                 maxPrice = config.maxPrice,
                 maxPositionValue = config.maxPositionValue,
                 maxPositionCount = config.maxPositionCount,
+                keywordFilterMode = config.keywordFilterMode,
+                keywords = config.keywords,
                 configName = configName,
                 pushFailedOrders = request.pushFailedOrders ?: false
             )
@@ -213,6 +223,14 @@ class CopyTradingService(
                 maxPrice = request.maxPrice?.toSafeBigDecimal() ?: copyTrading.maxPrice,
                 maxPositionValue = request.maxPositionValue?.toSafeBigDecimal() ?: copyTrading.maxPositionValue,
                 maxPositionCount = request.maxPositionCount ?: copyTrading.maxPositionCount,
+                keywordFilterMode = request.keywordFilterMode ?: copyTrading.keywordFilterMode,
+                keywords = if (request.keywords != null) {
+                    convertKeywordsToJson(request.keywords)
+                } else if (request.keywordFilterMode != null && request.keywordFilterMode == "DISABLED") {
+                    null
+                } else {
+                    copyTrading.keywords
+                },
                 configName = configName,
                 pushFailedOrders = request.pushFailedOrders ?: copyTrading.pushFailedOrders,
                 updatedAt = System.currentTimeMillis()
@@ -424,6 +442,8 @@ class CopyTradingService(
             maxPrice = copyTrading.maxPrice?.toPlainString(),
             maxPositionValue = copyTrading.maxPositionValue?.toPlainString(),
             maxPositionCount = copyTrading.maxPositionCount,
+            keywordFilterMode = copyTrading.keywordFilterMode,
+            keywords = convertJsonToKeywords(copyTrading.keywords),
             configName = copyTrading.configName,
             pushFailedOrders = copyTrading.pushFailedOrders,
             createdAt = copyTrading.createdAt,
@@ -431,6 +451,36 @@ class CopyTradingService(
         )
     }
     
+    /**
+     * 将关键字列表转换为 JSON 字符串
+     */
+    private fun convertKeywordsToJson(keywords: List<String>?): String? {
+        if (keywords == null || keywords.isEmpty()) {
+            return null
+        }
+        return try {
+            gson.toJson(keywords)
+        } catch (e: Exception) {
+            logger.error("转换关键字列表为 JSON 失败", e)
+            null
+        }
+    }
+    
+    /**
+     * 将 JSON 字符串转换为关键字列表
+     */
+    private fun convertJsonToKeywords(jsonString: String?): List<String>? {
+        if (jsonString.isNullOrBlank()) {
+            return null
+        }
+        return try {
+            jsonUtils.parseStringArray(jsonString)
+        } catch (e: Exception) {
+            logger.error("解析关键字 JSON 失败", e)
+            null
+        }
+    }
+    
     /**
      * 内部配置类（用于构建 CopyTrading 实体）
      */
@@ -454,6 +504,8 @@ class CopyTradingService(
         val minPrice: BigDecimal?,
         val maxPrice: BigDecimal?,
         val maxPositionValue: BigDecimal?,
-        val maxPositionCount: Int?
+        val maxPositionCount: Int?,
+        val keywordFilterMode: String,
+        val keywords: String?  // JSON 字符串
     )
 }

backend/src/main/kotlin/com/wrbug/polymarketbot/service/copytrading/configs/FilterResult.kt

@@ -21,7 +21,9 @@ enum class FilterStatus {
     /** 失败：超过最大仓位金额 */
     FAILED_MAX_POSITION_VALUE,
     /** 失败：超过最大仓位数量 */
-    FAILED_MAX_POSITION_COUNT
+    FAILED_MAX_POSITION_COUNT,
+    /** 失败：关键字过滤 */
+    FAILED_KEYWORD_FILTER
 }
 
 /**
@@ -89,6 +91,12 @@ data class FilterResult(
             status = FilterStatus.FAILED_MAX_POSITION_COUNT,
             reason = reason
         )
+        
+        /** 关键字过滤失败 */
+        fun keywordFilterFailed(reason: String) = FilterResult(
+            status = FilterStatus.FAILED_KEYWORD_FILTER,
+            reason = reason
+        )
     }
 }
 

backend/src/main/kotlin/com/wrbug/polymarketbot/service/copytrading/orders/OrderPushService.kt

@@ -3,6 +3,7 @@ package com.wrbug.polymarketbot.service.copytrading.orders
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.wrbug.polymarketbot.api.MarketResponse
 import com.wrbug.polymarketbot.dto.OrderDetailDto
+import com.wrbug.polymarketbot.util.getEventSlug
 import com.wrbug.polymarketbot.dto.OrderMessageDto
 import com.wrbug.polymarketbot.dto.OrderPushMessage
 import com.wrbug.polymarketbot.entity.Account
@@ -437,7 +438,7 @@ class OrderPushService(
                         status = openOrder.status,
                         createdAt = openOrder.createdAt.toString(),  // unix timestamp 转换为字符串
                         marketName = marketInfo?.question,
-                        marketSlug = marketInfo?.slug,
+                        marketSlug = marketInfo?.slug,  // 显示用的 slug
                         marketIcon = marketInfo?.icon
                     )
                 },

backend/src/main/kotlin/com/wrbug/polymarketbot/service/copytrading/statistics/CopyOrderTrackingService.kt

@@ -7,6 +7,7 @@ import com.wrbug.polymarketbot.entity.*
 import com.wrbug.polymarketbot.repository.*
 import com.wrbug.polymarketbot.util.RetrofitFactory
 import com.wrbug.polymarketbot.util.*
+import com.wrbug.polymarketbot.util.getEventSlug
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -264,16 +265,32 @@ open class CopyOrderTrackingService(
                     // 计算跟单金额（USDC）= 买入数量 × 价格
                     val copyOrderAmount = buyQuantity.multi(tradePrice)
 
+                    // 如果启用了关键字过滤，需要先获取市场标题
+                    var marketTitle: String? = null
+                    if (copyTrading.keywordFilterMode != null && copyTrading.keywordFilterMode != "DISABLED") {
+                        try {
+                            val gammaApi = retrofitFactory.createGammaApi()
+                            val marketResponse = gammaApi.listMarkets(conditionIds = listOf(trade.market))
+                            if (marketResponse.isSuccessful && marketResponse.body() != null) {
+                                marketTitle = marketResponse.body()!!.firstOrNull()?.question
+                            }
+                        } catch (e: Exception) {
+                            logger.warn("获取市场标题失败（关键字过滤需要）: ${e.message}", e)
+                        }
+                    }
+
                     // 过滤条件检查（在计算订单参数之前）
                     // 传入 Leader 交易价格，用于价格区间检查
                     // 传入跟单金额和市场ID，用于仓位检查（按市场检查仓位）
+                    // 传入市场标题，用于关键字过滤
                     // 订单簿只请求一次，返回给后续逻辑使用
                     val filterResult = filterService.checkFilters(
                         copyTrading,
                         tokenId,
                         tradePrice = tradePrice,
                         copyOrderAmount = copyOrderAmount,
-                        marketId = trade.market
+                        marketId = trade.market,
+                        marketTitle = marketTitle
                     )
                     val orderbook = filterResult.orderbook  // 获取订单簿（如果需要）
                     if (!filterResult.isPassed) {
@@ -299,7 +316,7 @@ open class CopyOrderTrackingService(
                                 }
 
                                 val marketTitle = marketInfo?.question ?: trade.market
-                                val marketSlug = marketInfo?.slug
+                                val marketSlug = marketInfo?.slug  // 显示用的 slug
 
                                 // 从过滤结果中提取 filterType
                                 val filterType = extractFilterType(filterResult.status, filterResult.reason)
@@ -348,7 +365,7 @@ open class CopyOrderTrackingService(
                                 telegramNotificationService?.sendOrderFilteredNotification(
                                     marketTitle = marketTitle,
                                     marketId = trade.market,
-                                    marketSlug = marketSlug,
+                                    marketSlug = marketInfo.getEventSlug(),  // 跳转用的 slug
                                     side = "BUY",
                                     outcome = trade.outcome,
                                     price = trade.price,
@@ -571,7 +588,6 @@ open class CopyOrderTrackingService(
                                     }
 
                                     val marketTitle = marketInfo?.question ?: trade.market
-                                    val marketSlug = marketInfo?.slug
 
                                     // 获取当前语言设置（从 LocaleContextHolder）
                                     val locale = try {
@@ -583,7 +599,7 @@ open class CopyOrderTrackingService(
                                     telegramNotificationService?.sendOrderFailureNotification(
                                         marketTitle = marketTitle,
                                         marketId = trade.market,
-                                        marketSlug = marketSlug,
+                                        marketSlug = marketInfo.getEventSlug(),  // 跳转用的 slug
                                         side = "BUY",
                                         outcome = null,  // 失败时可能没有 outcome
                                         price = buyPrice.toString(),
@@ -1416,6 +1432,7 @@ open class CopyOrderTrackingService(
             FilterStatus.FAILED_ORDER_DEPTH -> "ORDER_DEPTH"
             FilterStatus.FAILED_MAX_POSITION_VALUE -> "MAX_POSITION_VALUE"
             FilterStatus.FAILED_MAX_POSITION_COUNT -> "MAX_POSITION_COUNT"
+            FilterStatus.FAILED_KEYWORD_FILTER -> "KEYWORD_FILTER"
         }
     }
 

backend/src/main/kotlin/com/wrbug/polymarketbot/service/copytrading/statistics/CopyTradingStatisticsService.kt

@@ -179,7 +179,8 @@ class CopyTradingStatisticsService(
                 leaderTradeId = order.leaderBuyTradeId,
                 marketId = order.marketId,
                 marketTitle = market?.title,
-                marketSlug = market?.slug,
+                marketSlug = market?.slug,  // 显示用的 slug
+                eventSlug = market?.eventSlug,  // 跳转用的 slug（从数据库读取）
                 marketCategory = market?.category,
                 side = order.side,
                 quantity = order.quantity.toString(),
@@ -234,7 +235,8 @@ class CopyTradingStatisticsService(
                 leaderTradeId = record.leaderSellTradeId,
                 marketId = record.marketId,
                 marketTitle = market?.title,
-                marketSlug = market?.slug,
+                marketSlug = market?.slug,  // 显示用的 slug
+                eventSlug = market?.eventSlug,  // 跳转用的 slug（从数据库读取）
                 marketCategory = market?.category,
                 side = record.side,
                 quantity = record.totalMatchedQuantity.toString(),
@@ -297,7 +299,8 @@ class CopyTradingStatisticsService(
                 buyOrderId = detail.buyOrderId,
                 marketId = matchRecord?.marketId,
                 marketTitle = market?.title,
-                marketSlug = market?.slug,
+                marketSlug = market?.slug,  // 显示用的 slug
+                eventSlug = market?.eventSlug,  // 跳转用的 slug（从数据库读取）
                 marketCategory = market?.category,
                 matchedQuantity = detail.matchedQuantity.toString(),
                 buyPrice = detail.buyPrice.toString(),
@@ -791,7 +794,8 @@ class CopyTradingStatisticsService(
                         leaderTradeId = order.leaderBuyTradeId,
                         marketId = order.marketId,
                         marketTitle = market?.title,
-                        marketSlug = market?.slug,
+                        marketSlug = market?.slug,  // 显示用的 slug
+                        eventSlug = market?.eventSlug,  // 跳转用的 slug（从数据库读取）
                         marketCategory = market?.category,
                         side = order.side,
                         quantity = order.quantity.toString(),
@@ -807,7 +811,8 @@ class CopyTradingStatisticsService(
                 MarketOrderGroup(
                     marketId = marketId,
                     marketTitle = markets[marketId]?.title,
-                    marketSlug = markets[marketId]?.slug,
+                    marketSlug = markets[marketId]?.slug,  // 显示用的 slug
+                    eventSlug = markets[marketId]?.eventSlug,  // 跳转用的 slug（从数据库读取）
                     marketCategory = markets[marketId]?.category,
                     stats = stats,
                     orders = orderDtos as List<Any>
@@ -895,7 +900,8 @@ class CopyTradingStatisticsService(
                         leaderTradeId = record.leaderSellTradeId,
                         marketId = record.marketId,
                         marketTitle = market?.title,
-                        marketSlug = market?.slug,
+                        marketSlug = market?.slug,  // 显示用的 slug
+                        eventSlug = market?.eventSlug,  // 跳转用的 slug（从数据库读取）
                         marketCategory = market?.category,
                         side = record.side,
                         quantity = record.totalMatchedQuantity.toString(),
@@ -909,7 +915,8 @@ class CopyTradingStatisticsService(
                 MarketOrderGroup(
                     marketId = marketId,
                     marketTitle = markets[marketId]?.title,
-                    marketSlug = markets[marketId]?.slug,
+                    marketSlug = markets[marketId]?.slug,  // 显示用的 slug
+                    eventSlug = markets[marketId]?.eventSlug,  // 跳转用的 slug（从数据库读取）
                     marketCategory = markets[marketId]?.category,
                     stats = stats,
                     orders = orderDtos as List<Any>
@@ -938,4 +945,5 @@ class CopyTradingStatisticsService(
             Result.failure(e)
         }
     }
+    
 }

backend/src/main/kotlin/com/wrbug/polymarketbot/service/copytrading/statistics/OrderStatusUpdateService.kt

@@ -8,6 +8,7 @@ import com.wrbug.polymarketbot.util.RetrofitFactory
 import com.wrbug.polymarketbot.util.CryptoUtils
 import com.wrbug.polymarketbot.util.toSafeBigDecimal
 import com.wrbug.polymarketbot.util.multi
+import com.wrbug.polymarketbot.util.getEventSlug
 import kotlinx.coroutines.*
 import org.slf4j.LoggerFactory
 import org.springframework.boot.context.event.ApplicationReadyEvent
@@ -730,7 +731,6 @@ class OrderStatusUpdateService(
             }
             
             val marketTitle = marketInfo?.question ?: order.marketId
-            val marketSlug = marketInfo?.slug
             
             // 获取 Leader 和跟单配置信息
             val leader = leaderRepository.findById(order.leaderId).orElse(null)
@@ -761,7 +761,7 @@ class OrderStatusUpdateService(
                 orderId = order.buyOrderId,
                 marketTitle = marketTitle,
                 marketId = order.marketId,
-                marketSlug = marketSlug,
+                marketSlug = marketInfo.getEventSlug(),  // 跳转用的 slug
                 side = "BUY",
                 price = actualPrice ?: order.price.toString(),  // 使用实际价格或临时价格
                 size = actualSize ?: order.quantity.toString(),  // 使用实际数量或临时数量
@@ -835,7 +835,6 @@ class OrderStatusUpdateService(
             }
             
             val marketTitle = marketInfo?.question ?: record.marketId
-            val marketSlug = marketInfo?.slug
             
             // 获取 Leader 和跟单配置信息
             val leader = leaderRepository.findById(finalCopyTrading.leaderId).orElse(null)
@@ -866,7 +865,7 @@ class OrderStatusUpdateService(
                 orderId = record.sellOrderId,
                 marketTitle = marketTitle,
                 marketId = record.marketId,
-                marketSlug = marketSlug,
+                marketSlug = marketInfo.getEventSlug(),  // 跳转用的 slug
                 side = "SELL",
                 price = actualPrice ?: record.sellPrice.toString(),  // 使用实际价格或临时价格
                 size = actualSize ?: record.totalMatchedQuantity.toString(),  // 使用实际数量或临时数量

backend/src/main/kotlin/com/wrbug/polymarketbot/util/MarketExt.kt

@@ -0,0 +1,20 @@
+package com.wrbug.polymarketbot.util
+
+import com.wrbug.polymarketbot.api.MarketResponse
+
+/**
+ * MarketResponse 扩展函数
+ * 从 events[0].slug 获取 slug，用于网页跳转
+ */
+fun MarketResponse?.getEventSlug(): String? {
+    return this?.events?.firstOrNull()?.slug ?: this?.slug
+}
+
+/**
+ * MarketResponse 扩展函数
+ * 获取显示用的 slug（使用原来的 slug 字段）
+ */
+fun MarketResponse?.getDisplaySlug(): String? {
+    return this?.slug
+}
+

backend/src/main/resources/db/migration/V20__add_keyword_filter.sql

@@ -0,0 +1,19 @@
+-- ============================================
+-- V20: 添加关键字过滤字段
+-- 在 copy_trading 表中添加关键字过滤配置
+-- 支持白名单和黑名单两种模式
+-- ============================================
+
+-- 添加关键字过滤模式字段
+-- DISABLED: 不启用关键字过滤（默认）
+-- WHITELIST: 白名单模式，只跟单包含关键字的市场
+-- BLACKLIST: 黑名单模式，不跟单包含关键字的市场
+ALTER TABLE copy_trading
+ADD COLUMN keyword_filter_mode VARCHAR(20) NOT NULL DEFAULT 'DISABLED' COMMENT '关键字过滤模式（DISABLED/WHITELIST/BLACKLIST）' AFTER max_position_count;
+
+-- 添加关键字列表字段（JSON 数组）
+-- 当 keyword_filter_mode 为 DISABLED 时，此字段为 NULL
+-- 当 keyword_filter_mode 为 WHITELIST 或 BLACKLIST 时，此字段存储关键字数组，例如：["NBA", "足球", "NBA总决赛"]
+ALTER TABLE copy_trading
+ADD COLUMN keywords JSON NULL COMMENT '关键字列表（JSON数组），仅在WHITELIST或BLACKLIST模式下使用' AFTER keyword_filter_mode;
+

backend/src/main/resources/db/migration/V21__add_event_slug_to_markets.sql

@@ -0,0 +1,8 @@
+-- ============================================
+-- V21: 添加 event_slug 字段到 markets 表
+-- 用于存储跳转用的 slug（从 events[0].slug 获取）
+-- ============================================
+
+ALTER TABLE markets
+ADD COLUMN event_slug VARCHAR(200) NULL COMMENT '跳转用的 slug（从 events[0].slug 获取，用于构建 URL）' AFTER slug;
+

frontend/src/App.tsx

@@ -23,8 +23,6 @@ import TemplateList from './pages/TemplateList'
 import TemplateAdd from './pages/TemplateAdd'
 import TemplateEdit from './pages/TemplateEdit'
 import CopyTradingList from './pages/CopyTradingList'
-import CopyTradingAdd from './pages/CopyTradingAdd'
-import CopyTradingEdit from './pages/CopyTradingEdit'
 import CopyTradingStatistics from './pages/CopyTradingStatistics'
 import CopyTradingBuyOrders from './pages/CopyTradingBuyOrders'
 import CopyTradingSellOrders from './pages/CopyTradingSellOrders'
@@ -250,8 +248,6 @@ function App() {
           <Route path="/templates/add" element={<ProtectedRoute><TemplateAdd /></ProtectedRoute>} />
           <Route path="/templates/edit/:id" element={<ProtectedRoute><TemplateEdit /></ProtectedRoute>} />
           <Route path="/copy-trading" element={<ProtectedRoute><CopyTradingList /></ProtectedRoute>} />
-          <Route path="/copy-trading/add" element={<ProtectedRoute><CopyTradingAdd /></ProtectedRoute>} />
-          <Route path="/copy-trading/edit/:id" element={<ProtectedRoute><CopyTradingEdit /></ProtectedRoute>} />
           <Route path="/copy-trading/statistics/:copyTradingId" element={<ProtectedRoute><CopyTradingStatistics /></ProtectedRoute>} />
           {/* 保留旧路由以保持向后兼容 */}
           <Route path="/copy-trading/orders/buy/:copyTradingId" element={<ProtectedRoute><CopyTradingBuyOrders /></ProtectedRoute>} />

frontend/src/components/AccountImportForm.tsx

@@ -227,8 +227,8 @@ const AccountImportForm: React.FC<AccountImportFormProps> = ({
             <Radio value="safe">
               {t('accountImport.walletTypeSafe')}
             </Radio>
-            <Radio value="magic">
-              {t('accountImport.walletTypeMagic')}
+            <Radio value="magic" disabled>
+              {t('accountImport.walletTypeMagic')} {t('accountImport.magicNotSupported')}
             </Radio>
           </Radio.Group>
         </Form.Item>

frontend/src/locales/en/common.json

@@ -30,7 +30,10 @@
     "total": "Total",
     "items": "items",
     "prev": "Previous",
-    "next": "Next"
+    "previous": "Previous",
+    "next": "Next",
+    "page": "Page",
+    "pageOf": "Page"
   },
   "account": {
     "title": "Account Management",
@@ -203,7 +206,8 @@
     "walletType": "Wallet Type",
     "walletTypeHelp": "Web3 Wallet: Polymarket accounts connected via browser wallets like MetaMask\nMagic: Polymarket accounts logged in via email or social accounts (Google, Twitter, etc.)",
     "walletTypeMagic": "Magic (Email/Social Login)",
-    "walletTypeSafe": "Web3 Wallet"
+    "walletTypeSafe": "Web3 Wallet",
+    "magicNotSupported": "(Not Supported)"
   },
   "leader": {
     "title": "Leader Management",
@@ -753,6 +757,17 @@
     "maxPositionCount": "Max Position Count",
     "maxPositionCountTooltip": "Limit the maximum position count for a single market. If the current position count reaches or exceeds this limit, the order will not be placed. Leave empty to disable",
     "maxPositionCountPlaceholder": "For example: 10 (optional, leave empty to disable)",
+    "keywordFilter": "Keyword Filter",
+    "keywordFilterMode": "Filter Mode",
+    "keywordFilterModeTooltip": "Select keyword filter mode. Whitelist: only copy markets containing keywords; Blacklist: do not copy markets containing keywords; Disabled: no keyword filtering. Keyword matching is case-insensitive.",
+    "disabled": "Disabled",
+    "whitelist": "Whitelist",
+    "blacklist": "Blacklist",
+    "keywords": "Keywords",
+    "keywordPlaceholder": "Enter keyword, press Enter to add",
+    "keywordExists": "Keyword already exists",
+    "whitelistTooltip": "💡 Whitelist mode: only copy markets whose titles contain any of the above keywords (case-insensitive)",
+    "blacklistTooltip": "💡 Blacklist mode: do not copy markets whose titles contain any of the above keywords (case-insensitive)",
     "configName": "Configuration Name",
     "configNameRequired": "Please enter configuration name",
     "configNamePlaceholder": "e.g., Copy Trading Config 1",
@@ -839,6 +854,17 @@
     "maxPositionCount": "Max Position Count",
     "maxPositionCountTooltip": "Limit the maximum position count for a single market. If the current position count reaches or exceeds this limit, the order will not be placed. Leave empty to disable",
     "maxPositionCountPlaceholder": "For example: 10 (optional, leave empty to disable)",
+    "keywordFilter": "Keyword Filter",
+    "keywordFilterMode": "Filter Mode",
+    "keywordFilterModeTooltip": "Select keyword filter mode. Whitelist: only copy markets containing keywords; Blacklist: do not copy markets containing keywords; Disabled: no keyword filtering. Keyword matching is case-insensitive.",
+    "disabled": "Disabled",
+    "whitelist": "Whitelist",
+    "blacklist": "Blacklist",
+    "keywords": "Keywords",
+    "keywordPlaceholder": "Enter keyword, press Enter to add",
+    "keywordExists": "Keyword already exists",
+    "whitelistTooltip": "💡 Whitelist mode: only copy markets whose titles contain any of the above keywords (case-insensitive)",
+    "blacklistTooltip": "💡 Blacklist mode: do not copy markets whose titles contain any of the above keywords (case-insensitive)",
     "configName": "Configuration Name",
     "configNameRequired": "Please enter configuration name",
     "configNamePlaceholder": "e.g., Copy Trading Config 1",

frontend/src/locales/zh-CN/common.json

@@ -27,7 +27,10 @@
     "total": "共",
     "items": "条",
     "prev": "上一页",
+    "previous": "上一页",
     "next": "下一页",
+    "page": "页",
+    "pageOf": "第",
     "success": "成功",
     "failed": "失败",
     "close": "关闭"
@@ -203,7 +206,8 @@
     "walletType": "钱包类型",
     "walletTypeHelp": "Web3钱包：使用 MetaMask 等浏览器钱包连接的 Polymarket 账户\nMagic：通过邮箱或社交账号（如 Google、Twitter）登录的 Polymarket 账户",
     "walletTypeMagic": "Magic（邮箱/社交账号登录）",
-    "walletTypeSafe": "Web3钱包"
+    "walletTypeSafe": "Web3钱包",
+    "magicNotSupported": "（暂不支持）"
   },
   "leader": {
     "title": "Leader 管理",
@@ -765,6 +769,17 @@
     "maxPositionCount": "最大仓位数量",
     "maxPositionCountTooltip": "限制单个市场的最大仓位数量。如果该市场的当前仓位数量达到或超过此限制，则不会下单。不填写则不启用此限制",
     "maxPositionCountPlaceholder": "例如：10（可选，不填写表示不启用）",
+    "keywordFilter": "关键字过滤",
+    "keywordFilterMode": "过滤模式",
+    "keywordFilterModeTooltip": "选择关键字过滤模式。白名单：只跟单包含关键字的市场；黑名单：不跟单包含关键字的市场；不启用：不进行关键字过滤。关键字匹配不区分大小写。",
+    "disabled": "不启用",
+    "whitelist": "白名单",
+    "blacklist": "黑名单",
+    "keywords": "关键字",
+    "keywordPlaceholder": "输入关键字，按回车添加",
+    "keywordExists": "关键字已存在",
+    "whitelistTooltip": "💡 白名单模式：只跟单包含上述任意关键字的市场标题（不区分大小写）",
+    "blacklistTooltip": "💡 黑名单模式：不跟单包含上述任意关键字的市场标题（不区分大小写）",
     "supportSell": "跟单卖出",
     "supportSellTooltip": "是否跟单 Leader 的卖出订单",
     "create": "创建跟单配置",
@@ -851,6 +866,17 @@
     "maxPositionCount": "最大仓位数量",
     "maxPositionCountTooltip": "限制单个市场的最大仓位数量。如果该市场的当前仓位数量达到或超过此限制，则不会下单。不填写则不启用此限制",
     "maxPositionCountPlaceholder": "例如：10（可选，不填写表示不启用）",
+    "keywordFilter": "关键字过滤",
+    "keywordFilterMode": "过滤模式",
+    "keywordFilterModeTooltip": "选择关键字过滤模式。白名单：只跟单包含关键字的市场；黑名单：不跟单包含关键字的市场；不启用：不进行关键字过滤。关键字匹配不区分大小写。",
+    "disabled": "不启用",
+    "whitelist": "白名单",
+    "blacklist": "黑名单",
+    "keywords": "关键字",
+    "keywordPlaceholder": "输入关键字，按回车添加",
+    "keywordExists": "关键字已存在",
+    "whitelistTooltip": "💡 白名单模式：只跟单包含上述任意关键字的市场标题（不区分大小写）",
+    "blacklistTooltip": "💡 黑名单模式：不跟单包含上述任意关键字的市场标题（不区分大小写）",
     "supportSell": "跟单卖出",
     "supportSellTooltip": "是否跟单 Leader 的卖出订单",
     "save": "保存",

frontend/src/locales/zh-TW/common.json

@@ -30,7 +30,10 @@
     "total": "共",
     "items": "條",
     "prev": "上一頁",
-    "next": "下一頁"
+    "previous": "上一頁",
+    "next": "下一頁",
+    "page": "頁",
+    "pageOf": "第"
   },
   "account": {
     "title": "賬戶管理",
@@ -203,7 +206,8 @@
     "walletType": "錢包類型",
     "walletTypeHelp": "Web3錢包：使用 MetaMask 等瀏覽器錢包連接的 Polymarket 帳戶\nMagic：透過郵箱或社群帳號（如 Google、Twitter）登入的 Polymarket 帳戶",
     "walletTypeMagic": "Magic（郵箱/社群帳號登入）",
-    "walletTypeSafe": "Web3錢包"
+    "walletTypeSafe": "Web3錢包",
+    "magicNotSupported": "（暫不支持）"
   },
   "leader": {
     "title": "Leader 管理",
@@ -753,6 +757,17 @@
     "maxPositionCount": "最大倉位數量",
     "maxPositionCountTooltip": "限制單個市場的最大倉位數量。如果該市場的當前倉位數量達到或超過此限制，則不會下單。不填寫則不啟用此限制",
     "maxPositionCountPlaceholder": "例如：10（可選，不填寫表示不啟用）",
+    "keywordFilter": "關鍵字過濾",
+    "keywordFilterMode": "過濾模式",
+    "keywordFilterModeTooltip": "選擇關鍵字過濾模式。白名單：只跟單包含關鍵字的市場；黑名單：不跟單包含關鍵字的市場；不啟用：不進行關鍵字過濾。關鍵字匹配不區分大小寫。",
+    "disabled": "不啟用",
+    "whitelist": "白名單",
+    "blacklist": "黑名單",
+    "keywords": "關鍵字",
+    "keywordPlaceholder": "輸入關鍵字，按回車添加",
+    "keywordExists": "關鍵字已存在",
+    "whitelistTooltip": "💡 白名單模式：只跟單包含上述任意關鍵字的市場標題（不區分大小寫）",
+    "blacklistTooltip": "💡 黑名單模式：不跟單包含上述任意關鍵字的市場標題（不區分大小寫）",
     "configName": "配置名",
     "configNameRequired": "請輸入配置名",
     "configNamePlaceholder": "例如：跟單配置1",
@@ -839,6 +854,17 @@
     "maxPositionCount": "最大倉位數量",
     "maxPositionCountTooltip": "限制單個市場的最大倉位數量。如果該市場的當前倉位數量達到或超過此限制，則不會下單。不填寫則不啟用此限制",
     "maxPositionCountPlaceholder": "例如：10（可選，不填寫表示不啟用）",
+    "keywordFilter": "關鍵字過濾",
+    "keywordFilterMode": "過濾模式",
+    "keywordFilterModeTooltip": "選擇關鍵字過濾模式。白名單：只跟單包含關鍵字的市場；黑名單：不跟單包含關鍵字的市場；不啟用：不進行關鍵字過濾。關鍵字匹配不區分大小寫。",
+    "disabled": "不啟用",
+    "whitelist": "白名單",
+    "blacklist": "黑名單",
+    "keywords": "關鍵字",
+    "keywordPlaceholder": "輸入關鍵字，按回車添加",
+    "keywordExists": "關鍵字已存在",
+    "whitelistTooltip": "💡 白名單模式：只跟單包含上述任意關鍵字的市場標題（不區分大小寫）",
+    "blacklistTooltip": "💡 黑名單模式：不跟單包含上述任意關鍵字的市場標題（不區分大小寫）",
     "configName": "配置名",
     "configNameRequired": "請輸入配置名",
     "configNamePlaceholder": "例如：跟單配置1",

frontend/src/pages/CopyTradingEdit.tsx

@@ -1,614 +0,0 @@
-import { useEffect, useState } from 'react'
-import { useNavigate, useParams } from 'react-router-dom'
-import { Card, Form, Button, Switch, message, Typography, Space, Radio, InputNumber, Divider, Spin, Select, Input } from 'antd'
-import { ArrowLeftOutlined, SaveOutlined } from '@ant-design/icons'
-import { apiService } from '../services/api'
-import type { CopyTrading, CopyTradingUpdateRequest } from '../types'
-import { useTranslation } from 'react-i18next'
-
-const { Title } = Typography
-const { Option } = Select
-
-const CopyTradingEdit: React.FC = () => {
-  const { t } = useTranslation()
-  const navigate = useNavigate()
-  const { id } = useParams<{ id: string }>()
-  const [form] = Form.useForm()
-  const [loading, setLoading] = useState(false)
-  const [fetching, setFetching] = useState(true)
-  const [copyTrading, setCopyTrading] = useState<CopyTrading | null>(null)
-  const [copyMode, setCopyMode] = useState<'RATIO' | 'FIXED'>('RATIO')
-  const [originalEnabled, setOriginalEnabled] = useState<boolean>(true)
-  
-  useEffect(() => {
-    if (id) {
-      fetchCopyTrading(parseInt(id))
-    }
-  }, [id])
-  
-  const fetchCopyTrading = async (copyTradingId: number) => {
-    setFetching(true)
-    try {
-      const response = await apiService.copyTrading.list({})
-      if (response.data.code === 0 && response.data.data) {
-        const found = response.data.data.list.find((ct: CopyTrading) => ct.id === copyTradingId)
-        if (found) {
-          setCopyTrading(found)
-          setCopyMode(found.copyMode)
-          setOriginalEnabled(found.enabled) // 保存原始的enabled状态
-          // 填充表单数据
-          form.setFieldsValue({
-            accountId: found.accountId,
-            leaderId: found.leaderId,
-            copyMode: found.copyMode,
-            copyRatio: found.copyRatio ? parseFloat(found.copyRatio) * 100 : 100, // 转换为百分比显示
-            fixedAmount: found.fixedAmount ? parseFloat(found.fixedAmount) : undefined,
-            maxOrderSize: found.maxOrderSize ? parseFloat(found.maxOrderSize) : undefined,
-            minOrderSize: found.minOrderSize ? parseFloat(found.minOrderSize) : undefined,
-            maxDailyLoss: found.maxDailyLoss ? parseFloat(found.maxDailyLoss) : undefined,
-            maxDailyOrders: found.maxDailyOrders,
-            priceTolerance: found.priceTolerance ? parseFloat(found.priceTolerance) : undefined,
-            delaySeconds: found.delaySeconds,
-            pollIntervalSeconds: found.pollIntervalSeconds,
-            useWebSocket: found.useWebSocket,
-            websocketReconnectInterval: found.websocketReconnectInterval,
-            websocketMaxRetries: found.websocketMaxRetries,
-            supportSell: found.supportSell,
-            minOrderDepth: found.minOrderDepth ? parseFloat(found.minOrderDepth) : undefined,
-            maxSpread: found.maxSpread ? parseFloat(found.maxSpread) : undefined,
-            minPrice: found.minPrice ? parseFloat(found.minPrice) : undefined,
-            maxPrice: found.maxPrice ? parseFloat(found.maxPrice) : undefined,
-            maxPositionValue: found.maxPositionValue ? parseFloat(found.maxPositionValue) : undefined,
-            maxPositionCount: found.maxPositionCount,
-            configName: found.configName || '',
-            pushFailedOrders: found.pushFailedOrders ?? false
-          })
-        } else {
-          message.error(t('copyTradingEdit.fetchFailed') || '跟单配置不存在')
-          navigate('/copy-trading')
-        }
-      } else {
-        message.error(response.data.msg || t('copyTradingEdit.fetchFailed') || '获取跟单配置失败')
-        navigate('/copy-trading')
-      }
-    } catch (error: any) {
-      message.error(error.message || t('copyTradingEdit.fetchFailed') || '获取跟单配置失败')
-      navigate('/copy-trading')
-    } finally {
-      setFetching(false)
-    }
-  }
-  
-  const handleCopyModeChange = (mode: 'RATIO' | 'FIXED') => {
-    setCopyMode(mode)
-  }
-  
-  const handleSubmit = async (values: any) => {
-    // 前端校验
-    if (values.copyMode === 'FIXED') {
-      if (!values.fixedAmount || Number(values.fixedAmount) < 1) {
-        message.error('固定金额必须 >= 1')
-        return
-      }
-    }
-    
-    if (values.copyMode === 'RATIO' && values.minOrderSize !== undefined && values.minOrderSize !== null && Number(values.minOrderSize) < 1) {
-      message.error('最小金额必须 >= 1')
-      return
-    }
-    
-    if (!id) {
-      message.error('配置ID不存在')
-      return
-    }
-    
-    setLoading(true)
-    try {
-      const request: CopyTradingUpdateRequest = {
-        copyTradingId: parseInt(id),
-        enabled: originalEnabled, // 保持原有的enabled状态，不修改
-        copyMode: values.copyMode,
-        copyRatio: values.copyMode === 'RATIO' && values.copyRatio ? (values.copyRatio / 100).toString() : undefined,
-        fixedAmount: values.copyMode === 'FIXED' ? values.fixedAmount?.toString() : undefined,
-        maxOrderSize: values.maxOrderSize?.toString(),
-        minOrderSize: values.minOrderSize?.toString(),
-        maxDailyLoss: values.maxDailyLoss?.toString(),
-        maxDailyOrders: values.maxDailyOrders,
-        priceTolerance: values.priceTolerance?.toString(),
-        delaySeconds: values.delaySeconds,
-        pollIntervalSeconds: values.pollIntervalSeconds,
-        useWebSocket: values.useWebSocket,
-        websocketReconnectInterval: values.websocketReconnectInterval,
-        websocketMaxRetries: values.websocketMaxRetries,
-        supportSell: values.supportSell,
-        minOrderDepth: values.minOrderDepth?.toString(),
-        maxSpread: values.maxSpread?.toString(),
-        minPrice: values.minPrice?.toString(),
-        maxPrice: values.maxPrice?.toString(),
-        maxPositionValue: values.maxPositionValue?.toString(),
-        maxPositionCount: values.maxPositionCount,
-        configName: values.configName?.trim() || undefined,
-        pushFailedOrders: values.pushFailedOrders
-      }
-      
-      const response = await apiService.copyTrading.update(request)
-      
-      if (response.data.code === 0) {
-        message.success(t('copyTradingEdit.saveSuccess') || '更新跟单配置成功')
-        navigate('/copy-trading')
-      } else {
-        message.error(response.data.msg || t('copyTradingEdit.saveFailed') || '更新跟单配置失败')
-      }
-    } catch (error: any) {
-      message.error(error.message || t('copyTradingEdit.saveFailed') || '更新跟单配置失败')
-    } finally {
-      setLoading(false)
-    }
-  }
-  
-  if (fetching) {
-    return (
-      <div style={{ textAlign: 'center', padding: '40px' }}>
-        <Spin size="large" />
-      </div>
-    )
-  }
-  
-  if (!copyTrading) {
-    return null
-  }
-  
-  return (
-    <div>
-      <div style={{ marginBottom: 16 }}>
-        <Button
-          icon={<ArrowLeftOutlined />}
-          onClick={() => navigate('/copy-trading')}
-        >
-          {t('common.back') || '返回'}
-        </Button>
-      </div>
-      
-      <Card>
-        <Title level={4}>{t('copyTradingEdit.title') || '编辑跟单配置'}</Title>
-        
-        <Form
-          form={form}
-          layout="vertical"
-          onFinish={handleSubmit}
-        >
-          {/* 基础信息（只读） */}
-          <Form.Item
-            label={t('copyTradingEdit.configName') || '配置名'}
-            name="configName"
-            rules={[
-              { required: true, message: t('copyTradingEdit.configNameRequired') || '请输入配置名' },
-              { whitespace: true, message: t('copyTradingEdit.configNameRequired') || '配置名不能为空' }
-            ]}
-            tooltip={t('copyTradingEdit.configNameTooltip') || '为跟单配置设置一个名称，便于识别和管理'}
-          >
-            <Input 
-              placeholder={t('copyTradingEdit.configNamePlaceholder') || '例如：跟单配置1'} 
-              maxLength={255}
-            />
-          </Form.Item>
-          
-          <Form.Item
-            label={t('copyTradingAdd.selectWallet') || t('copyTradingEdit.selectWallet') || '钱包'}
-            name="accountId"
-          >
-            <Select disabled>
-              <Option value={copyTrading.accountId}>
-                {copyTrading.accountName || `账户 ${copyTrading.accountId}`} ({copyTrading.walletAddress.slice(0, 6)}...{copyTrading.walletAddress.slice(-4)})
-              </Option>
-            </Select>
-          </Form.Item>
-          
-          <Form.Item
-            label={t('copyTradingAdd.selectLeader') || t('copyTradingEdit.selectLeader') || 'Leader'}
-            name="leaderId"
-          >
-            <Select disabled>
-              <Option value={copyTrading.leaderId}>
-                {copyTrading.leaderName || `Leader ${copyTrading.leaderId}`} ({copyTrading.leaderAddress.slice(0, 6)}...{copyTrading.leaderAddress.slice(-4)})
-              </Option>
-            </Select>
-          </Form.Item>
-          
-          <Divider>{t('copyTradingEdit.basicConfig') || '基础配置'}</Divider>
-     
-          {/* 跟单金额模式 */}
-          <Form.Item
-            label={t('copyTradingEdit.copyMode') || '跟单金额模式'}
-            name="copyMode"
-            tooltip={t('copyTradingEdit.copyModeTooltip') || '选择跟单金额的计算方式'}
-            rules={[{ required: true }]}
-          >
-            <Radio.Group onChange={(e) => handleCopyModeChange(e.target.value)}>
-              <Radio value="RATIO">{t('copyTradingEdit.ratioMode') || '比例模式'}</Radio>
-              <Radio value="FIXED">{t('copyTradingEdit.fixedAmountMode') || '固定金额模式'}</Radio>
-            </Radio.Group>
-          </Form.Item>
-          
-          {copyMode === 'RATIO' && (
-            <Form.Item
-              label={t('copyTradingEdit.copyRatio') || '跟单比例'}
-              name="copyRatio"
-              tooltip={t('copyTradingEdit.copyRatioTooltip') || '跟单比例表示跟单金额相对于 Leader 订单金额的百分比'}
-            >
-              <InputNumber
-                min={0.01}
-                max={10000}
-                step={0.01}
-                precision={2}
-                style={{ width: '100%' }}
-                addonAfter="%"
-                placeholder={t('copyTradingEdit.copyRatioPlaceholder') || '例如：100 表示 100%（1:1 跟单）'}
-                parser={(value) => {
-                  console.log('[CopyTradingEdit copyRatio parser] 输入值:', value, '类型:', typeof value)
-                  // 移除 % 符号和其他非数字字符（保留小数点和负号）
-                  const cleaned = (value || '').toString().replace(/%/g, '').trim()
-                  console.log('[CopyTradingEdit copyRatio parser] 清理后:', cleaned)
-                  const parsed = parseFloat(cleaned) || 0
-                  console.log('[CopyTradingEdit copyRatio parser] 解析后:', parsed)
-                  if (parsed > 10000) {
-                    console.log('[CopyTradingEdit copyRatio parser] 超过最大值，返回 10000')
-                    return 10000
-                  }
-                  if (parsed < 0.01) {
-                    console.log('[CopyTradingEdit copyRatio parser] 小于最小值，返回 0.01')
-                    return 0.01
-                  }
-                  console.log('[CopyTradingEdit copyRatio parser] 返回:', parsed)
-                  return parsed
-                }}
-                formatter={(value) => {
-                  console.log('[CopyTradingEdit copyRatio formatter] 输入值:', value, '类型:', typeof value)
-                  if (!value && value !== 0) {
-                    console.log('[CopyTradingEdit copyRatio formatter] 空值，返回空字符串')
-                    return ''
-                  }
-                  const num = parseFloat(value.toString())
-                  console.log('[CopyTradingEdit copyRatio formatter] 解析后:', num)
-                  if (isNaN(num)) {
-                    console.log('[CopyTradingEdit copyRatio formatter] NaN，返回空字符串')
-                    return ''
-                  }
-                  if (num > 10000) {
-                    console.log('[CopyTradingEdit copyRatio formatter] 超过最大值，返回 10000')
-                    return '10000'
-                  }
-                  const result = num.toString().replace(/\.0+$/, '')
-                  console.log('[CopyTradingEdit copyRatio formatter] 格式化后返回:', result)
-                  return result
-                }}
-              />
-            </Form.Item>
-          )}
-          
-          {copyMode === 'FIXED' && (
-            <Form.Item
-              label={t('copyTradingEdit.fixedAmount') || '固定跟单金额 (USDC)'}
-              name="fixedAmount"
-              rules={[
-                { required: true, message: t('copyTradingEdit.fixedAmountRequired') || '请输入固定跟单金额' },
-                { 
-                  validator: (_, value) => {
-                    if (value !== undefined && value !== null && value !== '') {
-                      const amount = Number(value)
-                      if (isNaN(amount)) {
-                        return Promise.reject(new Error(t('copyTradingEdit.invalidNumber') || '请输入有效的数字'))
-                      }
-                      if (amount < 1) {
-                        return Promise.reject(new Error(t('copyTradingEdit.fixedAmountMin') || '固定金额必须 >= 1'))
-                      }
-                    }
-                    return Promise.resolve()
-                  }
-                }
-              ]}
-            >
-              <InputNumber
-                min={1}
-                step={0.0001}
-                precision={4}
-                style={{ width: '100%' }}
-                placeholder={t('copyTradingEdit.fixedAmountPlaceholder') || '固定金额，不随 Leader 订单大小变化，必须 >= 1'}
-                formatter={(value) => {
-                  if (!value && value !== 0) return ''
-                  const num = parseFloat(value.toString())
-                  if (isNaN(num)) return ''
-                  return num.toString().replace(/\.0+$/, '')
-                }}
-              />
-            </Form.Item>
-          )}
-          
-          {copyMode === 'RATIO' && (
-            <>
-              <Form.Item
-                label={t('copyTradingEdit.maxOrderSize') || '单笔订单最大金额 (USDC)'}
-                name="maxOrderSize"
-                tooltip={t('copyTradingEdit.maxOrderSizeTooltip') || '比例模式下，限制单笔跟单订单的最大金额上限'}
-              >
-                <InputNumber
-                  min={0.0001}
-                  step={0.0001}
-                  precision={4}
-                  style={{ width: '100%' }}
-                  placeholder={t('copyTradingEdit.maxOrderSizePlaceholder') || '仅在比例模式下生效（可选）'}
-                  formatter={(value) => {
-                    if (!value && value !== 0) return ''
-                    const num = parseFloat(value.toString())
-                    if (isNaN(num)) return ''
-                    return num.toString().replace(/\.0+$/, '')
-                  }}
-                />
-              </Form.Item>
-              
-              <Form.Item
-                label={t('copyTradingEdit.minOrderSize') || '单笔订单最小金额 (USDC)'}
-                name="minOrderSize"
-                tooltip={t('copyTradingEdit.minOrderSizeTooltip') || '比例模式下，限制单笔跟单订单的最小金额下限，必须 >= 1'}
-                rules={[
-                  { 
-                    validator: (_, value) => {
-                      if (value === undefined || value === null || value === '') {
-                        return Promise.resolve()
-                      }
-                      if (typeof value === 'number' && value < 1) {
-                        return Promise.reject(new Error(t('copyTradingEdit.minOrderSizeMin') || '最小金额必须 >= 1'))
-                      }
-                      return Promise.resolve()
-                    }
-                  }
-                ]}
-              >
-                <InputNumber
-                  min={1}
-                  step={0.0001}
-                  precision={4}
-                  style={{ width: '100%' }}
-                  placeholder={t('copyTradingEdit.minOrderSizePlaceholder') || '仅在比例模式下生效，必须 >= 1（可选）'}
-                  formatter={(value) => {
-                    if (!value && value !== 0) return ''
-                    const num = parseFloat(value.toString())
-                    if (isNaN(num)) return ''
-                    return num.toString().replace(/\.0+$/, '')
-                  }}
-                />
-              </Form.Item>
-            </>
-          )}
-          
-          <Form.Item
-            label={t('copyTradingEdit.maxDailyLoss') || '每日最大亏损限制 (USDC)'}
-            name="maxDailyLoss"
-            tooltip={t('copyTradingEdit.maxDailyLossTooltip') || '限制每日最大亏损金额，用于风险控制'}
-          >
-            <InputNumber
-              min={0}
-              step={0.0001}
-              precision={4}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.maxDailyLossPlaceholder') || '默认 10000 USDC（可选）'}
-              formatter={(value) => {
-                if (!value && value !== 0) return ''
-                const num = parseFloat(value.toString())
-                if (isNaN(num)) return ''
-                return num.toString().replace(/\.0+$/, '')
-              }}
-            />
-          </Form.Item>
-          
-          <Form.Item
-            label={t('copyTradingEdit.maxDailyOrders') || '每日最大跟单订单数'}
-            name="maxDailyOrders"
-            tooltip={t('copyTradingEdit.maxDailyOrdersTooltip') || '限制每日最多跟单的订单数量'}
-          >
-            <InputNumber
-              min={1}
-              step={1}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.maxDailyOrdersPlaceholder') || '默认 100（可选）'}
-            />
-          </Form.Item>
-          
-          <Form.Item
-            label={t('copyTradingEdit.priceTolerance') || '价格容忍度 (%)'}
-            name="priceTolerance"
-            tooltip={t('copyTradingEdit.priceToleranceTooltip') || '允许跟单价格在 Leader 价格基础上的调整范围'}
-          >
-            <InputNumber
-              min={0}
-              max={100}
-              step={0.1}
-              precision={2}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.priceTolerancePlaceholder') || '默认 5%（可选）'}
-              formatter={(value) => {
-                if (!value && value !== 0) return ''
-                const num = parseFloat(value.toString())
-                if (isNaN(num)) return ''
-                return num.toString().replace(/\.0+$/, '')
-              }}
-            />
-          </Form.Item>
-          
-          <Form.Item
-            label={t('copyTradingEdit.delaySeconds') || '跟单延迟 (秒)'}
-            name="delaySeconds"
-            tooltip={t('copyTradingEdit.delaySecondsTooltip') || '跟单延迟时间，0 表示立即跟单'}
-          >
-            <InputNumber
-              min={0}
-              step={1}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.delaySecondsPlaceholder') || '默认 0（立即跟单）'}
-            />
-          </Form.Item>
-   
-          <Form.Item
-            label={t('copyTradingEdit.minOrderDepth') || '最小订单深度 (USDC)'}
-            name="minOrderDepth"
-            tooltip={t('copyTradingEdit.minOrderDepthTooltip') || '检查订单簿的总订单金额（买盘+卖盘），确保市场有足够的流动性。不填写则不启用此过滤'}
-          >
-            <InputNumber
-              min={0}
-              step={0.0001}
-              precision={4}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.minOrderDepthPlaceholder') || '例如：100（可选，不填写表示不启用）'}
-              formatter={(value) => {
-                if (!value && value !== 0) return ''
-                const num = parseFloat(value.toString())
-                if (isNaN(num)) return ''
-                return num.toString().replace(/\.0+$/, '')
-              }}
-            />
-          </Form.Item>
-          
-          <Form.Item
-            label={t('copyTradingEdit.maxSpread') || '最大价差（绝对价格）'}
-            name="maxSpread"
-            tooltip={t('copyTradingEdit.maxSpreadTooltip') || '最大价差（绝对价格）。避免在价差过大的市场跟单。不填写则不启用此过滤'}
-          >
-            <InputNumber
-              min={0}
-              step={0.0001}
-              precision={4}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.maxSpreadPlaceholder') || '例如：0.05（5美分，可选，不填写表示不启用）'}
-              formatter={(value) => {
-                if (!value && value !== 0) return ''
-                const num = parseFloat(value.toString())
-                if (isNaN(num)) return ''
-                return num.toString().replace(/\.0+$/, '')
-              }}
-            />
-          </Form.Item>
-          
-          <Divider>{t('copyTradingEdit.priceRangeFilter') || '价格区间过滤'}</Divider>
-          
-          <Form.Item
-            label={t('copyTradingEdit.priceRange') || '价格区间'}
-            name="priceRange"
-            tooltip={t('copyTradingEdit.priceRangeTooltip') || '配置价格区间，仅在指定价格区间内的订单才会下单。例如：0.11-0.89 表示区间在0.11和0.89之间；-0.89 表示0.89以下都可以；0.11- 表示0.11以上都可以'}
-          >
-            <Input.Group compact style={{ display: 'flex' }}>
-              <Form.Item name="minPrice" noStyle>
-                <InputNumber
-                  min={0.01}
-                  max={0.99}
-                  step={0.0001}
-                  precision={4}
-                  style={{ width: '50%' }}
-                  placeholder={t('copyTradingEdit.minPricePlaceholder') || '最低价（可选）'}
-                  formatter={(value) => {
-                    if (!value && value !== 0) return ''
-                    const num = parseFloat(value.toString())
-                    if (isNaN(num)) return ''
-                    return num.toString().replace(/\.0+$/, '')
-                  }}
-                />
-              </Form.Item>
-              <span style={{ display: 'inline-block', width: '20px', textAlign: 'center', lineHeight: '32px' }}>-</span>
-              <Form.Item name="maxPrice" noStyle>
-                <InputNumber
-                  min={0.01}
-                  max={0.99}
-                  step={0.0001}
-                  precision={4}
-                  style={{ width: '50%' }}
-                  placeholder={t('copyTradingEdit.maxPricePlaceholder') || '最高价（可选）'}
-                  formatter={(value) => {
-                    if (!value && value !== 0) return ''
-                    const num = parseFloat(value.toString())
-                    if (isNaN(num)) return ''
-                    return num.toString().replace(/\.0+$/, '')
-                  }}
-                />
-              </Form.Item>
-            </Input.Group>
-          </Form.Item>
-          
-          <Divider>{t('copyTradingEdit.positionLimitFilter') || '最大仓位限制'}</Divider>
-          
-          <Form.Item
-            label={t('copyTradingEdit.maxPositionValue') || '最大仓位金额 (USDC)'}
-            name="maxPositionValue"
-            tooltip={t('copyTradingEdit.maxPositionValueTooltip') || '限制单个市场的最大仓位金额。如果该市场的当前仓位金额 + 跟单金额超过此限制，则不会下单。不填写则不启用此限制'}
-          >
-            <InputNumber
-              min={0}
-              step={0.0001}
-              precision={4}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.maxPositionValuePlaceholder') || '例如：100（可选，不填写表示不启用）'}
-              formatter={(value) => {
-                if (!value && value !== 0) return ''
-                const num = parseFloat(value.toString())
-                if (isNaN(num)) return ''
-                return num.toString().replace(/\.0+$/, '')
-              }}
-            />
-          </Form.Item>
-          
-          <Form.Item
-            label={t('copyTradingEdit.maxPositionCount') || '最大仓位数量'}
-            name="maxPositionCount"
-            tooltip={t('copyTradingEdit.maxPositionCountTooltip') || '限制单个市场的最大仓位数量。如果该市场的当前仓位数量达到或超过此限制，则不会下单。不填写则不启用此限制'}
-          >
-            <InputNumber
-              min={1}
-              step={1}
-              style={{ width: '100%' }}
-              placeholder={t('copyTradingEdit.maxPositionCountPlaceholder') || '例如：10（可选，不填写表示不启用）'}
-            />
-          </Form.Item>
-          
-          <Divider>{t('copyTradingEdit.advancedSettings') || '高级设置'}</Divider>
-          
-          {/* 跟单卖出 */}
-          <Form.Item
-            label={t('copyTradingEdit.supportSell') || '跟单卖出'}
-            name="supportSell"
-            tooltip={t('copyTradingEdit.supportSellTooltip') || '是否跟单 Leader 的卖出订单'}
-            valuePropName="checked"
-          >
-            <Switch />
-          </Form.Item>
-          
-          {/* 推送失败订单 */}
-          <Form.Item
-            label={t('copyTradingEdit.pushFailedOrders') || '推送失败订单'}
-            name="pushFailedOrders"
-            tooltip={t('copyTradingEdit.pushFailedOrdersTooltip') || '开启后，失败的订单会推送到 Telegram'}
-            valuePropName="checked"
-          >
-            <Switch />
-          </Form.Item>
-          
-          <Form.Item>
-            <Space>
-              <Button
-                type="primary"
-                htmlType="submit"
-                icon={<SaveOutlined />}
-                loading={loading}
-              >
-                {t('copyTradingEdit.save') || '保存'}
-              </Button>
-              <Button onClick={() => navigate('/copy-trading')}>
-                {t('common.cancel') || '取消'}
-              </Button>
-            </Space>
-          </Form.Item>
-        </Form>
-      </Card>
-    </div>
-  )
-}
-
-export default CopyTradingEdit
-

frontend/src/pages/CopyTradingList.tsx

@@ -1,5 +1,4 @@
 import { useEffect, useState } from 'react'
-import { useNavigate } from 'react-router-dom'
 import { Card, Table, Button, Space, Tag, Popconfirm, Switch, message, Select, Dropdown, Divider, Spin } from 'antd'
 import { PlusOutlined, DeleteOutlined, BarChartOutlined, UnorderedListOutlined, ArrowUpOutlined, ArrowDownOutlined, EditOutlined } from '@ant-design/icons'
 import { useTranslation } from 'react-i18next'
@@ -13,12 +12,12 @@ import CopyTradingOrdersModal from './CopyTradingOrders/index'
 import StatisticsModal from './CopyTradingOrders/StatisticsModal'
 import FilteredOrdersModal from './CopyTradingOrders/FilteredOrdersModal'
 import EditModal from './CopyTradingOrders/EditModal'
+import AddModal from './CopyTradingOrders/AddModal'
 
 const { Option } = Select
 
 const CopyTradingList: React.FC = () => {
   const { t } = useTranslation()
-  const navigate = useNavigate()
   const isMobile = useMediaQuery({ maxWidth: 768 })
   const { accounts, fetchAccounts } = useAccountStore()
   const [copyTradings, setCopyTradings] = useState<CopyTrading[]>([])
@@ -42,6 +41,7 @@ const CopyTradingList: React.FC = () => {
   const [filteredOrdersModalCopyTradingId, setFilteredOrdersModalCopyTradingId] = useState<string>('')
   const [editModalOpen, setEditModalOpen] = useState(false)
   const [editModalCopyTradingId, setEditModalCopyTradingId] = useState<string>('')
+  const [addModalOpen, setAddModalOpen] = useState(false)
   
   useEffect(() => {
     fetchAccounts()
@@ -369,7 +369,7 @@ const CopyTradingList: React.FC = () => {
           <Button
             type="primary"
             icon={<PlusOutlined />}
-            onClick={() => navigate('/copy-trading/add')}
+            onClick={() => setAddModalOpen(true)}
           >
             {t('copyTradingList.addCopyTrading') || '新增跟单'}
           </Button>
@@ -668,6 +668,13 @@ const CopyTradingList: React.FC = () => {
           fetchCopyTradings()
         }}
       />
+      <AddModal
+        open={addModalOpen}
+        onClose={() => setAddModalOpen(false)}
+        onSuccess={() => {
+          fetchCopyTradings()
+        }}
+      />
     </div>
   )
 }

frontend/src/pages/CopyTradingOrders/AddModal.tsx

@@ -1,22 +1,29 @@
-import { useEffect, useState } from 'react'
-import { useNavigate } from 'react-router-dom'
-import { Card, Form, Button, Switch, message, Typography, Space, Radio, InputNumber, Modal, Table, Select, Divider, Input } from 'antd'
-import { ArrowLeftOutlined, SaveOutlined, FileTextOutlined, PlusOutlined } from '@ant-design/icons'
-import { apiService } from '../services/api'
-import { useAccountStore } from '../store/accountStore'
-import type { Leader, CopyTradingTemplate, CopyTradingCreateRequest } from '../types'
-import { formatUSDC } from '../utils'
+import React, { useEffect, useState, useRef } from 'react'
+import { Modal, Form, Button, Switch, message, Space, Radio, InputNumber, Table, Select, Divider, Input, Tag, InputRef } from 'antd'
+import { SaveOutlined, FileTextOutlined, PlusOutlined } from '@ant-design/icons'
+import { apiService } from '../../services/api'
+import { useAccountStore } from '../../store/accountStore'
+import type { Leader, CopyTradingTemplate, CopyTradingCreateRequest } from '../../types'
+import { formatUSDC } from '../../utils'
 import { useTranslation } from 'react-i18next'
 import { useMediaQuery } from 'react-responsive'
-import AccountImportForm from '../components/AccountImportForm'
-import LeaderAddForm from '../components/LeaderAddForm'
+import AccountImportForm from '../../components/AccountImportForm'
+import LeaderAddForm from '../../components/LeaderAddForm'
 
-const { Title } = Typography
 const { Option } = Select
 
-const CopyTradingAdd: React.FC = () => {
+interface AddModalProps {
+  open: boolean
+  onClose: () => void
+  onSuccess?: () => void
+}
+
+const AddModal: React.FC<AddModalProps> = ({
+  open,
+  onClose,
+  onSuccess
+}) => {
   const { t } = useTranslation()
-  const navigate = useNavigate()
   const isMobile = useMediaQuery({ maxWidth: 768 })
   const { accounts, fetchAccounts } = useAccountStore()
   const [form] = Form.useForm()
@@ -25,6 +32,8 @@ const CopyTradingAdd: React.FC = () => {
   const [templates, setTemplates] = useState<CopyTradingTemplate[]>([])
   const [templateModalVisible, setTemplateModalVisible] = useState(false)
   const [copyMode, setCopyMode] = useState<'RATIO' | 'FIXED'>('RATIO')
+  const [keywords, setKeywords] = useState<string[]>([])
+  const keywordInputRef = useRef<InputRef>(null)
   
   // 导入账户modal相关状态
   const [accountImportModalVisible, setAccountImportModalVisible] = useState(false)
@@ -52,14 +61,24 @@ const CopyTradingAdd: React.FC = () => {
   }
   
   useEffect(() => {
-    fetchAccounts()
-    fetchLeaders()
-    fetchTemplates()
-    
-    // 生成默认配置名
-    const defaultConfigName = generateDefaultConfigName()
-    form.setFieldsValue({ configName: defaultConfigName })
-  }, [])
+    if (open) {
+      fetchAccounts()
+      fetchLeaders()
+      fetchTemplates()
+      
+      // 生成默认配置名
+      const defaultConfigName = generateDefaultConfigName()
+      form.setFieldsValue({ configName: defaultConfigName })
+      
+      // 重置关键字列表
+      setKeywords([])
+    } else {
+      // 关闭时重置表单
+      form.resetFields()
+      setKeywords([])
+      setCopyMode('RATIO')
+    }
+  }, [open])
   
   const fetchLeaders = async () => {
     try {
@@ -140,6 +159,45 @@ const CopyTradingAdd: React.FC = () => {
     leaderAddForm.resetFields()
   }
   
+  // 添加关键字
+  const handleAddKeyword = (e?: React.KeyboardEvent<HTMLInputElement>) => {
+    let inputValue = ''
+    
+    if (e) {
+      // 从键盘事件获取输入值
+      const target = e.target as HTMLInputElement
+      inputValue = target.value.trim()
+    } else if (keywordInputRef.current) {
+      // 从输入框 ref 获取值
+      inputValue = keywordInputRef.current.input?.value?.trim() || ''
+    }
+    
+    if (!inputValue) {
+      return
+    }
+    
+    // 检查是否已存在
+    if (keywords.includes(inputValue)) {
+      message.warning(t('copyTradingAdd.keywordExists') || '关键字已存在')
+      return
+    }
+    
+    // 添加关键字
+    const newKeywords = [...keywords, inputValue]
+    setKeywords(newKeywords)
+    
+    // 清空输入框
+    if (keywordInputRef.current) {
+      keywordInputRef.current.input!.value = ''
+    }
+  }
+  
+  // 删除关键字
+  const handleRemoveKeyword = (index: number) => {
+    const newKeywords = keywords.filter((_, i) => i !== index)
+    setKeywords(newKeywords)
+  }
+  
   const handleSubmit = async (values: any) => {
     // 前端校验
     if (values.copyMode === 'FIXED') {
@@ -180,6 +238,10 @@ const CopyTradingAdd: React.FC = () => {
         maxPrice: values.maxPrice?.toString(),
         maxPositionValue: values.maxPositionValue?.toString(),
         maxPositionCount: values.maxPositionCount,
+        keywordFilterMode: values.keywordFilterMode || 'DISABLED',
+        keywords: (values.keywordFilterMode === 'WHITELIST' || values.keywordFilterMode === 'BLACKLIST') 
+          ? keywords 
+          : undefined,
         configName: values.configName?.trim(),
         pushFailedOrders: values.pushFailedOrders ?? false
       }
@@ -188,7 +250,10 @@ const CopyTradingAdd: React.FC = () => {
       
       if (response.data.code === 0) {
         message.success(t('copyTradingAdd.createSuccess') || '创建跟单配置成功')
-        navigate('/copy-trading')
+        onClose()
+        if (onSuccess) {
+          onSuccess()
+        }
       } else {
         message.error(response.data.msg || t('copyTradingAdd.createFailed') || '创建跟单配置失败')
       }
@@ -200,19 +265,17 @@ const CopyTradingAdd: React.FC = () => {
   }
   
   return (
-    <div>
-      <div style={{ marginBottom: 16 }}>
-        <Button
-          icon={<ArrowLeftOutlined />}
-          onClick={() => navigate('/copy-trading')}
-        >
-          {t('common.back') || '返回'}
-        </Button>
-      </div>
-      
-      <Card>
-        <Title level={4}>{t('copyTradingAdd.title') || '新增跟单配置'}</Title>
-        
+    <>
+      <Modal
+        title={t('copyTradingAdd.title') || '新增跟单配置'}
+        open={open}
+        onCancel={onClose}
+        footer={null}
+        width="90%"
+        style={{ top: 20 }}
+        bodyStyle={{ padding: '24px', maxHeight: 'calc(100vh - 100px)', overflow: 'auto' }}
+        destroyOnClose
+      >
         <Form
           form={form}
           layout="vertical"
@@ -231,7 +294,8 @@ const CopyTradingAdd: React.FC = () => {
             websocketReconnectInterval: 5000,
             websocketMaxRetries: 10,
             supportSell: true,
-            pushFailedOrders: false
+            pushFailedOrders: false,
+            keywordFilterMode: 'DISABLED'
           }}
         >
           {/* 基础信息 */}
@@ -352,42 +416,18 @@ const CopyTradingAdd: React.FC = () => {
                 addonAfter="%"
                 placeholder={t('copyTradingAdd.copyRatioPlaceholder') || '例如：100 表示 100%（1:1 跟单），默认 100%'}
                 parser={(value) => {
-                  console.log('[CopyTradingAdd copyRatio parser] 输入值:', value, '类型:', typeof value)
-                  // 移除 % 符号和其他非数字字符（保留小数点和负号）
                   const cleaned = (value || '').toString().replace(/%/g, '').trim()
-                  console.log('[CopyTradingAdd copyRatio parser] 清理后:', cleaned)
                   const parsed = parseFloat(cleaned) || 0
-                  console.log('[CopyTradingAdd copyRatio parser] 解析后:', parsed)
-                  if (parsed > 10000) {
-                    console.log('[CopyTradingAdd copyRatio parser] 超过最大值，返回 10000')
-                    return 10000
-                  }
-                  if (parsed < 0.01) {
-                    console.log('[CopyTradingAdd copyRatio parser] 小于最小值，返回 0.01')
-                    return 0.01
-                  }
-                  console.log('[CopyTradingAdd copyRatio parser] 返回:', parsed)
+                  if (parsed > 10000) return 10000
+                  if (parsed < 0.01) return 0.01
                   return parsed
                 }}
                 formatter={(value) => {
-                  console.log('[CopyTradingAdd copyRatio formatter] 输入值:', value, '类型:', typeof value)
-                  if (!value && value !== 0) {
-                    console.log('[CopyTradingAdd copyRatio formatter] 空值，返回空字符串')
-                    return ''
-                  }
+                  if (!value && value !== 0) return ''
                   const num = parseFloat(value.toString())
-                  console.log('[CopyTradingAdd copyRatio formatter] 解析后:', num)
-                  if (isNaN(num)) {
-                    console.log('[CopyTradingAdd copyRatio formatter] NaN，返回空字符串')
-                    return ''
-                  }
-                  if (num > 10000) {
-                    console.log('[CopyTradingAdd copyRatio formatter] 超过最大值，返回 10000')
-                    return '10000'
-                  }
-                  const result = num.toString().replace(/\.0+$/, '')
-                  console.log('[CopyTradingAdd copyRatio formatter] 格式化后返回:', result)
-                  return result
+                  if (isNaN(num)) return ''
+                  if (num > 10000) return '10000'
+                  return num.toString().replace(/\.0+$/, '')
                 }}
               />
             </Form.Item>
@@ -674,6 +714,75 @@ const CopyTradingAdd: React.FC = () => {
             />
           </Form.Item>
           
+          <Divider>{t('copyTradingAdd.keywordFilter') || '关键字过滤'}</Divider>
+          
+          <Form.Item
+            label={t('copyTradingAdd.keywordFilterMode') || '过滤模式'}
+            name="keywordFilterMode"
+            tooltip={t('copyTradingAdd.keywordFilterModeTooltip') || '选择关键字过滤模式。白名单：只跟单包含关键字的市场；黑名单：不跟单包含关键字的市场；不启用：不进行关键字过滤'}
+          >
+            <Radio.Group>
+              <Radio value="DISABLED">{t('copyTradingAdd.disabled') || '不启用'}</Radio>
+              <Radio value="WHITELIST">{t('copyTradingAdd.whitelist') || '白名单'}</Radio>
+              <Radio value="BLACKLIST">{t('copyTradingAdd.blacklist') || '黑名单'}</Radio>
+            </Radio.Group>
+          </Form.Item>
+          
+          <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => 
+            prevValues.keywordFilterMode !== currentValues.keywordFilterMode
+          }>
+            {({ getFieldValue }) => {
+              const filterMode = getFieldValue('keywordFilterMode')
+              if (filterMode !== 'WHITELIST' && filterMode !== 'BLACKLIST') {
+                return null
+              }
+              
+              return (
+                <>
+                  <Form.Item label={t('copyTradingAdd.keywords') || '关键字'}>
+                    <Space.Compact style={{ width: '100%' }}>
+                      <Input
+                        ref={keywordInputRef}
+                        placeholder={t('copyTradingAdd.keywordPlaceholder') || '输入关键字，按回车添加'}
+                        onPressEnter={(e) => handleAddKeyword(e)}
+                      />
+                      <Button 
+                        type="primary" 
+                        onClick={() => handleAddKeyword()}
+                      >
+                        {t('common.add') || '添加'}
+                      </Button>
+                    </Space.Compact>
+                    
+                    {keywords.length > 0 && (
+                      <div style={{ marginTop: 8 }}>
+                        <Space wrap>
+                          {keywords.map((keyword, index) => (
+                            <Tag
+                              key={index}
+                              closable
+                              onClose={() => handleRemoveKeyword(index)}
+                              color={filterMode === 'WHITELIST' ? 'green' : 'red'}
+                            >
+                              {keyword}
+                            </Tag>
+                          ))}
+                        </Space>
+                      </div>
+                    )}
+                    
+                    <div style={{ marginTop: 8, fontSize: 12, color: '#999' }}>
+                      {filterMode === 'WHITELIST' 
+                        ? (t('copyTradingAdd.whitelistTooltip') || '💡 白名单模式：只跟单包含上述任意关键字的市场标题')
+                        : (t('copyTradingAdd.blacklistTooltip') || '💡 黑名单模式：不跟单包含上述任意关键字的市场标题')
+                      }
+                    </div>
+                  </Form.Item>
+                </>
+              )
+            }}
+          </Form.Item>
+          
           <Divider>{t('copyTradingAdd.advancedSettings') || '高级设置'}</Divider>
           
           {/* 跟单卖出 */}
@@ -706,13 +815,13 @@ const CopyTradingAdd: React.FC = () => {
               >
                 {t('copyTradingAdd.create') || '创建跟单配置'}
               </Button>
-              <Button onClick={() => navigate('/copy-trading')}>
+              <Button onClick={onClose}>
                 {t('common.cancel') || '取消'}
               </Button>
             </Space>
           </Form.Item>
         </Form>
-      </Card>
+      </Modal>
       
       {/* 模板选择 Modal */}
       <Modal
@@ -812,8 +921,9 @@ const CopyTradingAdd: React.FC = () => {
           showCancelButton={true}
         />
       </Modal>
-    </div>
+    </>
   )
 }
 
-export default CopyTradingAdd
+export default AddModal
+

frontend/src/pages/CopyTradingOrders/BuyOrdersTab.tsx

@@ -173,7 +173,7 @@ const BuyOrdersTab: React.FC<BuyOrdersTabProps> = ({ copyTradingId, active = fal
       key: 'marketId',
       width: isMobile ? 120 : 200,
       render: (text: string, record: BuyOrderInfo) => {
-        const marketUrl = getPolymarketUrl(record.marketSlug, record.marketCategory, record.marketId)
+        const marketUrl = getPolymarketUrl(record.marketSlug, record.eventSlug, record.marketCategory, record.marketId)
         return (
           <div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
             {record.marketTitle ? (
@@ -307,7 +307,7 @@ const BuyOrdersTab: React.FC<BuyOrdersTabProps> = ({ copyTradingId, active = fal
         {groupedOrders.map((group) => {
           const isExpanded = expandedMarkets.has(group.marketId)
           const marketDisplayName = group.marketTitle || group.marketId.slice(0, 8) + '...' + group.marketId.slice(-6)
-          const marketUrl = getPolymarketUrl(group.marketSlug, group.marketCategory, group.marketId)
+          const marketUrl = getPolymarketUrl(group.marketSlug, group.eventSlug, group.marketCategory, group.marketId)
           const orders = group.orders as BuyOrderInfo[]
 
           return (
@@ -564,7 +564,7 @@ const BuyOrdersTab: React.FC<BuyOrdersTabProps> = ({ copyTradingId, active = fal
                       <div style={{ fontSize: '12px', color: '#666', marginBottom: '4px' }}>{t('copyTradingOrders.market') || '市场'}</div>
                       {order.marketTitle ? (
                         (() => {
-                          const marketUrl = getPolymarketUrl(order.marketSlug, order.marketCategory, order.marketId)
+                          const marketUrl = getPolymarketUrl(order.marketSlug, order.eventSlug, order.marketCategory, order.marketId)
                           return marketUrl ? (
                             <a
                               href={marketUrl}
@@ -717,7 +717,7 @@ const BuyOrdersTab: React.FC<BuyOrdersTabProps> = ({ copyTradingId, active = fal
                 {t('common.previous') || '上一页'}
               </Button>
               <span style={{ margin: '0 16px' }}>
-                {t('common.page') || '第'} {page} / {Math.ceil(groupedTotal / limit)} {t('common.page') || '页'}
+                {t('common.pageOf') || '第'} {page} / {Math.ceil(groupedTotal / limit)} {t('common.page') || '页'}
               </span>
               <Button
                 onClick={() => {

frontend/src/pages/CopyTradingOrders/EditModal.tsx

@@ -1,5 +1,5 @@
-import { useEffect, useState } from 'react'
-import { Modal, Form, Button, message, Radio, InputNumber, Divider, Spin, Select, Input, Space, Switch } from 'antd'
+import React, { useEffect, useState, useRef } from 'react'
+import { Modal, Form, Button, message, Radio, InputNumber, Divider, Spin, Select, Input, Space, Switch, Tag, InputRef } from 'antd'
 import { SaveOutlined } from '@ant-design/icons'
 import { apiService } from '../../services/api'
 import type { CopyTrading, CopyTradingUpdateRequest } from '../../types'
@@ -27,6 +27,8 @@ const EditModal: React.FC<EditModalProps> = ({
   const [copyTrading, setCopyTrading] = useState<CopyTrading | null>(null)
   const [copyMode, setCopyMode] = useState<'RATIO' | 'FIXED'>('RATIO')
   const [originalEnabled, setOriginalEnabled] = useState<boolean>(true)
+  const [keywords, setKeywords] = useState<string[]>([])
+  const keywordInputRef = useRef<InputRef>(null)
   
   useEffect(() => {
     if (open && copyTradingId) {
@@ -67,9 +69,12 @@ const EditModal: React.FC<EditModalProps> = ({
             maxPrice: found.maxPrice ? parseFloat(found.maxPrice) : undefined,
             maxPositionValue: found.maxPositionValue ? parseFloat(found.maxPositionValue) : undefined,
             maxPositionCount: found.maxPositionCount,
+            keywordFilterMode: found.keywordFilterMode || 'DISABLED',
             configName: found.configName || '',
             pushFailedOrders: found.pushFailedOrders ?? false
           })
+          // 设置关键字列表
+          setKeywords(found.keywords || [])
         } else {
           message.error(t('copyTradingEdit.fetchFailed') || '跟单配置不存在')
           onClose()
@@ -90,6 +95,40 @@ const EditModal: React.FC<EditModalProps> = ({
     setCopyMode(mode)
   }
   
+  // 添加关键字
+  const handleAddKeyword = (e?: React.KeyboardEvent<HTMLInputElement>) => {
+    let inputValue = ''
+    
+    if (e) {
+      const target = e.target as HTMLInputElement
+      inputValue = target.value.trim()
+    } else if (keywordInputRef.current) {
+      inputValue = keywordInputRef.current.input?.value?.trim() || ''
+    }
+    
+    if (!inputValue) {
+      return
+    }
+    
+    if (keywords.includes(inputValue)) {
+      message.warning(t('copyTradingEdit.keywordExists') || t('copyTradingAdd.keywordExists') || '关键字已存在')
+      return
+    }
+    
+    const newKeywords = [...keywords, inputValue]
+    setKeywords(newKeywords)
+    
+    if (keywordInputRef.current) {
+      keywordInputRef.current.input!.value = ''
+    }
+  }
+  
+  // 删除关键字
+  const handleRemoveKeyword = (index: number) => {
+    const newKeywords = keywords.filter((_, i) => i !== index)
+    setKeywords(newKeywords)
+  }
+  
   const handleSubmit = async (values: any) => {
     if (values.copyMode === 'FIXED') {
       if (!values.fixedAmount || Number(values.fixedAmount) < 1) {
@@ -133,6 +172,10 @@ const EditModal: React.FC<EditModalProps> = ({
         maxPrice: values.maxPrice?.toString(),
         maxPositionValue: values.maxPositionValue?.toString(),
         maxPositionCount: values.maxPositionCount,
+        keywordFilterMode: values.keywordFilterMode || 'DISABLED',
+        keywords: (values.keywordFilterMode === 'WHITELIST' || values.keywordFilterMode === 'BLACKLIST') 
+          ? keywords 
+          : undefined,
         configName: values.configName?.trim() || undefined,
         pushFailedOrders: values.pushFailedOrders
       }
@@ -178,6 +221,9 @@ const EditModal: React.FC<EditModalProps> = ({
           form={form}
           layout="vertical"
           onFinish={handleSubmit}
+          initialValues={{
+            keywordFilterMode: 'DISABLED'
+          }}
         >
           <Form.Item
             label={t('copyTradingEdit.configName') || '配置名'}
@@ -567,6 +613,76 @@ const EditModal: React.FC<EditModalProps> = ({
             />
           </Form.Item>
           
+          {/* 关键字过滤 */}
+          <Divider>{t('copyTradingEdit.keywordFilter') || t('copyTradingAdd.keywordFilter') || '关键字过滤'}</Divider>
+          
+          <Form.Item
+            label={t('copyTradingEdit.keywordFilterMode') || t('copyTradingAdd.keywordFilterMode') || '过滤模式'}
+            name="keywordFilterMode"
+            tooltip={t('copyTradingEdit.keywordFilterModeTooltip') || t('copyTradingAdd.keywordFilterModeTooltip') || '选择关键字过滤模式。白名单：只跟单包含关键字的市场；黑名单：不跟单包含关键字的市场；不启用：不进行关键字过滤'}
+          >
+            <Radio.Group>
+              <Radio value="DISABLED">{t('copyTradingEdit.disabled') || t('copyTradingAdd.disabled') || '不启用'}</Radio>
+              <Radio value="WHITELIST">{t('copyTradingEdit.whitelist') || t('copyTradingAdd.whitelist') || '白名单'}</Radio>
+              <Radio value="BLACKLIST">{t('copyTradingEdit.blacklist') || t('copyTradingAdd.blacklist') || '黑名单'}</Radio>
+            </Radio.Group>
+          </Form.Item>
+          
+          <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => 
+            prevValues.keywordFilterMode !== currentValues.keywordFilterMode
+          }>
+            {({ getFieldValue }) => {
+              const filterMode = getFieldValue('keywordFilterMode')
+              if (filterMode !== 'WHITELIST' && filterMode !== 'BLACKLIST') {
+                return null
+              }
+              
+              return (
+                <>
+                  <Form.Item label={t('copyTradingEdit.keywords') || t('copyTradingAdd.keywords') || '关键字'}>
+                    <Space.Compact style={{ width: '100%' }}>
+                      <Input
+                        ref={keywordInputRef}
+                        placeholder={t('copyTradingEdit.keywordPlaceholder') || t('copyTradingAdd.keywordPlaceholder') || '输入关键字，按回车添加'}
+                        onPressEnter={(e) => handleAddKeyword(e)}
+                      />
+                      <Button 
+                        type="primary" 
+                        onClick={() => handleAddKeyword()}
+                      >
+                        {t('common.add') || '添加'}
+                      </Button>
+                    </Space.Compact>
+                    
+                    {keywords.length > 0 && (
+                      <div style={{ marginTop: 8 }}>
+                        <Space wrap>
+                          {keywords.map((keyword, index) => (
+                            <Tag
+                              key={index}
+                              closable
+                              onClose={() => handleRemoveKeyword(index)}
+                              color={filterMode === 'WHITELIST' ? 'green' : 'red'}
+                            >
+                              {keyword}
+                            </Tag>
+                          ))}
+                        </Space>
+                      </div>
+                    )}
+                    
+                    <div style={{ marginTop: 8, fontSize: 12, color: '#999' }}>
+                      {filterMode === 'WHITELIST' 
+                        ? (t('copyTradingEdit.whitelistTooltip') || t('copyTradingAdd.whitelistTooltip') || '💡 白名单模式：只跟单包含上述任意关键字的市场标题')
+                        : (t('copyTradingEdit.blacklistTooltip') || t('copyTradingAdd.blacklistTooltip') || '💡 黑名单模式：不跟单包含上述任意关键字的市场标题')
+                      }
+                    </div>
+                  </Form.Item>
+                </>
+              )
+            }}
+          </Form.Item>
+          
           <Divider>{t('copyTradingEdit.advancedSettings') || '高级设置'}</Divider>
           
           <Form.Item

frontend/src/pages/CopyTradingOrders/SellOrdersTab.tsx

@@ -169,7 +169,7 @@ const SellOrdersTab: React.FC<SellOrdersTabProps> = ({ copyTradingId, active = f
       key: 'marketId',
       width: isMobile ? 120 : 200,
       render: (text: string, record: SellOrderInfo) => {
-        const marketUrl = getPolymarketUrl(record.marketSlug, record.marketCategory, record.marketId)
+        const marketUrl = getPolymarketUrl(record.marketSlug, record.eventSlug, record.marketCategory, record.marketId)
         return (
           <div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
             {record.marketTitle ? (
@@ -291,7 +291,7 @@ const SellOrdersTab: React.FC<SellOrdersTabProps> = ({ copyTradingId, active = f
         {groupedOrders.map((group) => {
           const isExpanded = expandedMarkets.has(group.marketId)
           const marketDisplayName = group.marketTitle || group.marketId.slice(0, 8) + '...' + group.marketId.slice(-6)
-          const marketUrl = getPolymarketUrl(group.marketSlug, group.marketCategory, group.marketId)
+          const marketUrl = getPolymarketUrl(group.marketSlug, group.eventSlug, group.marketCategory, group.marketId)
           const pnlColor = getPnlColor(group.stats.totalPnl || '0')
           const orders = group.orders as SellOrderInfo[]
 
@@ -546,7 +546,7 @@ const SellOrdersTab: React.FC<SellOrdersTabProps> = ({ copyTradingId, active = f
                       <div style={{ fontSize: '12px', color: '#666', marginBottom: '4px' }}>{t('copyTradingOrders.market') || '市场'}</div>
                       {order.marketTitle ? (
                         (() => {
-                          const marketUrl = getPolymarketUrl(order.marketSlug, order.marketCategory, order.marketId)
+                          const marketUrl = getPolymarketUrl(order.marketSlug, order.eventSlug, order.marketCategory, order.marketId)
                           return marketUrl ? (
                             <a
                               href={marketUrl}
@@ -689,7 +689,7 @@ const SellOrdersTab: React.FC<SellOrdersTabProps> = ({ copyTradingId, active = f
                 {t('common.previous') || '上一页'}
               </Button>
               <span style={{ margin: '0 16px' }}>
-                {t('common.page') || '第'} {page} / {Math.ceil(groupedTotal / limit)} {t('common.page') || '页'}
+                {t('common.pageOf') || '第'} {page} / {Math.ceil(groupedTotal / limit)} {t('common.page') || '页'}
               </span>
               <Button
                 onClick={() => {

frontend/src/pages/PositionList.tsx

@@ -582,9 +582,9 @@ const PositionList: React.FC = () => {
                     )}
                     <div style={{ flex: 1, minWidth: 0 }}>
                       {position.marketTitle ? (
-                        position.marketSlug ? (
+                        (position.eventSlug || position.marketSlug) ? (
                           <a 
-                            href={`https://polymarket.com/event/${position.marketSlug}`}
+                            href={`https://polymarket.com/event/${position.eventSlug || position.marketSlug}`}
                             target="_blank"
                             rel="noopener noreferrer"
                             onClick={(e) => e.stopPropagation()}
@@ -838,8 +838,8 @@ const PositionList: React.FC = () => {
       dataIndex: 'marketTitle',
       key: 'marketTitle',
       render: (text: string | undefined, record: AccountPosition) => {
-        const url = record.marketSlug 
-          ? `https://polymarket.com/event/${record.marketSlug}`
+        const url = record.eventSlug || record.marketSlug
+          ? `https://polymarket.com/event/${record.eventSlug || record.marketSlug}`
           : null
         
         const handleTitleClick = (e: React.MouseEvent) => {

frontend/src/types/index.ts

@@ -210,6 +210,9 @@ export interface CopyTrading {
   // 最大仓位配置
   maxPositionValue?: string  // 最大仓位金额（USDC），NULL表示不启用
   maxPositionCount?: number  // 最大仓位数量，NULL表示不启用
+  // 关键字过滤配置
+  keywordFilterMode?: 'DISABLED' | 'WHITELIST' | 'BLACKLIST'  // 关键字过滤模式
+  keywords?: string[]  // 关键字列表，当keywordFilterMode为DISABLED时为null
   // 新增配置字段
   configName?: string  // 配置名（可选，但提供时必须非空）
   pushFailedOrders: boolean  // 推送失败订单（默认关闭）
@@ -256,6 +259,9 @@ export interface CopyTradingCreateRequest {
   // 最大仓位配置
   maxPositionValue?: string  // 最大仓位金额（USDC），NULL表示不启用
   maxPositionCount?: number  // 最大仓位数量，NULL表示不启用
+  // 关键字过滤配置
+  keywordFilterMode?: 'DISABLED' | 'WHITELIST' | 'BLACKLIST'  // 关键字过滤模式
+  keywords?: string[]  // 关键字列表，当keywordFilterMode为DISABLED时为null
   // 新增配置字段
   configName?: string  // 配置名（可选，但提供时必须非空）
   pushFailedOrders?: boolean  // 推送失败订单（可选）
@@ -290,6 +296,9 @@ export interface CopyTradingUpdateRequest {
   // 最大仓位配置
   maxPositionValue?: string  // 最大仓位金额（USDC），NULL表示不启用
   maxPositionCount?: number  // 最大仓位数量，NULL表示不启用
+  // 关键字过滤配置
+  keywordFilterMode?: 'DISABLED' | 'WHITELIST' | 'BLACKLIST'  // 关键字过滤模式
+  keywords?: string[]  // 关键字列表，当keywordFilterMode为DISABLED时为null
   // 新增配置字段
   configName?: string  // 配置名（可选，但提供时必须非空）
   pushFailedOrders?: boolean  // 推送失败订单（可选）
@@ -372,7 +381,8 @@ export interface AccountPosition {
   proxyAddress: string
   marketId: string
   marketTitle?: string
-  marketSlug?: string
+  marketSlug?: string  // 显示用的 slug
+  eventSlug?: string  // 跳转用的 slug（从 events[0].slug 获取）
   marketIcon?: string  // 市场图标 URL
   side: string  // 结果名称（如 "YES", "NO", "Pakistan" 等）
   outcomeIndex?: number  // 结果索引（0, 1, 2...），用于计算 tokenId
@@ -628,7 +638,8 @@ export interface BuyOrderInfo {
   leaderTradeId: string
   marketId: string
   marketTitle?: string  // 市场名称
-  marketSlug?: string  // 市场 slug（用于构建 URL）
+  marketSlug?: string  // 市场 slug（用于显示）
+  eventSlug?: string  // 跳转用的 slug（从 events[0].slug 获取）
   marketCategory?: string  // 市场分类（sports, crypto 等）
   side: string
   quantity: string
@@ -648,7 +659,8 @@ export interface SellOrderInfo {
   leaderTradeId: string
   marketId: string
   marketTitle?: string  // 市场名称
-  marketSlug?: string  // 市场 slug（用于构建 URL）
+  marketSlug?: string  // 市场 slug（用于显示）
+  eventSlug?: string  // 跳转用的 slug（从 events[0].slug 获取）
   marketCategory?: string  // 市场分类（sports, crypto 等）
   side: string
   quantity: string
@@ -666,7 +678,8 @@ export interface MatchedOrderInfo {
   buyOrderId: string
   marketId?: string  // 市场ID
   marketTitle?: string  // 市场名称
-  marketSlug?: string  // 市场 slug（用于构建 URL）
+  marketSlug?: string  // 市场 slug（用于显示）
+  eventSlug?: string  // 跳转用的 slug（从 events[0].slug 获取）
   marketCategory?: string  // 市场分类（sports, crypto 等）
   matchedQuantity: string
   buyPrice: string
@@ -729,7 +742,8 @@ export interface MarketOrderStats {
 export interface MarketOrderGroup {
   marketId: string
   marketTitle?: string
-  marketSlug?: string
+  marketSlug?: string  // 显示用的 slug
+  eventSlug?: string  // 跳转用的 slug（从 events[0].slug 获取）
   marketCategory?: string
   stats: MarketOrderStats
   orders: BuyOrderInfo[] | SellOrderInfo[]  // 订单列表

frontend/src/utils/index.ts

@@ -98,7 +98,8 @@ export const isAutoGeneratedOrderId = (orderId: string | undefined | null): bool
  * 构建 Polymarket 市场 URL
  * 对于 moneyline 市场，跳转到 moneyline 页面
  * 注意：目前无法自动判断市场是否为 moneyline，需要后端提供标识
- * @param marketSlug - 市场 slug
+ * @param marketSlug - 市场 slug（用于显示）
+ * @param eventSlug - 跳转用的 slug（从 events[0].slug 获取，优先使用）
  * @param marketCategory - 市场分类（sports, crypto 等）
  * @param marketId - 市场ID（作为后备）
  * @param isMoneyline - 是否为 moneyline 市场（需要后端提供）
@@ -106,18 +107,21 @@ export const isAutoGeneratedOrderId = (orderId: string | undefined | null): bool
  */
 export const getPolymarketUrl = (
   marketSlug?: string | null,
+  eventSlug?: string | null,  // 跳转用的 slug（优先使用）
   _marketCategory?: string | null,  // 保留参数以便未来使用
   marketId?: string | null,
   isMoneyline?: boolean
 ): string | null => {
-  // 优先使用 slug
-  if (marketSlug) {
+  // 优先使用 eventSlug（跳转用的 slug）
+  const slug = eventSlug || marketSlug
+  
+  if (slug) {
     // 如果是 moneyline 市场，跳转到 moneyline 页面
     if (isMoneyline === true) {
-      return `https://polymarket.com/event/${marketSlug}/moneyline`
+      return `https://polymarket.com/event/${slug}/moneyline`
     }
     // 其他市场跳转到普通市场页面
-    return `https://polymarket.com/event/${marketSlug}`
+    return `https://polymarket.com/event/${slug}`
   }
   
   // 如果没有 slug，使用 marketId（作为后备）