@visactor/vchart 1.0.1-alpha.1 → 1.1.0-beta.0

package/cjs/component/tooltip/handler/utils/attribute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/attribute.ts"],"names":[],"mappings":"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","file":"attribute.js","sourcesContent":["import type {\n  IContainerSize,\n  TooltipAttributes,\n  TooltipRowAttrs,\n  TooltipSymbolAttrs\n} from '@visactor/vrender-components';\nimport type { IToolTipActual } from '../../../../typings';\nimport type { ITooltipStyle } from '../interface';\nimport { isValid } from '@visactor/vutils';\nimport { initTextMeasure } from '../../../../util';\nimport { builtinSymbolsMap } from '@visactor/vrender';\n\nexport const getTooltipAttributes = (actualTooltip: IToolTipActual, style: ITooltipStyle): TooltipAttributes => {\n  const { spaceRow, padding, title: titleStyle, shape: shapeStyle, key: keyStyle, value: valueStyle } = style;\n\n  const attribute: TooltipAttributes = {\n    ...style,\n\n    title: {},\n    content: [],\n\n    titleStyle: {\n      value: titleStyle,\n      spaceRow\n    },\n    contentStyle: {\n      shape: shapeStyle,\n      key: keyStyle,\n      value: valueStyle,\n      spaceRow\n    },\n\n    hasContentShape: false,\n    keyWidth: 0,\n    valueWidth: 0\n  };\n  (['key', 'value', 'shape'] as (keyof ITooltipStyle)[]).forEach(key => {\n    delete attribute[key];\n  });\n\n  const { title = {}, content = [] } = actualTooltip;\n\n  let maxWidth = 0;\n  let containerHeight = padding.top + padding.bottom;\n\n  // calculate title\n  let titleMaxHeight = 0;\n  const {\n    visible: titleVisible = true,\n    value: titleValue = '',\n    hasShape: titleHasShape,\n    shapeType: titleShapeType = '',\n    shapeHollow: titleShapeHollow,\n    shapeColor: titleShapeColor\n  } = title;\n  attribute.title.visible = titleVisible;\n  if (titleVisible) {\n    const { width, height } = initTextMeasure(titleStyle as any).quickMeasure(titleValue);\n    attribute.title.value = {\n      // width, height,\n      text: titleValue\n    };\n    maxWidth = width;\n    titleMaxHeight = height;\n\n    if (titleHasShape && builtinSymbolsMap[titleShapeType]) {\n      const titleShapeAttrs: TooltipSymbolAttrs = {\n        symbolType: titleShapeType\n      };\n      if (titleShapeHollow) {\n        titleShapeAttrs.stroke = titleShapeColor;\n      } else {\n        titleShapeAttrs.fill = titleShapeColor;\n      }\n      attribute.title.shape = titleShapeAttrs;\n      maxWidth += shapeStyle.size + shapeStyle.spacing;\n      titleMaxHeight = Math.max(shapeStyle.size, titleMaxHeight);\n    }\n\n    attribute.title.width = maxWidth;\n    attribute.title.height = titleMaxHeight;\n\n    containerHeight += titleMaxHeight + spaceRow;\n  }\n\n  // calculate content\n  if (content.length) {\n    // filter content\n    const filteredContent = content.filter(item => {\n      return (item.key || item.value) && item.visible !== false;\n    });\n    if (filteredContent.length) {\n      let hasContentShape = false;\n      const keyWidths: number[] = [];\n      const valueWidths: number[] = [];\n\n      const keyTextMeasure = initTextMeasure(keyStyle as any);\n      const valueTextMeasure = initTextMeasure(valueStyle as any);\n\n      attribute.content = filteredContent.map((item, i) => {\n        const itemAttrs: TooltipRowAttrs = { height: 0, spaceRow };\n        let itemHeight = 0;\n        const { hasShape, key, shapeColor, shapeHollow, shapeType = '', value } = item;\n        if (isValid(key)) {\n          const { width, height } = keyTextMeasure.quickMeasure(key);\n          itemAttrs.key = {\n            text: key as any\n          };\n          keyWidths.push(width);\n          itemHeight = Math.max(itemHeight, height);\n        }\n        if (isValid(value)) {\n          const { width, height } = valueTextMeasure.quickMeasure(value);\n          itemAttrs.value = {\n            text: value as any\n          };\n          valueWidths.push(width);\n          itemHeight = Math.max(itemHeight, height);\n        }\n        if (hasShape && builtinSymbolsMap[shapeType]) {\n          hasContentShape = true;\n          const shape: TooltipSymbolAttrs = {\n            symbolType: shapeType\n          };\n          if (shapeHollow) {\n            shape.stroke = shapeColor;\n          } else {\n            shape.fill = shapeColor;\n          }\n          itemHeight = Math.max(shapeStyle.size, itemHeight);\n          itemAttrs.shape = shape;\n        }\n\n        itemAttrs.height = itemHeight;\n        containerHeight += itemHeight;\n        if (i < filteredContent.length - 1) {\n          containerHeight += spaceRow;\n        }\n\n        return itemAttrs;\n      });\n\n      const maxKeyWidth = keyWidths.length ? Math.max(...keyWidths) : 0; // name 需要对齐\n      const maxValueWidth = valueWidths.length ? Math.max(...valueWidths) : 0; // value 需要对齐\n      maxWidth = Math.max(\n        maxKeyWidth +\n          maxValueWidth +\n          keyStyle.spacing +\n          valueStyle.spacing +\n          (hasContentShape ? shapeStyle.size + shapeStyle.spacing : 0),\n        maxWidth\n      );\n      attribute.hasContentShape = hasContentShape;\n      attribute.keyWidth = maxKeyWidth;\n      attribute.valueWidth = maxValueWidth;\n    }\n  }\n\n  const containerSize: IContainerSize = {\n    width: maxWidth + padding.left + padding.right,\n    height: containerHeight\n  };\n\n  attribute.panel.width = containerSize.width;\n  attribute.panel.height = containerSize.height;\n  return attribute;\n};\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/attribute.ts"],"names":[],"mappings":"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","file":"attribute.js","sourcesContent":["import type {\n  IContainerSize,\n  TooltipAttributes,\n  TooltipRowAttrs,\n  TooltipSymbolAttrs\n} from '@visactor/vrender-components';\nimport type { IToolTipActual } from '../../../../typings';\nimport type { ITooltipStyle } from '../interface';\nimport { isValid } from '@visactor/vutils';\nimport { initTextMeasure } from '../../../../util';\nimport { builtinSymbolsMap } from '@visactor/vrender';\n\nexport const getTooltipAttributes = (actualTooltip: IToolTipActual, style: ITooltipStyle): TooltipAttributes => {\n  const { spaceRow, padding, title: titleStyle, shape: shapeStyle, key: keyStyle, value: valueStyle } = style;\n\n  const attribute: TooltipAttributes = {\n    ...style,\n\n    title: {},\n    content: [],\n\n    titleStyle: {\n      value: titleStyle,\n      spaceRow\n    },\n    contentStyle: {\n      shape: shapeStyle,\n      key: keyStyle,\n      value: valueStyle,\n      spaceRow\n    },\n\n    hasContentShape: false,\n    keyWidth: 0,\n    valueWidth: 0\n  };\n  (['key', 'value', 'shape'] as (keyof ITooltipStyle)[]).forEach(key => {\n    delete attribute[key];\n  });\n\n  const { title = {}, content = [] } = actualTooltip;\n\n  let maxWidth = 0;\n  let containerHeight = padding.top + padding.bottom;\n\n  // calculate title\n  let titleMaxHeight = 0;\n  const {\n    visible: titleVisible = true,\n    value: titleValue = '',\n    hasShape: titleHasShape,\n    shapeType: titleShapeType = '',\n    shapeHollow: titleShapeHollow,\n    shapeColor: titleShapeColor\n  } = title;\n  attribute.title.visible = titleVisible;\n  if (titleVisible) {\n    const { width, height } = initTextMeasure(titleStyle as any).quickMeasure(titleValue);\n    attribute.title.value = {\n      // width, height,\n      text: titleValue\n    };\n    maxWidth = width;\n    titleMaxHeight = height;\n\n    if (titleHasShape && builtinSymbolsMap[titleShapeType]) {\n      const titleShapeAttrs: TooltipSymbolAttrs = {\n        symbolType: titleShapeType\n      };\n      if (titleShapeHollow) {\n        titleShapeAttrs.stroke = titleShapeColor;\n      } else {\n        titleShapeAttrs.fill = titleShapeColor;\n      }\n      attribute.title.shape = titleShapeAttrs;\n      maxWidth += shapeStyle.size + shapeStyle.spacing;\n      titleMaxHeight = Math.max(shapeStyle.size, titleMaxHeight);\n    }\n\n    attribute.title.width = maxWidth;\n    attribute.title.height = titleMaxHeight;\n\n    containerHeight += titleMaxHeight;\n  }\n\n  // calculate content\n  if (content.length) {\n    // filter content\n    const filteredContent = content.filter(item => {\n      return (item.key || item.value) && item.visible !== false;\n    });\n    if (filteredContent.length) {\n      if (titleVisible) {\n        containerHeight += spaceRow; // title 与 content 之前的间隔\n      }\n\n      let hasContentShape = false;\n      const keyWidths: number[] = [];\n      const adaptiveKeyWidths: number[] = [];\n      const valueWidths: number[] = [];\n\n      const keyTextMeasure = initTextMeasure(keyStyle as any);\n      const valueTextMeasure = initTextMeasure(valueStyle as any);\n\n      attribute.content = filteredContent.map((item, i) => {\n        const itemAttrs: TooltipRowAttrs = { height: 0, spaceRow };\n        let itemHeight = 0;\n        const { hasShape, key, shapeColor, shapeHollow, shapeType = '', value, isKeyAdaptive } = item;\n        if (isValid(key)) {\n          const { width, height } = keyTextMeasure.quickMeasure(key);\n          itemAttrs.key = {\n            text: key as any\n          };\n          if (!isKeyAdaptive) {\n            keyWidths.push(width);\n          } else {\n            adaptiveKeyWidths.push(width);\n          }\n          itemHeight = Math.max(itemHeight, height);\n        }\n        if (isValid(value)) {\n          const { width, height } = valueTextMeasure.quickMeasure(value);\n          itemAttrs.value = {\n            text: value as any\n          };\n          valueWidths.push(width);\n          itemHeight = Math.max(itemHeight, height);\n        }\n        if (hasShape && builtinSymbolsMap[shapeType]) {\n          hasContentShape = true;\n          const shape: TooltipSymbolAttrs = {\n            visible: true,\n            symbolType: shapeType\n          };\n          if (shapeHollow) {\n            shape.stroke = shapeColor;\n          } else {\n            shape.fill = shapeColor;\n          }\n          itemHeight = Math.max(shapeStyle.size, itemHeight);\n          itemAttrs.shape = shape;\n        } else {\n          itemAttrs.shape = { visible: false };\n        }\n\n        itemAttrs.height = itemHeight;\n        containerHeight += itemHeight;\n        if (i < filteredContent.length - 1) {\n          containerHeight += spaceRow;\n        }\n\n        return itemAttrs;\n      });\n\n      const maxKeyWidth = keyWidths.length ? Math.max(...keyWidths) : 0; // name 需要对齐\n      const maxAdaptiveKeyWidth = adaptiveKeyWidths.length ? Math.max(...adaptiveKeyWidths) : 0;\n      const maxValueWidth = valueWidths.length ? Math.max(...valueWidths) : 0; // value 需要对齐\n      const shapeWidth = hasContentShape ? shapeStyle.size + shapeStyle.spacing : 0; // shape 列宽度\n      maxWidth = Math.max(\n        maxKeyWidth + maxValueWidth + keyStyle.spacing + valueStyle.spacing + shapeWidth,\n        maxAdaptiveKeyWidth + shapeWidth,\n        maxWidth\n      );\n      attribute.hasContentShape = hasContentShape;\n      attribute.keyWidth = maxKeyWidth;\n      attribute.valueWidth = maxValueWidth;\n    }\n  }\n\n  const containerSize: IContainerSize = {\n    width: maxWidth + padding.left + padding.right,\n    height: containerHeight\n  };\n\n  attribute.panel.width = containerSize.width;\n  attribute.panel.height = containerSize.height;\n  return attribute;\n};\n"]}

package/cjs/component/tooltip/handler/utils/common.d.ts

@@ -1,5 +1,9 @@
-import type { TooltipContentCallback } from '../../../../typings';
+import type { Datum } from '@visactor/vgrammar';
+import type { MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';
+import type { TooltipHandlerParams } from '../../interface';
 export declare function escapeHTML(value: any): string;
-export declare const getTooltipValue: (field: string | TooltipContentCallback | null | undefined, datum?: any) => string | undefined;
+export declare const getTooltipContentValue: <T>(field?: TooltipContentProperty<T>, datum?: any, params?: TooltipHandlerParams) => T;
+export declare const getTooltipPatternValue: <T>(field?: MaybeArray<TooltipPatternProperty<T>>, data?: TooltipData, params?: TooltipHandlerParams) => MaybeArray<TooltipPatternProperty<T>> extends TooltipPatternProperty<T>[] ? MaybeArray<T> : T;
+export declare function getFirstDatumFromTooltipData(data: TooltipData): Datum;
 export declare function pickFirstValidValue<T>(isValid: (element?: T) => any, ...elements: T[]): T | undefined;
 export declare function convertToColorString(color: any, defaultColor?: string): string;

package/cjs/component/tooltip/handler/utils/common.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.convertToColorString = exports.pickFirstValidValue = exports.getTooltipValue = exports.escapeHTML = void 0;
+}), exports.convertToColorString = exports.pickFirstValidValue = exports.getFirstDatumFromTooltipData = exports.getTooltipPatternValue = exports.getTooltipContentValue = exports.escapeHTML = void 0;
 
 const util_1 = require("../../../../util");
 
