@@ -1117,17 +1164,29 @@ export type MakeNodeOptions = {
rightPeriod?: number;
leftCandleType?: string;
rightCandleType?: string;
+ /** Stoch 과열×보조 복합 */
+ stochPair?: boolean;
+ secondaryIndicator?: string;
};
/** 팔레트 드래그 payload → makeNode 옵션 */
export function makeNodeOptionsFromPalette(data: {
composite?: boolean;
+ stochPair?: boolean;
+ secondaryIndicator?: string;
period?: number;
shortPeriod?: number;
longPeriod?: number;
leftCandleType?: string;
rightCandleType?: string;
+ value?: string;
}): MakeNodeOptions | undefined {
+ if (data.stochPair || (data.value && isStochOverboughtPairPaletteValue(data.value))) {
+ return {
+ stochPair: true,
+ secondaryIndicator: data.secondaryIndicator ?? 'CCI',
+ };
+ }
if (data.composite) {
return {
composite: true,
@@ -1146,6 +1205,9 @@ export const makeNode = (
options?: MakeNodeOptions,
): LogicNode => {
if (type === 'operator') return { id: genId(), type: value as LogicNodeType, children: [] };
+ if (options?.stochPair || isStochOverboughtPairPaletteValue(value)) {
+ return buildStochOverboughtPairTree(options?.secondaryIndicator ?? 'CCI', DEF);
+ }
if (options?.composite) {
let condition = makeCompositeCondition(value, signalType, DEF);
condition = {
diff --git a/frontend/src/utils/strategyFlowLayout.ts b/frontend/src/utils/strategyFlowLayout.ts
index 12c47dd..c1d9f92 100644
--- a/frontend/src/utils/strategyFlowLayout.ts
+++ b/frontend/src/utils/strategyFlowLayout.ts
@@ -40,6 +40,8 @@ export type StrategyFlowNodeData = {
onDeleteStart?: (startId: string) => void;
onDelete?: (id: string) => void;
onUpdateCondition?: (nodeId: string, condition: ConditionDSL) => void;
+ /** Stoch 과열×보조 복합 — 보조지표 변경 */
+ onUpdateStochPairSecondary?: (nodeId: string, secondaryIndicator: string) => void;
/** AND ↔ OR 전환 */
onChangeLogicGateType?: (nodeId: string, gateType: 'AND' | 'OR') => void;
onDropTarget?: (targetId: string, data: { type: string; value: string; label: string }, flowPos: { x: number; y: number }) => void;
@@ -472,7 +474,7 @@ function layoutTree(
signalTab: 'buy' | 'sell',
callbacks: Pick<
StrategyFlowNodeData,
- 'onDelete' | 'onUpdateCondition' | 'onChangeLogicGateType'
+ 'onDelete' | 'onUpdateCondition' | 'onUpdateStochPairSecondary' | 'onChangeLogicGateType'
| 'onDropTarget' | 'onDragOverTarget' | 'onDragLeaveTarget'
>,
dragOverId: string | null,
@@ -494,6 +496,7 @@ function layoutTree(
signalTab,
onDelete: callbacks.onDelete,
onUpdateCondition: callbacks.onUpdateCondition,
+ onUpdateStochPairSecondary: callbacks.onUpdateStochPairSecondary,
onChangeLogicGateType: callbacks.onChangeLogicGateType,
onDropTarget: callbacks.onDropTarget,
onDragOverTarget: callbacks.onDragOverTarget,
@@ -623,7 +626,7 @@ function appendOrphanFlowNodes(
signalTab: 'buy' | 'sell',
callbacks: Pick<
StrategyFlowNodeData,
- 'onDelete' | 'onUpdateCondition' | 'onChangeLogicGateType'
+ 'onDelete' | 'onUpdateCondition' | 'onUpdateStochPairSecondary' | 'onChangeLogicGateType'
| 'onDropTarget' | 'onDragOverTarget' | 'onDragLeaveTarget'
>,
): void {
@@ -645,6 +648,7 @@ function appendOrphanFlowNodes(
signalTab,
onDelete: callbacks.onDelete,
onUpdateCondition: callbacks.onUpdateCondition,
+ onUpdateStochPairSecondary: callbacks.onUpdateStochPairSecondary,
onChangeLogicGateType: callbacks.onChangeLogicGateType,
onDropTarget: callbacks.onDropTarget,
onDragOverTarget: callbacks.onDragOverTarget,
@@ -668,6 +672,7 @@ export function logicNodeToFlow(
StrategyFlowNodeData,
| 'onDelete'
| 'onUpdateCondition'
+ | 'onUpdateStochPairSecondary'
| 'onDropTarget'
| 'onDragOverTarget'
| 'onDragLeaveTarget'
diff --git a/frontend/src/utils/strategyNodeIds.ts b/frontend/src/utils/strategyNodeIds.ts
new file mode 100644
index 0000000..396e67b
--- /dev/null
+++ b/frontend/src/utils/strategyNodeIds.ts
@@ -0,0 +1,3 @@
+/** 전략 DSL 노드 id — 순환 import 방지를 위해 별도 모듈 */
+let _cnt = 0;
+export const genId = () => `n_${++_cnt}_${Date.now()}`;
diff --git a/frontend/src/utils/strategyPaletteStorage.ts b/frontend/src/utils/strategyPaletteStorage.ts
index d2bea15..11c6d5c 100644
--- a/frontend/src/utils/strategyPaletteStorage.ts
+++ b/frontend/src/utils/strategyPaletteStorage.ts
@@ -1,6 +1,10 @@
/** 전략편집기 우측 팔레트 — 보조·복합 지표 목록 (DB ui_preferences) */
import { getUiPreferences, patchUiPreferences } from './uiPreferencesDb';
import { COMPOSITE_INDICATOR_ITEMS } from './compositeIndicators';
+import {
+ STOCH_OVERBOUGHT_PAIR_VALUE,
+ stochPairPaletteDesc,
+} from './stochOverboughtPair';
export type PaletteItemKind = 'auxiliary' | 'composite';
@@ -16,6 +20,8 @@ export interface PaletteItem {
/** 복합지표 단기·장기 기간 */
shortPeriod?: number;
longPeriod?: number;
+ /** Stoch 과열×보조 복합 — 기본 보조지표 (CCI 등) */
+ secondaryIndicator?: string;
builtIn?: boolean;
}
@@ -40,20 +46,29 @@ export const DEFAULT_AUXILIARY_ITEMS: Omit
[] = [
{ value: 'NEW_LOW', label: '신저가', desc: '직전 N봉 최저가 이탈 — 종가/저가 vs N일 신저가선 (9·20일)', builtIn: true, period: 9 },
];
-export const DEFAULT_COMPOSITE_ITEMS: Omit[] =
- COMPOSITE_INDICATOR_ITEMS.map(i => ({
+export const DEFAULT_COMPOSITE_ITEMS: Omit[] = [
+ {
+ value: STOCH_OVERBOUGHT_PAIR_VALUE,
+ label: 'Stoch 과열×보조',
+ desc: stochPairPaletteDesc('CCI'),
+ builtIn: true,
+ secondaryIndicator: 'CCI',
+ },
+ ...COMPOSITE_INDICATOR_ITEMS.map(i => ({
value: i.value,
label: i.label,
desc: i.desc,
builtIn: true,
- }));
+ })),
+];
export const AUXILIARY_TYPE_OPTIONS = DEFAULT_AUXILIARY_ITEMS.map(i => ({
value: i.value,
label: i.label,
}));
-export const COMPOSITE_TYPE_OPTIONS = DEFAULT_COMPOSITE_ITEMS.map(i => ({
+/** 팔레트 추가 모달 — 동일 지표 2기간 교차만 선택 (Stoch×보조는 내장 칩) */
+export const COMPOSITE_TYPE_OPTIONS = COMPOSITE_INDICATOR_ITEMS.map(i => ({
value: i.value,
label: i.label,
}));
diff --git a/frontend/src/utils/strategyTypes.ts b/frontend/src/utils/strategyTypes.ts
index 248bac3..ff795a3 100644
--- a/frontend/src/utils/strategyTypes.ts
+++ b/frontend/src/utils/strategyTypes.ts
@@ -38,6 +38,10 @@ export interface LogicNode {
candleType?: string;
/** TIMEFRAME 노드 — 동일 조건을 여러 분봉 마감마다 평가 */
candleTypes?: string[];
+ /** Stoch 과열×보조지표 순차 OR 복합 — OR 루트에만 설정 */
+ stochPair?: {
+ secondaryIndicatorType: string;
+ };
}
export interface StrategyDSLDto {