diff --git a/ChanKLC.py b/ChanKLC.py
index 8999da6..2f33b82 100644
--- a/ChanKLC.py
+++ b/ChanKLC.py
@@ -61,7 +61,7 @@ class ChanKLC():
 		#print(self.start_time, klc_fx_type, self.get_feature_data()['klu_macd'], self.get_feature_data()['klu_macdhist'], self.get_feature_data()['klu_rsi'])
 		self.klc_fx_type = klc_fx_type
 		#self.cal_fx()
-		self.cal_bb_out()
+		#self.cal_bb_out()
 	def add_klu(self, klu):
 		self.klus.append(klu)
 	def set_end_klu(self, klu):
diff --git a/ChanLun.py b/ChanLun.py
index cab0039..78a069d 100644
--- a/ChanLun.py
+++ b/ChanLun.py
@@ -84,12 +84,12 @@ class ChanLun():
 	def check_fx(self, klc):
 		if klc.pre and klc.next:
 			if klc.high > klc.pre.high and klc.high > klc.next.high:
-				if (klc.close > klc.ema52 or klc.next.close > klc.next.ema52) and klc.macd > 0:
+				if (klc.close > klc.ema52 or klc.next.close > klc.next.ema52) and klc.macd > 0 and klc.macd > klc.macdhist:
 					klc.set_fx(Chan_FX_TYPE.TOP)
 					#print(klc.start_time, klc.end_time,klc.next.start_time, klc.next.end_time, klc.macd, klc.state, klc.fx, "TOP")
 					return Chan_FX_TYPE.TOP
 			elif klc.low < klc.pre.low and klc.low < klc.next.low:
-				if (klc.close < klc.ema52 or klc.next.close < klc.next.ema52) and klc.macd < 0:
+				if (klc.close < klc.ema52 or klc.next.close < klc.next.ema52) and klc.macd < 0 and klc.macd < klc.macdhist:
 					klc.set_fx(Chan_FX_TYPE.BOTTOM)
 					#print(klc.start_time, klc.end_time,klc.next.start_time, klc.next.end_time, klc.macd, klc.state, klc.fx, "BOTTOM")
 					return Chan_FX_TYPE.BOTTOM
diff --git a/web/app.py b/web/app.py
index 38d4384..56bf248 100644
--- a/web/app.py
+++ b/web/app.py
@@ -2128,144 +2128,7 @@ def debug_replay_structure():
     except Exception as e:
         return jsonify({'error': str(e)})
 
-@app.route('/api/filter_stocks', methods=['POST'])
-def filter_stocks():
-    """筛选满足条件的A股股票"""
-    try:
-        data = request.get_json()
-        start_time = data.get('start_time')
-        end_time = data.get('end_time')
-        timeframe = data.get('timeframe', '1d')
-        fx_strength_threshold = data.get('fx_strength_threshold', 1.0)
-        
-        if not start_time or not end_time:
-            return jsonify({'error': '开始时间和结束时间不能为空'})
-        
-        # 获取所有A股股票列表，如果失败则使用热门股票作为备用
-        stock_list = []
-        data_source = ""
-        try:
-            stock_list = china_stock.get_stock_list()
-            if stock_list and len(stock_list) > 0:
-                data_source = "完整股票列表"
-            else:
-                raise Exception("获取到的股票列表为空")
-        except Exception as e:
-            try:
-                popular_stocks = china_stock.get_popular_stocks()
-                stock_list = [{'symbol': stock['symbol'], 'name': stock['name']} for stock in popular_stocks]
-                data_source = "热门股票列表"
-            except Exception as e2:
-                # 检查是否是网络连接问题
-                if "timeout" in str(e).lower() or "connection" in str(e).lower() or "network" in str(e).lower():
-                    return jsonify({
-                        'error': '网络连接超时，无法获取股票数据。请检查网络连接后重试。',
-                        'error_type': 'network_error',
-                        'suggestion': '请确保网络连接正常，或稍后重试。'
-                    })
-                else:
-                    return jsonify({'error': f'无法获取股票列表: {str(e)}'})
-        
-        if not stock_list:
-            return jsonify({
-                'error': '无法获取股票列表，请检查网络连接后重试',
-                'error_type': 'network_error',
-                'suggestion': '请确保网络连接正常，或稍后重试。'
-            })
-        
-        results = []
-        processed_count = 0
-        total_count = len(stock_list)
-        failed_count = 0
-        
-        for stock in stock_list:
-            try:
-                symbol = stock['symbol']
-                name = stock['name']
-                processed_count += 1
-                
-                # 获取股票K线数据
-                df = get_a_stock_kl_data(symbol, timeframe, start_time=start_time, end_time=end_time)
-                
-                if df is None or len(df) < 3:
-                    failed_count += 1
-                    # 如果连续失败太多，可能是网络问题
-                    if failed_count > 10 and len(results) == 0:
-                        return jsonify({
-                            'error': '网络连接不稳定，无法获取股票数据。请检查网络连接后重试。',
-                            'error_type': 'network_error',
-                            'processed_count': processed_count,
-                            'failed_count': failed_count
-                        })
-                    continue
-                
-                # 进行缠论分析
-                analysis_result = analyze_chan(df, symbol, timeframe)
-                
-                if not analysis_result or 'klc_fx_info' not in analysis_result:
-                    continue
-                
-                klc_fx_info = analysis_result['klc_fx_info']
-                
-                # 检查最近2个KLC是否有满足条件的分型
-                recent_klcs = klc_fx_info[-2:] if len(klc_fx_info) >= 2 else klc_fx_info
-                
-                for klc_info in recent_klcs:
-                    fx_strength = klc_info.get('fx_strength', 0)
-                    fx_type = klc_info.get('fx_type', 'UNKNOWN')
-                    
-                    # 检查是否满足条件：分型强度>=阈值 且 分型类型不为UNKNOWN
-                    if fx_strength >= fx_strength_threshold and fx_type != 'UNKNOWN':
-                        # 获取当前价格（最新收盘价）
-                        current_price = df['close'].iloc[-1] if len(df) > 0 else None
-                        fx_price = klc_info.get('price', 0)
-                        
-                        # 计算涨跌幅
-                        change_percent = 0
-                        if current_price and fx_price and fx_price > 0:
-                            change_percent = ((current_price - fx_price) / fx_price) * 100
-                        
-                        # 格式化分型类型显示
-                        fx_type_display = format_fx_type(fx_type)
-                        
-                        results.append({
-                            'symbol': symbol,
-                            'name': name,
-                            'fx_time': klc_info.get('time', ''),
-                            'fx_type': fx_type_display,
-                            'fx_strength': fx_strength,
-                            'fx_price': fx_price,
-                            'current_price': current_price,
-                            'change_percent': change_percent
-                        })
-                        break  # 找到一个满足条件的就跳出循环
-                        
-            except Exception as e:
-                failed_count += 1
-                continue
-        
-        # 按分型强度降序排列
-        results.sort(key=lambda x: x['fx_strength'], reverse=True)
-        
-        return jsonify({
-            'results': results,
-            'total_processed': processed_count,
-            'total_found': len(results),
-            'failed_count': failed_count,
-            'data_source': data_source,
-            'message': f'使用{data_source}进行筛选，共处理{processed_count}只股票，找到{len(results)}只满足条件的股票'
-        })
-        
-    except Exception as e:
-        # 检查是否是网络连接问题
-        if "timeout" in str(e).lower() or "connection" in str(e).lower() or "network" in str(e).lower():
-            return jsonify({
-                'error': '网络连接超时，请检查网络连接后重试。',
-                'error_type': 'network_error',
-                'suggestion': '请确保网络连接正常，或稍后重试。'
-            })
-        else:
-            return jsonify({'error': str(e)})
+# 已移除：/api/filter_stocks 路由
 
 def get_uncompleted_seg_list(seg_list, client_tz):
     """获取未完成线段列表，正确处理倒数第二个和最后一个未完成线段"""
