@visactor/vchart 1.10.0-alpha.4 → 1.10.0-alpha.6

package/esm/plugin/components/tooltip-handler/utils/compose.js

@@ -1,4 +1,4 @@
-import { isValid, isNil } from "@visactor/vutils";
+import { isValid, isNil, TimeUtil } from "@visactor/vutils";
 
 import { getFirstDatumFromTooltipData, getTooltipContentPattern, getTooltipContentValue, getTooltipPatternValue } from "./common";
 
@@ -6,8 +6,6 @@ import { TOOLTIP_MAX_LINE_COUNT, TOOLTIP_OTHERS_LINE } from "../constants";
 
 import { getTooltipActualActiveType } from "../../../../component/tooltip/utils";
 
-import { TimeUtil } from "../../../../component/axis/cartesian/util";
-
 const getTimeString = (value, timeFormat, timeFormatMode) => {
     if (!timeFormat && !timeFormatMode) return "object" != typeof value ? null == value ? void 0 : value.toString() : value;
     const timeUtil = TimeUtil.getInstance();
@@ -21,11 +19,11 @@ export const getShowContent = (pattern, data, params) => {
     const tooltipActualTitleContent = {
         title: {},
         content: []
-    }, patternTitle = getTooltipPatternValue(pattern.title, data, params), {visible: visible, value: value, valueTimeFormat: valueTimeFormat, valueTimeFormatMode: valueTimeFormatMode, valueStyle: valueStyle, hasShape: hasShape} = null != patternTitle ? patternTitle : {}, patternTitleVisible = !1 !== getTooltipContentValue(visible, data, params);
+    }, patternTitle = getTooltipPatternValue(pattern.title, data, params), {visible: visible, value: value, valueTimeFormat: valueTimeFormat, valueTimeFormatMode: valueTimeFormatMode, valueStyle: valueStyle, hasShape: hasShape, valueFormatter: valueFormatter} = null != patternTitle ? patternTitle : {}, patternTitleVisible = !1 !== getTooltipContentValue(visible, data, params);
     if (patternTitle && patternTitleVisible) {
         const datum = getFirstDatumFromTooltipData(data);
         tooltipActualTitleContent.title = {
-            value: getTimeString(getTooltipContentValue(value, datum, params), valueTimeFormat, valueTimeFormatMode),
+            value: getTimeString(getTooltipContentValue(value, datum, params, valueFormatter), valueTimeFormat, valueTimeFormatMode),
             valueStyle: getTooltipContentValue(valueStyle, datum, params),
             hasShape: hasShape
         };
@@ -72,7 +70,7 @@ export const getShowContent = (pattern, data, params) => {
 };
 
 export const getOneLineData = (datum, config, params) => {
-    const key = getTimeString(getTooltipContentValue(config.key, datum, params), config.keyTimeFormat, config.keyTimeFormatMode), value = getTimeString(getTooltipContentValue(config.value, datum, params), config.valueTimeFormat, config.valueTimeFormatMode), visible = !1 !== getTooltipContentValue(config.visible, datum, params) && (isValid(key) || isValid(value)), isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params), spaceRow = getTooltipContentValue(config.spaceRow, datum, params), shapeType = getTooltipContentValue(config.shapeType, datum, params), shapeColor = getTooltipContentValue(config.shapeColor, datum, params), shapeFill = getTooltipContentValue(config.shapeFill, datum, params), shapeStroke = getTooltipContentValue(config.shapeStroke, datum, params), shapeLineWidth = getTooltipContentValue(config.shapeLineWidth, datum, params), keyStyle = getTooltipContentValue(config.keyStyle, datum, params), valueStyle = getTooltipContentValue(config.valueStyle, datum, params);
+    const key = getTimeString(getTooltipContentValue(config.key, datum, params, config.keyFormatter), config.keyTimeFormat, config.keyTimeFormatMode), value = getTimeString(getTooltipContentValue(config.value, datum, params, config.valueFormatter), config.valueTimeFormat, config.valueTimeFormatMode), visible = !1 !== getTooltipContentValue(config.visible, datum, params) && (isValid(key) || isValid(value)), isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params), spaceRow = getTooltipContentValue(config.spaceRow, datum, params), shapeType = getTooltipContentValue(config.shapeType, datum, params), shapeColor = getTooltipContentValue(config.shapeColor, datum, params), shapeFill = getTooltipContentValue(config.shapeFill, datum, params), shapeStroke = getTooltipContentValue(config.shapeStroke, datum, params), shapeLineWidth = getTooltipContentValue(config.shapeLineWidth, datum, params), shapeHollow = getTooltipContentValue(config.shapeHollow, datum, params), keyStyle = getTooltipContentValue(config.keyStyle, datum, params), valueStyle = getTooltipContentValue(config.valueStyle, datum, params);
     return {
         key: key,
         value: value,
@@ -83,7 +81,7 @@ export const getOneLineData = (datum, config, params) => {
         shapeFill: shapeFill,
         shapeStroke: shapeStroke,
         shapeLineWidth: shapeLineWidth,
-        shapeHollow: config.shapeHollow,
+        shapeHollow: shapeHollow,
         shapeColor: shapeColor,
         keyStyle: keyStyle,
         valueStyle: valueStyle,

package/esm/plugin/components/tooltip-handler/utils/compose.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/components/tooltip-handler/utils/compose.ts"],"names":[],"mappings":"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","file":"compose.js","sourcesContent":["import { isValid, isNil } from '@visactor/vutils';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  TooltipData,\n  IToolTipLineActual\n} from '../../../../typings/tooltip';\nimport {\n  getFirstDatumFromTooltipData,\n  getTooltipContentPattern,\n  getTooltipContentValue,\n  getTooltipPatternValue\n} from './common';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { TOOLTIP_MAX_LINE_COUNT, TOOLTIP_OTHERS_LINE } from '../constants';\nimport { getTooltipActualActiveType } from '../../../../component/tooltip/utils';\nimport type { TooltipActualTitleContent, TooltipHandlerParams } from '../../../../component/tooltip';\nimport { TimeUtil } from '../../../../component/axis/cartesian/util';\n\nconst getTimeString = (value: any, timeFormat?: string, timeFormatMode?: 'local' | 'utc') => {\n  if (!timeFormat && !timeFormatMode) {\n    if (typeof value !== 'object') {\n      return value?.toString();\n    }\n    return value;\n  }\n\n  const timeUtil = TimeUtil.getInstance();\n  timeFormat = timeFormat || '%Y%m%d';\n  timeFormatMode = timeFormatMode || 'local';\n  const timeFormatter = timeFormatMode === 'local' ? timeUtil.timeFormat : timeUtil.timeUTCFormat;\n  return timeFormatter(timeFormat, value);\n};\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): TooltipActualTitleContent | null => {\n  if (\n    !data ||\n    // data.key === undefined ||\n    params?.event?.type === 'mouseout'\n  ) {\n    return null;\n  }\n\n  const tooltipActualTitleContent: Required<TooltipActualTitleContent> = {\n    title: {},\n    content: []\n  };\n\n  /** title */\n  const patternTitle = getTooltipPatternValue(pattern.title, data, params);\n  const { visible, value, valueTimeFormat, valueTimeFormatMode, valueStyle, hasShape } = patternTitle ?? {};\n  const patternTitleVisible = getTooltipContentValue(visible, data, params) !== false;\n\n  if (!patternTitle || !patternTitleVisible) {\n    tooltipActualTitleContent.title = {\n      hasShape: false,\n      visible: false\n    };\n  } else {\n    // 找到第一个可用的datum\n    const datum = getFirstDatumFromTooltipData(data);\n    tooltipActualTitleContent.title = {\n      value: getTimeString(getTooltipContentValue(value, datum, params), valueTimeFormat, valueTimeFormatMode),\n      valueStyle: getTooltipContentValue(valueStyle, datum, params),\n      hasShape\n    };\n  }\n\n  /** content */\n  const patternContent = getTooltipContentPattern(pattern.content, data, params);\n  const { maxLineCount = TOOLTIP_MAX_LINE_COUNT } = pattern;\n\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 (tooltipActualTitleContent.content.length === maxLineCount - 1) {\n          tooltipActualTitleContent.content.push({\n            ...oneLineData,\n            ...TOOLTIP_OTHERS_LINE\n          });\n          break;\n        } else if (tooltipActualTitleContent.content.length < maxLineCount) {\n          tooltipActualTitleContent.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 (tooltipActualTitleContent.content.length === maxLineCount - 1) {\n              tooltipActualTitleContent.content.push({\n                ...oneLineData,\n                ...TOOLTIP_OTHERS_LINE\n              });\n              break;\n            } else if (tooltipActualTitleContent.content.length < maxLineCount) {\n              tooltipActualTitleContent.content.push(oneLineData);\n            } else {\n              break;\n            }\n          }\n          if (tooltipActualTitleContent.content.length >= maxLineCount) {\n            break;\n          }\n        }\n        if (tooltipActualTitleContent.content.length >= maxLineCount) {\n          break;\n        }\n      }\n      if (tooltipActualTitleContent.content.length >= maxLineCount) {\n        break;\n      }\n    }\n  }\n\n  if (tooltipActualTitleContent.title) {\n    // TODO：对 title shape 的支持目前还不完整，尚没有相关需求\n    if (tooltipActualTitleContent.content.length > 0 && tooltipActualTitleContent.content[0].shapeType) {\n      if (isNil(tooltipActualTitleContent.title.shapeType)) {\n        tooltipActualTitleContent.title.shapeType = tooltipActualTitleContent.content[0].shapeType;\n      }\n      if (isNil(tooltipActualTitleContent.title.shapeColor)) {\n        tooltipActualTitleContent.title.shapeColor = tooltipActualTitleContent.content[0].shapeColor;\n      }\n    } else {\n      tooltipActualTitleContent.title.hasShape = false;\n    }\n  }\n\n  return tooltipActualTitleContent;\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 = getTimeString(\n    getTooltipContentValue(config.key, datum, params),\n    config.keyTimeFormat,\n    config.keyTimeFormatMode\n  );\n  const value = getTimeString(\n    getTooltipContentValue(config.value, datum, params),\n    config.valueTimeFormat,\n    config.valueTimeFormatMode\n  );\n  const visible: boolean =\n    getTooltipContentValue(config.visible, datum, params) !== false && (isValid(key) || isValid(value));\n  const isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params);\n  const spaceRow = getTooltipContentValue(config.spaceRow, datum, params);\n\n  const shapeType = getTooltipContentValue(config.shapeType, datum, params);\n  const shapeColor = getTooltipContentValue(config.shapeColor, datum, params);\n  const shapeFill = getTooltipContentValue(config.shapeFill, datum, params);\n  const shapeStroke = getTooltipContentValue(config.shapeStroke, datum, params);\n  const shapeLineWidth = getTooltipContentValue(config.shapeLineWidth, datum, params);\n  const keyStyle = getTooltipContentValue(config.keyStyle, datum, params);\n  const valueStyle = getTooltipContentValue(config.valueStyle, datum, params);\n\n  return {\n    key,\n    value,\n    visible,\n    isKeyAdaptive,\n    hasShape: config.hasShape,\n    shapeType: shapeType as any,\n    shapeFill,\n    shapeStroke,\n    shapeLineWidth,\n    shapeHollow: config.shapeHollow,\n    shapeColor,\n    keyStyle,\n    valueStyle,\n    spaceRow,\n    datum\n  };\n};\n"]}
+{"version":3,"sources":["../src/plugin/components/tooltip-handler/utils/compose.ts"],"names":[],"mappings":"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","file":"compose.js","sourcesContent":["import { isValid, isNil, TimeUtil } from '@visactor/vutils';\nimport type {\n  ITooltipLinePattern,\n  ITooltipPattern,\n  TooltipData,\n  ITooltipLineActual\n} from '../../../../typings/tooltip';\nimport {\n  getFirstDatumFromTooltipData,\n  getTooltipContentPattern,\n  getTooltipContentValue,\n  getTooltipPatternValue\n} from './common';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { TOOLTIP_MAX_LINE_COUNT, TOOLTIP_OTHERS_LINE } from '../constants';\nimport { getTooltipActualActiveType } from '../../../../component/tooltip/utils';\nimport type { TooltipActualTitleContent, TooltipHandlerParams } from '../../../../component/tooltip';\n\nconst getTimeString = (value: any, timeFormat?: string, timeFormatMode?: 'local' | 'utc') => {\n  if (!timeFormat && !timeFormatMode) {\n    if (typeof value !== 'object') {\n      return value?.toString();\n    }\n    return value;\n  }\n\n  const timeUtil = TimeUtil.getInstance();\n  timeFormat = timeFormat || '%Y%m%d';\n  timeFormatMode = timeFormatMode || 'local';\n  const timeFormatter = timeFormatMode === 'local' ? timeUtil.timeFormat : timeUtil.timeUTCFormat;\n  return timeFormatter(timeFormat, value);\n};\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): TooltipActualTitleContent | null => {\n  if (\n    !data ||\n    // data.key === undefined ||\n    params?.event?.type === 'mouseout'\n  ) {\n    return null;\n  }\n\n  const tooltipActualTitleContent: Required<TooltipActualTitleContent> = {\n    title: {},\n    content: []\n  };\n\n  /** title */\n  const patternTitle = getTooltipPatternValue(pattern.title, data, params);\n  const { visible, value, valueTimeFormat, valueTimeFormatMode, valueStyle, hasShape, valueFormatter } =\n    patternTitle ?? {};\n  const patternTitleVisible = getTooltipContentValue(visible, data, params) !== false;\n\n  if (!patternTitle || !patternTitleVisible) {\n    tooltipActualTitleContent.title = {\n      hasShape: false,\n      visible: false\n    };\n  } else {\n    // 找到第一个可用的datum\n    const datum = getFirstDatumFromTooltipData(data);\n    tooltipActualTitleContent.title = {\n      value: getTimeString(\n        getTooltipContentValue(value, datum, params, valueFormatter),\n        valueTimeFormat,\n        valueTimeFormatMode\n      ),\n      valueStyle: getTooltipContentValue(valueStyle, datum, params),\n      hasShape\n    };\n  }\n\n  /** content */\n  const patternContent = getTooltipContentPattern(pattern.content, data, params);\n  const { maxLineCount = TOOLTIP_MAX_LINE_COUNT } = pattern;\n\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 (tooltipActualTitleContent.content.length === maxLineCount - 1) {\n          tooltipActualTitleContent.content.push({\n            ...oneLineData,\n            ...TOOLTIP_OTHERS_LINE\n          });\n          break;\n        } else if (tooltipActualTitleContent.content.length < maxLineCount) {\n          tooltipActualTitleContent.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 (tooltipActualTitleContent.content.length === maxLineCount - 1) {\n              tooltipActualTitleContent.content.push({\n                ...oneLineData,\n                ...TOOLTIP_OTHERS_LINE\n              });\n              break;\n            } else if (tooltipActualTitleContent.content.length < maxLineCount) {\n              tooltipActualTitleContent.content.push(oneLineData);\n            } else {\n              break;\n            }\n          }\n          if (tooltipActualTitleContent.content.length >= maxLineCount) {\n            break;\n          }\n        }\n        if (tooltipActualTitleContent.content.length >= maxLineCount) {\n          break;\n        }\n      }\n      if (tooltipActualTitleContent.content.length >= maxLineCount) {\n        break;\n      }\n    }\n  }\n\n  if (tooltipActualTitleContent.title) {\n    // TODO：对 title shape 的支持目前还不完整，尚没有相关需求\n    if (tooltipActualTitleContent.content.length > 0 && tooltipActualTitleContent.content[0].shapeType) {\n      if (isNil(tooltipActualTitleContent.title.shapeType)) {\n        tooltipActualTitleContent.title.shapeType = tooltipActualTitleContent.content[0].shapeType;\n      }\n      if (isNil(tooltipActualTitleContent.title.shapeColor)) {\n        tooltipActualTitleContent.title.shapeColor = tooltipActualTitleContent.content[0].shapeColor;\n      }\n    } else {\n      tooltipActualTitleContent.title.hasShape = false;\n    }\n  }\n\n  return tooltipActualTitleContent;\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 = getTimeString(\n    getTooltipContentValue(config.key, datum, params, config.keyFormatter),\n    config.keyTimeFormat,\n    config.keyTimeFormatMode\n  );\n  const value = getTimeString(\n    getTooltipContentValue(config.value, datum, params, config.valueFormatter),\n    config.valueTimeFormat,\n    config.valueTimeFormatMode\n  );\n  const visible: boolean =\n    getTooltipContentValue(config.visible, datum, params) !== false && (isValid(key) || isValid(value));\n  const isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params);\n  const spaceRow = getTooltipContentValue(config.spaceRow, datum, params);\n\n  const shapeType = getTooltipContentValue(config.shapeType, datum, params);\n  const shapeColor = getTooltipContentValue(config.shapeColor, datum, params);\n  const shapeFill = getTooltipContentValue(config.shapeFill, datum, params);\n  const shapeStroke = getTooltipContentValue(config.shapeStroke, datum, params);\n  const shapeLineWidth = getTooltipContentValue(config.shapeLineWidth, datum, params);\n  const shapeHollow = getTooltipContentValue(config.shapeHollow, datum, params);\n  const keyStyle = getTooltipContentValue(config.keyStyle, datum, params);\n  const valueStyle = getTooltipContentValue(config.valueStyle, datum, params);\n\n  return {\n    key,\n    value,\n    visible,\n    isKeyAdaptive,\n    hasShape: config.hasShape,\n    shapeType,\n    shapeFill,\n    shapeStroke,\n    shapeLineWidth,\n    shapeHollow,\n    shapeColor,\n    keyStyle,\n    valueStyle,\n    spaceRow,\n    datum\n  };\n};\n"]}

package/esm/plugin/components/tooltip-handler/utils/get-spec.js

@@ -12,7 +12,7 @@ export const getTooltipSpecForShow = (activeType, globalSpec, series, dimensionI
     var _a, _b, _c, _d, _e, _f, _g;
     const finalSpec = Object.assign(Object.assign({}, globalSpec), {
         activeType: activeType
-    });
+    }), {style: style = {}} = globalSpec;
     if ("mark" === activeType && series) {
         const seriesSpec = null !== (_b = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec) && void 0 !== _b ? _b : {};
         if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType) ? finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes("mark") : isValid(globalSpec.visible) || isValid(globalSpec.activeType) ? finalSpec.visible = getTooltipActualActiveType(globalSpec).includes("mark") : finalSpec.visible = !0, 
@@ -26,13 +26,13 @@ export const getTooltipSpecForShow = (activeType, globalSpec, series, dimensionI
         finalSpec.handler = null !== (_f = globalSpec.handler) && void 0 !== _f ? _f : void 0, 
         null === (_g = finalSpec.handler) || void 0 === _g ? void 0 : _g.showTooltip) return finalSpec;
     }
-    const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo), seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo), userPattern = mergeSpec({}, cloneDeep(globalSpec[activeType]), seriesPattern), defaultPatternTitle = defaultPattern.title, titleShape = getShapePattern(void 0, userPattern, void 0, defaultPatternTitle);
+    const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo), seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo), userPattern = mergeSpec({}, cloneDeep(globalSpec[activeType]), seriesPattern), defaultPatternTitle = defaultPattern.title, titleShape = getShapePattern(void 0, userPattern, style.shape, void 0, defaultPatternTitle);
     isValid(userPattern.title) ? userPattern.title = addExtraInfoToTooltipTitlePattern(userPattern.title, Object.assign(Object.assign({}, defaultPatternTitle), titleShape)) : userPattern.title = addExtraInfoToTooltipTitlePattern(defaultPatternTitle, titleShape, !0);
     const defaultPatternContent = array(defaultPattern.content);
     if (isValid(userPattern.content)) {
         const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);
