@363045841yyt/klinechart-core 0.8.1 → 0.8.3

package/src/semantic/schema.json

@@ -33,7 +33,7 @@
           "type": "string",
           "enum": ["daily", "weekly", "monthly", "5min", "15min", "30min", "60min"]
         },
-        "adjust": { "type": "string", "enum": ["qfq", "hfq", "none"] }
+        "adjust": { "type": "string", "enum": ["qfq", "hfq", "splits", "none"] }
       }
     },
     "IndicatorsConfig": {

package/src/semantic/types.ts

@@ -19,6 +19,8 @@ export interface SemanticChartConfig {
 // ============ 数据配置 ============
 
 /** 数据配置 */
+export type AdjustType = 'qfq' | 'hfq' | 'splits' | 'none'
+
 export interface DataConfig {
   source: 'baostock' | 'dongcai'
   /** 股票代码（6位数字，不含前缀） */
@@ -30,7 +32,7 @@ export interface DataConfig {
   /** 结束日期 YYYY-MM-DD */
   endDate: string
   period: 'daily' | 'weekly' | 'monthly' | '5min' | '15min' | '30min' | '60min'
-  adjust: 'qfq' | 'hfq' | 'none'
+  adjust: AdjustType
 }
 
 // ============ 指标配置 ============

package/src/utils/dateFormat.ts

@@ -137,6 +137,39 @@ export function monthKey(timestamp: number): number {
 
 // ========== 便捷别名 ==========
 
+/**
+ * 格式化时间戳为日期/日期时间字符串，支持可配置时区
+ * @param timestamp - 时间戳（毫秒）
+ * @param options - 配置项
+ * @param options.timeZone - 时区，默认 'Asia/Shanghai'
+ * @param options.showTime - 是否显示时间，默认 false
+ * @returns 格式化后的字符串，如 "2026-05-15" 或 "2026-05-15 09:35"
+ */
+export function formatTimestamp(
+  timestamp: number,
+  options?: { timeZone?: string; showTime?: boolean }
+): string {
+  const timeZone = options?.timeZone ?? 'Asia/Shanghai'
+  const showTime = options?.showTime ?? false
+  const formatter = new Intl.DateTimeFormat('zh-CN', {
+    timeZone,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    ...(showTime ? { hour: '2-digit', minute: '2-digit', hour12: false } : {}),
+  })
+  const parts = formatter.formatToParts(new Date(timestamp))
+  let y = '', m = '', d = '', h = '', min = ''
+  for (const p of parts) {
+    if (p.type === 'year') y = p.value
+    else if (p.type === 'month') m = p.value
+    else if (p.type === 'day') d = p.value
+    else if (p.type === 'hour') h = p.value
+    else if (p.type === 'minute') min = p.value
+  }
+  return showTime ? `${y}-${m}-${d} ${h}:${min}` : `${y}-${m}-${d}`
+}
+
 /**
  * formatDateToYYYYMMDD 的别名，保持与历史代码的兼容性
  * timestamp 是"上海时区当天 00:00:00"映射到 UTC 的值；显示时强制按上海时区格式化
@@ -206,3 +239,55 @@ export function findMonthBoundaries(data: Array<{ timestamp: number } | undefine
     _cacheResult = boundaries
     return boundaries
 }
+
+// ========== 日边界查找 + 日标签格式化 ==========
+
+/**
+ * 查找每天第一个K线的索引
+ */
+export function findDayBoundaries(data: Array<{ timestamp: number } | undefined>): number[] {
+    if (data.length === 0) return []
+
+    const boundaries: number[] = [0]
+    let lastKey = dayKey(data[0]!.timestamp)
+
+    for (let i = 1; i < data.length; i++) {
+        const cur = data[i]
+        if (!cur) continue
+        const curKey = dayKey(cur.timestamp)
+        if (curKey !== lastKey) {
+            boundaries.push(i)
+            lastKey = curKey
+        }
+    }
+
+    return boundaries
+}
+
+function dayKey(timestamp: number): number {
+    const d = new Date(timestamp)
+    return d.getFullYear() * 366 + getDayOfYear(d)
+}
+
+/**
+ * 格式化日期为 "MM-DD" 或年初显示 "YYYY-MM-DD"
+ */
+export function formatDay(timestamp: number): { text: string; isYear: boolean } {
+    const d = new Date(timestamp)
+    const month = String(d.getMonth() + 1).padStart(2, '0')
+    const day = String(d.getDate()).padStart(2, '0')
+    const isYear = d.getMonth() === 0 && d.getDate() === 1
+    if (isYear) {
+        return { text: `${d.getFullYear()}-${month}-${day}`, isYear }
+    }
+    return { text: `${month}-${day}`, isYear }
+}
+
+// 兼容 getDayOfYear — fallback when not on Date prototype
+function getDayOfYear(date: Date): number {
+    const start = new Date(date.getFullYear(), 0, 0)
+    const diff = date.getTime() - start.getTime()
+    return Math.floor(diff / 86400000)
+}
+
+

package/src/utils/kLineDraw/axis.ts

@@ -1,7 +1,7 @@
 import type { KLineData } from '../../types/price'
 import { priceToY, yToPrice } from '../priceToY'
 import { alignToPhysicalPixelCenter, roundToPhysicalPixel } from '../../engine/draw/pixelAlign'
-import { formatYMDShanghai, formatMonthOrYear, findMonthBoundaries } from '../../utils/dateFormat'
+import { formatYMDShanghai, formatMonthOrYear, formatDay, findMonthBoundaries, findDayBoundaries } from '../../utils/dateFormat'
 import { resolveThemeColors } from '../../tokens'
 import type { ColorPresetSettings } from '../../tokens'
 import { getFont, setCanvasFont } from '../../engine/theme/fonts'
@@ -133,6 +133,8 @@ export interface TimeAxisOptions {
     drawTopBorder?: boolean
     /** 是否绘制底部边界线（默认 true，如果副图已有下边框则设为 false 避免重复） */
     drawBottomBorder?: boolean
+    /** K线级别，如 'daily'、'5min'、'15min' */
+    period: string
 }
 
 export interface LastPriceLineOptions {
@@ -406,15 +408,21 @@ export function drawTimeAxis(ctx: CanvasRenderingContext2D, opts: TimeAxisOption
     const regularFont = getFont(fontSize)
     const boldFont = getFont(fontSize, { bold: true })
 
-    const boundaries = findMonthBoundaries(data)
+    const isMinuteData = opts.period.includes('min')
+    const showOnlyYear = !isMinuteData && opts.period !== 'daily'
+    const boundaries = isMinuteData ? findDayBoundaries(data) : findMonthBoundaries(data)
     const visibleBoundaries = boundaries.filter((idx: number) => idx >= startIndex && idx < endIndex)
 
-    let lastWasYear: boolean | null = null
+    let lastBold: boolean | null = null
+    const labelFn = isMinuteData ? formatDay : formatMonthOrYear
 
     for (const idx of visibleBoundaries) {
         const k = data[idx]
         if (!k) continue
 
+        const { text, isYear } = labelFn(k.timestamp)
+        if (showOnlyYear && !isYear) continue
+
         const worldX = startX + idx * unit + alignedKWidth / 2
         const screenX = worldX - scrollLeft
 
@@ -423,10 +431,9 @@ export function drawTimeAxis(ctx: CanvasRenderingContext2D, opts: TimeAxisOption
 
         if (screenX >= minX && screenX <= maxX) {
             const drawX = Math.min(Math.max(screenX, minX), maxX)
-            const { text, isYear } = formatMonthOrYear(k.timestamp)
-            if (lastWasYear !== isYear) {
+            if (lastBold !== isYear) {
                 setCanvasFont(ctx, isYear ? boldFont : regularFont)
-                lastWasYear = isYear
+                lastBold = isYear
             }
             ctx.fillText(text, roundToPhysicalPixel(drawX, dpr), alignToPhysicalPixelCenter(textY, dpr))
         }

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = "0.8.1"
+export const VERSION = "0.8.3"