diff --git a/web/static/js/charts.js b/web/static/js/charts.js
new file mode 100644
index 0000000..53ac532
--- /dev/null
+++ b/web/static/js/charts.js
@@ -0,0 +1,69 @@
+// Namespace setup
+window.App = window.App || {};
+window.App.Charts = (function() {
+  // 依赖 Indicators
+  const Indicators = (window.App && window.App.Indicators) || {};
+
+  function addMovingAveragesToChart(candleData) {
+    if (!window.tvWidget || !tvWidget.mainChart || !candleData || candleData.length === 0) return;
+    if (!window.movingAverages) return;
+    if (!tvWidget.series) tvWidget.series = {};
+
+    if (tvWidget.series.maSeries && tvWidget.series.maSeries.length > 0) {
+      tvWidget.series.maSeries.forEach(series => {
+        try { tvWidget.mainChart.removeSeries(series); } catch(e) {}
+      });
+    }
+    tvWidget.series.maSeries = [];
+
+    window.movingAverages.forEach(maConfig => {
+      if (!maConfig.visible) return;
+      try {
+        const maData = Indicators.calculateMA(candleData, maConfig.type, maConfig.length, maConfig.source);
+        const smoothedData = maConfig.smoothType !== 'none' ? (window.applySmoothToMA ? window.applySmoothToMA(maData, maConfig.smoothType, maConfig.smoothLength) : maData) : maData;
+        const maSeries = tvWidget.mainChart.addLineSeries({
+          color: maConfig.color,
+          lineWidth: maConfig.lineWidth || 2,
+          lineStyle: maConfig.lineStyle || 0,
+          title: `${maConfig.type}(${maConfig.length})`,
+          lastValueVisible: false,
+          priceLineVisible: false,
+          crosshairMarkerVisible: true,
+        });
+        maSeries.setData(smoothedData);
+        maConfig.data = smoothedData;
+        tvWidget.series.maSeries.push(maSeries);
+      } catch(e) {}
+    });
+  }
+
+  function addBollingerBandsToChart(candleData) {
+    if (!window.tvWidget || !tvWidget.mainChart || !candleData || candleData.length === 0) return;
+    if (!window.bollingerBands) return;
+    if (!tvWidget.series) tvWidget.series = {};
+
+    if (tvWidget.series.bbSeries && tvWidget.series.bbSeries.length > 0) {
+      tvWidget.series.bbSeries.forEach(series => { try { tvWidget.mainChart.removeSeries(series); } catch(e) {} });
+    }
+    tvWidget.series.bbSeries = [];
+
+    window.bollingerBands.forEach(bbConfig => {
+      if (!bbConfig.visible) return;
+      try {
+        const bbData = Indicators.calculateBB(candleData, bbConfig.length, bbConfig.upperMultiplier, bbConfig.lowerMultiplier, bbConfig.source);
+        const upperSeries = tvWidget.mainChart.addLineSeries({ color: bbConfig.upperColor, lineWidth: bbConfig.lineWidth || 2, lineStyle: bbConfig.lineStyle || 0, lastValueVisible: false, priceLineVisible: false, crosshairMarkerVisible: true });
+        const middleSeries = tvWidget.mainChart.addLineSeries({ color: bbConfig.middleColor, lineWidth: bbConfig.lineWidth || 2, lineStyle: bbConfig.lineStyle || 0, lastValueVisible: false, priceLineVisible: false, crosshairMarkerVisible: true });
+        const lowerSeries = tvWidget.mainChart.addLineSeries({ color: bbConfig.lowerColor, lineWidth: bbConfig.lineWidth || 2, lineStyle: bbConfig.lineStyle || 0, lastValueVisible: false, priceLineVisible: false, crosshairMarkerVisible: true });
+        upperSeries.setData(bbData.map(item => ({ time: item.time, value: item.upper })));
+        middleSeries.setData(bbData.map(item => ({ time: item.time, value: item.middle })));
+        lowerSeries.setData(bbData.map(item => ({ time: item.time, value: item.lower })));
+        bbConfig.data = bbData;
+        tvWidget.series.bbSeries.push(upperSeries, middleSeries, lowerSeries);
+      } catch(e) {}
+    });
+  }
+
+  return { addMovingAveragesToChart, addBollingerBandsToChart };
+})();
+
+
diff --git a/web/static/js/indicators.js b/web/static/js/indicators.js
new file mode 100644
index 0000000..6085042
--- /dev/null
+++ b/web/static/js/indicators.js
@@ -0,0 +1,99 @@
+// Namespace setup
+window.App = window.App || {};
+window.App.Indicators = (function() {
+  function computeEMA(arr, period) {
+    const k = 2 / (period + 1);
+    const out = [];
+    let emaPrev = null;
+    for (let i = 0; i < arr.length; i++) {
+      const price = arr[i];
+      if (price == null || !isFinite(price)) { out.push(null); continue; }
+      if (emaPrev == null) {
+        const start = Math.max(0, i - period + 1);
+        const windowArr = arr.slice(start, i + 1).filter(v => v != null && isFinite(v));
+        const sma = windowArr.length ? windowArr.reduce((a,b)=>a+b,0)/windowArr.length : price;
+        emaPrev = sma;
+      }
+      const ema = price * k + emaPrev * (1 - k);
+      out.push(ema);
+      emaPrev = ema;
+    }
+    return out;
+  }
+
+  function calculateMA(data, type, length, source) {
+    if (!data || data.length < length) return [];
+    const sourceData = data.map(candle => {
+      switch(source) {
+        case 'open': return candle.open;
+        case 'high': return candle.high;
+        case 'low': return candle.low;
+        case 'close': return candle.close;
+        case 'hl2': return (candle.high + candle.low) / 2;
+        case 'hlc3': return (candle.high + candle.low + candle.close) / 3;
+        case 'ohlc4': return (candle.open + candle.high + candle.low + candle.close) / 4;
+        default: return candle.close;
+      }
+    });
+    const result = [];
+    for (let i = length - 1; i < sourceData.length; i++) {
+      let value;
+      switch(type) {
+        case 'SMA':
+          value = sourceData.slice(i - length + 1, i + 1).reduce((sum, v) => sum + v, 0) / length;
+          break;
+        case 'EMA':
+          const multiplier = 2 / (length + 1);
+          if (result.length === 0) {
+            value = sourceData.slice(i - length + 1, i + 1).reduce((sum, v) => sum + v, 0) / length;
+          } else {
+            value = sourceData[i] * multiplier + result[result.length - 1].value * (1 - multiplier);
+          }
+          break;
+        case 'WMA':
+          let weightSum = 0;
+          let valueSum = 0;
+          for (let j = 0; j < length; j++) {
+            const weight = j + 1;
+            weightSum += weight;
+            valueSum += sourceData[i - length + 1 + j] * weight;
+          }
+          value = valueSum / weightSum;
+          break;
+        default:
+          value = sourceData[i];
+      }
+      result.push({ time: data[i].time, value });
+    }
+    return result;
+  }
+
+  function calculateBB(data, length, upperMultiplier, lowerMultiplier, source) {
+    if (!data || data.length < length) return [];
+    const sourceData = data.map(candle => {
+      switch(source) {
+        case 'open': return candle.open;
+        case 'high': return candle.high;
+        case 'low': return candle.low;
+        case 'close': return candle.close;
+        case 'hl2': return (candle.high + candle.low) / 2;
+        case 'hlc3': return (candle.high + candle.low + candle.close) / 3;
+        case 'ohlc4': return (candle.open + candle.high + candle.low + candle.close) / 4;
+        default: return candle.close;
+      }
+    });
+    const result = [];
+    for (let i = length - 1; i < sourceData.length; i++) {
+      const start = Math.max(0, i - length + 1);
+      const slice = sourceData.slice(start, i + 1);
+      const avg = slice.reduce((sum, v) => sum + v, 0) / length;
+      const std = Math.sqrt(slice.reduce((sum, v) => sum + Math.pow(v - avg, 2), 0) / length);
+      result.push({ time: data[i].time, upper: avg + upperMultiplier * std, middle: avg, lower: avg - lowerMultiplier * std });
+    }
+    return result;
+  }
+
+  return { computeEMA, calculateMA, calculateBB };
+})();
+
+
diff --git a/web/templates/index.html b/web/templates/index.html
index cc330f2..e15a743 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -13,6 +13,8 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
     <!-- TradingView Widget BEGIN -->
     <script src="https://cdn.jsdelivr.net/npm/lightweight-charts@4.0.1/dist/lightweight-charts.standalone.production.js"></script>
+    <script defer src="{{ url_for('static', filename='js/indicators.js') }}"></script>
+    <script defer src="{{ url_for('static', filename='js/charts.js') }}"></script>
     <!-- TradingView Widget END -->
     <style>
         body {
@@ -108,22 +110,7 @@
             color: white;
             border-color: #0d6efd;
         }
-        /* 特别突出显示股票筛选tab */
-        #stock-filter-tab {
-            background-color: #28a745 !important;
-            color: white !important;
-            border-color: #28a745 !important;
-            font-weight: bold !important;
-            box-shadow: 0 2px 4px rgba(40, 167, 69, 0.3) !important;
-        }
-        #stock-filter-tab:hover {
-            background-color: #218838 !important;
-            border-color: #1e7e34 !important;
-        }
-        #stock-filter-tab.active {
-            background-color: #155724 !important;
-            border-color: #155724 !important;
-        }
+        
         .table-container {
             overflow-x: auto;
         }
@@ -178,39 +165,7 @@
             --bs-gutter-y: 1rem;
         }
         