-        userPattern.content = addExtraInfoToTooltipContentPattern(userPattern.content, (userLine => getShapePattern(userLine, userPattern, shapePatternMap)));
-    } else userPattern.content = addExtraInfoToTooltipContentPattern(defaultPatternContent, (line => getShapePattern(void 0, userPattern, void 0, line)), !0);
+        userPattern.content = addExtraInfoToTooltipContentPattern(userPattern.content, (userLine => getShapePattern(userLine, userPattern, style.shape, shapePatternMap)));
+    } else userPattern.content = addExtraInfoToTooltipContentPattern(defaultPatternContent, (line => getShapePattern(void 0, userPattern, style.shape, void 0, line)), !0);
     return finalSpec[activeType] = Object.assign(Object.assign(Object.assign({}, defaultPattern), userPattern), {
         activeType: activeType
     }), finalSpec;
@@ -86,12 +86,15 @@ const getDefaultTooltipPattern = (activeType, series, dimensionInfo) => {
         const key = null !== (_a = line.seriesId) && void 0 !== _a ? _a : 0;
         shapePatternMap[key] || (shapePatternMap[key] = line);
     })), shapePatternMap;
-}, getShapePattern = (userLinePattern, userPattern, shapePatternMap, defaultShapePattern) => {
-    var _a, _b;
-    const shapePatternFromMap = null !== (_b = null == shapePatternMap ? void 0 : shapePatternMap[null !== (_a = null == userLinePattern ? void 0 : userLinePattern.seriesId) && void 0 !== _a ? _a : 0]) && void 0 !== _b ? _b : null == shapePatternMap ? void 0 : shapePatternMap[0], shapeKeys = new Set([].concat(Object.keys(null != userLinePattern ? userLinePattern : {}), Object.keys(null != userPattern ? userPattern : {}), Object.keys(null != shapePatternFromMap ? shapePatternFromMap : {}), Object.keys(null != defaultShapePattern ? defaultShapePattern : {})).filter((key => key.toLowerCase().includes("shape")))), shapePattern = {};
+}, getShapePattern = (userLinePattern, userPattern, userStyle, shapePatternMap, defaultShapePattern) => {
+    var _a, _b, _c;
+    userStyle && (userStyle.shapeSize = null !== (_a = userStyle.shapeSize) && void 0 !== _a ? _a : userStyle.size);
+    const maps = [ userLinePattern, userPattern, userStyle, null !== (_c = null == shapePatternMap ? void 0 : shapePatternMap[null !== (_b = null == userLinePattern ? void 0 : userLinePattern.seriesId) && void 0 !== _b ? _b : 0]) && void 0 !== _c ? _c : null == shapePatternMap ? void 0 : shapePatternMap[0], defaultShapePattern ].filter(isValid), shapeKeys = new Set(maps.reduce(((keys, cur) => keys.concat(Object.keys(cur))), []).filter((key => key.toLowerCase().includes("shape")))), shapePattern = {};
     return shapeKeys.forEach((key => {
-        var _a, _b, _c;
-        const value = null !== (_c = null !== (_b = null !== (_a = null == userLinePattern ? void 0 : userLinePattern[key]) && void 0 !== _a ? _a : null == userPattern ? void 0 : userPattern[key]) && void 0 !== _b ? _b : null == shapePatternFromMap ? void 0 : shapePatternFromMap[key]) && void 0 !== _c ? _c : null == defaultShapePattern ? void 0 : defaultShapePattern[key];
+        let value, i = 0;
+        do {
+            value = maps[i++][key];
+        } while (i < maps.length && isNil(value));
         void 0 !== value && (shapePattern[key] = value);
     })), shapePattern;
 };

