From e9359c4fa77ee8068ccf9fc34aec375b6dce45a7 Mon Sep 17 00:00:00 2001
From: shy3130 <415333856@qq.com>
Date: Sat, 5 Sep 2026 20:48:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(screener):=20=E6=96=B0=E5=BB=BA=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E6=A8=A1=E6=9D=BF=E7=BB=9F=E4=B8=80=20basic=5Ffilter?=
 =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 普通与矩阵两个模板统一为: 价格 5~200、流通市值 30~1500 亿 (float_cap)、
  换手率下限 1%、排除 ST、次新 30 天、板块默认不含北交所
- 成交额与总市值下限显式置 None: 引擎合并规则下省略键会继承
  DEFAULT_BASIC_FILTER (成交额 0.2 亿 / 总市值 10 亿), 显式 None 才表达"不设"
- 矩阵模板原无 basic_filter (落库后走引擎兜底), 一并补齐消除两模板不一致

验证: pnpm build 通过; 字段语义核对 (_basic_filter_expr 对 None 跳过,
float_cap=close*float_shares, turnover_rate 为百分数口径, boards 白名单制)。
---
 .../screener/StrategyBuilderDialog.tsx          | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/screener/StrategyBuilderDialog.tsx b/frontend/src/components/screener/StrategyBuilderDialog.tsx
index 8c7e0af..473593b 100644
--- a/frontend/src/components/screener/StrategyBuilderDialog.tsx
+++ b/frontend/src/components/screener/StrategyBuilderDialog.tsx
@@ -94,9 +94,13 @@ META = {
     "asset_types": ["stock"],
     "timeframes": ["1d"],
     "basic_filter": {
-        "price_min": 3, "price_max": 200,
-        "market_cap_min": 10e8, "amount_min": 0.5e8,
+        "price_min": 5, "price_max": 200,
+        "market_cap_min": None,
+        "float_cap_min": 30e8, "float_cap_max": 1500e8,
+        "amount_min": None,
+        "turnover_min": 1,
         "exclude_st": True, "exclude_new_days": 30,
+        "boards": ["沪主板", "深主板", "创业板", "科创板"],
     },
     "params": [],
     "scoring": {
@@ -137,6 +141,15 @@ META = {
     "tags": ["自定义", "矩阵"],
     "asset_types": ["stock"],
     "timeframes": ["1d"],
+    "basic_filter": {
+        "price_min": 5, "price_max": 200,
+        "market_cap_min": None,
+        "float_cap_min": 30e8, "float_cap_max": 1500e8,
+        "amount_min": None,
+        "turnover_min": 1,
+        "exclude_st": True, "exclude_new_days": 30,
+        "boards": ["沪主板", "深主板", "创业板", "科创板"],
+    },
     "params": [],
     "scoring": {},
     "order_by": "score",