-        .point-tooltip {
-            position: absolute;
-            background: rgba(40, 40, 40, 0.9);
-            color: white;
-            padding: 8px 12px;
-            border-radius: 4px;
-            font-size: 12px;
-            z-index: 1000;
-            pointer-events: none;
-            max-width: 300px;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.2);
-            display: none;
-        }
-        
-        .buy-point {
-            color: #ff1744;
-            font-weight: bold;
-        }
-        
-        .sell-point {
-            color: #00e676;
-            font-weight: bold;
-        }
-        
-        .buy-marker {
-            background-color: #ff1744;
-            border: 2px solid white;
-        }
-        
-        .sell-marker {
-            background-color: #00e676;
-            border: 2px solid white;
-        }
+        /* 买卖点相关样式已移除 */
         
         /* 主次周期元素样式区分 */
         .main-bi {
@@ -1016,13 +971,7 @@
                     <button class="nav-link" id="macd-tab" data-bs-toggle="tab" data-bs-target="#macd" type="button" role="tab">MACD</button>
                 </li>
                 <li class="nav-item" role="presentation">
-                    <button class="nav-link" id="trade-points-tab" data-bs-toggle="tab" data-bs-target="#trade-points" type="button" role="tab">买卖点</button>
-                </li>
-                <li class="nav-item" role="presentation">
-                    <button class="nav-link" id="trend-filter-tab" data-bs-toggle="tab" data-bs-target="#trend-filter" type="button" role="tab">趋势筛选(币对)</button>
-                </li>
-                <li class="nav-item" role="presentation">
-                    <button class="nav-link" id="stock-filter-tab" data-bs-toggle="tab" data-bs-target="#stock-filter" type="button" role="tab">股票筛选</button>
+                    
                 </li>
             </ul>
             <div class="data-source-info alert alert-info py-2 mt-1 mb-2" style="display:none;">
@@ -1126,215 +1075,8 @@
                         </table>
                     </div>
                 </div>
-                <div class="tab-pane fade" id="trade-points" role="tabpanel">
-                    <div class="table-container">
-                        <table id="tradePointsTable" class="display compact" style="width:100%">
-                            <thead>
-                                <tr>
-                                    <th>时间</th>
-                                    <th>价格</th>
-                                    <th>类型</th>
-                                    <th>描述</th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
-                </div>
-                <div class="tab-pane fade" id="trend-filter" role="tabpanel">
-                    <div class="container-fluid">
-                        <div class="row g-3 mb-2">
-                            <div class="col-md-2">
-                                <label class="form-label">K线周期</label>
-                                <select id="trendTimeframe" class="form-select">
-                                    <option value="1m">1m</option>
-                                    <option value="5m">5m</option>
-                                    <option value="15m" selected>15m</option>
-                                    <option value="30m">30m</option>
-                                    <option value="1h">1h</option>
-                                    <option value="4h">4h</option>
-                                    <option value="1d">1d</option>
-                                </select>
-                            </div>
-                            <div class="col-md-2">
-                                <label class="form-label">方向</label>
-                                <select id="trendDirection" class="form-select">
-                                    <option value="">全部</option>
-                                    <option value="bull">多头</option>
-                                    <option value="bear">空头</option>
-                                    <option value="sideways">盘整</option>
-                                </select>
-                            </div>
-                            <div class="col-md-2">
-                                <label class="form-label">阶段</label>
-                                <select id="trendStage" class="form-select">
-                                    <option value="">全部</option>
-                                    <option value="early">初期</option>
-                                    <option value="mid">中期</option>
-                                    <option value="late">末期</option>
-                                </select>
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label">强度 (0-100)</label>
-                                <div class="d-flex align-items-center">
-                                    <input type="range" id="trendMinStrength" class="form-range me-2" min="0" max="100" value="30">
-                                    <input type="number" id="trendMinStrengthNum" class="form-control" style="width:90px" min="0" max="100" value="30">
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label">自选币对(逗号分隔)</label>
-                                <input id="trendSymbols" class="form-control" placeholder="例如: BTC/USDT:USDT,ETH/USDT:USDT，可留空">
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label">开始时间</label>
-                                <input type="datetime-local" id="trendStart" class="form-control">
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label">结束时间</label>
-                                <input type="datetime-local" id="trendEnd" class="form-control">
-                            </div>
-                            <div class="col-md-2 d-flex align-items-end">
-                                <button class="btn btn-primary w-100" id="btnTrendFilter">开始筛选</button>
-                            </div>
-                        </div>
-
-                        <div class="table-container mb-3">
-                            <div id="trendFilterStatus" class="alert alert-info py-2" style="display:none;">
-                                <span class="loading-spinner"></span>
-                                <span class="ms-2">正在筛选，请稍候...</span>
-                            </div>
-                            <table id="trendFilterTable" class="display compact" style="width:100%">
-                                <thead>
-                                    <tr>
-                                        <th>交易对</th>
-                                        <th>时间</th>
-                                        <th>方向</th>
-                                        <th>阶段</th>
-                                        <th>强度</th>
-                                        <th>收盘</th>
-                                        <th>EMA5</th>
-                                        <th>EMA10</th>
-                                        <th>EMA24</th>
-                                        <th>EMA52</th>
-                                        <th>操作</th>
-                                    </tr>
-                                </thead>
-                                <tbody></tbody>
-                            </table>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        趋势详情
-                                        <span id="trendDetailStatus" class="text-muted ms-3" style="display:none;">
-                                            <span class="loading-spinner"></span>
-                                            <span class="ms-2">正在加载详情...</span>
-                                        </span>
-                                    </div>
-                                    <div class="card-body">
-                                        <div id="trendChartContainer" style="height:420px;"></div>
-                                        <div class="table-container mt-3">
-                                            <table id="trendDetailTable" class="display compact" style="width:100%">
-                                                <thead>
-                                                    <tr>
-                                                        <th>时间</th>
-                                                        <th>开</th>
-                                                        <th>高</th>
-                                                        <th>低</th>
-                                                        <th>收</th>
-                                                        <th>成交量</th>
-                                                        <th>EMA5</th>
-                                                        <th>EMA10</th>
-                                                        <th>EMA24</th>
-                                                        <th>EMA52</th>
-                                                    </tr>
-                                                </thead>
-                                                <tbody></tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="tab-pane fade" id="stock-filter" role="tabpanel">
-                    <div class="container-fluid">
-                        <div class="row mb-3">
-                            <div class="col-md-12">
-                                <h5>A股强分型筛选</h5>
-                                <p class="text-muted">筛选最近2个K线合并(KLC)中有一个满足分型强度≥1.0且分型类型不为UNKNOWN的A股股票</p>
-                            </div>
-                        </div>
-                        
-                        <div class="row mb-3">
-                            <div class="col-md-3">
-                                <label for="filterStartTime" class="form-label">开始时间:</label>
-                                <input type="datetime-local" id="filterStartTime" class="form-control">
-                            </div>
-                            <div class="col-md-3">
-                                <label for="filterEndTime" class="form-label">结束时间:</label>
-                                <input type="datetime-local" id="filterEndTime" class="form-control">
-                            </div>
-                            <div class="col-md-3">
-                                <label for="filterTimeframe" class="form-label">时间周期:</label>
-                                <select id="filterTimeframe" class="form-select">
-                                    <option value="5m">5分钟</option>
-                                    <option value="15m">15分钟</option>
-                                    <option value="30m">30分钟</option>
-                                    <option value="1h">1小时</option>
-                                    <option value="4h">4小时</option>
-                                    <option value="1d" selected>1日</option>
-                                    <option value="1w">1周</option>
-                                    <option value="1M">1月</option>
-                                </select>
-                            </div>
-                            <div class="col-md-3">
-                                <label for="fxStrengthThreshold" class="form-label">分型强度阈值:</label>
-                                <input type="number" id="fxStrengthThreshold" class="form-control" value="1.0" min="0" max="100" step="0.1">
-                            </div>
-                        </div>
-                        
-                        <div class="row mb-3">
-                            <div class="col-md-12">
-                                <button class="btn btn-primary" onclick="filterStocks()">
-                                    <i class="bi bi-search"></i> 开始筛选
-                                </button>
-                                <button class="btn btn-secondary ms-2" onclick="exportFilterResults()">
-                                    <i class="bi bi-download"></i> 导出结果
-                                </button>
-                                <span id="filterProgress" class="ms-3" style="display:none;">
-                                    <i class="bi bi-hourglass-split"></i> 正在筛选中...
-                                </span>
-                            </div>
-                        </div>
-                        
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-container">
-                                    <table id="stockFilterTable" class="display compact" style="width:100%">
-                                        <thead>
-                                            <tr>
-                                                <th>股票代码</th>
-                                                <th>股票名称</th>
-                                                <th>分型时间</th>
-                                                <th>分型类型</th>
-                                                <th>分型强度</th>
-                                                <th>分型价格</th>
-                                                <th>当前价格</th>
-                                                <th>涨跌幅(%)</th>
-                                                <th>操作</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody></tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                
+                
             </div>
         </div>
     </div>
@@ -1342,6 +1084,11 @@
     <script>
         let currentData = null;
         let lastRequestId = 0; // 防止过期响应覆盖新数据
+        const FEATURES = {
+            trendFilter: false,   // 趋势筛选/趋势小图等
+            dataReplay: false,    // 数据回放功能
+            legacyMacd: false     // 旧MACD（已弃用）
+        };
         const tables = {};
         // ======= 趋势筛选(币对) =======
         let trendTable = null;
@@ -1393,6 +1140,7 @@
         let trendChart = null;
 
         function initTrendTables() {
+            if (!FEATURES.trendFilter) return; // 未启用则跳过初始化
             if (!trendTable) {
                 trendTable = $('#trendFilterTable').DataTable({
                     paging: true,
@@ -1444,6 +1192,7 @@
         }
 
         async function runTrendFilter() {
+            if (!FEATURES.trendFilter) return; // 未启用则早退
             initTrendTables();
             trendTable.clear().draw();
 
@@ -1628,25 +1377,12 @@
         }
 
         // ===== 前端精细化阶段判定 =====
-        function computeEMA(arr, period) {
-            const k = 2 / (period + 1);
-            const out = [];
-            let emaPrev = null;
-            for (let i = 0; i < arr.length; i++) {
-                const price = arr[i];
-                if (price == null || !isFinite(price)) { out.push(null); continue; }
-                if (emaPrev == null) {
-                    // 取首个可用SMA种子
-                    const start = Math.max(0, i - period + 1);
-                    const window = arr.slice(start, i + 1).filter(v => v != null && isFinite(v));
-                    const sma = window.length ? window.reduce((a,b)=>a+b,0)/window.length : price;
-                    emaPrev = sma;
-                }
-                const ema = price * k + emaPrev * (1 - k);
-                out.push(ema);
-                emaPrev = ema;
+        function computeEMA() {
+            if (window.App && window.App.Indicators && typeof window.App.Indicators.computeEMA === 'function') {
+                return window.App.Indicators.computeEMA.apply(null, arguments);
             }
-            return out;
+            console.warn('computeEMA 未就绪，返回空数组');
+            return [];
         }
 
         function computeMACDSeries(close) {
@@ -1758,7 +1494,7 @@
             initTrendTables();
             bindTrendControls();
         });
-        let tvWidget = {
+        var tvWidget = {
             mainChart: null,
             volumeChart: null,
             macdChart: null,
@@ -1779,7 +1515,6 @@
                 elementSegSeries: [],
                 elementZsSeries: [],
                 elementUncompletedZsSeries: [],
-                tradePointSeries: [],
                 mainBollingerSeries: [],
                 elementBollingerSeries: [],
                 maSeries: [],  // 添加均线系列
@@ -1799,6 +1534,9 @@
             }
         };
         
+        // 默认EMA初始化哨兵，防止删除后再次被自动添加
+        var hasInitializedDefaultMAs = false;
+        
         // 买卖点类型定义
         const TRADE_POINT_TYPE = {
             BUY1: 1,   // 一类买点
@@ -1996,6 +1734,14 @@
             updateChartDisplay();
         });
         
+        // 添加趋势显示复选框变更事件（主/元素），变更后刷新主图
+        $('#showMainTrend').change(function() {
+            updateChartDisplay();
+        });
+        $('#showElementTrend').change(function() {
+            updateChartDisplay();
+        });
+        
         // 添加买卖点复选框变更事件
         $('#showElementBi').change(function() {
             updateChartDisplay();
@@ -2016,14 +1762,9 @@
             updateChartDisplay();
         });
         
-        // 添加买卖点复选框变更事件
-        $('#showTradePoints').change(function() {
-            refreshChart(currentData);
-        });
+        // 买卖点复选框已移除
         
-        // Trend 显示开关
-        $('#showMainTrend').change(function() { refreshChartOnly(); });
-        $('#showElementTrend').change(function() { refreshChartOnly(); });
+        // 趋势开关已移除
         
         // 添加K线周期切换事件监听器
         $('input[name="klinePeriod"]').change(function() {
@@ -2848,8 +2589,8 @@
                 atrLineSeries.setData(atrData);
                 tvWidget.series.atrLineSeries = atrLineSeries;
                 
-                // 旧 MACD 图已移除，不再绘制
-                if (false && showMacd && currentData.macd && currentData.kline_data && Array.isArray(currentData.kline_data)) {
+                // 旧 MACD 图已移除，不再绘制（保留占位但彻底禁用）
+                if (FEATURES.legacyMacd && showMacd && currentData.macd && currentData.kline_data && Array.isArray(currentData.kline_data)) {
                     // 创建MACD线
                     const macdLineSeries = macdChart.addLineSeries({
                         color: '#2962FF',
@@ -5785,7 +5526,7 @@
                 };
                 
                 // 初始化默认EMA配置（仅在首次初始化时）
-                if (movingAverages.length === 0) {
+                if (!hasInitializedDefaultMAs && movingAverages.length === 0) {
                     console.log('初始化默认EMA指标');
                     
                     // 添加默认EMA配置
@@ -5815,6 +5556,7 @@
                     });
                     
                     console.log('默认EMA配置完成，共添加', movingAverages.length, '个指标');
+                    hasInitializedDefaultMAs = true;
                 }
                 
                 // 添加均线到图表
@@ -7368,11 +7110,7 @@
                 const now = new Date();
                 const weekAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000);
                 
-                $('#filterEndTime').val(now.toISOString().slice(0, 16));
-                $('#filterStartTime').val(weekAgo.toISOString().slice(0, 16));
-                
-                // 初始化股票筛选表格
-                initStockFilterTable();
+            
                 
                 // 添加页面滚动事件监听器，清除十字线延长线
                 $(window).on('scroll', function() {
@@ -7391,36 +7129,7 @@
                     }
                 });
                 
-                // 突出显示股票筛选tab (已禁用)
-                setTimeout(function() {
-                    const stockFilterTab = $('#stock-filter-tab');
-                    if (false && stockFilterTab.length > 0) {
-                        console.log('股票筛选tab已找到，开始突出显示');
-                        
-                        // 添加闪烁效果来吸引注意
-                        stockFilterTab.addClass('animate__animated animate__pulse');
-                        
-                        // 滚动到tab区域
-                        $('html, body').animate({
-                            scrollTop: $('.data-container').offset().top - 100
-                        }, 1000);
-                        
-                        // 添加提示信息
-                        const alertDiv = $(`
-                            <div class="alert alert-info alert-dismissible fade show" role="alert" style="position: fixed; top: 20px; right: 20px; z-index: 9999; max-width: 400px;">
-                                
-                                <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-                            </div>
-                        `);
-                        $('body').append(alertDiv);
-                        
-                        // 10秒后自动隐藏提示
-                        setTimeout(() => {
-                            alertDiv.alert('close');
-                        }, 10000);
-                    }
-                    // 已禁用突出显示功能，无需错误日志
-                }, 2000);
+                
             });
         });
         // 自动刷新相关变量
@@ -7882,630 +7591,6 @@
             return new bootstrap.Tooltip(tooltipTriggerEl)
         })
         