package/esm/plugin/components/tooltip-handler/utils/get-spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/components/tooltip-handler/utils/get-spec.ts"],"names":[],"mappings":"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","file":"get-spec.js","sourcesContent":["import type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  MaybeArray,\n  TooltipActiveType,\n  TooltipPatternProperty\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { mergeSpec } from '../../../../util/spec/merge-spec';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { memoize, isValid, array, isFunction, isNil, cloneDeep } from '@visactor/vutils';\nimport type { ITooltipSpec } from '../../../../component/tooltip';\nimport { getTooltipActualActiveType } from '../../../../component/tooltip/utils';\nimport {\n  addExtraInfoToTooltipContentPattern,\n  addExtraInfoToTooltipTitlePattern\n} from '../../../../series/base/tooltip-helper';\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  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  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\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\n  // 默认的 pattern\n  const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo);\n  // 来自系列的 pattern\n  const seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo);\n  // 来自用户配置的 pattern\n  const userPattern: ITooltipPattern = mergeSpec({}, cloneDeep(globalSpec[activeType]), seriesPattern);\n\n  // 对pattern进行组装\n  // 组装 title\n  const defaultPatternTitle = defaultPattern.title as IToolTipLinePattern | undefined;\n  const titleShape: ITooltipShapePattern = getShapePattern(undefined, userPattern, undefined, defaultPatternTitle);\n  if (isValid(userPattern.title)) {\n    userPattern.title = addExtraInfoToTooltipTitlePattern(userPattern.title, {\n      ...defaultPatternTitle,\n      ...titleShape // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n    });\n  } else {\n    userPattern.title = addExtraInfoToTooltipTitlePattern(\n      defaultPatternTitle,\n      titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n      true\n    );\n  }\n\n  // 组装 content\n  const defaultPatternContent = array(defaultPattern.content) as IToolTipLinePattern[];\n  if (isValid(userPattern.content)) {\n    const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);\n    userPattern.content = addExtraInfoToTooltipContentPattern(\n      userPattern.content,\n      // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n      userLine => getShapePattern(userLine, userPattern, shapePatternMap)\n    );\n  } else {\n    userPattern.content = addExtraInfoToTooltipContentPattern(\n      defaultPatternContent,\n      // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n      line => getShapePattern(undefined, userPattern, undefined, line),\n      true\n    );\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n\n/** 获取默认 tooltip pattern */\nconst getDefaultTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    defaultPattern = makeDefaultPattern(series, 'mark') ?? {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const patternList: ITooltipPattern[] = [];\n    dimensionInfo.forEach(({ data }) =>\n      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    );\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  return defaultPattern;\n};\n\n/** 获取来自系列 spec 的 tooltip pattern */\nconst getSeriesTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let seriesPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n    seriesPattern = seriesSpec.mark ? cloneDeep(seriesSpec.mark) : {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\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 => series.tooltipHelper.spec.dimension);\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      seriesPattern = {\n        ...seriesPatternList[0],\n        content: seriesPatternContent\n      };\n    }\n  }\n  return seriesPattern;\n};\n\nconst getSeriesListFromDimensionInfo = memoize((dimensionInfo: IDimensionInfo[]): ISeries[] => {\n  return dimensionInfo.reduce(\n    (list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)),\n    [] as ISeries[]\n  );\n});\n\n/** 获取每个系列对应的 shape pattern */\nconst getShapePatternMapOfEachSeries = (content: IToolTipLinePattern[]): Record<number, ITooltipShapePattern> => {\n  const shapePatternMap: Record<number, ITooltipShapePattern> = {};\n  content.forEach(line => {\n    const key = line.seriesId ?? 0;\n    if (!shapePatternMap[key]) {\n      shapePatternMap[key] = line;\n    }\n  });\n  return shapePatternMap;\n};\n\n/** 根据优先级获取形状配置 */\nconst getShapePattern = (\n  userLinePattern?: IToolTipLinePattern,\n  userPattern?: ITooltipPattern,\n  shapePatternMap?: Record<number, ITooltipShapePattern>,\n  defaultShapePattern?: ITooltipShapePattern\n): ITooltipShapePattern => {\n  const shapePatternFromMap = shapePatternMap?.[userLinePattern?.seriesId ?? 0] ?? shapePatternMap?.[0];\n  const shapeKeys: Set<keyof ITooltipShapePattern> = new Set(\n    []\n      .concat(\n        Object.keys(userLinePattern ?? {}),\n        Object.keys(userPattern ?? {}),\n        Object.keys(shapePatternFromMap ?? {}),\n        Object.keys(defaultShapePattern ?? {})\n      )\n      .filter(key => key.toLowerCase().includes('shape')) as any[]\n  );\n\n  const shapePattern: ITooltipShapePattern = {};\n  shapeKeys.forEach(key => {\n    const value =\n      userLinePattern?.[key] ?? userPattern?.[key] ?? shapePatternFromMap?.[key] ?? defaultShapePattern?.[key];\n    if (value !== undefined) {\n      shapePattern[key as any] = value;\n    }\n  });\n  return shapePattern;\n};\n"]}
+{"version":3,"sources":["../src/plugin/components/tooltip-handler/utils/get-spec.ts"],"names":[],"mappings":"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","file":"get-spec.js","sourcesContent":["import type {\n  ITooltipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  MaybeArray,\n  TooltipActiveType,\n  TooltipPatternProperty\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { mergeSpec } from '../../../../util/spec/merge-spec';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { memoize, isValid, array, isFunction, isNil, cloneDeep } from '@visactor/vutils';\nimport type { ITooltipSpec, ITooltipTheme } from '../../../../component/tooltip';\nimport { getTooltipActualActiveType } from '../../../../component/tooltip/utils';\nimport {\n  addExtraInfoToTooltipContentPattern,\n  addExtraInfoToTooltipTitlePattern\n} from '../../../../series/base/tooltip-helper';\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\n  const { style = {} } = globalSpec;\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  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\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\n  // 默认的 pattern\n  const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo);\n  // 来自系列的 pattern\n  const seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo);\n  // 来自用户配置的 pattern\n  const userPattern: ITooltipPattern = mergeSpec({}, cloneDeep(globalSpec[activeType]), seriesPattern);\n\n  // 对pattern进行组装\n  // 组装 title\n  const defaultPatternTitle = defaultPattern.title as ITooltipLinePattern | undefined;\n  const titleShape: ITooltipShapePattern = getShapePattern(\n    undefined,\n    userPattern,\n    style.shape,\n    undefined,\n    defaultPatternTitle\n  );\n  if (isValid(userPattern.title)) {\n    userPattern.title = addExtraInfoToTooltipTitlePattern(userPattern.title, {\n      ...defaultPatternTitle,\n      ...titleShape // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n    });\n  } else {\n    userPattern.title = addExtraInfoToTooltipTitlePattern(\n      defaultPatternTitle,\n      titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n      true\n    );\n  }\n\n  // 组装 content\n  const defaultPatternContent = array(defaultPattern.content) as ITooltipLinePattern[];\n  if (isValid(userPattern.content)) {\n    const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);\n    userPattern.content = addExtraInfoToTooltipContentPattern(\n      userPattern.content,\n      // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n      userLine => getShapePattern(userLine, userPattern, style.shape, shapePatternMap)\n    );\n  } else {\n    userPattern.content = addExtraInfoToTooltipContentPattern(\n      defaultPatternContent,\n      // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n      line => getShapePattern(undefined, userPattern, style.shape, undefined, line),\n      true\n    );\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n\n/** 获取默认 tooltip pattern */\nconst getDefaultTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    defaultPattern = makeDefaultPattern(series, 'mark') ?? {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const patternList: ITooltipPattern[] = [];\n    dimensionInfo.forEach(({ data }) =>\n      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    );\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  return defaultPattern;\n};\n\n/** 获取来自系列 spec 的 tooltip pattern */\nconst getSeriesTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let seriesPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n    seriesPattern = seriesSpec.mark ? cloneDeep(seriesSpec.mark) : {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\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 => series.tooltipHelper.spec.dimension);\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      seriesPattern = {\n        ...seriesPatternList[0],\n        content: seriesPatternContent\n      };\n    }\n  }\n  return seriesPattern;\n};\n\nconst getSeriesListFromDimensionInfo = memoize((dimensionInfo: IDimensionInfo[]): ISeries[] => {\n  return dimensionInfo.reduce(\n    (list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)),\n    [] as ISeries[]\n  );\n});\n\n/** 获取每个系列对应的 shape pattern */\nconst getShapePatternMapOfEachSeries = (content: ITooltipLinePattern[]): Record<number, ITooltipShapePattern> => {\n  const shapePatternMap: Record<number, ITooltipShapePattern> = {};\n  content.forEach(line => {\n    const key = line.seriesId ?? 0;\n    if (!shapePatternMap[key]) {\n      shapePatternMap[key] = line;\n    }\n  });\n  return shapePatternMap;\n};\n\n/** 根据优先级获取形状配置 */\nconst getShapePattern = (\n  userLinePattern?: ITooltipLinePattern,\n  userPattern?: ITooltipPattern,\n  userStyle?: ITooltipTheme['shape'],\n  shapePatternMap?: Record<number, ITooltipShapePattern>,\n  defaultShapePattern?: ITooltipShapePattern\n): ITooltipShapePattern => {\n  if (userStyle) {\n    userStyle.shapeSize = userStyle.shapeSize ?? userStyle.size; // 兼容旧配置\n  }\n  const shapePatternFromMap = shapePatternMap?.[userLinePattern?.seriesId ?? 0] ?? shapePatternMap?.[0];\n\n  const maps = [userLinePattern, userPattern, userStyle, shapePatternFromMap, defaultShapePattern].filter(isValid);\n\n  const shapeKeys: Set<keyof ITooltipShapePattern> = new Set(\n    maps\n      .reduce((keys, cur) => keys.concat(Object.keys(cur)), [] as string[])\n      .filter(key => key.toLowerCase().includes('shape')) as any[]\n  );\n\n  const shapePattern: ITooltipShapePattern = {};\n  shapeKeys.forEach(key => {\n    let value;\n    let i = 0;\n    do {\n      value = maps[i++][key];\n    } while (i < maps.length && isNil(value));\n    if (value !== undefined) {\n      shapePattern[key as any] = value;\n    }\n  });\n  return shapePattern;\n};\n"]}

