fix: parser of tooltip content

VisActor · Sep 27, 2024 · 51b990a · 51b990a
1 parent 765741f
commit 51b990a
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/packages/vchart/src/series/base/tooltip-helper.ts b/packages/vchart/src/series/base/tooltip-helper.ts
@@ -6,6 +6,7 @@ import type {
   ShapeType,
   TooltipActiveType,
   TooltipData,
+  TooltipPatternCallback,
   TooltipPatternProperty
 } from '../../typings';
 import { array, isFunction, isValid } from '@visactor/vutils';
@@ -160,7 +161,7 @@ export class BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
   protected getDefaultContentList(
     activeType: TooltipActiveType
   ): MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>> {
-    return [{}];
+    return [this.getDefaultContentPattern(activeType)];
   }
 
   protected getContentList(
@@ -179,12 +180,11 @@ export class BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
     params?: TooltipHandlerParams
   ) {
     const titlePattern = isFunction(titleSpec)
-      ? (titleSpec(data, params) as ITooltipLinePattern)
+      ? ((titleSpec as TooltipPatternCallback<ITooltipLinePattern>)(data, params) as ITooltipLinePattern)
       : (titleSpec as ITooltipLinePattern);
 
     return titlePattern
       ? {
-          ...this.getDefaultTitlePattern(activeType),
           ...titlePattern
         }
       : this.getDefaultTitlePattern(activeType);
@@ -212,7 +212,6 @@ export class BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
             userContents.forEach(entry => {
               content.push({
                 ...shapeAttrs,
-                ...this.getDefaultContentPattern(activeType),
                 ...entry
               });
             });
@@ -239,15 +238,15 @@ export class BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
     };
   }
 
-  protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipPattern['title'] {
+  protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern {
     return {
       key: undefined,
       value: activeType === 'group' ? this.groupTooltipTitleCallback : this.dimensionTooltipTitleCallback,
       hasShape: false
     };
   }
 
-  protected getDefaultContentPattern(activeType: TooltipActiveType): ITooltipPattern['content'] {
+  protected getDefaultContentPattern(activeType: TooltipActiveType): ITooltipLinePattern {
     return {
       seriesId: this.series.id,
       key: activeType === 'group' ? this.groupTooltipKeyCallback : this.markTooltipKeyCallback,