@363045841yyt/klinechart-core 0.7.6 → 0.7.8

package/src/engine/renderers/Indicator/fastk.ts

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
-import { getColors, type ChartTheme } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
 import type { FASTKRenderState } from '../../indicators/fastkState'
 import { createFASTKStateKey } from '../../indicators/fastkState'
@@ -148,7 +148,7 @@ export function createFASTKRendererPlugin(options: FASTKRendererOptions = {}): R
 
         draw(context: RenderContext) {
 const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             const stateKey = resolveKey()
             if (!stateKey) return
@@ -218,7 +218,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 if (params.showFASTK && cachedFASTKPoints.length >= 2) {
                     const ok = lineWebGLSurface.drawLineStrips(
-                        [{ points: cachedFASTKPoints, width: 1, color: colors.KDJ.K }],
+                        [{ points: cachedFASTKPoints, width: 1, color: colors.kdj.k }],
                         scrollLeft
                     )
                     if (ok) {
@@ -254,13 +254,13 @@ function drawFASTKLineWithCanvas2D(
     scrollLeft: number,
     fastkPoints: LinePoint[],
     params: { showFASTK: boolean },
-    colors: { KDJ: { K: string } }
+    colors: { kdj: { k: string } }
 ): void {
     if (!params.showFASTK || fastkPoints.length < 2) return
 
     ctx.save()
     ctx.translate(-scrollLeft, 0)
-    ctx.strokeStyle = colors.KDJ.K
+    ctx.strokeStyle = colors.kdj.k
     ctx.lineWidth = 1
     ctx.lineJoin = 'round'
     ctx.lineCap = 'round'
@@ -282,9 +282,10 @@ export function getFASTKTitleInfo(
     period: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_FASTK',
-    theme: ChartTheme = 'light'
+    theme: 'light' | 'dark' = 'light',
+    isAsiaMarket?: boolean
 ): { name: string; params: number[]; values: Array<{ label: string; value: number; color: string }> } | null {
-    const colors = getColors(theme)
+    const colors = resolveThemeColors(theme, isAsiaMarket)
     const state = pluginHost.getSharedState<FASTKRenderState>(createFASTKStateKey(paneId))
     if (!state) return null
 
@@ -295,7 +296,7 @@ export function getFASTKTitleInfo(
         name: 'FASTK',
         params: [period],
         values: [
-            { label: 'FASTK', value: fastk, color: colors.KDJ.K },
+            { label: 'FASTK', value: fastk, color: colors.kdj.k },
         ],
     }
 }

package/src/engine/renderers/Indicator/kst.ts

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
-import { getColors, type ChartTheme } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import type { KSTRenderState } from '../../indicators/kstState'
 import { createKSTStateKey } from '../../indicators/kstState'
 import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
@@ -99,7 +99,7 @@ export function createKSTRendererPlugin(options: KSTRendererOptions = {}): Rende
 
         draw(context: RenderContext) {
 const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             const stateKey = resolveKey()
             if (!stateKey) return
@@ -178,10 +178,10 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 const lines: Array<{ points: LinePoint[]; width: number; color: string }> = []
                 if (params.showKST && cachedKSTPoints.length >= 2) {
-                    lines.push({ points: cachedKSTPoints, width: 1, color: colors.KST.KST })
+                    lines.push({ points: cachedKSTPoints, width: 1, color: colors.kst.kst })
                 }
                 if (params.showSignal && cachedSignalPoints.length >= 2) {
-                    lines.push({ points: cachedSignalPoints, width: 1, color: colors.KST.SIGNAL })
+                    lines.push({ points: cachedSignalPoints, width: 1, color: colors.kst.signal })
                 }
 
                 const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
@@ -219,7 +219,7 @@ function drawKSTLinesWithCanvas2D(
     kstPoints: LinePoint[],
     signalPoints: LinePoint[],
     params: { showKST: boolean; showSignal: boolean },
-    colors: { KST: { KST: string; SIGNAL: string } }
+    colors: { kst: { kst: string; signal: string } }
 ): void {
     ctx.save()
     ctx.translate(-scrollLeft, 0)
@@ -228,7 +228,7 @@ function drawKSTLinesWithCanvas2D(
     ctx.lineCap = 'round'
 
     if (params.showKST && kstPoints.length >= 2) {
-        ctx.strokeStyle = colors.KST.KST
+        ctx.strokeStyle = colors.kst.kst
         ctx.beginPath()
         ctx.moveTo(kstPoints[0]!.x, kstPoints[0]!.y)
         for (let i = 1; i < kstPoints.length; i++) {
@@ -239,7 +239,7 @@ function drawKSTLinesWithCanvas2D(
     }
 
     if (params.showSignal && signalPoints.length >= 2) {
-        ctx.strokeStyle = colors.KST.SIGNAL
+        ctx.strokeStyle = colors.kst.signal
         ctx.beginPath()
         ctx.moveTo(signalPoints[0]!.x, signalPoints[0]!.y)
         for (let i = 1; i < signalPoints.length; i++) {
@@ -264,9 +264,10 @@ export function getKSTTitleInfo(
     signalPeriod: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_KST',
-    theme: ChartTheme = 'light'
+    theme: 'light' | 'dark' = 'light',
+    isAsiaMarket?: boolean
 ): { name: string; params: number[]; values: Array<{ label: string; value: number; color: string }> } | null {
-    const colors = getColors(theme)
+    const colors = resolveThemeColors(theme, isAsiaMarket)
     const state = pluginHost.getSharedState<KSTRenderState>(createKSTStateKey(paneId))
     if (!state) return null
 
@@ -274,8 +275,8 @@ export function getKSTTitleInfo(
     if (!point) return null
 
     const values = []
-    if (state.params.showKST) values.push({ label: 'KST', value: point.kst, color: colors.KST.KST })
-    if (state.params.showSignal) values.push({ label: 'Signal', value: point.signal, color: colors.KST.SIGNAL })
+    if (state.params.showKST) values.push({ label: 'KST', value: point.kst, color: colors.kst.kst })
+    if (state.params.showSignal) values.push({ label: 'Signal', value: point.signal, color: colors.kst.signal })
 
     if (values.length === 0) return null
 

package/src/engine/renderers/Indicator/ma.ts

@@ -5,7 +5,7 @@ import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
 import { resolveStateKey } from '../../indicators/indicatorMetadata'
 import type { IndicatorScheduler } from '../../indicators/scheduler'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 
 // Re-export MAFlags from calculators for backward compatibility
 export type { MAFlags } from '../../indicators/calculators'
@@ -97,8 +97,8 @@ export function createMARendererPlugin(): RendererPluginWithHost {
 
         draw(context: RenderContext) {
             const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
-            const colors = getColors(context.theme)
-            const maColors: Record<number, string> = { 5: colors.MA.MA5, 10: colors.MA.MA10, 20: colors.MA.MA20, 30: colors.MA.MA30, 60: colors.MA.MA60 }
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
+            const maColors: Record<number, string> = { 5: colors.ma.ma5, 10: colors.ma.ma10, 20: colors.ma.ma20, 30: colors.ma.ma30, 60: colors.ma.ma60 }
             const stateKey = resolveKey()
             if (!stateKey) return
             const state = pluginHost?.getSharedState<MARenderState>(stateKey)
@@ -147,7 +147,7 @@ export function createMARendererPlugin(): RendererPluginWithHost {
                 for (const period of state.enabledPeriods) {
                     const points = cachedLines.get(period)
                     if (!points) continue
-                    lines.push({ points, width: 1, color: maColors[period] ?? colors.MA.MA5 })
+                    lines.push({ points, width: 1, color: maColors[period] ?? colors.ma.ma5 })
                 }
                 const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
 
@@ -170,7 +170,7 @@ export function createMARendererPlugin(): RendererPluginWithHost {
             for (const period of state.enabledPeriods) {
                 const points = cachedLines.get(period)
                 if (!points || points.length < 2) continue
-                ctx.strokeStyle = maColors[period] ?? colors.MA.MA5
+                ctx.strokeStyle = maColors[period] ?? colors.ma.ma5
                 ctx.beginPath()
                 ctx.moveTo(points[0]!.x, points[0]!.y)
                 for (let i = 1; i < points.length; i++) {

package/src/engine/renderers/Indicator/macd.ts

@@ -1,8 +1,7 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
 import type { KLineData } from '../../../types/price'
-import { getColors } from '../../theme/colors'
-import type { ChartTheme, ThemeColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
 import type { MACDRenderState } from '../../indicators/macdState'
 import { createMACDStateKey } from '../../indicators/macdState'
@@ -131,7 +130,7 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
     draw(context: RenderContext) {
       const { ctx, pane, data, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
       const klineData = data as KLineData[]
-      const colors = getColors(context.theme)
+      const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
       // 从 StateStore 读取 MACD 状态
       const stateKey = resolveKey()
@@ -214,7 +213,7 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
 
         const usedWebGL = drawMacdBarsWithWebGL(context, barUpBuf, barUpCount, barUpLightBuf, barUpLightCount, barDownBuf, barDownCount, barDownLightBuf, barDownLightCount)
         if (!usedWebGL) {
-          drawMacdBarsWithCanvas2D(ctx, scrollLeft, colors, barUpBuf, barUpCount, barUpLightBuf, barUpLightCount, barDownBuf, barDownCount, barDownLightBuf, barDownLightCount)
+          drawMacdBarsWithCanvas2D(ctx, scrollLeft, colors.macd.barUp, colors.macd.barUpLight, colors.macd.barDown, colors.macd.barDownLight, barUpBuf, barUpCount, barUpLightBuf, barUpLightCount, barDownBuf, barDownCount, barDownLightBuf, barDownLightCount)
         } else {
           compositeMacdWebGL(ctx, context)
         }
@@ -256,10 +255,10 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
       if (enableWebGL && lineWebGLSurface?.isAvailable()) {
         const lines: Array<{ points: LinePoint[]; width: number; color: string }> = []
         if (config.showDIF && cachedDifPoints.length >= 2) {
-          lines.push({ points: cachedDifPoints, width: 1, color: colors.MACD.DIF })
+          lines.push({ points: cachedDifPoints, width: 1, color: colors.macd.dif })
         }
         if (config.showDEA && cachedDeaPoints.length >= 2) {
-          lines.push({ points: cachedDeaPoints, width: 1, color: colors.MACD.DEA })
+          lines.push({ points: cachedDeaPoints, width: 1, color: colors.macd.dea })
         }
         const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
         if (allOk) {
@@ -269,7 +268,7 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
       }
 
       if (!usedWebGLForLines) {
-        drawMacdLinesWithCanvas2D(ctx, scrollLeft, colors, cachedDifPoints, cachedDeaPoints, config)
+        drawMacdLinesWithCanvas2D(ctx, scrollLeft, colors.macd.dif, colors.macd.dea, cachedDifPoints, cachedDeaPoints, config)
       }
     },
 
@@ -313,17 +312,17 @@ function drawMacdBarsWithWebGL(
   barDownBuf: Float32Array, barDownCount: number,
   barDownLightBuf: Float32Array, barDownLightCount: number
 ): boolean {
-  const colors = getColors(context.theme)
+  const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
   if (context.settings?.enableWebGLRendering === false) return false
   const surface = context.candleWebGLSurface
   if (!surface || !surface.isAvailable()) return false
 
   surface.clear()
 
-  const ok1 = barUpCount === 0 || surface.drawRectBuffer(barUpBuf.subarray(0, barUpCount * 4), barUpCount, colors.MACD.BAR_UP, context.scrollLeft)
-  const ok2 = barUpLightCount === 0 || surface.drawRectBuffer(barUpLightBuf.subarray(0, barUpLightCount * 4), barUpLightCount, colors.MACD.BAR_UP_LIGHT, context.scrollLeft)
-  const ok3 = barDownCount === 0 || surface.drawRectBuffer(barDownBuf.subarray(0, barDownCount * 4), barDownCount, colors.MACD.BAR_DOWN, context.scrollLeft)
-  const ok4 = barDownLightCount === 0 || surface.drawRectBuffer(barDownLightBuf.subarray(0, barDownLightCount * 4), barDownLightCount, colors.MACD.BAR_DOWN_LIGHT, context.scrollLeft)
+  const ok1 = barUpCount === 0 || surface.drawRectBuffer(barUpBuf.subarray(0, barUpCount * 4), barUpCount, colors.macd.barUp, context.scrollLeft)
+  const ok2 = barUpLightCount === 0 || surface.drawRectBuffer(barUpLightBuf.subarray(0, barUpLightCount * 4), barUpLightCount, colors.macd.barUpLight, context.scrollLeft)
+  const ok3 = barDownCount === 0 || surface.drawRectBuffer(barDownBuf.subarray(0, barDownCount * 4), barDownCount, colors.macd.barDown, context.scrollLeft)
+  const ok4 = barDownLightCount === 0 || surface.drawRectBuffer(barDownLightBuf.subarray(0, barDownLightCount * 4), barDownLightCount, colors.macd.barDownLight, context.scrollLeft)
 
   return ok1 && ok2 && ok3 && ok4
 }
@@ -331,7 +330,8 @@ function drawMacdBarsWithWebGL(
 function drawMacdBarsWithCanvas2D(
   ctx: CanvasRenderingContext2D,
   scrollLeft: number,
-  colors: { MACD: { BAR_UP: string; BAR_UP_LIGHT: string; BAR_DOWN: string; BAR_DOWN_LIGHT: string } },
+  barUpColor: string, barUpLightColor: string,
+  barDownColor: string, barDownLightColor: string,
   barUpBuf: Float32Array, barUpCount: number,
   barUpLightBuf: Float32Array, barUpLightCount: number,
   barDownBuf: Float32Array, barDownCount: number,
@@ -340,25 +340,25 @@ function drawMacdBarsWithCanvas2D(
   ctx.save()
   ctx.translate(-scrollLeft, 0)
 
-  ctx.fillStyle = colors.MACD.BAR_UP
+  ctx.fillStyle = barUpColor
   for (let i = 0; i < barUpCount; i++) {
     const off = i * 4
     ctx.fillRect(barUpBuf[off], barUpBuf[off + 1], barUpBuf[off + 2], barUpBuf[off + 3])
   }
 
-  ctx.fillStyle = colors.MACD.BAR_UP_LIGHT
+  ctx.fillStyle = barUpLightColor
   for (let i = 0; i < barUpLightCount; i++) {
     const off = i * 4
     ctx.fillRect(barUpLightBuf[off], barUpLightBuf[off + 1], barUpLightBuf[off + 2], barUpLightBuf[off + 3])
   }
 
-  ctx.fillStyle = colors.MACD.BAR_DOWN
+  ctx.fillStyle = barDownColor
   for (let i = 0; i < barDownCount; i++) {
     const off = i * 4
     ctx.fillRect(barDownBuf[off], barDownBuf[off + 1], barDownBuf[off + 2], barDownBuf[off + 3])
   }
 
-  ctx.fillStyle = colors.MACD.BAR_DOWN_LIGHT
+  ctx.fillStyle = barDownLightColor
   for (let i = 0; i < barDownLightCount; i++) {
     const off = i * 4
     ctx.fillRect(barDownLightBuf[off], barDownLightBuf[off + 1], barDownLightBuf[off + 2], barDownLightBuf[off + 3])
@@ -370,7 +370,8 @@ function drawMacdBarsWithCanvas2D(
 function drawMacdLinesWithCanvas2D(
   ctx: CanvasRenderingContext2D,
   scrollLeft: number,
-  colors: ThemeColors,
+  difColor: string,
+  deaColor: string,
   difPoints: LinePoint[],
   deaPoints: LinePoint[],
   config: { showDIF: boolean; showDEA: boolean }
@@ -382,7 +383,7 @@ function drawMacdLinesWithCanvas2D(
   ctx.lineCap = 'round'
 
   if (config.showDIF && difPoints.length >= 2) {
-    ctx.strokeStyle = colors.MACD.DIF
+    ctx.strokeStyle = difColor
     ctx.beginPath()
     ctx.moveTo(difPoints[0]!.x, difPoints[0]!.y)
     for (let i = 1; i < difPoints.length; i++) {
@@ -393,7 +394,7 @@ function drawMacdLinesWithCanvas2D(
   }
 
   if (config.showDEA && deaPoints.length >= 2) {
-    ctx.strokeStyle = colors.MACD.DEA
+    ctx.strokeStyle = deaColor
     ctx.beginPath()
     ctx.moveTo(deaPoints[0]!.x, deaPoints[0]!.y)
     for (let i = 1; i < deaPoints.length; i++) {
@@ -441,9 +442,10 @@ export function getMACDTitleInfo(
   signalPeriod: number,
   pluginHost: PluginHost,
   paneId: string = 'sub_MACD',
-  theme: ChartTheme = 'light'
+  theme: 'light' | 'dark' = 'light',
+  isAsiaMarket?: boolean
 ): { name: string; params: number[]; values: Array<{ label: string; value: number; color: string }> } | null {
-  const colors = getColors(theme)
+  const colors = resolveThemeColors(theme, isAsiaMarket)
   const state = pluginHost.getSharedState<MACDRenderState>(createMACDStateKey(paneId))
   if (!state) return null
 
@@ -454,9 +456,9 @@ export function getMACDTitleInfo(
     name: 'MACD',
     params: [fastPeriod, slowPeriod, signalPeriod],
     values: [
-      { label: 'DIF', value: point.dif, color: colors.MACD.DIF },
-      { label: 'DEA', value: point.dea, color: colors.MACD.DEA },
-      { label: 'MACD', value: point.macd, color: point.macd >= 0 ? colors.MACD.BAR_UP : colors.MACD.BAR_DOWN },
+      { label: 'DIF', value: point.dif, color: colors.macd.dif },
+      { label: 'DEA', value: point.dea, color: colors.macd.dea },
+      { label: 'MACD', value: point.macd, color: point.macd >= 0 ? colors.macd.barUp : colors.macd.barDown },
     ],
   }
 }

package/src/engine/renderers/Indicator/macdLegend.ts

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, PluginHost, RenderContext } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { getFont, setCanvasFont } from '../../theme/fonts'
 import type { MACDRenderState } from '../../indicators/macdState'
 import { createMACDStateKey } from '../../indicators/macdState'
@@ -59,7 +59,7 @@ export function createMACDLegendRendererPlugin(options: MACDLegendOptions = {}):
 
         draw(context: RenderContext) {
             const { ctx, range } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             // 从 StateStore 读取 MACD 状态
             const state = pluginHost?.getSharedState<MACDRenderState>(stateKey)
@@ -103,22 +103,22 @@ export function createMACDLegendRendererPlugin(options: MACDLegendOptions = {}):
             ctx.textBaseline = 'top'
 
             const paramText = `MACD(${fastPeriod},${slowPeriod},${signalPeriod})`
-            ctx.fillStyle = colors.TEXT.TERTIARY
+            ctx.fillStyle = colors.text.tertiary
             ctx.fillText(paramText, x, y)
             x += measureTextWidth(ctx, paramText) + gap
 
             const difText = `DIF:${macdValue.dif.toFixed(2)}`
-            ctx.fillStyle = colors.MACD.DIF
+            ctx.fillStyle = colors.macd.dif
             ctx.fillText(difText, x, y)
             x += measureTextWidth(ctx, difText) + gap
 
             const deaText = `DEA:${macdValue.dea.toFixed(2)}`
-            ctx.fillStyle = colors.MACD.DEA
+            ctx.fillStyle = colors.macd.dea
             ctx.fillText(deaText, x, y)
             x += measureTextWidth(ctx, deaText) + gap
 
             const macdText = `MACD:${macdValue.macd.toFixed(2)}`
-            ctx.fillStyle = macdValue.macd >= 0 ? colors.MACD.BAR_UP : colors.MACD.BAR_DOWN
+            ctx.fillStyle = macdValue.macd >= 0 ? colors.macd.barUp : colors.macd.barDown
             ctx.fillText(macdText, x, y)
 
             ctx.restore()

package/src/engine/renderers/Indicator/mainIndicatorLegend.ts

@@ -5,7 +5,7 @@ import { MA_STATE_KEY, type MARenderState } from '../../indicators/maState'
 import { BOLL_STATE_KEY, type BOLLRenderState } from '../../indicators/bollState'
 import { EXPMA_STATE_KEY, type EXPMARenderState } from '../../indicators/expmaState'
 import { ENE_STATE_KEY, type ENERenderState } from '../../indicators/eneState'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { getFont, setCanvasFont } from '../../theme/fonts'
 
 const textWidthCache = new Map<string, number>()
@@ -80,7 +80,7 @@ export function createMainIndicatorLegendRendererPlugin(options: {
     draw(context: RenderContext) {
       const { overlayCtx, data, range, crosshairIndex } = context
       const klineData = data as KLineData[]
-      const colors = getColors(context.theme)
+      const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
       if (!klineData.length || !overlayCtx) return
 
       const fontSize = 12
@@ -104,13 +104,13 @@ export function createMainIndicatorLegendRendererPlugin(options: {
 
             if (state && state.visibleMin <= state.visibleMax) {
               for (const period of state.enabledPeriods) {
-                const colorKey = `MA${period}` as keyof typeof colors.MA
+                const colorKey = `ma${period}` as keyof typeof colors.ma
                 const series = state.series[period]
                 const value = series?.[targetIndex]
 
                 items.push({
                   label: `MA${period}`,
-                  color: colors.MA[colorKey] || colors.MA.MA5,
+                  color: colors.ma[colorKey] || colors.ma.ma5,
                   value: value,
                 })
               }
@@ -120,7 +120,7 @@ export function createMainIndicatorLegendRendererPlugin(options: {
               let x = legendX
               const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
 
-              overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+              overlayCtx.fillStyle = colors.text.primary
               overlayCtx.fillText('MA', x, y)
               x += measureTextWidth(overlayCtx, 'MA') + gap
 
@@ -149,23 +149,23 @@ export function createMainIndicatorLegendRendererPlugin(options: {
             const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
             const titleText = `BOLL(${period},${multiplier})`
 
-            overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+            overlayCtx.fillStyle = colors.text.primary
             overlayCtx.fillText(titleText, x, y)
             x += measureTextWidth(overlayCtx, titleText) + gap
 
             if (boll) {
               const upperText = `上轨:${boll.upper.toFixed(2)}`
-              overlayCtx.fillStyle = colors.BOLL.UPPER
+              overlayCtx.fillStyle = colors.boll.upper
               overlayCtx.fillText(upperText, x, y)
               x += measureTextWidth(overlayCtx, upperText) + gap
 
               const middleText = `中轨:${boll.middle.toFixed(2)}`
-              overlayCtx.fillStyle = colors.BOLL.MIDDLE
+              overlayCtx.fillStyle = colors.boll.middle
               overlayCtx.fillText(middleText, x, y)
               x += measureTextWidth(overlayCtx, middleText) + gap
 
               const lowerText = `下轨:${boll.lower.toFixed(2)}`
-              overlayCtx.fillStyle = colors.BOLL.LOWER
+              overlayCtx.fillStyle = colors.boll.lower
               overlayCtx.fillText(lowerText, x, y)
             }
           }
@@ -185,18 +185,18 @@ export function createMainIndicatorLegendRendererPlugin(options: {
             const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
             const titleText = `EXPMA(${fastPeriod},${slowPeriod})`
 
-            overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+            overlayCtx.fillStyle = colors.text.primary
             overlayCtx.fillText(titleText, x, y)
             x += measureTextWidth(overlayCtx, titleText) + gap
 
             if (expma) {
               const fastText = `快:${expma.fast.toFixed(2)}`
-              overlayCtx.fillStyle = colors.EXPMA.FAST
+              overlayCtx.fillStyle = colors.expma.fast
               overlayCtx.fillText(fastText, x, y)
               x += measureTextWidth(overlayCtx, fastText) + gap
 
               const slowText = `慢:${expma.slow.toFixed(2)}`
-              overlayCtx.fillStyle = colors.EXPMA.SLOW
+              overlayCtx.fillStyle = colors.expma.slow
               overlayCtx.fillText(slowText, x, y)
             }
           }
@@ -216,23 +216,23 @@ export function createMainIndicatorLegendRendererPlugin(options: {
             const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
             const titleText = `ENE(${period},${deviation})`
 
-            overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+            overlayCtx.fillStyle = colors.text.primary
             overlayCtx.fillText(titleText, x, y)
             x += measureTextWidth(overlayCtx, titleText) + gap
 
             if (ene) {
               const upperText = `上轨:${ene.upper.toFixed(2)}`
-              overlayCtx.fillStyle = colors.ENE.UPPER
+              overlayCtx.fillStyle = colors.ene.upper
               overlayCtx.fillText(upperText, x, y)
               x += measureTextWidth(overlayCtx, upperText) + gap
 
               const middleText = `中轨:${ene.middle.toFixed(2)}`
-              overlayCtx.fillStyle = colors.ENE.MIDDLE
+              overlayCtx.fillStyle = colors.ene.middle
               overlayCtx.fillText(middleText, x, y)
               x += measureTextWidth(overlayCtx, middleText) + gap
 
               const lowerText = `下轨:${ene.lower.toFixed(2)}`
-              overlayCtx.fillStyle = colors.ENE.LOWER
+              overlayCtx.fillStyle = colors.ene.lower
               overlayCtx.fillText(lowerText, x, y)
             }
           }

package/src/engine/renderers/Indicator/mom.ts

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
-import { getColors, type ChartTheme } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
 import type { MOMRenderState } from '../../indicators/momState'
 import { createMOMStateKey } from '../../indicators/momState'
@@ -82,7 +82,7 @@ export function createMOMRendererPlugin(options: MOMRendererOptions = {}): Rende
         displayMin: number,
         displayMax: number,
         dpr: number,
-        colors: { MOM: { ZERO: string } }
+        colors: { mom: { zero: string } }
     ): void {
         const displayValueRange = displayMax - displayMin || 1
         const zeroY = alignToPhysicalPixelCenter(paneHeight - (0 - displayMin) / displayValueRange * paneHeight, dpr)
@@ -90,7 +90,7 @@ export function createMOMRendererPlugin(options: MOMRendererOptions = {}): Rende
         ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height)
         ctx.save()
         ctx.scale(dpr, dpr)
-        ctx.strokeStyle = colors.MOM.ZERO
+        ctx.strokeStyle = colors.mom.zero
         ctx.lineWidth = 1
         ctx.beginPath()
         ctx.moveTo(0, zeroY)
@@ -143,7 +143,7 @@ export function createMOMRendererPlugin(options: MOMRendererOptions = {}): Rende
 
         draw(context: RenderContext) {
 const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             const stateKey = resolveKey()
             if (!stateKey) return
@@ -213,7 +213,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 if (params.showMOM && cachedMOMPoints.length >= 2) {
                     const ok = lineWebGLSurface.drawLineStrips(
-                        [{ points: cachedMOMPoints, width: 1, color: colors.MOM.MOM }],
+                        [{ points: cachedMOMPoints, width: 1, color: colors.mom.mom }],
                         scrollLeft
                     )
                     if (ok) {
@@ -249,13 +249,13 @@ function drawMOMLineWithCanvas2D(
     scrollLeft: number,
     momPoints: LinePoint[],
     params: { showMOM: boolean },
-    colors: { MOM: { MOM: string } }
+    colors: { mom: { mom: string } }
 ): void {
     if (!params.showMOM || momPoints.length < 2) return
 
     ctx.save()
     ctx.translate(-scrollLeft, 0)
-    ctx.strokeStyle = colors.MOM.MOM
+    ctx.strokeStyle = colors.mom.mom
     ctx.lineWidth = 1
     ctx.lineJoin = 'round'
     ctx.lineCap = 'round'
@@ -277,9 +277,10 @@ export function getMOMTitleInfo(
     period: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_MOM',
-    theme: ChartTheme = 'light'
+    theme: 'light' | 'dark' = 'light',
+    isAsiaMarket?: boolean
 ): { name: string; params: number[]; values: Array<{ label: string; value: number; color: string }> } | null {
-    const colors = getColors(theme)
+    const colors = resolveThemeColors(theme, isAsiaMarket)
     const state = pluginHost.getSharedState<MOMRenderState>(createMOMStateKey(paneId))
     if (!state) return null
 
@@ -290,7 +291,7 @@ export function getMOMTitleInfo(
         name: 'MOM',
         params: [period],
         values: [
-            { label: 'MOM', value: mom, color: colors.MOM.MOM },
+            { label: 'MOM', value: mom, color: colors.mom.mom },
         ],
     }
 }