package/esm/plugin/components/tooltip-handler/utils/position.d.ts

@@ -1,7 +1,22 @@
-import type { TooltipFixedPosition } from '../../../../typings/tooltip/position';
+import type { IDimensionInfo } from '../../../../event';
+import type { ICartesianSeries } from '../../../../series';
+import type { ILayoutPoint } from '../../../../typings';
+import type { IFixedTooltipPositionPattern, IGlobalTooltipPositionPattern, TooltipFixedPosition } from '../../../../typings/tooltip/position';
 export declare const getActualTooltipPositionValue: (position: number | ((event: MouseEvent) => number), event: MouseEvent) => number;
-export type TooltipHorizontalPositionType = 'left' | 'right' | 'middle';
-export type TooltipVerticalPositionType = 'top' | 'bottom' | 'middle';
+export type TooltipHorizontalPositionType = 'left' | 'right' | 'center' | 'centerLeft' | 'centerRight';
+export type TooltipVerticalPositionType = 'top' | 'bottom' | 'center' | 'centerTop' | 'centerBottom';
 export declare const positionType: Record<TooltipFixedPosition, [TooltipHorizontalPositionType, TooltipVerticalPositionType]>;
 export declare const getHorizontalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipHorizontalPositionType) => TooltipHorizontalPositionType;
 export declare const getVerticalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipVerticalPositionType) => TooltipVerticalPositionType;
