@363045841yyt/klinechart-core 0.8.14 → 0.9.0-alpha.0

package/dist/engine/data/chartDataManager.js

@@ -1,15 +1,13 @@
-import { DataBuffer } from '../../data-fetchers/dataBuffer';
-import { getPeriodDays } from '../../data-fetchers/dataBuffer.effects';
-import { TimeShareBuffer } from '../../data-fetchers/timeShareBuffer';
-import { createSignal } from '../../reactivity/signal';
+import { DataBuffer } from '../../data/dataBuffer';
+import { getPeriodDays } from '../../data/dataBuffer.effects';
+import { TimeShareBuffer } from '../../data/timeShareBuffer';
+import { createSignal } from '../../foundation/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';
 const BUF_COMPARISON = 'cmp';
 const BUF_TIMESHARE = 'ts';
@@ -24,36 +22,40 @@ export class ChartDataManager {
     _timeShareFetcher = null;
     _klineBuffers = new Map();
     _tsBuffers = new Map();
-    _activeBufferKey = null;
-    _activeBufferUnsub = null;
-    _dataSignal = createSignal([]);
-    _loadingSignal = createSignal(false);
-    _symbolsSignal = createSignal([]);
-    /** Available symbol catalog — consumed by UI pickers (e.g. TopToolbar) */
-    _symbolCatalog = createSignal([]);
-    _currentSpec = null;
+    get _activeKey() {
+        return this._dataState.readonly.activeBufferKey.peek();
+    }
+    _dataState;
+    _dmState;
+    _dataUnsub = null;
+    _loadingUnsub = null;
+    _lastDataChange = null;
     _batchScheduler = new FetchBatchScheduler();
     _scrollCompensator;
     _comparisonManager;
+    _comparisonSpecsUnsub = null;
     _loadHint;
-    _savedScrollLeft = null;
-    _preCustomSpec = null;
-    lastVisibleRange = { start: 0, end: 0 };
-    lastRawVisibleRange = { start: 0, end: 0 };
-    pendingIndicatorDataUpdate = false;
+    _pendingIncrementalLoadFlushTimer = 0;
     deps;
-    constructor(deps) {
+    constructor(deps, dataState, dmState) {
         this.deps = deps;
+        this._dataState = dataState;
+        this._dmState = dmState;
         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(),
+            getSpecs: () => this.deps.comparisonSpecs$.peek(),
+            setLoading: (loading) => this.deps.setComparisonLoading(loading),
         });
+        this._comparisonSpecsUnsub = this.deps.comparisonSpecs$.subscribe(() => {
+            this.reconcileComparisonBuffers();
+        });
+        this.reconcileComparisonBuffers();
     }
     // ── Buffer helpers ──
     _lookupBuffer(key) {
@@ -65,38 +67,90 @@ export class ChartDataManager {
         return this._klineBuffers.get(key);
     }
     activateBuffer(key) {
-        if (this._activeBufferKey === key)
+        if (this._activeKey === key)
             return;
-        this._activeBufferUnsub?.();
-        this._activeBufferKey = key;
+        this.resetIncrementalLoadHintBatch();
+        this.bindActiveBuffer(key);
+    }
+    /** 订阅当前 active buffer 的 data/loading，路径为 subscription → Action */
+    bindActiveBuffer(key) {
+        this.unbindActiveBuffer();
         const buf = this._lookupBuffer(key);
-        if (buf) {
-            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([...change.data]);
-                this.onBufferDataChanged(key, prevDataLength, change.prependedCount);
-            });
-            const unsubLoading = buf.loading.subscribe(() => {
-                this._loadingSignal.set(buf.loading.peek());
+        if (!buf) {
+            this._dataState.actions.applyActiveBufferSnapshot({
+                key,
+                data: [],
+                loading: false,
             });
-            this._activeBufferUnsub = () => {
-                unsubData();
-                unsubLoading();
-            };
-        }
-        else {
-            this._dataSignal.set([]);
-            this._loadingSignal.set(false);
-            this._activeBufferUnsub = null;
+            return;
         }
+        this._dataUnsub = buf.data.subscribe(() => {
+            this.handleBufferDataEvent(key);
+        });
+        this._loadingUnsub = buf.loading.subscribe(() => {
+            this.handleBufferLoadingEvent(key);
+        });
+        // 初始同步：key/data/loading 同批；subscribe 不回放当前值
+        const { dataChanged, prependedCount, prevDataLength } = this.publishBufferSnapshot(key, buf, true);
+        if (dataChanged) {
+            this.onBufferDataChanged(key, prevDataLength, prependedCount);
+        }
+        if (!buf.loading.peek()) {
+            this.scheduleIncrementalLoadHintFlush(key);
+        }
+    }
+    unbindActiveBuffer() {
+        this._dataUnsub?.();
+        this._loadingUnsub?.();
+        this._dataUnsub = null;
+        this._loadingUnsub = null;
+        this._lastDataChange = null;
+    }
+    publishBufferSnapshot(key, buf, forceData) {
+        const dataChange = buf.data.peek();
+        const dataChanged = forceData || dataChange !== this._lastDataChange;
+        const prevDataLength = this._dataState.readonly.dataLength.peek();
+        const prependedCount = dataChanged ? dataChange.prependedCount : 0;
+        if (dataChanged)
+            this._lastDataChange = dataChange;
+        this._dataState.actions.applyActiveBufferSnapshot({
+            key,
+            data: dataChanged
+                ? [...dataChange.data]
+                : this._dataState.readonly.data.peek(),
+            loading: buf.loading.peek(),
+        });
+        return { dataChanged, prependedCount, prevDataLength };
+    }
+    handleBufferDataEvent(key) {
+        if (this._dataState.readonly.activeBufferKey.peek() !== key)
+            return;
+        const buf = this._lookupBuffer(key);
+        if (!buf)
+            return;
+        const { dataChanged, prependedCount, prevDataLength } = this.publishBufferSnapshot(key, buf, false);
+        if (!dataChanged)
+            return;
+        this.onBufferDataChanged(key, prevDataLength, prependedCount);
+    }
+    handleBufferLoadingEvent(key) {
+        if (this._dataState.readonly.activeBufferKey.peek() !== key)
+            return;
+        const buf = this._lookupBuffer(key);
+        if (!buf)
+            return;
+        this.publishBufferSnapshot(key, buf, false);
+        if (!buf.loading.peek())
+            this.scheduleIncrementalLoadHintFlush(key);
     }
     disposeBuffer(key) {
         const buf = this._lookupBuffer(key);
         if (!buf)
             return;
+        if (this._activeKey === key) {
+            this.unbindActiveBuffer();
+            this.resetIncrementalLoadHintBatch();
+        }
         buf.dispose();
         if (key.startsWith(BUF_TIMESHARE))
             this._tsBuffers.delete(key);
@@ -104,13 +158,13 @@ export class ChartDataManager {
             this._klineBuffers.delete(key);
     }
     getActiveDataBuffer() {
-        return this._activeBufferKey && !this._activeBufferKey.startsWith(BUF_TIMESHARE)
-            ? (this._klineBuffers.get(this._activeBufferKey) ?? null)
+        return this._activeKey && !this._activeKey.startsWith(BUF_TIMESHARE)
+            ? (this._klineBuffers.get(this._activeKey) ?? null)
             : null;
     }
     getActiveTimeShareBuffer() {
-        return this._activeBufferKey?.startsWith(BUF_TIMESHARE) === true
-            ? (this._tsBuffers.get(this._activeBufferKey) ?? null)
+        return this._activeKey?.startsWith(BUF_TIMESHARE) === true
+            ? (this._tsBuffers.get(this._activeKey) ?? null)
             : null;
     }
     getPrimaryDataBuffer(symbol, period) {
@@ -166,106 +220,125 @@ export class ChartDataManager {
         else {
             this._scrollCompensator.adjustScrollAfterDataChange(bufferData.length);
         }
-        if ((prevDataLength ?? this._dataSignal.peek().length) === 0 && bufferData.length > 0) {
+        if ((prevDataLength ?? this._dataState.readonly.dataLength.peek()) === 0 &&
+            bufferData.length > 0) {
             this.scrollToRight();
         }
         this.deps.resetInteraction();
-        if (this.lastVisibleRange.start === 0 &&
-            this.lastVisibleRange.end === 0 &&
-            bufferData.length > 0) {
-            const plotWidth = this.deps.getObservedSize().width > 0
-                ? this.deps.getObservedSize().width
-                : Math.max(1, Math.round(this.deps.getDom().container?.clientWidth ?? 800));
-            const dpr = this.deps.getEffectiveDpr();
-            const opt = this.deps.getOption();
-            const { start, end } = getVisibleRange(this.deps.getLogicalScrollLeft(), plotWidth, opt.kWidth, opt.kGap, bufferData.length, dpr);
-            this.lastRawVisibleRange = { start, end };
-            this.lastVisibleRange = { start: Math.max(0, start), end };
+        if (!this._dmState.readonly.rangeInitialized.peek() && bufferData.length > 0) {
+            this._dmState.actions.setRangeInitialized(true);
+        }
+        let currentRange = this.deps.getVisibleRange();
+        if (!currentRange && this._dmState.readonly.rangeInitialized.peek() && bufferData.length > 0) {
+            currentRange = { start: 0, end: bufferData.length };
+        }
+        if (currentRange) {
+            const scheduler = this.deps.getIndicatorScheduler();
+            const indicatorsReady = scheduler.update(bufferData, currentRange);
+            if (indicatorsReady) {
+                this.deps.scheduleDraw();
+                this.deps.onDataProcessed?.(bufferData, currentRange);
+            }
         }
-        const scheduler = this.deps.getIndicatorScheduler();
-        const indicatorsReady = scheduler.update(bufferData, this.lastVisibleRange);
-        if (indicatorsReady) {
-            this.pendingIndicatorDataUpdate = false;
-            this.deps.scheduleDraw();
-            this.deps.onDataProcessed?.(bufferData, this.lastVisibleRange);
+        if (prependedCount > 0) {
+            this.recordIncrementalLoad(prependedCount);
+            this.checkVisibleRangeGap();
         }
-        else {
-            this.pendingIndicatorDataUpdate = true;
+    }
+    recordIncrementalLoad(prependedCount) {
+        this._dmState.actions.recordIncrementalLoad(prependedCount, this.deps.getLeftLoadBufferWidth());
+    }
+    scheduleIncrementalLoadHintFlush(key) {
+        if (this._dmState.readonly.pendingIncrementalLoad.peek().count <= 0 ||
+            this._pendingIncrementalLoadFlushTimer !== 0) {
+            return;
         }
-        this._loadHint.show(prependedCount, this.getLeftLoadBufferWidth());
+        this._pendingIncrementalLoadFlushTimer = window.setTimeout(() => {
+            this._pendingIncrementalLoadFlushTimer = 0;
+            if (this._activeKey !== key)
+                return;
+            const buf = this._lookupBuffer(key);
+            if (!buf || buf.loading.peek())
+                return;
+            this.flushIncrementalLoadHint();
+        }, 0);
+    }
+    flushIncrementalLoadHint() {
+        const { count, leftBufferWidth } = this._dmState.actions.flushIncrementalLoad();
+        if (count <= 0)
+            return;
+        this._loadHint.show(count, leftBufferWidth);
+    }
+    resetIncrementalLoadHintBatch() {
+        if (this._pendingIncrementalLoadFlushTimer !== 0) {
+            clearTimeout(this._pendingIncrementalLoadFlushTimer);
+            this._pendingIncrementalLoadFlushTimer = 0;
+        }
+        this._dmState.actions.resetIncrementalLoad();
+        this._loadHint.hide();
     }
     onTimeShareBufferChanged() {
-        const data = this._dataSignal.peek();
-        this.lastVisibleRange = { start: 0, end: data.length };
-        this.lastRawVisibleRange = { start: 0, end: data.length };
+        const data = this._dataState.readonly.data.peek();
+        this._dmState.actions.setRangeInitialized(true);
         this.deps.resetInteraction();
         this.deps.onTimeShareDataReady(data.length);
     }
     // ── Internal helpers ──
     getLeftLoadBufferWidth() {
-        const buf = this.getActiveDataBuffer();
-        const dataLength = buf ? buf.getRawData().length : 0;
-        return this._scrollCompensator.getLeftLoadBufferWidth(dataLength);
+        return this.deps.getLeftLoadBufferWidth();
     }
     getActiveKLineLength() {
         const buf = this.getActiveDataBuffer();
         return buf ? buf.getRawData().length : 0;
     }
-    computeRawVisibleRange() {
-        const buf = this.getActiveDataBuffer();
-        const dataLength = buf ? buf.getRawData().length : 0;
-        if (dataLength === 0)
-            return null;
-        const vp = this.deps.getViewport();
-        if (!vp)
-            return null;
-        const opt = this.deps.getOption();
-        return getVisibleRange(vp.scrollLeft, vp.plotWidth, opt.kWidth, opt.kGap, dataLength, vp.dpr);
+    /** 当前可见范围（on-demand 实时计算，消除 stale 缓存） */
+    getCurrentVisibleRange() {
+        return this.deps.getVisibleRange();
     }
     /** Unified data signal — always reflects the active buffer's data */
     get data() {
-        return this._dataSignal;
+        return this._dataState.readonly.data;
     }
     /** Loading signal — mirrors the active buffer's loading state */
     get loading() {
-        return this._loadingSignal;
+        return this._dataState.readonly.loading;
     }
     get symbols() {
-        return this._symbolsSignal;
+        return this._dataState.readonly.symbols;
     }
     get symbolCatalog() {
-        return this._symbolCatalog;
+        return this._dataState.readonly.symbolCatalog;
     }
     /**
      * Register symbols into the available catalog.
      * Deduplicates by symbol code: newer entries replace older ones.
      */
     registerSymbols(infos) {
-        const current = new Map(this._symbolCatalog.peek().map((s) => [s.code, s]));
+        const current = new Map(this._dataState.readonly.symbolCatalog.peek().map((s) => [s.symbol, s]));
         for (const info of infos)
-            current.set(info.code, info);
-        this._symbolCatalog.set([...current.values()]);
+            current.set(info.symbol, info);
+        this._dataState.actions.setSymbolCatalog([...current.values()]);
     }
     /** Remove a symbol from the catalog by code. */
-    unregisterSymbol(code) {
-        const next = this._symbolCatalog.peek().filter((s) => s.code !== code);
-        if (next.length < this._symbolCatalog.peek().length) {
-            this._symbolCatalog.set(next);
+    unregisterSymbol(symbol) {
+        const next = this._dataState.readonly.symbolCatalog.peek().filter((s) => s.symbol !== symbol);
+        if (next.length < this._dataState.readonly.symbolCatalog.peek().length) {
+            this._dataState.actions.setSymbolCatalog(next);
         }
     }
     get currentPeriod() {
-        return this._currentSpec?.period ?? 'daily';
+        return this._dmState.readonly.currentPeriod();
     }
     /** Internal KLine data for indicator scheduler (empty in timeshare mode) */
     getInternalData() {
         const buf = this.getActiveDataBuffer();
         if (buf)
             return buf.getRawData();
-        const peek = this._dataSignal.peek();
+        const peek = this._dataState.readonly.data();
         return peek.length > 0 ? peek : [];
     }
     getRenderData() {
-        return [...this._dataSignal.peek()];
+        return this._dataState.readonly.data.peek();
     }
     getMonthKeys() {
         return this.getActiveDataBuffer()?.getMonthKeys() ?? null;
@@ -292,7 +365,7 @@ export class ChartDataManager {
         return this._comparisonManager.data;
     }
     getComparisonSpecs() {
-        return this._comparisonManager.specs;
+        return this.deps.comparisonSpecs$.peek().map((spec) => ({ ...spec }));
     }
     get dataBuffer() {
         const buf = this.getActiveDataBuffer();
@@ -307,13 +380,13 @@ export class ChartDataManager {
         return fallback;
     }
     get comparisonColors() {
-        return this._comparisonManager.colorsSignal;
+        return this.deps.comparisonColors$;
     }
     get comparisonLoading() {
-        return this._comparisonManager.loadingSignal;
+        return this.deps.comparisonLoading$;
     }
     getComparisonColors() {
-        return this._comparisonManager.getColors();
+        return new Map(this.deps.comparisonColors$.peek());
     }
     // ── Data updates (KLine) ──
     updateData(data) {
@@ -330,7 +403,7 @@ export class ChartDataManager {
             buf.setInlineData(data);
         }
         else {
-            this._dataSignal.set([...data]);
+            this._dataState.actions.setData([...data]);
         }
     }
     appendData(newData) {
@@ -340,7 +413,7 @@ export class ChartDataManager {
             buf.setInlineData(merged);
         }
         else {
-            this._dataSignal.set([...this._dataSignal.peek(), ...newData]);
+            this._dataState.actions.setData([...this._dataState.readonly.data(), ...newData]);
         }
     }
     getData() {
@@ -372,7 +445,9 @@ export class ChartDataManager {
         const window = buf.loadedWindow;
         if (!window)
             return;
-        const range = this.computeRawVisibleRange() ?? this.lastRawVisibleRange;
+        const range = this.deps.getVisibleRange();
+        if (!range)
+            return;
         const MS_PER_DAY = 86_400_000;
         const spec = buf.currentSpec;
         const gapDays = getPeriodDays(spec?.period);
@@ -393,41 +468,73 @@ export class ChartDataManager {
         this._comparisonManager.ensureRange(firstVisibleTs, window.earliestTs);
     }
     // ── Comparison management ──
-    syncComparisonBuffers(specs) {
+    reconcileComparisonBuffers() {
         const primaryBuf = this.getActiveDataBuffer();
-        this._comparisonManager.syncBuffers(specs, primaryBuf?.loadedWindow?.earliestTs);
-    }
-    clearComparisonBuffers() {
-        this._comparisonManager.clearAll();
+        this._comparisonManager.reconcile(primaryBuf?.loadedWindow?.earliestTs);
     }
     addComparisonSymbol(spec) {
-        this._comparisonManager.addSymbol(spec, () => {
-            const allSpecs = this._symbolsSignal.peek();
-            this._symbolsSignal.set([allSpecs[0], ...this._comparisonManager.specs]);
-        });
+        const primary = this._dataState.readonly.symbols.peek()[0];
+        if (!primary || this.deps.comparisonSpecs$.peek().some((item) => item.symbol === spec.symbol))
+            return;
+        this.deps.setSymbols([primary, ...this.deps.comparisonSpecs$.peek(), spec]);
     }
     setComparisonData(symbol, data) {
-        this._comparisonManager.setData(symbol, data, (key) => {
-            this._symbolsSignal.set([
-                this._symbolsSignal.peek()[0],
-                ...this._comparisonManager.specs,
+        const primary = this._dataState.readonly.symbols.peek()[0];
+        if (!primary)
+            return;
+        if (!this.deps.comparisonSpecs$.peek().some((spec) => spec.symbol === symbol)) {
+            this.deps.setSymbols([
+                primary,
+                ...this.deps.comparisonSpecs$.peek(),
+                { symbol, period: 'daily' },
             ]);
-        });
+        }
+        this._comparisonManager.setData(symbol, data);
     }
     removeComparisonSymbol(symbol) {
-        if (!this._comparisonManager.removeSymbol(symbol))
+        const primary = this._dataState.readonly.symbols.peek()[0];
+        if (!primary || !this.deps.comparisonSpecs$.peek().some((spec) => spec.symbol === symbol))
             return;
-        this._symbolsSignal.set([this._symbolsSignal.peek()[0], ...this._comparisonManager.specs]);
+        this.deps.setSymbols([
+            primary,
+            ...this.deps.comparisonSpecs$.peek().filter((spec) => spec.symbol !== symbol),
+        ]);
         this.deps.scheduleDraw();
     }
     // ── Symbol / Period ──
     setCurrentSymbol(symbol) {
-        const current = this._currentSpec ?? { symbol };
-        this._currentSpec = { ...current, symbol };
-        const specs = this._symbolsSignal.peek();
+        const current = this._dmState.readonly.currentSpec.peek() ?? { symbol };
+        this._dmState.actions.setCurrentSpec({ ...current, symbol });
+        const specs = this._dataState.readonly.symbols.peek();
         if (specs.length > 0) {
             const updated = [{ ...specs[0], symbol }, ...specs.slice(1)];
-            this._symbolsSignal.set(updated);
+            this.deps.setSymbols(updated);
+        }
+    }
+    /** 进入分时模式前保存当前 K 线第一根可见数据的时间戳，用于退出后恢复滚动位置 */
+    _saveKLineScrollTimestamp() {
+        const kBuf = this.getActiveDataBuffer();
+        const rawFromBuf = kBuf?.getRawData();
+        const kRaw = rawFromBuf ?? this._dataState.readonly.data();
+        const dataLen = kRaw?.length ?? 0;
+        let visibleStart = 0;
+        if (dataLen > 0) {
+            const vp = this.deps.getViewport();
+            if (vp) {
+                const opt = this.deps.getOption();
+                const vRange = getVisibleRange(vp.scrollLeft, vp.plotWidth, opt.kWidth, opt.kGap, dataLen, vp.dpr);
+                visibleStart = vRange ? Math.max(0, vRange.start) : 0;
+            }
+        }
+        // 双路径守卫：
+        //   - switchToTimeShareForDate 路径：setTimeShareQueryDate 已在
+        //     activateBuffer 之前调用此方法，已保存 → 跳过。
+        //   - 直接 setSymbols({period:'timeshare'}) 路径：未经过
+        //     setTimeShareQueryDate，_savedScrollTimestamp 为 null → 正常写入。
+        if (this._dmState.readonly.savedScrollTimestamp.peek() === null) {
+            this._dmState.actions.setSavedScrollTimestamp(kRaw && visibleStart >= 0 && visibleStart < kRaw.length
+                ? kRaw[visibleStart].timestamp
+                : null);
         }
     }
     setTimeShareQueryDate(date) {
@@ -436,11 +543,13 @@ export class ChartDataManager {
             buf.setQueryDate(date);
         }
         else {
-            // Store for later when buffer is created
+            // Save scroll timestamp before activateBuffer clears _dataSignal,
+            // so setSymbols can't overwrite the saved value with empty TS data.
+            this._saveKLineScrollTimestamp();
             const tsBuf = new TimeShareBuffer();
             tsBuf.setFetcher(this._timeShareFetcher);
             tsBuf.setQueryDate(date);
-            const spec = this._currentSpec;
+            const spec = this._dmState.readonly.currentSpec.peek();
             if (spec) {
                 const key = bufKey(BUF_TIMESHARE, spec.symbol);
                 this._tsBuffers.set(key, tsBuf);
@@ -450,13 +559,13 @@ export class ChartDataManager {
         }
     }
     setCurrentPeriod(period) {
-        const current = this._currentSpec;
+        const current = this._dmState.readonly.currentSpec.peek();
         if (!current) {
-            this._currentSpec = { symbol: '', period };
+            this._dmState.actions.setCurrentSpec({ symbol: '', period });
             return;
         }
         const next = { ...current, period };
-        this.setSymbols([next, ...this._comparisonManager.specs]);
+        this.setSymbols([next, ...this.deps.comparisonSpecs$.peek()]);
     }
     /**
      * 归一化 K 线周期别名，防止无效 period 进入引擎
@@ -473,8 +582,11 @@ export class ChartDataManager {
     applyCustomData(source) {
         const plainData = source.data.map((d) => ({ ...d }));
         // 首次调用时保存原始 spec，用于切回 Fetcher 时恢复
-        if (!this._preCustomSpec) {
-            this._preCustomSpec = { ...(this._currentSpec ?? this._symbolsSignal.peek()[0] ?? { symbol: '' }) };
+        if (!this._dmState.readonly.preCustomSpec.peek()) {
+            this._dmState.actions.setPreCustomSpec({
+                ...(this._dmState.readonly.currentSpec.peek() ??
+                    this._dataState.readonly.symbols.peek()[0] ?? { symbol: '' }),
+            });
         }
         // 每次都切到 custom 品种，注册到目录，填入数据
         const spec = {
@@ -483,12 +595,12 @@ export class ChartDataManager {
             incremental: false,
             source: source.source ?? 'custom',
         };
-        this.setSymbols([spec, ...this._comparisonManager.specs]);
+        this.setSymbols([spec, ...this.deps.comparisonSpecs$.peek()]);
         const symbolCode = spec.symbol;
         if (symbolCode) {
             this.registerSymbols([
                 {
-                    code: symbolCode,
+                    symbol: symbolCode,
                     description: source.description ?? symbolCode,
                     exchange: source.exchange ?? '',
                     source: source.source ?? 'custom',
@@ -507,41 +619,44 @@ export class ChartDataManager {
         }
     }
     resetToFetcher(spec) {
-        if (this._activeBufferKey && !this._activeBufferKey.startsWith(BUF_TIMESHARE)) {
-            this.disposeBuffer(this._activeBufferKey);
+        if (this._activeKey && !this._activeKey.startsWith(BUF_TIMESHARE)) {
+            this.disposeBuffer(this._activeKey);
         }
-        this._dataSignal.set([]);
-        this.lastVisibleRange = { start: 0, end: 0 };
-        this.lastRawVisibleRange = { start: 0, end: 0 };
-        this._savedScrollLeft = null;
-        this.setSymbols([spec, ...this._comparisonManager.specs]);
+        this._dataState.actions.setData([]);
+        this._dmState.actions.setRangeInitialized(false);
+        this._dmState.actions.setSavedScrollTimestamp(null);
+        this.setSymbols([spec, ...this.deps.comparisonSpecs$.peek()]);
     }
     getPreCustomSpec() {
-        return this._preCustomSpec;
+        return this._dmState.readonly.preCustomSpec.peek();
     }
     // ── Main symbol switching ──
     setSymbols(specs) {
-        this._symbolsSignal.set(specs);
-        if (specs.length === 0) {
-            this._currentSpec = null;
+        const selection = specs[0]?.period === 'timeshare' ? specs.slice(0, 1) : specs;
+        this.deps.setSymbols(selection);
+        if (selection.length === 0) {
+            this._dmState.actions.setCurrentSpec(null);
             this.disposeAllBuffers();
-            this._dataSignal.set([]);
-            this.lastVisibleRange = { start: 0, end: 0 };
-            this.lastRawVisibleRange = { start: 0, end: 0 };
+            this._dataState.actions.applyActiveBufferSnapshot({
+                key: null,
+                data: [],
+                loading: false,
+            });
+            this._dmState.actions.setRangeInitialized(false);
             return;
         }
-        const primary = specs[0];
-        this._currentSpec = primary;
+        const primary = selection[0];
+        this._dmState.actions.setCurrentSpec(primary);
         if (primary.period === 'timeshare') {
             // Switch to timeshare mode
-            this.clearComparisonBuffers();
-            // Save scroll position so we can restore it when returning to K-line mode
-            this._savedScrollLeft = this.deps.getCachedScrollLeft();
+            // Save scroll position before activating TS buffer (which clears _dataSignal).
+            // Guarded by _savedScrollTimestamp === null so setTimeShareQueryDate (which
+            // calls this method first) won't be overwritten.
+            this._saveKLineScrollTimestamp();
             // 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 };
+            this._dataState.actions.setData([]);
+            this._dmState.actions.setRangeInitialized(false);
             // Get or create timeshare buffer
             const tsKey = bufKey(BUF_TIMESHARE, primary.symbol);
             let tsBuf = this._tsBuffers.get(tsKey);
@@ -559,12 +674,11 @@ export class ChartDataManager {
         for (const [key] of this._tsBuffers) {
             this.disposeBuffer(key);
         }
-        this.loadKLineSymbols(specs);
+        this.loadKLineSymbols(selection);
     }
     // ── KLine loading ──
     loadKLineSymbols(specs) {
         const spec = specs[0];
-        this.syncComparisonBuffers(specs.slice(1));
         const buf = this.getPrimaryDataBuffer(spec.symbol, spec.period);
         this.activateBuffer(bufKey(BUF_PRIMARY, spec.symbol, spec.period));
         if (!this._dataFetcher) {
@@ -581,11 +695,10 @@ export class ChartDataManager {
                 incremental: spec.incremental ?? buf.currentSpec?.incremental ?? true,
             });
             this.deps.resetInteraction();
-            if (this._savedScrollLeft !== null) {
-                this.deps.setScrollLeft(this._savedScrollLeft);
-                this._savedScrollLeft = null;
-            }
-            else {
+            // Scroll restoration from _savedScrollTimestamp is deferred to
+            // chart → tryRestoreScrollFromSnapshot() so kWidth/kGap have been
+            // restored by setActiveMode before scrollLeft calculation.
+            if (this._dmState.readonly.savedScrollTimestamp.peek() === null) {
                 this.scrollToRight();
             }
             return;
@@ -596,20 +709,30 @@ export class ChartDataManager {
         }
         buf.setSymbol(spec);
     }
+    /** 退出分时图时根据保存的时间戳恢复 K 线滚动位置。返回是否成功恢复。 */
+    tryRestoreScrollFromSnapshot() {
+        if (this._dmState.readonly.savedScrollTimestamp.peek() === null)
+            return false;
+        const buf = this.getActiveDataBuffer();
+        const raw = buf ? buf.getRawData() : null;
+        if (!raw || raw.length === 0)
+            return false;
+        const idx = raw.findIndex((d) => d.timestamp >= this._dmState.readonly.savedScrollTimestamp.peek());
+        this._dmState.actions.setSavedScrollTimestamp(null);
+        if (idx >= 0) {
+            const dpr = this.deps.getEffectiveDpr();
+            const opt = this.deps.getOption();
+            const { unitPx, startXPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr);
+            const leftBuffer = this.getLeftLoadBufferWidth();
+            const scrollLeft = ((idx + 1) * unitPx + startXPx) / dpr + leftBuffer;
+            this.deps.setScrollLeft(scrollLeft);
+            return true;
+        }
+        return false;
+    }
     // ── Content width ──
     getContentWidth() {
-        if (this.currentPeriod === 'timeshare') {
-            const tsData = this.getTimeShareData();
-            if (tsData.length === 0)
-                return 0;
-            const viewWidth = this.deps.getViewport()?.plotWidth ?? 0;
-            return this.getLeftLoadBufferWidth() + Math.max(viewWidth, 1);
-        }
-        const buf = this.getActiveDataBuffer();
-        const dataLength = buf ? buf.getRawData().length : 0;
-        if (dataLength === 0)
-            return 0;
-        return this._scrollCompensator.getContentWidth(dataLength);
+        return this.deps.getContentWidth();
     }
     scrollToRight() {
         const buf = this.getActiveDataBuffer();
@@ -714,7 +837,10 @@ export class ChartDataManager {
         }
     }
     destroy() {
-        this._activeBufferUnsub?.();
+        this._comparisonSpecsUnsub?.();
+        this._comparisonSpecsUnsub = null;
+        this._comparisonManager.clearAll();
+        this.unbindActiveBuffer();
         this.disposeAllBuffers();
         this._loadHint.destroy();
     }