-        // 数据回放相关变量
-        let replayTimer = null;
-        let replayData = null;
-        let replayStepData = null;  // 存储逐步计算的回放数据
-        let currentReplayIndex = 0;
-        let totalReplaySteps = 0;
-        let isReplaying = false;
-        let replayStartTime = null;
-        let replayEndTime = null;
-        
-        // 数据回放功能初始化
-        $(document).ready(function() {
-            // 开始回放按钮
-            $('#startReplay').click(function() {
-                startDataReplay();
-            });
-            
-            // 暂停回放按钮
-            $('#pauseReplay').click(function() {
-                pauseDataReplay();
-            });
-            
-            // 停止回放按钮
-            $('#stopReplay').click(function() {
-                stopDataReplay();
-            });
-        });
-        
-        // 开始数据回放
-        function startDataReplay() {
-            // 如果自动刷新开启，需要先关闭
-            if ($('#autoRefresh').is(':checked')) {
-                $('#autoRefresh').prop('checked', false).change();
-            }
-            
-            // 检查是否设置了时间范围
-            if (!$('#start_time').val() || !$('#end_time').val()) {
-                alert('请先设置开始时间和结束时间');
-                return;
-            }
-            
-            // 如果已经在回放中，且是暂停状态，则继续回放
-            if (isReplaying && replayTimer === null) {
-                continueDataReplay();
-                return;
-            }
-            
-            // 停止任何现有的回放
-            stopDataReplay();
-            
-            // 获取回放参数
-            replayStartTime = new Date($('#start_time').val()).getTime();
-            replayEndTime = new Date($('#end_time').val()).getTime();
-            
-            // 检查时间范围是否有效
-            if (replayStartTime >= replayEndTime) {
-                alert('开始时间必须早于结束时间');
-                return;
-            }
-            
-            // 获取当前参数
-            const symbol = $('#symbol').val() || 'BTC/USDT:USDT';
-            const timeframe = $('#timeframe').val() || '5m';
-            const timezone = $('#timezone').val() || 'Asia/Shanghai';
-            const elementTimeframe = $('#elementTimeframe').val() || '1m';
-            
-            // 显示回放状态
-            $('#replayStatus').text('正在加载数据...');
-            $('#replayProgress').show();
-            $('.progress-bar').css('width', '0%');
-            
-            // 切换按钮状态
-            $('#startReplay').hide();
-            $('#stopReplay').show();
-            
-            // 尝试使用当前已有数据
-            if (currentData && currentData.kline_data && currentData.kline_data.length > 0) {
-                const currentStart = new Date(currentData.kline_data[0].date).getTime();
-                const currentEnd = new Date(currentData.kline_data[currentData.kline_data.length - 1].date).getTime();
-                
-                // 检查当前数据是否覆盖所需的时间范围
-                if (currentStart <= replayStartTime && currentEnd >= replayEndTime) {
-                    console.log('使用当前数据进行回放，无需重新请求');
-                    replayData = currentData;
-                    initReplay();
-                    return;
-                }
-            }
-            
-            // 请求整个时间范围的数据，包含回放数据
-            $.ajax({
-                url: '/api/analyze',
-                data: {
-                    symbol: symbol,
-                    timeframe: timeframe,
-                    timezone: timezone,
-                    element_timeframe: elementTimeframe,
-                    start_time: replayStartTime,
-                    end_time: replayEndTime,
-                    elements_only: false,
-                    need_replay_data: true  // 请求逐步计算的回放数据
-                },
-                success: function(data) {
-                    // 检查是否有有效数据
-                    if (!data || !data.kline_data || data.kline_data.length === 0) {
-                        $('#replayStatus').text('服务器返回的数据无效');
-                        $('#replayProgress').hide();
-                        $('#startReplay').show();
-                        $('#stopReplay').hide();
-                        console.error('服务器返回的数据无效:', data);
-                        return;
-                    }
-                    
-                    // 保存完整数据
-                    replayData = data;
-                    
-                    // 初始化回放
-                    initReplay();
-                },
-                error: function(jqXHR, textStatus, errorThrown) {
-                    $('#replayStatus').text('加载数据失败');
-                    $('#replayProgress').hide();
-                    $('#startReplay').show();
-                    $('#stopReplay').hide();
-                    alert('加载数据失败: ' + (jqXHR.responseJSON?.error || errorThrown));
-                }
-            });
-        }
-        // 初始化回放
-        function initReplay() {
-            // 检查是否有新的回放数据结构
-            if (replayData && replayData.replay_data) {
-                console.log('使用新的逐步计算回放数据');
-                replayStepData = replayData.replay_data;  // 存储逐步计算的数据
-                totalReplaySteps = Object.keys(replayStepData).length;
-                
-                if (totalReplaySteps === 0) {
-                    $('#replayStatus').text('没有可回放的数据');
-                    $('#replayProgress').hide();
-                    $('#startReplay').show();
-                    $('#stopReplay').hide();
-                    return;
-                }
-            } else if (replayData && replayData.kline_data && replayData.kline_data.length > 0) {
-                console.log('使用传统回放数据结构');
-                replayStepData = null;  // 标记使用传统方式
-                totalReplaySteps = replayData.kline_data.length;
-            } else {
-                $('#replayStatus').text('没有可回放的数据');
-                $('#replayProgress').hide();
-                $('#startReplay').show();
-                $('#stopReplay').hide();
-                return;
-            }
-            
-            // 设置回放变量
-            isReplaying = true;
-            currentReplayIndex = 0;
-            
-            // 更新回放状态
-            $('#replayStatus').text(`准备回放 (0/${totalReplaySteps})`);
-            $('.progress-bar').css('width', '0%');
-            
-            // 准备初始数据
-            prepareInitialReplayData();
-            
-            // 开始回放
-            continueDataReplay();
-        }
-        
-        // 准备初始回放数据
-        function prepareInitialReplayData() {
-            let initialData;
-            
-            // 检查是否使用新的逐步计算回放数据
-            if (replayStepData) {
-                // 使用第一步的数据作为初始数据
-                initialData = $.extend(true, {}, replayStepData[0]);
-                console.log('使用逐步计算的初始数据');
-            } else {
-                // 使用传统方式，创建初始数据集，只包含第一根K线
-                initialData = $.extend(true, {}, replayData);
-                
-                // 确保第一根K线数据有效
-                if (!replayData.kline_data || replayData.kline_data.length === 0) {
-                    console.error('无有效K线数据用于回放');
-                    $('#replayStatus').text('无有效数据用于回放');
-                    $('#replayProgress').hide();
-                    return;
-                }
-                
-                // 传统方式的数据清空逻辑
-                initialData.kline_data = [replayData.kline_data[0]];
-                
-                // 确保初始K线数据的所有字段都有值
-                const firstKline = initialData.kline_data[0];
-                if (firstKline) {
-                    // 确保K线数据的每个字段都是有效的数值
-                    ['open', 'high', 'low', 'close', 'volume'].forEach(field => {
-                        if (firstKline[field] === null || firstKline[field] === undefined || isNaN(firstKline[field])) {
-                            console.warn(`K线数据的${field}字段无效，设置为默认值`);
-                            firstKline[field] = field === 'volume' ? 0 : firstKline.close || 0;
-                        }
-                    });
-                }
-                
-                // 清空其他数据列表，因为还没有处理
-                initialData.bi_list = [];
-                initialData.seg_list = [];
-                initialData.zs_list = [];
-                initialData.uncompleted_zs_list = [];
-                initialData.element_bi_list = [];
-                initialData.element_seg_list = [];
-                initialData.element_zs_list = [];
-                initialData.element_uncompleted_zs_list = [];
-                initialData.trade_points = [];
-                initialData.element_trade_points = [];
-                initialData.macd_divergence = [];
-                initialData.klc_fx_type = [];
-                // 清空分型相关数据
-                initialData.klc_fx_info = [];
-                initialData.klu_fx_info = [];
-                initialData.element_klc_fx_info = [];
-                initialData.element_klu_fx_info = [];
-                
-                // 初始化MACD数据
-                if (initialData.macd && typeof initialData.macd === 'object') {
-                    // MACD数据是对象结构 {macd: [], signal: [], histogram: []}
-                    if (initialData.macd.macd && initialData.macd.macd.length > 0) {
-                        initialData.macd = {
-                            macd: [initialData.macd.macd[0] || 0],
-                            signal: [initialData.macd.signal[0] || 0],
-                            histogram: [initialData.macd.histogram[0] || 0]
-                        };
-                    } else {
-                        // 如果没有MACD数据，创建默认值
-                        initialData.macd = {
-                            macd: [0],
-                            signal: [0],
-                            histogram: [0]
-                        };
-                    }
-                } else {
-                    // 如果MACD数据结构不正确，创建默认值
-                    initialData.macd = {
-                        macd: [0],
-                        signal: [0],
-                        histogram: [0]
-                    };
-                }
-                
-                console.log('使用传统方式生成初始数据');
-            }
-            
-
-            
-            // 更新图表，固定坐标轴范围
-            currentData = initialData;
-            
-            // 清除当前图表
-            if (tvWidget.state.isInitialized) {
-                // 保存当前的图表可见范围以供后续使用
-                try {
-                    tvWidget.state.visibleRange = tvWidget.mainChart.timeScale().getVisibleRange();
-                    tvWidget.state.logicalRange = tvWidget.mainChart.timeScale().getVisibleLogicalRange();
-                } catch (e) {
-                    console.error('保存图表范围失败', e);
-                }
-            }
-            
-            // 输出调试信息，确认数据已正确清空
-            console.log('回放初始化完成，数据统计:');
-            console.log('K线数据:', initialData.kline_data ? initialData.kline_data.length : 0, '条');
-            console.log('笔数据:', initialData.bi_list ? initialData.bi_list.length : 0, '条');
-            console.log('线段数据:', initialData.seg_list ? initialData.seg_list.length : 0, '条');
-            console.log('中枢数据:', initialData.zs_list ? initialData.zs_list.length : 0, '条');
-            console.log('KLC分型数据:', initialData.klc_fx_info ? initialData.klc_fx_info.length : 0, '条');
-            console.log('KLU分型数据:', initialData.klu_fx_info ? initialData.klu_fx_info.length : 0, '条');
-            console.log('买卖点数据:', initialData.trade_points ? initialData.trade_points.length : 0, '条');
-            
-            // 刷新图表
-            refreshChart(initialData);
-            
-            // 固定y轴范围
-            fixYAxisRange();
-        }
-        
-        // 固定y轴范围，保持图表不因数据变化而变化
-        function fixYAxisRange() {
-            if (!tvWidget.mainChart) return;
-            
-            // 获取全部数据的最高价和最低价，为了适当的范围
-            let minPrice = Infinity;
-            let maxPrice = -Infinity;
-            
-            // 计算整个数据集的价格范围
-            replayData.kline_data.forEach(kline => {
-                const high = parseFloat(kline.high);
-                const low = parseFloat(kline.low);
-                
-                if (high > maxPrice) maxPrice = high;
-                if (low < minPrice) minPrice = low;
-            });
-            
-            // 添加一些边距（约5%）
-            const priceRange = maxPrice - minPrice;
-            maxPrice += priceRange * 0.05;
-            minPrice -= priceRange * 0.05;
-            
-            // 修复: 使用正确的API设置固定价格范围
-            try {
-                // 禁用自动缩放
-                tvWidget.mainChart.priceScale().applyOptions({
-                    autoScale: false,
-                    scaleMargins: {
-                        top: 0.1,
-                        bottom: 0.2
-                    },
-                    // 直接在options中设置最小和最大值
-                    minimumValue: minPrice,
-                    maximumValue: maxPrice
-                });
-            } catch (e) {
-                console.error('设置Y轴范围失败:', e);
-            }
-        }
-        
-        // 继续回放
-        function continueDataReplay() {
-            if (!isReplaying || !replayData) return;
-            
-            // 获取回放速度
-            const interval = parseFloat($('#replayInterval').val()) * 1000 || 1000;
-            
-            // 切换按钮状态
-            $('#startReplay').hide();
-            $('#pauseReplay').show();
-            $('#stopReplay').show();
-            
-            // 开始回放定时器
-            replayTimer = setInterval(replayNextStep, interval);
-        }
-        // 回放下一步
-        function replayNextStep() {
-            if (!isReplaying || currentReplayIndex >= totalReplaySteps) {
-                stopDataReplay();
-                return;
-            }
-            
-            // 更新回放状态
-            currentReplayIndex++;
-            updateReplayStatus();
-            
-            let subsetData;
-            
-            // 检查是否使用新的逐步计算数据
-            if (replayStepData) {
-                // 直接使用预计算的数据
-                subsetData = $.extend(true, {}, replayStepData[currentReplayIndex - 1]);
-                console.log(`回放步骤 ${currentReplayIndex}/${totalReplaySteps} (使用预计算数据)`);
-            } else {
-                // 使用传统方式创建数据子集
-                subsetData = createDataSubset(currentReplayIndex);
-                console.log(`回放步骤 ${currentReplayIndex}/${totalReplaySteps} (传统方式)`);
-            }
-            
-            // 输出回放进度调试信息
-            if (currentReplayIndex % 10 === 0 || currentReplayIndex <= 5) { // 每10步输出一次，或前5步
-                console.log('K线数据:', subsetData.kline_data ? subsetData.kline_data.length : 0, '条');
-                console.log('笔数据:', subsetData.bi_list ? subsetData.bi_list.length : 0, '条');
-                console.log('KLC分型:', subsetData.klc_fx_info ? subsetData.klc_fx_info.length : 0, '条');
-                console.log('KLU分型:', subsetData.klu_fx_info ? subsetData.klu_fx_info.length : 0, '条');
-            }
-            
-            // 更新图表
-            currentData = subsetData;
-            refreshChart(subsetData);
-            
-            // 固定Y轴范围
-            if (!replayStepData) {  // 只有传统方式需要固定Y轴
-                fixYAxisRange();
-            }
-            
-            // 保持最新数据可见
-            keepLatestDataVisible();
-            
-            // 如果到达最后一步，停止回放
-            if (currentReplayIndex >= totalReplaySteps) {
-                $('#replayStatus').text('回放完成');
-                pauseDataReplay();
-            }
-        }
-        
-        // 保持最新数据可见
-        function keepLatestDataVisible() {
-            if (!tvWidget.mainChart) return;
-            
-            try {
-                // 获取当前数据的最后一个时间点
-                if (currentData && currentData.kline_data && currentData.kline_data.length > 0) {
-                    const lastBar = currentData.kline_data[currentData.kline_data.length - 1];
-                    const lastTime = Math.floor(new Date(lastBar.date).getTime() / 1000);
-                    
-                    // 计算时间范围
-                    const barCount = Math.min(50, currentData.kline_data.length); // 显示最近的50根K线或所有K线
-                    const firstVisibleIndex = Math.max(0, currentData.kline_data.length - barCount);
-                    const firstVisibleBar = currentData.kline_data[firstVisibleIndex];
-                    const firstTime = Math.floor(new Date(firstVisibleBar.date).getTime() / 1000);
-                    
-                    // 设置时间轴范围
-                    tvWidget.mainChart.timeScale().setVisibleRange({
-                        from: firstTime,
-                        to: lastTime
-                    });
-                }
-            } catch (e) {
-                console.error('保持最新数据可见失败:', e);
-            }
-        }
-        
-        // 创建数据子集
-        function createDataSubset(endIndex) {
-            // 创建数据副本
-            const subsetData = $.extend(true, {}, replayData);
-            
-            // 截取K线数据
-            subsetData.kline_data = replayData.kline_data.slice(0, endIndex);
-            
-            // 验证K线数据
-            subsetData.kline_data.forEach((kline, index) => {
-                ['open', 'high', 'low', 'close', 'volume'].forEach(field => {
-                    if (kline[field] === null || kline[field] === undefined || isNaN(kline[field])) {
-                        console.warn(`K线数据[${index}]的${field}字段无效，使用替代值`);
-                        // 对于价格字段，尝试使用其他价格字段，或者前一个K线的对应值
-                        if (field !== 'volume') {
-                            if (field === 'open' && kline.close !== null && !isNaN(kline.close)) {
-                                kline[field] = kline.close;
-                            } else if (index > 0) {
-                                kline[field] = subsetData.kline_data[index-1][field] || 0;
-                            } else {
-                                kline[field] = 0;
-                            }
-                        } else {
-                            kline[field] = 0; // 对于成交量，设为0
-                        }
-                    }
-                });
-            });
-            
-            // 处理其他数据结构（笔、线段、中枢等）
-            // 我们需要根据当前K线的时间来过滤其他数据结构
-            try {
-                const currentEndTime = new Date(subsetData.kline_data[endIndex - 1].date).getTime();
-                
-                // 过滤笔列表
-                if (subsetData.bi_list && subsetData.bi_list.length) {
-                    subsetData.bi_list = filterDataByTime(replayData.bi_list, currentEndTime);
-                }
-                
-                // 过滤线段列表
-                if (subsetData.seg_list && subsetData.seg_list.length) {
-                    subsetData.seg_list = filterDataByTime(replayData.seg_list, currentEndTime);
-                }
-                
-                // 过滤中枢列表
-                if (subsetData.zs_list && subsetData.zs_list.length) {
-                    subsetData.zs_list = filterDataByTime(replayData.zs_list, currentEndTime);
-                }
-                
-                // 过滤未完成中枢列表
-                if (subsetData.uncompleted_zs_list && subsetData.uncompleted_zs_list.length) {
-                    subsetData.uncompleted_zs_list = filterDataByTime(replayData.uncompleted_zs_list, currentEndTime);
-                }
-                
-                // 过滤小周期数据
-                if (subsetData.element_bi_list && subsetData.element_bi_list.length) {
-                    subsetData.element_bi_list = filterDataByTime(replayData.element_bi_list, currentEndTime);
-                }
-                
-                if (subsetData.element_seg_list && subsetData.element_seg_list.length) {
-                    subsetData.element_seg_list = filterDataByTime(replayData.element_seg_list, currentEndTime);
-                }
-                
-                if (subsetData.element_zs_list && subsetData.element_zs_list.length) {
-                    subsetData.element_zs_list = filterDataByTime(replayData.element_zs_list, currentEndTime);
-                }
-                
-                if (subsetData.element_uncompleted_zs_list && subsetData.element_uncompleted_zs_list.length) {
-                    subsetData.element_uncompleted_zs_list = filterDataByTime(replayData.element_uncompleted_zs_list, currentEndTime);
-                }
-                
-                // 过滤MACD数据
-                if (subsetData.macd && typeof subsetData.macd === 'object') {
-                    if (replayData.macd.macd && replayData.macd.macd.length > 0) {
-                        subsetData.macd = {
-                            macd: replayData.macd.macd.slice(0, endIndex),
-                            signal: replayData.macd.signal.slice(0, endIndex),
-                            histogram: replayData.macd.histogram.slice(0, endIndex)
-                        };
-                        
-                        // 验证MACD数据
-                        ['macd', 'signal', 'histogram'].forEach(field => {
-                            subsetData.macd[field].forEach((value, index) => {
-                                if (value === null || value === undefined || isNaN(value)) {
-                                    console.warn(`MACD ${field}[${index}]数据无效，设置为0`);
-                                    subsetData.macd[field][index] = 0;
-                                }
-                            });
-                        });
-                    } else {
-                        // 如果没有有效的MACD数据，创建默认数组
-                        subsetData.macd = {
-                            macd: new Array(endIndex).fill(0),
-                            signal: new Array(endIndex).fill(0),
-                            histogram: new Array(endIndex).fill(0)
-                        };
-                    }
-                }
-                
-                // 过滤MACD背离
-                if (subsetData.macd_divergence && subsetData.macd_divergence.length) {
-                    subsetData.macd_divergence = filterDataByTime(replayData.macd_divergence, currentEndTime);
-                }
-                
-                // 过滤分型类型
-                if (subsetData.klc_fx_type && subsetData.klc_fx_type.length) {
-                    subsetData.klc_fx_type = filterDataByTime(replayData.klc_fx_type, currentEndTime, 'time');
-                }
-                
-                // 过滤分型信息数据
-                if (subsetData.klc_fx_info && subsetData.klc_fx_info.length) {
-                    subsetData.klc_fx_info = filterDataByTime(replayData.klc_fx_info, currentEndTime, 'time');
-                }
-                
-                if (subsetData.klu_fx_info && subsetData.klu_fx_info.length) {
-                    subsetData.klu_fx_info = filterDataByTime(replayData.klu_fx_info, currentEndTime, 'time');
-                }
-                
-                if (subsetData.element_klc_fx_info && subsetData.element_klc_fx_info.length) {
-                    subsetData.element_klc_fx_info = filterDataByTime(replayData.element_klc_fx_info, currentEndTime, 'time');
-                }
-                
-                if (subsetData.element_klu_fx_info && subsetData.element_klu_fx_info.length) {
-                    subsetData.element_klu_fx_info = filterDataByTime(replayData.element_klu_fx_info, currentEndTime, 'time');
-                }
-                
-                // 过滤买卖点数据
-                if (subsetData.trade_points && subsetData.trade_points.length) {
-                    subsetData.trade_points = filterDataByTime(replayData.trade_points, currentEndTime, 'time');
-                }
-                
-                if (subsetData.element_trade_points && subsetData.element_trade_points.length) {
-                    subsetData.element_trade_points = filterDataByTime(replayData.element_trade_points, currentEndTime, 'time');
-                }
-            } catch (e) {
-                console.error('过滤数据时出错:', e);
-            }
-            
-            return subsetData;
-        }
-        
-        // 根据时间过滤数据
-        function filterDataByTime(dataList, endTime, timeField = 'end_time') {
-            if (!dataList || !Array.isArray(dataList)) return [];
-            
-            return dataList.filter(item => {
-                const itemTime = new Date(item[timeField]).getTime();
-                return itemTime <= endTime;
-            });
-        }
-        
-        // 更新回放状态显示
-        function updateReplayStatus() {
-            const percent = Math.floor((currentReplayIndex / totalReplaySteps) * 100);
-            $('#replayStatus').text(`回放中 (${currentReplayIndex}/${totalReplaySteps})`);
-            $('.progress-bar').css('width', `${percent}%`);
-        }
-        
-        // 暂停回放
-        function pauseDataReplay() {
-            if (replayTimer) {
-                clearInterval(replayTimer);
-                replayTimer = null;
-            }
-            
-            // 切换按钮状态
-            $('#pauseReplay').hide();
-            $('#startReplay').show();
-            
-            if (currentReplayIndex >= totalReplaySteps) {
-                $('#replayStatus').text('回放完成');
-            } else {
-                $('#replayStatus').text(`已暂停 (${currentReplayIndex}/${totalReplaySteps})`);
-            }
-        }
-        
-        // 停止回放
-        function stopDataReplay() {
-            // 清除定时器
-            if (replayTimer) {
-                clearInterval(replayTimer);
-                replayTimer = null;
-            }
-            
-            // 重置回放状态
-            isReplaying = false;
-            currentReplayIndex = 0;
-            replayData = null;
-            replayStepData = null;  // 清理逐步计算数据
-            
-            // 更新UI
-            $('#replayStatus').text('');
-            $('#replayProgress').hide();
-            $('#pauseReplay').hide();
-            $('#stopReplay').hide();
-            $('#startReplay').show();
-            
-            // 恢复图表自动缩放
-            if (tvWidget.mainChart) {
-                tvWidget.mainChart.priceScale().applyOptions({
-                    autoScale: true
-                });
-            }
-        }
         
         // 获取A股股票列表
         function loadAStockSymbols() {
@@ -8681,180 +7766,15 @@
             console.log('A股交易时间状态更新器已启动');
         }
         
