@visactor/vchart 1.2.0-beta.4 → 1.2.0-beta.6

package/esm/data/transforms/map.js

@@ -1,7 +1,9 @@
-import { DEFAULT_DATA_INDEX } from "../../constant";
+import { DEFAULT_DATA_INDEX, PREFIX } from "../../constant";
+
+export const DEFAULT_MAP_LOOK_UP_KEY = `${PREFIX}_MAP_LOOK_UP_KEY`;
 
 export const map = (data, opt) => (data.features && data.features.forEach(((f, index) => {
     var _a, _b;
-    f[DEFAULT_DATA_INDEX] = index, opt.nameMap ? f.name = opt.nameMap[null === (_a = f.properties) || void 0 === _a ? void 0 : _a[opt.nameProperty]] : f.name = null === (_b = f.properties) || void 0 === _b ? void 0 : _b[opt.nameProperty];
+    f[DEFAULT_DATA_INDEX] = index, opt.nameMap ? f[DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[null === (_a = f.properties) || void 0 === _a ? void 0 : _a[opt.nameProperty]] : f[DEFAULT_MAP_LOOK_UP_KEY] = null === (_b = f.properties) || void 0 === _b ? void 0 : _b[opt.nameProperty];
 })), data.features);
 //# sourceMappingURL=map.js.map

package/esm/data/transforms/map.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAQpD,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAmB,EAAE,GAAY,EAAE,EAAE;IACvD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;;YAC9C,CAAC,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;YAC9B,IAAI,GAAG,CAAC,OAAO,EAAE;gBACf,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;aACxD;iBAAM;gBACL,CAAC,CAAC,IAAI,GAAG,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC,CAAC","file":"map.js","sourcesContent":["import { DEFAULT_DATA_INDEX } from '../../constant';\nimport type { GeoSourceType } from '../../typings/geo';\n\nexport interface IMapOpt {\n  nameMap: Record<string, string>;\n  nameProperty: string;\n}\n\nexport const map = (data: GeoSourceType, opt: IMapOpt) => {\n  if (data.features) {\n    data.features.forEach((f: any, index: number) => {\n      f[DEFAULT_DATA_INDEX] = index;\n      if (opt.nameMap) {\n        f.name = opt.nameMap[f.properties?.[opt.nameProperty]];\n      } else {\n        f.name = f.properties?.[opt.nameProperty];\n      }\n    });\n  }\n  return data.features;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAQ5D,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,MAAM,kBAAkB,CAAC;AAEnE,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAmB,EAAE,GAAY,EAAE,EAAE;IACvD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;;YAC9C,CAAC,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;YAC9B,IAAI,GAAG,CAAC,OAAO,EAAE;gBACf,CAAC,CAAC,uBAAuB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;aAC5E;iBAAM;gBACL,CAAC,CAAC,uBAAuB,CAAC,GAAG,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC,CAAC","file":"map.js","sourcesContent":["import { DEFAULT_DATA_INDEX, PREFIX } from '../../constant';\nimport type { GeoSourceType } from '../../typings/geo';\n\nexport interface IMapOpt {\n  nameMap: Record<string, string>;\n  nameProperty: string;\n}\n\nexport const DEFAULT_MAP_LOOK_UP_KEY = `${PREFIX}_MAP_LOOK_UP_KEY`;\n\nexport const map = (data: GeoSourceType, opt: IMapOpt) => {\n  if (data.features) {\n    data.features.forEach((f: any, index: number) => {\n      f[DEFAULT_DATA_INDEX] = index;\n      if (opt.nameMap) {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[f.properties?.[opt.nameProperty]];\n      } else {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = f.properties?.[opt.nameProperty];\n      }\n    });\n  }\n  return data.features;\n};\n"]}

package/esm/data/transforms/tick-data/continuous.js

@@ -8,6 +8,8 @@ import { convertDomainToTickData, getCartesianLabelBounds, hasOverlap, intersect
 
 export const continuousTicks = (scale, op) => {
     if (!isContinuous(scale.type)) return convertDomainToTickData(scale.domain(), op);
+    const range = scale.range();
+    if (Math.abs(range[range.length - 1] - range[0]) < 2) return convertDomainToTickData([ scale.domain()[0] ], op);
     const {tickCount: tickCount, forceTickCount: forceTickCount, tickStep: tickStep} = op;
     let scaleTicks;
     if (scaleTicks = isValid(tickStep) ? scale.stepTicks(tickStep) : isValid(forceTickCount) ? scale.forceTicks(forceTickCount) : scale.ticks(null != tickCount ? tickCount : DEFAULT_CONTINUOUS_TICK_COUNT), 

package/esm/data/transforms/tick-data/continuous.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/tick-data/continuous.ts"],"names":[],"mappings":"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","file":"continuous.js","sourcesContent":["import type { LinearScale, ContinuousScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { isValid, peek } from '../../../util';\nimport { DEFAULT_CONTINUOUS_TICK_COUNT } from './config';\nimport type { ICartesianTickDataOpt, ITickData, ITickDataOpt } from './interface';\nimport type { ILabelItem } from './util';\n// eslint-disable-next-line no-duplicate-imports\nimport { convertDomainToTickData, getCartesianLabelBounds, hasOverlap, intersect } from './util';\n\n/**\n * 对于连续轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出LinearScale的ticks()、forceTicks()、stepTicks()结果；\n * - 默认输出tickCount为10的ticks()结果。\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const continuousTicks = (scale: ContinuousScale, op: ITickDataOpt): ITickData[] => {\n  if (!isContinuous(scale.type)) {\n    return convertDomainToTickData(scale.domain(), op);\n  }\n  const { tickCount, forceTickCount, tickStep } = op;\n\n  let scaleTicks: number[];\n  if (isValid(tickStep)) {\n    scaleTicks = (scale as LinearScale).stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = (scale as LinearScale).forceTicks(forceTickCount);\n  } else {\n    scaleTicks = (scale as LinearScale).ticks(tickCount ?? DEFAULT_CONTINUOUS_TICK_COUNT);\n  }\n\n  if (op.sampling) {\n    // 判断重叠\n    if (op.coordinateType === 'cartesian' || (op.coordinateType === 'polar' && op.axisOrientType === 'radius')) {\n      const { labelGap = 4, labelFlush } = op as ICartesianTickDataOpt;\n      let items = getCartesianLabelBounds(scale, scaleTicks, op as ICartesianTickDataOpt).map(\n        (bounds, i) =>\n          ({\n            AABBBounds: bounds,\n            value: scaleTicks[i]\n          } as ILabelItem<number>)\n      );\n      while (items.length >= 3 && hasOverlap(items, labelGap)) {\n        items = methods.parity(items);\n      }\n      const ticks = items.map(item => item.value);\n\n      if (ticks.length < 3 && labelFlush) {\n        if (ticks.length > 1) {\n          ticks.pop();\n        }\n        if (peek(ticks) !== peek(scaleTicks)) {\n          ticks.push(peek(scaleTicks));\n        }\n      }\n\n      scaleTicks = ticks;\n    }\n  }\n\n  return convertDomainToTickData(scaleTicks, op);\n};\n\nconst methods = {\n  parity: function <T>(items: ILabelItem<T>[]) {\n    return items.filter((item, i) => i % 2 === 0);\n  },\n  greedy: function <T>(items: ILabelItem<T>[], sep: number) {\n    let a: ILabelItem<T>;\n    return items.filter((b, i) => {\n      if (!i || !intersect(a.AABBBounds, b.AABBBounds, sep)) {\n        a = b;\n        return true;\n      }\n      return false;\n    });\n  }\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/tick-data/continuous.ts"],"names":[],"mappings":"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","file":"continuous.js","sourcesContent":["import type { LinearScale, ContinuousScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { isValid, peek } from '../../../util';\nimport { DEFAULT_CONTINUOUS_TICK_COUNT } from './config';\nimport type { ICartesianTickDataOpt, ITickData, ITickDataOpt } from './interface';\nimport type { ILabelItem } from './util';\n// eslint-disable-next-line no-duplicate-imports\nimport { convertDomainToTickData, getCartesianLabelBounds, hasOverlap, intersect } from './util';\n\n/**\n * 对于连续轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出LinearScale的ticks()、forceTicks()、stepTicks()结果；\n * - 默认输出tickCount为10的ticks()结果。\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const continuousTicks = (scale: ContinuousScale, op: ITickDataOpt): ITickData[] => {\n  if (!isContinuous(scale.type)) {\n    return convertDomainToTickData(scale.domain(), op);\n  }\n  // if range is so small\n  const range = scale.range();\n  const rangeSize = Math.abs(range[range.length - 1] - range[0]);\n  if (rangeSize < 2) {\n    return convertDomainToTickData([scale.domain()[0]], op);\n  }\n\n  const { tickCount, forceTickCount, tickStep } = op;\n\n  let scaleTicks: number[];\n  if (isValid(tickStep)) {\n    scaleTicks = (scale as LinearScale).stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = (scale as LinearScale).forceTicks(forceTickCount);\n  } else {\n    scaleTicks = (scale as LinearScale).ticks(tickCount ?? DEFAULT_CONTINUOUS_TICK_COUNT);\n  }\n\n  if (op.sampling) {\n    // 判断重叠\n    if (op.coordinateType === 'cartesian' || (op.coordinateType === 'polar' && op.axisOrientType === 'radius')) {\n      const { labelGap = 4, labelFlush } = op as ICartesianTickDataOpt;\n      let items = getCartesianLabelBounds(scale, scaleTicks, op as ICartesianTickDataOpt).map(\n        (bounds, i) =>\n          ({\n            AABBBounds: bounds,\n            value: scaleTicks[i]\n          } as ILabelItem<number>)\n      );\n      while (items.length >= 3 && hasOverlap(items, labelGap)) {\n        items = methods.parity(items);\n      }\n      const ticks = items.map(item => item.value);\n\n      if (ticks.length < 3 && labelFlush) {\n        if (ticks.length > 1) {\n          ticks.pop();\n        }\n        if (peek(ticks) !== peek(scaleTicks)) {\n          ticks.push(peek(scaleTicks));\n        }\n      }\n\n      scaleTicks = ticks;\n    }\n  }\n\n  return convertDomainToTickData(scaleTicks, op);\n};\n\nconst methods = {\n  parity: function <T>(items: ILabelItem<T>[]) {\n    return items.filter((item, i) => i % 2 === 0);\n  },\n  greedy: function <T>(items: ILabelItem<T>[], sep: number) {\n    let a: ILabelItem<T>;\n    return items.filter((b, i) => {\n      if (!i || !intersect(a.AABBBounds, b.AABBBounds, sep)) {\n        a = b;\n        return true;\n      }\n      return false;\n    });\n  }\n};\n"]}

package/esm/data/transforms/tick-data/discrete/linear.js

@@ -3,10 +3,32 @@ import { isValid } from "../../../../util";
 import { convertDomainToTickData, getCartesianLabelBounds, labelDistance, labelOverlap } from "../util";
 
 export const linearDiscreteTicks = (scale, op) => {
-    const {tickCount: tickCount, forceTickCount: forceTickCount, tickStep: tickStep, labelGap: labelGap = 4, axisOrientType: axisOrientType} = op, isHorizontal = [ "bottom", "top" ].includes(axisOrientType);
+    var _a;
+    const domain = scale.domain();
+    if (!domain.length) return [];
+    const {tickCount: tickCount, forceTickCount: forceTickCount, tickStep: tickStep, labelGap: labelGap = 4, axisOrientType: axisOrientType} = op, isHorizontal = [ "bottom", "top" ].includes(axisOrientType), range = scale.range(), rangeSize = Math.abs(range[range.length - 1] - range[0]);
+    if (rangeSize < 2) return op.labelLastVisible ? convertDomainToTickData([ domain[domain.length - 1] ], op) : convertDomainToTickData([ domain[0] ], op);
     let scaleTicks;
     if (isValid(tickStep)) scaleTicks = scale.stepTicks(tickStep); else if (isValid(forceTickCount)) scaleTicks = scale.forceTicks(forceTickCount); else if (isValid(tickCount)) scaleTicks = scale.ticks(tickCount); else if (op.sampling) {
-        const domain = scale.domain(), range = scale.range(), labelBoundsList = getCartesianLabelBounds(scale, domain, op), domainLengthList = labelBoundsList.map((b => isHorizontal ? b.width() : b.height())), rangeStart = Math.min(...range), incrementUnit = (Math.max(...range) - rangeStart) / domain.length, result = getStep(domain, labelBoundsList, labelGap, op.labelLastVisible, isHorizontal, Math.floor(Math.min(...domainLengthList) / incrementUnit));
+        let labelBoundsList;
+        const fontSize = (null !== (_a = op.labelStyle.fontSize) && void 0 !== _a ? _a : 12) + 2;
+        if (domain.length <= rangeSize / fontSize) labelBoundsList = getCartesianLabelBounds(scale, domain, op); else {
+            const tempDomain = [ domain[0], domain[Math.floor(domain.length / 2)], domain[domain.length - 1] ], tempList = getCartesianLabelBounds(scale, tempDomain, op);
+            let maxBounds = null, maxBoundsIndex = 0;
+            tempList.forEach(((current, index) => {
+                if (!maxBounds) return maxBounds = current, void (maxBoundsIndex = index);
+                isHorizontal ? maxBounds.width() < current.width() && (maxBounds = current, maxBoundsIndex = index) : maxBounds.height() < current.height() && (maxBounds = current, 
+                maxBoundsIndex = index);
+            }));
+            const maxBoundsDomainIndex = 0 === maxBoundsIndex ? 0 : 2 === maxBoundsIndex ? domain.length - 1 : Math.floor(domain.length / 2), maxBoundsPos = scale.scale(domain[maxBoundsDomainIndex]);
+            labelBoundsList = new Array(domain.length);
+            for (let i = 0; i < labelBoundsList.length; i++) {
+                labelBoundsList[i] = maxBounds.clone();
+                const currentPos = scale.scale(domain[i]);
+                isHorizontal ? labelBoundsList[i].translate(currentPos - maxBoundsPos, 0) : labelBoundsList[i].translate(0, currentPos - maxBoundsPos);
+            }
+        }
+        const domainLengthList = labelBoundsList.map((b => isHorizontal ? b.width() : b.height())), rangeStart = Math.min(...range), incrementUnit = (Math.max(...range) - rangeStart) / domain.length, result = getStep(domain, labelBoundsList, labelGap, op.labelLastVisible, isHorizontal, Math.floor(Math.min(...domainLengthList) / incrementUnit));
         scaleTicks = scale.stepTicks(result.step), op.labelLastVisible && (scaleTicks = scaleTicks.slice(0, scaleTicks.length - result.delCount), 
         scaleTicks.push(domain[domain.length - 1]));
     } else scaleTicks = scale.domain();

package/esm/data/transforms/tick-data/discrete/linear.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/tick-data/discrete/linear.ts"],"names":[],"mappings":"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","file":"linear.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport { isValid } from '../../../../util';\nimport type { ICartesianTickDataOpt, ITickData } from '../interface';\nimport { convertDomainToTickData, getCartesianLabelBounds, labelDistance, labelOverlap } from '../util';\nimport type { AABBBounds } from '@visactor/vutils';\n\n/**\n * 对于离散轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出BandScale的ticks()、forceTicks()、stepTicks()结果；\n * - 估算所有轴label的宽度（或高度，在竖轴的情况下）并存为数组domainLengthList；\n * - 通过循环来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡（此处用到domainLengthList和scale.range()）；\n * - 如果用户配置了spec.label.lastVisible，则处理右边界：强制采样最后一个tick数据，并删掉这个tick的label所覆盖的那些tick数据。\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const linearDiscreteTicks = (scale: BandScale, op: ICartesianTickDataOpt): ITickData[] => {\n  const { tickCount, forceTickCount, tickStep, labelGap = 4, axisOrientType } = op;\n  const isHorizontal = ['bottom', 'top'].includes(axisOrientType);\n\n  let scaleTicks;\n  if (isValid(tickStep)) {\n    scaleTicks = scale.stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = scale.forceTicks(forceTickCount);\n  } else if (isValid(tickCount)) {\n    scaleTicks = scale.ticks(tickCount);\n  } else if (op.sampling) {\n    const domain = scale.domain();\n    const range = scale.range();\n\n    const labelBoundsList = getCartesianLabelBounds(scale, domain, op);\n\n    const domainLengthList = labelBoundsList.map(b => {\n      return isHorizontal ? b.width() : b.height();\n    });\n\n    const rangeStart = Math.min(...range);\n    const rangeEnd = Math.max(...range);\n    const incrementUnit = (rangeEnd - rangeStart) / domain.length;\n    const result = getStep(\n      domain,\n      labelBoundsList,\n      labelGap,\n      op.labelLastVisible,\n      isHorizontal,\n      Math.floor(Math.min(...domainLengthList) / incrementUnit) // 给step赋上合适的初值，有效改善外层循环次数\n    );\n\n    scaleTicks = (scale as BandScale).stepTicks(result.step);\n    if (op.labelLastVisible) {\n      scaleTicks = scaleTicks.slice(0, scaleTicks.length - result.delCount);\n      scaleTicks.push(domain[domain.length - 1]);\n    }\n  } else {\n    scaleTicks = scale.domain();\n  }\n\n  return convertDomainToTickData(scaleTicks, op);\n};\n\n/** 计算合适的step */\nconst getStep = (\n  domain: any[],\n  labelBoundsList: AABBBounds[],\n  labelGap: number,\n  labelLastVisible: boolean,\n  isHorizontal: boolean,\n  defaultStep: number\n) => {\n  let step = defaultStep;\n  let delCount = 0;\n  let resultDelCount = 0;\n  let resultStep = 0;\n  let resultTickCount = -1;\n  let minDiff = Number.MAX_VALUE;\n  // 通过循环来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡\n  do {\n    let success = true;\n    step++;\n    let ptr = 0;\n    do {\n      if (ptr + step < domain.length && labelOverlap(labelBoundsList[ptr], labelBoundsList[ptr + step], labelGap)) {\n        success = false;\n      }\n      ptr += step;\n    } while (success && ptr < domain.length);\n\n    if (success) {\n      if (labelLastVisible) {\n        const lastIndex = domain.length - 1;\n        delCount = 0;\n        do {\n          ptr -= step; // 获取最后一个label位置\n          if (ptr === lastIndex || labelOverlap(labelBoundsList[ptr], labelBoundsList[lastIndex], labelGap)) {\n            delCount++;\n          } else {\n            break;\n          }\n        } while (ptr > 0);\n        if (ptr === lastIndex) {\n          // 采到的最后的一个 label 刚好是最后一项，直接退出\n          resultStep = step;\n          resultDelCount = delCount;\n          break;\n        } else {\n          // 尝试获取最均匀的结果，防止倒数第二项和最后一项有大的空档\n          const tickCount = Math.floor(domain.length / step) - delCount + 1;\n          if (tickCount < resultTickCount) {\n            break;\n          } else {\n            resultTickCount = tickCount;\n            const distanceIndex = isHorizontal ? 0 : 1;\n            const distance1 = labelDistance(labelBoundsList[ptr], labelBoundsList[lastIndex])[distanceIndex]; // 倒数第2项和最后一项的距离\n            const distance2 =\n              ptr - step >= 0\n                ? labelDistance(labelBoundsList[ptr - step], labelBoundsList[ptr])[distanceIndex]\n                : distance1; // 倒数第3项和倒数第2项的距离\n            const diff = Math.abs(distance1 - distance2);\n            if (diff < minDiff) {\n              minDiff = diff;\n              resultStep = step; // 记录最均匀的 step\n              resultDelCount = delCount;\n            }\n          }\n        }\n      } else {\n        resultStep = step;\n        break;\n      }\n    }\n  } while (step <= domain.length);\n\n  return {\n    step: resultStep,\n    delCount: resultDelCount\n  };\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/tick-data/discrete/linear.ts"],"names":[],"mappings":"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","file":"linear.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport { isValid } from '../../../../util';\nimport type { ICartesianTickDataOpt, ITickData } from '../interface';\nimport { convertDomainToTickData, getCartesianLabelBounds, labelDistance, labelOverlap } from '../util';\nimport type { AABBBounds } from '@visactor/vutils';\n\n/**\n * 对于离散轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出BandScale的ticks()、forceTicks()、stepTicks()结果；\n * - 估算所有轴label的宽度（或高度，在竖轴的情况下）并存为数组domainLengthList；\n * - 通过循环来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡（此处用到domainLengthList和scale.range()）；\n * - 如果用户配置了spec.label.lastVisible，则处理右边界：强制采样最后一个tick数据，并删掉这个tick的label所覆盖的那些tick数据。\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const linearDiscreteTicks = (scale: BandScale, op: ICartesianTickDataOpt): ITickData[] => {\n  const domain = scale.domain();\n  if (!domain.length) {\n    return [];\n  }\n  const { tickCount, forceTickCount, tickStep, labelGap = 4, axisOrientType } = op;\n  const isHorizontal = ['bottom', 'top'].includes(axisOrientType);\n  const range = scale.range();\n\n  // if range is so small\n  const rangeSize = Math.abs(range[range.length - 1] - range[0]);\n  if (rangeSize < 2) {\n    if (op.labelLastVisible) {\n      return convertDomainToTickData([domain[domain.length - 1]], op);\n    }\n    return convertDomainToTickData([domain[0]], op);\n  }\n\n  let scaleTicks;\n  if (isValid(tickStep)) {\n    scaleTicks = scale.stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = scale.forceTicks(forceTickCount);\n  } else if (isValid(tickCount)) {\n    scaleTicks = scale.ticks(tickCount);\n  } else if (op.sampling) {\n    let labelBoundsList: AABBBounds[];\n    const fontSize = (op.labelStyle.fontSize ?? 12) + 2;\n    if (domain.length <= rangeSize / fontSize) {\n      labelBoundsList = getCartesianLabelBounds(scale, domain, op);\n    } else {\n      // only check first middle last, use the max size to sampling\n      const tempDomain = [domain[0], domain[Math.floor(domain.length / 2)], domain[domain.length - 1]];\n      const tempList = getCartesianLabelBounds(scale, tempDomain, op);\n      let maxBounds: AABBBounds = null;\n      let maxBoundsIndex = 0;\n      tempList.forEach((current, index) => {\n        if (!maxBounds) {\n          maxBounds = current;\n          maxBoundsIndex = index;\n          return;\n        }\n        if (isHorizontal) {\n          if (maxBounds.width() < current.width()) {\n            maxBounds = current;\n            maxBoundsIndex = index;\n          }\n        } else if (maxBounds.height() < current.height()) {\n          maxBounds = current;\n          maxBoundsIndex = index;\n        }\n      });\n      const maxBoundsDomainIndex =\n        maxBoundsIndex === 0 ? 0 : maxBoundsIndex === 2 ? domain.length - 1 : Math.floor(domain.length / 2);\n      const maxBoundsPos = scale.scale(domain[maxBoundsDomainIndex]);\n      labelBoundsList = new Array(domain.length);\n      // set bounds to each pos\n      for (let i = 0; i < labelBoundsList.length; i++) {\n        labelBoundsList[i] = maxBounds.clone();\n        const currentPos = scale.scale(domain[i]);\n        if (isHorizontal) {\n          labelBoundsList[i].translate(currentPos - maxBoundsPos, 0);\n        } else {\n          labelBoundsList[i].translate(0, currentPos - maxBoundsPos);\n        }\n      }\n    }\n\n    const domainLengthList = labelBoundsList.map(b => {\n      return isHorizontal ? b.width() : b.height();\n    });\n\n    const rangeStart = Math.min(...range);\n    const rangeEnd = Math.max(...range);\n    const incrementUnit = (rangeEnd - rangeStart) / domain.length;\n    const result = getStep(\n      domain,\n      labelBoundsList,\n      labelGap,\n      op.labelLastVisible,\n      isHorizontal,\n      Math.floor(Math.min(...domainLengthList) / incrementUnit) // 给step赋上合适的初值，有效改善外层循环次数\n    );\n\n    scaleTicks = (scale as BandScale).stepTicks(result.step);\n    if (op.labelLastVisible) {\n      scaleTicks = scaleTicks.slice(0, scaleTicks.length - result.delCount);\n      scaleTicks.push(domain[domain.length - 1]);\n    }\n  } else {\n    scaleTicks = scale.domain();\n  }\n\n  return convertDomainToTickData(scaleTicks, op);\n};\n\n/** 计算合适的step */\nconst getStep = (\n  domain: any[],\n  labelBoundsList: AABBBounds[],\n  labelGap: number,\n  labelLastVisible: boolean,\n  isHorizontal: boolean,\n  defaultStep: number\n) => {\n  let step = defaultStep;\n  let delCount = 0;\n  let resultDelCount = 0;\n  let resultStep = 0;\n  let resultTickCount = -1;\n  let minDiff = Number.MAX_VALUE;\n  // 通过循环来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡\n  do {\n    let success = true;\n    step++;\n    let ptr = 0;\n    do {\n      if (ptr + step < domain.length && labelOverlap(labelBoundsList[ptr], labelBoundsList[ptr + step], labelGap)) {\n        success = false;\n      }\n      ptr += step;\n    } while (success && ptr < domain.length);\n\n    if (success) {\n      if (labelLastVisible) {\n        const lastIndex = domain.length - 1;\n        delCount = 0;\n        do {\n          ptr -= step; // 获取最后一个label位置\n          if (ptr === lastIndex || labelOverlap(labelBoundsList[ptr], labelBoundsList[lastIndex], labelGap)) {\n            delCount++;\n          } else {\n            break;\n          }\n        } while (ptr > 0);\n        if (ptr === lastIndex) {\n          // 采到的最后的一个 label 刚好是最后一项，直接退出\n          resultStep = step;\n          resultDelCount = delCount;\n          break;\n        } else {\n          // 尝试获取最均匀的结果，防止倒数第二项和最后一项有大的空档\n          const tickCount = Math.floor(domain.length / step) - delCount + 1;\n          if (tickCount < resultTickCount) {\n            break;\n          } else {\n            resultTickCount = tickCount;\n            const distanceIndex = isHorizontal ? 0 : 1;\n            const distance1 = labelDistance(labelBoundsList[ptr], labelBoundsList[lastIndex])[distanceIndex]; // 倒数第2项和最后一项的距离\n            const distance2 =\n              ptr - step >= 0\n                ? labelDistance(labelBoundsList[ptr - step], labelBoundsList[ptr])[distanceIndex]\n                : distance1; // 倒数第3项和倒数第2项的距离\n            const diff = Math.abs(distance1 - distance2);\n            if (diff < minDiff) {\n              minDiff = diff;\n              resultStep = step; // 记录最均匀的 step\n              resultDelCount = delCount;\n            }\n          }\n        }\n      } else {\n        resultStep = step;\n        break;\n      }\n    }\n  } while (step <= domain.length);\n\n  return {\n    step: resultStep,\n    delCount: resultDelCount\n  };\n};\n"]}

package/esm/event/events/dimension/util/common.js

@@ -30,19 +30,30 @@ export const getDimensionData = (value, axis, coordinate, getDimensionField) =>
         const seriesList = region.getSeries();
         for (const series of seriesList) if (series.coordinate === coordinate) {
             const dimensionField = array(getDimensionField(series)), viewData = null === (_a = series.getViewData()) || void 0 === _a ? void 0 : _a.latestData;
-            dimensionField && viewData && (isDiscreteAxis ? data.push({
+            if (dimensionField && viewData) if (isDiscreteAxis) data.push({
                 series: series,
                 datum: viewData.filter((datum => {
                     var _a;
                     return (null === (_a = datum[dimensionField[0]]) || void 0 === _a ? void 0 : _a.toString()) === (null == value ? void 0 : value.toString());
                 }))
-            }) : data.push({
+            }); else if (isValid(dimensionField[1])) data.push({
                 series: series,
                 datum: viewData.filter((datum => {
                     var _a;
                     return (null === (_a = datum[dimensionField[0]]) || void 0 === _a ? void 0 : _a.toString()) === (null == value ? void 0 : value.toString()) || isValid(datum[dimensionField[0]]) && isValid(datum[dimensionField[1]]) && value >= datum[dimensionField[0]] && value < datum[dimensionField[1]];
                 }))
-            }));
+            }); else {
+                let minDelta = 1 / 0, minDatums = [], deltaSign = 0;
+                viewData.forEach((datum => {
+                    if (isValid(datum[dimensionField[0]])) {
+                        const delta = Math.abs(datum[dimensionField[0]] - value), sign = Math.sign(datum[dimensionField[0]] - value);
+                        delta < minDelta ? (minDelta = delta, minDatums = [ datum ], deltaSign = sign) : delta === minDelta && sign === deltaSign && minDatums.push(datum);
+                    }
+                })), data.push({
+                    series: series,
+                    datum: minDatums
+                });
+            }
         }
     }
     return data;

package/esm/event/events/dimension/util/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/events/dimension/util/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { ILayoutPoint } from '../../../../model/interface';\nimport type { IChart } from '../../../../chart/interface';\nimport type { IDimensionData, IDimensionInfo } from '../interface';\nimport { isNil, array, isValid } from '../../../../util';\nimport type { AxisComponent } from '../../../../component/axis/base-axis';\nimport type { CoordinateType } from '../../../../typings';\nimport { isDiscrete } from '@visactor/vscale';\n\nconst isInBound = (pos: ILayoutPoint, min: ILayoutPoint, max: ILayoutPoint): boolean =>\n  pos.x >= min.x && pos.x <= max.x && pos.y >= min.y && pos.y <= max.y;\n\nexport const isInRegionBound = (chart: IChart, axis: AxisComponent, pos: ILayoutPoint) => {\n  const regionList = chart.getRegionsInIds(array(axis.layoutBindRegionID));\n  return regionList?.some(region => {\n    const rect = region.getLayoutRect();\n    const startPoint = region.getLayoutStartPoint();\n    return isInBound(\n      pos,\n      { x: startPoint.x, y: startPoint.y },\n      { x: rect.width + startPoint.x, y: rect.height + startPoint.y }\n    );\n  });\n};\n\nexport const isSameDimensionInfo = (a?: IDimensionInfo, b?: IDimensionInfo): boolean => {\n  if (a === b) {\n    return true;\n  }\n  if (isNil(a) || isNil(b)) {\n    return false;\n  }\n  if (a.value !== b.value) {\n    return false;\n  }\n  if (a.axis?.id !== b.axis?.id) {\n    return false;\n  }\n  return true;\n};\n\n/** 给定维度项的值，获取对应维度数据 */\nexport const getDimensionData = (\n  value: any,\n  axis: AxisComponent,\n  coordinate: CoordinateType,\n  getDimensionField: (series: any) => string | string[]\n): IDimensionData[] => {\n  const scale = axis.getScale();\n  const isDiscreteAxis = isDiscrete(scale.type);\n\n  const data: IDimensionData[] = [];\n  const regions = axis.getRegions(); // TODO: 直接从轴里取系列\n  for (const region of regions) {\n    const seriesList = region.getSeries();\n    for (const series of seriesList) {\n      if (series.coordinate === coordinate) {\n        const dimensionField = array(getDimensionField(series));\n        const viewData = series.getViewData()?.latestData;\n        if (dimensionField && viewData) {\n          if (isDiscreteAxis) {\n            data.push({\n              series,\n              datum: viewData.filter(\n                (datum: any) => datum[dimensionField[0]]?.toString() === value?.toString() // 获取该维度项所对应的数据\n              )\n            });\n          } else {\n            data.push({\n              series,\n              datum: viewData.filter(\n                (datum: any) =>\n                  datum[dimensionField[0]]?.toString() === value?.toString() ||\n                  (isValid(datum[dimensionField[0]]) &&\n                    isValid(datum[dimensionField[1]]) &&\n                    value >= datum[dimensionField[0]] &&\n                    value < datum[dimensionField[1]])\n              )\n            });\n          }\n        }\n      }\n    }\n  }\n  return data;\n};\n"]}
+{"version":3,"sources":["../src/event/events/dimension/util/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { ILayoutPoint } from '../../../../model/interface';\nimport type { IChart } from '../../../../chart/interface';\nimport type { IDimensionData, IDimensionInfo } from '../interface';\nimport { isNil, array, isValid } from '../../../../util';\nimport type { AxisComponent } from '../../../../component/axis/base-axis';\nimport type { CoordinateType } from '../../../../typings';\nimport { isDiscrete } from '@visactor/vscale';\n\nconst isInBound = (pos: ILayoutPoint, min: ILayoutPoint, max: ILayoutPoint): boolean =>\n  pos.x >= min.x && pos.x <= max.x && pos.y >= min.y && pos.y <= max.y;\n\nexport const isInRegionBound = (chart: IChart, axis: AxisComponent, pos: ILayoutPoint) => {\n  const regionList = chart.getRegionsInIds(array(axis.layoutBindRegionID));\n  return regionList?.some(region => {\n    const rect = region.getLayoutRect();\n    const startPoint = region.getLayoutStartPoint();\n    return isInBound(\n      pos,\n      { x: startPoint.x, y: startPoint.y },\n      { x: rect.width + startPoint.x, y: rect.height + startPoint.y }\n    );\n  });\n};\n\nexport const isSameDimensionInfo = (a?: IDimensionInfo, b?: IDimensionInfo): boolean => {\n  if (a === b) {\n    return true;\n  }\n  if (isNil(a) || isNil(b)) {\n    return false;\n  }\n  if (a.value !== b.value) {\n    return false;\n  }\n  if (a.axis?.id !== b.axis?.id) {\n    return false;\n  }\n  return true;\n};\n\n/** 给定维度项的值，获取对应维度数据 */\nexport const getDimensionData = (\n  value: any,\n  axis: AxisComponent,\n  coordinate: CoordinateType,\n  getDimensionField: (series: any) => string | string[]\n): IDimensionData[] => {\n  const scale = axis.getScale();\n  const isDiscreteAxis = isDiscrete(scale.type);\n\n  const data: IDimensionData[] = [];\n  const regions = axis.getRegions(); // TODO: 直接从轴里取系列\n  for (const region of regions) {\n    const seriesList = region.getSeries();\n    for (const series of seriesList) {\n      if (series.coordinate === coordinate) {\n        const dimensionField = array(getDimensionField(series));\n        const viewData = series.getViewData()?.latestData;\n        if (dimensionField && viewData) {\n          if (isDiscreteAxis) {\n            data.push({\n              series,\n              datum: viewData.filter(\n                (datum: any) => datum[dimensionField[0]]?.toString() === value?.toString() // 获取该维度项所对应的数据\n              )\n            });\n          } else {\n            if (isValid(dimensionField[1])) {\n              // 根据范围取 datum\n              data.push({\n                series,\n                datum: viewData.filter((datum: any) => {\n                  if (datum[dimensionField[0]]?.toString() === value?.toString()) {\n                    return true;\n                  }\n                  return (\n                    isValid(datum[dimensionField[0]]) &&\n                    isValid(datum[dimensionField[1]]) &&\n                    value >= datum[dimensionField[0]] &&\n                    value < datum[dimensionField[1]]\n                  );\n                })\n              });\n            } else {\n              // 根据最近距离取 datum\n              let minDelta = Infinity;\n              let minDatums: any[] = [];\n              let deltaSign = 0;\n              viewData.forEach((datum: any) => {\n                if (isValid(datum[dimensionField[0]])) {\n                  const delta = Math.abs(datum[dimensionField[0]] - value);\n                  const sign = Math.sign(datum[dimensionField[0]] - value);\n                  if (delta < minDelta) {\n                    minDelta = delta;\n                    minDatums = [datum];\n                    deltaSign = sign;\n                  } else if (delta === minDelta && sign === deltaSign) {\n                    minDatums.push(datum);\n                  }\n                }\n              });\n              data.push({\n                series,\n                datum: minDatums\n              });\n            }\n          }\n        }\n      }\n    }\n  }\n  return data;\n};\n"]}

package/esm/event/interface.d.ts

@@ -125,6 +125,7 @@ export type EventParamsDefinition = {
     dimension: DimensionEventParams;
     tooltipShow: TooltipEventParams;
     tooltipHide: TooltipEventParams;
+    tooltipRelease: TooltipEventParams;
     [key: string]: ExtendEventParam;
 };
 export interface IEventDispatcher {

package/esm/event/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { INode } from '@visactor/vrender';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { IChart } from '../chart/interface';\nimport type { IModel } from '../model/interface';\nimport type { IMark, MarkType } from '../mark/interface';\nimport type { VChart } from '../core/vchart';\nimport type { DimensionEventParams } from './events/dimension/interface';\nimport type { Datum, IPoint, StringOrNumber } from '../typings';\nimport type { ChartEvent, Event_Bubble_Level, Event_Source_Type, VGRAMMAR_HOOK_EVENT } from '../constant';\nimport type { SeriesType } from '../series/interface';\nimport type { TooltipEventParams } from '../component/tooltip/interface/event';\n\nexport type EventType =\n  | 'pointerdown'\n  | 'pointerup'\n  | 'pointerupoutside'\n  | 'pointertap'\n  | 'pointerover'\n  | 'pointermove'\n  | 'pointerenter'\n  | 'pointerleave'\n  | 'pointerout'\n  | 'mousedown'\n  | 'mouseup'\n  | 'mouseupoutside'\n  | 'rightdown'\n  | 'rightup'\n  | 'rightupoutside'\n  | 'click'\n  | 'dblclick'\n  | 'mousemove'\n  | 'mouseover'\n  | 'mouseout'\n  | 'mouseenter'\n  | 'mouseleave'\n  | 'wheel'\n  | 'touchstart'\n  | 'touchend'\n  | 'touchendoutside'\n  | 'touchmove'\n  | 'touchcancel'\n  | 'tap'\n  | 'dragstart'\n  | 'drag'\n  | 'dragenter'\n  | 'dragleave'\n  | 'dragover'\n  | 'dragend'\n  | 'drop'\n  | 'pan'\n  | 'panstart'\n  | 'panend'\n  | 'press'\n  | 'pressup'\n  | 'pressend'\n  | 'pinch'\n  | 'pinchstart'\n  | 'pinchend'\n  | 'swipe'\n  | keyof typeof ChartEvent\n  | keyof typeof VGRAMMAR_HOOK_EVENT\n  | string;\n\nexport type EventBubbleLevel = keyof typeof Event_Bubble_Level;\n\nexport type ComponentType =\n  | 'axis'\n  | 'dataZoom'\n  | 'indicator'\n  | 'legend'\n  | 'mapLabel'\n  | 'markLine'\n  | 'tooltip'\n  | 'title';\nexport type EventTargetType = MarkType | ComponentType | SeriesType;\n\nexport type EventSourceType = keyof typeof Event_Source_Type;\n\n/**\n * 事件 API 中的事件筛选配置\n */\nexport type EventQuery = {\n  /**\n   * 事件的冒泡层级配置，其中 model 指的是图表的内部模型，包括 region、series 以及 component\n   */\n  level?: EventBubbleLevel;\n  /**\n   * 事件来源配置。\n   * - `window`: window 事件\n   * - `chart`: 图表事件\n   */\n  source?: EventSourceType;\n\n  /**\n   * vrender 图形节点名称\n   */\n  nodeName?: string;\n  /**\n   * mark 图元名称\n   */\n  markName?: string;\n  /**\n   * 仅在 level 为 'mark' 或者 'model' 的场景下使用，用于筛选 mark 类型或者图表组成元素模型类型\n   */\n  type?: EventTargetType;\n  /**\n   * 用户在 spec 上配置的 id\n   */\n  id?: StringOrNumber;\n  /**\n   * 自定义过滤函数\n   * @param params\n   * @returns\n   */\n  filter?: (params: Partial<BaseEventParams>) => boolean;\n\n  throttle?: number;\n  debounce?: number;\n\n  consume?: boolean;\n};\n\nexport type EventParams = {\n  /**\n   * 事件对象\n   */\n  event?: SuperEvent;\n  /**\n   * 供不同的事件用于存储期望携带的数据\n   */\n  value?: any;\n  /**\n   * 事件来源的 mark\n   */\n  mark?: IMark;\n  /**\n   * 事件来源的 model\n   */\n  model?: IModel;\n  /**\n   * 事件来源的 chart\n   */\n  chart?: IChart;\n  /**\n   * 事件拾取到的图元的数据\n   */\n  datum?: Datum;\n  /**\n   * 拾取到的图形节点\n   */\n  node?: INode;\n};\n\ntype SuperEvent = Event & {\n  [key: string]: any;\n};\n\nexport type BaseEventParams = EventParams & {\n  /**\n   * 事件对象\n   */\n  event: SuperEvent;\n  item: IElement;\n  datum: Datum;\n  source: EventSourceType;\n  itemMap: Map<string, any>;\n};\n\nexport type EventCallback<Params extends EventParams> = (params: Params) => boolean | void;\n\n/**\n * 内部事件分发中所应用的事件筛选配置\n */\nexport type EventFilter = {\n  source: EventSourceType;\n  level: EventBubbleLevel;\n  type: string | null;\n  markName: string | null;\n  nodeName: string | null;\n  userId: StringOrNumber | null;\n  filter: (params: Partial<BaseEventParams>) => boolean | null;\n};\n\nexport type EventHandler<Params extends EventParams> = {\n  callback: EventCallback<Params>;\n  query: EventQuery | null;\n  // 如果有 debounce/throttle 配置则需要封装原始回调函数\n  wrappedCallback?: EventCallback<Params>;\n  // 转换后的事件筛选配置\n  filter?: EventFilter;\n};\n\nexport type ExtendEventParam = EventParams & {\n  event?: Event;\n  item?: any;\n  datum?: Datum;\n  source?: EventSourceType;\n  itemMap?: Map<string, any>;\n};\n\nexport type PanEventParam = ExtendEventParam & {\n  // x/y方向上的偏移值\n  delta: [number, number];\n};\n\nexport type ZoomEventParam = ExtendEventParam & {\n  // 缩放值\n  scale: number;\n  // 缩放中心\n  scaleCenter: IPoint;\n};\n\nexport type EventParamsDefinition = {\n  // 基础事件回调参数\n  pointerdown: BaseEventParams;\n  pointerup: BaseEventParams;\n  pointerupoutside: BaseEventParams;\n  pointertap: BaseEventParams;\n  pointerover: BaseEventParams;\n  pointermove: BaseEventParams;\n  pointerenter: BaseEventParams;\n  pointerleave: BaseEventParams;\n  pointerout: BaseEventParams;\n  mousedown: BaseEventParams;\n  mouseup: BaseEventParams;\n  mouseupoutside: BaseEventParams;\n  rightdown: BaseEventParams;\n  rightup: BaseEventParams;\n  rightupoutside: BaseEventParams;\n  click: BaseEventParams;\n  dblclick: BaseEventParams;\n  mousemove: BaseEventParams;\n  mouseover: BaseEventParams;\n  mouseout: BaseEventParams;\n  mouseenter: BaseEventParams;\n  mouseleave: BaseEventParams;\n  wheel: BaseEventParams;\n  touchstart: BaseEventParams;\n  touchend: BaseEventParams;\n  touchendoutside: BaseEventParams;\n  touchmove: BaseEventParams;\n  touchcancel: BaseEventParams;\n\n  dragstart: BaseEventParams;\n  drag: BaseEventParams;\n  dragenter: BaseEventParams;\n  dragleave: BaseEventParams;\n  dragover: BaseEventParams;\n  dragend: BaseEventParams;\n  drop: BaseEventParams;\n\n  tap: BaseEventParams;\n  pan: BaseEventParams;\n  panstart: BaseEventParams;\n  panend: BaseEventParams;\n  press: BaseEventParams;\n  pressup: BaseEventParams;\n  pressend: BaseEventParams;\n  pinch: BaseEventParams;\n  pinchstart: BaseEventParams;\n  pinchend: BaseEventParams;\n  swipe: BaseEventParams;\n\n  // VChart 内置的扩展组合事件\n  dimension: DimensionEventParams;\n  tooltipShow: TooltipEventParams;\n  tooltipHide: TooltipEventParams;\n\n  // 扩展事件参数\n  [key: string]: ExtendEventParam;\n};\n\nexport interface IEventDispatcher {\n  globalInstance: VChart;\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => this;\n  unregister: <Evt extends EventType>(eType: Evt, handler?: EventHandler<EventParamsDefinition[Evt]>) => this;\n  dispatch: <Evt extends EventType>(eType: Evt, params?: EventParamsDefinition[Evt], level?: EventBubbleLevel) => this;\n  release: () => void;\n}\n\nexport interface IEvent {\n  on: (<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  off: (<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  emit: <Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel) => void;\n  release: () => void;\n\n  getComposedEventMap: () => Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }>;\n}\n\nexport interface IComposedEvent {\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => void;\n  unregister: () => void;\n  dispatch: (v: unknown, opt: unknown) => unknown;\n}\n"]}
+{"version":3,"sources":["../src/event/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { INode } from '@visactor/vrender';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { IChart } from '../chart/interface';\nimport type { IModel } from '../model/interface';\nimport type { IMark, MarkType } from '../mark/interface';\nimport type { VChart } from '../core/vchart';\nimport type { DimensionEventParams } from './events/dimension/interface';\nimport type { Datum, IPoint, StringOrNumber } from '../typings';\nimport type { ChartEvent, Event_Bubble_Level, Event_Source_Type, VGRAMMAR_HOOK_EVENT } from '../constant';\nimport type { SeriesType } from '../series/interface';\nimport type { TooltipEventParams } from '../component/tooltip/interface/event';\n\nexport type EventType =\n  | 'pointerdown'\n  | 'pointerup'\n  | 'pointerupoutside'\n  | 'pointertap'\n  | 'pointerover'\n  | 'pointermove'\n  | 'pointerenter'\n  | 'pointerleave'\n  | 'pointerout'\n  | 'mousedown'\n  | 'mouseup'\n  | 'mouseupoutside'\n  | 'rightdown'\n  | 'rightup'\n  | 'rightupoutside'\n  | 'click'\n  | 'dblclick'\n  | 'mousemove'\n  | 'mouseover'\n  | 'mouseout'\n  | 'mouseenter'\n  | 'mouseleave'\n  | 'wheel'\n  | 'touchstart'\n  | 'touchend'\n  | 'touchendoutside'\n  | 'touchmove'\n  | 'touchcancel'\n  | 'tap'\n  | 'dragstart'\n  | 'drag'\n  | 'dragenter'\n  | 'dragleave'\n  | 'dragover'\n  | 'dragend'\n  | 'drop'\n  | 'pan'\n  | 'panstart'\n  | 'panend'\n  | 'press'\n  | 'pressup'\n  | 'pressend'\n  | 'pinch'\n  | 'pinchstart'\n  | 'pinchend'\n  | 'swipe'\n  | keyof typeof ChartEvent\n  | keyof typeof VGRAMMAR_HOOK_EVENT\n  | string;\n\nexport type EventBubbleLevel = keyof typeof Event_Bubble_Level;\n\nexport type ComponentType =\n  | 'axis'\n  | 'dataZoom'\n  | 'indicator'\n  | 'legend'\n  | 'mapLabel'\n  | 'markLine'\n  | 'tooltip'\n  | 'title';\nexport type EventTargetType = MarkType | ComponentType | SeriesType;\n\nexport type EventSourceType = keyof typeof Event_Source_Type;\n\n/**\n * 事件 API 中的事件筛选配置\n */\nexport type EventQuery = {\n  /**\n   * 事件的冒泡层级配置，其中 model 指的是图表的内部模型，包括 region、series 以及 component\n   */\n  level?: EventBubbleLevel;\n  /**\n   * 事件来源配置。\n   * - `window`: window 事件\n   * - `chart`: 图表事件\n   */\n  source?: EventSourceType;\n\n  /**\n   * vrender 图形节点名称\n   */\n  nodeName?: string;\n  /**\n   * mark 图元名称\n   */\n  markName?: string;\n  /**\n   * 仅在 level 为 'mark' 或者 'model' 的场景下使用，用于筛选 mark 类型或者图表组成元素模型类型\n   */\n  type?: EventTargetType;\n  /**\n   * 用户在 spec 上配置的 id\n   */\n  id?: StringOrNumber;\n  /**\n   * 自定义过滤函数\n   * @param params\n   * @returns\n   */\n  filter?: (params: Partial<BaseEventParams>) => boolean;\n\n  throttle?: number;\n  debounce?: number;\n\n  consume?: boolean;\n};\n\nexport type EventParams = {\n  /**\n   * 事件对象\n   */\n  event?: SuperEvent;\n  /**\n   * 供不同的事件用于存储期望携带的数据\n   */\n  value?: any;\n  /**\n   * 事件来源的 mark\n   */\n  mark?: IMark;\n  /**\n   * 事件来源的 model\n   */\n  model?: IModel;\n  /**\n   * 事件来源的 chart\n   */\n  chart?: IChart;\n  /**\n   * 事件拾取到的图元的数据\n   */\n  datum?: Datum;\n  /**\n   * 拾取到的图形节点\n   */\n  node?: INode;\n};\n\ntype SuperEvent = Event & {\n  [key: string]: any;\n};\n\nexport type BaseEventParams = EventParams & {\n  /**\n   * 事件对象\n   */\n  event: SuperEvent;\n  item: IElement;\n  datum: Datum;\n  source: EventSourceType;\n  itemMap: Map<string, any>;\n};\n\nexport type EventCallback<Params extends EventParams> = (params: Params) => boolean | void;\n\n/**\n * 内部事件分发中所应用的事件筛选配置\n */\nexport type EventFilter = {\n  source: EventSourceType;\n  level: EventBubbleLevel;\n  type: string | null;\n  markName: string | null;\n  nodeName: string | null;\n  userId: StringOrNumber | null;\n  filter: (params: Partial<BaseEventParams>) => boolean | null;\n};\n\nexport type EventHandler<Params extends EventParams> = {\n  callback: EventCallback<Params>;\n  query: EventQuery | null;\n  // 如果有 debounce/throttle 配置则需要封装原始回调函数\n  wrappedCallback?: EventCallback<Params>;\n  // 转换后的事件筛选配置\n  filter?: EventFilter;\n};\n\nexport type ExtendEventParam = EventParams & {\n  event?: Event;\n  item?: any;\n  datum?: Datum;\n  source?: EventSourceType;\n  itemMap?: Map<string, any>;\n};\n\nexport type PanEventParam = ExtendEventParam & {\n  // x/y方向上的偏移值\n  delta: [number, number];\n};\n\nexport type ZoomEventParam = ExtendEventParam & {\n  // 缩放值\n  scale: number;\n  // 缩放中心\n  scaleCenter: IPoint;\n};\n\nexport type EventParamsDefinition = {\n  // 基础事件回调参数\n  pointerdown: BaseEventParams;\n  pointerup: BaseEventParams;\n  pointerupoutside: BaseEventParams;\n  pointertap: BaseEventParams;\n  pointerover: BaseEventParams;\n  pointermove: BaseEventParams;\n  pointerenter: BaseEventParams;\n  pointerleave: BaseEventParams;\n  pointerout: BaseEventParams;\n  mousedown: BaseEventParams;\n  mouseup: BaseEventParams;\n  mouseupoutside: BaseEventParams;\n  rightdown: BaseEventParams;\n  rightup: BaseEventParams;\n  rightupoutside: BaseEventParams;\n  click: BaseEventParams;\n  dblclick: BaseEventParams;\n  mousemove: BaseEventParams;\n  mouseover: BaseEventParams;\n  mouseout: BaseEventParams;\n  mouseenter: BaseEventParams;\n  mouseleave: BaseEventParams;\n  wheel: BaseEventParams;\n  touchstart: BaseEventParams;\n  touchend: BaseEventParams;\n  touchendoutside: BaseEventParams;\n  touchmove: BaseEventParams;\n  touchcancel: BaseEventParams;\n\n  dragstart: BaseEventParams;\n  drag: BaseEventParams;\n  dragenter: BaseEventParams;\n  dragleave: BaseEventParams;\n  dragover: BaseEventParams;\n  dragend: BaseEventParams;\n  drop: BaseEventParams;\n\n  tap: BaseEventParams;\n  pan: BaseEventParams;\n  panstart: BaseEventParams;\n  panend: BaseEventParams;\n  press: BaseEventParams;\n  pressup: BaseEventParams;\n  pressend: BaseEventParams;\n  pinch: BaseEventParams;\n  pinchstart: BaseEventParams;\n  pinchend: BaseEventParams;\n  swipe: BaseEventParams;\n\n  // VChart 内置的扩展组合事件\n  dimension: DimensionEventParams;\n  tooltipShow: TooltipEventParams;\n  tooltipHide: TooltipEventParams;\n  tooltipRelease: TooltipEventParams;\n\n  // 扩展事件参数\n  [key: string]: ExtendEventParam;\n};\n\nexport interface IEventDispatcher {\n  globalInstance: VChart;\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => this;\n  unregister: <Evt extends EventType>(eType: Evt, handler?: EventHandler<EventParamsDefinition[Evt]>) => this;\n  dispatch: <Evt extends EventType>(eType: Evt, params?: EventParamsDefinition[Evt], level?: EventBubbleLevel) => this;\n  release: () => void;\n}\n\nexport interface IEvent {\n  on: (<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  off: (<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  emit: <Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel) => void;\n  release: () => void;\n\n  getComposedEventMap: () => Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }>;\n}\n\nexport interface IComposedEvent {\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => void;\n  unregister: () => void;\n  dispatch: (v: unknown, opt: unknown) => unknown;\n}\n"]}

package/esm/plugin/components/axis-label-overlap-plugin.js

@@ -7,8 +7,17 @@ import { isXAxis } from "../../component/axis/cartesian/util/common";
 import { peek } from "../../util";
 
 function labelFlush(axisLabels, axis) {
-    const {width: width, height: height} = axis.getLayoutRect(), isX = isXAxis(axis.layoutOrient), first = axisLabels[0], last = peek(axisLabels);
-    if (isX) {
+    const {width: width, height: height} = axis.getLayoutRect(), isX = isXAxis(axis.layoutOrient), isInverse = !0 === axis.getSpec().inverse, first = axisLabels[0], last = peek(axisLabels);
+    if (isX) if (isInverse) {
+        const start = width, end = 0, startBound = first.AABBBounds.x2, endBound = last.AABBBounds.x1;
+        startBound > start && first.setAttributes({
+            x: start,
+            textAlign: "right"
+        }), endBound < end && last.setAttributes({
+            x: end,
+            textAlign: "left"
+        });
+    } else {
         const start = 0, end = width, startBound = first.AABBBounds.x1, endBound = last.AABBBounds.x2;
         startBound < start && first.setAttributes({
             x: start,
@@ -17,6 +26,15 @@ function labelFlush(axisLabels, axis) {
             x: end,
             textAlign: "right"
         });
+    } else if (isInverse) {
+        const startBound = first.AABBBounds.y1, endBound = last.AABBBounds.y2, start = 0, end = height;
+        startBound < start && first.setAttributes({
+            y: start,
+            textBaseline: "top"
+        }), endBound > end && last.setAttributes({
+            y: end,
+            textBaseline: "bottom"
+        });
     } else {
         const start = height, end = 0, startBound = first.AABBBounds.y2, endBound = last.AABBBounds.y1;
         startBound > start && first.setAttributes({

package/esm/plugin/components/axis-label-overlap-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/components/axis-label-overlap-plugin.ts"],"names":[],"mappings":"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","file":"axis-label-overlap-plugin.js","sourcesContent":["import { isEmpty } from '@visactor/vutils';\nimport type { IText, IGroup, INode } from '@visactor/vrender';\nimport { BasicComponentPlugin } from './basic-plugin';\nimport type { IComponentPlugin, IComponentPluginService } from './interface';\nimport type { IComponent } from '../../component/interface';\nimport { isXAxis } from '../../component/axis/cartesian/util/common';\nimport { peek } from '../../util';\nimport type { CartesianAxis } from '../../component/axis/cartesian';\n\nfunction labelFlush(axisLabels: IText[], axis: IComponent) {\n  const { width, height } = axis.getLayoutRect();\n  const isX = isXAxis(axis.layoutOrient);\n  const first = axisLabels[0];\n  const last = peek(axisLabels);\n\n  if (isX) {\n    const start = 0;\n    const end = width;\n    const startBound = first.AABBBounds.x1;\n    const endBound = last.AABBBounds.x2;\n    if (startBound < start) {\n      first.setAttributes({\n        x: start,\n        textAlign: 'left'\n      });\n    }\n\n    if (endBound > end) {\n      last.setAttributes({\n        x: end,\n        textAlign: 'right'\n      });\n    }\n  } else {\n    const start = height;\n    const end = 0;\n    const startBound = first.AABBBounds.y2;\n    const endBound = last.AABBBounds.y1;\n\n    if (startBound > start) {\n      first.setAttributes({\n        y: start,\n        textBaseline: 'bottom'\n      });\n    }\n\n    if (endBound < end) {\n      last.setAttributes({\n        y: end,\n        textBaseline: 'top'\n      });\n    }\n  }\n}\n\nfunction overlap(axisLabels: IText[], axis: IComponent) {\n  const spec = axis.getSpec?.();\n  if (!isEmpty(axisLabels)) {\n    // 首尾标签向内偏移\n    if (spec?.label?.flush) {\n      labelFlush(axisLabels, axis);\n    }\n  }\n}\n\nexport class AxisLabelOverlapPlugin extends BasicComponentPlugin implements IComponentPlugin {\n  Name: string = 'AxisLabelOverlapPlugin';\n\n  constructor() {\n    super(AxisLabelOverlapPlugin.Name);\n  }\n\n  onDidLayoutVertical(service: IComponentPluginService, axis: CartesianAxis) {\n    this._doOverlap(service, axis);\n  }\n  onDidLayoutHorizontal(service: IComponentPluginService, axis: CartesianAxis) {\n    this._doOverlap(service, axis);\n  }\n\n  private _doOverlap(service: IComponentPluginService, axis: CartesianAxis) {\n    const axisComponent = axis.getSceneNodeMarks()[0].getGroupGraphicItem();\n    const layer0LabelsContainer = axisComponent.find(\n      (node: INode) => node.name === 'axis-label-container-layer-0',\n      true\n    ) as IGroup;\n    const layer1LabelsContainer = axisComponent.find(\n      (node: INode) => node.name === 'axis-label-container-layer-1',\n      true\n    ) as IGroup;\n    overlap(layer0LabelsContainer ? (layer0LabelsContainer.getChildren() as IText[]) : [], service.component);\n    overlap(layer1LabelsContainer ? (layer1LabelsContainer.getChildren() as IText[]) : [], service.component);\n  }\n}\n"]}
+{"version":3,"sources":["../src/plugin/components/axis-label-overlap-plugin.ts"],"names":[],"mappings":"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","file":"axis-label-overlap-plugin.js","sourcesContent":["import { isEmpty } from '@visactor/vutils';\nimport type { IText, IGroup, INode } from '@visactor/vrender';\nimport { BasicComponentPlugin } from './basic-plugin';\nimport type { IComponentPlugin, IComponentPluginService } from './interface';\nimport type { IComponent } from '../../component/interface';\nimport { isXAxis } from '../../component/axis/cartesian/util/common';\nimport { peek } from '../../util';\nimport type { CartesianAxis } from '../../component/axis/cartesian';\n\nfunction labelFlush(axisLabels: IText[], axis: IComponent) {\n  const { width, height } = axis.getLayoutRect();\n  const isX = isXAxis(axis.layoutOrient);\n  const isInverse = axis.getSpec().inverse === true;\n  const first = axisLabels[0];\n  const last = peek(axisLabels);\n\n  if (isX) {\n    if (isInverse) {\n      const start = width;\n      const end = 0;\n      const startBound = first.AABBBounds.x2;\n      const endBound = last.AABBBounds.x1;\n\n      if (startBound > start) {\n        first.setAttributes({\n          x: start,\n          textAlign: 'right'\n        });\n      }\n\n      if (endBound < end) {\n        last.setAttributes({\n          x: end,\n          textAlign: 'left'\n        });\n      }\n    } else {\n      const start = 0;\n      const end = width;\n      const startBound = first.AABBBounds.x1;\n      const endBound = last.AABBBounds.x2;\n      if (startBound < start) {\n        first.setAttributes({\n          x: start,\n          textAlign: 'left'\n        });\n      }\n\n      if (endBound > end) {\n        last.setAttributes({\n          x: end,\n          textAlign: 'right'\n        });\n      }\n    }\n  } else {\n    if (isInverse) {\n      const startBound = first.AABBBounds.y1;\n      const endBound = last.AABBBounds.y2;\n      const start = 0;\n      const end = height;\n\n      if (startBound < start) {\n        first.setAttributes({\n          y: start,\n          textBaseline: 'top'\n        });\n      }\n\n      if (endBound > end) {\n        last.setAttributes({\n          y: end,\n          textBaseline: 'bottom'\n        });\n      }\n    } else {\n      const start = height;\n      const end = 0;\n      const startBound = first.AABBBounds.y2;\n      const endBound = last.AABBBounds.y1;\n\n      if (startBound > start) {\n        first.setAttributes({\n          y: start,\n          textBaseline: 'bottom'\n        });\n      }\n\n      if (endBound < end) {\n        last.setAttributes({\n          y: end,\n          textBaseline: 'top'\n        });\n      }\n    }\n  }\n}\n\nfunction overlap(axisLabels: IText[], axis: IComponent) {\n  const spec = axis.getSpec?.();\n  if (!isEmpty(axisLabels)) {\n    // 首尾标签向内偏移\n    if (spec?.label?.flush) {\n      labelFlush(axisLabels, axis);\n    }\n  }\n}\n\nexport class AxisLabelOverlapPlugin extends BasicComponentPlugin implements IComponentPlugin {\n  Name: string = 'AxisLabelOverlapPlugin';\n\n  constructor() {\n    super(AxisLabelOverlapPlugin.Name);\n  }\n\n  onDidLayoutVertical(service: IComponentPluginService, axis: CartesianAxis) {\n    this._doOverlap(service, axis);\n  }\n  onDidLayoutHorizontal(service: IComponentPluginService, axis: CartesianAxis) {\n    this._doOverlap(service, axis);\n  }\n\n  private _doOverlap(service: IComponentPluginService, axis: CartesianAxis) {\n    const axisComponent = axis.getSceneNodeMarks()[0].getGroupGraphicItem();\n    const layer0LabelsContainer = axisComponent.find(\n      (node: INode) => node.name === 'axis-label-container-layer-0',\n      true\n    ) as IGroup;\n    const layer1LabelsContainer = axisComponent.find(\n      (node: INode) => node.name === 'axis-label-container-layer-1',\n      true\n    ) as IGroup;\n    overlap(layer0LabelsContainer ? (layer0LabelsContainer.getChildren() as IText[]) : [], service.component);\n    overlap(layer1LabelsContainer ? (layer1LabelsContainer.getChildren() as IText[]) : [], service.component);\n  }\n}\n"]}

package/esm/series/bar/bar.d.ts

@@ -1,6 +1,6 @@
 import { CartesianSeries } from '../cartesian/cartesian';
 import { MarkTypeEnum } from '../../mark/interface';
-import type { Maybe } from '../../typings';
+import type { Maybe, Datum, DirectionType } from '../../typings';
 import type { IBarSeriesSpec, IBarSeriesTheme } from './interface';
 import type { IAxisHelper } from '../../component/axis/cartesian/interface';
 import type { IRectMark } from '../../mark/rect';
@@ -27,7 +27,8 @@ export declare class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extend
     initBandRectMarkStyle(): void;
     initLinearRectMarkStyle(): void;
     initAnimation(): void;
-    protected getBarWidth(axisHelper: IAxisHelper): number;
+    protected _getBarWidth(axisHelper: IAxisHelper): number;
+    protected _getPosition(direction: DirectionType, datum: Datum): number;
     updateSpec(spec: IBarSeriesSpec): {
         change: boolean;
         reMake: boolean;

package/esm/series/bar/bar.js

@@ -28,6 +28,8 @@ import { RectMark } from "../../mark/rect";
 
 import { TextMark } from "../../mark/text";
 
+import { array, isValid, last } from "@visactor/vutils";
+
 VChart.useMark([ RectMark, TextMark ]);
 
 export const DefaultBandWidth = 6;
@@ -82,21 +84,13 @@ export class BarSeries extends CartesianSeries {
         this.direction === Direction.horizontal ? this.setMarkStyle(this._rectMark, {
             x: datum => valueInScaleRange(this.dataToPositionX(datum), xScale),
             x1: datum => valueInScaleRange(this.dataToPositionX1(datum), xScale),
-            y: datum => {
-                var _a, _b, _c;
-                const bandWidth = null !== (_c = null === (_b = (_a = this.getYAxisHelper()).getBandwidth) || void 0 === _b ? void 0 : _b.call(_a, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _c ? _c : 6, continuous = isContinuous(yScale.type || "band");
-                return this.dataToPositionY(datum) + .5 * (bandWidth - this._rectMark.getAttribute("height", datum)) + (continuous ? -bandWidth / 2 : 0);
-            },
-            height: () => this.getBarWidth(this._yAxisHelper)
+            y: datum => this._getPosition(this.direction, datum),
+            height: () => this._getBarWidth(this._yAxisHelper)
         }, "normal", AttributeLevel.Series) : this.setMarkStyle(this._rectMark, {
-            x: datum => {
-                var _a, _b, _c, _d, _e;
-                const bandWidth = null !== (_c = null === (_b = (_a = this.getXAxisHelper()).getBandwidth) || void 0 === _b ? void 0 : _b.call(_a, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _c ? _c : 6, width = this._rectMark.getAttribute("width", datum), continuous = isContinuous((null === (_e = (_d = this.getXAxisHelper()).getScale) || void 0 === _e ? void 0 : _e.call(_d, 0).type) || "band");
-                return this.dataToPositionX(datum) + (bandWidth - width) / 2 + (continuous ? -bandWidth / 2 : 0);
-            },
+            x: datum => this._getPosition(this.direction, datum),
             y: datum => valueInScaleRange(this.dataToPositionY(datum), yScale),
             y1: datum => valueInScaleRange(this.dataToPositionY1(datum), yScale),
-            width: () => this.getBarWidth(this._xAxisHelper)
+            width: () => this._getBarWidth(this._xAxisHelper)
         }, "normal", AttributeLevel.Series);
     }
     initLinearRectMarkStyle() {
@@ -128,7 +122,7 @@ export class BarSeries extends CartesianSeries {
             }
         }));
     }
-    getBarWidth(axisHelper) {
+    _getBarWidth(axisHelper) {
         var _a, _b;
         const hasBarWidth = void 0 !== this._spec.barWidth, bandWidth = null !== (_b = null === (_a = axisHelper.getBandwidth) || void 0 === _a ? void 0 : _a.call(axisHelper, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _b ? _b : 6;
         if (hasBarWidth) return getActualNumValue(this._spec.barWidth, bandWidth);
@@ -138,6 +132,26 @@ export class BarSeries extends CartesianSeries {
         hasBarMaxWidth && (width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth))), 
         width;
     }
+    _getPosition(direction, datum) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        let axisHelper, sizeAttribute, dataToPosition;
+        direction === Direction.horizontal ? (axisHelper = this.getYAxisHelper(), sizeAttribute = "height", 
+        dataToPosition = this.dataToPositionY.bind(this)) : (axisHelper = this.getXAxisHelper(), 
+        sizeAttribute = "width", dataToPosition = this.dataToPositionX.bind(this));
+        const scale = axisHelper.getScale(0), size = this._rectMark.getAttribute(sizeAttribute, datum), bandWidth = null !== (_b = null === (_a = axisHelper.getBandwidth) || void 0 === _a ? void 0 : _a.call(axisHelper, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _b ? _b : 6;
+        if ((null === (_d = null === (_c = this._groups) || void 0 === _c ? void 0 : _c.fields) || void 0 === _d ? void 0 : _d.length) > 1 && isValid(this._spec.barGapInGroup)) {
+            const groupFields = this._groups.fields, barInGroup = array(this._spec.barGapInGroup);
+            let totalWidth = 0, offSet = 0;
+            for (let index = groupFields.length - 1; index >= 1; index--) {
+                const groupField = groupFields[index], groupValues = null !== (_h = null === (_g = null === (_f = null === (_e = this.getViewDataStatistics()) || void 0 === _e ? void 0 : _e.latestData) || void 0 === _f ? void 0 : _f[groupField]) || void 0 === _g ? void 0 : _g.values) && void 0 !== _h ? _h : [], groupCount = groupValues.length, gap = getActualNumValue(null !== (_j = barInGroup[index - 1]) && void 0 !== _j ? _j : last(barInGroup), bandWidth), i = groupValues.indexOf(datum[groupField]);
+                index === groupFields.length - 1 ? (totalWidth += groupCount * size + (groupCount - 1) * gap, 
+                offSet += i * (size + gap)) : (offSet += i * (totalWidth + gap), totalWidth += totalWidth + (groupCount - 1) * gap);
+            }
+            return scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2 - totalWidth / 2 + offSet;
+        }
+        const continuous = isContinuous(scale.type || "band");
+        return dataToPosition(datum) + .5 * (bandWidth - size) + (continuous ? -bandWidth / 2 : 0);
+    }
     updateSpec(spec) {
         const {direction: direction} = this._spec, result = super.updateSpec(spec);
         return spec.direction !== direction && (result.change = !0, result.reRender = !0, 

package/esm/series/bar/bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel } from '../../constant';\nimport { getActualNumValue } from '../util/utils';\nimport type { Maybe, Datum } from '../../typings';\nimport { merge, valueInScaleRange } from '../../util';\nimport type { BarAppearPreset, IBarAnimationParams } from './animation';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum } from '../interface';\nimport { SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { BaseSeries } from '../base/base-series';\nimport { VChart } from '../../core/vchart';\nimport { RectMark } from '../../mark/rect';\nimport { TextMark } from '../../mark/text';\n\nVChart.useMark([RectMark, TextMark]);\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.bar;\n  type = SeriesTypeEnum.bar;\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.bar]: { name: SeriesMarkNameEnum.bar, type: MarkTypeEnum.rect }\n  };\n\n  protected declare _theme: Maybe<IBarSeriesTheme>;\n\n  protected _stack: boolean = true;\n  protected _bandPosition = 0;\n  protected _rectMark!: IRectMark;\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    this._rectMark = this._createMark(\n      {\n        ...BarSeries.mark.bar,\n        name: this._barMarkName,\n        type: this._barMarkType\n      },\n      {\n        morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig(this.type, this._spec)),\n        defaultMorphElementKey: this.getDimensionField()[0],\n        groupKey: this._seriesField,\n        isSeriesMark: true,\n        label: merge({ animation: this._spec.animation }, this._spec.label),\n        progressive\n      }\n    ) as IRectMark;\n  }\n\n  initMarkStyle(): void {\n    const rectMark = this._rectMark;\n    if (rectMark) {\n      this.setMarkStyle(\n        rectMark,\n        {\n          fill: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      this._trigger.registerMark(rectMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(rectMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getStackValueField()];\n      },\n      z: this.dataToPositionZ.bind(this)\n    });\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    if (this.direction === 'vertical') {\n      this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    } else {\n      this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    }\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    // TODO: 这里要考虑更多 条件因素\n    // TODO: 这里要补充堆积\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n          x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n          y: (datum: Datum) => {\n            const bandWidth =\n              this.getYAxisHelper().getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ??\n              DefaultBandWidth;\n            const continuous = isContinuous(yScale.type || 'band');\n            const pos = this.dataToPositionY(datum);\n            const width = this._rectMark.getAttribute('height', datum) as number;\n            return pos + (bandWidth - width) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n          },\n          height: () => this.getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => {\n            const bandWidth =\n              this.getXAxisHelper().getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ??\n              DefaultBandWidth;\n            const width = this._rectMark.getAttribute('width', datum) as number;\n            const continuous = isContinuous(this.getXAxisHelper().getScale?.(0).type || 'band');\n            const pos = this.dataToPositionX(datum);\n            return pos + (bandWidth - width) / 2 + (continuous ? -bandWidth / 2 : 0);\n          },\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n          y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale),\n          width: () => {\n            return this.getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initLinearRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    this.setMarkStyle(\n      this._rectMark,\n      {\n        x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n        x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n        y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n        y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n  }\n\n  initAnimation() {\n    // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n    // 而且这个值理论上是动态的，建议 监听 viewDataStatisticsUpdate 消息动态更新\n    const animationParams: IBarAnimationParams = {\n      yField: this._fieldY[0],\n      xField: this._fieldX[0],\n      direction: this.direction,\n      growFrom: () =>\n        this.direction === 'horizontal'\n          ? this._xAxisHelper?.getScale(0).scale(0)\n          : this._yAxisHelper?.getScale(0).scale(0)\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._rectMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.bar(animationParams, appearPreset),\n        userAnimationConfig(this._barMarkName, this._spec),\n        { dataIndex }\n      )\n    );\n  }\n\n  protected getBarWidth(axisHelper: IAxisHelper) {\n    const hasBarWidth = this._spec.barWidth !== undefined;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (hasBarWidth) {\n      return getActualNumValue(this._spec.barWidth, bandWidth);\n    }\n    const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n    const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n    let width = bandWidth;\n    if (hasBarMinWidth) {\n      width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n    }\n    if (hasBarMaxWidth) {\n      width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n    }\n    return width;\n  }\n\n  /**\n   * spec 更新\n   * @param spec\n   * @returns\n   */\n  updateSpec(spec: IBarSeriesSpec) {\n    // super updateSpec 会执行 setAttrFromSpec 所以先缓存比对值\n    const { direction } = this._spec;\n    const result = super.updateSpec(spec);\n    if (spec.direction !== direction) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel } from '../../constant';\nimport { getActualNumValue } from '../util/utils';\nimport type { Maybe, Datum, DirectionType } from '../../typings';\nimport { merge, valueInScaleRange } from '../../util';\nimport type { BarAppearPreset, IBarAnimationParams } from './animation';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum } from '../interface';\nimport { SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { BaseSeries } from '../base/base-series';\nimport { VChart } from '../../core/vchart';\nimport { RectMark } from '../../mark/rect';\nimport { TextMark } from '../../mark/text';\nimport { array, isValid, last } from '@visactor/vutils';\n\nVChart.useMark([RectMark, TextMark]);\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.bar;\n  type = SeriesTypeEnum.bar;\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.bar]: { name: SeriesMarkNameEnum.bar, type: MarkTypeEnum.rect }\n  };\n\n  protected declare _theme: Maybe<IBarSeriesTheme>;\n\n  protected _stack: boolean = true;\n  protected _bandPosition = 0;\n  protected _rectMark!: IRectMark;\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    this._rectMark = this._createMark(\n      {\n        ...BarSeries.mark.bar,\n        name: this._barMarkName,\n        type: this._barMarkType\n      },\n      {\n        morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig(this.type, this._spec)),\n        defaultMorphElementKey: this.getDimensionField()[0],\n        groupKey: this._seriesField,\n        isSeriesMark: true,\n        label: merge({ animation: this._spec.animation }, this._spec.label),\n        progressive\n      }\n    ) as IRectMark;\n  }\n\n  initMarkStyle(): void {\n    const rectMark = this._rectMark;\n    if (rectMark) {\n      this.setMarkStyle(\n        rectMark,\n        {\n          fill: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      this._trigger.registerMark(rectMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(rectMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getStackValueField()];\n      },\n      z: this.dataToPositionZ.bind(this)\n    });\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    if (this.direction === 'vertical') {\n      this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    } else {\n      this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    }\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    // TODO: 这里要考虑更多 条件因素\n    // TODO: 这里要补充堆积\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n          x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n          y: (datum: Datum) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n          y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale),\n          width: () => {\n            return this._getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initLinearRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    this.setMarkStyle(\n      this._rectMark,\n      {\n        x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n        x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n        y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n        y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n  }\n\n  initAnimation() {\n    // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n    // 而且这个值理论上是动态的，建议 监听 viewDataStatisticsUpdate 消息动态更新\n    const animationParams: IBarAnimationParams = {\n      yField: this._fieldY[0],\n      xField: this._fieldX[0],\n      direction: this.direction,\n      growFrom: () =>\n        this.direction === 'horizontal'\n          ? this._xAxisHelper?.getScale(0).scale(0)\n          : this._yAxisHelper?.getScale(0).scale(0)\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._rectMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.bar(animationParams, appearPreset),\n        userAnimationConfig(this._barMarkName, this._spec),\n        { dataIndex }\n      )\n    );\n  }\n\n  protected _getBarWidth(axisHelper: IAxisHelper) {\n    const hasBarWidth = this._spec.barWidth !== undefined;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n\n    if (hasBarWidth) {\n      return getActualNumValue(this._spec.barWidth, bandWidth);\n    }\n    const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n    const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n    let width = bandWidth;\n    if (hasBarMinWidth) {\n      width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n    }\n    if (hasBarMaxWidth) {\n      width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n    }\n    return width;\n  }\n\n  protected _getPosition(direction: DirectionType, datum: Datum) {\n    let axisHelper;\n    let sizeAttribute;\n    let dataToPosition;\n    if (direction === Direction.horizontal) {\n      axisHelper = this.getYAxisHelper();\n      sizeAttribute = 'height';\n      dataToPosition = this.dataToPositionY.bind(this);\n    } else {\n      axisHelper = this.getXAxisHelper();\n      sizeAttribute = 'width';\n      dataToPosition = this.dataToPositionX.bind(this);\n    }\n    const scale = axisHelper.getScale(0);\n    const size = this._rectMark.getAttribute(sizeAttribute, datum) as number;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (this._groups?.fields?.length > 1 && isValid(this._spec.barGapInGroup)) {\n      // 自里向外计算，沿着第一层分组的中心点进行位置调整\n      const groupFields = this._groups.fields;\n      const barInGroup = array(this._spec.barGapInGroup);\n      let totalWidth: number = 0;\n      let offSet: number = 0;\n\n      for (let index = groupFields.length - 1; index >= 1; index--) {\n        const groupField = groupFields[index];\n        const groupValues = this.getViewDataStatistics()?.latestData?.[groupField]?.values ?? [];\n        const groupCount = groupValues.length;\n        const gap = getActualNumValue(barInGroup[index - 1] ?? last(barInGroup), bandWidth);\n        const i = groupValues.indexOf(datum[groupField]);\n        if (index === groupFields.length - 1) {\n          totalWidth += groupCount * size + (groupCount - 1) * gap;\n          offSet += i * (size + gap);\n        } else {\n          offSet += i * (totalWidth + gap);\n          totalWidth += totalWidth + (groupCount - 1) * gap;\n        }\n      }\n\n      const center = scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2;\n      return center - totalWidth / 2 + offSet;\n    }\n\n    const continuous = isContinuous(scale.type || 'band');\n    const pos = dataToPosition(datum);\n    return pos + (bandWidth - size) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n  }\n\n  /**\n   * spec 更新\n   * @param spec\n   * @returns\n   */\n  updateSpec(spec: IBarSeriesSpec) {\n    // super updateSpec 会执行 setAttrFromSpec 所以先缓存比对值\n    const { direction } = this._spec;\n    const result = super.updateSpec(spec);\n    if (spec.direction !== direction) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n}\n"]}

package/esm/series/bar/interface.d.ts

@@ -6,6 +6,7 @@ import type { BarAppearPreset } from './animation';
 import type { ILabelSpec } from '../../component/label';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface';
+import type { MaybeArray } from '../../typings';
 type BarMarks = 'bar';
 export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<BarMarks, BarAppearPreset>, IMarkProgressiveConfig {
     type: 'bar';
@@ -13,9 +14,10 @@ export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<Bar
     [SeriesMarkNameEnum.label]?: ILabelSpec & {
         position?: 'outside' | 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left';
     };
-    barWidth?: number;
-    barMinWidth?: number;
-    barMaxWidth?: number;
+    barWidth?: number | string;
+    barMinWidth?: number | string;
+    barMaxWidth?: number | string;
+    barGapInGroup?: MaybeArray<number | string>;
 }
 export interface IBarSeriesTheme extends ICartesianSeriesTheme {
     [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;

package/esm/series/bar/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/bar/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { IRect3dMarkSpec, IRectMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { BarAppearPreset } from './animation';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { SeriesMarkNameEnum } from '../interface';\n\ntype BarMarks = 'bar';\n\nexport interface IBarSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<BarMarks, BarAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   *  系列类型\n   */\n  type: 'bar';\n  /**\n   * 图元配置\n   */\n  [SeriesMarkNameEnum.bar]?: IMarkSpec<IRectMarkSpec>;\n  /** 标签配置*/\n  [SeriesMarkNameEnum.label]?: ILabelSpec & {\n    /** 标签位置 */\n    position?:\n      | 'outside'\n      | 'top'\n      | 'bottom'\n      | 'left'\n      | 'right'\n      | 'inside'\n      | 'inside-top'\n      | 'inside-bottom'\n      | 'inside-right'\n      | 'inside-left';\n  };\n  /**\n   * 柱体宽度\n   */\n  barWidth?: number;\n  /**\n   * 柱体最小宽度\n   */\n  barMinWidth?: number;\n  /**\n   * 柱体最大宽度\n   */\n  barMaxWidth?: number;\n}\n\nexport interface IBarSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /**\n   * 柱体宽度\n   */\n  barWidth?: number;\n  /**\n   * 柱体最小宽度\n   */\n  barMinWidth?: number;\n  /**\n   * 柱体最大宽度\n   */\n  barMaxWidth?: number;\n}\n\nexport type IBar3dSeriesSpec = {\n  type: 'bar3d';\n} & Omit<IBarSeriesSpec, 'type'> &\n  ICartesianSeriesSpec &\n  IAnimationSpec<BarMarks, BarAppearPreset>;\n\nexport interface IBar3dSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar3d]?: Partial<IMarkTheme<IRect3dMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/bar/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { IRect3dMarkSpec, IRectMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { BarAppearPreset } from './animation';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { SeriesMarkNameEnum } from '../interface';\nimport type { MaybeArray } from '../../typings';\n\ntype BarMarks = 'bar';\n\nexport interface IBarSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<BarMarks, BarAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   *  系列类型\n   */\n  type: 'bar';\n  /**\n   * 图元配置\n   */\n  [SeriesMarkNameEnum.bar]?: IMarkSpec<IRectMarkSpec>;\n  /** 标签配置*/\n  [SeriesMarkNameEnum.label]?: ILabelSpec & {\n    /** 标签位置 */\n    position?:\n      | 'outside'\n      | 'top'\n      | 'bottom'\n      | 'left'\n      | 'right'\n      | 'inside'\n      | 'inside-top'\n      | 'inside-bottom'\n      | 'inside-right'\n      | 'inside-left';\n  };\n  /**\n   * 柱体宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barWidth?: number | string;\n  /**\n   * 柱体最小宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barMinWidth?: number | string;\n  /**\n   * 柱体最大宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barMaxWidth?: number | string;\n  /**\n   * 分组柱图中各个分组内的柱子间距，可以设置绝对的像素值，也可以使用百分比（如 '10%'）。\n   * 当存在多层分组时，可以使用数组来设置不同层级的间距，如 [10, '20%']，表示第一层分组的间距为 10px，第二层分组的间距为 '20%'。\n   * 如果 barGapInGroup 的数组个数小于分组层数，则后面的分组间距使用最后一个值。\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   * @since 1.2.0\n   */\n  barGapInGroup?: MaybeArray<number | string>;\n}\n\nexport interface IBarSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /**\n   * 柱体宽度\n   */\n  barWidth?: number;\n  /**\n   * 柱体最小宽度\n   */\n  barMinWidth?: number;\n  /**\n   * 柱体最大宽度\n   */\n  barMaxWidth?: number;\n}\n\nexport type IBar3dSeriesSpec = {\n  type: 'bar3d';\n} & Omit<IBarSeriesSpec, 'type'> &\n  ICartesianSeriesSpec &\n  IAnimationSpec<BarMarks, BarAppearPreset>;\n\nexport interface IBar3dSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar3d]?: Partial<IMarkTheme<IRect3dMarkSpec>>;\n}\n"]}

package/esm/series/base/base-series.d.ts

@@ -78,6 +78,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
         operations: StatisticOperations;
     }[]): DataView;
     private createdStackData;
+    protected _noAnimationDataKey(datum: Datum, index: number, context: AddVChartPropertyContext): unknown | undefined;
     protected generateDefaultDataKey(dataKey: DataKeyType, datum: Datum, index: number, context: AddVChartPropertyContext): any;
     protected _addDataIndexAndKey(): void;
     updateRawData(d: any): void;