전략평가 매매시그널 표시안되는 문제 수정

This commit is contained in:
Macbook
2026-06-13 00:00:39 +09:00
parent 2c0570c95e
commit 24128e6a0a
7 changed files with 55 additions and 90 deletions
@@ -18,8 +18,8 @@ import { loadBacktestSettings, runBacktest } from '../../utils/backendApi';
import {
BACKTEST_DISPLAY_BAR_COUNT,
fetchBacktestCandleBundle,
resolveEvaluationFromLoadedBars,
} from '../../utils/backtestWarmup';
import type { EvalIndicatorParams } from '../../utils/strategyEvaluationParams';
import { DISPLAY_COUNT } from '../../hooks/useUpbitData';
import { buildVirtualTradingChartIndicators } from '../../utils/strategyToChartIndicators';
import { buildEvalParamsFromStrategy } from '../../utils/strategyEvaluationParams';
@@ -49,6 +49,8 @@ interface Props {
onSelectedBarIndexChange: (index: number) => void;
onBarsLoaded?: (bars: OHLCVBar[]) => void;
paramsRevision?: number;
/** 사용자가 저장한 지표 파라미터 — null 이면 백테스트도 서버 DB 설정 사용 (live-conditions 와 동일) */
appliedIndicatorParams?: EvalIndicatorParams | null;
getParamsOverride?: (
type: string,
defaults?: Record<string, number | string | boolean>,
@@ -94,6 +96,7 @@ const StrategyEvaluationChart: React.FC<Props> = ({
onSelectedBarIndexChange,
onBarsLoaded,
paramsRevision = 0,
appliedIndicatorParams = null,
getParamsOverride,
getVisualConfigOverride,
evalLoading = false,
@@ -115,6 +118,7 @@ const StrategyEvaluationChart: React.FC<Props> = ({
const marketBtnRef = useRef<HTMLButtonElement>(null);
const managerRef = useRef<ChartManager | null>(null);
const backtestGenRef = useRef(0);
const evaluationBarCountRef = useRef(BACKTEST_DISPLAY_BAR_COUNT);
const signalsRef = useRef(signals);
signalsRef.current = signals;
const chartType: ChartType = 'candlestick';
@@ -135,9 +139,14 @@ const StrategyEvaluationChart: React.FC<Props> = ({
return { candle: flex.candle, aux: flex.aux };
}, [auxPaneCount]);
/** 저장된 오버라이드가 있을 때만 백테스트에 전달 — 미설정 시 live-conditions 와 같이 서버 DB 사용 */
const indicatorParams = useMemo(
() => (strategy ? buildEvalParamsFromStrategy(strategy, getParams) : {}),
[strategy, getParams],
() => (
strategy && appliedIndicatorParams
? buildEvalParamsFromStrategy(strategy, getParams)
: undefined
),
[strategy, getParams, appliedIndicatorParams],
);
const resolveInitialDisplayCount = useCallback(
@@ -180,13 +189,6 @@ const StrategyEvaluationChart: React.FC<Props> = ({
setBacktestError(null);
try {
const btSettings = await loadBacktestSettings();
const { evaluationBarCount } = resolveEvaluationFromLoadedBars(
barData.length,
strategy.buyCondition,
strategy.sellCondition,
indicatorParams,
);
const evalCount = Math.min(BACKTEST_DISPLAY_BAR_COUNT, evaluationBarCount);
const res = await runBacktest({
strategyId: strategy.id,
bars: barData.map(b => ({
@@ -200,9 +202,13 @@ const StrategyEvaluationChart: React.FC<Props> = ({
timeframe,
symbol: market,
strategyName: strategy.name,
settings: btSettings,
settings: {
...btSettings,
// 전략 평가 차트 — 조건 충족 시작 봉마다 매수/매도 마커 (포지션 락 무시)
positionMode: 'SIGNAL_ONLY',
},
indicatorParams,
evaluationBarCount: evalCount,
evaluationBarCount: evaluationBarCountRef.current,
});
if (gen !== backtestGenRef.current) return;
if (!res) {
@@ -267,8 +273,9 @@ const StrategyEvaluationChart: React.FC<Props> = ({
sellDsl: strategy?.sellCondition,
indicatorParams,
})
.then(({ bars: data }) => {
.then(({ bars: data, evaluationBarCount: evalCount }) => {
if (cancelled) return;
evaluationBarCountRef.current = evalCount;
setBars(data);
onBarsLoaded?.(data);
if (data.length > 0) {
@@ -284,7 +291,7 @@ const StrategyEvaluationChart: React.FC<Props> = ({
if (!cancelled) setLoading(false);
});
return () => { cancelled = true; };
}, [market, timeframe, strategy?.id, strategy?.buyCondition, strategy?.sellCondition, indicatorParams, onBarsLoaded, onSelectedBarIndexChange]);
}, [market, timeframe, strategy?.id, paramsRevision, onBarsLoaded, onSelectedBarIndexChange]);
const scrollToBar = useCallback((barIdx: number) => {
const mgr = chartMgr;
@@ -25,16 +25,6 @@ interface Props {
className?: string;
}
const InterpretIcon = () => (
<svg viewBox="0 0 24 24" width="16" height="16" aria-hidden className="seval-interpret-icon">
<circle cx="12" cy="12" r="9" fill="none" stroke="currentColor" strokeWidth="1.75" />
<path
fill="currentColor"
d="M11.25 10.5h1.5V17h-1.5V10.5zm0-3.25h1.5V9h-1.5V6.25z"
/>
</svg>
);
interface SideCardProps {
side: 'buy' | 'sell';
metrics: ConditionMetric[];
@@ -53,9 +43,10 @@ const SideCard: React.FC<SideCardProps> = ({
barTimeSec,
}) => {
const [interpretOpen, setInterpretOpen] = useState(false);
const sideLabel = side === 'buy' ? '매수' : '매도';
const title = side === 'buy' ? '매수 조건' : '매도 조건';
const overallLabel =
overallMet === true ? '전체 충족' : overallMet === false ? '전체 미충족' : null;
overallMet === true ? '충족' : overallMet === false ? '미충족' : null;
const contextMap = useMemo(() => buildConditionContextMap(strategy), [strategy]);
const interpretation = useMemo(
@@ -75,7 +66,7 @@ const SideCard: React.FC<SideCardProps> = ({
>
<header className="seval-side-card-head">
<div className="seval-side-card-head-main">
<span className={`seval-side-card-badge seval-side-card-badge--${side}`}>{title}</span>
<span className={`seval-side-card-badge seval-side-card-badge--${side}`}>{sideLabel}</span>
{overallLabel && (
<span
className={`seval-side-overall seval-side-overall--${overallMet ? 'met' : 'unmet'}`}
@@ -87,13 +78,13 @@ const SideCard: React.FC<SideCardProps> = ({
</div>
<button
type="button"
className="seval-interpret-btn"
title="전략 판별 해석 — 조건별 충족/미충족 이유"
aria-label={`${title} 전략 판별 해석`}
className="seval-analyze-btn"
title="조건별 충족/미충족 분석"
aria-label={`${title} 분석보기`}
disabled={metrics.length === 0}
onClick={() => setInterpretOpen(true)}
>
<InterpretIcon />
</button>
</header>
<div className="seval-side-card-body">