-        // 股票筛选相关函数
-        let stockFilterTable = null;
         
-        // 初始化股票筛选表格
-        function initStockFilterTable() {
-            // 简单的表格初始化，不使用DataTable
-            console.log('初始化股票筛选表格');
-        }
-        
-        // 筛选股票
-        function filterStocks() {
-            const startTime = $('#filterStartTime').val();
-            const endTime = $('#filterEndTime').val();
-            const timeframe = $('#filterTimeframe').val();
-            const threshold = parseFloat($('#fxStrengthThreshold').val());
-            
-            if (!startTime || !endTime) {
-                alert('请选择开始时间和结束时间');
-                return;
-            }
-            
-            if (new Date(startTime) >= new Date(endTime)) {
-                alert('开始时间必须早于结束时间');
-                return;
-            }
-            
-            // 显示进度指示器
-            $('#filterProgress').show();
-            $('#stockFilterTable tbody').empty();
-            
-            // 发送筛选请求
-            $.ajax({
-                url: '/api/filter_stocks',
-                method: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify({
-                    start_time: startTime,
-                    end_time: endTime,
-                    timeframe: timeframe,
-                    fx_strength_threshold: threshold
-                }),
-                timeout: 300000, // 5分钟超时
-                success: function(response) {
-                    $('#filterProgress').hide();
-                    
-                    if (response.error) {
-                        // 根据错误类型显示不同的错误信息
-                        if (response.error_type === 'network_error') {
-                            showNetworkErrorAlert(response.error, response.suggestion);
-                        } else {
-                            alert('筛选失败: ' + response.error);
-                        }
-                        return;
-                    }
-                    
-                    // 更新表格数据
-                    updateStockFilterTable(response.results);
-                    
-                    // 显示统计信息
-                    const totalCount = response.results.length;
-                    const processedCount = response.total_processed || 0;
-                    const failedCount = response.failed_count || 0;
-                    const dataSource = response.data_source || '未知';
-                    
-                    let message = `筛选完成！使用${dataSource}，共处理 ${processedCount} 只股票，找到 ${totalCount} 只满足条件的股票`;
-                    if (failedCount > 0) {
-                        message += `，${failedCount} 只股票数据获取失败`;
-                    }
-                    
-                    // 显示成功提示
-                    showSuccessAlert(message);
-                },
-                error: function(xhr, status, error) {
-                    $('#filterProgress').hide();
-                    console.error('筛选请求失败:', error, status, xhr);
-                    
-                    // 根据错误类型显示不同的错误信息
-                    if (status === 'timeout') {
-                        showNetworkErrorAlert(
-                            '请求超时，可能是网络连接不稳定或数据量较大',
-                            '请检查网络连接，或尝试缩小时间范围后重试'
-                        );
-                    } else if (xhr.responseJSON && xhr.responseJSON.error_type === 'network_error') {
-                        showNetworkErrorAlert(xhr.responseJSON.error, xhr.responseJSON.suggestion);
-                    } else {
-                        alert('筛选请求失败: ' + (xhr.responseJSON?.error || error || '未知错误'));
-                    }
-                }
-            });
-        }
-        
-        // 显示网络错误提示
-        function showNetworkErrorAlert(errorMessage, suggestion) {
-            const alertDiv = $(`
-                <div class="alert alert-warning alert-dismissible fade show" role="alert">
-                    <h6><i class="fas fa-exclamation-triangle"></i> 网络连接问题</h6>
-                    <p><strong>错误信息：</strong>${errorMessage}</p>
-                    <p><strong>建议：</strong>${suggestion}</p>
-                    <hr>
-                    <p class="mb-0">
-                        <small>
-                            <i class="fas fa-info-circle"></i> 
-                            如果问题持续存在，请检查网络连接或联系管理员
-                        </small>
-                    </p>
-                    <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-                </div>
-            `);
-            $('#stock-filter .container-fluid').prepend(alertDiv);
-            
-            // 10秒后自动隐藏提示
-            setTimeout(() => {
-                alertDiv.alert('close');
-            }, 10000);
-        }
-        // 显示成功提示
-        function showSuccessAlert(message) {
-            const alertDiv = $(`
-                <div class="alert alert-success alert-dismissible fade show" role="alert">
-                    <i class="fas fa-check-circle"></i> ${message}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-                </div>
-            `);
-            $('#stock-filter .container-fluid').prepend(alertDiv);
-            
-            // 5秒后自动隐藏提示
-            setTimeout(() => {
-                alertDiv.alert('close');
-            }, 5000);
-        }
-        
-        // 更新股票筛选表格
-        function updateStockFilterTable(results) {
-            const tbody = $('#stockFilterTable tbody');
-            tbody.empty();
-            
-            if (!results || results.length === 0) {
-                tbody.append('<tr><td colspan="9" class="text-center">没有找到满足条件的股票</td></tr>');
-                return;
-            }
-            
-            // 按分型强度降序排列
-            results.sort((a, b) => b.fx_strength - a.fx_strength);
-            
-            // 添加新数据
-            results.forEach(function(stock) {
-                const strengthClass = getStrengthClass(stock.fx_strength);
-                const changeClass = stock.change_percent >= 0 ? 'text-danger' : 'text-success';
-                const changeSign = stock.change_percent >= 0 ? '+' : '';
-                
-                const row = `
-                    <tr>
-                        <td>${stock.symbol}</td>
-                        <td>${stock.name}</td>
-                        <td>${stock.fx_time}</td>
-                        <td>${stock.fx_type}</td>
-                        <td><span class="${strengthClass}">${stock.fx_strength.toFixed(2)}</span></td>
-                        <td>${stock.fx_price.toFixed(2)}</td>
-                        <td>${stock.current_price ? stock.current_price.toFixed(2) : '-'}</td>
-                        <td><span class="${changeClass}">${changeSign}${(stock.change_percent || 0).toFixed(2)}%</span></td>
-                        <td><button class="btn btn-sm btn-outline-primary" onclick="analyzeStock('${stock.symbol}')">分析</button></td>
-                    </tr>
-                `;
-                tbody.append(row);
-            });
-        }
         
         // 均线系统全局变量
