@363045841yyt/klinechart-core 0.8.7 → 0.8.9

package/src/data-fetchers/dataBuffer.ts

@@ -8,10 +8,26 @@ export interface DataWindow {
 }
 
 const MS_PER_DAY = 86_400_000
-const INITIAL_LOAD_DAYS = 365
-const INCREMENTAL_LOAD_DAYS = 90
 const FETCH_MAX_RETRIES = 2
 
+const PERIOD_INITIAL_DAYS: Record<string, number> = {
+  '1min': 3,
+  '5min': 30,
+  '15min': 60,
+  '30min': 90,
+  '60min': 180,
+  daily: 365,
+  weekly: 365,
+  monthly: 365,
+  quarterly: 365,
+  yearly: 365,
+  timeshare: 1,
+}
+
+export function getPeriodDays(period?: string): number {
+  return PERIOD_INITIAL_DAYS[period ?? 'daily'] ?? 365
+}
+
 function formatDate(ts: number): string {
     const d = new Date(ts)
     const y = d.getFullYear()
@@ -47,6 +63,8 @@ export class DataBuffer implements DataBufferLike {
     private _pendingFetch: Promise<void> | null = null
     private _disposed = false
     private _attemptedBoundaries: Set<number> = new Set()
+    private _monthKeys: Int32Array | null = null
+    private _dayKeys: Int32Array | null = null
 
     onPrepend: ((count: number) => void) | null = null
 
@@ -75,6 +93,33 @@ export class DataBuffer implements DataBufferLike {
         return this._data
     }
 
+    getMonthKeys(): Int32Array | null {
+        return this._monthKeys
+    }
+
+    getDayKeys(): Int32Array | null {
+        return this._dayKeys
+    }
+
+    private _precomputeKeys(): void {
+        const n = this._data.length
+        if (n === 0) {
+            this._monthKeys = null
+            this._dayKeys = null
+            return
+        }
+        const monthKeys = new Int32Array(n)
+        const dayKeys = new Int32Array(n)
+        for (let i = 0; i < n; i++) {
+            const d = new Date(this._data[i]!.timestamp)
+            monthKeys[i] = d.getFullYear() * 12 + d.getMonth()
+            const yearStart = new Date(d.getFullYear(), 0, 0)
+            dayKeys[i] = d.getFullYear() * 366 + Math.floor((d.getTime() - yearStart.getTime()) / 86400000)
+        }
+        this._monthKeys = monthKeys
+        this._dayKeys = dayKeys
+    }
+
     setFetcher(fetcher: DataFetcher | null): void {
         this._fetcher = fetcher
     }
@@ -88,6 +133,8 @@ export class DataBuffer implements DataBufferLike {
         this._data = []
         this._loadedWindow = null
         this._attemptedBoundaries.clear()
+        this._monthKeys = null
+        this._dayKeys = null
         this._dataSignal.set([])
         if (initialStartTs !== undefined) {
             this.loadInitialRange(initialStartTs, Date.now())
@@ -110,15 +157,16 @@ export class DataBuffer implements DataBufferLike {
         this.fetchRange(requestStartTs, incrementalEnd)
     }
 
-    private loadInitial(): void {
-        if ((!this._requestFetch && !this._fetcher) || !this._currentSpec || this._disposed) return
+	private loadInitial(): void {
+		if ((!this._requestFetch && !this._fetcher) || !this._currentSpec || this._disposed) return
 
-        const now = Date.now()
-        const startDate = now - INITIAL_LOAD_DAYS * MS_PER_DAY
-        const endDate = now
+		const now = Date.now()
+		const days = getPeriodDays(this._currentSpec.period)
+		const startDate = now - days * MS_PER_DAY
+		const endDate = now
 
-        this.fetchRange(startDate, endDate)
-    }
+		this.fetchRange(startDate, endDate)
+	}
 
     private loadInitialRange(startTs: number, endTs: number): void {
         if ((!this._requestFetch && !this._fetcher) || !this._currentSpec || this._disposed) return
@@ -182,6 +230,7 @@ export class DataBuffer implements DataBufferLike {
 
                 this._data = merged
                 this._dataSignal.set([...merged])
+                this._precomputeKeys()
 
                 if (merged.length > 0) {
                     const newEarliest = merged[0]!.timestamp
@@ -245,6 +294,7 @@ export class DataBuffer implements DataBufferLike {
             this._loadedWindow = null
         }
         this._attemptedBoundaries.clear()
+        this._precomputeKeys()
     }
 
     /**
@@ -260,5 +310,7 @@ export class DataBuffer implements DataBufferLike {
         this._data = []
         this._loadedWindow = null
         this._attemptedBoundaries.clear()
+        this._monthKeys = null
+        this._dayKeys = null
     }
 }

package/src/engine/chart.ts

@@ -194,8 +194,7 @@ export class Chart {
             getEffectiveDpr: () => this.viewportManager.getEffectiveDpr(),
             getLogicalScrollLeft: () => this.viewportManager.getLogicalScrollLeft(),
             getCachedScrollLeft: () => this.viewportManager.getCachedScrollLeft(),
-            setCachedScrollLeft: (v) => { this.viewportManager.setCachedScrollLeft(v) },
-            setPendingScrollLeft: (v) => { this.viewportManager.setPendingScrollLeft(v) },
+            setScrollLeft: (v) => { this.viewportManager.setScrollLeft(v) },
             getDom: () => this.dom,
             getObservedSize: () => this.viewportManager.getObservedSize(),
             getViewport: () => this.viewportManager.getViewport(),
@@ -352,7 +351,11 @@ export class Chart {
 
     /** 同步程序性 scrollLeft 写入后的缓存，避免等待异步 scroll 事件 */
     syncScrollLeft(scrollLeft: number): void {
-        this.viewportManager.setCachedScrollLeft(scrollLeft)
+        this.viewportManager.setScrollLeft(scrollLeft)
+    }
+
+    setScrollLeft(v: number): void {
+        this.viewportManager.setScrollLeft(v)
     }
 
     /** 获取逻辑 scrollLeft（减去左侧加载缓冲宽度，可为负值） */
@@ -608,49 +611,6 @@ export class Chart {
         return this.indicatorManager.getSubPaneEntry(paneId)
     }
 
-    private getDefaultSubPaneParams(indicatorId: SubIndicatorType): Record<string, unknown> {
-        // 默认参数定义在 SubPaneManager 中，这里导入使用
-        const defaults: Record<string, Record<string, unknown>> = {
-            VOLUME: {},
-            MACD: { fastPeriod: 12, slowPeriod: 26, signalPeriod: 9 },
-            RSI: { period1: 6, period2: 12, period3: 24 },
-            CCI: { period: 14, showCCI: true },
-            STOCH: { n: 9, m: 3, showK: true, showD: true },
-            MOM: { period: 10, showMOM: true },
-            WMSR: { period: 14, showWMSR: true },
-            KST: { roc1: 10, roc2: 15, roc3: 20, roc4: 30, signalPeriod: 9, showKST: true, showSignal: true },
-            FASTK: { period: 9, showFASTK: true },
-            ATR: { period: 14, showATR: true },
-            WMA: { period: 10, showWMA: true },
-            DEMA: { period: 14, showDEMA: true },
-            TEMA: { period: 14, showTEMA: true },
-            HMA: { period: 14, showHMA: true },
-            KAMA: { period: 10, fastPeriod: 2, slowPeriod: 30, showKAMA: true },
-            SAR: { step: 0.02, maxStep: 0.2, showSAR: true },
-            SUPERTREND: { atrPeriod: 10, multiplier: 3, showSuperTrend: true },
-            KELTNER: { emaPeriod: 20, atrPeriod: 10, multiplier: 2, showUpper: true, showMiddle: true, showLower: true },
-            DONCHIAN: { period: 20, showUpper: true, showMiddle: true, showLower: true },
-            ICHIMOKU: { tenkanPeriod: 9, kijunPeriod: 26, spanBPeriod: 52, displacement: 26, showTenkan: true, showKijun: true, showSpanA: true, showSpanB: true, showChikou: true, showCloud: true },
-            ROC: { period: 12, showROC: true },
-            TRIX: { period: 15, signalPeriod: 9, showTRIX: true, showSignal: true },
-            HV: { period: 20, annualizationFactor: 252, showHV: true },
-            PARKINSON: { period: 20, annualizationFactor: 252, showParkinson: true },
-            CHAIKIN_VOL: { emaPeriod: 10, rocPeriod: 10, showChaikinVol: true },
-            VMA: { period: 5, showVMA: true },
-            OBV: { showOBV: true },
-            PVT: { showPVT: true },
-            VWAP: { sessionResetGapMs: 0, showVWAP: true },
-            CMF: { period: 20, showCMF: true },
-            MFI: { period: 14, showMFI: true },
-            PIVOT: { showPP: true, showR1: true, showR2: true, showR3: false, showS1: true, showS2: true, showS3: false },
-            FIB: { period: 50, showLevels: true },
-            STRUCTURE: { leftWindow: 2, rightWindow: 2, breakoutSource: 'close', showSwingLabels: true, showBOS: true, showCHOCH: true, showProvisional: false },
-            ZONES: { showFVG: true, showOB: true, showFilledZones: true, obLookback: 5 },
-            VOLUME_PROFILE: { bins: 24, lookback: 0, valueAreaPercent: 0.7, showVolumeProfile: true },
-        }
-        return { ...(defaults[indicatorId] ?? {}) }
-    }
-
 
 
     /**
@@ -751,6 +711,11 @@ export class Chart {
         return this.dataManager.getContentWidth()
     }
 
+    /** 获取左侧加载缓冲宽度（视口宽度，用于计算 overlay 像素偏移） */
+    getLeftLoadBufferWidth(): number {
+        return this.dataManager.getLeftLoadBufferWidth()
+    }
+
     /** 滚动到最右侧（最新数据位置） */
     scrollToRight(): void {
         this.dataManager.scrollToRight()

package/src/engine/controller/interaction.ts

@@ -14,6 +14,27 @@ interface PointerLocation {
     mouseY: number
 }
 
+/** 悬停上下文 — 由 resolveHoverContext 创建，传递给后续所有子步骤 */
+interface HoverContext {
+    mouseX: number
+    mouseY: number
+    plotWidth: number
+    plotHeight: number
+    viewWidth: number
+    viewHeight: number
+    scrollLeft: number
+    dpr: number
+    worldX: number
+}
+
+/** 最近邻 K 线 bar — 由 findNearestBar 返回 */
+interface NearestBar {
+    localIdx: number
+    globalIdx: number
+    kLineStartX: number
+    widthLogical: number
+}
+
 export interface InteractionSnapshot {
     crosshairPos: { x: number; y: number } | null
     crosshairIndex: number | null
@@ -47,7 +68,7 @@ export class InteractionController {
         const dpr = this.chart.getCurrentDpr()
         const rounded = Math.round(clampedScrollLeft * dpr) / dpr
         container.scrollLeft = rounded
-        this.chart.syncScrollLeft(container.scrollLeft)
+        this.chart.setScrollLeft(container.scrollLeft)
     }
 
     /** 垂直拖动相关 */
@@ -633,9 +654,51 @@ export class InteractionController {
         this.activePaneId = pane?.id || null
     }
 
+    /**
+     * 指针悬停检测（coordinator）
+     *
+     * 每次指针移动时触发，按优先级依次检测：
+     * 边界 → pane 分隔器 → marker → K 线 bar → 十字线定位 → candle 命中 → tooltip。
+     * 每个步骤都可能提前 return，无需执行后续检测。
+     */
     private updatePlotHoverFromPoint(clientX: number, clientY: number) {
+        const ctx = this.resolveHoverContext(clientX, clientY)
+        if (!ctx) return
+
+        if (this.handleSeparatorHit(ctx)) return
+        if (this.handleMarkerHit(ctx)) return
+
+        const bar = this.findNearestBar(ctx)
+        if (!bar) {
+            this.clearHover()
+            return
+        }
+
+        this.positionCrosshair(ctx, bar)
+
+        if (this.chart.currentPeriod === 'timeshare') {
+            this.handleTimeshareHover(ctx, bar)
+            return
+        }
+
+        if (!this.hitTestCandle(ctx, bar)) {
+            this.hoveredIndex = null
+            return
+        }
+
+        this.hoveredIndex = bar.globalIdx
+        this.updateTooltip(ctx)
+    }
+
+    /**
+     * 解析悬停上下文
+     *
+     * 将 client 坐标转换为 plot 坐标，并做边界检查。
+     * 返回 null 表示指针不在 plot 区域内。
+     */
+    private resolveHoverContext(clientX: number, clientY: number): HoverContext | null {
         const location = this.getPlotPointerLocation(clientX, clientY)
-        if (!location) return
+        if (!location) return null
 
         const { mouseX, mouseY } = location
         const container = this.chart.getDom().container
@@ -644,17 +707,26 @@ export class InteractionController {
         const viewHeight = viewport?.viewHeight ?? Math.max(1, Math.round(container.clientHeight))
         const plotWidth = viewport?.plotWidth ?? viewWidth
         const plotHeight = viewport?.plotHeight ?? viewHeight
+
         if (mouseX < 0 || mouseY < 0 || mouseX > plotWidth || mouseY > plotHeight) {
             this.clearHover()
-            return
+            return null
         }
 
-        this.hoveredRightAxisPaneId = null
-
         const scrollLeft = this.chart.getLogicalScrollLeft()
         const dpr = this.chart.getCurrentDpr()
 
-        const separatorUpperPaneId = this.hitTestPaneSeparator(mouseY)
+        return { mouseX, mouseY, plotWidth, plotHeight, viewWidth, viewHeight, scrollLeft, dpr, worldX: scrollLeft + mouseX }
+    }
+
+    /**
+     * 检测 pane 分隔器悬停
+     *
+     * 若指针悬浮在 pane 分隔条上，清除十字线状态并返回 true。
+     */
+    private handleSeparatorHit(ctx: HoverContext): boolean {
+        this.hoveredRightAxisPaneId = null
+        const separatorUpperPaneId = this.hitTestPaneSeparator(ctx.mouseY)
         this.hoveredSeparatorUpperPaneId = separatorUpperPaneId
         if (separatorUpperPaneId) {
             this.crosshairPos = null
@@ -662,30 +734,45 @@ export class InteractionController {
             this.crosshairPrice = null
             this.hoveredIndex = null
             this.activePaneId = null
-            return
+            return true
         }
+        return false
+    }
 
+    /**
+     * 检测 marker 悬停
+     *
+     * 若指针悬浮在 marker 上，清除十字线状态并返回 true。
+     */
+    private handleMarkerHit(ctx: HoverContext): boolean {
         const markerManager = this.chart.getMarkerManager()
-        const worldX = scrollLeft + mouseX
-        if (this.markerState.updateHoverFromPoint(worldX, mouseX, mouseY, markerManager)) {
+        if (this.markerState.updateHoverFromPoint(ctx.worldX, ctx.mouseX, ctx.mouseY, markerManager)) {
             this.crosshairPos = null
             this.crosshairIndex = null
             this.crosshairPrice = null
             this.hoveredIndex = null
-            return
+            return true
         }
+        return false
+    }
 
-        if (!this.kLinePositions || !this.visibleRange || !this.kWidthPx) {
-            this.clearHover()
-            return
-        }
+    /**
+     * 查找最近邻 K 线 bar
+     *
+     * 使用二分搜索在 kLinePositions 中定位指针最近的 K 线 bar。
+     * 若无 kLinePositions、visibleRange 或 kWidthPx，返回 null。
+     */
+    private findNearestBar(ctx: HoverContext): NearestBar | null {
+        if (!this.kLinePositions || !this.visibleRange || !this.kWidthPx) return null
 
+        const { worldX, mouseY, dpr } = ctx
         const kWidthLogical = this.kWidthPx / dpr
+        const positions = this.kLinePositions
 
-        let lo = 0, hi = this.kLinePositions.length
+        let lo = 0, hi = positions.length
         while (lo < hi) {
             const mid = (lo + hi) >> 1
-            if (this.kLinePositions[mid]! < worldX) {
+            if (positions[mid]! < worldX) {
                 lo = mid + 1
             } else {
                 hi = mid
@@ -693,69 +780,86 @@ export class InteractionController {
         }
 
         let localIdx = lo
-        if (lo > 0 && lo < this.kLinePositions.length) {
-            const prevCenter = this.kLinePositions[lo - 1]! + kWidthLogical / 2
-            const currCenter = this.kLinePositions[lo]! + kWidthLogical / 2
+        if (lo > 0 && lo < positions.length) {
+            const prevCenter = positions[lo - 1]! + kWidthLogical / 2
+            const currCenter = positions[lo]! + kWidthLogical / 2
             if (Math.abs(worldX - prevCenter) < Math.abs(worldX - currCenter)) {
                 localIdx = lo - 1
             }
-        } else if (lo === this.kLinePositions.length && this.kLinePositions.length > 0) {
-            localIdx = this.kLinePositions.length - 1
+        } else if (lo === positions.length && positions.length > 0) {
+            localIdx = positions.length - 1
         }
 
-        const idx = localIdx + this.visibleRange.start
-        const data = this.chart.getRenderData()
+        return {
+            localIdx,
+            globalIdx: localIdx + this.visibleRange.start,
+            kLineStartX: positions[localIdx]!,
+            widthLogical: kWidthLogical,
+        }
+    }
 
+    /**
+     * 定位十字线
+     *
+     * 根据最近邻 bar 设置 crosshairIndex、crosshairPos（snap 到 K 线中心）
+     * 以及 crosshairPrice（鼠标 Y → 价格）。
+     * 索引无效时清除十字线状态。
+     */
+    private positionCrosshair(ctx: HoverContext, bar: NearestBar): void {
+        const { mouseX, mouseY, scrollLeft, plotWidth, plotHeight, dpr } = ctx
         const pane = this.getPaneByY(mouseY)
         this.activePaneId = pane?.id || null
 
-        if (idx >= 0 && idx < (data?.length ?? 0)) {
-            this.crosshairIndex = idx
+        if (bar.globalIdx < 0 || bar.globalIdx >= (this.chart.getRenderData()?.length ?? 0)) {
+            this.crosshairIndex = null
+            this.crosshairPos = null
+            this.crosshairPrice = null
+            return
+        }
 
-            const centerX = this.kLineCenters?.[localIdx] ?? this.kLinePositions[localIdx]! + (this.kWidthPx! / dpr) / 2
-            const snappedX = centerX - scrollLeft
+        this.crosshairIndex = bar.globalIdx
 
-            this.crosshairPos = {
-                x: Math.min(Math.max(snappedX, 0), plotWidth),
-                y: Math.min(Math.max(mouseY, 0), plotHeight),
-            }
+        const centerX = this.kLineCenters?.[bar.localIdx] ?? bar.kLineStartX + bar.widthLogical / 2
+        const snappedX = centerX - scrollLeft
 
-            if (pane) {
-                const localY = mouseY - pane.top
-                this.crosshairPrice = pane.yAxis.yToPrice(localY)
-            } else {
-                this.crosshairPrice = null
-            }
+        this.crosshairPos = {
+            x: Math.min(Math.max(snappedX, 0), plotWidth),
+            y: Math.min(Math.max(mouseY, 0), plotHeight),
+        }
 
-            if (this.chart.currentPeriod === 'timeshare') {
-                this.hoveredIndex = idx
-                const tooltipResult = computeTooltipPosition({
-                    mouseX,
-                    mouseY,
-                    viewWidth,
-                    viewHeight,
-                    plotWidth,
-                    plotHeight,
-                    tooltipSize: this.tooltipSize,
-                    useAnchorPositioning: this.useTooltipAnchorPositioning,
-                })
-                if (tooltipResult.anchorPlacement) {
-                    this.tooltipAnchorPlacement = tooltipResult.anchorPlacement
-                }
-                this.tooltipPos = tooltipResult.pos
-                return
-            }
+        if (pane) {
+            const localY = mouseY - pane.top
+            this.crosshairPrice = pane.yAxis.yToPrice(localY)
         } else {
-            this.crosshairIndex = null
-            this.crosshairPos = null
             this.crosshairPrice = null
         }
+    }
 
-        const k = typeof this.crosshairIndex === 'number' ? data[this.crosshairIndex] as KLineData : undefined
-        if (!k || !pane || !pane.capabilities.candleHitTest) {
-            this.hoveredIndex = null
-            return
-        }
+    /**
+     * 分时模式悬停处理
+     *
+     * 分时模式下直接设置 hoveredIndex 并计算 tooltip 位置后返回，
+     * 不执行 candle body/wick 命中检测。
+     */
+    private handleTimeshareHover(ctx: HoverContext, bar: NearestBar): void {
+        this.hoveredIndex = bar.globalIdx
+        this.updateTooltip(ctx)
+    }
+
+    /**
+     * Candle 实体/影线命中检测
+     *
+     * 检测指针是否落在 K 线实体内或影线上。
+     * 小实体（< 8px）会扩展命中区域以保证可用性。
+     * 未命中时返回 false。
+     */
+    private hitTestCandle(ctx: HoverContext, bar: NearestBar): boolean {
+        const { mouseY, worldX, dpr } = ctx
+        const data = this.chart.getRenderData()
+        const k = typeof this.crosshairIndex === 'number' ? data?.[this.crosshairIndex] as KLineData | undefined : undefined
+        const pane = this.getPaneByY(mouseY)
+
+        if (!k || !pane || !pane.capabilities.candleHitTest) return false
 
         const localY = mouseY - pane.top
         const openY = pane.yAxis.priceToY(k.open)
@@ -765,29 +869,35 @@ export class InteractionController {
         const bodyTop = Math.min(openY, closeY)
         const bodyBottom = Math.max(openY, closeY)
 
-        const kLineStartX = this.kLinePositions[localIdx]!
-        const inUnitX = worldX - kLineStartX
-        const cxLogical = kWidthLogical / 2
+        const inUnitX = worldX - bar.kLineStartX
+        const cxLogical = bar.widthLogical / 2
 
         const MIN_BODY_HIT_HEIGHT = 8
         const bodyHeight = Math.abs(bodyBottom - bodyTop)
-        const effectiveBodyTop = bodyHeight < MIN_BODY_HIT_HEIGHT ? (bodyTop + bodyBottom) / 2 - MIN_BODY_HIT_HEIGHT / 2 : bodyTop
-        const effectiveBodyBottom = bodyHeight < MIN_BODY_HIT_HEIGHT ? (bodyTop + bodyBottom) / 2 + MIN_BODY_HIT_HEIGHT / 2 : bodyBottom
+        const effectiveBodyTop = bodyHeight < MIN_BODY_HIT_HEIGHT
+            ? (bodyTop + bodyBottom) / 2 - MIN_BODY_HIT_HEIGHT / 2
+            : bodyTop
+        const effectiveBodyBottom = bodyHeight < MIN_BODY_HIT_HEIGHT
+            ? (bodyTop + bodyBottom) / 2 + MIN_BODY_HIT_HEIGHT / 2
+            : bodyBottom
 
         const HIT_WICK_HALF_EXTENDED = 3
 
-        const hitBody = localY >= effectiveBodyTop && localY <= effectiveBodyBottom &&
-            inUnitX >= 0 && inUnitX <= kWidthLogical
-        const hitWick = Math.abs(inUnitX - cxLogical) <= HIT_WICK_HALF_EXTENDED &&
-            localY >= Math.min(highY, lowY) && localY <= Math.max(highY, lowY)
+        const hitBody = localY >= effectiveBodyTop && localY <= effectiveBodyBottom
+            && inUnitX >= 0 && inUnitX <= bar.widthLogical
+        const hitWick = Math.abs(inUnitX - cxLogical) <= HIT_WICK_HALF_EXTENDED
+            && localY >= Math.min(highY, lowY) && localY <= Math.max(highY, lowY)
 
-        if (!hitBody && !hitWick) {
-            this.hoveredIndex = null
-            return
-        }
-
-        this.hoveredIndex = this.crosshairIndex
+        return hitBody || hitWick
+    }
 
+    /**
+     * 更新 tooltip 位置
+     *
+     * 使用 computeTooltipPosition 计算 tooltip 的显示位置和锚点方向。
+     */
+    private updateTooltip(ctx: HoverContext): void {
+        const { mouseX, mouseY, viewWidth, viewHeight, plotWidth, plotHeight } = ctx
         const tooltipResult = computeTooltipPosition({
             mouseX,
             mouseY,