@@ -12,8 +12,33 @@ function escapeHTML(value) {
 
 exports.escapeHTML = escapeHTML;
 
-const getTooltipValue = (field, datum) => (0, util_1.isNil)(field) ? null : (0, 
-util_1.isFunction)(field) ? field(datum) : field.toString();
+const getTooltipContentValue = (field, datum, params) => (0, util_1.isNil)(field) ? field : (0, 
+util_1.isFunction)(field) ? field(datum, params) : field;
+
+exports.getTooltipContentValue = getTooltipContentValue;
+
+const getTooltipPatternValue = (field, data, params) => {
+    if ((0, util_1.isNil)(field)) return field;
+    if ((0, util_1.isArray)(field)) {
+        const result = [];
+        return field.forEach((item => {
+            if ((0, util_1.isFunction)(item)) {
+                const value = item(data, params);
+                (0, util_1.isValid)(value) && result.push(value);
+            } else result.push(item);
+        })), result;
+    }
+    return (0, util_1.isFunction)(field) ? field(data, params) : field;
+};
+
+function getFirstDatumFromTooltipData(data) {
+    var _a;
+    const dimInfoList = (null === (_a = data[0]) || void 0 === _a ? void 0 : _a.series) ? [ {
+        data: data,
+        value: ""
+    } ] : data;
+    for (const {data: dataList} of dimInfoList) for (const {datum: datumList} of dataList) for (const datumItem of null != datumList ? datumList : []) if (datumItem) return datumItem;
+}
 
 function pickFirstValidValue(isValid, ...elements) {
     for (const ele of elements) if (isValid(ele)) return ele;
@@ -23,6 +48,6 @@ function convertToColorString(color, defaultColor = "#000") {
     return color ? (0, util_1.isString)(color) ? color : (0, util_1.isObject)(color) && color.stops && color.stops[0] && color.stops[0].color || defaultColor : defaultColor;
 }
 
-exports.getTooltipValue = getTooltipValue, exports.pickFirstValidValue = pickFirstValidValue, 
-exports.convertToColorString = convertToColorString;
+exports.getTooltipPatternValue = getTooltipPatternValue, exports.getFirstDatumFromTooltipData = getFirstDatumFromTooltipData, 
+exports.pickFirstValidValue = pickFirstValidValue, exports.convertToColorString = convertToColorString;
 //# sourceMappingURL=common.js.map

package/cjs/component/tooltip/handler/utils/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/common.ts"],"names":[],"mappings":";;;AACA,2CAAyE;AAezE,SAAgB,UAAU,CAAC,KAAU;IACnC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAClH,CAAC;AAFD,gCAEC;AAEM,MAAM,eAAe,GAAG,CAC7B,KAAyD,EACzD,KAAW,EACS,EAAE;IACtB,IAAI,IAAA,YAAK,EAAC,KAAK,CAAC,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;QACrB,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC;KACrB;IACD,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC,CAAC;AAXW,QAAA,eAAe,mBAW1B;AAEF,SAAgB,mBAAmB,CAAI,OAA6B,EAAE,GAAG,QAAa;IACpF,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;YAChB,OAAO,GAAG,CAAC;SACZ;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAPD,kDAOC;AAGD,SAAgB,oBAAoB,CAAC,KAAU,EAAE,eAAuB,MAAM;IAC5E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,YAAY,CAAC;KACrB;IACD,IAAI,IAAA,eAAQ,EAAC,KAAK,CAAC,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,IAAA,eAAQ,EAAC,KAAK,CAAC,IAAK,KAAwB,CAAC,KAAK,IAAK,KAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QAC5F,OAAQ,KAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,YAAY,CAAC;KACjE;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAbD,oDAaC","file":"common.js","sourcesContent":["import type { TooltipContentCallback } from '../../../../typings';\nimport { isFunction, isObject, isString, isNil } from '../../../../util';\n\ninterface IGradientColor {\n  [key: string]: any;\n  stops: {\n    offset: number;\n    color: string;\n  }[];\n}\n\n/**\n * Escape special HTML characters.\n *\n * @param value A value to convert to string and HTML-escape.\n */\nexport function escapeHTML(value: any): string {\n  return String(value).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\\(/g, '&#40;');\n}\n\nexport const getTooltipValue = (\n  field: string | TooltipContentCallback | null | undefined,\n  datum?: any\n): string | undefined => {\n  if (isNil(field)) {\n    return null;\n  }\n  if (isFunction(field)) {\n    return field(datum);\n  }\n  return field.toString();\n};\n\nexport function pickFirstValidValue<T>(isValid: (element?: T) => any, ...elements: T[]): T | undefined {\n  for (const ele of elements) {\n    if (isValid(ele)) {\n      return ele;\n    }\n  }\n  return undefined;\n}\n\n// 针对渐变色，受底层渲染引擎影响，不一定都能绘制正确，所以这里取 colorStop 的第一个颜色作为 color\nexport function convertToColorString(color: any, defaultColor: string = '#000') {\n  if (!color) {\n    return defaultColor;\n  }\n  if (isString(color)) {\n    return color;\n  }\n\n  if (isObject(color) && (color as IGradientColor).stops && (color as IGradientColor).stops[0]) {\n    return (color as IGradientColor).stops[0].color || defaultColor;\n  }\n\n  return defaultColor;\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { Datum } from '@visactor/vgrammar';\nimport type { MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';\nimport { isFunction, isObject, isString, isNil, isArray, isValid, field } from '../../../../util';\nimport type { TooltipHandlerParams } from '../../interface';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension';\n\ninterface IGradientColor {\n  [key: string]: any;\n  stops: {\n    offset: number;\n    color: string;\n  }[];\n}\n\n/**\n * Escape special HTML characters.\n *\n * @param value A value to convert to string and HTML-escape.\n */\nexport function escapeHTML(value: any): string {\n  return String(value).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\\(/g, '&#40;');\n}\n\nexport const getTooltipContentValue = <T>(\n  field?: TooltipContentProperty<T>,\n  datum?: any,\n  params?: TooltipHandlerParams\n): T | undefined => {\n  if (isNil(field)) {\n    return field;\n  }\n  if (isFunction(field)) {\n    return field(datum, params);\n  }\n  return field;\n};\n\nexport const getTooltipPatternValue = <T>(\n  field?: MaybeArray<TooltipPatternProperty<T>>,\n  data?: TooltipData,\n  params?: TooltipHandlerParams\n): (typeof field extends Array<TooltipPatternProperty<T>> ? MaybeArray<T> : T) | undefined => {\n  if (isNil(field)) {\n    return field;\n  }\n  if (isArray(field)) {\n    const result: T[] = [];\n    field.forEach(item => {\n      if (isFunction(item)) {\n        const value = item(data, params);\n        if (isValid(value)) {\n          result.push(value);\n        }\n      } else {\n        result.push(item);\n      }\n    });\n    return result as any;\n  }\n  if (isFunction(field)) {\n    return field(data, params);\n  }\n  return field;\n};\n\nexport function getFirstDatumFromTooltipData(data: TooltipData): Datum {\n  // 找到第一个可用的datum\n  const dimInfoList: IDimensionInfo[] = (data as IDimensionData[])[0]?.series\n    ? [{ data: data as IDimensionData[], value: '' }]\n    : (data as IDimensionInfo[]);\n  for (const { data: dataList } of dimInfoList) {\n    for (const { datum: datumList } of dataList) {\n      for (const datumItem of datumList ?? []) {\n        if (datumItem) {\n          return datumItem;\n        }\n      }\n    }\n  }\n}\n\nexport function pickFirstValidValue<T>(isValid: (element?: T) => any, ...elements: T[]): T | undefined {\n  for (const ele of elements) {\n    if (isValid(ele)) {\n      return ele;\n    }\n  }\n  return undefined;\n}\n\n// 针对渐变色，受底层渲染引擎影响，不一定都能绘制正确，所以这里取 colorStop 的第一个颜色作为 color\nexport function convertToColorString(color: any, defaultColor: string = '#000') {\n  if (!color) {\n    return defaultColor;\n  }\n  if (isString(color)) {\n    return color;\n  }\n\n  if (isObject(color) && (color as IGradientColor).stops && (color as IGradientColor).stops[0]) {\n    return (color as IGradientColor).stops[0].color || defaultColor;\n  }\n\n  return defaultColor;\n}\n"]}

package/cjs/component/tooltip/handler/utils/compose.d.ts

@@ -1,4 +1,5 @@
 import type { TooltipContent } from '../../tooltip';
 import type { IToolTipLinePattern, ITooltipPattern, TooltipData, IToolTipLineActual } from '../../../../typings/tooltip';
-export declare const getShowContent: (pattern: ITooltipPattern, data: TooltipData, event: MouseEvent) => TooltipContent | null;
-export declare const getOneLineData: (datum: any, config: IToolTipLinePattern) => IToolTipLineActual;
+import type { TooltipHandlerParams } from '../../interface';
+export declare const getShowContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => TooltipContent | null;
+export declare const getOneLineData: (datum: any, config: IToolTipLinePattern, params: TooltipHandlerParams) => IToolTipLineActual;

package/cjs/component/tooltip/handler/utils/compose.js

@@ -4,60 +4,67 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getOneLineData = exports.getShowContent = void 0;
 
-const util_1 = require("../../../../util"), common_1 = require("./common"), utils_1 = require("../../utils"), getShowContent = (pattern, data, event) => {
-    var _a, _b, _c, _d, _e, _f, _g;
-    if (!data || "mouseout" === event.type) return null;
-    const tooltipContent = {
+const util_1 = require("../../../../util"), common_1 = require("./common"), utils_1 = require("../../utils"), constants_1 = require("../constants"), getShowContent = (pattern, data, params) => {
+    var _a, _b, _c, _d, _e;
+    if (!data || "mouseout" === (null === (_a = null == params ? void 0 : params.event) || void 0 === _a ? void 0 : _a.type)) return null;
+    const patternTitle = (0, common_1.getTooltipPatternValue)(pattern.title, data, params), patternContent = (0, 
+    util_1.array)((0, common_1.getTooltipPatternValue)(pattern.content, data, params)), tooltipContent = {
         title: {
-            value: null === (_b = null === (_a = pattern.title) || void 0 === _a ? void 0 : _a.value) || void 0 === _b ? void 0 : _b.toString(),
+            value: null === (_b = null == patternTitle ? void 0 : patternTitle.value) || void 0 === _b ? void 0 : _b.toString(),
             hasShape: !1,
             shapeType: void 0,
             shapeHollow: void 0
         },
         content: []
-    };
-    if (pattern.title && !1 !== pattern.title.visible) {
-        if (tooltipContent.title.hasShape = pattern.title.hasShape, (0, util_1.isValid)(pattern.title) && (0, 
-        util_1.isValid)(pattern.title.value)) {
-            let datum;
+    }, {maxLineCount: maxLineCount = constants_1.TOOLTIP_MAX_LINE_COUNT} = pattern, patternTitleVisible = !1 !== (0, 
+    common_1.getTooltipContentValue)(null == patternTitle ? void 0 : patternTitle.visible, data, params);
+    if (patternTitle && patternTitleVisible) {
+        if (tooltipContent.title.hasShape = patternTitle.hasShape, (0, util_1.isValid)(patternTitle.value)) {
             tooltipContent.title = {
-                hasShape: null === (_c = pattern.title) || void 0 === _c ? void 0 : _c.hasShape,
-                shapeHollow: null === (_d = pattern.title) || void 0 === _d ? void 0 : _d.shapeHollow
+                hasShape: patternTitle.hasShape,
+                shapeHollow: patternTitle.shapeHollow
             };
-            const dimInfoList = (null === (_e = data[0]) || void 0 === _e ? void 0 : _e.series) ? [ {
-                data: data,
-                value: ""
-            } ] : data;
-            for (const {data: dataList} of dimInfoList) {
-                for (const {datum: datumList} of dataList) {
-                    for (const datumItem of null != datumList ? datumList : []) if (datumItem) {
-                        datum = datumItem;
-                        break;
-                    }
-                    if (datum) break;
-                }
-                if (datum) break;
-            }
-            tooltipContent.title.value = (0, common_1.getTooltipValue)(null === (_f = pattern.title) || void 0 === _f ? void 0 : _f.value, datum);
+            const datum = (0, common_1.getFirstDatumFromTooltipData)(data);
+            tooltipContent.title.value = (0, common_1.getTooltipContentValue)(null == patternTitle ? void 0 : patternTitle.value, datum, params);
         }
     } else tooltipContent.title = {
         hasShape: !1,
         visible: !1
     };
-    return "mark" === pattern.activeType ? null === (_g = pattern.content) || void 0 === _g || _g.forEach((content => {
-        var _a;
-        const oneLineData = (0, exports.getOneLineData)(null === (_a = data[0]) || void 0 === _a ? void 0 : _a.datum[0], content);
-        !1 !== oneLineData.visible && tooltipContent.content.push(oneLineData);
-    })) : "dimension" === pattern.activeType && data.forEach((({data: d}) => d.forEach((({datum: datum, series: series}) => {
-        var _a, _b, _c;
-        if (!(0, utils_1.getTooltipActualActiveType)(null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec).includes("dimension")) return;
-        const contentPatterns = null !== (_c = null === (_b = pattern.content) || void 0 === _b ? void 0 : _b.filter((c => (0, 
-        util_1.isNil)(c.seriesId) || c.seriesId === series.id))) && void 0 !== _c ? _c : [];
-        datum.forEach((datumItem => contentPatterns.forEach((c => {
-            const oneLineData = (0, exports.getOneLineData)(datumItem, c);
-            !1 !== oneLineData.visible && tooltipContent.content.push(oneLineData);
-        }))));
-    })))), tooltipContent.title && (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType ? ((0, 
+    if ("mark" === pattern.activeType) for (const content of null != patternContent ? patternContent : []) {
+        const oneLineData = (0, exports.getOneLineData)(null === (_c = data[0]) || void 0 === _c ? void 0 : _c.datum[0], content, params);
+        if (!1 !== oneLineData.visible) {
+            if (tooltipContent.content.length === maxLineCount - 1) {
+                tooltipContent.content.push(Object.assign(Object.assign({}, oneLineData), constants_1.TOOLTIP_OTHERS_LINE));
+                break;
+            }
+            if (!(tooltipContent.content.length < maxLineCount)) break;
+            tooltipContent.content.push(oneLineData);
+        }
+    } else if ("dimension" === pattern.activeType) for (const {data: d} of data) {
+        for (const {datum: datum, series: series} of d) {
+            if (!(0, utils_1.getTooltipActualActiveType)(null === (_d = series.tooltipHelper) || void 0 === _d ? void 0 : _d.spec).includes("dimension")) continue;
+            const contentPatterns = null !== (_e = null == patternContent ? void 0 : patternContent.filter((c => (0, 
+            util_1.isNil)(c.seriesId) || c.seriesId === series.id))) && void 0 !== _e ? _e : [];
+            for (const datumItem of datum) {
+                for (const linePattern of contentPatterns) {
+                    const oneLineData = (0, exports.getOneLineData)(datumItem, linePattern, params);
+                    if (!1 !== oneLineData.visible) {
+                        if (tooltipContent.content.length === maxLineCount - 1) {
+                            tooltipContent.content.push(Object.assign(Object.assign({}, oneLineData), constants_1.TOOLTIP_OTHERS_LINE));
+                            break;
+                        }
+                        if (!(tooltipContent.content.length < maxLineCount)) break;
+                        tooltipContent.content.push(oneLineData);
+                    }
+                }
+                if (tooltipContent.content.length >= maxLineCount) break;
+            }
+            if (tooltipContent.content.length >= maxLineCount) break;
+        }
+        if (tooltipContent.content.length >= maxLineCount) break;
+    }
+    return tooltipContent.title && (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType ? ((0, 
     util_1.isNil)(tooltipContent.title.shapeType) && (tooltipContent.title.shapeType = tooltipContent.content[0].shapeType), 
     (0, util_1.isNil)(tooltipContent.title.shapeColor) && (tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor)) : tooltipContent.title.hasShape = !1), 
     tooltipContent;
@@ -65,14 +72,18 @@ const util_1 = require("../../../../util"), common_1 = require("./common"), util
 
 exports.getShowContent = getShowContent;
 
-const getOneLineData = (datum, config) => {
-    const key = (0, common_1.getTooltipValue)(config.key, datum), value = (0, common_1.getTooltipValue)(config.value, datum), visible = (0, 
-    util_1.isValid)(key) || (0, util_1.isValid)(value), shapeType = (0, common_1.getTooltipValue)(config.shapeType, datum), shapeColor = (0, 
-    common_1.getTooltipValue)(config.shapeColor, datum);
+const getOneLineData = (datum, config, params) => {
+    const key = (0, common_1.getTooltipContentValue)(config.key, datum, params), value = (0, 
+    common_1.getTooltipContentValue)(config.value, datum, params), visible = !1 !== (0, 
+    common_1.getTooltipContentValue)(config.visible, datum, params) && ((0, util_1.isValid)(key) || (0, 
+    util_1.isValid)(value)), isKeyAdaptive = (0, common_1.getTooltipContentValue)(config.isKeyAdaptive, datum, params), shapeType = (0, 
+    common_1.getTooltipContentValue)(config.shapeType, datum, params), shapeColor = (0, 
+    common_1.getTooltipContentValue)(config.shapeColor, datum, params);
     return {
         key: key,
         value: value,
         visible: visible,
+        isKeyAdaptive: isKeyAdaptive,
         hasShape: config.hasShape,
         shapeType: shapeType,
         shapeHollow: config.shapeHollow,

package/cjs/component/tooltip/handler/utils/compose.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/compose.ts"],"names":[],"mappings":"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","file":"compose.js","sourcesContent":["import { isValid, isNil } from '../../../../util';\nimport type { TooltipContent } from '../../tooltip';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  TooltipData,\n  IToolTipLineActual\n} from '../../../../typings/tooltip';\nimport { getTooltipValue } from './common';\nimport { getTooltipActualActiveType } from '../../utils';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension/interface';\n\n/**\n * 获得tooltip的实际显示内容\n * @param pattern\n * @param data\n * @param event\n * @returns\n */\nexport const getShowContent = (\n  pattern: ITooltipPattern,\n  data: TooltipData,\n  event: MouseEvent\n): TooltipContent | null => {\n  if (\n    !data ||\n    // data.key === undefined ||\n    event.type === 'mouseout'\n  ) {\n    return null;\n  }\n  const tooltipContent: TooltipContent = {\n    title: {\n      value: pattern.title?.value?.toString(),\n      hasShape: false,\n      shapeType: undefined,\n      shapeHollow: undefined\n    },\n    content: []\n  };\n\n  /** title */\n  if (!pattern.title || pattern.title.visible === false) {\n    tooltipContent.title = {\n      hasShape: false,\n      visible: false\n    };\n  } else {\n    tooltipContent.title.hasShape = pattern.title.hasShape;\n    if (isValid(pattern.title) && isValid(pattern.title.value)) {\n      tooltipContent.title = {\n        hasShape: pattern.title?.hasShape,\n        shapeHollow: pattern.title?.shapeHollow\n      };\n      // 找到第一个可用的datum\n      let datum: any;\n      const dimInfoList: IDimensionInfo[] = (data as IDimensionData[])[0]?.series\n        ? [{ data: data as IDimensionData[], value: '' }]\n        : (data as IDimensionInfo[]);\n      for (const { data: dataList } of dimInfoList) {\n        for (const { datum: datumList } of dataList) {\n          for (const datumItem of datumList ?? []) {\n            if (datumItem) {\n              datum = datumItem;\n              break;\n            }\n          }\n          if (datum) {\n            break;\n          }\n        }\n        if (datum) {\n          break;\n        }\n      }\n      tooltipContent.title.value = getTooltipValue(pattern.title?.value, datum);\n    }\n  }\n\n  /** content */\n  if (pattern.activeType === 'mark') {\n    pattern.content?.forEach(content => {\n      const oneLineData = getOneLineData((data as IDimensionData[])[0]?.datum[0], content);\n      if (oneLineData.visible !== false) {\n        tooltipContent.content.push(oneLineData);\n      }\n    });\n  } else if (pattern.activeType === 'dimension') {\n    (data as IDimensionInfo[]).forEach(({ data: d }) =>\n      d.forEach(({ datum, series }) => {\n        if (!getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension')) {\n          return;\n        }\n        const contentPatterns =\n          pattern.content?.filter(\n            c => isNil(c.seriesId) || c.seriesId === series.id // 匹配对应series\n          ) ?? [];\n        datum.forEach(datumItem =>\n          contentPatterns.forEach(c => {\n            const oneLineData = getOneLineData(datumItem, c);\n            if (oneLineData.visible !== false) {\n              tooltipContent.content.push(oneLineData);\n            }\n          })\n        );\n      })\n    );\n  }\n\n  if (tooltipContent.title) {\n    // TODO：对 title shape 的支持目前还不完整，尚没有相关需求\n    if (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType) {\n      if (isNil(tooltipContent.title.shapeType)) {\n        tooltipContent.title.shapeType = tooltipContent.content[0].shapeType;\n      }\n      if (isNil(tooltipContent.title.shapeColor)) {\n        tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor;\n      }\n    } else {\n      tooltipContent.title.hasShape = false;\n    }\n  }\n\n  return tooltipContent;\n};\n\n/**\n * 获得tooltip的单行实际显示内容\n * @param datum\n * @param config\n * @returns\n */\nexport const getOneLineData = (datum: any, config: IToolTipLinePattern): IToolTipLineActual => {\n  const key = getTooltipValue(config.key, datum);\n  const value = getTooltipValue(config.value, datum);\n  const visible: boolean = isValid(key) || isValid(value);\n\n  const shapeType = getTooltipValue(config.shapeType, datum);\n  const shapeColor = getTooltipValue(config.shapeColor, datum);\n\n  return {\n    key,\n    value,\n    visible,\n    hasShape: config.hasShape,\n    shapeType: shapeType as any,\n    shapeHollow: config.shapeHollow,\n    shapeColor\n  };\n};\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/compose.ts"],"names":[],"mappings":"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","file":"compose.js","sourcesContent":["import { isValid, isNil, array } from '../../../../util';\nimport type { TooltipContent } from '../../tooltip';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  TooltipData,\n  IToolTipLineActual\n} from '../../../../typings/tooltip';\nimport { getFirstDatumFromTooltipData, getTooltipContentValue, getTooltipPatternValue } from './common';\nimport { getTooltipActualActiveType } from '../../utils';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport type { TooltipHandlerParams } from '../../interface';\nimport { TOOLTIP_MAX_LINE_COUNT, TOOLTIP_OTHERS_LINE } from '../constants';\n\n/**\n * 获得tooltip的实际显示内容\n * @param pattern\n * @param data\n * @param event\n * @returns\n */\nexport const getShowContent = (\n  pattern: ITooltipPattern,\n  data: TooltipData,\n  params: TooltipHandlerParams\n): TooltipContent | null => {\n  if (\n    !data ||\n    // data.key === undefined ||\n    params?.event?.type === 'mouseout'\n  ) {\n    return null;\n  }\n\n  const patternTitle = getTooltipPatternValue(pattern.title, data, params);\n  const patternContent = array(getTooltipPatternValue(pattern.content, data, params));\n\n  const tooltipContent: Required<TooltipContent> = {\n    title: {\n      value: patternTitle?.value?.toString(),\n      hasShape: false,\n      shapeType: undefined,\n      shapeHollow: undefined\n    },\n    content: []\n  };\n\n  const { maxLineCount = TOOLTIP_MAX_LINE_COUNT } = pattern;\n\n  /** title */\n  const patternTitleVisible = getTooltipContentValue(patternTitle?.visible, data, params) !== false;\n  if (!patternTitle || !patternTitleVisible) {\n    tooltipContent.title = {\n      hasShape: false,\n      visible: false\n    };\n  } else {\n    tooltipContent.title.hasShape = patternTitle.hasShape;\n    if (isValid(patternTitle.value)) {\n      tooltipContent.title = {\n        hasShape: patternTitle.hasShape,\n        shapeHollow: patternTitle.shapeHollow\n      };\n      // 找到第一个可用的datum\n      const datum = getFirstDatumFromTooltipData(data);\n      tooltipContent.title.value = getTooltipContentValue(patternTitle?.value, datum, params);\n    }\n  }\n\n  /** content */\n  if (pattern.activeType === 'mark') {\n    for (const content of patternContent ?? []) {\n      const oneLineData = getOneLineData((data as IDimensionData[])[0]?.datum[0], content, params);\n      if (oneLineData.visible !== false) {\n        if (tooltipContent.content.length === maxLineCount - 1) {\n          tooltipContent.content.push({\n            ...oneLineData,\n            ...TOOLTIP_OTHERS_LINE\n          });\n          break;\n        } else if (tooltipContent.content.length < maxLineCount) {\n          tooltipContent.content.push(oneLineData);\n        } else {\n          break;\n        }\n      }\n    }\n  } else if (pattern.activeType === 'dimension') {\n    for (const { data: d } of data as IDimensionInfo[]) {\n      for (const { datum, series } of d) {\n        if (!getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension')) {\n          continue;\n        }\n        const contentPatterns =\n          patternContent?.filter(\n            c => isNil(c.seriesId) || c.seriesId === series.id // 匹配对应series\n          ) ?? [];\n        for (const datumItem of datum) {\n          for (const linePattern of contentPatterns) {\n            const oneLineData = getOneLineData(datumItem, linePattern, params);\n            if (oneLineData.visible === false) {\n              continue;\n            }\n            if (tooltipContent.content.length === maxLineCount - 1) {\n              tooltipContent.content.push({\n                ...oneLineData,\n                ...TOOLTIP_OTHERS_LINE\n              });\n              break;\n            } else if (tooltipContent.content.length < maxLineCount) {\n              tooltipContent.content.push(oneLineData);\n            } else {\n              break;\n            }\n          }\n          if (tooltipContent.content.length >= maxLineCount) {\n            break;\n          }\n        }\n        if (tooltipContent.content.length >= maxLineCount) {\n          break;\n        }\n      }\n      if (tooltipContent.content.length >= maxLineCount) {\n        break;\n      }\n    }\n  }\n\n  if (tooltipContent.title) {\n    // TODO：对 title shape 的支持目前还不完整，尚没有相关需求\n    if (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType) {\n      if (isNil(tooltipContent.title.shapeType)) {\n        tooltipContent.title.shapeType = tooltipContent.content[0].shapeType;\n      }\n      if (isNil(tooltipContent.title.shapeColor)) {\n        tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor;\n      }\n    } else {\n      tooltipContent.title.hasShape = false;\n    }\n  }\n\n  return tooltipContent;\n};\n\n/**\n * 获得tooltip的单行实际显示内容\n * @param datum\n * @param config\n * @returns\n */\nexport const getOneLineData = (\n  datum: any,\n  config: IToolTipLinePattern,\n  params: TooltipHandlerParams\n): IToolTipLineActual => {\n  const key = getTooltipContentValue(config.key, datum, params);\n  const value = getTooltipContentValue(config.value, datum, params);\n  const visible: boolean =\n    getTooltipContentValue(config.visible, datum, params) !== false && (isValid(key) || isValid(value));\n  const isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params);\n\n  const shapeType = getTooltipContentValue(config.shapeType, datum, params);\n  const shapeColor = getTooltipContentValue(config.shapeColor, datum, params);\n\n  return {\n    key,\n    value,\n    visible,\n    isKeyAdaptive,\n    hasShape: config.hasShape,\n    shapeType: shapeType as any,\n    shapeHollow: config.shapeHollow,\n    shapeColor\n  };\n};\n"]}

package/cjs/component/tooltip/handler/utils/get-spec.js

@@ -4,37 +4,68 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getTooltipSpecForShow = void 0;
 
-const util_1 = require("../../../../util"), pattern_1 = require("./pattern"), getTooltipSpecForShow = (activeType, globalSpec, series, dimensionInfo) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+const util_1 = require("../../../../util"), pattern_1 = require("./pattern"), utils_1 = require("../../utils"), getTooltipSpecForShow = (activeType, globalSpec, series, dimensionInfo) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const finalSpec = Object.assign(Object.assign({}, globalSpec), {
         activeType: activeType
     });
     let defaultPattern = {}, userPattern = {};
     if ("mark" === activeType && series) {
         const seriesSpec = null !== (_b = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec) && void 0 !== _b ? _b : {};
-        if ((0, util_1.isValid)(seriesSpec.visible) || (0, util_1.isValid)(seriesSpec.activeType) ? finalSpec.visible = !1 !== seriesSpec.visible && !1 !== (null === (_c = seriesSpec.mark) || void 0 === _c ? void 0 : _c.visible) && ((0, 
-        util_1.isNil)(seriesSpec.activeType) || (null === (_e = (_d = (0, util_1.array)(seriesSpec.activeType)).includes) || void 0 === _e ? void 0 : _e.call(_d, "mark"))) : (0, 
-        util_1.isValid)(globalSpec.visible) || (0, util_1.isValid)(globalSpec.activeType) ? finalSpec.visible = !1 !== globalSpec.visible && !1 !== (null === (_f = globalSpec.mark) || void 0 === _f ? void 0 : _f.visible) && ((0, 
-        util_1.isNil)(globalSpec.activeType) || (null === (_h = (_g = (0, util_1.array)(globalSpec.activeType)).includes) || void 0 === _h ? void 0 : _h.call(_g, "mark"))) : finalSpec.visible = !0, 
-        finalSpec.handler = null !== (_k = null !== (_j = seriesSpec.handler) && void 0 !== _j ? _j : globalSpec.handler) && void 0 !== _k ? _k : void 0, 
-        null === (_l = finalSpec.handler) || void 0 === _l ? void 0 : _l.showTooltip) return finalSpec;
-        defaultPattern = (0, pattern_1.makeDefaultPattern)(series, "mark"), userPattern = (0, 
-        util_1.merge)({}, (0, util_1.cloneDeep)(globalSpec.mark), (0, util_1.cloneDeep)(seriesSpec.mark));
-    } else if ("dimension" === activeType && dimensionInfo) {
-        if ((0, util_1.isValid)(globalSpec.visible) || (0, util_1.isValid)(globalSpec.activeType) ? finalSpec.visible = !1 !== globalSpec.visible && !1 !== (null === (_m = globalSpec.dimension) || void 0 === _m ? void 0 : _m.visible) && ((0, 
-        util_1.isNil)(globalSpec.activeType) || (null === (_p = (_o = (0, util_1.array)(globalSpec.activeType)).includes) || void 0 === _p ? void 0 : _p.call(_o, "dimension"))) : finalSpec.visible = !0, 
-        finalSpec.handler = null !== (_q = globalSpec.handler) && void 0 !== _q ? _q : void 0, 
-        null === (_r = finalSpec.handler) || void 0 === _r ? void 0 : _r.showTooltip) return finalSpec;
-        const firstSeries = null === (_t = null === (_s = dimensionInfo[0]) || void 0 === _s ? void 0 : _s.data[0]) || void 0 === _t ? void 0 : _t.series;
-        defaultPattern = firstSeries ? (0, pattern_1.makeDefaultPattern)(firstSeries, "dimension", dimensionInfo) : {}, 
-        userPattern = null !== (_u = (0, util_1.cloneDeep)(globalSpec.dimension)) && void 0 !== _u ? _u : {};
+        if ((0, util_1.isValid)(seriesSpec.visible) || (0, util_1.isValid)(seriesSpec.activeType) ? finalSpec.visible = (0, 
+        utils_1.getTooltipActualActiveType)(seriesSpec).includes("mark") : (0, util_1.isValid)(globalSpec.visible) || (0, 
+        util_1.isValid)(globalSpec.activeType) ? finalSpec.visible = (0, utils_1.getTooltipActualActiveType)(globalSpec).includes("mark") : finalSpec.visible = !0, 
+        finalSpec.handler = null !== (_d = null !== (_c = seriesSpec.handler) && void 0 !== _c ? _c : globalSpec.handler) && void 0 !== _d ? _d : void 0, 
+        null === (_e = finalSpec.handler) || void 0 === _e ? void 0 : _e.showTooltip) return finalSpec;
+        defaultPattern = null !== (_f = (0, pattern_1.makeDefaultPattern)(series, "mark")) && void 0 !== _f ? _f : {}, 
+        userPattern = (0, util_1.merge)({}, (0, util_1.cloneDeep)(globalSpec.mark), (0, 
+        util_1.cloneDeep)(seriesSpec.mark));
+    } else if ("dimension" === activeType && (null == dimensionInfo ? void 0 : dimensionInfo.length)) {
+        const seriesList = dimensionInfo.reduce(((list, cur) => list.concat(cur.data.map((data => data.series)).filter(util_1.isValid))), []);
+        if (seriesList.every((series => {
+            var _a;
+            return !(0, utils_1.getTooltipActualActiveType)(null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec).includes("dimension");
+        })) ? finalSpec.visible = !1 : (0, util_1.isValid)(globalSpec.visible) || (0, util_1.isValid)(globalSpec.activeType) ? finalSpec.visible = (0, 
+        utils_1.getTooltipActualActiveType)(globalSpec).includes("dimension") : finalSpec.visible = !0, 
+        finalSpec.handler = null !== (_g = globalSpec.handler) && void 0 !== _g ? _g : void 0, 
+        null === (_h = finalSpec.handler) || void 0 === _h ? void 0 : _h.showTooltip) return finalSpec;
+        const patternList = [];
+        dimensionInfo[0].data.forEach((data => {
+            const {series: series} = data, mockDimensionInfo = [ Object.assign(Object.assign({}, dimensionInfo[0]), {
+                data: [ data ]
+            }) ], pattern = (0, pattern_1.makeDefaultPattern)(series, "dimension", mockDimensionInfo);
+            pattern && patternList.push(pattern);
+        }));
+        const defaultPatternContent = [];
+        patternList.forEach((({content: content}) => {
+            (0, util_1.isFunction)(content) ? defaultPatternContent.push(content) : defaultPatternContent.push(...(0, 
+            util_1.array)(content));
+        })), defaultPattern = Object.assign(Object.assign({}, patternList[0]), {
+            content: defaultPatternContent
+        });
+        let seriesDimensionPattern = {};
+        const seriesPatternList = seriesList.filter((series => {
+            var _a;
+            const spec = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec;
+            return (0, util_1.isValid)(null == spec ? void 0 : spec.dimension) && (0, utils_1.getTooltipActualActiveType)(spec).includes("dimension");
+        })).map((series => series.tooltipHelper.spec.dimension));
+        if (seriesPatternList.length) {
+            let seriesPatternContent = [];
+            seriesPatternList.every((({content: content}) => (0, util_1.isNil)(content))) ? seriesPatternContent = void 0 : seriesPatternList.forEach((({content: content}) => {
+                (0, util_1.isNil)(content) || ((0, util_1.isFunction)(content) ? null == seriesPatternContent || seriesPatternContent.push(content) : null == seriesPatternContent || seriesPatternContent.push(...(0, 
+                util_1.array)(content)));
+            })), seriesDimensionPattern = Object.assign(Object.assign({}, seriesPatternList[0]), {
+                content: seriesPatternContent
+            });
+        }
+        userPattern = (0, util_1.merge)({}, (0, util_1.cloneDeep)(globalSpec.dimension), seriesDimensionPattern);
     }
-    const titleShape = {
-        hasShape: null !== (_v = userPattern.hasShape) && void 0 !== _v ? _v : defaultPattern.title.hasShape,
-        shapeType: null !== (_w = userPattern.shapeType) && void 0 !== _w ? _w : defaultPattern.title.shapeType,
-        shapeColor: null !== (_x = userPattern.shapeColor) && void 0 !== _x ? _x : defaultPattern.title.shapeColor
+    const defaultPatternTitle = defaultPattern.title, titleShape = {
+        hasShape: null !== (_j = userPattern.hasShape) && void 0 !== _j ? _j : null == defaultPatternTitle ? void 0 : defaultPatternTitle.hasShape,
+        shapeType: null !== (_k = userPattern.shapeType) && void 0 !== _k ? _k : null == defaultPatternTitle ? void 0 : defaultPatternTitle.shapeType,
+        shapeColor: null !== (_l = userPattern.shapeColor) && void 0 !== _l ? _l : null == defaultPatternTitle ? void 0 : defaultPatternTitle.shapeColor
     };
-    (0, util_1.isValid)(userPattern.title) ? userPattern.title = Object.assign(Object.assign(Object.assign({}, defaultPattern.title), titleShape), userPattern.title) : userPattern.title = Object.assign(Object.assign({}, defaultPattern.title), titleShape);
+    (0, util_1.isValid)(userPattern.title) ? (0, util_1.isFunction)(userPattern.title) || (userPattern.title = Object.assign(Object.assign(Object.assign({}, defaultPattern.title), titleShape), userPattern.title)) : userPattern.title = Object.assign(Object.assign({}, defaultPattern.title), titleShape);
     const getContentShape = defaultContentLine => {
         var _a, _b, _c;
         return {
@@ -42,11 +73,16 @@ const util_1 = require("../../../../util"), pattern_1 = require("./pattern"), ge
             shapeType: null !== (_b = userPattern.shapeType) && void 0 !== _b ? _b : null == defaultContentLine ? void 0 : defaultContentLine.shapeType,
             shapeColor: null !== (_c = userPattern.shapeColor) && void 0 !== _c ? _c : null == defaultContentLine ? void 0 : defaultContentLine.shapeColor
         };
-    };
-    return (0, util_1.isValid)(userPattern.content) ? userPattern.content.forEach(((line, i) => {
-        userPattern.content[i] = Object.assign(Object.assign({}, getContentShape(defaultPattern.content[0])), line);
-    })) : userPattern.content = defaultPattern.content.map((line => Object.assign(Object.assign({}, line), getContentShape(line)))), 
-    finalSpec[activeType] = Object.assign(Object.assign(Object.assign({}, defaultPattern), userPattern), {
+    }, defaultPatternContent = (0, util_1.array)(defaultPattern.content);
+    if ((0, util_1.isValid)(userPattern.content)) {
+        if (!(0, util_1.isFunction)(userPattern.content)) {
+            const userPatternContent = (0, util_1.array)(userPattern.content);
+            userPatternContent.forEach(((line, i) => {
+                userPatternContent[i] = Object.assign(Object.assign({}, getContentShape(defaultPatternContent[0])), line);
+            }));
+        }
+    } else userPattern.content = defaultPatternContent.map((line => Object.assign(Object.assign({}, line), getContentShape(line))));
+    return finalSpec[activeType] = Object.assign(Object.assign(Object.assign({}, defaultPattern), userPattern), {
         activeType: activeType
     }), finalSpec;
 };

package/cjs/component/tooltip/handler/utils/get-spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/get-spec.ts"],"names":[],"mappings":"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","file":"get-spec.js","sourcesContent":["import type { ITooltipSpec } from '../../interface';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  TooltipActiveType\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { cloneDeep, isValid, isNil, merge, array } from '../../../../util';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\n\nexport const getTooltipSpecForShow = (\n  activeType: TooltipActiveType,\n  globalSpec: ITooltipSpec,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipSpec => {\n  // 组装tooltip spec\n  const finalSpec = {\n    ...globalSpec,\n    activeType\n  } as ITooltipSpec;\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  // 用户配置的pattern\n  let userPattern = {} as ITooltipPattern;\n\n  if (activeType === 'mark' && series) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n\n    // visible\n    if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType)) {\n      finalSpec.visible =\n        seriesSpec.visible !== false &&\n        seriesSpec.mark?.visible !== false &&\n        (isNil(seriesSpec.activeType) || array(seriesSpec.activeType).includes?.('mark'));\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible =\n        globalSpec.visible !== false &&\n        globalSpec.mark?.visible !== false &&\n        (isNil(globalSpec.activeType) || array(globalSpec.activeType).includes?.('mark'));\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = seriesSpec.handler ?? globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n\n    // pattern\n    defaultPattern = makeDefaultPattern(series, 'mark');\n    userPattern = merge({}, cloneDeep(globalSpec.mark), cloneDeep(seriesSpec.mark));\n  } else if (activeType === 'dimension' && dimensionInfo) {\n    // dimension目前仅支持global spec\n\n    // visible\n    if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible =\n        globalSpec.visible !== false &&\n        globalSpec.dimension?.visible !== false &&\n        (isNil(globalSpec.activeType) || array(globalSpec.activeType).includes?.('dimension'));\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n\n    // pattern\n    const firstSeries = dimensionInfo[0]?.data[0]?.series;\n    defaultPattern = firstSeries ? makeDefaultPattern(firstSeries, 'dimension', dimensionInfo) : {};\n    userPattern = cloneDeep(globalSpec.dimension) ?? {};\n  }\n\n  // 对pattern进行组装\n  const titleShape: ITooltipShapePattern = {\n    hasShape: userPattern.hasShape ?? defaultPattern.title.hasShape,\n    shapeType: userPattern.shapeType ?? defaultPattern.title.shapeType,\n    shapeColor: userPattern.shapeColor ?? defaultPattern.title.shapeColor\n  };\n  if (isValid(userPattern.title)) {\n    userPattern.title = {\n      ...defaultPattern.title,\n      ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n      ...userPattern.title\n    };\n  } else {\n    userPattern.title = {\n      ...defaultPattern.title,\n      ...titleShape\n    };\n  }\n\n  const getContentShape = (defaultContentLine?: IToolTipLinePattern): ITooltipShapePattern => ({\n    hasShape: userPattern.hasShape ?? defaultContentLine?.hasShape,\n    shapeType: userPattern.shapeType ?? defaultContentLine?.shapeType,\n    shapeColor: userPattern.shapeColor ?? defaultContentLine?.shapeColor\n  });\n  if (isValid(userPattern.content)) {\n    userPattern.content.forEach((line, i) => {\n      userPattern.content[i] = {\n        ...getContentShape(defaultPattern.content[0]), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n        ...line\n      };\n    });\n  } else {\n    userPattern.content = defaultPattern.content.map(line => ({\n      ...line,\n      ...getContentShape(line)\n    }));\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/get-spec.ts"],"names":[],"mappings":";;;AAUA,2CAAuF;AACvF,uCAA+C;AAE/C,uCAAyD;AAElD,MAAM,qBAAqB,GAAG,CACnC,UAA6B,EAC7B,UAAwB,EACxB,MAAgB,EAChB,aAAgC,EAClB,EAAE;;IAEhB,MAAM,SAAS,GAAG,gCACb,UAAU,KACb,UAAU,GACK,CAAC;IAElB,IAAI,cAAc,GAAG,EAAqB,CAAC;IAE3C,IAAI,WAAW,GAAG,EAAqB,CAAC;IAExC,IAAI,UAAU,KAAK,MAAM,IAAI,MAAM,EAAE;QAEnC,MAAM,UAAU,GAAG,CAAC,MAAA,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,mCAAI,EAAE,CAAiB,CAAC;QAGtE,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACjE,SAAS,CAAC,OAAO,GAAG,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC7E;aAAM,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACxE,SAAS,CAAC,OAAO,GAAG,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC7E;aAAM;YACL,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;SAC1B;QAGD,SAAS,CAAC,OAAO,GAAG,MAAA,MAAA,UAAU,CAAC,OAAO,mCAAI,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1E,IAAI,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QAGD,cAAc,GAAG,MAAA,IAAA,4BAAkB,EAAC,MAAM,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC;QAC1D,WAAW,GAAG,IAAA,YAAK,EAAC,EAAE,EAAE,IAAA,gBAAS,EAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAA,gBAAS,EAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;KACjF;SAAM,IAAI,UAAU,KAAK,WAAW,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE;QAE9D,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CACrC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,cAAO,CAAC,CAAC,EAC7E,EAAe,CAChB,CAAC;QAGF,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,CAAC,IAAA,kCAA0B,EAAC,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA,EAAA,CAAC,EAAE;YAC7G,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC;SAC3B;aAAM,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACxE,SAAS,CAAC,OAAO,GAAG,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;SAClF;aAAM;YACL,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;SAC1B;QAGD,SAAS,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;QACpD,IAAI,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QAGD,MAAM,WAAW,GAAsB,EAAE,CAAC;QAC1C,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,MAAM,iBAAiB,GAAG;gDAEnB,aAAa,CAAC,CAAC,CAAC,KACnB,IAAI,EAAE,CAAC,IAAI,CAAC;aAEK,CAAC;YACtB,MAAM,OAAO,GAAG,IAAA,4BAAkB,EAAC,MAAM,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;YAC3E,IAAI,OAAO,EAAE;gBACX,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAmE,EAAE,CAAC;QACjG,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YAClC,IAAI,IAAA,iBAAU,EAAC,OAAO,CAAC,EAAE;gBACvB,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrC;iBAAM;gBACL,qBAAqB,CAAC,IAAI,CAAC,GAAG,IAAA,YAAK,EAAC,OAAO,CAAC,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC,CAAC;QACH,cAAc,mCACT,WAAW,CAAC,CAAC,CAAC,KACjB,OAAO,EAAE,qBAAqB,GAC/B,CAAC;QAGF,IAAI,sBAAsB,GAAoB,EAAE,CAAC;QACjD,MAAM,iBAAiB,GAAG,UAAU;aACjC,MAAM,CAAC,MAAM,CAAC,EAAE;;YACf,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,CAAC;YACxC,OAAO,IAAA,cAAO,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,CAAC,IAAI,IAAA,kCAA0B,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC5F,CAAC,CAAC;aACD,GAAG,CAAC,MAAM,CAAC,EAAE;YACZ,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,IAAK,CAAC,SAAU,CAAC;YACtD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QACL,IAAI,iBAAiB,CAAC,MAAM,EAAE;YAE5B,IAAI,oBAAoB,GAA+E,EAAE,CAAC;YAC1G,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,IAAA,YAAK,EAAC,OAAO,CAAC,CAAC,EAAE;gBAC5D,oBAAoB,GAAG,SAAS,CAAC;aAClC;iBAAM;gBACL,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;oBACxC,IAAI,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE;wBAClB,OAAO;qBACR;oBACD,IAAI,IAAA,iBAAU,EAAC,OAAO,CAAC,EAAE;wBACvB,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAC,OAAO,CAAC,CAAC;qBACrC;yBAAM;wBACL,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAC,GAAG,IAAA,YAAK,EAAC,OAAO,CAAC,CAAC,CAAC;qBAC/C;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,sBAAsB,mCACjB,iBAAiB,CAAC,CAAC,CAAC,KACvB,OAAO,EAAE,oBAAoB,GAC9B,CAAC;SACH;QAED,WAAW,GAAG,IAAA,YAAK,EAAC,EAAE,EAAE,IAAA,gBAAS,EAAC,UAAU,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAAC,CAAC;KAClF;IAGD,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAwC,CAAC;IACpF,MAAM,UAAU,GAAyB;QACvC,QAAQ,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,QAAQ;QAC/D,SAAS,EAAE,MAAA,WAAW,CAAC,SAAS,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,SAAS;QAClE,UAAU,EAAE,MAAA,WAAW,CAAC,UAAU,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,UAAU;KACtE,CAAC;IACF,IAAI,IAAA,cAAO,EAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QAE9B,IAAI,CAAC,IAAA,iBAAU,EAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YAClC,WAAW,CAAC,KAAK,iDACZ,cAAc,CAAC,KAAK,GACpB,UAAU,GACV,WAAW,CAAC,KAAK,CACrB,CAAC;SACH;KACF;SAAM;QACL,WAAW,CAAC,KAAK,mCACZ,cAAc,CAAC,KAAK,GACpB,UAAU,CACd,CAAC;KACH;IAED,MAAM,eAAe,GAAG,CAAC,kBAAwC,EAAwB,EAAE;;QAAC,OAAA,CAAC;YAC3F,QAAQ,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,QAAQ;YAC9D,SAAS,EAAE,MAAA,WAAW,CAAC,SAAS,mCAAI,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,SAAS;YACjE,UAAU,EAAE,MAAA,WAAW,CAAC,UAAU,mCAAI,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,UAAU;SACrE,CAAC,CAAA;KAAA,CAAC;IACH,MAAM,qBAAqB,GAAG,IAAA,YAAK,EAAC,cAAc,CAAC,OAAO,CAA0B,CAAC;IACrF,IAAI,IAAA,cAAO,EAAC,WAAW,CAAC,OAAO,CAAC,EAAE;QAEhC,IAAI,CAAC,IAAA,iBAAU,EAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,kBAAkB,GAAG,IAAA,YAAK,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACtD,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gBACrC,kBAAkB,CAAC,CAAC,CAAC,mCAChB,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,GACzC,IAAI,CACR,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;KACF;SAAM;QACL,WAAW,CAAC,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iCACnD,IAAI,GACJ,eAAe,CAAC,IAAI,CAAC,EACxB,CAAC,CAAC;KACL;IAED,SAAS,CAAC,UAAU,CAAC,iDAChB,cAAc,GACd,WAAW,KACd,UAAU,GACX,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AApLW,QAAA,qBAAqB,yBAoLhC","file":"get-spec.js","sourcesContent":["import type { ITooltipSpec } from '../../interface';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  MaybeArray,\n  TooltipActiveType,\n  TooltipPatternProperty\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { cloneDeep, isValid, merge, array, isFunction, isNil } from '../../../../util';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { getTooltipActualActiveType } from '../../utils';\n\nexport const getTooltipSpecForShow = (\n  activeType: TooltipActiveType,\n  globalSpec: ITooltipSpec,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipSpec => {\n  // 组装tooltip spec\n  const finalSpec = {\n    ...globalSpec,\n    activeType\n  } as ITooltipSpec;\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  // 用户配置的pattern\n  let userPattern = {} as ITooltipPattern;\n\n  if (activeType === 'mark' && series) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n\n    // visible\n    if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes('mark');\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('mark');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = seriesSpec.handler ?? globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n\n    // pattern\n    defaultPattern = makeDefaultPattern(series, 'mark') ?? {};\n    userPattern = merge({}, cloneDeep(globalSpec.mark), cloneDeep(seriesSpec.mark));\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesList = dimensionInfo.reduce(\n      (list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)),\n      [] as ISeries[]\n    );\n\n    // visible\n    if (seriesList.every(series => !getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension'))) {\n      finalSpec.visible = false;\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('dimension');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n\n    // 默认 pattern\n    const patternList: ITooltipPattern[] = [];\n    dimensionInfo[0].data.forEach(data => {\n      const { series } = data;\n      const mockDimensionInfo = [\n        {\n          ...dimensionInfo[0],\n          data: [data]\n        }\n      ] as IDimensionInfo[];\n      const pattern = makeDefaultPattern(series, 'dimension', mockDimensionInfo);\n      if (pattern) {\n        patternList.push(pattern);\n      }\n    });\n    // 拼接默认 tooltip content\n    const defaultPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> = [];\n    patternList.forEach(({ content }) => {\n      if (isFunction(content)) {\n        defaultPatternContent.push(content);\n      } else {\n        defaultPatternContent.push(...array(content));\n      }\n    });\n    defaultPattern = {\n      ...patternList[0],\n      content: defaultPatternContent\n    };\n\n    // 系列 pattern\n    let seriesDimensionPattern: ITooltipPattern = {};\n    const seriesPatternList = seriesList\n      .filter(series => {\n        const spec = series.tooltipHelper?.spec;\n        return isValid(spec?.dimension) && getTooltipActualActiveType(spec).includes('dimension');\n      })\n      .map(series => {\n        const pattern = series.tooltipHelper.spec!.dimension!;\n        return pattern;\n      });\n    if (seriesPatternList.length) {\n      // 拼接系列 tooltip content\n      let seriesPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> | undefined = [];\n      if (seriesPatternList.every(({ content }) => isNil(content))) {\n        seriesPatternContent = undefined;\n      } else {\n        seriesPatternList.forEach(({ content }) => {\n          if (isNil(content)) {\n            return;\n          }\n          if (isFunction(content)) {\n            seriesPatternContent?.push(content);\n          } else {\n            seriesPatternContent?.push(...array(content));\n          }\n        });\n      }\n      seriesDimensionPattern = {\n        ...seriesPatternList[0],\n        content: seriesPatternContent\n      };\n    }\n\n    userPattern = merge({}, cloneDeep(globalSpec.dimension), seriesDimensionPattern);\n  }\n\n  // 对pattern进行组装\n  const defaultPatternTitle = defaultPattern.title as IToolTipLinePattern | undefined;\n  const titleShape: ITooltipShapePattern = {\n    hasShape: userPattern.hasShape ?? defaultPatternTitle?.hasShape,\n    shapeType: userPattern.shapeType ?? defaultPatternTitle?.shapeType,\n    shapeColor: userPattern.shapeColor ?? defaultPatternTitle?.shapeColor\n  };\n  if (isValid(userPattern.title)) {\n    // 排除是回调的情况\n    if (!isFunction(userPattern.title)) {\n      userPattern.title = {\n        ...defaultPattern.title,\n        ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n        ...userPattern.title\n      };\n    }\n  } else {\n    userPattern.title = {\n      ...defaultPattern.title,\n      ...titleShape\n    };\n  }\n\n  const getContentShape = (defaultContentLine?: IToolTipLinePattern): ITooltipShapePattern => ({\n    hasShape: userPattern.hasShape ?? defaultContentLine?.hasShape,\n    shapeType: userPattern.shapeType ?? defaultContentLine?.shapeType,\n    shapeColor: userPattern.shapeColor ?? defaultContentLine?.shapeColor\n  });\n  const defaultPatternContent = array(defaultPattern.content) as IToolTipLinePattern[];\n  if (isValid(userPattern.content)) {\n    // 排除是回调的情况\n    if (!isFunction(userPattern.content)) {\n      const userPatternContent = array(userPattern.content);\n      userPatternContent.forEach((line, i) => {\n        userPatternContent[i] = {\n          ...getContentShape(defaultPatternContent[0]), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...line\n        };\n      });\n    }\n  } else {\n    userPattern.content = defaultPatternContent.map(line => ({\n      ...line,\n      ...getContentShape(line)\n    }));\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n"]}

package/cjs/component/tooltip/handler/utils/style.d.ts

@@ -1,3 +1,4 @@
+import type { ITheme } from '../../../../theme';
 import type { ITooltipTextTheme } from '../../interface';
 import type { ITextStyle } from '../interface';
-export declare function getTextAttributes(style: ITooltipTextTheme, fontFamily: string): ITextStyle;
+export declare function getTextAttributes(style?: ITooltipTextTheme, globalTheme?: ITheme): ITextStyle;

package/cjs/component/tooltip/handler/utils/style.js

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 
 const theme_1 = require("../../../../theme");
 
-function getTextAttributes(style = {}, fontFamily) {
-    var _a, _b;
+function getTextAttributes(style = {}, globalTheme) {
+    var _a, _b, _c;
     return {
         fill: style.fontColor,
         textAlign: style.textAlign,
         textBaseline: style.textBaseline,
-        fontFamily: null !== (_b = null !== (_a = style.fontFamily) && void 0 !== _a ? _a : fontFamily) && void 0 !== _b ? _b : theme_1.DEFAULT_TEXT_FONT_FAMILY,
+        fontFamily: null !== (_b = null !== (_a = style.fontFamily) && void 0 !== _a ? _a : null == globalTheme ? void 0 : globalTheme.fontFamily) && void 0 !== _b ? _b : theme_1.DEFAULT_TEXT_FONT_FAMILY,
         fontSize: style.fontSize,
         fontWeight: style.fontWeight,
         lineHeight: style.lineHeight,
-        spacing: style.spacing
+        spacing: null !== (_c = style.spacing) && void 0 !== _c ? _c : 10
     };
 }
 

package/cjs/component/tooltip/handler/utils/style.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/style.ts"],"names":[],"mappings":";;;AAAA,6CAA6D;AAI7D,SAAgB,iBAAiB,CAAC,QAA2B,EAAE,EAAE,UAAkB;;IACjF,MAAM,KAAK,GAAe;QACxB,IAAI,EAAE,KAAK,CAAC,SAAS;QACrB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,UAAU,EAAE,MAAA,MAAA,KAAK,CAAC,UAAU,mCAAI,UAAU,mCAAI,gCAAwB;QACtE,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,8CAYC","file":"style.js","sourcesContent":["import { DEFAULT_TEXT_FONT_FAMILY } from '../../../../theme';\nimport type { ITooltipTextTheme } from '../../interface';\nimport type { ITextStyle } from '../interface';\n\nexport function getTextAttributes(style: ITooltipTextTheme = {}, fontFamily: string) {\n  const attrs: ITextStyle = {\n    fill: style.fontColor,\n    textAlign: style.textAlign,\n    textBaseline: style.textBaseline,\n    fontFamily: style.fontFamily ?? fontFamily ?? DEFAULT_TEXT_FONT_FAMILY,\n    fontSize: style.fontSize,\n    fontWeight: style.fontWeight,\n    lineHeight: style.lineHeight,\n    spacing: style.spacing\n  };\n  return attrs;\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/style.ts"],"names":[],"mappings":";;;AAEA,6CAA6D;AAI7D,SAAgB,iBAAiB,CAAC,QAA2B,EAAE,EAAE,WAAoB;;IACnF,MAAM,KAAK,GAAe;QACxB,IAAI,EAAE,KAAK,CAAC,SAAS;QACrB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,UAAU,EAAE,MAAA,MAAA,KAAK,CAAC,UAAU,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,mCAAI,gCAAwB;QACnF,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO,EAAE,MAAA,KAAK,CAAC,OAAO,mCAAI,EAAE;KAC7B,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,8CAYC","file":"style.js","sourcesContent":["import type { ITheme } from '../../../../theme';\n// eslint-disable-next-line no-duplicate-imports\nimport { DEFAULT_TEXT_FONT_FAMILY } from '../../../../theme';\nimport type { ITooltipTextTheme } from '../../interface';\nimport type { ITextStyle } from '../interface';\n\nexport function getTextAttributes(style: ITooltipTextTheme = {}, globalTheme?: ITheme) {\n  const attrs: ITextStyle = {\n    fill: style.fontColor,\n    textAlign: style.textAlign,\n    textBaseline: style.textBaseline,\n    fontFamily: style.fontFamily ?? globalTheme?.fontFamily ?? DEFAULT_TEXT_FONT_FAMILY,\n    fontSize: style.fontSize,\n    fontWeight: style.fontWeight,\n    lineHeight: style.lineHeight,\n    spacing: style.spacing ?? 10\n  };\n  return attrs;\n}\n"]}

package/cjs/component/tooltip/tooltip.d.ts

@@ -44,9 +44,11 @@ export declare class Tooltip extends BaseComponent {
     protected _getMouseEventData: (params: BaseEventParams) => TotalMouseEventData;
     protected _hideTooltipByHandler: (params: TooltipHandlerParams) => void;
     protected _initTheme(theme?: any): void;
+    reInit(theme?: any): void;
     setAttrFromSpec(): void;
     showTooltip(datum: Datum, options: IShowTooltipOption): false | "none" | TooltipActiveType;
     hideTooltip(): boolean;
     private _isSameAsCacheInfo;
-    private _isPointInChart;
+    private _isPointerInChart;
+    private _isPointerOnTooltip;
 }