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

package/esm/component/tooltip/handler/dom/util.d.ts

@@ -0,0 +1,5 @@
+import type { Maybe } from '@visactor/vutils';
+import type { ITooltipStyle } from '../interface';
+import type { IDomTooltipStyle } from './interface';
+import type { TooltipAttributes } from '@visactor/vrender-components';
+export declare function getDomStyles(style: ITooltipStyle, attributeCache?: Maybe<TooltipAttributes>): IDomTooltipStyle;

package/esm/component/tooltip/handler/dom/util.js

@@ -0,0 +1,71 @@
+import { isValid, merge, isArray } from "../../../../util";
+
+const DEFAULT_SHAPE_SPACING = 8, DEFAULT_KEY_SPACING = 26, DEFAULT_VALUE_SPACING = 0, getPixelPropertyStr = (num, defaultStr) => isValid(num) ? isArray(num) ? num.map((n => `${n}px`)).join(" ") : `${num}px` : null != defaultStr ? defaultStr : "initial";
+
+export function getDomStyles(style, attributeCache) {
+    var _a, _b, _c, _d, _e;
+    const {panel: {fill: fillColor, shadow: shadow, shadowBlur: shadowBlur, shadowColor: shadowColor, shadowOffsetX: shadowOffsetX, shadowOffsetY: shadowOffsetY, shadowSpread: shadowSpread, cornerRadius: cornerRadius, stroke: strokeColor, lineWidth: lineWidth}, padding: padding, key: key, value: value, title: title, shape: shape, maxWidth: maxWidth, minWidth: minWidth, enterable: enterable, spaceRow: spaceRow, transitionDuration: transitionDuration} = style, backgroundColor = fillColor, styles = {
+        panel: {
+            width: getPixelPropertyStr(null === (_a = null == attributeCache ? void 0 : attributeCache.panel) || void 0 === _a ? void 0 : _a.width),
+            height: getPixelPropertyStr(null === (_b = null == attributeCache ? void 0 : attributeCache.panel) || void 0 === _b ? void 0 : _b.height),
+            paddingBottom: getPixelPropertyStr(padding.bottom),
+            paddingLeft: getPixelPropertyStr(padding.left),
+            paddingRight: getPixelPropertyStr(padding.right),
+            paddingTop: getPixelPropertyStr(padding.top),
+            borderColor: strokeColor,
+            borderWidth: getPixelPropertyStr(lineWidth),
+            borderRadius: getPixelPropertyStr(cornerRadius),
+            backgroundColor: backgroundColor ? `${backgroundColor}` : "transparent",
+            boxShadow: shadow ? `${shadowOffsetX}px ${shadowOffsetY}px ${shadowBlur}px ${shadowSpread}px ${shadowColor}` : "initial",
+            maxWidth: getPixelPropertyStr(maxWidth),
+            minWidth: getPixelPropertyStr(minWidth),
+            pointerEvents: enterable ? "auto" : "none",
+            transitionDuration: transitionDuration ? `${transitionDuration}ms` : "initial",
+            transitionProperty: transitionDuration ? "transform" : "initial",
+            transitionTimingFunction: transitionDuration ? "ease-out" : "initial"
+        },
+        title: getLabelStyle(title),
+        content: {},
+        shapeColumn: {
+            item: getShapeStyle(shape),
+            width: getPixelPropertyStr(shape.size),
+            marginRight: getPixelPropertyStr(null !== (_c = shape.spacing) && void 0 !== _c ? _c : 8)
+        },
+        keyColumn: {
+            item: getLabelStyle(key),
+            width: getPixelPropertyStr(null == attributeCache ? void 0 : attributeCache.keyWidth),
+            marginRight: getPixelPropertyStr(null !== (_d = key.spacing) && void 0 !== _d ? _d : 26)
+        },
+        valueColumn: {
+            item: getLabelStyle(value),
+            width: getPixelPropertyStr(null == attributeCache ? void 0 : attributeCache.valueWidth),
+            marginRight: getPixelPropertyStr(null !== (_e = value.spacing) && void 0 !== _e ? _e : 0)
+        },
+        spaceRow: getPixelPropertyStr(spaceRow)
+    };
+    if (isValid(spaceRow)) {
+        const gapUnit = spaceRow / 2;
+        [ styles.shapeColumn.item, styles.keyColumn.item, styles.valueColumn.item ].forEach((obj => {
+            obj.marginTop = getPixelPropertyStr(gapUnit), obj.marginBottom = obj.marginTop;
+        })), styles.content.marginTop = getPixelPropertyStr(-gapUnit), styles.content.marginBottom = styles.content.marginTop;
+    } else [ styles.content, styles.shapeColumn.item, styles.keyColumn.item, styles.valueColumn.item ].forEach((obj => {
+        obj.marginTop = "initial", obj.marginBottom = "initial";
+    }));
+    return styles;
+}
+
+function getLabelStyle(labelStyle, defaultStyle) {
+    if (!labelStyle) return;
+    const {fontFamily: labelFont, fontSize: labelFontSize, fill: labelColor, textAlign: textAlign, lineHeight: lineHeight, fontWeight: fontWeight} = merge({}, defaultStyle, labelStyle), styleObj = {};
+    return styleObj.fontFamily = labelFont, styleObj.fontSize = getPixelPropertyStr(labelFontSize), 
+    styleObj.color = labelColor, styleObj.textAlign = textAlign, styleObj.lineHeight = getPixelPropertyStr(lineHeight), 
+    styleObj.fontWeight = fontWeight, styleObj;
+}
+
+function getShapeStyle(shapeStyle, defaultStyle) {
+    if (!shapeStyle) return;
+    const {size: size} = merge({}, defaultStyle, shapeStyle), styleObj = {};
+    return styleObj.width = getPixelPropertyStr(size), styleObj.height = styleObj.width, 
+    styleObj;
+}
+//# sourceMappingURL=util.js.map

