@363045841yyt/klinechart-core 0.8.13 → 0.8.14-alpha.1

package/dist/engine/data/chartDataManager.js

@@ -1,9 +1,13 @@
-import { createSignal } from '../../reactivity/signal';
 import { DataBuffer } from '../../data-fetchers/dataBuffer';
 import { getPeriodDays } from '../../data-fetchers/dataBuffer.effects';
 import { TimeShareBuffer } from '../../data-fetchers/timeShareBuffer';
-import { getVisibleRange } from '../viewport/viewport';
+import { createSignal } from '../../reactivity/signal';
 import { getPhysicalKLineConfig } from '../utils/klineConfig';
+import { getVisibleRange } from '../viewport/viewport';
+import { ComparisonManager } from './comparisonManager';
+import { FetchBatchScheduler } from './fetchBatchScheduler';
+import { IncrementalLoadHint } from './incrementalLoadHint';
+import { ScrollCompensator } from './scrollCompensator';
 const COMPARISON_PALETTE = ['#f59e0b', '#8b5cf6', '#06b6d4', '#ec4899', '#84cc16', '#f97316'];
 const DEFAULT_COMPARISON_COLOR = '#f59e0b';
 const BUF_PRIMARY = 'main';
@@ -18,7 +22,8 @@ export class ChartDataManager {
     static TRAILING_SLOTS = 30;
     _dataFetcher = null;
     _timeShareFetcher = null;
-    _buffers = new Map();
+    _klineBuffers = new Map();
+    _tsBuffers = new Map();
     _activeBufferKey = null;
     _activeBufferUnsub = null;
     _dataSignal = createSignal([]);
@@ -27,40 +32,52 @@ export class ChartDataManager {
     /** Available symbol catalog — consumed by UI pickers (e.g. TopToolbar) */
     _symbolCatalog = createSignal([]);
     _currentSpec = null;
-    // Comparison-specific state (still needed for rendering pass-through)
-    _comparisonSpecs = [];
-    _comparisonData = new Map();
-    _comparisonColors = new Map();
-    _comparisonColorsSignal = createSignal(new Map());
-    _comparisonLoadingSignal = createSignal(false);
-    // Track loading per-comparison buffer (keyed by buffer key)
-    _cmpLoadingUnsubs = new Map();
-    _pendingFetches = [];
-    _batchFlushScheduled = false;
-    incrementalLoadHintEl = null;
-    incrementalLoadHintTimer = null;
-    pendingPrependedCount = 0;
+    _batchScheduler = new FetchBatchScheduler();
+    _scrollCompensator;
+    _comparisonManager;
+    _loadHint;
+    _savedScrollLeft = null;
+    _preCustomSpec = null;
     lastVisibleRange = { start: 0, end: 0 };
     lastRawVisibleRange = { start: 0, end: 0 };
     pendingIndicatorDataUpdate = false;
     deps;
     constructor(deps) {
         this.deps = deps;
+        this._scrollCompensator = new ScrollCompensator(deps);
+        this._loadHint = new IncrementalLoadHint(deps);
+        this._comparisonManager = new ComparisonManager({
+            createComparisonBuffer: (spec) => this._createCmpBuffer(spec),
+            disposeBuffer: (key) => this.disposeBuffer(key),
+            getKLineBuffer: (key) => this._klineBuffers.get(key),
+            hasKLineBuffer: (key) => this._klineBuffers.has(key),
+            getKLineBufferKeys: () => [...this._klineBuffers.keys()],
+            scheduleDraw: () => this.deps.scheduleDraw(),
+        });
     }
     // ── Buffer helpers ──
+    _lookupBuffer(key) {
+        if (key.startsWith(BUF_TIMESHARE))
+            return this._tsBuffers.get(key);
+        return this._klineBuffers.get(key);
+    }
+    _lookupKLineBuffer(key) {
+        return this._klineBuffers.get(key);
+    }
     activateBuffer(key) {
         if (this._activeBufferKey === key)
             return;
         this._activeBufferUnsub?.();
         this._activeBufferKey = key;
-        const buf = this._buffers.get(key);
+        const buf = this._lookupBuffer(key);
         if (buf) {
-            this._dataSignal.set([...buf.data.peek()]);
+            this._dataSignal.set([...buf.data.peek().data]);
             this._loadingSignal.set(buf.loading.peek());
             const unsubData = buf.data.subscribe(() => {
+                const change = buf.data.peek();
                 const prevDataLength = this._dataSignal.peek().length;
-                this._dataSignal.set([...buf.data.peek()]);
-                this.onBufferDataChanged(key, prevDataLength);
+                this._dataSignal.set([...change.data]);
+                this.onBufferDataChanged(key, prevDataLength, change.prependedCount);
             });
             const unsubLoading = buf.loading.subscribe(() => {
                 this._loadingSignal.set(buf.loading.peek());
@@ -77,78 +94,77 @@ export class ChartDataManager {
         }
     }
     disposeBuffer(key) {
-        const buf = this._buffers.get(key);
+        const buf = this._lookupBuffer(key);
         if (!buf)
             return;
-        const unsub = this._cmpLoadingUnsubs.get(key);
-        unsub?.();
-        const loadingUnsub = this._cmpLoadingUnsubs.get(`loading:${key}`);
-        loadingUnsub?.();
-        this._cmpLoadingUnsubs.delete(key);
-        this._cmpLoadingUnsubs.delete(`loading:${key}`);
         buf.dispose();
-        this._buffers.delete(key);
+        if (key.startsWith(BUF_TIMESHARE))
+            this._tsBuffers.delete(key);
+        else
+            this._klineBuffers.delete(key);
     }
     getActiveDataBuffer() {
-        const buf = this._activeBufferKey ? this._buffers.get(this._activeBufferKey) : null;
-        return buf instanceof DataBuffer ? buf : null;
+        return this._activeBufferKey && !this._activeBufferKey.startsWith(BUF_TIMESHARE)
+            ? (this._klineBuffers.get(this._activeBufferKey) ?? null)
+            : null;
     }
     getActiveTimeShareBuffer() {
-        const buf = this._activeBufferKey ? this._buffers.get(this._activeBufferKey) : null;
-        return buf instanceof TimeShareBuffer ? buf : null;
+        return this._activeBufferKey?.startsWith(BUF_TIMESHARE) === true
+            ? (this._tsBuffers.get(this._activeBufferKey) ?? null)
+            : null;
     }
     getPrimaryDataBuffer(symbol, period) {
         const key = bufKey(BUF_PRIMARY, symbol, period);
-        let buf = this._buffers.get(key);
+        let buf = this._klineBuffers.get(key);
         if (!buf) {
-            buf = new DataBuffer();
+            buf = this._createKLineBuffer();
             buf.setFetcher(this._dataFetcher);
             if (this._dataFetcher) {
-                buf.setRequestFetch(this._createBatchHandler(this._dataFetcher));
+                buf.setRequestFetch(this._batchScheduler.createHandler());
             }
-            this._buffers.set(key, buf);
+            this._klineBuffers.set(key, buf);
         }
         else {
             buf.setFetcher(this._dataFetcher);
             if (this._dataFetcher) {
-                buf.setRequestFetch(this._createBatchHandler(this._dataFetcher));
+                buf.setRequestFetch(this._batchScheduler.createHandler());
             }
         }
         return buf;
     }
+    _createKLineBuffer() {
+        return new DataBuffer();
+    }
+    _createCmpBuffer(spec) {
+        const key = bufKey(BUF_COMPARISON, spec.symbol, spec.period);
+        const buffer = this._createKLineBuffer();
+        buffer.setFetcher(this._dataFetcher);
+        if (this._dataFetcher) {
+            buffer.setRequestFetch(this._batchScheduler.createHandler());
+        }
+        this._klineBuffers.set(key, buffer);
+        return { key, buffer };
+    }
     // ── Buffer data change handler ──
-    onBufferDataChanged(key, prevDataLength) {
-        const buf = this._buffers.get(key);
-        if (!buf)
+    onBufferDataChanged(key, prevDataLength, prependedCount) {
+        if (key.startsWith(BUF_TIMESHARE)) {
+            this.onTimeShareBufferChanged();
             return;
-        if (buf instanceof DataBuffer) {
-            this.onKLineBufferChanged(key, buf, prevDataLength);
-        }
-        else if (buf instanceof TimeShareBuffer) {
-            this.onTimeShareBufferChanged(key, buf);
         }
+        const buf = this._klineBuffers.get(key);
+        if (!buf)
+            return;
+        this.onKLineBufferChanged(key, buf, prevDataLength, prependedCount ?? 0);
     }
-    onKLineBufferChanged(key, buf, prevDataLength) {
+    onKLineBufferChanged(key, buf, prevDataLength, prependedCount = 0) {
         if (!key.startsWith('main:'))
             return;
         const bufferData = buf.getRawData();
-        const prependedCount = this.pendingPrependedCount;
-        this.pendingPrependedCount = 0;
-        if (prependedCount === 0 && this.deps.getCachedScrollLeft() < this.getLeftLoadBufferWidth()) {
-            const scrollLeft = this.deps.getCachedScrollLeft();
-            if (scrollLeft <= 0) {
-                this.deps.setScrollLeft(this.getLeftLoadBufferWidth());
-            }
-            else {
-                const dpr = this.deps.getEffectiveDpr();
-                const opt = this.deps.getOption();
-                const { unitPx, startXPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr);
-                const totalDataWidth = (startXPx + bufferData.length * unitPx) / dpr;
-                const leftBuffer = this.getLeftLoadBufferWidth();
-                if (scrollLeft >= leftBuffer + totalDataWidth) {
-                    this.deps.setScrollLeft(leftBuffer);
-                }
-            }
+        if (prependedCount > 0) {
+            this._scrollCompensator.compensatePrepend(prependedCount);
+        }
+        else {
+            this._scrollCompensator.adjustScrollAfterDataChange(bufferData.length);
         }
         if ((prevDataLength ?? this._dataSignal.peek().length) === 0 && bufferData.length > 0) {
             this.scrollToRight();
@@ -171,15 +187,14 @@ export class ChartDataManager {
         if (indicatorsReady) {
             this.pendingIndicatorDataUpdate = false;
             this.deps.scheduleDraw();
-            // Alert 管线入口：Chart 构造时绑定 → evaluateAlerts()
             this.deps.onDataProcessed?.(bufferData, this.lastVisibleRange);
         }
         else {
             this.pendingIndicatorDataUpdate = true;
         }
-        this.showIncrementalLoadHint(prependedCount);
+        this._loadHint.show(prependedCount, this.getLeftLoadBufferWidth());
     }
-    onTimeShareBufferChanged(_key, _buf) {
+    onTimeShareBufferChanged() {
         const data = this._dataSignal.peek();
         this.lastVisibleRange = { start: 0, end: data.length };
         this.lastRawVisibleRange = { start: 0, end: data.length };
@@ -187,18 +202,10 @@ export class ChartDataManager {
         this.deps.onTimeShareDataReady(data.length);
     }
     // ── Internal helpers ──
-    getScrollContentHost() {
-        return this.deps.getDom().scrollContent ?? this.deps.getDom().container ?? null;
-    }
     getLeftLoadBufferWidth() {
         const buf = this.getActiveDataBuffer();
         const dataLength = buf ? buf.getRawData().length : 0;
-        if (dataLength === 0)
-            return 0;
-        const plotWidth = this.deps.getViewport()?.plotWidth ??
-            (this.deps.getObservedSize().width > 0 ? this.deps.getObservedSize().width : undefined) ??
-            Math.round(this.deps.getDom().container?.clientWidth ?? 0);
-        return Math.max(0, plotWidth);
+        return this._scrollCompensator.getLeftLoadBufferWidth(dataLength);
     }
     getActiveKLineLength() {
         const buf = this.getActiveDataBuffer();
@@ -215,72 +222,6 @@ export class ChartDataManager {
         const opt = this.deps.getOption();
         return getVisibleRange(vp.scrollLeft, vp.plotWidth, opt.kWidth, opt.kGap, dataLength, vp.dpr);
     }
-    getTrailingSlotCount() {
-        return 24;
-    }
-    clearIncrementalLoadHintTimer() {
-        if (this.incrementalLoadHintTimer !== null) {
-            window.clearTimeout(this.incrementalLoadHintTimer);
-            this.incrementalLoadHintTimer = null;
-        }
-    }
-    hideIncrementalLoadHint() {
-        const hint = this.incrementalLoadHintEl;
-        if (!hint)
-            return;
-        hint.style.opacity = '0';
-        hint.style.filter = 'blur(10px)';
-    }
-    ensureIncrementalLoadHint() {
-        const host = this.getScrollContentHost();
-        if (!host)
-            return null;
-        if (this.incrementalLoadHintEl && this.incrementalLoadHintEl.isConnected) {
-            return this.incrementalLoadHintEl;
-        }
-        const ownerDoc = host.ownerDocument;
-        if (!ownerDoc)
-            return null;
-        const hint = ownerDoc.createElement('div');
-        hint.className = 'klc-incremental-load-hint';
-        hint.style.position = 'absolute';
-        hint.style.top = '0';
-        hint.style.height = '0px';
-        hint.style.width = '0px';
-        hint.style.pointerEvents = 'none';
-        hint.style.opacity = '0';
-        hint.style.filter = 'blur(10px)';
-        hint.style.transition = 'opacity 420ms ease, filter 420ms ease';
-        hint.style.background = 'rgba(71, 91, 132, 0.5)';
-        hint.style.zIndex = '3';
-        hint.style.willChange = 'opacity, filter, width';
-        host.appendChild(hint);
-        this.incrementalLoadHintEl = hint;
-        return hint;
-    }
-    showIncrementalLoadHint(count) {
-        if (count <= 0)
-            return;
-        const hint = this.ensureIncrementalLoadHint();
-        if (!hint)
-            return;
-        this.clearIncrementalLoadHintTimer();
-        const dpr = this.deps.getEffectiveDpr();
-        const opt = this.deps.getOption();
-        const { unitPx, startXPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr);
-        hint.style.left = `${this.getLeftLoadBufferWidth()}px`;
-        const width = (startXPx + count * unitPx) / dpr;
-        hint.style.width = `${Math.max(0, width)}px`;
-        hint.style.height = `${Math.max(0, this.deps.getViewport()?.viewHeight ?? this.deps.getDom().container?.clientHeight ?? 0)}px`;
-        hint.getBoundingClientRect();
-        hint.style.opacity = '1';
-        hint.style.filter = 'blur(0px)';
-        this.incrementalLoadHintTimer = window.setTimeout(() => {
-            this.hideIncrementalLoadHint();
-            this.incrementalLoadHintTimer = null;
-        }, 900);
-    }
-    // ── Public accessors ──
     /** Unified data signal — always reflects the active buffer's data */
     get data() {
         return this._dataSignal;
@@ -303,7 +244,7 @@ export class ChartDataManager {
         const current = new Map(this._symbolCatalog.peek().map((s) => [s.code, s]));
         for (const info of infos)
             current.set(info.code, info);
-        this._symbolCatalog.set(Array.from(current.values()));
+        this._symbolCatalog.set([...current.values()]);
     }
     /** Remove a symbol from the catalog by code. */
     unregisterSymbol(code) {
@@ -348,36 +289,31 @@ export class ChartDataManager {
         this._timeShareFetcher = fetcher;
     }
     getComparisonData() {
-        return this._comparisonData;
+        return this._comparisonManager.data;
     }
     getComparisonSpecs() {
-        return this._comparisonSpecs;
+        return this._comparisonManager.specs;
     }
     get dataBuffer() {
         const buf = this.getActiveDataBuffer();
         if (buf)
             return buf;
-        // Fallback: create a primary buffer if none exists yet
         const key = bufKey(BUF_PRIMARY, '', 'daily');
-        let fallback = this._buffers.get(key);
+        let fallback = this._klineBuffers.get(key);
         if (!fallback) {
-            fallback = new DataBuffer();
-            this._buffers.set(key, fallback);
+            fallback = this._createKLineBuffer();
+            this._klineBuffers.set(key, fallback);
         }
         return fallback;
     }
     get comparisonColors() {
-        return this._comparisonColorsSignal;
+        return this._comparisonManager.colorsSignal;
     }
     get comparisonLoading() {
-        return this._comparisonLoadingSignal;
+        return this._comparisonManager.loadingSignal;
     }
     getComparisonColors() {
-        return this._comparisonColors;
-    }
-    recomputeComparisonLoading() {
-        const anyLoading = Array.from(this._buffers.entries()).some(([k, b]) => k.startsWith(BUF_COMPARISON) && b instanceof DataBuffer && b.loading.peek());
-        this._comparisonLoadingSignal.set(anyLoading);
+        return this._comparisonManager.getColors();
     }
     // ── Data updates (KLine) ──
     updateData(data) {
@@ -414,63 +350,16 @@ export class ChartDataManager {
     // ── Fetcher ──
     setDataFetcher(fetcher) {
         this._dataFetcher = fetcher;
+        this._batchScheduler.setFetcher(fetcher);
         if (!fetcher) {
-            for (const [key, buf] of this._buffers) {
-                if (buf instanceof DataBuffer) {
-                    const dataBuf = buf;
-                    dataBuf.setRequestFetch(null);
-                }
+            for (const [, buf] of this._klineBuffers) {
+                buf.setRequestFetch(null);
             }
             return;
         }
-        const handler = this._createBatchHandler(fetcher);
-        for (const [key, buf] of this._buffers) {
-            if (buf instanceof DataBuffer) {
-                const dataBuf = buf;
-                dataBuf.setRequestFetch(handler);
-            }
-        }
-    }
-    _createBatchHandler(fetcher) {
-        return (spec, startTs, endTs) => new Promise((resolve, reject) => {
-            if (!spec.source) {
-                reject(new Error(`[DataFetcher] source is required but was not provided for symbol "${spec.symbol}"`));
-                return;
-            }
-            this._pendingFetches.push({
-                source: spec.source,
-                spec,
-                startTs,
-                endTs,
-                resolve,
-                reject,
-            });
-            this._scheduleBatchFlush();
-        });
-    }
-    _scheduleBatchFlush() {
-        if (this._batchFlushScheduled)
-            return;
-        this._batchFlushScheduled = true;
-        Promise.resolve().then(() => this._flushBatch());
-    }
-    async _flushBatch() {
-        this._batchFlushScheduled = false;
-        const batch = this._pendingFetches.splice(0);
-        if (batch.length === 0 || !this._dataFetcher)
-            return;
-        const fetcher = this._dataFetcher;
-        const CONCURRENCY = 4;
-        for (let i = 0; i < batch.length; i += CONCURRENCY) {
-            const chunk = batch.slice(i, i + CONCURRENCY);
-            await Promise.allSettled(chunk.map(({ source, spec, startTs, endTs, resolve, reject }) => fetcher(source, {
-                symbol: spec.symbol,
-                startDate: batchFormatDate(startTs),
-                endDate: batchFormatDate(endTs),
-                period: spec.period ?? 'daily',
-                adjust: spec.adjust ?? 'none',
-                exchange: spec.exchange,
-            }).then(resolve, reject)));
+        const handler = this._batchScheduler.createHandler();
+        for (const [, buf] of this._klineBuffers) {
+            buf.setRequestFetch(handler);
         }
     }
     checkVisibleRangeGap() {
@@ -501,149 +390,34 @@ export class ChartDataManager {
         }
         if (firstVisibleTs === undefined)
             return;
-        for (const [key, b] of this._buffers) {
-            if (key.startsWith(BUF_COMPARISON) && b instanceof DataBuffer) {
-                b.ensureRange(firstVisibleTs, window.earliestTs);
-            }
-        }
+        this._comparisonManager.ensureRange(firstVisibleTs, window.earliestTs);
     }
     // ── Comparison management ──
     syncComparisonBuffers(specs) {
-        this._comparisonSpecs = [...specs];
-        const nextKeys = new Set(specs.map((spec) => spec.symbol));
-        // Remove buffers for removed comparisons
-        for (const [key, buf] of this._buffers) {
-            if (!key.startsWith(BUF_COMPARISON))
-                continue;
-            const symbol = key.split(':')[1];
-            if (nextKeys.has(symbol))
-                continue;
-            this.disposeBuffer(key);
-            this._comparisonData.delete(symbol);
-        }
-        if (!this._dataFetcher)
-            return;
         const primaryBuf = this.getActiveDataBuffer();
-        for (const spec of specs) {
-            const key = bufKey(BUF_COMPARISON, spec.symbol, spec.period);
-            const symbol = spec.symbol;
-            let buf = this._buffers.get(key);
-            if (!buf) {
-                const newBuffer = new DataBuffer();
-                newBuffer.setFetcher(this._dataFetcher);
-                if (this._dataFetcher) {
-                    newBuffer.setRequestFetch(this._createBatchHandler(this._dataFetcher));
-                }
-                this._buffers.set(key, newBuffer);
-                const unsubscribe = newBuffer.data.subscribe(() => {
-                    this._comparisonData.set(symbol, [...newBuffer.getRawData()]);
-                    this.deps.scheduleDraw();
-                });
-                this._cmpLoadingUnsubs.set(key, unsubscribe);
-                const unsubLoading = newBuffer.loading.subscribe(() => this.recomputeComparisonLoading());
-                // Store loading unsubscribe with a special key
-                this._cmpLoadingUnsubs.set(`loading:${key}`, unsubLoading);
-                buf = newBuffer;
-            }
-            else {
-                buf.setFetcher(this._dataFetcher);
-                if (this._dataFetcher) {
-                    buf.setRequestFetch(this._createBatchHandler(this._dataFetcher));
-                }
-            }
-            const mainEarliest = primaryBuf?.loadedWindow?.earliestTs;
-            buf.setSymbol(spec, mainEarliest);
-        }
+        this._comparisonManager.syncBuffers(specs, primaryBuf?.loadedWindow?.earliestTs);
     }
     clearComparisonBuffers() {
-        for (const [key, buf] of this._buffers) {
-            if (key.startsWith(BUF_COMPARISON)) {
-                this.disposeBuffer(key);
-            }
-        }
-        this._comparisonData.clear();
-        this._comparisonColors.clear();
-        this._comparisonColorsSignal.set(new Map());
-        this._comparisonLoadingSignal.set(false);
-        this._comparisonSpecs = [];
+        this._comparisonManager.clearAll();
     }
     addComparisonSymbol(spec) {
-        const symbol = spec.symbol;
-        const key = bufKey(BUF_COMPARISON, symbol, spec.period);
-        // Check if already exists
-        for (const k of this._buffers.keys()) {
-            if (k.startsWith(BUF_COMPARISON) && k.split(':')[1] === symbol)
-                return;
-        }
-        this._comparisonSpecs.push(spec);
-        const color = COMPARISON_PALETTE[this._comparisonColors.size % COMPARISON_PALETTE.length] ??
-            DEFAULT_COMPARISON_COLOR;
-        this._comparisonColors.set(symbol, color);
-        this._comparisonColorsSignal.set(new Map(this._comparisonColors));
-        if (!this._dataFetcher)
-            return;
-        const newBuffer = new DataBuffer();
-        newBuffer.setFetcher(this._dataFetcher);
-        if (this._dataFetcher) {
-            newBuffer.setRequestFetch(this._createBatchHandler(this._dataFetcher));
-        }
-        this._buffers.set(key, newBuffer);
-        const unsubscribe = newBuffer.data.subscribe(() => {
-            this._comparisonData.set(symbol, [...newBuffer.getRawData()]);
-            this.deps.scheduleDraw();
+        this._comparisonManager.addSymbol(spec, () => {
+            const allSpecs = this._symbolsSignal.peek();
+            this._symbolsSignal.set([allSpecs[0], ...this._comparisonManager.specs]);
         });
-        this._cmpLoadingUnsubs.set(key, unsubscribe);
-        const unsubLoading = newBuffer.loading.subscribe(() => this.recomputeComparisonLoading());
-        this._cmpLoadingUnsubs.set(`loading:${key}`, unsubLoading);
-        const primaryBuf = this.getActiveDataBuffer();
-        const mainEarliest = primaryBuf?.loadedWindow?.earliestTs;
-        newBuffer.setSymbol(spec, mainEarliest);
-        this._symbolsSignal.set([this._symbolsSignal.peek()[0], ...this._comparisonSpecs]);
     }
     setComparisonData(symbol, data) {
-        const period = this.currentPeriod;
-        const key = bufKey(BUF_COMPARISON, symbol, period);
-        const existing = this._buffers.get(key);
-        if (!existing) {
-            const buffer = new DataBuffer();
-            this._buffers.set(key, buffer);
-            const unsub = buffer.data.subscribe(() => {
-                this._comparisonData.set(symbol, [...buffer.getRawData()]);
-                this.deps.scheduleDraw();
-            });
-            this._cmpLoadingUnsubs.set(key, unsub);
-            const unsubLoading = buffer.loading.subscribe(() => this.recomputeComparisonLoading());
-            this._cmpLoadingUnsubs.set(`loading:${key}`, unsubLoading);
-            const color = COMPARISON_PALETTE[this._comparisonColors.size % COMPARISON_PALETTE.length] ??
-                DEFAULT_COMPARISON_COLOR;
-            this._comparisonColors.set(symbol, color);
-            this._comparisonColorsSignal.set(new Map(this._comparisonColors));
-            const spec = { symbol, period };
-            this._comparisonSpecs.push(spec);
-            const mainSpec = this._symbolsSignal.peek()[0];
-            this._symbolsSignal.set(mainSpec ? [mainSpec, ...this._comparisonSpecs] : [...this._comparisonSpecs]);
-            buffer.setInlineData(data);
-            return;
-        }
-        existing.setInlineData(data);
+        this._comparisonManager.setData(symbol, data, (key) => {
+            this._symbolsSignal.set([
+                this._symbolsSignal.peek()[0],
+                ...this._comparisonManager.specs,
+            ]);
+        });
     }
     removeComparisonSymbol(symbol) {
-        let found = false;
-        for (const [key, buf] of this._buffers) {
-            if (key.startsWith(BUF_COMPARISON) && key.split(':')[1] === symbol) {
-                this.disposeBuffer(key);
-                found = true;
-                break;
-            }
-        }
-        if (!found)
+        if (!this._comparisonManager.removeSymbol(symbol))
             return;
-        this._comparisonData.delete(symbol);
-        this._comparisonColors.delete(symbol);
-        this._comparisonColorsSignal.set(new Map(this._comparisonColors));
-        this._comparisonSpecs = this._comparisonSpecs.filter((s) => s.symbol !== symbol);
-        this._symbolsSignal.set([this._symbolsSignal.peek()[0], ...this._comparisonSpecs]);
-        this.recomputeComparisonLoading();
+        this._symbolsSignal.set([this._symbolsSignal.peek()[0], ...this._comparisonManager.specs]);
         this.deps.scheduleDraw();
     }
     // ── Symbol / Period ──
@@ -669,7 +443,7 @@ export class ChartDataManager {
             const spec = this._currentSpec;
             if (spec) {
                 const key = bufKey(BUF_TIMESHARE, spec.symbol);
-                this._buffers.set(key, tsBuf);
+                this._tsBuffers.set(key, tsBuf);
                 this.activateBuffer(key);
                 tsBuf.load(spec);
             }
@@ -682,17 +456,34 @@ export class ChartDataManager {
             return;
         }
         const next = { ...current, period };
-        this.setSymbols([next, ...this._comparisonSpecs]);
+        this.setSymbols([next, ...this._comparisonManager.specs]);
+    }
+    /**
+     * 归一化 K 线周期别名，防止无效 period 进入引擎
+     *  "day" → "daily"，其余保持原值
+     */
+    static normalizePeriod(period) {
+        if (!period)
+            return 'daily';
+        const alias = period.toLowerCase().trim();
+        if (alias === 'day')
+            return 'daily';
+        return period;
     }
     applyCustomData(source) {
+        const plainData = source.data.map((d) => ({ ...d }));
+        // 首次调用时保存原始 spec，用于切回 Fetcher 时恢复
+        if (!this._preCustomSpec) {
+            this._preCustomSpec = { ...(this._currentSpec ?? this._symbolsSignal.peek()[0] ?? { symbol: '' }) };
+        }
+        // 每次都切到 custom 品种，注册到目录，填入数据
         const spec = {
-            symbol: source.symbol ?? this._currentSpec?.symbol ?? '',
-            period: source.period ?? this._currentSpec?.period ?? 'daily',
+            symbol: source.symbol ?? '',
+            period: ChartDataManager.normalizePeriod(source.period),
             incremental: false,
             source: source.source ?? 'custom',
         };
-        this.setSymbols([spec, ...this._comparisonSpecs]);
-        // Auto-register the custom symbol into the available catalog so it appears in UI pickers.
+        this.setSymbols([spec, ...this._comparisonManager.specs]);
         const symbolCode = spec.symbol;
         if (symbolCode) {
             this.registerSymbols([
@@ -704,10 +495,9 @@ export class ChartDataManager {
                 },
             ]);
         }
-        const plainData = source.data.map((d) => ({ ...d }));
         this.setData(plainData);
         if (source.comparisons) {
-            for (const key of this._comparisonData.keys()) {
+            for (const key of this._comparisonManager.data.keys()) {
                 if (!source.comparisons[key])
                     this.removeComparisonSymbol(key);
             }
@@ -716,6 +506,19 @@ export class ChartDataManager {
             }
         }
     }
+    resetToFetcher(spec) {
+        if (this._activeBufferKey && !this._activeBufferKey.startsWith(BUF_TIMESHARE)) {
+            this.disposeBuffer(this._activeBufferKey);
+        }
+        this._dataSignal.set([]);
+        this.lastVisibleRange = { start: 0, end: 0 };
+        this.lastRawVisibleRange = { start: 0, end: 0 };
+        this._savedScrollLeft = null;
+        this.setSymbols([spec, ...this._comparisonManager.specs]);
+    }
+    getPreCustomSpec() {
+        return this._preCustomSpec;
+    }
     // ── Main symbol switching ──
     setSymbols(specs) {
         this._symbolsSignal.set(specs);
@@ -732,22 +535,20 @@ export class ChartDataManager {
         if (primary.period === 'timeshare') {
             // Switch to timeshare mode
             this.clearComparisonBuffers();
-            // Dispose primary KLine buffer
-            for (const [key, buf] of this._buffers) {
-                if (key.startsWith(BUF_PRIMARY)) {
-                    this.disposeBuffer(key);
-                }
-            }
+            // Save scroll position so we can restore it when returning to K-line mode
+            this._savedScrollLeft = this.deps.getCachedScrollLeft();
+            // Keep primary KLine buffer in memory — don't dispose it,
+            // so data and scroll position are preserved when user returns
             this._dataSignal.set([]);
             this.lastVisibleRange = { start: 0, end: 0 };
             this.lastRawVisibleRange = { start: 0, end: 0 };
             // Get or create timeshare buffer
             const tsKey = bufKey(BUF_TIMESHARE, primary.symbol);
-            let tsBuf = this._buffers.get(tsKey);
+            let tsBuf = this._tsBuffers.get(tsKey);
             if (!tsBuf) {
                 tsBuf = new TimeShareBuffer();
                 tsBuf.setFetcher(this._timeShareFetcher);
-                this._buffers.set(tsKey, tsBuf);
+                this._tsBuffers.set(tsKey, tsBuf);
             }
             this.activateBuffer(tsKey);
             tsBuf.load(primary);
@@ -755,10 +556,8 @@ export class ChartDataManager {
         }
         // KLine mode
         // Dispose timeshare buffer
-        for (const [key, buf] of this._buffers) {
-            if (key.startsWith(BUF_TIMESHARE)) {
-                this.disposeBuffer(key);
-            }
+        for (const [key] of this._tsBuffers) {
+            this.disposeBuffer(key);
         }
         this.loadKLineSymbols(specs);
     }
@@ -782,22 +581,19 @@ export class ChartDataManager {
                 incremental: spec.incremental ?? buf.currentSpec?.incremental ?? true,
             });
             this.deps.resetInteraction();
-            this.scrollToRight();
+            if (this._savedScrollLeft !== null) {
+                this.deps.setScrollLeft(this._savedScrollLeft);
+                this._savedScrollLeft = null;
+            }
+            else {
+                this.scrollToRight();
+            }
             return;
         }
         if (!spec.source) {
             throw new Error(`[ChartDataManager] source is required for symbol "${spec.symbol}". ` +
                 `Provide a source in SymbolSpec or use setData/applyCustomData for inline data.`);
         }
-        buf.onPrepend = (count) => {
-            this.pendingPrependedCount = count;
-            const dpr = this.deps.getEffectiveDpr();
-            const opt = this.deps.getOption();
-            const { unitPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr);
-            const compensation = (count * unitPx) / dpr;
-            const nextScrollLeft = this.deps.getCachedScrollLeft() + compensation;
-            this.deps.setScrollLeft(nextScrollLeft);
-        };
         buf.setSymbol(spec);
     }
     // ── Content width ──
@@ -813,46 +609,17 @@ export class ChartDataManager {
         const dataLength = buf ? buf.getRawData().length : 0;
         if (dataLength === 0)
             return 0;
-        const opt = this.deps.getOption();
-        const viewWidth = this.deps.getViewport()?.plotWidth ?? 0;
-        const dpr = this.deps.getEffectiveDpr();
-        const { startXPx, unitPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr);
-        const dataPlotWidth = (startXPx + (dataLength + ChartDataManager.TRAILING_SLOTS) * unitPx) / dpr;
-        return this.getLeftLoadBufferWidth() + Math.max(dataPlotWidth, viewWidth);
+        return this._scrollCompensator.getContentWidth(dataLength);
     }
     scrollToRight() {
         const buf = this.getActiveDataBuffer();
         const dataLength = buf ? buf.getRawData().length : 0;
-        if (dataLength === 0)
-            return;
-        const dpr = this.deps.getEffectiveDpr();
-        const opt = this.deps.getOption();
-        const { unitPx, startXPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr);
-        const lastKLineEndPx = (startXPx + dataLength * unitPx) / dpr;
-        const viewport = this.deps.getViewport();
-        const clientWidth = viewport?.viewWidth ??
-            (this.deps.getObservedSize().width > 0 ? this.deps.getObservedSize().width : undefined) ??
-            Math.round(this.deps.getDom().container?.clientWidth ?? 0);
-        if (clientWidth <= 0)
-            return;
-        const leftBuffer = this.getLeftLoadBufferWidth();
-        let target;
-        if (lastKLineEndPx <= clientWidth) {
-            // 数据不足以填满一屏 → 右对齐：最后一根 K 线固定在右侧
-            target = leftBuffer - (clientWidth - lastKLineEndPx);
-        }
-        else {
-            target = leftBuffer + (lastKLineEndPx - clientWidth);
-        }
-        const contentWidth = this.getContentWidth();
-        const maxScroll = Math.max(0, contentWidth - clientWidth);
-        const scrollLeft = Math.round(Math.max(0, Math.min(target, maxScroll)) * dpr) / dpr;
-        this.deps.setScrollLeft(scrollLeft);
+        this._scrollCompensator.scrollToRight(dataLength);
         this.deps.scheduleDraw();
     }
     // ── Comparison price range ──
     getComparisonEquivalentPriceRange(range) {
-        if (this._comparisonSpecs.length === 0 || this._comparisonData.size === 0)
+        if (this._comparisonManager.specs.length === 0 || this._comparisonManager.data.size === 0)
             return null;
         const buf = this.getActiveDataBuffer();
         const internalData = buf ? buf.getRawData() : [];
@@ -864,8 +631,8 @@ export class ChartDataManager {
         const baseDate = baseItem.date ?? '';
         let min = Number.POSITIVE_INFINITY;
         let max = Number.NEGATIVE_INFINITY;
-        for (const spec of this._comparisonSpecs) {
-            const data = this._comparisonData.get(spec.symbol);
+        for (const spec of this._comparisonManager.specs) {
+            const data = this._comparisonManager.data.get(spec.symbol);
             if (!data?.length)
                 continue;
             const baseline = baseDate
@@ -904,7 +671,7 @@ export class ChartDataManager {
     getLogicalSlotCount() {
         const buf = this.getActiveDataBuffer();
         const dataLength = buf ? buf.getRawData().length : 0;
-        return dataLength + this.getTrailingSlotCount();
+        return dataLength + 24;
     }
     getTimestampAtLogicalIndex(index) {
         const buf = this.getActiveDataBuffer();
@@ -939,17 +706,17 @@ export class ChartDataManager {
         return index;
     }
     disposeAllBuffers() {
-        for (const key of this._buffers.keys()) {
+        for (const key of this._klineBuffers.keys()) {
+            this.disposeBuffer(key);
+        }
+        for (const key of this._tsBuffers.keys()) {
             this.disposeBuffer(key);
         }
     }
     destroy() {
         this._activeBufferUnsub?.();
         this.disposeAllBuffers();
-        this.clearIncrementalLoadHintTimer();
-        this.incrementalLoadHintEl?.remove();
-        this.incrementalLoadHintEl = null;
-        this.pendingPrependedCount = 0;
+        this._loadHint.destroy();
     }
 }
 function findComparisonBaselineByDate(data, date) {
@@ -966,11 +733,4 @@ function findComparisonBaselineByTimestamp(data, timestamp) {
     }
     return null;
 }
-function batchFormatDate(ts) {
-    const d = new Date(ts);
-    const y = d.getFullYear();
-    const m = String(d.getMonth() + 1).padStart(2, '0');
-    const day = String(d.getDate()).padStart(2, '0');
-    return `${y}-${m}-${day}`;
-}
 //# sourceMappingURL=chartDataManager.js.map