@363045841yyt/klinechart-core 0.9.0-alpha.2 → 0.9.0-alpha.4

package/src/engine/modes/timeShareMode.ts

@@ -1,6 +1,14 @@
 import type { ChartDataManager } from '../data/chartDataManager'
 import type { Pane, VisibleRange } from '../layout/pane'
 
+import type { MarketSessionConfig } from '../../foundation/utils/timeShareAxisLabels'
+import { ASHARE_MARKET_SESSION } from '../../foundation/utils/timeShareAxisLabels'
+
+import {
+  computeTimeShareBarMetrics,
+  computeTimeSharePriceRange,
+  resolveTimeShareBaseline,
+} from './timeShareMath'
 import type { ChartModeHandler } from './types'
 
 export class TimeShareMode implements ChartModeHandler {
@@ -12,6 +20,17 @@ export class TimeShareMode implements ChartModeHandler {
   readonly allowRightAxisScale = false
   readonly useIndicatorScheduler = false
 
+  /** 市场 session；默认 A 股，可 setMarketSession 切换 */
+  private _marketSession: MarketSessionConfig = ASHARE_MARKET_SESSION
+
+  get marketSession(): MarketSessionConfig {
+    return this._marketSession
+  }
+
+  setMarketSession(config: MarketSessionConfig): void {
+    this._marketSession = config
+  }
+
   computeContentWidth(
     _dataLength: number,
     leftBufferWidth: number,
@@ -27,17 +46,7 @@ export class TimeShareMode implements ChartModeHandler {
     viewWidth: number,
     dpr: number,
   ): { kWidth: number; kGap: number } | null {
-    if (dataLength <= 0 || viewWidth <= 0) return null
-
-    const kGapPx = 1
-    const totalGapPx = (dataLength + 1) * kGapPx
-    const availablePx = Math.max(1, viewWidth * dpr - totalGapPx)
-    const kWidthPx = Math.max(1, Math.floor(availablePx / dataLength))
-
-    return {
-      kWidth: kWidthPx / dpr,
-      kGap: kGapPx / dpr,
-    }
+    return computeTimeShareBarMetrics(dataLength, viewWidth, dpr, this._marketSession)
   }
 
   updatePaneRange(
@@ -47,30 +56,28 @@ export class TimeShareMode implements ChartModeHandler {
     _mergedIndicatorRange?: { min: number; max: number } | null,
   ): void {
     const tsData = dm.getTimeShareData()
-    const end = Math.min(range.end, tsData.length)
     if (tsData.length === 0) return
 
-    const baseline = tsData[0]?.price ?? 0
-    if (baseline === 0) return
+    const end = Math.min(range.end, tsData.length)
+    const start = Math.max(0, range.start)
+    // 优先昨收；缺失时回退首笔价
+    const baseline = resolveTimeShareBaseline({
+      preClose: dm.getTimeSharePreClose(),
+      firstPrice: tsData[0]?.price,
+    })
+    if (baseline === null) return
 
     // scaleType 由 kernel.paneScaleTypes 投影（进入 timeshare 时写 percent）；此处只设会话 basePrice
     pane.yAxis.setBasePrice(baseline)
 
-    let maxAbsPct = 0
-    for (let i = Math.max(0, range.start); i < end; i++) {
+    const prices: number[] = []
+    for (let i = start; i < end; i++) {
       const p = tsData[i]?.price
-      if (p !== undefined && Number.isFinite(p)) {
-        const pct = Math.abs((p - baseline) / baseline) * 100
-        if (pct > maxAbsPct) maxAbsPct = pct
-      }
+      if (p !== undefined) prices.push(p)
     }
-    if (maxAbsPct <= 0) return
-
-    const padding = Math.max(maxAbsPct * 0.1, 0.5)
-    const displayPct = maxAbsPct + padding
-    const minPrice = baseline * (1 - displayPct / 100)
-    const maxPrice = baseline * (1 + displayPct / 100)
-    pane.yAxis.setRange({ maxPrice, minPrice })
+    const priceRange = computeTimeSharePriceRange(prices, baseline)
+    if (!priceRange) return
+    pane.yAxis.setRange(priceRange)
   }
 
   onActivate(
@@ -103,6 +110,6 @@ export class TimeShareMode implements ChartModeHandler {
     _next: ChartModeHandler | null,
   ): void {
     chart.disableMainIndicator('timeShare')
-    chart.setRendererEnabled('candle', true)
+    // candle 可见性由 Chart.setActiveMode 按进入前快照恢复，此处不强制 true
   }
 }

package/src/engine/paneRenderer.ts

@@ -6,7 +6,9 @@ export type PaneRendererContexts = {
   mainCtx: CanvasRenderingContext2D | null
   overlayCtx: CanvasRenderingContext2D | null
   yAxisCtx: CanvasRenderingContext2D | null
+  yAxisOverlayCtx: CanvasRenderingContext2D | null
   leftAxisCtx: CanvasRenderingContext2D | null
+  leftAxisOverlayCtx: CanvasRenderingContext2D | null
 }
 
 export type PaneRendererOptions = {
@@ -17,7 +19,7 @@ export type PaneRendererOptions = {
 }
 
 /* PaneRenderer：负责单个 Pane 的 Canvas 管理与运行时状态持有
-   创建并管理 mainCanvas / overlayCanvas / yAxisCanvas
+   创建并管理 main/overlay/yAxis/yAxisOverlay（及可选 left 轴）canvas
    持有 Pane 实例（布局、Y 轴、价格范围）
    响应 Chart 的 resize / layout 信号
    GPU 绘制经 ChartRenderer.sceneRenderer（SharedWebGLSurface），本类不再持有 per-pane surface */
@@ -52,7 +54,9 @@ export class PaneRenderer {
         mainCtx: this.dom.mainCanvas.getContext('2d'),
         overlayCtx: this.dom.overlayCanvas.getContext('2d'),
         yAxisCtx: this.dom.yAxisCanvas.getContext('2d'),
+        yAxisOverlayCtx: this.dom.yAxisOverlayCanvas.getContext('2d'),
         leftAxisCtx: this.dom.leftYAxisCanvas?.getContext('2d') ?? null,
+        leftAxisOverlayCtx: this.dom.leftYAxisOverlayCanvas?.getContext('2d') ?? null,
       }
     }
     return this.contexts
@@ -90,6 +94,7 @@ export class PaneRenderer {
     const mainCanvas = this.dom.mainCanvas
     const overlayCanvas = this.dom.overlayCanvas
     const yAxisCanvas = this.dom.yAxisCanvas
+    const yAxisOverlayCanvas = this.dom.yAxisOverlayCanvas
 
     // 先读取 parentClientWidth，避免在写入样式后读取触发强制回流
     const fallbackYAxisWidth = this.opt.rightAxisWidth + (this.opt.priceLabelWidth || 60)
@@ -104,22 +109,24 @@ export class PaneRenderer {
     // Overlay Canvas - 与 Main Canvas 相同尺寸
     PaneRenderer.resizeCanvas(overlayCanvas, mainWidth, mainHeight, dpr)
 
-    // YAxis Canvas
+    // YAxis Canvas + overlay 轴（同尺寸）
     const yAxisWidth = Math.round(canvasYAxisWidth * dpr)
-    PaneRenderer.resizeCanvas(yAxisCanvas, yAxisWidth, Math.round(height * dpr), dpr)
+    const yAxisHeight = Math.round(height * dpr)
+    PaneRenderer.resizeCanvas(yAxisCanvas, yAxisWidth, yAxisHeight, dpr)
+    PaneRenderer.resizeCanvas(yAxisOverlayCanvas, yAxisWidth, yAxisHeight, dpr)
 
-    // Left YAxis Canvas
+    // Left YAxis Canvas + overlay
     const leftCanvas = this.dom.leftYAxisCanvas
+    const leftOverlayCanvas = this.dom.leftYAxisOverlayCanvas
     if (leftCanvas) {
       const fallbackLeftAxisWidth = this.opt.leftAxisWidth
       const leftParentWidth = leftCanvas.parentElement?.clientWidth ?? 0
       const canvasLeftAxisWidth = leftParentWidth > 0 ? leftParentWidth : fallbackLeftAxisWidth
-      PaneRenderer.resizeCanvas(
-        leftCanvas,
-        Math.round(Math.max(canvasLeftAxisWidth, 0) * dpr),
-        Math.round(height * dpr),
-        dpr,
-      )
+      const leftW = Math.round(Math.max(canvasLeftAxisWidth, 0) * dpr)
+      PaneRenderer.resizeCanvas(leftCanvas, leftW, yAxisHeight, dpr)
+      if (leftOverlayCanvas) {
+        PaneRenderer.resizeCanvas(leftOverlayCanvas, leftW, yAxisHeight, dpr)
+      }
     }
   }