package/esm/component/tooltip/handler/dom/util.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/tooltip/handler/dom/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import type { Maybe } from '@visactor/vutils';\nimport type { FontWeight, TextAlign } from '../../../../typings';\nimport { isValid, merge, isArray } from '../../../../util';\nimport type { ITooltipTheme } from '../../interface';\nimport type { ITextStyle, ITooltipStyle } from '../interface';\nimport type { ILabelStyle, IMargin, IShapeStyle, IDomTooltipStyle } from './interface';\nimport type { TooltipAttributes } from '@visactor/vrender-components';\n\nconst DEFAULT_SHAPE_SPACING = 8;\nconst DEFAULT_KEY_SPACING = 26;\nconst DEFAULT_VALUE_SPACING = 0;\n\nconst getPixelPropertyStr = (num?: number | number[], defaultStr?: string) => {\n  if (isValid(num)) {\n    if (isArray(num)) {\n      return num.map(n => `${n}px`).join(' ');\n    }\n    return `${num}px`;\n  }\n  return defaultStr ?? 'initial';\n};\n\nexport function getDomStyles(style: ITooltipStyle, attributeCache?: Maybe<TooltipAttributes>): IDomTooltipStyle {\n  const {\n    panel: {\n      fill: fillColor,\n      shadow,\n      shadowBlur,\n      shadowColor,\n      shadowOffsetX,\n      shadowOffsetY,\n      shadowSpread,\n      cornerRadius,\n      stroke: strokeColor,\n      lineWidth\n    },\n    padding,\n    key,\n    value,\n    title,\n    shape,\n    maxWidth,\n    minWidth,\n    enterable,\n    spaceRow,\n    transitionDuration\n  } = style;\n\n  const backgroundColor = fillColor as string;\n\n  const styles = {\n    panel: {\n      width: getPixelPropertyStr(attributeCache?.panel?.width),\n      height: getPixelPropertyStr(attributeCache?.panel?.height),\n      paddingBottom: getPixelPropertyStr(padding.bottom),\n      paddingLeft: getPixelPropertyStr(padding.left),\n      paddingRight: getPixelPropertyStr(padding.right),\n      paddingTop: getPixelPropertyStr(padding.top),\n      borderColor: strokeColor,\n      borderWidth: getPixelPropertyStr(lineWidth),\n      borderRadius: getPixelPropertyStr(cornerRadius),\n      backgroundColor: backgroundColor ? `${backgroundColor}` : 'transparent',\n      boxShadow: shadow\n        ? `${shadowOffsetX}px ${shadowOffsetY}px ${shadowBlur}px ${shadowSpread}px ${shadowColor}`\n        : 'initial',\n      maxWidth: getPixelPropertyStr(maxWidth),\n      minWidth: getPixelPropertyStr(minWidth),\n      pointerEvents: enterable ? 'auto' : 'none',\n      transitionDuration: transitionDuration ? `${transitionDuration}ms` : 'initial',\n      transitionProperty: transitionDuration ? 'transform' : 'initial',\n      transitionTimingFunction: transitionDuration ? 'ease-out' : 'initial'\n    },\n    title: getLabelStyle(title),\n    content: {},\n    shapeColumn: {\n      item: getShapeStyle(shape),\n      width: getPixelPropertyStr(shape.size),\n      marginRight: getPixelPropertyStr(shape.spacing ?? DEFAULT_SHAPE_SPACING)\n    },\n    keyColumn: {\n      item: getLabelStyle(key),\n      width: getPixelPropertyStr(attributeCache?.keyWidth),\n      marginRight: getPixelPropertyStr(key.spacing ?? DEFAULT_KEY_SPACING)\n    },\n    valueColumn: {\n      item: getLabelStyle(value),\n      width: getPixelPropertyStr(attributeCache?.valueWidth),\n      marginRight: getPixelPropertyStr(value.spacing ?? DEFAULT_VALUE_SPACING)\n    },\n    spaceRow: getPixelPropertyStr(spaceRow)\n  } as IDomTooltipStyle;\n\n  if (isValid(spaceRow)) {\n    const gapUnit = spaceRow / 2;\n    ([styles.shapeColumn.item, styles.keyColumn.item, styles.valueColumn.item] as IMargin[]).forEach(obj => {\n      obj.marginTop = getPixelPropertyStr(gapUnit);\n      obj.marginBottom = obj.marginTop;\n    });\n    styles.content.marginTop = getPixelPropertyStr(-gapUnit);\n    styles.content.marginBottom = styles.content.marginTop;\n  } else {\n    ([styles.content, styles.shapeColumn.item, styles.keyColumn.item, styles.valueColumn.item] as IMargin[]).forEach(\n      obj => {\n        obj.marginTop = 'initial';\n        obj.marginBottom = 'initial';\n      }\n    );\n  }\n  return styles;\n}\n\nfunction getLabelStyle(labelStyle?: ITextStyle, defaultStyle?: Partial<ITextStyle>): ILabelStyle | undefined {\n  if (!labelStyle) {\n    return undefined;\n  }\n  const {\n    fontFamily: labelFont,\n    fontSize: labelFontSize,\n    fill: labelColor,\n    textAlign,\n    lineHeight,\n    fontWeight\n  } = merge({}, defaultStyle, labelStyle) as ITextStyle;\n  const styleObj: ILabelStyle = {};\n\n  styleObj.fontFamily = labelFont;\n  styleObj.fontSize = getPixelPropertyStr(labelFontSize);\n  styleObj.color = labelColor as string;\n  styleObj.textAlign = textAlign as TextAlign;\n  styleObj.lineHeight = getPixelPropertyStr(lineHeight);\n  styleObj.fontWeight = fontWeight as FontWeight;\n  return styleObj;\n}\n\nfunction getShapeStyle(\n  shapeStyle?: ITooltipTheme['shape'],\n  defaultStyle?: Partial<ITooltipTheme['shape']>\n): IShapeStyle | undefined {\n  if (!shapeStyle) {\n    return undefined;\n  }\n  const { size } = merge({}, defaultStyle, shapeStyle);\n  const styleObj: IShapeStyle = {};\n\n  styleObj.width = getPixelPropertyStr(size);\n  styleObj.height = styleObj.width;\n  return styleObj;\n}\n"]}