-        let movingAverages = []; // 存储所有均线配置
-        let maIdCounter = 0; // 均线ID计数器
+        var movingAverages = []; // 存储所有均线配置
+        var maIdCounter = 0; // 均线ID计数器
         
         // 布林带系统全局变量
-        let bollingerBands = []; // 存储所有布林带配置
-        let bbIdCounter = 0; // 布林带ID计数器
+        var bollingerBands = []; // 存储所有布林带配置
+        var bbIdCounter = 0; // 布林带ID计数器
         
         // 清理EMA52系列
         function clearEMA52Series() {
@@ -9118,6 +8038,13 @@
             
             console.log('🔄 按钮已重置为添加模式，等待用户主动点击"添加均线"按钮');
         }
+
+        // 点击弹窗外部关闭（MA）
+        $(document).on('click', '#maConfigModal', function(e) {
+            if (e.target === this) {
+                hideMAConfig();
+            }
+        });
         
         // 添加均线
         function addMovingAverage() {
@@ -9163,71 +8090,16 @@
             
             hideMAConfig();
             
-            // 直接使用前端数据计算和添加均线，不请求后台
-            if (tvWidget.mainChart && currentData && currentData.kline_data) {
-                const candles = getCurrentCandleData();
-                addMovingAveragesToChart(candles);
-            }
+            // 统一刷新（带重试，确保图表就绪）
+            refreshIndicatorsNowOrLater(5);
         }
         // 计算均线数据