+export declare const getCartesianCrosshairRect: (dimensionInfo: IDimensionInfo[], series: ICartesianSeries, layoutStartPoint: ILayoutPoint) => {
+    start: {
+        x: number;
+        y: number;
+    };
+    end: {
+        x: number;
+        y: number;
+    };
+};
+export declare const isGlobalTooltipPositionPattern: (obj: any) => obj is IGlobalTooltipPositionPattern;
+export declare const isFixedTooltipPositionPattern: (obj: any) => obj is IFixedTooltipPositionPattern;

package/esm/plugin/components/tooltip-handler/utils/position.js

@@ -1,4 +1,6 @@
-import { isFunction, isNumber, isValid } from "@visactor/vutils";
+import { layoutByValue, layoutHorizontalCrosshair, layoutVerticalCrosshair } from "../../../../component/crosshair/utils/cartesian";
+
+import { isFunction, isNumber, isObject, isValid } from "@visactor/vutils";
 
 export const getActualTooltipPositionValue = (position, event) => {
     let result;
@@ -10,19 +12,24 @@ export const getActualTooltipPositionValue = (position, event) => {
 };
 
 export const positionType = {
-    left: [ "left", "middle" ],
-    right: [ "right", "middle" ],
-    inside: [ "middle", "middle" ],
-    top: [ "middle", "top" ],
+    left: [ "left", "center" ],
+    right: [ "right", "center" ],
+    top: [ "center", "top" ],
     lt: [ "left", "top" ],
     tl: [ "left", "top" ],
     rt: [ "right", "top" ],
     tr: [ "right", "top" ],
-    bottom: [ "middle", "bottom" ],
+    bottom: [ "center", "bottom" ],
     bl: [ "left", "bottom" ],
     lb: [ "left", "bottom" ],
     br: [ "right", "bottom" ],
-    rb: [ "right", "bottom" ]
+    rb: [ "right", "bottom" ],
+    inside: [ "center", "center" ],
+    center: [ "center", "center" ],
+    centerBottom: [ "center", "centerBottom" ],
+    centerTop: [ "center", "centerTop" ],
+    centerLeft: [ "centerLeft", "center" ],
+    centerRight: [ "centerRight", "center" ]
 };
 
 export const getHorizontalPositionType = (position, defaultCase) => {
@@ -34,4 +41,29 @@ export const getVerticalPositionType = (position, defaultCase) => {
     var _a, _b;
     return null !== (_b = null === (_a = positionType[position]) || void 0 === _a ? void 0 : _a[1]) && void 0 !== _b ? _b : defaultCase;
 };
+
+export const getCartesianCrosshairRect = (dimensionInfo, series, layoutStartPoint) => {
+    const currValueX = new Map, currValueY = new Map;
+    dimensionInfo.forEach((({axis: axis, value: value}) => {
+        [ "top", "bottom" ].includes(axis.getOrient()) ? currValueX.set(axis.getSpecIndex(), {
+            value: value,
+            axis: axis
+        }) : currValueY.set(axis.getSpecIndex(), {
+            value: value,
+            axis: axis
+        });
+    }));
+    const xHair = {
+        visible: !!currValueX.size,
+        type: "rect"
+    }, yHair = {
+        visible: !!currValueY.size,
+        type: "rect"
+    }, {x: crosshairInfoX, y: crosshairInfoY, offsetWidth: offsetWidth, offsetHeight: offsetHeight, bandWidth: bandWidth, bandHeight: bandHeight} = layoutByValue(3, series, layoutStartPoint, currValueX, currValueY, xHair, yHair);
+    return crosshairInfoX ? layoutVerticalCrosshair(xHair, crosshairInfoX, bandWidth, offsetWidth) : crosshairInfoY ? layoutHorizontalCrosshair(yHair, crosshairInfoY, bandHeight, offsetHeight) : void 0;
+};
+
+export const isGlobalTooltipPositionPattern = obj => isObject(obj) && (isValid(obj.left) || isValid(obj.right) || isValid(obj.top) || isValid(obj.bottom));
+
+export const isFixedTooltipPositionPattern = obj => isObject(obj) && (isValid(obj.x) || isValid(obj.y));
 //# sourceMappingURL=position.js.map

package/esm/plugin/components/tooltip-handler/utils/position.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/components/tooltip-handler/utils/position.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,QAAqE,EACrE,KAAiB,EACjB,EAAE;IACF,IAAI,MAAM,CAAC;IACX,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE;QACrB,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACtB,MAAM,GAAG,QAAQ,CAAC;SACnB;aAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE;YAE/B,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAExC,IAAI,QAAQ,CAAC,eAAe,CAAC,EAAE;gBAC7B,MAAM,GAAG,eAAe,CAAC;aAC1B;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,YAAY,GACvB;IACE,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IACxB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC1B,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;IACtB,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;IACnB,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;IACnB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;IACpB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;IACpB,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,EAAE,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IACtB,EAAE,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IACtB,EAAE,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;IACvB,EAAE,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;CACxB,CAAC;AAEJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,QAA8B,EAC9B,WAA2C,EACZ,EAAE,eAAC,OAAA,MAAA,MAAA,YAAY,CAAC,QAAQ,CAAC,0CAAG,CAAC,CAAC,mCAAI,WAAW,CAAA,EAAA,CAAC;AAE/E,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,QAA8B,EAC9B,WAAyC,EACZ,EAAE,eAAC,OAAA,MAAA,MAAA,YAAY,CAAC,QAAQ,CAAC,0CAAG,CAAC,CAAC,mCAAI,WAAW,CAAA,EAAA,CAAC","file":"position.js","sourcesContent":["import type { TooltipFixedPosition } from '../../../../typings/tooltip/position';\nimport { isFunction, isNumber, isValid } from '@visactor/vutils';\n\nexport const getActualTooltipPositionValue = (\n  position: number | ((event: MouseEvent) => number) | null | undefined,\n  event: MouseEvent\n) => {\n  let result;\n  if (isValid(position)) {\n    if (isNumber(position)) {\n      result = position;\n    } else if (isFunction(position)) {\n      //  这里额外判断下是否合法\n      const tooltipPosition = position(event);\n\n      if (isNumber(tooltipPosition)) {\n        result = tooltipPosition;\n      }\n    }\n  }\n  return result;\n};\n\nexport type TooltipHorizontalPositionType = 'left' | 'right' | 'middle';\nexport type TooltipVerticalPositionType = 'top' | 'bottom' | 'middle';\n\nexport const positionType: Record<TooltipFixedPosition, [TooltipHorizontalPositionType, TooltipVerticalPositionType]> =\n  {\n    left: ['left', 'middle'],\n    right: ['right', 'middle'],\n    inside: ['middle', 'middle'],\n    top: ['middle', 'top'],\n    lt: ['left', 'top'],\n    tl: ['left', 'top'],\n    rt: ['right', 'top'],\n    tr: ['right', 'top'],\n    bottom: ['middle', 'bottom'],\n    bl: ['left', 'bottom'],\n    lb: ['left', 'bottom'],\n    br: ['right', 'bottom'],\n    rb: ['right', 'bottom']\n  };\n\nexport const getHorizontalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipHorizontalPositionType\n): TooltipHorizontalPositionType => positionType[position]?.[0] ?? defaultCase;\n\nexport const getVerticalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipVerticalPositionType\n): TooltipVerticalPositionType => positionType[position]?.[1] ?? defaultCase;\n"]}
+{"version":3,"sources":["../src/plugin/components/tooltip-handler/utils/position.ts"],"names":[],"mappings":"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","file":"position.js","sourcesContent":["import type { AxisCurrentValueMap } from '../../../../component/crosshair';\nimport type { IHair } from '../../../../component/crosshair/base';\nimport { LayoutType } from '../../../../component/crosshair/config';\nimport {\n  layoutByValue,\n  layoutHorizontalCrosshair,\n  layoutVerticalCrosshair\n} from '../../../../component/crosshair/utils/cartesian';\nimport type { IDimensionInfo } from '../../../../event';\nimport type { ICartesianSeries } from '../../../../series';\nimport type { ILayoutPoint } from '../../../../typings';\nimport type {\n  IFixedTooltipPositionPattern,\n  IGlobalTooltipPositionPattern,\n  TooltipFixedPosition\n} from '../../../../typings/tooltip/position';\nimport { isFunction, isNumber, isObject, isValid } from '@visactor/vutils';\n\nexport const getActualTooltipPositionValue = (\n  position: number | ((event: MouseEvent) => number) | null | undefined,\n  event: MouseEvent\n) => {\n  let result;\n  if (isValid(position)) {\n    if (isNumber(position)) {\n      result = position;\n    } else if (isFunction(position)) {\n      //  这里额外判断下是否合法\n      const tooltipPosition = position(event);\n\n      if (isNumber(tooltipPosition)) {\n        result = tooltipPosition;\n      }\n    }\n  }\n  return result;\n};\n\nexport type TooltipHorizontalPositionType = 'left' | 'right' | 'center' | 'centerLeft' | 'centerRight';\nexport type TooltipVerticalPositionType = 'top' | 'bottom' | 'center' | 'centerTop' | 'centerBottom';\n\n/** position 对齐方式在 x、y 分量下的分解 */\nexport const positionType: Record<TooltipFixedPosition, [TooltipHorizontalPositionType, TooltipVerticalPositionType]> =\n  {\n    left: ['left', 'center'],\n    right: ['right', 'center'],\n    top: ['center', 'top'],\n    lt: ['left', 'top'],\n    tl: ['left', 'top'],\n    rt: ['right', 'top'],\n    tr: ['right', 'top'],\n    bottom: ['center', 'bottom'],\n    bl: ['left', 'bottom'],\n    lb: ['left', 'bottom'],\n    br: ['right', 'bottom'],\n    rb: ['right', 'bottom'],\n    inside: ['center', 'center'], // 旧版兼容\n    center: ['center', 'center'],\n    centerBottom: ['center', 'centerBottom'],\n    centerTop: ['center', 'centerTop'],\n    centerLeft: ['centerLeft', 'center'],\n    centerRight: ['centerRight', 'center']\n  };\n\nexport const getHorizontalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipHorizontalPositionType\n): TooltipHorizontalPositionType => positionType[position]?.[0] ?? defaultCase;\n\nexport const getVerticalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipVerticalPositionType\n): TooltipVerticalPositionType => positionType[position]?.[1] ?? defaultCase;\n\nexport const getCartesianCrosshairRect = (\n  dimensionInfo: IDimensionInfo[],\n  series: ICartesianSeries,\n  layoutStartPoint: ILayoutPoint\n) => {\n  const currValueX: AxisCurrentValueMap = new Map();\n  const currValueY: AxisCurrentValueMap = new Map();\n  // 将 dimensionInfo 转换为 AxisCurrentValueMap\n  dimensionInfo.forEach(({ axis, value }) => {\n    if (['top', 'bottom'].includes(axis.getOrient())) {\n      currValueX.set(axis.getSpecIndex(), {\n        value,\n        axis\n      });\n    } else {\n      currValueY.set(axis.getSpecIndex(), {\n        value,\n        axis\n      });\n    }\n  });\n\n  const xHair: IHair = {\n    visible: !!currValueX.size,\n    type: 'rect'\n  };\n  const yHair: IHair = {\n    visible: !!currValueY.size,\n    type: 'rect'\n  };\n\n  const {\n    x: crosshairInfoX,\n    y: crosshairInfoY,\n    offsetWidth,\n    offsetHeight,\n    bandWidth,\n    bandHeight\n  } = layoutByValue(LayoutType.ALL, series, layoutStartPoint, currValueX, currValueY, xHair, yHair);\n\n  if (crosshairInfoX) {\n    return layoutVerticalCrosshair(xHair, crosshairInfoX, bandWidth, offsetWidth);\n  }\n  if (crosshairInfoY) {\n    return layoutHorizontalCrosshair(yHair, crosshairInfoY, bandHeight, offsetHeight);\n  }\n  return undefined;\n};\n\nexport const isGlobalTooltipPositionPattern = (obj: any): obj is IGlobalTooltipPositionPattern => {\n  return (\n    isObject(obj) &&\n    (isValid((obj as IGlobalTooltipPositionPattern).left) ||\n      isValid((obj as IGlobalTooltipPositionPattern).right) ||\n      isValid((obj as IGlobalTooltipPositionPattern).top) ||\n      isValid((obj as IGlobalTooltipPositionPattern).bottom))\n  );\n};\n\nexport const isFixedTooltipPositionPattern = (obj: any): obj is IFixedTooltipPositionPattern => {\n  return (\n    isObject(obj) &&\n    (isValid((obj as IFixedTooltipPositionPattern).x) || isValid((obj as IFixedTooltipPositionPattern).y))\n  );\n};\n"]}

package/esm/plugin/index.d.ts

@@ -1 +1,2 @@
 export * from './chart';
+export * from './components';

package/esm/plugin/index.js

@@ -1,2 +1,4 @@
 export * from "./chart";
+
+export * from "./components";
 //# sourceMappingURL=index.js.map

package/esm/plugin/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC","file":"index.js","sourcesContent":["export * from './chart';\n"]}
+{"version":3,"sources":["../src/plugin/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC","file":"index.js","sourcesContent":["export * from './chart';\nexport * from './components';\n"]}

package/esm/series/base/base-series-transformer.js

@@ -20,9 +20,9 @@ export class BaseSeriesSpecTransformer extends BaseModelSpecTransformer {
         this.markLabelSpec[markName] || (this.markLabelSpec[markName] = []), head ? this.markLabelSpec[markName].unshift(label) : this.markLabelSpec[markName].push(label);
     }
     getTheme(spec, chartSpec) {
-        var _a;
-        const direction = getDirectionFromSeriesSpec(spec), chartTheme = null === (_a = this._option) || void 0 === _a ? void 0 : _a.getTheme(), {markByName: markByName, mark: mark} = chartTheme, type = this._option.type, theme = transformSeriesThemeToMerge(get(chartTheme, `series.${type}`), type, mark, markByName), themeWithDirection = transformSeriesThemeToMerge(get(chartTheme, `series.${type}_${direction}`), `${type}_${direction}`, mark, markByName);
-        return mergeSpec({}, theme, themeWithDirection);
+        var _a, _b, _c;
+        const direction = getDirectionFromSeriesSpec(spec), chartTheme = null === (_a = this._option) || void 0 === _a ? void 0 : _a.getTheme(), {markByName: markByName, mark: mark} = chartTheme, type = this._option.type, theme = transformSeriesThemeToMerge(get(chartTheme, `series.${type}`), type, mark, markByName), themeWithDirection = get(chartTheme, `series.${type}_${direction}`), themeWithStack = (null !== (_c = null !== (_b = spec.stack) && void 0 !== _b ? _b : null == themeWithDirection ? void 0 : themeWithDirection.stack) && void 0 !== _c ? _c : null == theme ? void 0 : theme.stack) ? get(chartTheme, `series.${type}_stack`) : void 0;
+        return mergeSpec({}, theme, themeWithDirection, themeWithStack);
     }
     transformSpec(spec, chartSpec, chartSpecInfo) {
         const result = super.transformSpec(spec, chartSpec, chartSpecInfo);

package/esm/series/base/base-series-transformer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/base/base-series-transformer.ts"],"names":[],"mappings":"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","file":"base-series-transformer.js","sourcesContent":["import { isObject } from '@visactor/vutils';\nimport type { IChartSpecInfo } from '../../chart/interface';\nimport type { ILabelSpec, TransformedLabelSpec } from '../../component/label';\nimport type { IBaseModelSpecTransformerResult } from '../../model/interface';\nimport { BaseModelSpecTransformer } from '../../model/base-model-transformer';\nimport type { ISeriesSpec } from '../../typings';\nimport { array, get, isArray, isValid, mergeSpec, transformSeriesThemeToMerge } from '../../util';\nimport type { SeriesMarkNameEnum } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { ISeries } from '../interface';\nimport { getDirectionFromSeriesSpec } from '../util/spec';\n\nexport class BaseSeriesSpecTransformer<T extends ISeriesSpec, K> extends BaseModelSpecTransformer<T, K> {\n  markLabelSpec: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>> = {};\n\n  getLabelSpec(markName: string) {\n    return this.markLabelSpec[markName];\n  }\n\n  setLabelSpec(markName: string, label: TransformedLabelSpec | TransformedLabelSpec[]) {\n    this.markLabelSpec[markName] = array(label);\n  }\n\n  addLabelSpec(markName: string, label: TransformedLabelSpec, head = false) {\n    if (!this.markLabelSpec[markName]) {\n      this.markLabelSpec[markName] = [];\n    }\n    if (head) {\n      // 排序靠前的 label 优先布局，尽可能避免碰撞隐藏\n      this.markLabelSpec[markName].unshift(label);\n    } else {\n      this.markLabelSpec[markName].push(label);\n    }\n  }\n\n  getTheme(spec: T, chartSpec: any): K {\n    const direction = getDirectionFromSeriesSpec(spec);\n    const chartTheme = this._option?.getTheme();\n    const { markByName, mark } = chartTheme;\n    const type = this._option.type;\n    const theme = transformSeriesThemeToMerge(get(chartTheme, `series.${type}`), type, mark, markByName);\n    const themeWithDirection = transformSeriesThemeToMerge(\n      get(chartTheme, `series.${type}_${direction}`),\n      `${type}_${direction}`,\n      mark,\n      markByName\n    );\n    return mergeSpec({}, theme, themeWithDirection);\n  }\n\n  /** 不建议重写该方法，最好重写对应子步骤 */\n  transformSpec(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): IBaseModelSpecTransformerResult<T, K> {\n    const result = super.transformSpec(spec, chartSpec, chartSpecInfo);\n    this._transformLabelSpec(result.spec);\n    return {\n      ...result,\n      markLabelSpec: this.markLabelSpec\n    };\n  }\n\n  protected _transformLabelSpec(spec: T) {\n    // empty\n  }\n\n  protected _addMarkLabelSpec<V extends ISeries = ISeries>(\n    spec: T,\n    markName: SeriesMarkNameEnum,\n    labelSpecKey: keyof T = 'label' as any,\n    styleHandlerName: keyof V = 'initLabelMarkStyle',\n    hasAnimation?: boolean,\n    head?: boolean\n  ): void {\n    if (!spec) {\n      return;\n    }\n    const labels = array<ILabelSpec>(spec[labelSpecKey]);\n    labels.forEach(labelSpec => {\n      if (labelSpec && labelSpec.visible) {\n        this.addLabelSpec(\n          markName,\n          {\n            animation: hasAnimation ?? spec.animation,\n            ...labelSpec,\n            getStyleHandler: (series: V) => (series[styleHandlerName] as any)?.bind(series)\n          } as TransformedLabelSpec,\n          head\n        );\n      }\n    });\n  }\n\n  protected _getDefaultSpecFromChart(chartSpec: any): any {\n    const spec = (super._getDefaultSpecFromChart(chartSpec) as any) ?? {};\n    const { outerRadius, innerRadius, direction } = chartSpec;\n    if (isValid(outerRadius)) {\n      spec.outerRadius = outerRadius;\n    }\n    if (isValid(innerRadius)) {\n      spec.innerRadius = innerRadius;\n    }\n\n    if (isValid(direction)) {\n      spec.direction = direction;\n    }\n\n    return Object.keys(spec).length > 0 ? spec : undefined;\n  }\n\n  protected _mergeThemeToSpec(spec: T, chartSpec: any): { spec: T; theme: K } {\n    const theme = this._theme;\n\n    if (this._shouldMergeThemeToSpec()) {\n      const specFromChart = this._getDefaultSpecFromChart(chartSpec);\n      // this._originalSpec + specFromChart + this._theme = this._spec\n      const merge = (originalSpec: any) => {\n        const result = mergeSpec({}, theme, specFromChart, originalSpec);\n        const labelTheme = (theme as any).label;\n        if (labelTheme && isObject(labelTheme) && isArray(result.label)) {\n          result.label = result.label.map((label: ILabelSpec) => mergeSpec({}, labelTheme, label));\n        }\n        return result;\n      };\n\n      if (isArray(spec)) {\n        return {\n          spec: spec.map(specItem => merge(specItem)) as unknown as T,\n          theme\n        };\n      }\n\n      return {\n        spec: merge(spec),\n        theme\n      };\n    }\n    return { spec, theme };\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/base/base-series-transformer.ts"],"names":[],"mappings":"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","file":"base-series-transformer.js","sourcesContent":["import { isObject } from '@visactor/vutils';\nimport type { IChartSpecInfo } from '../../chart/interface';\nimport type { ILabelSpec, TransformedLabelSpec } from '../../component/label';\nimport type { IBaseModelSpecTransformerResult } from '../../model/interface';\nimport { BaseModelSpecTransformer } from '../../model/base-model-transformer';\nimport type { ISeriesSpec } from '../../typings';\nimport { array, get, isArray, isValid, mergeSpec, transformSeriesThemeToMerge } from '../../util';\nimport type { SeriesMarkNameEnum } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { ISeries } from '../interface';\nimport { getDirectionFromSeriesSpec } from '../util/spec';\n\nexport class BaseSeriesSpecTransformer<T extends ISeriesSpec, K> extends BaseModelSpecTransformer<T, K> {\n  markLabelSpec: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>> = {};\n\n  getLabelSpec(markName: string) {\n    return this.markLabelSpec[markName];\n  }\n\n  setLabelSpec(markName: string, label: TransformedLabelSpec | TransformedLabelSpec[]) {\n    this.markLabelSpec[markName] = array(label);\n  }\n\n  addLabelSpec(markName: string, label: TransformedLabelSpec, head = false) {\n    if (!this.markLabelSpec[markName]) {\n      this.markLabelSpec[markName] = [];\n    }\n    if (head) {\n      // 排序靠前的 label 优先布局，尽可能避免碰撞隐藏\n      this.markLabelSpec[markName].unshift(label);\n    } else {\n      this.markLabelSpec[markName].push(label);\n    }\n  }\n\n  getTheme(spec: T, chartSpec: any): K {\n    const direction = getDirectionFromSeriesSpec(spec);\n    const chartTheme = this._option?.getTheme();\n    const { markByName, mark } = chartTheme;\n    const type = this._option.type;\n    // 基本主题\n    const theme = transformSeriesThemeToMerge(get(chartTheme, `series.${type}`), type, mark, markByName);\n    // 区分方向的主题\n    const themeWithDirection = get(chartTheme, `series.${type}_${direction}`);\n    // stack 状态下的主题\n    const stack = spec.stack ?? themeWithDirection?.stack ?? theme?.stack;\n    const themeWithStack = stack ? get(chartTheme, `series.${type}_stack`) : undefined;\n    return mergeSpec({}, theme, themeWithDirection, themeWithStack);\n  }\n\n  /** 不建议重写该方法，最好重写对应子步骤 */\n  transformSpec(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): IBaseModelSpecTransformerResult<T, K> {\n    const result = super.transformSpec(spec, chartSpec, chartSpecInfo);\n    this._transformLabelSpec(result.spec);\n    return {\n      ...result,\n      markLabelSpec: this.markLabelSpec\n    };\n  }\n\n  protected _transformLabelSpec(spec: T) {\n    // empty\n  }\n\n  protected _addMarkLabelSpec<V extends ISeries = ISeries>(\n    spec: T,\n    markName: SeriesMarkNameEnum,\n    labelSpecKey: keyof T = 'label' as any,\n    styleHandlerName: keyof V = 'initLabelMarkStyle',\n    hasAnimation?: boolean,\n    head?: boolean\n  ): void {\n    if (!spec) {\n      return;\n    }\n    const labels = array<ILabelSpec>(spec[labelSpecKey]);\n    labels.forEach(labelSpec => {\n      if (labelSpec && labelSpec.visible) {\n        this.addLabelSpec(\n          markName,\n          {\n            animation: hasAnimation ?? spec.animation,\n            ...labelSpec,\n            getStyleHandler: (series: V) => (series[styleHandlerName] as any)?.bind(series)\n          } as TransformedLabelSpec,\n          head\n        );\n      }\n    });\n  }\n\n  protected _getDefaultSpecFromChart(chartSpec: any): any {\n    const spec = (super._getDefaultSpecFromChart(chartSpec) as any) ?? {};\n    const { outerRadius, innerRadius, direction } = chartSpec;\n    if (isValid(outerRadius)) {\n      spec.outerRadius = outerRadius;\n    }\n    if (isValid(innerRadius)) {\n      spec.innerRadius = innerRadius;\n    }\n\n    if (isValid(direction)) {\n      spec.direction = direction;\n    }\n\n    return Object.keys(spec).length > 0 ? spec : undefined;\n  }\n\n  protected _mergeThemeToSpec(spec: T, chartSpec: any): { spec: T; theme: K } {\n    const theme = this._theme;\n\n    if (this._shouldMergeThemeToSpec()) {\n      const specFromChart = this._getDefaultSpecFromChart(chartSpec);\n      // this._originalSpec + specFromChart + this._theme = this._spec\n      const merge = (originalSpec: any) => {\n        const result = mergeSpec({}, theme, specFromChart, originalSpec);\n        const labelTheme = (theme as any).label;\n        if (labelTheme && isObject(labelTheme) && isArray(result.label)) {\n          result.label = result.label.map((label: ILabelSpec) => mergeSpec({}, labelTheme, label));\n        }\n        return result;\n      };\n\n      if (isArray(spec)) {\n        return {\n          spec: spec.map(specItem => merge(specItem)) as unknown as T,\n          theme\n        };\n      }\n\n      return {\n        spec: merge(spec),\n        theme\n      };\n    }\n    return { spec, theme };\n  }\n}\n"]}

package/esm/series/base/base-series.js

@@ -372,7 +372,8 @@ export class BaseSeries extends BaseModel {
             dataView: !1,
             customShape: null == spec ? void 0 : spec.customShape,
             componentType: spec.componentType,
-            depend: options.depend
+            depend: options.depend,
+            key: spec.dataKey
         });
         if (mark) {
             if (options.hasAnimation) {