package/esm/component/tooltip/handler/interface/index.d.ts

@@ -1,2 +1 @@
 export * from './style';
-export * from './cache';

package/esm/component/tooltip/handler/interface/index.js

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

package/esm/component/tooltip/handler/interface/index.js.map

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

package/esm/component/tooltip/handler/utils/attribute.js

@@ -40,25 +40,26 @@ export const getTooltipAttributes = (actualTooltip, style) => {
             attribute.title.shape = titleShapeAttrs, maxWidth += shapeStyle.size + shapeStyle.spacing, 
             titleMaxHeight = Math.max(shapeStyle.size, titleMaxHeight);
         }
-        attribute.title.width = maxWidth, attribute.title.height = titleMaxHeight, containerHeight += titleMaxHeight + spaceRow;
+        attribute.title.width = maxWidth, attribute.title.height = titleMaxHeight, containerHeight += titleMaxHeight;
     }
     if (content.length) {
         const filteredContent = content.filter((item => (item.key || item.value) && !1 !== item.visible));
         if (filteredContent.length) {
+            titleVisible && (containerHeight += spaceRow);
             let hasContentShape = !1;
-            const keyWidths = [], valueWidths = [], keyTextMeasure = initTextMeasure(keyStyle), valueTextMeasure = initTextMeasure(valueStyle);
+            const keyWidths = [], adaptiveKeyWidths = [], valueWidths = [], keyTextMeasure = initTextMeasure(keyStyle), valueTextMeasure = initTextMeasure(valueStyle);
             attribute.content = filteredContent.map(((item, i) => {
                 const itemAttrs = {
                     height: 0,
                     spaceRow: spaceRow
                 };
                 let itemHeight = 0;
-                const {hasShape: hasShape, key: key, shapeColor: shapeColor, shapeHollow: shapeHollow, shapeType: shapeType = "", value: value} = item;
+                const {hasShape: hasShape, key: key, shapeColor: shapeColor, shapeHollow: shapeHollow, shapeType: shapeType = "", value: value, isKeyAdaptive: isKeyAdaptive} = item;
                 if (isValid(key)) {
                     const {width: width, height: height} = keyTextMeasure.quickMeasure(key);
                     itemAttrs.key = {
                         text: key
-                    }, keyWidths.push(width), itemHeight = Math.max(itemHeight, height);
+                    }, isKeyAdaptive ? adaptiveKeyWidths.push(width) : keyWidths.push(width), itemHeight = Math.max(itemHeight, height);
                 }
                 if (isValid(value)) {
                     const {width: width, height: height} = valueTextMeasure.quickMeasure(value);
@@ -69,16 +70,19 @@ export const getTooltipAttributes = (actualTooltip, style) => {
                 if (hasShape && builtinSymbolsMap[shapeType]) {
                     hasContentShape = !0;
                     const shape = {
+                        visible: !0,
                         symbolType: shapeType
                     };
                     shapeHollow ? shape.stroke = shapeColor : shape.fill = shapeColor, itemHeight = Math.max(shapeStyle.size, itemHeight), 
                     itemAttrs.shape = shape;
-                }
+                } else itemAttrs.shape = {
+                    visible: !1
+                };
                 return itemAttrs.height = itemHeight, containerHeight += itemHeight, i < filteredContent.length - 1 && (containerHeight += spaceRow), 
                 itemAttrs;
             }));
-            const maxKeyWidth = keyWidths.length ? Math.max(...keyWidths) : 0, maxValueWidth = valueWidths.length ? Math.max(...valueWidths) : 0;
-            maxWidth = Math.max(maxKeyWidth + maxValueWidth + keyStyle.spacing + valueStyle.spacing + (hasContentShape ? shapeStyle.size + shapeStyle.spacing : 0), maxWidth), 
+            const maxKeyWidth = keyWidths.length ? Math.max(...keyWidths) : 0, maxAdaptiveKeyWidth = adaptiveKeyWidths.length ? Math.max(...adaptiveKeyWidths) : 0, maxValueWidth = valueWidths.length ? Math.max(...valueWidths) : 0, shapeWidth = hasContentShape ? shapeStyle.size + shapeStyle.spacing : 0;
+            maxWidth = Math.max(maxKeyWidth + maxValueWidth + keyStyle.spacing + valueStyle.spacing + shapeWidth, maxAdaptiveKeyWidth + shapeWidth, maxWidth), 
             attribute.hasContentShape = hasContentShape, attribute.keyWidth = maxKeyWidth, attribute.valueWidth = maxValueWidth;
         }
     }

