refactor(web): 移除主图威科夫选项与叠层
去掉区间/阶段/时间/VP 开关、Cycle 摘要面板及绘制逻辑；分析请求默认 include_wyckoff=0。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jackyu66git
@@ -1,4 +1,4 @@
|
||||
/* chart_tv_overlays.js — structure zones / wyckoff / BSP / FX / bollinger */
|
||||
/* chart_tv_overlays.js — structure zones / BSP / FX / bollinger */
|
||||
|
||||
/** 标记 time 必须落在主 series 的 K 线 time 上，否则 LWC 会抛 Value is null */
|
||||
function alignMarkersToCandles(markers, candles) {
|
||||
@@ -331,229 +331,6 @@ function chartTvRenderOverlays(ctx) {
|
||||
}
|
||||
} catch (e) { console.error('结构区整体绘制出错:', e); }
|
||||
}
|
||||
// 区间/阶段/时间/VP：框线同中枢；标记并入主 K（同 BSP），时间对齐 candles
|
||||
(function drawWrLikeChan() {
|
||||
const candleSeries = tvWidget.series.candleSeries
|
||||
|| tvWidget.series.barSeries
|
||||
|| tvWidget.series.lineSeries
|
||||
|| tvWidget.series.areaSeries
|
||||
|| tvWidget.series.heikinSeries
|
||||
|| tvWidget.series.renkoSeries;
|
||||
const candleTimes = (candles || []).map(function(c) { return c.time; })
|
||||
.filter(function(t) { return t != null && !isNaN(t); });
|
||||
const barStep = (candleTimes.length >= 2)
|
||||
? Math.max(1, candleTimes[1] - candleTimes[0])
|
||||
: 3600;
|
||||
const lastKlineTime = candleTimes.length ? candleTimes[candleTimes.length - 1] : NaN;
|
||||
const chartStart = candleTimes.length ? candleTimes[0] : NaN;
|
||||
|
||||
const toSec = function(t) {
|
||||
if (t == null) return NaN;
|
||||
if (typeof t === 'number') return t > 1e12 ? Math.floor(t / 1000) : Math.floor(t);
|
||||
const ms = new Date(t).getTime();
|
||||
return isNaN(ms) ? NaN : Math.floor(ms / 1000);
|
||||
};
|
||||
// 标记必须落在主 series 的 time 上（与 KLC 趋势 nearestTime 同思路）
|
||||
const snapToCandle = function(t) {
|
||||
if (!candleTimes.length || isNaN(t)) return t;
|
||||
let best = candleTimes[0], bd = Math.abs(candleTimes[0] - t);
|
||||
for (let i = 1; i < candleTimes.length; i++) {
|
||||
const d = Math.abs(candleTimes[i] - t);
|
||||
if (d < bd) { bd = d; best = candleTimes[i]; }
|
||||
}
|
||||
return best;
|
||||
};
|
||||
const ensureSpan = function(t0, t1) {
|
||||
if (isNaN(t0) || isNaN(t1)) return [t0, t1];
|
||||
if (t1 < t0) { const x = t0; t0 = t1; t1 = x; }
|
||||
if (t1 <= t0) t1 = t0 + barStep;
|
||||
return [t0, t1];
|
||||
};
|
||||
const drawBox = function(t0, t1, hi, lo, color) {
|
||||
const span = ensureSpan(t0, t1);
|
||||
t0 = span[0]; t1 = span[1];
|
||||
if (isNaN(t0) || isNaN(t1) || isNaN(hi) || isNaN(lo)) return;
|
||||
const opt = { color: color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false };
|
||||
mainChart.addLineSeries(opt).setData([{ time: t0, value: hi }, { time: t1, value: hi }]);
|
||||
mainChart.addLineSeries(opt).setData([{ time: t0, value: lo }, { time: t1, value: lo }]);
|
||||
mainChart.addLineSeries(opt).setData([{ time: t0, value: lo }, { time: t0, value: hi }]);
|
||||
mainChart.addLineSeries(opt).setData([{ time: t1, value: lo }, { time: t1, value: hi }]);
|
||||
};
|
||||
const mkPL = function(price, color, title, style) {
|
||||
if (!candleSeries) return;
|
||||
const p = parseFloat(price);
|
||||
if (isNaN(p)) return;
|
||||
try {
|
||||
candleSeries.createPriceLine({
|
||||
price: p, color: color,
|
||||
lineWidth: style === 2 ? 1 : 2,
|
||||
lineStyle: style || 0,
|
||||
axisLabelVisible: true,
|
||||
title: title
|
||||
});
|
||||
} catch (e) { console.warn('价位线失败', title, e); }
|
||||
};
|
||||
const phaseColors = { A: '#f1c40f', B: '#9b59b6', C: '#e67e22', D: '#2ecc71', E: '#3498db' };
|
||||
const eventColors = {
|
||||
Spring: '#27ae60', SOS: '#2ecc71', LPS: '#16a085',
|
||||
UTAD: '#e74c3c', SOW: '#c0392b', LPSY: '#d35400'
|
||||
};
|
||||
|
||||
const wrMarkers = [];
|
||||
window.wrMarkers = [];
|
||||
const pushMarker = function(m) {
|
||||
if (!m || isNaN(m.time)) return;
|
||||
m.time = snapToCandle(m.time);
|
||||
if (!isNaN(chartStart) && (m.time < chartStart || m.time > lastKlineTime)) return;
|
||||
wrMarkers.push(m);
|
||||
};
|
||||
|
||||
const drawOne = function(w, cfg) {
|
||||
if (!w) return;
|
||||
const showR = $(cfg.rangeSel).is(':checked');
|
||||
const showP = $(cfg.phasesSel).is(':checked');
|
||||
const showE = $(cfg.eventsSel).is(':checked');
|
||||
const showV = $(cfg.vpSel).is(':checked');
|
||||
if (!showR && !showP && !showE && !showV) return;
|
||||
// WYCKOFF-MULTI-CYCLE-001：遍历 cycles；无则退化为顶层单段
|
||||
const cycles = (w.cycles && w.cycles.length)
|
||||
? w.cycles
|
||||
: (w.trading_range ? [{
|
||||
id: 0, status: 'ACTIVE', role: 'latest',
|
||||
trading_range: w.trading_range, phases: w.phases, events: w.events,
|
||||
volume_profile: w.volume_profile, volume_confirm: w.volume_confirm,
|
||||
period: { start_time: w.trading_range.start_time, end_time: w.trading_range.end_time, bars: w.trading_range.bars }
|
||||
}] : []);
|
||||
const tfLabel = (cfg.tfLabel || cfg.tag || 'TF').toString().toUpperCase();
|
||||
|
||||
cycles.forEach(function(cycle) {
|
||||
const tr = cycle.trading_range;
|
||||
if (!tr) return;
|
||||
const cid = (cycle.id != null) ? cycle.id : 0;
|
||||
const isActive = String(cycle.status || '').toUpperCase() === 'ACTIVE';
|
||||
const cTag = tfLabel + ' C' + cid + ' ';
|
||||
try {
|
||||
let t0 = toSec(tr.start_time || (cycle.period && cycle.period.start_time));
|
||||
let t1 = toSec(tr.end_time || (cycle.period && cycle.period.end_time));
|
||||
// 仅 ACTIVE 可拉到最新 K；历史用 period.end
|
||||
if (isActive && !isNaN(lastKlineTime)) {
|
||||
t1 = lastKlineTime;
|
||||
} else if (cycle.period && cycle.period.end_time) {
|
||||
t1 = toSec(cycle.period.end_time);
|
||||
}
|
||||
const hi = parseFloat(tr.high), lo = parseFloat(tr.low);
|
||||
if (showR && !isNaN(hi) && !isNaN(lo)) {
|
||||
drawBox(t0, t1, hi, lo, cfg.color);
|
||||
if (isActive) {
|
||||
mkPL(hi, cfg.color, cfg.hiTag, 0);
|
||||
mkPL(lo, cfg.color, cfg.loTag, 0);
|
||||
mkPL(tr.mid, cfg.color, cfg.midTag, 2);
|
||||
}
|
||||
}
|
||||
if (showP && cycle.phases && cycle.phases.length && !isNaN(hi)) {
|
||||
cycle.phases.forEach(function(ph) {
|
||||
let p0 = toSec(ph.start_time);
|
||||
let p1 = ph.end_time ? toSec(ph.end_time) : t1;
|
||||
const sp = ensureSpan(p0, p1);
|
||||
p0 = sp[0]; p1 = sp[1];
|
||||
if (isNaN(p0) || isNaN(p1)) return;
|
||||
const col = phaseColors[ph.phase] || '#95a5a6';
|
||||
mainChart.addLineSeries({
|
||||
color: col, lineWidth: 3, lastValueVisible: false, priceLineVisible: false
|
||||
}).setData([{ time: p0, value: hi }, { time: p1, value: hi }]);
|
||||
pushMarker({
|
||||
time: p0, position: 'aboveBar', color: col, shape: 'square',
|
||||
text: cTag + 'Phase ' + String(ph.phase || ''), size: 1
|
||||
});
|
||||
});
|
||||
}
|
||||
if (showV && isActive && cycle.volume_profile) {
|
||||
const vp = cycle.volume_profile;
|
||||
mkPL(vp.poc, cfg.vpColor, cfg.pocTag, 0);
|
||||
mkPL(vp.vah, cfg.vpColor, cfg.vahTag, 2);
|
||||
mkPL(vp.val, cfg.vpColor, cfg.valTag, 2);
|
||||
const bins = (vp.bins || []).filter(function(b) { return b && b.volume > 0; })
|
||||
.slice().sort(function(a, b) { return b.volume - a.volume; }).slice(0, 8);
|
||||
let maxVol = 0;
|
||||
bins.forEach(function(b) { if (b.volume > maxVol) maxVol = b.volume; });
|
||||
const span = (!isNaN(t0) && !isNaN(t1) && t1 > t0) ? (t1 - t0) : barStep * 12;
|
||||
bins.forEach(function(b) {
|
||||
if (!b.volume || maxVol <= 0 || isNaN(t1)) return;
|
||||
const wSec = Math.max(barStep, Math.floor(span * 0.12 * (b.volume / maxVol)));
|
||||
let leftT = Math.max(isNaN(t0) ? (t1 - wSec) : t0, t1 - wSec);
|
||||
if (leftT >= t1) leftT = t1 - barStep;
|
||||
if (leftT >= t1) return;
|
||||
const alpha = 0.25 + 0.55 * (b.volume / maxVol);
|
||||
mainChart.addLineSeries({
|
||||
color: cfg.vpRgb.replace('ALPHA', alpha.toFixed(2)),
|
||||
lineWidth: 2, lastValueVisible: false, priceLineVisible: false
|
||||
}).setData([{ time: leftT, value: b.price }, { time: t1, value: b.price }]);
|
||||
});
|
||||
}
|
||||
if (showE && cycle.events && cycle.events.length) {
|
||||
const checks = (cycle.volume_confirm && cycle.volume_confirm.event_checks) || {};
|
||||
cycle.events.forEach(function(ev) {
|
||||
const t = toSec(ev.time);
|
||||
if (isNaN(t)) return;
|
||||
const typ = ev.type || '';
|
||||
const chk = checks[typ] || {};
|
||||
const volOk = (chk.volume_ok != null) ? chk.volume_ok : ev.volume_ok;
|
||||
const ok = volOk === true ? '✓' : (volOk === false ? '✗' : '');
|
||||
pushMarker({
|
||||
time: t,
|
||||
position: (typ === 'Spring' || typ === 'LPS' || typ === 'SOW') ? 'belowBar' : 'aboveBar',
|
||||
color: eventColors[typ] || '#7f8c8d',
|
||||
shape: (typ === 'Spring' || typ === 'SOW' || typ === 'LPS') ? 'arrowDown' : 'arrowUp',
|
||||
text: cTag + typ + ok,
|
||||
size: 1
|
||||
});
|
||||
});
|
||||
}
|
||||
} catch (e) { console.error('区间叠层出错', cfg.name, 'C' + cid, e); }
|
||||
});
|
||||
};
|
||||
|
||||
if ($('#showMainWrRange').is(':checked') || $('#showMainWrPhases').is(':checked')
|
||||
|| $('#showMainWrEvents').is(':checked') || $('#showMainWrVP').is(':checked')) {
|
||||
drawOne(currentData.wyckoff, {
|
||||
name: '主', tag: '', tfLabel: (currentData.timeframe || '4H'), color: '#3498db', vpColor: '#8e44ad',
|
||||
vpRgb: 'rgba(142, 68, 173, ALPHA)',
|
||||
rangeSel: '#showMainWrRange', phasesSel: '#showMainWrPhases',
|
||||
eventsSel: '#showMainWrEvents', vpSel: '#showMainWrVP',
|
||||
hiTag: 'WR.H', loTag: 'WR.L', midTag: 'WR.M',
|
||||
pocTag: 'POC', vahTag: 'VAH', valTag: 'VAL'
|
||||
});
|
||||
}
|
||||
if ($('#showElementWrRange').is(':checked') || $('#showElementWrPhases').is(':checked')
|
||||
|| $('#showElementWrEvents').is(':checked') || $('#showElementWrVP').is(':checked')) {
|
||||
drawOne(currentData.element_wyckoff, {
|
||||
name: '次', tag: 'e', tfLabel: (currentData.element_timeframe || '2H'), color: '#e67e22', vpColor: '#d35400',
|
||||
vpRgb: 'rgba(211, 84, 0, ALPHA)',
|
||||
rangeSel: '#showElementWrRange', phasesSel: '#showElementWrPhases',
|
||||
eventsSel: '#showElementWrEvents', vpSel: '#showElementWrVP',
|
||||
hiTag: 'eWR.H', loTag: 'eWR.L', midTag: 'eWR.M',
|
||||
pocTag: 'ePOC', vahTag: 'eVAH', valTag: 'eVAL'
|
||||
});
|
||||
}
|
||||
if ($('#showSubSubWrRange').is(':checked') || $('#showSubSubWrPhases').is(':checked')
|
||||
|| $('#showSubSubWrEvents').is(':checked') || $('#showSubSubWrVP').is(':checked')) {
|
||||
drawOne(currentData.sub_sub_wyckoff, {
|
||||
name: '次次', tag: 's', tfLabel: (currentData.sub_sub_timeframe || '1H'), color: '#27ae60', vpColor: '#16a085',
|
||||
vpRgb: 'rgba(22, 160, 133, ALPHA)',
|
||||
rangeSel: '#showSubSubWrRange', phasesSel: '#showSubSubWrPhases',
|
||||
eventsSel: '#showSubSubWrEvents', vpSel: '#showSubSubWrVP',
|
||||
hiTag: 'sWR.H', loTag: 'sWR.L', midTag: 'sWR.M',
|
||||
pocTag: 'sPOC', vahTag: 'sVAH', valTag: 'sVAL'
|
||||
});
|
||||
}
|
||||
|
||||
// 同 BSP：写入 window，稍后与分型/买卖点一并 setMarkers
|
||||
wrMarkers.sort(function(a, b) { return a.time - b.time; });
|
||||
window.wrMarkers = wrMarkers;
|
||||
if (typeof renderWyckoffCycleSummary === 'function') {
|
||||
renderWyckoffCycleSummary();
|
||||
}
|
||||
})();
|
||||
// 显示未完成中枢 - 分别处理主周期、次周期和次次周期
|
||||
if ($('#showMainZs').is(':checked') || $('#showElementZs').is(':checked') || $('#showSubSubZs').is(':checked') || $('#showSubSubBiZs').is(':checked')) {
|
||||
console.log('绘制未完成中枢 - 已启用');
|
||||
@@ -2336,8 +2113,7 @@ function chartTvRenderOverlays(ctx) {
|
||||
...(window.kluDivMarkersElement || []),
|
||||
...(window.kluDivMarkersSubSub || []),
|
||||
...trendMarkersToUse,
|
||||
...(window.bspMarkers || []),
|
||||
...(window.wrMarkers || [])
|
||||
...(window.bspMarkers || [])
|
||||
];
|
||||
if (combinedMarkers.length > 0) {
|
||||
console.log(
|
||||
@@ -2346,7 +2122,6 @@ function chartTvRenderOverlays(ctx) {
|
||||
'个，小周期分型:', allElementFxMarkers.length,
|
||||
'个，UnitTF:', (window.unittfMarkers || []).length,
|
||||
'个，BSP标记:', (window.bspMarkers || []).length,
|
||||
'个，区间标记:', (window.wrMarkers || []).length,
|
||||
'个）'
|
||||
);
|
||||
|
||||
@@ -2455,8 +2230,7 @@ function chartTvRenderOverlays(ctx) {
|
||||
...(window.kluDivMarkersElement || []),
|
||||
...(window.kluDivMarkersSubSub || []),
|
||||
...trendMarkersToUse,
|
||||
...(window.bspMarkers || []),
|
||||
...(window.wrMarkers || [])
|
||||
...(window.bspMarkers || [])
|
||||
];
|
||||
if (onlyMainAndU.length > 0) {
|
||||
console.log('仅设置', onlyMainAndU.length, '个主周期/UnitTF标记（主周期分型:', (window.mainFxMarkers || []).length, '，UnitTF:', (window.unittfMarkers || []).length, '）');
|
||||
|
||||
Reference in New Issue
Block a user