@363045841yyt/klinechart 0.7.6 → 0.7.7

package/src/components/IndicatorSelector.vue

@@ -560,7 +560,7 @@ onUnmounted(() => {
   width: 1px;
   height: 20px;
   align-self: center;
-  background: #d9d9d9;
+  background: var(--klc-color-axis-line);
 }
 
 .indicator-item {
@@ -581,8 +581,7 @@ onUnmounted(() => {
 }
 
 .indicator-item.drag-over .indicator-btn {
-  border-color: #1a1a1a;
-  box-shadow: 0 0 0 2px rgba(26, 26, 26, 0.12);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--klc-color-foreground) 12%, transparent);
 }
 
 .indicator-btn-wrapper {
@@ -593,10 +592,10 @@ onUnmounted(() => {
   position: relative;
   flex-shrink: 0;
   padding: 6px 16px;
-  border: 1px solid #e0e0e0;
+  border: none;
   border-radius: 16px;
-  background: #ffffff;
-  color: #666;
+  background: var(--klc-color-tag-bg-white);
+  color: var(--klc-color-axis-text);
   font-size: 13px;
   font-weight: 500;
   cursor: pointer;
@@ -610,20 +609,17 @@ onUnmounted(() => {
 }
 
 .indicator-btn:hover:not(.hovering) {
-  background: #f8f8f8;
-  border-color: #ccc;
-  color: #333;
+  background: var(--klc-color-tag-bg-hover);
+  color: var(--klc-color-foreground);
 }
 
 .indicator-btn.active {
-  background: #f8f8f8;
-  border-color: #1a1a1a;
-  color: #1a1a1a;
+  background: var(--klc-color-tag-bg-hover);
+  color: var(--klc-color-foreground);
 }
 
 .indicator-btn.active:hover:not(.hovering) {
-  background: #f0f0f0;
-  border-color: #333;
+  background: var(--klc-color-tag-bg-hover);
 }
 
 .btn-content {
@@ -647,7 +643,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   gap: 4px;
-  background: rgba(255, 255, 255, 0.85);
+  background: color-mix(in srgb, var(--klc-color-background) 85%, transparent);
   backdrop-filter: blur(4px);
   border-radius: 16px;
   z-index: 2;
@@ -660,7 +656,7 @@ onUnmounted(() => {
   border: none;
   border-radius: 50%;
   background: transparent;
-  color: #666;
+  color: var(--klc-color-axis-text);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -669,12 +665,12 @@ onUnmounted(() => {
 }
 
 .action-btn:hover {
-  background: rgba(0, 0, 0, 0.06);
-  color: #333;
+  background: var(--klc-color-tag-bg-hover);
+  color: var(--klc-color-foreground);
 }
 
 .settings-btn:hover {
-  color: #1a1a1a;
+  color: var(--klc-color-foreground);
 }
 
 .remove-btn:hover {
@@ -684,7 +680,7 @@ onUnmounted(() => {
 .divider {
   width: 1px;
   height: 14px;
-  background: #e0e0e0;
+  background: var(--klc-color-border-button);
 }
 
 /* 添加按钮 */
@@ -693,10 +689,10 @@ onUnmounted(() => {
   width: 32px;
   height: 32px;
   padding: 0;
-  border: 1px dashed #d9d9d9;
+  border: none;
   border-radius: 50%;
   background: transparent;
-  color: #999;
+  color: var(--klc-color-axis-text);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -705,9 +701,8 @@ onUnmounted(() => {
 }
 
 .add-btn:hover {
-  border-color: #1a1a1a;
-  color: #1a1a1a;
-  background: rgba(26, 26, 26, 0.04);
+  color: var(--klc-color-foreground);
+  background: var(--klc-color-tag-bg-hover);
 }
 
 /* ─────────────────────────────────────────────────────────────────
@@ -728,8 +723,8 @@ onUnmounted(() => {
 
 /* 弹窗容器 */
 .selector-modal {
-  background: #ffffff;
-  border: 1px solid #e0e0e0;
+  background: var(--klc-color-tag-bg-white);
+  border: 1px solid var(--klc-color-axis-line);
   border-radius: 12px;
   box-shadow: 0 8px 40px rgba(0, 0, 0, 0.15);
   width: 90vw;
@@ -746,8 +741,8 @@ onUnmounted(() => {
   justify-content: space-between;
   align-items: center;
   padding: 16px 20px;
-  background: #f8f8f8;
-  border-bottom: 1px solid #e8e8e8;
+  background: var(--klc-color-background);
+  border-bottom: 1px solid var(--klc-color-border-chart);
   flex-shrink: 0;
 }
 
@@ -760,18 +755,18 @@ onUnmounted(() => {
 .title-text {
   font-size: 14px;
   font-weight: 600;
-  color: #1a1a1a;
+  color: var(--klc-color-foreground);
   letter-spacing: 0.2px;
 }
 
 .title-sub {
   font-size: 11px;
-  color: #999;
+  color: var(--klc-color-axis-text);
 }
 
 .modal-close {
-  background: #fff;
-  border: 1px solid #e0e0e0;
+  background: var(--klc-color-tag-bg-white);
+  border: 1px solid var(--klc-color-border-button);
   border-radius: 6px;
   width: 28px;
   height: 28px;
@@ -779,15 +774,15 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   cursor: pointer;
-  color: #888;
+  color: var(--klc-color-axis-text);
   transition: all 0.15s;
   padding: 0;
 }
 
 .modal-close:hover {
-  background: #f0f0f0;
-  color: #333;
-  border-color: #ccc;
+  background: var(--klc-color-tag-bg-hover);
+  color: var(--klc-color-foreground);
+  border-color: var(--klc-color-axis-line);
 }
 
 .modal-close svg {
@@ -802,8 +797,8 @@ onUnmounted(() => {
 }
 
 .view-toggle-btn {
-  background: #fff;
-  border: 1px solid #e0e0e0;
+  background: var(--klc-color-tag-bg-white);
+  border: 1px solid var(--klc-color-border-button);
   border-radius: 6px;
   width: 28px;
   height: 28px;
@@ -811,21 +806,21 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   cursor: pointer;
-  color: #888;
+  color: var(--klc-color-axis-text);
   transition: all 0.15s;
   padding: 0;
 }
 
 .view-toggle-btn:hover {
-  background: #f0f0f0;
-  color: #333;
-  border-color: #ccc;
+  background: var(--klc-color-tag-bg-hover);
+  color: var(--klc-color-foreground);
+  border-color: var(--klc-color-axis-line);
 }
 
 .view-toggle-btn.active {
-  background: #1a1a1a;
-  border-color: #1a1a1a;
-  color: #fff;
+  background: var(--klc-color-tag-bg-white);
+  border-color: var(--klc-color-border-button);
+  color: var(--klc-color-foreground);
 }
 
 /* 弹窗主体 */
@@ -838,26 +833,36 @@ onUnmounted(() => {
   gap: 20px;
 }
 
+.modal-body::-webkit-scrollbar {
+  width: 8px;
+}
+
+.modal-body::-webkit-scrollbar-thumb {
+  background: var(--klc-color-axis-line);
+  border: 2px solid var(--klc-color-tag-bg-white);
+  border-radius: 999px;
+}
+
 /* 搜索框 */
 .search-box {
   display: flex;
   align-items: center;
   gap: 10px;
   padding: 10px 14px;
-  border: 1px solid #e0e0e0;
+  border: 1px solid var(--klc-color-border-button);
   border-radius: 8px;
   transition: all 0.2s ease;
 }
 
 .search-box:focus-within {
-  background: #ffffff;
-  border-color: #1a1a1a;
-  box-shadow: 0 0 0 2px rgba(26, 26, 26, 0.08);
+  background: var(--klc-color-tag-bg-white);
+  border-color: var(--klc-color-foreground);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--klc-color-foreground) 8%, transparent);
 }
 
 .search-icon {
   flex-shrink: 0;
-  color: #999;
+  color: var(--klc-color-axis-text);
 }
 
 .search-input {
@@ -865,12 +870,12 @@ onUnmounted(() => {
   border: none;
   background: transparent;
   font-size: 13px;
-  color: #333;
+  color: var(--klc-color-foreground);
   outline: none;
 }
 
 .search-input::placeholder {
-  color: #aaa;
+  color: var(--klc-color-axis-text);
 }
 
 /* 无结果提示 */
@@ -880,7 +885,7 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   padding: 48px 20px;
-  color: #ccc;
+  color: var(--klc-color-axis-text);
   gap: 12px;
 }
 
@@ -891,13 +896,13 @@ onUnmounted(() => {
 .no-results p {
   margin: 0;
   font-size: 14px;
-  color: #999;
+  color: var(--klc-color-axis-text);
   font-weight: 500;
 }
 
 .no-results-hint {
   font-size: 12px;
-  color: #bbb;
+  color: var(--klc-color-axis-text);
 }
 
 /* 指标区域 */
@@ -916,13 +921,13 @@ onUnmounted(() => {
 .section-title {
   font-size: 13px;
   font-weight: 600;
-  color: #1a1a1a;
+  color: var(--klc-color-foreground);
 }
 
 .section-count {
   font-size: 11px;
-  color: #999;
-  background: #f0f0f0;
+  color: var(--klc-color-axis-text);
+  background: var(--klc-color-grid-minor);
   padding: 2px 8px;
   border-radius: 10px;
 }
@@ -959,8 +964,8 @@ onUnmounted(() => {
   transform: translateX(-50%);
   padding: 4px 10px;
   border-radius: 6px;
-  background: #333;
-  color: #fff;
+  background: var(--klc-color-foreground);
+  color: var(--klc-color-background);
   font-size: 12px;
   white-space: nowrap;
   pointer-events: none;
@@ -984,24 +989,24 @@ onUnmounted(() => {
   flex-direction: column;
   gap: 4px;
   padding: 12px 14px;
-  border: 1px solid #e8e8e8;
+  border: 1px solid var(--klc-color-border-chart);
   border-radius: 8px;
-  background: #ffffff;
+  background: var(--klc-color-tag-bg-white);
   cursor: pointer;
   transition: all 0.15s;
   text-align: left;
 }
 
 .indicator-card:hover:not(.disabled) {
-  border-color: #1a1a1a;
-  background: #fafafa;
+  border-color: var(--klc-color-foreground);
+  background: var(--klc-color-background);
   transform: translateY(-1px);
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
 }
 
 .indicator-card.active {
-  border-color: #1a1a1a;
-  background: #f8f8f8;
+  border-color: var(--klc-color-foreground);
+  background: var(--klc-color-tag-bg-hover);
 }
 
 .card-header {
@@ -1014,7 +1019,7 @@ onUnmounted(() => {
 .card-label {
   font-size: 13px;
   font-weight: 600;
-  color: #1a1a1a;
+  color: var(--klc-color-foreground);
 }
 
 .card-header-actions {
@@ -1033,32 +1038,32 @@ onUnmounted(() => {
   border: none;
   border-radius: 4px;
   background: transparent;
-  color: #bbb;
+  color: var(--klc-color-axis-text);
   cursor: pointer;
   transition: all 0.15s;
 }
 
 .card-settings-btn:hover {
-  background: #f0f0f0;
-  color: #555;
+  background: var(--klc-color-tag-bg-hover);
+  color: var(--klc-color-foreground);
 }
 
 .card-name {
   font-size: 11px;
-  color: #666;
+  color: var(--klc-color-axis-text);
   line-height: 1.4;
 }
 
 .card-params {
   font-size: 10px;
-  color: #999;
+  color: var(--klc-color-axis-text);
   margin-top: 2px;
 }
 
 /* 区域分隔线 */
 .section-divider {
   height: 1px;
-  background: linear-gradient(90deg, transparent, #e0e0e0, transparent);
+  background: linear-gradient(90deg, transparent, var(--klc-color-border-button), transparent);
   margin: 4px 0;
 }
 
@@ -1068,18 +1073,18 @@ onUnmounted(() => {
   align-items: center;
   justify-content: space-between;
   padding: 12px 20px;
-  background: #f8f8f8;
-  border-top: 1px solid #e8e8e8;
+  background: var(--klc-color-background);
+  border-top: 1px solid var(--klc-color-border-chart);
   flex-shrink: 0;
 }
 
 .footer-info {
   font-size: 12px;
-  color: #666;
+  color: var(--klc-color-axis-text);
 }
 
 .info-text {
-  color: #999;
+  color: var(--klc-color-axis-text);
 }
 
 /* 按钮样式 */
@@ -1098,14 +1103,14 @@ onUnmounted(() => {
 }
 
 .btn-confirm {
-  background: #1a1a1a;
-  border-color: #1a1a1a;
-  color: #fff;
+  background: var(--klc-color-foreground);
+  border-color: var(--klc-color-foreground);
+  color: var(--klc-color-background);
 }
 
 .btn-confirm:hover {
-  background: #333;
-  border-color: #333;
+  background: var(--klc-color-foreground);
+  border-color: var(--klc-color-foreground);
   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
   transform: translateY(-1px);
 }

package/src/components/KLineChart.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chartWrapperRef" class="chart-wrapper" :data-theme="chartTheme">
+  <div ref="chartWrapperRef" class="chart-wrapper" :data-theme="chartTheme" :style="themeCssVars">
     <div
       class="chart-stage"
       :class="{
@@ -75,6 +75,8 @@
             :set-el="setTooltipEl"
             :use-anchor="useAnchorPositioning"
             :anchor-placement="tooltipAnchorPlacement"
+            :up-color="tooltipColors.upColor"
+            :down-color="tooltipColors.downColor"
           />
           <MarkerTooltip
             v-if="hoveredMarker || hoveredCustomMarker"
@@ -136,6 +138,8 @@ import {
   DrawingInteractionController,
 } from '@363045841yyt/klinechart-core/controllers'
 import type { DrawingObject, DrawingStyle } from '@363045841yyt/klinechart-core/plugin'
+import type { ChartSettings } from '@363045841yyt/klinechart-core/config'
+import { resolveThemeColors, themeToCssVars, lightTheme, darkTheme, type ColorPresetSettings } from '@363045841yyt/klinechart-core'
 import LeftToolbar from './LeftToolbar.vue'
 
 const props = withDefaults(
@@ -179,6 +183,7 @@ const props = withDefaults(
 const emit = defineEmits<{
   (e: 'zoomLevelChange', level: number, kWidth: number): void
   (e: 'toggleFullscreen'): void
+  (e: 'themeChange', theme: 'light' | 'dark'): void
 }>()
 
 const containerRef = ref<HTMLDivElement | null>(null)
@@ -219,11 +224,58 @@ kGap.value = kGapFromKWidth(kWidth.value, viewportDpr.value)
 /* ========== 主题状态 ========== */
 const chartTheme = ref<'light' | 'dark'>('light')
 
+const chartSettings = ref<ChartSettings>({})
+
+const tooltipColors = computed(() => {
+  const isAsiaMarket = chartSettings.value.isAsiaMarket ?? false
+  const colors = resolveThemeColors(chartTheme.value, isAsiaMarket as boolean | undefined)
+  return {
+    upColor: colors.candleUpBody,
+    downColor: colors.candleDownBody,
+  }
+})
+
+const themeCssVars = computed(() => {
+  const theme = chartTheme.value === 'dark' ? darkTheme : lightTheme
+  const overrides = (chartSettings.value.colorPresetSettings as ColorPresetSettings | undefined)?.[chartTheme.value]
+  if (overrides && Object.keys(overrides).length > 0) {
+    return themeToCssVars({ ...theme, colors: { ...theme.colors, ...overrides } })
+  }
+  return themeToCssVars(theme)
+})
+
+/* ========== 主题切换（支持 light / dark / auto 跟随系统） ========== */
+let autoThemeMediaQuery: MediaQueryList | null = null
+
+function onSystemThemeChange(e: MediaQueryListEvent) {
+  controller.value?.setTheme(e.matches ? 'dark' : 'light')
+}
+
+function applyThemeFromSettings(ctrl: ChartController | null, themeSetting: string | undefined) {
+  if (!ctrl || !themeSetting) return
+
+  if (themeSetting === 'auto') {
+    const mq = window.matchMedia('(prefers-color-scheme: dark)')
+    ctrl.setTheme(mq.matches ? 'dark' : 'light')
+    if (autoThemeMediaQuery !== mq) {
+      autoThemeMediaQuery?.removeEventListener('change', onSystemThemeChange)
+      autoThemeMediaQuery = mq
+      mq.addEventListener('change', onSystemThemeChange)
+    }
+  } else {
+    autoThemeMediaQuery?.removeEventListener('change', onSystemThemeChange)
+    autoThemeMediaQuery = null
+    ctrl.setTheme(themeSetting as 'light' | 'dark')
+  }
+}
+
 function scheduleRender() {
   /* Controller auto-renders on state changes */
 }
 
-function handleSettingsChange(settings: Record<string, boolean | string>) {
+function handleSettingsChange(settings: ChartSettings) {
+  chartSettings.value = settings
+  applyThemeFromSettings(controller.value, settings.theme as string)
   controller.value?.updateSettingsFacade(settings)
 
   if (settings.performanceTest10kKlines) {
@@ -735,7 +787,14 @@ function handleReorderSubIndicators(orderedIndicatorIds: string[]) {
 /* 计算总宽度：从 Vue 响应式状态读取，zoom 变化时自动重算 */
 const axisHostWidth = computed(() => props.rightAxisWidth + props.priceLabelWidth)
 
-const totalWidth = computed(() => controller.value?.getContentWidth() ?? 0)
+const totalWidth = computed(() => {
+  void dataVersion.value
+  void viewWidth.value
+  void kWidth.value
+  void kGap.value
+  void viewportDpr.value
+  return controller.value?.getContentWidth() ?? 0
+})
 
 function scrollToRight() {
   const container = containerRef.value
@@ -872,7 +931,9 @@ function setupChartCallbacks(ctrl: ChartController): void {
   })
 
   const unsubscribeTheme = ctrl.theme.subscribe(() => {
-    chartTheme.value = ctrl.theme.peek()
+    const newTheme = ctrl.theme.peek()
+    chartTheme.value = newTheme
+    emit('themeChange', newTheme)
   })
 
   const unsubscribeIndicators = ctrl.indicators.subscribe(() => {
@@ -936,11 +997,14 @@ function setupChartCallbacks(ctrl: ChartController): void {
     unsubscribeTheme()
     unsubscribeIndicators()
     unsubscribeSubPanes()
+    autoThemeMediaQuery?.removeEventListener('change', onSystemThemeChange)
   })
 }
 
 function applyInitialSettings(ctrl: ChartController): void {
   const initialSettings = toolbarRef.value?.getSettings() ?? { showVolumePriceMarkers: true }
+  chartSettings.value = initialSettings
+  applyThemeFromSettings(ctrl, initialSettings.theme as string)
   ctrl.updateSettingsFacade(initialSettings)
 
   if (initialSettings.performanceTest10kKlines) {
@@ -1070,12 +1134,12 @@ watch(
   --kmap-height: var(--kmap-chart-height, 100%);
   --kmap-width: var(--kmap-chart-width, 100%);
 
-  --chart-bg: #ffffff;
-  --chart-bg-secondary: #f8f9fa;
-  --chart-border: #e5e7eb;
-  --chart-border-active: #3b82f6;
-  --chart-text: #374151;
-  --chart-text-secondary: #6b7280;
+  --chart-bg: var(--klc-color-chart-background);
+  --chart-bg-secondary: var(--klc-color-chart-background);
+  --chart-border: var(--klc-color-border-chart);
+  --chart-border-active: #1890ff;
+  --chart-text: var(--klc-color-foreground);
+  --chart-text-secondary: var(--klc-color-axis-text);
 
   display: flex;
   align-items: center;
@@ -1086,15 +1150,6 @@ watch(
   flex-direction: column;
 }
 
-.chart-wrapper[data-theme='dark'] {
-  --chart-bg: #1a1a2e;
-  --chart-bg-secondary: #16162a;
-  --chart-border: #2d2d44;
-  --chart-border-active: #60a5fa;
-  --chart-text: #e5e7eb;
-  --chart-text-secondary: #9ca3af;
-}
-
 .chart-stage {
   width: 95%;
   height: 85%;

package/src/components/KLineTooltip.vue

@@ -67,7 +67,7 @@ export interface KLineData {
   stockCode?: string
 }
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   k: KLineData | null
   index: number | null
   data: ReadonlyArray<KLineData>
@@ -75,7 +75,14 @@ const props = defineProps<{
   useAnchor?: boolean
   anchorPlacement?: 'right-bottom' | 'left-bottom'
   setEl?: (el: HTMLDivElement | null) => void
-}>()
+  /** 涨的颜色（默认红涨） */
+  upColor?: string
+  /** 跌的颜色（默认绿跌） */
+  downColor?: string
+}>(), {
+  upColor: '#ef4444',
+  downColor: '#22c55e',
+})
 
 const useAnchor = computed(() => props.useAnchor === true)
 const anchorPlacementClass = computed(() =>
@@ -105,8 +112,6 @@ function formatSigned(val: number, unit: string): string {
   return `${sign}${val.toFixed(2)}${unit}`
 }
 
-const UP_COLOR = '#ef4444'
-const DOWN_COLOR = '#22c55e'
 const NEUTRAL_COLOR = '#6b7280'
 
 function calcDirection(k: KLineData, data: ReadonlyArray<KLineData>, idx: number | null): number {
@@ -121,21 +126,21 @@ const openColor = computed(() => {
   const k = props.k
   if (!k) return NEUTRAL_COLOR
   const dir = calcDirection(k, props.data, props.index)
-  return dir > 0 ? UP_COLOR : dir < 0 ? DOWN_COLOR : NEUTRAL_COLOR
+  return dir > 0 ? props.upColor : dir < 0 ? props.downColor : NEUTRAL_COLOR
 })
 
 const closeColor = computed(() => {
   const k = props.k
   if (!k) return NEUTRAL_COLOR
   const diff = k.close - k.open
-  return diff > 0 ? UP_COLOR : diff < 0 ? DOWN_COLOR : NEUTRAL_COLOR
+  return diff > 0 ? props.upColor : diff < 0 ? props.downColor : NEUTRAL_COLOR
 })
 
 const changeColor = computed(() => {
   const k = props.k
   if (!k) return NEUTRAL_COLOR
   const pct = k.changePercent ?? (k.close - k.open) / k.open * 100
-  return pct > 0 ? UP_COLOR : pct < 0 ? DOWN_COLOR : NEUTRAL_COLOR
+  return pct > 0 ? props.upColor : pct < 0 ? props.downColor : NEUTRAL_COLOR
 })
 </script>
 
@@ -147,10 +152,10 @@ const changeColor = computed(() => {
   max-width: 260px;
   padding: 10px 12px;
   border-radius: 8px;
-  background: rgba(255, 255, 255, 0.92);
-  border: 1px solid rgba(0, 0, 0, 0.12);
+  background: var(--klc-color-tooltip-bg);
+  border: 1px solid var(--klc-color-tooltip-border);
   box-shadow: 0 6px 18px rgba(0, 0, 0, 0.12);
-  color: rgba(0, 0, 0, 0.78);
+  color: var(--klc-color-tooltip-text);
   font-size: 12px;
   line-height: 1.4;
   pointer-events: none;
@@ -178,7 +183,8 @@ const changeColor = computed(() => {
 }
 
 .kline-tooltip__grid .row span:first-child {
-  color: rgba(0, 0, 0, 0.56);
+  color: var(--klc-color-tooltip-text);
+  opacity: 0.56;
 }
 
 @supports (anchor-name: --kmap-anchor) and (position-anchor: --kmap-anchor) {