package/esm/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/esm/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/esm/component/tooltip/handler/utils/common.js

@@ -1,10 +1,33 @@
-import { isFunction, isObject, isString, isNil } from "../../../../util";
+import { isFunction, isObject, isString, isNil, isArray, isValid } from "../../../../util";
 
 export function escapeHTML(value) {
     return String(value).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\(/g, "&#40;");
 }
 
-export const getTooltipValue = (field, datum) => isNil(field) ? null : isFunction(field) ? field(datum) : field.toString();
+export const getTooltipContentValue = (field, datum, params) => isNil(field) ? field : isFunction(field) ? field(datum, params) : field;
+
+export const getTooltipPatternValue = (field, data, params) => {
+    if (isNil(field)) return field;
+    if (isArray(field)) {
+        const result = [];
+        return field.forEach((item => {
+            if (isFunction(item)) {
+                const value = item(data, params);
+                isValid(value) && result.push(value);
+            } else result.push(item);
+        })), result;
+    }
+    return isFunction(field) ? field(data, params) : field;
+};
+
+export 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;
+}
 
 export function pickFirstValidValue(isValid, ...elements) {
     for (const ele of elements) if (isValid(ele)) return ele;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAezE,MAAM,UAAU,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;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,KAAyD,EACzD,KAAW,EACS,EAAE;IACtB,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;QACrB,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC;KACrB;IACD,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,UAAU,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;AAGD,MAAM,UAAU,oBAAoB,CAAC,KAAU,EAAE,eAAuB,MAAM;IAC5E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,YAAY,CAAC;KACrB;IACD,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,QAAQ,CAAC,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","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/esm/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/esm/component/tooltip/handler/utils/compose.js

@@ -1,71 +1,80 @@
-import { isValid, isNil } from "../../../../util";
+import { isValid, isNil, array } from "../../../../util";
 
-import { getTooltipValue } from "./common";
+import { getFirstDatumFromTooltipData, getTooltipContentValue, getTooltipPatternValue } from "./common";
 
 import { getTooltipActualActiveType } from "../../utils";
 
-export const getShowContent = (pattern, data, event) => {
-    var _a, _b, _c, _d, _e, _f, _g;
-    if (!data || "mouseout" === event.type) return null;
-    const tooltipContent = {
+import { TOOLTIP_MAX_LINE_COUNT, TOOLTIP_OTHERS_LINE } from "../constants";
+
+export const 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 = getTooltipPatternValue(pattern.title, data, params), patternContent = array(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, isValid(pattern.title) && isValid(pattern.title.value)) {
-            let datum;
+    }, {maxLineCount: maxLineCount = TOOLTIP_MAX_LINE_COUNT} = pattern, patternTitleVisible = !1 !== getTooltipContentValue(null == patternTitle ? void 0 : patternTitle.visible, data, params);
+    if (patternTitle && patternTitleVisible) {
+        if (tooltipContent.title.hasShape = patternTitle.hasShape, 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 = getTooltipValue(null === (_f = pattern.title) || void 0 === _f ? void 0 : _f.value, datum);
+            const datum = getFirstDatumFromTooltipData(data);
+            tooltipContent.title.value = 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 = 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 (!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 => isNil(c.seriesId) || c.seriesId === series.id))) && void 0 !== _c ? _c : [];
-        datum.forEach((datumItem => contentPatterns.forEach((c => {
-            const oneLineData = getOneLineData(datumItem, c);
-            !1 !== oneLineData.visible && tooltipContent.content.push(oneLineData);
-        }))));
-    })))), tooltipContent.title && (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType ? (isNil(tooltipContent.title.shapeType) && (tooltipContent.title.shapeType = tooltipContent.content[0].shapeType), 
+    if ("mark" === pattern.activeType) for (const content of null != patternContent ? patternContent : []) {
+        const oneLineData = 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), 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 (!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 => isNil(c.seriesId) || c.seriesId === series.id))) && void 0 !== _e ? _e : [];
+            for (const datumItem of datum) {
+                for (const linePattern of contentPatterns) {
+                    const oneLineData = getOneLineData(datumItem, linePattern, params);
+                    if (!1 !== oneLineData.visible) {
+                        if (tooltipContent.content.length === maxLineCount - 1) {
+                            tooltipContent.content.push(Object.assign(Object.assign({}, oneLineData), 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 ? (isNil(tooltipContent.title.shapeType) && (tooltipContent.title.shapeType = tooltipContent.content[0].shapeType), 
     isNil(tooltipContent.title.shapeColor) && (tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor)) : tooltipContent.title.hasShape = !1), 
     tooltipContent;
 };
 
-export const getOneLineData = (datum, config) => {
-    const key = getTooltipValue(config.key, datum), value = getTooltipValue(config.value, datum), visible = isValid(key) || isValid(value), shapeType = getTooltipValue(config.shapeType, datum), shapeColor = getTooltipValue(config.shapeColor, datum);
+export const getOneLineData = (datum, config, params) => {
+    const key = getTooltipContentValue(config.key, datum, params), value = getTooltipContentValue(config.value, datum, params), visible = !1 !== getTooltipContentValue(config.visible, datum, params) && (isValid(key) || isValid(value)), isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params), shapeType = getTooltipContentValue(config.shapeType, datum, params), shapeColor = getTooltipContentValue(config.shapeColor, datum, params);
     return {
         key: key,
         value: value,
         visible: visible,
+        isKeyAdaptive: isKeyAdaptive,
         hasShape: config.hasShape,
         shapeType: shapeType,
         shapeHollow: config.shapeHollow,

package/esm/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/esm/component/tooltip/handler/utils/get-spec.js

@@ -1,33 +1,65 @@
-import { cloneDeep, isValid, isNil, merge, array } from "../../../../util";
+import { cloneDeep, isValid, merge, array, isFunction, isNil } from "../../../../util";
 
 import { makeDefaultPattern } from "./pattern";
 
+import { getTooltipActualActiveType } from "../../utils";
+
 export const 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;
+    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 (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType) ? finalSpec.visible = !1 !== seriesSpec.visible && !1 !== (null === (_c = seriesSpec.mark) || void 0 === _c ? void 0 : _c.visible) && (isNil(seriesSpec.activeType) || (null === (_e = (_d = array(seriesSpec.activeType)).includes) || void 0 === _e ? void 0 : _e.call(_d, "mark"))) : isValid(globalSpec.visible) || isValid(globalSpec.activeType) ? finalSpec.visible = !1 !== globalSpec.visible && !1 !== (null === (_f = globalSpec.mark) || void 0 === _f ? void 0 : _f.visible) && (isNil(globalSpec.activeType) || (null === (_h = (_g = 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 = makeDefaultPattern(series, "mark"), userPattern = merge({}, cloneDeep(globalSpec.mark), cloneDeep(seriesSpec.mark));
-    } else if ("dimension" === activeType && dimensionInfo) {
-        if (isValid(globalSpec.visible) || isValid(globalSpec.activeType) ? finalSpec.visible = !1 !== globalSpec.visible && !1 !== (null === (_m = globalSpec.dimension) || void 0 === _m ? void 0 : _m.visible) && (isNil(globalSpec.activeType) || (null === (_p = (_o = 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 ? makeDefaultPattern(firstSeries, "dimension", dimensionInfo) : {}, 
-        userPattern = null !== (_u = cloneDeep(globalSpec.dimension)) && void 0 !== _u ? _u : {};
+        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, 
+        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 = makeDefaultPattern(series, "mark")) && void 0 !== _f ? _f : {}, 
+        userPattern = merge({}, cloneDeep(globalSpec.mark), 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(isValid))), []);
+        if (seriesList.every((series => {
+            var _a;
+            return !getTooltipActualActiveType(null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec).includes("dimension");
+        })) ? finalSpec.visible = !1 : isValid(globalSpec.visible) || isValid(globalSpec.activeType) ? finalSpec.visible = 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 = makeDefaultPattern(series, "dimension", mockDimensionInfo);
+            pattern && patternList.push(pattern);
+        }));
+        const defaultPatternContent = [];
+        patternList.forEach((({content: content}) => {
+            isFunction(content) ? defaultPatternContent.push(content) : defaultPatternContent.push(...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 isValid(null == spec ? void 0 : spec.dimension) && getTooltipActualActiveType(spec).includes("dimension");
+        })).map((series => series.tooltipHelper.spec.dimension));
+        if (seriesPatternList.length) {
+            let seriesPatternContent = [];
+            seriesPatternList.every((({content: content}) => isNil(content))) ? seriesPatternContent = void 0 : seriesPatternList.forEach((({content: content}) => {
+                isNil(content) || (isFunction(content) ? null == seriesPatternContent || seriesPatternContent.push(content) : null == seriesPatternContent || seriesPatternContent.push(...array(content)));
+            })), seriesDimensionPattern = Object.assign(Object.assign({}, seriesPatternList[0]), {
+                content: seriesPatternContent
+            });
+        }
+        userPattern = merge({}, 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
     };
-    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);
+    isValid(userPattern.title) ? 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 {
@@ -35,11 +67,16 @@ export const getTooltipSpecForShow = (activeType, globalSpec, series, dimensionI
             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 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 = array(defaultPattern.content);
+    if (isValid(userPattern.content)) {
+        if (!isFunction(userPattern.content)) {
+            const userPatternContent = 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;
 };