-        function calculateMA(data, type, length, source) {
-            if (!data || data.length < length) return [];
-            
-            const sourceData = data.map(candle => {
-                switch(source) {
-                    case 'open': return candle.open;
-                    case 'high': return candle.high;
-                    case 'low': return candle.low;
-                    case 'close': return candle.close;
-                    case 'hl2': return (candle.high + candle.low) / 2;
-                    case 'hlc3': return (candle.high + candle.low + candle.close) / 3;
-                    case 'ohlc4': return (candle.open + candle.high + candle.low + candle.close) / 4;
-                    default: return candle.close;
-                }
-            });
-            
-            const result = [];
-            
-            for (let i = length - 1; i < sourceData.length; i++) {
-                let value;
-                
-                switch(type) {
-                    case 'SMA':
-                        value = sourceData.slice(i - length + 1, i + 1)
-                                .reduce((sum, val) => sum + val, 0) / length;
-                        break;
-                    case 'EMA':
-                        const multiplier = 2 / (length + 1);
-                        if (result.length === 0) {
-                            // 第一个EMA值使用SMA作为种子值
-                            value = sourceData.slice(i - length + 1, i + 1)
-                                    .reduce((sum, val) => sum + val, 0) / length;
-                        } else {
-                            // 后续EMA值使用标准公式
-                            value = sourceData[i] * multiplier + result[result.length - 1].value * (1 - multiplier);
-                        }
-                        break;
-                    case 'WMA':
-                        let weightSum = 0;
-                        let valueSum = 0;
-                        for (let j = 0; j < length; j++) {
-                            const weight = j + 1;
-                            weightSum += weight;
-                            valueSum += sourceData[i - length + 1 + j] * weight;
-                        }
-                        value = valueSum / weightSum;
-                        break;
-                    default:
-                        value = sourceData[i];
-                }
-                
-                result.push({
-                    time: data[i].time,
-                    value: value
-                });
+        function calculateMA() {
+            if (window.App && window.App.Indicators && typeof window.App.Indicators.calculateMA === 'function') {
+                return window.App.Indicators.calculateMA.apply(null, arguments);
             }
-            
-            return result;
+            console.warn('calculateMA 未就绪，返回空数组');
+            return [];
         }
         
         // 应用平滑处理
@@ -9415,6 +8287,9 @@
                     const candles = getCurrentCandleData();
                     addMovingAveragesToChart(candles);
                 }
+                
+                // 刷新面板图标与数值
+                try { updateIndicatorPanel(); } catch(e) {}
             } else {
                 console.error('❌ 未找到要切换可见性的均线，ID:', maId);
             }
@@ -9533,6 +8408,9 @@
                 const candles = getCurrentCandleData();
                 addMovingAveragesToChart(candles);
             }
+            
+            // 刷新面板显示
+            try { updateIndicatorPanel(); } catch(e) {}
         }
         
         // 删除均线
@@ -9551,6 +8429,10 @@
                 const candles = getCurrentCandleData();
                 addMovingAveragesToChart(candles);
             }
+            
+            // 刷新技术指标面板并关闭可能残留的配置弹窗
+            try { updateIndicatorPanel(); } catch(e) {}
+            try { if ($('#maConfigModal').is(':visible')) { hideMAConfig(); } } catch(e) {}
         }
         
         // 获取当前K线数据的辅助函数
@@ -9594,119 +8476,40 @@
             return candles;
         }
         
-        // 添加均线到图表
-        function addMovingAveragesToChart(candleData) {
-            if (!tvWidget.mainChart || !candleData || candleData.length === 0) {
-                return;
-            }
-            
-            console.log('🔄 重新绘制均线，当前均线配置数量:', movingAverages.length);
-            
-            // 强制清除现有的均线系列
-            if (tvWidget.series.maSeries && tvWidget.series.maSeries.length > 0) {
-                console.log('🗑️ 清除现有均线系列:', tvWidget.series.maSeries.length);
-                tvWidget.series.maSeries.forEach((series, index) => {
-                    try {
-                        tvWidget.mainChart.removeSeries(series);
-                        console.log('✅ 移除均线系列:', index);
-                    } catch (e) {
-                        console.error('❌ 移除均线系列失败:', index, e);
+        // 指标统一刷新（若图表未就绪则自动重试）
+        function refreshIndicatorsNowOrLater(retries) {
+            try {
+                if (tvWidget && tvWidget.mainChart && currentData && (currentData.kline_data || currentData.element_kline_data)) {
+                    const candles = getCurrentCandleData();
+                    if (candles && candles.length > 0) {
+                        addMovingAveragesToChart(candles);
+                        addBollingerBandsToChart(candles);
+                        try { updateIndicatorPanel(); } catch(e) {}
+                        return;
                     }
-                });
+                }
+            } catch(e) {}
+            if (retries && retries > 0) {
+                setTimeout(function(){ refreshIndicatorsNowOrLater(retries - 1); }, 200);
             }
-            // 重置均线系列数组
-            tvWidget.series.maSeries = [];
-            
-            // 为每个均线配置创建系列
-            let addedCount = 0;
-            movingAverages.forEach((maConfig, index) => {
-                if (!maConfig.visible) {
-                    console.log(`⏭️ 跳过隐藏的均线 [${index}]:`, maConfig.type, maConfig.length);
-                    return;
-                }
-                
-                try {
-                    console.log(`📈 开始创建均线 [${index}]:`, maConfig.type, maConfig.length, maConfig.color);
-                    
-                    // 计算均线数据
-                    const maData = calculateMA(candleData, maConfig.type, maConfig.length, maConfig.source);
-                    
-                    // 应用平滑处理
-                    const smoothedData = maConfig.smoothType !== 'none' ? 
-                        applySmoothToMA(maData, maConfig.smoothType, maConfig.smoothLength) : 
-                        maData;
-                    
-                    // 创建线系列
-                    const maSeries = tvWidget.mainChart.addLineSeries({
-                        color: maConfig.color,
-                        lineWidth: maConfig.lineWidth || 2,
-                        lineStyle: maConfig.lineStyle || 0, // 0=实线, 1=点线, 2=虚线, 3=大虚线
-                        title: `${maConfig.type}(${maConfig.length})`,
-                        lastValueVisible: false,
-                        priceLineVisible: false,
-                        crosshairMarkerVisible: true,
-                    });
-                    
-                    // 设置数据
-                    maSeries.setData(smoothedData);
-                    
-                    // 保存数据到配置中以便显示最新值
-                    maConfig.data = smoothedData;
-                    
-                    // 保存系列引用
-                    tvWidget.series.maSeries.push(maSeries);
-                    addedCount++;
-                    
-                    console.log(`✅ 均线创建成功 [${index}]:`, maConfig.type, maConfig.length, '数据点:', smoothedData.length);
-                    
-                } catch (e) {
-                    console.error('❌ 添加均线时出错:', e, maConfig);
-                }
-            });
-            
-            console.log(`🎯 均线添加完成，共添加 ${addedCount} 条均线`);
-            console.log('📊 当前图表中的均线系列数量:', tvWidget.series.maSeries.length);
-            
-            // 更新技术指标面板
-            updateIndicatorPanel();
         }
         
-        // 监听平滑类型变化
+        // 添加均线到图表
+        function addMovingAveragesToChart() {
+            if (window.App && window.App.Charts && typeof window.App.Charts.addMovingAveragesToChart === 'function') {
+                return window.App.Charts.addMovingAveragesToChart.apply(null, arguments);
+            }
+            console.warn('addMovingAveragesToChart 未就绪');
+        }
+        
+        // 监听平滑类型变化（保留，UI 逻辑）
         $(document).on('change', '#maSmoothType', function() {
             const isNone = $(this).val() === 'none';
             $('#maSmoothLength').prop('disabled', isNone);
         });
         
-                 // 显示布林带配置弹窗
-         function showBBConfig() {
-             console.log('📂 显示布林带配置弹窗，设置为添加模式');
-             $('#bbConfigModal').css('display', 'flex');
-             
-             // 重置表单
-             $('#bbType').val('Bollinger Bands');
-             $('#bbLength').val(20);
-             $('#bbStdDev').val(2);
-             $('#bbSource').val('close');
-             $('#bbLineWidth').val(2);
-             $('#bbLineStyle').val(0);
-             $('#bbColor').val(getRandomColor());
-             
-             // 移除所有现有的点击事件，避免事件冲突
-             $('#bbConfigSubmitBtn').off('click');
-             
-             // 设置按钮为添加模式
-             $('#bbConfigSubmitBtn').text('添加').on('click', function(e) {
-                 e.preventDefault();
-                 e.stopPropagation();
-                 console.log('🖱️ 点击了添加按钮（来自showBBConfig），准备添加新布林带');
-                 addBollingerBand();
-             });
-             
-             console.log('🔄 按钮已设置为添加模式');
-             
-             // 更新预览
-             setTimeout(updateBBLinePreview, 50);
-         }
+        
+        // 重复定义的 showBBConfig 已移除（合并到上方唯一实现）
         
         // 隐藏布林带配置弹窗
         function hideBBConfig() {
@@ -9778,48 +8581,17 @@
             
             hideBBConfig();
             
-                         // 直接使用前端数据计算和添加布林带，不请求后台
-             if (tvWidget.mainChart && currentData && currentData.kline_data) {
-                 const candles = getCurrentCandleData();
-                 addBollingerBandsToChart(candles);
-                 addMovingAveragesToChart(candles); // 同时更新均线
-             }
+            // 统一刷新（带重试，确保图表就绪）
+            refreshIndicatorsNowOrLater(5);
         }
         
         // 计算布林带数据
-        function calculateBB(data, length, upperMultiplier, lowerMultiplier, source) {
-            if (!data || data.length < length) return [];
-            
-            const sourceData = data.map(candle => {
-                switch(source) {
-                    case 'open': return candle.open;
-                    case 'high': return candle.high;
-                    case 'low': return candle.low;
-                    case 'close': return candle.close;
-                    case 'hl2': return (candle.high + candle.low) / 2;
-                    case 'hlc3': return (candle.high + candle.low + candle.close) / 3;
-                    case 'ohlc4': return (candle.open + candle.high + candle.low + candle.close) / 4;
-                    default: return candle.close;
-                }
-            });
-            
-            const result = [];
-            
-            for (let i = length - 1; i < sourceData.length; i++) {
-                const start = Math.max(0, i - length + 1);
-                const slice = sourceData.slice(start, i + 1);
-                const avg = slice.reduce((sum, val) => sum + val, 0) / length;
-                const std = Math.sqrt(slice.reduce((sum, val) => sum + Math.pow(val - avg, 2), 0) / length);
-                
-                result.push({
-                    time: data[i].time,
-                    upper: avg + upperMultiplier * std,
-                    middle: avg,
-                    lower: avg - lowerMultiplier * std
-                });
+        function calculateBB() {
+            if (window.App && window.App.Indicators && typeof window.App.Indicators.calculateBB === 'function') {
+                return window.App.Indicators.calculateBB.apply(null, arguments);
             }
-            
-            return result;
+            console.warn('calculateBB 未就绪，返回空数组');
+            return [];
         }
         
         // 更新布林带面板（兼容旧代码）
@@ -9843,6 +8615,9 @@
                     addBollingerBandsToChart(candles);
                     addMovingAveragesToChart(candles); // 同时更新均线
                 }
+                
+                // 刷新面板图标与数值
+                try { updateIndicatorPanel(); } catch(e) {}
             } else {
                 console.error('❌ 未找到要切换可见性的布林带，ID:', bbId);
             }
@@ -9978,6 +8753,12 @@
                 const candles = getCurrentCandleData();
                 addBollingerBandsToChart(candles);
             }
+            
+            // 刷新面板显示
+            try { updateIndicatorPanel(); } catch(e) {}
+            
+            // 刷新面板显示
+            try { updateIndicatorPanel(); } catch(e) {}
         }
         
         // 删除布林带
@@ -9996,100 +8777,18 @@
                 const candles = getCurrentCandleData();
                 addBollingerBandsToChart(candles);
             }
+            
+            // 刷新技术指标面板并关闭可能残留的配置弹窗
+            try { updateIndicatorPanel(); } catch(e) {}
+            try { if ($('#bbConfigModal').is(':visible')) { hideBBConfig(); } } catch(e) {}
         }
         
         // 添加布林带到图表
-        function addBollingerBandsToChart(candleData) {
-            if (!tvWidget.mainChart || !candleData || candleData.length === 0) {
-                return;
+        function addBollingerBandsToChart() {
+            if (window.App && window.App.Charts && typeof window.App.Charts.addBollingerBandsToChart === 'function') {
+                return window.App.Charts.addBollingerBandsToChart.apply(null, arguments);
             }
-            
-            console.log('🔄 重新绘制布林带，当前布林带配置数量:', bollingerBands.length);
-            
-            // 强制清除现有的布林带系列
-            if (tvWidget.series.bbSeries && tvWidget.series.bbSeries.length > 0) {
-                console.log('🗑️ 清除现有布林带系列:', tvWidget.series.bbSeries.length);
-                tvWidget.series.bbSeries.forEach((series, index) => {
-                    try {
-                        tvWidget.mainChart.removeSeries(series);
-                        console.log('✅ 移除布林带系列:', index);
-                    } catch (e) {
-                        console.error('❌ 移除布林带系列失败:', index, e);
-                    }
-                });
-            }
-            // 重置布林带系列数组
-            tvWidget.series.bbSeries = [];
-            
-            // 为每个布林带配置创建系列
-            let addedCount = 0;
-            bollingerBands.forEach((bbConfig, index) => {
-                if (!bbConfig.visible) {
-                    console.log(`⏭️ 跳过隐藏的布林带 [${index}]:`, bbConfig.type, bbConfig.length, bbConfig.upperMultiplier, bbConfig.lowerMultiplier);
-                    return;
-                }
-                
-                try {
-                    console.log(`📈 开始创建布林带 [${index}]:`, bbConfig.type, bbConfig.length, bbConfig.upperMultiplier, bbConfig.lowerMultiplier, bbConfig.upperColor, bbConfig.middleColor, bbConfig.lowerColor);
-                    
-                    // 计算布林带数据
-                    const bbData = calculateBB(candleData, bbConfig.length, bbConfig.upperMultiplier, bbConfig.lowerMultiplier, bbConfig.source);
-                    
-                    // 创建线系列
-                    const upperSeries = tvWidget.mainChart.addLineSeries({
-                        color: bbConfig.upperColor,
-                        lineWidth: bbConfig.lineWidth || 2,
-                        lineStyle: bbConfig.lineStyle || 0, // 0=实线, 1=点线, 2=虚线, 3=大虚线
-                        title: `BB(${bbConfig.length}, ${bbConfig.upperMultiplier}, ${bbConfig.lowerMultiplier}) Upper`,
-                        lastValueVisible: false,
-                        priceLineVisible: false,
-                        crosshairMarkerVisible: true,
-                    });
-                    
-                    const middleSeries = tvWidget.mainChart.addLineSeries({
-                        color: bbConfig.middleColor,
-                        lineWidth: bbConfig.lineWidth || 2,
-                        lineStyle: bbConfig.lineStyle || 0, // 0=实线, 1=点线, 2=虚线, 3=大虚线
-                        title: `BB(${bbConfig.length}, ${bbConfig.upperMultiplier}, ${bbConfig.lowerMultiplier}) Middle`,
-                        lastValueVisible: false,
-                        priceLineVisible: false,
-                        crosshairMarkerVisible: true,
-                    });
-                    
-                    const lowerSeries = tvWidget.mainChart.addLineSeries({
-                        color: bbConfig.lowerColor,
-                        lineWidth: bbConfig.lineWidth || 2,
-                        lineStyle: bbConfig.lineStyle || 0, // 0=实线, 1=点线, 2=虚线, 3=大虚线
-                        title: `BB(${bbConfig.length}, ${bbConfig.upperMultiplier}, ${bbConfig.lowerMultiplier}) Lower`,
-                        lastValueVisible: false,
-                        priceLineVisible: false,
-                        crosshairMarkerVisible: true,
-                    });
-                    
-                    // 设置数据
-                    upperSeries.setData(bbData.map(item => ({ time: item.time, value: item.upper })));
-                    middleSeries.setData(bbData.map(item => ({ time: item.time, value: item.middle })));
-                    lowerSeries.setData(bbData.map(item => ({ time: item.time, value: item.lower })));
-                    
-                    // 保存数据到配置中以便显示最新值
-                    bbConfig.data = bbData;
-                    
-                    // 保存系列引用
-                    tvWidget.series.bbSeries.push(upperSeries, middleSeries, lowerSeries);
-                    addedCount++;
-                    
-                    console.log(`✅ 布林带创建成功 [${index}]:`, bbConfig.type, bbConfig.length, bbConfig.upperMultiplier, bbConfig.lowerMultiplier, '数据点:', bbData.length);
-                    
-                } catch (e) {
-                    console.error('❌ 添加布林带时出错:', e, bbConfig);
-                }
-            });
-            
-            console.log(`🎯 布林带添加完成，共添加 ${addedCount} 条布林带`);
-            console.log('📊 当前图表中的布林带系列数量:', tvWidget.series.bbSeries.length);
-            
-            // 更新技术指标面板
-            updateIndicatorPanel();
+            console.warn('addBollingerBandsToChart 未就绪');
         }
         
                  // 更新均线预览
@@ -10213,11 +8912,7 @@
             const now = new Date();
             const weekAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000);
             
-            $('#filterEndTime').val(now.toISOString().slice(0, 16));
-            $('#filterStartTime').val(weekAgo.toISOString().slice(0, 16));
             
-            // 初始化股票筛选表格
-            initStockFilterTable();
             
             // 添加页面滚动事件监听器，清除十字线延长线
             $(window).on('scroll', function() {
@@ -10236,36 +8931,7 @@
                 }
             });
             
-            // 突出显示股票筛选tab (已禁用)
-            setTimeout(function() {
-                const stockFilterTab = $('#stock-filter-tab');
-                if (false && stockFilterTab.length > 0) {
-                    console.log('股票筛选tab已找到，开始突出显示');
-                    
-                    // 添加闪烁效果来吸引注意
-                    stockFilterTab.addClass('animate__animated animate__pulse');
-                    
-                    // 滚动到tab区域
-                    $('html, body').animate({
-                        scrollTop: $('.data-container').offset().top - 100
-                    }, 1000);
-                    
-                    // 添加提示信息
-                    const alertDiv = $(`
-                        <div class="alert alert-info alert-dismissible fade show" role="alert" style="position: fixed; top: 20px; right: 20px; z-index: 9999; max-width: 400px;">
-                            
-                            <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-                        </div>
-                    `);
-                    $('body').append(alertDiv);
-                    
-                    // 10秒后自动隐藏提示
-                    setTimeout(() => {
-                        alertDiv.alert('close');
-                    }, 10000);
-                }
-                // 已禁用突出显示功能，无需错误日志
-            }, 2000);
+            
         });
 
         // ====== ChanMACD图表相关函数 ======