@visactor/vchart 1.11.11 → 1.11.12

package/cjs/event/events/dimension/util/cartesian.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getDimensionInfoByValue = exports.getDimensionInfoByPosition = exports.getCartesianDimensionInfo = void 0;
 
-const vscale_1 = require("@visactor/vscale"), common_1 = require("./common"), vutils_1 = require("@visactor/vutils"), common_2 = require("../../../../component/axis/cartesian/util/common"), model_1 = require("../../../../util/model"), discreteXAxisGetDimensionField = series => series.fieldX[0], discreteYAxisGetDimensionField = series => series.fieldY[0], continuousXAxisGetDimensionField = series => {
+const vscale_1 = require("@visactor/vscale"), common_1 = require("./common"), vutils_1 = require("@visactor/vutils"), common_2 = require("../../../../component/axis/cartesian/util/common"), discreteXAxisGetDimensionField = series => series.fieldX[0], discreteYAxisGetDimensionField = series => series.fieldY[0], continuousXAxisGetDimensionField = series => {
     var _a;
     return [ series.fieldX[0], null !== (_a = series.fieldX2) && void 0 !== _a ? _a : series.fieldX[1] ];
 }, continuousYAxisGetDimensionField = series => {
@@ -13,7 +13,6 @@ const vscale_1 = require("@visactor/vscale"), common_1 = require("./common"), vu
 }, getDimensionFieldFunc = (isXAxis, isDiscreteAxis) => isXAxis ? isDiscreteAxis ? discreteXAxisGetDimensionField : continuousXAxisGetDimensionField : isDiscreteAxis ? discreteYAxisGetDimensionField : continuousYAxisGetDimensionField, getCartesianDimensionInfo = (chart, pos, isTooltip) => {
     var _a, _b;
     if (!chart) return null;
-    if (!(0, model_1.getFirstSeries)(chart.getRegionsInIndex(), "cartesian")) return null;
     const {x: x, y: y} = pos, xAxisList = null !== (_a = (0, common_1.getAxis)(chart, (cmp => (0, 
     common_2.isXAxis)(cmp.getOrient())), pos)) && void 0 !== _a ? _a : [], yAxisList = null !== (_b = (0, 
     common_1.getAxis)(chart, (cmp => (0, common_2.isYAxis)(cmp.getOrient())), pos)) && void 0 !== _b ? _b : [], bandAxisSet = new Set, linearAxisSet = new Set, forceAxisSet = new Set;

package/cjs/event/events/dimension/util/cartesian.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/events/dimension/util/cartesian.ts"],"names":[],"mappings":"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","file":"cartesian.js","sourcesContent":["import type { IChart } from '../../../../chart/interface';\nimport type { IDimensionInfo } from '../interface';\nimport { isDiscrete } from '@visactor/vscale';\nimport { getDimensionData, getAxis } from './common';\nimport type { CartesianAxis } from '../../../../component/axis/cartesian';\nimport type { ICartesianSeries } from '../../../../series/interface';\nimport { isNil } from '@visactor/vutils';\nimport { isXAxis, isYAxis } from '../../../../component/axis/cartesian/util/common';\nimport { Direction } from '../../../../typings/space';\nimport type { ILayoutPoint } from '../../../../typings/layout';\nimport { getFirstSeries } from '../../../../util/model';\n\nconst discreteXAxisGetDimensionField = (series: ICartesianSeries) => series.fieldX[0];\nconst discreteYAxisGetDimensionField = (series: ICartesianSeries) => series.fieldY[0];\nconst continuousXAxisGetDimensionField = (series: ICartesianSeries) => [\n  series.fieldX[0],\n  series.fieldX2 ?? series.fieldX[1]\n];\nconst continuousYAxisGetDimensionField = (series: ICartesianSeries) => [\n  series.fieldY[0],\n  series.fieldY2 ?? series.fieldY[1]\n];\n\nconst getDimensionFieldFunc = (isXAxis: boolean, isDiscreteAxis: boolean) =>\n  isXAxis\n    ? isDiscreteAxis\n      ? discreteXAxisGetDimensionField\n      : continuousXAxisGetDimensionField\n    : isDiscreteAxis\n    ? discreteYAxisGetDimensionField\n    : continuousYAxisGetDimensionField;\n\nexport const getCartesianDimensionInfo = (\n  chart: IChart | undefined,\n  pos: ILayoutPoint,\n  isTooltip?: boolean\n): IDimensionInfo[] | null => {\n  if (!chart) {\n    return null;\n  }\n  const series = getFirstSeries(chart.getRegionsInIndex(), 'cartesian');\n  if (!series) {\n    return null;\n  }\n\n  const { x, y } = pos;\n  const xAxisList = getAxis(chart, (cmp: CartesianAxis) => isXAxis(cmp.getOrient()), pos) ?? [];\n  const yAxisList = getAxis(chart, (cmp: CartesianAxis) => isYAxis(cmp.getOrient()), pos) ?? [];\n\n  /** 离散轴集合 */\n  const bandAxisSet: Set<CartesianAxis> = new Set();\n  /** 连续轴集合 */\n  const linearAxisSet: Set<CartesianAxis> = new Set();\n  /** 必须包含的轴的集合 */\n  const forceAxisSet: Set<CartesianAxis> = new Set();\n\n  [xAxisList, yAxisList].forEach(axisList =>\n    axisList.forEach(axis => {\n      const isDiscreteAxis = isDiscrete(axis.getScale().type);\n      if (isDiscreteAxis) {\n        bandAxisSet.add(axis);\n      } else {\n        linearAxisSet.add(axis);\n      }\n      if (isTooltip && axis.getSpec().hasDimensionTooltip) {\n        forceAxisSet.add(axis);\n      }\n    })\n  );\n\n  const targetAxisInfo: IDimensionInfo[] = [];\n\n  const addAxisDimensionInfo = (orient: 'x' | 'y') => {\n    const isXAxis = orient === 'x';\n    const posValue = isXAxis ? x : y;\n    const axisList = isXAxis ? xAxisList : yAxisList;\n    axisList.forEach(axis => {\n      if (forceAxisSet.size > 0) {\n        if (forceAxisSet.has(axis)) {\n          const info = getDimensionInfoByPosition(\n            axis,\n            posValue,\n            orient,\n            getDimensionFieldFunc(isXAxis, isDiscrete(axis.getScale().type))\n          );\n          info && targetAxisInfo.push(info);\n        }\n      } else {\n        const hasDiscreteAxis = bandAxisSet.size > 0;\n        if ((hasDiscreteAxis ? bandAxisSet : linearAxisSet).has(axis)) {\n          const info = getDimensionInfoByPosition(\n            axis,\n            posValue,\n            orient,\n            getDimensionFieldFunc(isXAxis, hasDiscreteAxis)\n          );\n          info && targetAxisInfo.push(info);\n        }\n      }\n    });\n  };\n\n  // 优先筛选 band 轴，其次按照 direction 判断\n  if (chart.getSpec().direction === Direction.horizontal) {\n    addAxisDimensionInfo('y');\n    if (targetAxisInfo.length === 0) {\n      addAxisDimensionInfo('x');\n    }\n  } else {\n    addAxisDimensionInfo('x');\n    if (targetAxisInfo.length === 0) {\n      addAxisDimensionInfo('y');\n    }\n  }\n\n  if (!targetAxisInfo.length) {\n    return null;\n  }\n  return targetAxisInfo;\n};\n\nexport const getDimensionInfoByPosition = (\n  axis: CartesianAxis,\n  posValue: number,\n  posKey: 'x' | 'y',\n  getDimensionField: (series: ICartesianSeries) => string | string[]\n): IDimensionInfo | null => {\n  const scale = axis.getScale();\n  const scalePos = posValue - axis.getLayoutStartPoint()[posKey];\n  // 判断是否在 range 范围内\n  if ((scalePos - scale.range()[0]) * (scalePos - scale.range()[1]) > 0) {\n    return null;\n  }\n\n  const value = scale.invert(scalePos);\n  return getDimensionInfoByValue(axis, value, getDimensionField);\n};\n\nexport const getDimensionInfoByValue = (\n  axis: CartesianAxis,\n  value: any,\n  getDimensionField?: (series: ICartesianSeries) => string | string[]\n): IDimensionInfo | null => {\n  const scale = axis.getScale();\n\n  if (isNil(value)) {\n    return null;\n  }\n  const domain = scale.domain();\n  let index: number | undefined = domain.findIndex((v: any) => v?.toString() === value.toString());\n  if (index < 0) {\n    index = undefined;\n  }\n\n  const data = getDimensionData(\n    value,\n    axis,\n    'cartesian',\n    getDimensionField ?? (isXAxis(axis.getOrient()) ? discreteXAxisGetDimensionField : discreteYAxisGetDimensionField)\n  );\n  return { index, value, position: scale.scale(value), axis, data };\n};\n"]}
+{"version":3,"sources":["../src/event/events/dimension/util/cartesian.ts"],"names":[],"mappings":"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","file":"cartesian.js","sourcesContent":["import type { IChart } from '../../../../chart/interface';\nimport type { IDimensionInfo } from '../interface';\nimport { isDiscrete } from '@visactor/vscale';\nimport { getDimensionData, getAxis } from './common';\nimport type { CartesianAxis } from '../../../../component/axis/cartesian';\nimport type { ICartesianSeries } from '../../../../series/interface';\nimport { isNil } from '@visactor/vutils';\nimport { isXAxis, isYAxis } from '../../../../component/axis/cartesian/util/common';\nimport { Direction } from '../../../../typings/space';\nimport type { ILayoutPoint } from '../../../../typings/layout';\n\nconst discreteXAxisGetDimensionField = (series: ICartesianSeries) => series.fieldX[0];\nconst discreteYAxisGetDimensionField = (series: ICartesianSeries) => series.fieldY[0];\nconst continuousXAxisGetDimensionField = (series: ICartesianSeries) => [\n  series.fieldX[0],\n  series.fieldX2 ?? series.fieldX[1]\n];\nconst continuousYAxisGetDimensionField = (series: ICartesianSeries) => [\n  series.fieldY[0],\n  series.fieldY2 ?? series.fieldY[1]\n];\n\nconst getDimensionFieldFunc = (isXAxis: boolean, isDiscreteAxis: boolean) =>\n  isXAxis\n    ? isDiscreteAxis\n      ? discreteXAxisGetDimensionField\n      : continuousXAxisGetDimensionField\n    : isDiscreteAxis\n    ? discreteYAxisGetDimensionField\n    : continuousYAxisGetDimensionField;\n\nexport const getCartesianDimensionInfo = (\n  chart: IChart | undefined,\n  pos: ILayoutPoint,\n  isTooltip?: boolean\n): IDimensionInfo[] | null => {\n  if (!chart) {\n    return null;\n  }\n\n  const { x, y } = pos;\n  const xAxisList = getAxis(chart, (cmp: CartesianAxis) => isXAxis(cmp.getOrient()), pos) ?? [];\n  const yAxisList = getAxis(chart, (cmp: CartesianAxis) => isYAxis(cmp.getOrient()), pos) ?? [];\n\n  /** 离散轴集合 */\n  const bandAxisSet: Set<CartesianAxis> = new Set();\n  /** 连续轴集合 */\n  const linearAxisSet: Set<CartesianAxis> = new Set();\n  /** 必须包含的轴的集合 */\n  const forceAxisSet: Set<CartesianAxis> = new Set();\n\n  [xAxisList, yAxisList].forEach(axisList =>\n    axisList.forEach(axis => {\n      const isDiscreteAxis = isDiscrete(axis.getScale().type);\n      if (isDiscreteAxis) {\n        bandAxisSet.add(axis);\n      } else {\n        linearAxisSet.add(axis);\n      }\n      if (isTooltip && axis.getSpec().hasDimensionTooltip) {\n        forceAxisSet.add(axis);\n      }\n    })\n  );\n\n  const targetAxisInfo: IDimensionInfo[] = [];\n\n  const addAxisDimensionInfo = (orient: 'x' | 'y') => {\n    const isXAxis = orient === 'x';\n    const posValue = isXAxis ? x : y;\n    const axisList = isXAxis ? xAxisList : yAxisList;\n    axisList.forEach(axis => {\n      if (forceAxisSet.size > 0) {\n        if (forceAxisSet.has(axis)) {\n          const info = getDimensionInfoByPosition(\n            axis,\n            posValue,\n            orient,\n            getDimensionFieldFunc(isXAxis, isDiscrete(axis.getScale().type))\n          );\n          info && targetAxisInfo.push(info);\n        }\n      } else {\n        const hasDiscreteAxis = bandAxisSet.size > 0;\n        if ((hasDiscreteAxis ? bandAxisSet : linearAxisSet).has(axis)) {\n          const info = getDimensionInfoByPosition(\n            axis,\n            posValue,\n            orient,\n            getDimensionFieldFunc(isXAxis, hasDiscreteAxis)\n          );\n          info && targetAxisInfo.push(info);\n        }\n      }\n    });\n  };\n\n  // 优先筛选 band 轴，其次按照 direction 判断\n  if (chart.getSpec().direction === Direction.horizontal) {\n    addAxisDimensionInfo('y');\n    if (targetAxisInfo.length === 0) {\n      addAxisDimensionInfo('x');\n    }\n  } else {\n    addAxisDimensionInfo('x');\n    if (targetAxisInfo.length === 0) {\n      addAxisDimensionInfo('y');\n    }\n  }\n\n  if (!targetAxisInfo.length) {\n    return null;\n  }\n  return targetAxisInfo;\n};\n\nexport const getDimensionInfoByPosition = (\n  axis: CartesianAxis,\n  posValue: number,\n  posKey: 'x' | 'y',\n  getDimensionField: (series: ICartesianSeries) => string | string[]\n): IDimensionInfo | null => {\n  const scale = axis.getScale();\n  const scalePos = posValue - axis.getLayoutStartPoint()[posKey];\n  // 判断是否在 range 范围内\n  if ((scalePos - scale.range()[0]) * (scalePos - scale.range()[1]) > 0) {\n    return null;\n  }\n\n  const value = scale.invert(scalePos);\n  return getDimensionInfoByValue(axis, value, getDimensionField);\n};\n\nexport const getDimensionInfoByValue = (\n  axis: CartesianAxis,\n  value: any,\n  getDimensionField?: (series: ICartesianSeries) => string | string[]\n): IDimensionInfo | null => {\n  const scale = axis.getScale();\n\n  if (isNil(value)) {\n    return null;\n  }\n  const domain = scale.domain();\n  let index: number | undefined = domain.findIndex((v: any) => v?.toString() === value.toString());\n  if (index < 0) {\n    index = undefined;\n  }\n\n  const data = getDimensionData(\n    value,\n    axis,\n    'cartesian',\n    getDimensionField ?? (isXAxis(axis.getOrient()) ? discreteXAxisGetDimensionField : discreteYAxisGetDimensionField)\n  );\n  return { index, value, position: scale.scale(value), axis, data };\n};\n"]}

package/cjs/event/events/dimension/util/polar.js

@@ -4,13 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getPolarDimensionInfo = void 0;
 
-const vscale_1 = require("@visactor/vscale"), common_1 = require("./common"), vutils_1 = require("@visactor/vutils"), math_1 = require("../../../../util/math"), model_1 = require("../../../../util/model"), angleStandardize = (angle, range) => {
+const vscale_1 = require("@visactor/vscale"), common_1 = require("./common"), vutils_1 = require("@visactor/vutils"), math_1 = require("../../../../util/math"), angleStandardize = (angle, range) => {
     const unit = 2 * Math.PI, min = (0, vutils_1.minInArray)(range), max = (0, vutils_1.maxInArray)(range);
     return angle < min ? angle += Math.ceil((min - angle) / unit) * unit : angle > max && (angle -= Math.ceil((angle - max) / unit) * unit), 
     angle;
 }, getPolarDimensionInfo = (chart, pos) => {
     if (!chart) return null;
-    if (!(0, model_1.getFirstSeries)(chart.getRegionsInIndex(), "polar")) return null;
     const {x: x, y: y} = pos, angleAxisList = (0, common_1.getAxis)(chart, (cmp => "angle" === cmp.getOrient()), pos), radiusAxisList = (0, 
     common_1.getAxis)(chart, (cmp => "radius" === cmp.getOrient()), pos), targetAxisInfo = [], getDimensionField = series => series.getDimensionField()[0];
     return angleAxisList && angleAxisList.forEach((axis => {

package/cjs/event/events/dimension/util/polar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/events/dimension/util/polar.ts"],"names":[],"mappings":"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","file":"polar.js","sourcesContent":["import type { IChart } from '../../../../chart/interface';\nimport type { IDimensionInfo } from '../interface';\nimport { isDiscrete } from '@visactor/vscale';\nimport { getAxis, getDimensionData } from './common';\nimport type { IPolarSeries } from '../../../../series/interface';\nimport { isNil, maxInArray, minInArray } from '@visactor/vutils';\nimport { distance, vectorAngle } from '../../../../util/math';\nimport type { ILayoutPoint } from '../../../../typings/layout';\nimport type { PolarAxis } from '../../../../component';\nimport { getFirstSeries } from '../../../../util/model';\n\n/** 将角度标准化为 range 范围内的角度 */\nconst angleStandardize = (angle: number, range: [number, number]) => {\n  const unit = Math.PI * 2;\n  const min = minInArray(range);\n  const max = maxInArray(range);\n  if (angle < min) {\n    angle += Math.ceil((min - angle) / unit) * unit;\n  } else if (angle > max) {\n    angle -= Math.ceil((angle - max) / unit) * unit;\n  }\n  return angle;\n};\n\nexport const getPolarDimensionInfo = (chart: IChart | undefined, pos: ILayoutPoint): IDimensionInfo[] | null => {\n  if (!chart) {\n    return null;\n  }\n  const series = getFirstSeries(chart.getRegionsInIndex(), 'polar');\n  if (!series) {\n    return null;\n  }\n\n  const { x, y } = pos;\n  const angleAxisList = getAxis(chart, (cmp: PolarAxis) => cmp.getOrient() === 'angle', pos);\n  const radiusAxisList = getAxis(chart, (cmp: PolarAxis) => cmp.getOrient() === 'radius', pos);\n  const targetAxisInfo: IDimensionInfo[] = [];\n\n  const getDimensionField = (series: IPolarSeries) => series.getDimensionField()[0];\n\n  if (angleAxisList) {\n    angleAxisList.forEach(axis => {\n      const angleScale = axis.getScale();\n      // 限定为离散轴\n      if (angleScale && isDiscrete(angleScale.type)) {\n        const angleDomain = angleScale.domain();\n        const angleRange = angleScale.range();\n        const center = axis.getCenter();\n        const vector = {\n          x: x - axis.getLayoutStartPoint().x - center.x,\n          y: y - axis.getLayoutStartPoint().y - center.y\n        };\n\n        // 计算顺时针角度\n        let angle = vectorAngle({ x: 1, y: 0 }, vector);\n        angle = angleStandardize(angle, angleRange);\n\n        // 计算半径\n        const radius = distance(vector);\n        const radiusScale = radiusAxisList[0]?.getScale(); // FIXME: 想办法获取到和当前角度轴对应的径向轴，而不是取第一个\n        const radiusRange = radiusScale?.range();\n\n        // 判断是否在 range 范围内\n        if (\n          (angle - angleRange?.[0]) * (angle - angleRange?.[1]) > 0 ||\n          (radius - radiusRange?.[0]) * (radius - radiusRange?.[1]) > 0\n        ) {\n          return;\n        }\n\n        const value = axis.invert(angle);\n        if (isNil(value)) {\n          return;\n        }\n        let index: number | undefined = angleDomain.findIndex((v: any) => v?.toString() === value.toString());\n        if (index < 0) {\n          index = undefined;\n        }\n\n        const data = getDimensionData(value, axis, 'polar', getDimensionField);\n        targetAxisInfo.push({ index, value, position: angleScale.scale(value), axis, data });\n      }\n    });\n  }\n  if (radiusAxisList) {\n    radiusAxisList.forEach(axis => {\n      const radiusScale = axis.getScale();\n      const radiusRange = radiusScale?.range();\n\n      // 限定为离散轴\n      if (radiusScale && isDiscrete(radiusScale.type)) {\n        const center = axis.getCenter();\n        const vector = {\n          x: x - axis.getLayoutStartPoint().x - center.x,\n          y: y - axis.getLayoutStartPoint().y - center.y\n        };\n\n        // 计算顺时针角度\n        let angle = vectorAngle({ x: 1, y: 0 }, vector);\n        if (angle < -Math.PI / 2) {\n          angle = Math.PI * 2 + angle;\n        }\n\n        // 计算半径\n        const radius = distance(vector);\n        const angleScale = angleAxisList[0]?.getScale(); // FIXME: 想办法获取到和当前径向轴对应的角度轴，而不是取第一个\n        const angleRange = angleScale?.range();\n\n        // 判断是否在 range 范围内\n        if (\n          (angle - angleRange?.[0]) * (angle - angleRange?.[1]) > 0 ||\n          (radius - radiusRange?.[0]) * (radius - radiusRange?.[1]) > 0\n        ) {\n          return;\n        }\n\n        const value = radiusScale.invert(radius);\n        if (isNil(value)) {\n          return;\n        }\n        const domain = radiusScale.domain();\n        let index: number | undefined = domain.findIndex((v: any) => v?.toString() === value.toString());\n        if (index < 0) {\n          index = undefined;\n        }\n\n        const data = getDimensionData(value, axis, 'polar', getDimensionField);\n        targetAxisInfo.push({ index, value, position: radiusScale.scale(value), axis, data });\n      }\n    });\n  }\n  if (!targetAxisInfo.length) {\n    return null;\n  }\n  return targetAxisInfo;\n};\n"]}
+{"version":3,"sources":["../src/event/events/dimension/util/polar.ts"],"names":[],"mappings":"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","file":"polar.js","sourcesContent":["import type { IChart } from '../../../../chart/interface';\nimport type { IDimensionInfo } from '../interface';\nimport { isDiscrete } from '@visactor/vscale';\nimport { getAxis, getDimensionData } from './common';\nimport type { IPolarSeries } from '../../../../series/interface';\nimport { isNil, maxInArray, minInArray } from '@visactor/vutils';\nimport { distance, vectorAngle } from '../../../../util/math';\nimport type { ILayoutPoint } from '../../../../typings/layout';\nimport type { PolarAxis } from '../../../../component';\n/** 将角度标准化为 range 范围内的角度 */\nconst angleStandardize = (angle: number, range: [number, number]) => {\n  const unit = Math.PI * 2;\n  const min = minInArray(range);\n  const max = maxInArray(range);\n  if (angle < min) {\n    angle += Math.ceil((min - angle) / unit) * unit;\n  } else if (angle > max) {\n    angle -= Math.ceil((angle - max) / unit) * unit;\n  }\n  return angle;\n};\n\nexport const getPolarDimensionInfo = (chart: IChart | undefined, pos: ILayoutPoint): IDimensionInfo[] | null => {\n  if (!chart) {\n    return null;\n  }\n\n  const { x, y } = pos;\n  const angleAxisList = getAxis(chart, (cmp: PolarAxis) => cmp.getOrient() === 'angle', pos);\n  const radiusAxisList = getAxis(chart, (cmp: PolarAxis) => cmp.getOrient() === 'radius', pos);\n  const targetAxisInfo: IDimensionInfo[] = [];\n\n  const getDimensionField = (series: IPolarSeries) => series.getDimensionField()[0];\n\n  if (angleAxisList) {\n    angleAxisList.forEach(axis => {\n      const angleScale = axis.getScale();\n      // 限定为离散轴\n      if (angleScale && isDiscrete(angleScale.type)) {\n        const angleDomain = angleScale.domain();\n        const angleRange = angleScale.range();\n        const center = axis.getCenter();\n        const vector = {\n          x: x - axis.getLayoutStartPoint().x - center.x,\n          y: y - axis.getLayoutStartPoint().y - center.y\n        };\n\n        // 计算顺时针角度\n        let angle = vectorAngle({ x: 1, y: 0 }, vector);\n        angle = angleStandardize(angle, angleRange);\n\n        // 计算半径\n        const radius = distance(vector);\n        const radiusScale = radiusAxisList[0]?.getScale(); // FIXME: 想办法获取到和当前角度轴对应的径向轴，而不是取第一个\n        const radiusRange = radiusScale?.range();\n\n        // 判断是否在 range 范围内\n        if (\n          (angle - angleRange?.[0]) * (angle - angleRange?.[1]) > 0 ||\n          (radius - radiusRange?.[0]) * (radius - radiusRange?.[1]) > 0\n        ) {\n          return;\n        }\n\n        const value = axis.invert(angle);\n        if (isNil(value)) {\n          return;\n        }\n        let index: number | undefined = angleDomain.findIndex((v: any) => v?.toString() === value.toString());\n        if (index < 0) {\n          index = undefined;\n        }\n\n        const data = getDimensionData(value, axis, 'polar', getDimensionField);\n        targetAxisInfo.push({ index, value, position: angleScale.scale(value), axis, data });\n      }\n    });\n  }\n  if (radiusAxisList) {\n    radiusAxisList.forEach(axis => {\n      const radiusScale = axis.getScale();\n      const radiusRange = radiusScale?.range();\n\n      // 限定为离散轴\n      if (radiusScale && isDiscrete(radiusScale.type)) {\n        const center = axis.getCenter();\n        const vector = {\n          x: x - axis.getLayoutStartPoint().x - center.x,\n          y: y - axis.getLayoutStartPoint().y - center.y\n        };\n\n        // 计算顺时针角度\n        let angle = vectorAngle({ x: 1, y: 0 }, vector);\n        if (angle < -Math.PI / 2) {\n          angle = Math.PI * 2 + angle;\n        }\n\n        // 计算半径\n        const radius = distance(vector);\n        const angleScale = angleAxisList[0]?.getScale(); // FIXME: 想办法获取到和当前径向轴对应的角度轴，而不是取第一个\n        const angleRange = angleScale?.range();\n\n        // 判断是否在 range 范围内\n        if (\n          (angle - angleRange?.[0]) * (angle - angleRange?.[1]) > 0 ||\n          (radius - radiusRange?.[0]) * (radius - radiusRange?.[1]) > 0\n        ) {\n          return;\n        }\n\n        const value = radiusScale.invert(radius);\n        if (isNil(value)) {\n          return;\n        }\n        const domain = radiusScale.domain();\n        let index: number | undefined = domain.findIndex((v: any) => v?.toString() === value.toString());\n        if (index < 0) {\n          index = undefined;\n        }\n\n        const data = getDimensionData(value, axis, 'polar', getDimensionField);\n        targetAxisInfo.push({ index, value, position: radiusScale.scale(value), axis, data });\n      }\n    });\n  }\n  if (!targetAxisInfo.length) {\n    return null;\n  }\n  return targetAxisInfo;\n};\n"]}

package/cjs/layout/base-layout.js

@@ -193,9 +193,10 @@ class Layout {
             return null !== (_a = region.maxHeight) && void 0 !== _a ? _a : Number.MAX_VALUE;
         }))), 0);
         return regionItems.forEach((region => {
+            const width = regionWidth - region.layoutPaddingLeft - region.layoutPaddingRight, height = regionHeight - region.layoutPaddingTop - region.layoutPaddingBottom;
             region.setLayoutRect({
-                width: regionWidth,
-                height: regionHeight
+                width: width,
+                height: height
             }), region.setLayoutStartPosition({
                 x: this.leftCurrent + region.layoutOffsetX + region.layoutPaddingLeft,
                 y: this.topCurrent + region.layoutOffsetY + region.layoutPaddingTop

package/cjs/layout/base-layout.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/layout/base-layout.ts"],"names":[],"mappings":"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","file":"base-layout.js","sourcesContent":["import type { utilFunctionCtx } from '../typings/params';\nimport type { IChart } from '../chart/interface/chart';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { IBaseLayout, ILayoutItem } from './interface';\nimport type { IOrientType, IPadding, IRect } from '../typings/space';\nimport { error } from '../util/debug';\nimport { layoutBottomInlineItems, layoutLeftInlineItems, layoutRightInlineItems, layoutTopInlineItems } from './util';\nimport type { ILayoutRect } from '../typings/layout';\n\nexport type LayoutSideType = {\n  top: number;\n  left: number;\n  bottom: number;\n  right: number;\n};\n\nexport interface IOffset {\n  offsetLeft: number;\n  offsetRight: number;\n  offsetTop: number;\n  offsetBottom: number;\n}\n\ntype overlapInfo = {\n  items: ILayoutItem[];\n  rect: ILayoutRect;\n};\n\nexport class Layout implements IBaseLayout {\n  static type = 'base';\n\n  leftCurrent: number = 0;\n  topCurrent: number = 0;\n  rightCurrent: number = 0;\n  bottomCurrent: number = 0;\n\n  _chartLayoutRect!: IRect;\n  _chartViewBox!: IBoundsLike;\n\n  protected _onError: (msg: string) => void;\n\n  constructor(_spec?: unknown, ctx?: utilFunctionCtx) {\n    this._onError = ctx?.onError;\n  }\n\n  protected _layoutInit(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike) {\n    this._chartLayoutRect = chartLayoutRect;\n    this._chartViewBox = chartViewBox;\n    this.leftCurrent = chartLayoutRect.x;\n    this.topCurrent = chartLayoutRect.y;\n    this.rightCurrent = chartLayoutRect.x + chartLayoutRect.width;\n    this.bottomCurrent = chartLayoutRect.height + chartLayoutRect.y;\n\n    // 越大越先处理，进行排序调整，利用原地排序特性，排序会受 level 和传进来的数组顺序共同影响\n    items.sort((a, b) => b.layoutLevel - a.layoutLevel);\n  }\n\n  protected _layoutNormalItems(items: ILayoutItem[]) {\n    this.layoutNormalInlineItems(items.filter(x => x.layoutType === 'normal-inline'));\n    this.layoutNormalItems(items.filter(x => x.layoutType === 'normal'));\n  }\n\n  protected _groupItems(items: ILayoutItem[]) {\n    const regionItems = items.filter(x => x.layoutType === 'region');\n    const relativeItems = items.filter(x => x.layoutType === 'region-relative');\n    const relativeOverlapItems = items.filter(x => x.layoutType === 'region-relative-overlap');\n    const allRelatives = relativeItems.concat(relativeOverlapItems);\n    // 允许重叠元素 ，目前允许重叠元素认为是紧贴region的。最后布局\n    const overlapItems: {\n      [key in IOrientType]: overlapInfo;\n    } = {\n      left: { items: [], rect: { width: 0, height: 0 } },\n      right: { items: [], rect: { width: 0, height: 0 } },\n      top: { items: [], rect: { width: 0, height: 0 } },\n      bottom: { items: [], rect: { width: 0, height: 0 } },\n      z: { items: [], rect: { width: 0, height: 0 } }\n    };\n    relativeOverlapItems.forEach(i => {\n      overlapItems[i.layoutOrient].items.push(i);\n    });\n\n    return {\n      regionItems,\n      relativeItems,\n      relativeOverlapItems,\n      allRelatives,\n      overlapItems\n    };\n  }\n\n  layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void {\n    // 布局初始化\n    this._layoutInit(_chart, items, chartLayoutRect, chartViewBox);\n    // 先布局 normal 类型的元素\n    this._layoutNormalItems(items);\n    // 开始布局 region 相关元素\n    // 为了锁紧先保存一下当前的布局空间\n    const layoutTemp: LayoutSideType = {\n      left: this.leftCurrent,\n      top: this.topCurrent,\n      right: this.rightCurrent,\n      bottom: this.bottomCurrent\n    };\n    const { regionItems, relativeItems, relativeOverlapItems, allRelatives, overlapItems } = this._groupItems(items);\n    // 有元素开启了自动缩进\n    // TODO:目前只有普通占位布局下的 region-relative 元素支持\n    // 主要考虑常规元素超出画布一般为用户个性设置，而且可以设置padding规避裁剪,不需要使用自动缩进\n    this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);\n    // 缩进\n    this._processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems, allRelatives, layoutTemp);\n\n    this.layoutAbsoluteItems(items.filter(x => x.layoutType === 'absolute'));\n  }\n\n  protected _processAutoIndent(\n    regionItems: ILayoutItem[],\n    relativeItems: ILayoutItem[],\n    relativeOverlapItems: ILayoutItem[],\n    overlapItems: {\n      [key in IOrientType]: overlapInfo;\n    } = {\n      left: { items: [], rect: { width: 0, height: 0 } },\n      right: { items: [], rect: { width: 0, height: 0 } },\n      top: { items: [], rect: { width: 0, height: 0 } },\n      bottom: { items: [], rect: { width: 0, height: 0 } },\n      z: { items: [], rect: { width: 0, height: 0 } }\n    },\n    allRelatives: ILayoutItem[],\n    layoutTemp: LayoutSideType\n  ): void {\n    // 如果有缩进\n    if (allRelatives.some(i => i.autoIndent)) {\n      // check auto indent\n      const { top, bottom, left, right } = this._checkAutoIndent(allRelatives, layoutTemp);\n      // 如果出现了需要自动缩进的场景 则基于缩进再次布局\n      if (top || bottom || left || right) {\n        // set outer bounds to padding\n        this.topCurrent = layoutTemp.top + top;\n        this.bottomCurrent = layoutTemp.bottom - bottom;\n        this.leftCurrent = layoutTemp.left + left;\n        this.rightCurrent = layoutTemp.right - right;\n        // reLayout\n        this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);\n      }\n    }\n  }\n\n  protected layoutNormalItems(normalItems: ILayoutItem[]): void {\n    normalItems.forEach(item => {\n      const layoutRect = this.getItemComputeLayoutRect(item);\n      const rect = item.computeBoundsInRect(layoutRect);\n      item.setLayoutRect(rect);\n\n      if (item.layoutOrient === 'left') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingLeft,\n          y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n        });\n        this.leftCurrent += rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n      } else if (item.layoutOrient === 'top') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingLeft,\n          y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n        });\n        this.topCurrent += rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n      } else if (item.layoutOrient === 'right') {\n        item.setLayoutStartPosition({\n          x: this.rightCurrent + item.layoutOffsetX - rect.width - item.layoutPaddingRight,\n          y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n        });\n        this.rightCurrent -= rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n      } else if (item.layoutOrient === 'bottom') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingRight,\n          y: this.bottomCurrent + item.layoutOffsetY - rect.height - item.layoutPaddingBottom\n        });\n        this.bottomCurrent -= rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n      }\n    });\n  }\n\n  protected layoutNormalInlineItems(normalItems: ILayoutItem[]): void {\n    const leftItems = normalItems.filter(item => item.layoutOrient === 'left');\n    const rightItems = normalItems.filter(item => item.layoutOrient === 'right');\n    const topItems = normalItems.filter(item => item.layoutOrient === 'top');\n    const bottomItems = normalItems.filter(item => item.layoutOrient === 'bottom');\n\n    const limitWidth = this._chartLayoutRect.width + this._chartLayoutRect.x;\n    const limitHeight = this._chartLayoutRect.height + this._chartLayoutRect.y;\n\n    // 同 normal，按照 left、top、right、bottom 的顺序进行布局\n    // 各个方向上再按照 position 进行分组布局，顺序为 start middle end\n    leftItems.length && layoutLeftInlineItems(leftItems, this, limitHeight);\n    topItems.length && layoutTopInlineItems(topItems, this, limitWidth);\n    rightItems.length && layoutRightInlineItems(rightItems, this, limitHeight);\n    bottomItems.length && layoutBottomInlineItems(bottomItems, this, limitWidth);\n  }\n\n  protected _layoutRelativeOverlap(orient: IOrientType, info: overlapInfo) {\n    // 得到 max rect\n    info.items.forEach((item: ILayoutItem) => {\n      const layoutRect = this.getItemComputeLayoutRect(item);\n      const rect = item.computeBoundsInRect(layoutRect);\n      info.rect.width = Math.max(rect.width + item.layoutPaddingLeft + item.layoutPaddingRight, info.rect.width);\n      info.rect.height = Math.max(rect.height + item.layoutPaddingTop + item.layoutPaddingBottom, info.rect.height);\n    });\n\n    // 统一设置rect和pos\n    info.items.forEach((item: ILayoutItem) => {\n      item.setLayoutRect(info.rect);\n      if (orient === 'left') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX\n        });\n      } else if (orient === 'right') {\n        item.setLayoutStartPosition({\n          x: this.rightCurrent - info.rect.width + item.layoutOffsetX\n        });\n      } else if (orient === 'top') {\n        item.setLayoutStartPosition({\n          x: this.topCurrent + item.layoutOffsetY\n        });\n      } else {\n        item.setLayoutStartPosition({\n          x: this.bottomCurrent - info.rect.height + item.layoutOffsetY\n        });\n      }\n    });\n\n    if (orient === 'left') {\n      this.leftCurrent += info.rect.width;\n    } else if (orient === 'right') {\n      this.rightCurrent -= info.rect.width;\n    } else if (orient === 'top') {\n      this.topCurrent += info.rect.height;\n    } else {\n      this.bottomCurrent -= info.rect.height;\n    }\n  }\n\n  protected _layoutRelativeItem(item: ILayoutItem, layoutRect: ILayoutRect) {\n    const rect = item.computeBoundsInRect(layoutRect);\n    if (item.layoutOrient === 'left' || item.layoutOrient === 'right') {\n      item.setLayoutRect({ width: rect.width });\n    } else {\n      item.setLayoutRect({ height: rect.height });\n    }\n    // 减少尺寸\n    if (item.layoutOrient === 'left') {\n      item.setLayoutStartPosition({\n        x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingLeft\n      });\n      this.leftCurrent += rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n    } else if (item.layoutOrient === 'right') {\n      this.rightCurrent -= rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n      item.setLayoutStartPosition({\n        x: this.rightCurrent + item.layoutOffsetX + item.layoutPaddingLeft\n      });\n    } // 减少尺寸\n    else if (item.layoutOrient === 'top') {\n      item.setLayoutStartPosition({\n        y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n      });\n      this.topCurrent += rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n    } else if (item.layoutOrient === 'bottom') {\n      this.bottomCurrent -= rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n      item.setLayoutStartPosition({\n        y: this.bottomCurrent + item.layoutOffsetY + item.layoutPaddingTop\n      });\n    }\n  }\n\n  protected _layoutRegionItem(\n    regionItems: ILayoutItem[],\n    regionRelativeTotalWidth: number,\n    regionRelativeTotalHeight: number\n  ) {\n    // region 处理\n    const regionWidth = Math.max(\n      Math.min(regionRelativeTotalWidth, ...regionItems.map(region => region.maxWidth ?? Number.MAX_VALUE)),\n      0\n    );\n    const regionHeight = Math.max(\n      Math.min(regionRelativeTotalHeight, ...regionItems.map(region => region.maxHeight ?? Number.MAX_VALUE)),\n      0\n    );\n    regionItems.forEach(region => {\n      region.setLayoutRect({\n        width: regionWidth,\n        height: regionHeight\n      });\n\n      region.setLayoutStartPosition({\n        x: this.leftCurrent + region.layoutOffsetX + region.layoutPaddingLeft,\n        y: this.topCurrent + region.layoutOffsetY + region.layoutPaddingTop\n      });\n    });\n\n    return {\n      regionHeight,\n      regionWidth\n    };\n  }\n\n  /**\n   *\n   * 1. 补全 region-relative rect 和部分 layoutStartPoint\n   * 2. 补全 region rect 和 layoutStartPoint\n   *\n   */\n  protected layoutRegionItems(\n    regionItems: ILayoutItem[],\n    regionRelativeItems: ILayoutItem[],\n    regionRelativeOverlapItems: ILayoutItem[],\n    overlapItems: {\n      [key in IOrientType]: overlapInfo;\n    } = {\n      left: { items: [], rect: { width: 0, height: 0 } },\n      right: { items: [], rect: { width: 0, height: 0 } },\n      top: { items: [], rect: { width: 0, height: 0 } },\n      bottom: { items: [], rect: { width: 0, height: 0 } },\n      z: { items: [], rect: { width: 0, height: 0 } }\n    }\n  ): void {\n    let regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;\n    let regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;\n\n    regionRelativeItems\n      .filter(x => x.layoutOrient === 'left' || x.layoutOrient === 'right')\n      .forEach(item => {\n        this._layoutRelativeItem(item, this.getItemComputeLayoutRect(item));\n      });\n\n    this._layoutRelativeOverlap('left', overlapItems.left);\n    this._layoutRelativeOverlap('right', overlapItems.right);\n\n    regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;\n\n    regionRelativeItems\n      .filter(x => x.layoutOrient === 'top' || x.layoutOrient === 'bottom')\n      .forEach(item => {\n        this._layoutRelativeItem(item, this.getItemComputeLayoutRect(item));\n      });\n\n    this._layoutRelativeOverlap('top', overlapItems.top);\n    this._layoutRelativeOverlap('bottom', overlapItems.bottom);\n\n    // 此时得到height\n    regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;\n\n    // region 处理\n    const { regionWidth, regionHeight } = this._layoutRegionItem(\n      regionItems,\n      regionRelativeTotalWidth,\n      regionRelativeTotalHeight\n    );\n\n    // region-relative 特殊处理\n    regionRelativeItems.concat(regionRelativeOverlapItems).forEach(item => {\n      // 处理特殊元素的宽高\n      if (['left', 'right'].includes(item.layoutOrient)) {\n        // 用户有配置的话，已经处理过，不需要再次处理\n        const relativeRegion = this.filterRegionsWithID(regionItems, item.layoutBindRegionID[0]);\n\n        item.setLayoutRect({\n          height: relativeRegion.getLayoutRect().height\n        });\n        item.setLayoutStartPosition({\n          y: relativeRegion.getLayoutStartPoint().y + item.layoutOffsetY + item.layoutPaddingTop\n        });\n\n        if (item.layoutOrient === 'right') {\n          item.setLayoutStartPosition({\n            x: item.getLayoutStartPoint().x + regionWidth - regionRelativeTotalWidth\n          });\n        }\n      } else if (['top', 'bottom'].includes(item.layoutOrient)) {\n        const relativeRegion = this.filterRegionsWithID(regionItems, item.layoutBindRegionID[0]);\n\n        item.setLayoutRect({\n          width: relativeRegion.getLayoutRect().width\n        });\n\n        item.setLayoutStartPosition({\n          x: relativeRegion.getLayoutStartPoint().x + item.layoutOffsetX + item.layoutPaddingLeft\n        });\n\n        if (item.layoutOrient === 'bottom') {\n          item.setLayoutStartPosition({\n            y: item.getLayoutStartPoint().y + regionHeight - regionRelativeTotalHeight\n          });\n        }\n      }\n    });\n  }\n\n  /**\n   * 再找出对 absolute 元素，无需排序，在 compiler 层需要排序放置\n   *\n   * 重要：absolute 默认依据 region 进行相对依赖\n   */\n  protected layoutAbsoluteItems(absoluteItems: ILayoutItem[]) {\n    absoluteItems.forEach(item => {\n      // 设置盒子\n      item.absoluteLayoutInRect(this._chartLayoutRect);\n    });\n  }\n\n  // 对普通布局来说，只出一个 region 绑定\n  filterRegionsWithID(items: ILayoutItem[], id: number): ILayoutItem {\n    const target = items.find(x => x.getModelId() === id);\n    if (!target) {\n      (this._onError ?? error)('can not find target region item, invalid id');\n    }\n    return target as ILayoutItem;\n  }\n\n  /**\n   * 工具方法 根据item属性获取给item提供的布局空间\n   * @param item\n   */\n  getItemComputeLayoutRect(item: ILayoutItem) {\n    const result = {\n      width: this.rightCurrent - this.leftCurrent - item.layoutPaddingLeft - item.layoutPaddingRight,\n      height: this.bottomCurrent - this.topCurrent - item.layoutPaddingTop - item.layoutPaddingBottom\n    };\n    return result;\n  }\n\n  protected _checkAutoIndent(\n    items: ILayoutItem[],\n    layoutTemp: {\n      top: number;\n      left: number;\n      bottom: number;\n      right: number;\n    }\n  ): IPadding {\n    const result = {\n      top: 0,\n      left: 0,\n      bottom: 0,\n      right: 0\n    };\n    items.forEach(i => {\n      if (!i.getModelVisible() || !i.autoIndent) {\n        return;\n      }\n      const vOrH = i.layoutOrient === 'left' || i.layoutOrient === 'right';\n      const itemOuter = i.getLastComputeOutBounds();\n      const outer = this._getOutInLayout(itemOuter, i, layoutTemp);\n      if (vOrH) {\n        result.top = Math.max(result.top, outer.top);\n        result.bottom = Math.max(result.bottom, outer.bottom);\n      } else {\n        result.left = Math.max(result.left, outer.left);\n        result.right = Math.max(result.right, outer.right);\n      }\n    });\n    return result;\n  }\n\n  private _getOutInLayout(itemOuter: IBoundsLike, i: ILayoutItem, tempBorder: LayoutSideType): LayoutSideType {\n    const { x, y } = i.getLayoutStartPoint();\n    const { width, height } = i.getLayoutRect();\n\n    const result: LayoutSideType = {\n      left: tempBorder.left - (x - itemOuter.x1),\n      right: x + width + itemOuter.x2 - tempBorder.right,\n      top: tempBorder.top - (y - itemOuter.y1),\n      bottom: y + height + itemOuter.y2 - tempBorder.bottom\n    };\n    return result;\n  }\n}\n"]}
+{"version":3,"sources":["../src/layout/base-layout.ts"],"names":[],"mappings":"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","file":"base-layout.js","sourcesContent":["import type { utilFunctionCtx } from '../typings/params';\nimport type { IChart } from '../chart/interface/chart';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { IBaseLayout, ILayoutItem } from './interface';\nimport type { IOrientType, IPadding, IRect } from '../typings/space';\nimport { error } from '../util/debug';\nimport { layoutBottomInlineItems, layoutLeftInlineItems, layoutRightInlineItems, layoutTopInlineItems } from './util';\nimport type { ILayoutRect } from '../typings/layout';\n\nexport type LayoutSideType = {\n  top: number;\n  left: number;\n  bottom: number;\n  right: number;\n};\n\nexport interface IOffset {\n  offsetLeft: number;\n  offsetRight: number;\n  offsetTop: number;\n  offsetBottom: number;\n}\n\ntype overlapInfo = {\n  items: ILayoutItem[];\n  rect: ILayoutRect;\n};\n\nexport class Layout implements IBaseLayout {\n  static type = 'base';\n\n  leftCurrent: number = 0;\n  topCurrent: number = 0;\n  rightCurrent: number = 0;\n  bottomCurrent: number = 0;\n\n  _chartLayoutRect!: IRect;\n  _chartViewBox!: IBoundsLike;\n\n  protected _onError: (msg: string) => void;\n\n  constructor(_spec?: unknown, ctx?: utilFunctionCtx) {\n    this._onError = ctx?.onError;\n  }\n\n  protected _layoutInit(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike) {\n    this._chartLayoutRect = chartLayoutRect;\n    this._chartViewBox = chartViewBox;\n    this.leftCurrent = chartLayoutRect.x;\n    this.topCurrent = chartLayoutRect.y;\n    this.rightCurrent = chartLayoutRect.x + chartLayoutRect.width;\n    this.bottomCurrent = chartLayoutRect.height + chartLayoutRect.y;\n\n    // 越大越先处理，进行排序调整，利用原地排序特性，排序会受 level 和传进来的数组顺序共同影响\n    items.sort((a, b) => b.layoutLevel - a.layoutLevel);\n  }\n\n  protected _layoutNormalItems(items: ILayoutItem[]) {\n    this.layoutNormalInlineItems(items.filter(x => x.layoutType === 'normal-inline'));\n    this.layoutNormalItems(items.filter(x => x.layoutType === 'normal'));\n  }\n\n  protected _groupItems(items: ILayoutItem[]) {\n    const regionItems = items.filter(x => x.layoutType === 'region');\n    const relativeItems = items.filter(x => x.layoutType === 'region-relative');\n    const relativeOverlapItems = items.filter(x => x.layoutType === 'region-relative-overlap');\n    const allRelatives = relativeItems.concat(relativeOverlapItems);\n    // 允许重叠元素 ，目前允许重叠元素认为是紧贴region的。最后布局\n    const overlapItems: {\n      [key in IOrientType]: overlapInfo;\n    } = {\n      left: { items: [], rect: { width: 0, height: 0 } },\n      right: { items: [], rect: { width: 0, height: 0 } },\n      top: { items: [], rect: { width: 0, height: 0 } },\n      bottom: { items: [], rect: { width: 0, height: 0 } },\n      z: { items: [], rect: { width: 0, height: 0 } }\n    };\n    relativeOverlapItems.forEach(i => {\n      overlapItems[i.layoutOrient].items.push(i);\n    });\n\n    return {\n      regionItems,\n      relativeItems,\n      relativeOverlapItems,\n      allRelatives,\n      overlapItems\n    };\n  }\n\n  layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void {\n    // 布局初始化\n    this._layoutInit(_chart, items, chartLayoutRect, chartViewBox);\n    // 先布局 normal 类型的元素\n    this._layoutNormalItems(items);\n    // 开始布局 region 相关元素\n    // 为了锁紧先保存一下当前的布局空间\n    const layoutTemp: LayoutSideType = {\n      left: this.leftCurrent,\n      top: this.topCurrent,\n      right: this.rightCurrent,\n      bottom: this.bottomCurrent\n    };\n    const { regionItems, relativeItems, relativeOverlapItems, allRelatives, overlapItems } = this._groupItems(items);\n    // 有元素开启了自动缩进\n    // TODO:目前只有普通占位布局下的 region-relative 元素支持\n    // 主要考虑常规元素超出画布一般为用户个性设置，而且可以设置padding规避裁剪,不需要使用自动缩进\n    this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);\n    // 缩进\n    this._processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems, allRelatives, layoutTemp);\n\n    this.layoutAbsoluteItems(items.filter(x => x.layoutType === 'absolute'));\n  }\n\n  protected _processAutoIndent(\n    regionItems: ILayoutItem[],\n    relativeItems: ILayoutItem[],\n    relativeOverlapItems: ILayoutItem[],\n    overlapItems: {\n      [key in IOrientType]: overlapInfo;\n    } = {\n      left: { items: [], rect: { width: 0, height: 0 } },\n      right: { items: [], rect: { width: 0, height: 0 } },\n      top: { items: [], rect: { width: 0, height: 0 } },\n      bottom: { items: [], rect: { width: 0, height: 0 } },\n      z: { items: [], rect: { width: 0, height: 0 } }\n    },\n    allRelatives: ILayoutItem[],\n    layoutTemp: LayoutSideType\n  ): void {\n    // 如果有缩进\n    if (allRelatives.some(i => i.autoIndent)) {\n      // check auto indent\n      const { top, bottom, left, right } = this._checkAutoIndent(allRelatives, layoutTemp);\n      // 如果出现了需要自动缩进的场景 则基于缩进再次布局\n      if (top || bottom || left || right) {\n        // set outer bounds to padding\n        this.topCurrent = layoutTemp.top + top;\n        this.bottomCurrent = layoutTemp.bottom - bottom;\n        this.leftCurrent = layoutTemp.left + left;\n        this.rightCurrent = layoutTemp.right - right;\n        // reLayout\n        this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);\n      }\n    }\n  }\n\n  protected layoutNormalItems(normalItems: ILayoutItem[]): void {\n    normalItems.forEach(item => {\n      const layoutRect = this.getItemComputeLayoutRect(item);\n      const rect = item.computeBoundsInRect(layoutRect);\n      item.setLayoutRect(rect);\n\n      if (item.layoutOrient === 'left') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingLeft,\n          y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n        });\n        this.leftCurrent += rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n      } else if (item.layoutOrient === 'top') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingLeft,\n          y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n        });\n        this.topCurrent += rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n      } else if (item.layoutOrient === 'right') {\n        item.setLayoutStartPosition({\n          x: this.rightCurrent + item.layoutOffsetX - rect.width - item.layoutPaddingRight,\n          y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n        });\n        this.rightCurrent -= rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n      } else if (item.layoutOrient === 'bottom') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingRight,\n          y: this.bottomCurrent + item.layoutOffsetY - rect.height - item.layoutPaddingBottom\n        });\n        this.bottomCurrent -= rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n      }\n    });\n  }\n\n  protected layoutNormalInlineItems(normalItems: ILayoutItem[]): void {\n    const leftItems = normalItems.filter(item => item.layoutOrient === 'left');\n    const rightItems = normalItems.filter(item => item.layoutOrient === 'right');\n    const topItems = normalItems.filter(item => item.layoutOrient === 'top');\n    const bottomItems = normalItems.filter(item => item.layoutOrient === 'bottom');\n\n    const limitWidth = this._chartLayoutRect.width + this._chartLayoutRect.x;\n    const limitHeight = this._chartLayoutRect.height + this._chartLayoutRect.y;\n\n    // 同 normal，按照 left、top、right、bottom 的顺序进行布局\n    // 各个方向上再按照 position 进行分组布局，顺序为 start middle end\n    leftItems.length && layoutLeftInlineItems(leftItems, this, limitHeight);\n    topItems.length && layoutTopInlineItems(topItems, this, limitWidth);\n    rightItems.length && layoutRightInlineItems(rightItems, this, limitHeight);\n    bottomItems.length && layoutBottomInlineItems(bottomItems, this, limitWidth);\n  }\n\n  protected _layoutRelativeOverlap(orient: IOrientType, info: overlapInfo) {\n    // 得到 max rect\n    info.items.forEach((item: ILayoutItem) => {\n      const layoutRect = this.getItemComputeLayoutRect(item);\n      const rect = item.computeBoundsInRect(layoutRect);\n      info.rect.width = Math.max(rect.width + item.layoutPaddingLeft + item.layoutPaddingRight, info.rect.width);\n      info.rect.height = Math.max(rect.height + item.layoutPaddingTop + item.layoutPaddingBottom, info.rect.height);\n    });\n\n    // 统一设置rect和pos\n    info.items.forEach((item: ILayoutItem) => {\n      item.setLayoutRect(info.rect);\n      if (orient === 'left') {\n        item.setLayoutStartPosition({\n          x: this.leftCurrent + item.layoutOffsetX\n        });\n      } else if (orient === 'right') {\n        item.setLayoutStartPosition({\n          x: this.rightCurrent - info.rect.width + item.layoutOffsetX\n        });\n      } else if (orient === 'top') {\n        item.setLayoutStartPosition({\n          x: this.topCurrent + item.layoutOffsetY\n        });\n      } else {\n        item.setLayoutStartPosition({\n          x: this.bottomCurrent - info.rect.height + item.layoutOffsetY\n        });\n      }\n    });\n\n    if (orient === 'left') {\n      this.leftCurrent += info.rect.width;\n    } else if (orient === 'right') {\n      this.rightCurrent -= info.rect.width;\n    } else if (orient === 'top') {\n      this.topCurrent += info.rect.height;\n    } else {\n      this.bottomCurrent -= info.rect.height;\n    }\n  }\n\n  protected _layoutRelativeItem(item: ILayoutItem, layoutRect: ILayoutRect) {\n    const rect = item.computeBoundsInRect(layoutRect);\n    if (item.layoutOrient === 'left' || item.layoutOrient === 'right') {\n      item.setLayoutRect({ width: rect.width });\n    } else {\n      item.setLayoutRect({ height: rect.height });\n    }\n    // 减少尺寸\n    if (item.layoutOrient === 'left') {\n      item.setLayoutStartPosition({\n        x: this.leftCurrent + item.layoutOffsetX + item.layoutPaddingLeft\n      });\n      this.leftCurrent += rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n    } else if (item.layoutOrient === 'right') {\n      this.rightCurrent -= rect.width + item.layoutPaddingLeft + item.layoutPaddingRight;\n      item.setLayoutStartPosition({\n        x: this.rightCurrent + item.layoutOffsetX + item.layoutPaddingLeft\n      });\n    } // 减少尺寸\n    else if (item.layoutOrient === 'top') {\n      item.setLayoutStartPosition({\n        y: this.topCurrent + item.layoutOffsetY + item.layoutPaddingTop\n      });\n      this.topCurrent += rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n    } else if (item.layoutOrient === 'bottom') {\n      this.bottomCurrent -= rect.height + item.layoutPaddingTop + item.layoutPaddingBottom;\n      item.setLayoutStartPosition({\n        y: this.bottomCurrent + item.layoutOffsetY + item.layoutPaddingTop\n      });\n    }\n  }\n\n  protected _layoutRegionItem(\n    regionItems: ILayoutItem[],\n    regionRelativeTotalWidth: number,\n    regionRelativeTotalHeight: number\n  ) {\n    // region 处理\n    const regionWidth = Math.max(\n      Math.min(regionRelativeTotalWidth, ...regionItems.map(region => region.maxWidth ?? Number.MAX_VALUE)),\n      0\n    );\n    const regionHeight = Math.max(\n      Math.min(regionRelativeTotalHeight, ...regionItems.map(region => region.maxHeight ?? Number.MAX_VALUE)),\n      0\n    );\n    regionItems.forEach(region => {\n      const width = regionWidth - region.layoutPaddingLeft - region.layoutPaddingRight;\n      const height = regionHeight - region.layoutPaddingTop - region.layoutPaddingBottom;\n\n      region.setLayoutRect({\n        width: width,\n        height: height\n      });\n\n      region.setLayoutStartPosition({\n        x: this.leftCurrent + region.layoutOffsetX + region.layoutPaddingLeft,\n        y: this.topCurrent + region.layoutOffsetY + region.layoutPaddingTop\n      });\n    });\n\n    return {\n      regionHeight,\n      regionWidth\n    };\n  }\n\n  /**\n   *\n   * 1. 补全 region-relative rect 和部分 layoutStartPoint\n   * 2. 补全 region rect 和 layoutStartPoint\n   *\n   */\n  protected layoutRegionItems(\n    regionItems: ILayoutItem[],\n    regionRelativeItems: ILayoutItem[],\n    regionRelativeOverlapItems: ILayoutItem[],\n    overlapItems: {\n      [key in IOrientType]: overlapInfo;\n    } = {\n      left: { items: [], rect: { width: 0, height: 0 } },\n      right: { items: [], rect: { width: 0, height: 0 } },\n      top: { items: [], rect: { width: 0, height: 0 } },\n      bottom: { items: [], rect: { width: 0, height: 0 } },\n      z: { items: [], rect: { width: 0, height: 0 } }\n    }\n  ): void {\n    let regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;\n    let regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;\n\n    regionRelativeItems\n      .filter(x => x.layoutOrient === 'left' || x.layoutOrient === 'right')\n      .forEach(item => {\n        this._layoutRelativeItem(item, this.getItemComputeLayoutRect(item));\n      });\n\n    this._layoutRelativeOverlap('left', overlapItems.left);\n    this._layoutRelativeOverlap('right', overlapItems.right);\n\n    regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;\n\n    regionRelativeItems\n      .filter(x => x.layoutOrient === 'top' || x.layoutOrient === 'bottom')\n      .forEach(item => {\n        this._layoutRelativeItem(item, this.getItemComputeLayoutRect(item));\n      });\n\n    this._layoutRelativeOverlap('top', overlapItems.top);\n    this._layoutRelativeOverlap('bottom', overlapItems.bottom);\n\n    // 此时得到height\n    regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;\n\n    // region 处理\n    const { regionWidth, regionHeight } = this._layoutRegionItem(\n      regionItems,\n      regionRelativeTotalWidth,\n      regionRelativeTotalHeight\n    );\n\n    // region-relative 特殊处理\n    regionRelativeItems.concat(regionRelativeOverlapItems).forEach(item => {\n      // 处理特殊元素的宽高\n      if (['left', 'right'].includes(item.layoutOrient)) {\n        // 用户有配置的话，已经处理过，不需要再次处理\n        const relativeRegion = this.filterRegionsWithID(regionItems, item.layoutBindRegionID[0]);\n\n        item.setLayoutRect({\n          height: relativeRegion.getLayoutRect().height\n        });\n        item.setLayoutStartPosition({\n          y: relativeRegion.getLayoutStartPoint().y + item.layoutOffsetY + item.layoutPaddingTop\n        });\n\n        if (item.layoutOrient === 'right') {\n          item.setLayoutStartPosition({\n            x: item.getLayoutStartPoint().x + regionWidth - regionRelativeTotalWidth\n          });\n        }\n      } else if (['top', 'bottom'].includes(item.layoutOrient)) {\n        const relativeRegion = this.filterRegionsWithID(regionItems, item.layoutBindRegionID[0]);\n\n        item.setLayoutRect({\n          width: relativeRegion.getLayoutRect().width\n        });\n\n        item.setLayoutStartPosition({\n          x: relativeRegion.getLayoutStartPoint().x + item.layoutOffsetX + item.layoutPaddingLeft\n        });\n\n        if (item.layoutOrient === 'bottom') {\n          item.setLayoutStartPosition({\n            y: item.getLayoutStartPoint().y + regionHeight - regionRelativeTotalHeight\n          });\n        }\n      }\n    });\n  }\n\n  /**\n   * 再找出对 absolute 元素，无需排序，在 compiler 层需要排序放置\n   *\n   * 重要：absolute 默认依据 region 进行相对依赖\n   */\n  protected layoutAbsoluteItems(absoluteItems: ILayoutItem[]) {\n    absoluteItems.forEach(item => {\n      // 设置盒子\n      item.absoluteLayoutInRect(this._chartLayoutRect);\n    });\n  }\n\n  // 对普通布局来说，只出一个 region 绑定\n  filterRegionsWithID(items: ILayoutItem[], id: number): ILayoutItem {\n    const target = items.find(x => x.getModelId() === id);\n    if (!target) {\n      (this._onError ?? error)('can not find target region item, invalid id');\n    }\n    return target as ILayoutItem;\n  }\n\n  /**\n   * 工具方法 根据item属性获取给item提供的布局空间\n   * @param item\n   */\n  getItemComputeLayoutRect(item: ILayoutItem) {\n    const result = {\n      width: this.rightCurrent - this.leftCurrent - item.layoutPaddingLeft - item.layoutPaddingRight,\n      height: this.bottomCurrent - this.topCurrent - item.layoutPaddingTop - item.layoutPaddingBottom\n    };\n    return result;\n  }\n\n  protected _checkAutoIndent(\n    items: ILayoutItem[],\n    layoutTemp: {\n      top: number;\n      left: number;\n      bottom: number;\n      right: number;\n    }\n  ): IPadding {\n    const result = {\n      top: 0,\n      left: 0,\n      bottom: 0,\n      right: 0\n    };\n    items.forEach(i => {\n      if (!i.getModelVisible() || !i.autoIndent) {\n        return;\n      }\n      const vOrH = i.layoutOrient === 'left' || i.layoutOrient === 'right';\n      const itemOuter = i.getLastComputeOutBounds();\n      const outer = this._getOutInLayout(itemOuter, i, layoutTemp);\n      if (vOrH) {\n        result.top = Math.max(result.top, outer.top);\n        result.bottom = Math.max(result.bottom, outer.bottom);\n      } else {\n        result.left = Math.max(result.left, outer.left);\n        result.right = Math.max(result.right, outer.right);\n      }\n    });\n    return result;\n  }\n\n  private _getOutInLayout(itemOuter: IBoundsLike, i: ILayoutItem, tempBorder: LayoutSideType): LayoutSideType {\n    const { x, y } = i.getLayoutStartPoint();\n    const { width, height } = i.getLayoutRect();\n\n    const result: LayoutSideType = {\n      left: tempBorder.left - (x - itemOuter.x1),\n      right: x + width + itemOuter.x2 - tempBorder.right,\n      top: tempBorder.top - (y - itemOuter.y1),\n      bottom: y + height + itemOuter.y2 - tempBorder.bottom\n    };\n    return result;\n  }\n}\n"]}

package/cjs/model/interface.d.ts

@@ -46,6 +46,7 @@ export interface IUpdateSpecResult {
     reTransformSpec?: boolean;
     reAnimate?: boolean;
     changeTheme?: boolean;
+    changeBackground?: boolean;
 }
 export interface IUpdateDataResult {
     reAnimate?: boolean;

package/cjs/model/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet, DataView } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData } from '@visactor/vgrammar-core';\nimport type { StringOrNumber } from '../typings/common';\nimport type { IGroupMarkSpec, ConvertToMarkStyleSpec, ICommonSpec } from '../typings/visual';\nimport type { IRect } from '../typings/space';\nimport type { IPoint, CoordinateType } from '../typings/coordinate';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart, IChartSpecInfo, IChartSpecTransformerOption } from '../chart/interface';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\nimport type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';\nimport type { ILayoutPoint, ILayoutRect } from '../typings/layout';\nimport type { ComponentTypeEnum } from '../component/interface';\nimport type { SeriesTypeEnum } from '../series';\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n  reTransformSpec?: boolean;\n  reAnimate?: boolean;\n  changeTheme?: boolean;\n}\n\nexport interface IUpdateDataResult {\n  reAnimate?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  coordinate?: CoordinateType;\n\n  // 布局\n  layout?: ILayoutItem;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  /** updateSpec 或者切换主题后，根据新 spec 执行的初始化过程 */\n  reInit: (spec?: any) => void;\n  beforeRelease: () => void;\n\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n  getSpecPath: () => Array<string | number>;\n\n  //布局周期\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n\n  getColorScheme: () => IThemeColorScheme | undefined;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n  getSpecInfo: () => IModelSpecInfo;\n}\n\nexport interface ILayoutModel extends IModel {\n  // 布局相关\n  getLayoutStartPoint: () => IPoint;\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  getLayoutRect: () => ILayoutRect;\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) => void;\n\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  getBoundsInRect: (rect: ILayoutRect, fullRect: ILayoutRect) => IBoundsLike;\n\n  //布局周期\n  afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  type: string;\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  regionIndexes?: Array<number>;\n  specKey?: string;\n  specPath?: Array<string | number>;\n  specInfoPath?: Array<string | number>;\n\n  getTheme?: () => ITheme;\n  getSpecInfo?: () => IChartSpecInfo;\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n  getSeriesData: (id: StringOrNumber | undefined, index: number | undefined) => DataView | undefined;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n\n  /**\n   * 是否关闭交互效果\n   */\n  disableTriggerEvent?: boolean;\n}\n\nexport interface IModelSpecInfo<T extends Record<string, unknown> = any> {\n  /** model 具体类型 */\n  type: string | ComponentTypeEnum | SeriesTypeEnum;\n  /** model spec */\n  spec: T;\n  /** 该 spec 在图表 spec 上的路径 */\n  specPath?: Array<string | number>;\n  /** 该 spec 在图表 spec info 上的路径 */\n  specInfoPath?: Array<string | number>;\n  /** model 当前主题 */\n  theme?: any;\n  /** model 对应的 region 索引 */\n  regionIndexes?: number[];\n  /** model 对应的 series 索引 */\n  seriesIndexes?: number[];\n}\n\nexport interface IModelConstructor {\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n}\n\nexport type ILayoutModelState = {\n  layoutUpdateRank: number;\n  [key: string]: unknown;\n};\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n\nexport type IBaseModelSpecTransformerOption = IChartSpecTransformerOption;\n\nexport interface IBaseModelSpecTransformerResult<T, K> {\n  spec: T;\n  theme: K;\n}\n\nexport interface IBaseModelSpecTransformer {\n  getTheme: (spec: any, chartSpec: any) => any;\n  transformSpec: (\n    spec: any,\n    chartSpec: any,\n    chartSpecInfo?: IChartSpecInfo\n  ) => IBaseModelSpecTransformerResult<any, any>;\n}\n"]}
+{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet, DataView } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData } from '@visactor/vgrammar-core';\nimport type { StringOrNumber } from '../typings/common';\nimport type { IGroupMarkSpec, ConvertToMarkStyleSpec, ICommonSpec } from '../typings/visual';\nimport type { IRect } from '../typings/space';\nimport type { IPoint, CoordinateType } from '../typings/coordinate';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart, IChartSpecInfo, IChartSpecTransformerOption } from '../chart/interface';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\nimport type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';\nimport type { ILayoutPoint, ILayoutRect } from '../typings/layout';\nimport type { ComponentTypeEnum } from '../component/interface';\nimport type { SeriesTypeEnum } from '../series';\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n  reTransformSpec?: boolean;\n  reAnimate?: boolean;\n  changeTheme?: boolean;\n  changeBackground?: boolean;\n}\n\nexport interface IUpdateDataResult {\n  reAnimate?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  coordinate?: CoordinateType;\n\n  // 布局\n  layout?: ILayoutItem;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  /** updateSpec 或者切换主题后，根据新 spec 执行的初始化过程 */\n  reInit: (spec?: any) => void;\n  beforeRelease: () => void;\n\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n  getSpecPath: () => Array<string | number>;\n\n  //布局周期\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n\n  getColorScheme: () => IThemeColorScheme | undefined;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n  getSpecInfo: () => IModelSpecInfo;\n}\n\nexport interface ILayoutModel extends IModel {\n  // 布局相关\n  getLayoutStartPoint: () => IPoint;\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  getLayoutRect: () => ILayoutRect;\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) => void;\n\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  getBoundsInRect: (rect: ILayoutRect, fullRect: ILayoutRect) => IBoundsLike;\n\n  //布局周期\n  afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  type: string;\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  regionIndexes?: Array<number>;\n  specKey?: string;\n  specPath?: Array<string | number>;\n  specInfoPath?: Array<string | number>;\n\n  getTheme?: () => ITheme;\n  getSpecInfo?: () => IChartSpecInfo;\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n  getSeriesData: (id: StringOrNumber | undefined, index: number | undefined) => DataView | undefined;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n\n  /**\n   * 是否关闭交互效果\n   */\n  disableTriggerEvent?: boolean;\n}\n\nexport interface IModelSpecInfo<T extends Record<string, unknown> = any> {\n  /** model 具体类型 */\n  type: string | ComponentTypeEnum | SeriesTypeEnum;\n  /** model spec */\n  spec: T;\n  /** 该 spec 在图表 spec 上的路径 */\n  specPath?: Array<string | number>;\n  /** 该 spec 在图表 spec info 上的路径 */\n  specInfoPath?: Array<string | number>;\n  /** model 当前主题 */\n  theme?: any;\n  /** model 对应的 region 索引 */\n  regionIndexes?: number[];\n  /** model 对应的 series 索引 */\n  seriesIndexes?: number[];\n}\n\nexport interface IModelConstructor {\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n}\n\nexport type ILayoutModelState = {\n  layoutUpdateRank: number;\n  [key: string]: unknown;\n};\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n\nexport type IBaseModelSpecTransformerOption = IChartSpecTransformerOption;\n\nexport interface IBaseModelSpecTransformerResult<T, K> {\n  spec: T;\n  theme: K;\n}\n\nexport interface IBaseModelSpecTransformer {\n  getTheme: (spec: any, chartSpec: any) => any;\n  transformSpec: (\n    spec: any,\n    chartSpec: any,\n    chartSpecInfo?: IChartSpecInfo\n  ) => IBaseModelSpecTransformerResult<any, any>;\n}\n"]}

package/cjs/series/funnel/funnel.js

@@ -32,7 +32,7 @@ class FunnelSeries extends base_series_1.BaseSeries {
         this._funnelOrient = null !== (_a = this._spec.funnelOrient) && void 0 !== _a ? _a : "top", 
         this._shape = null !== (_b = this._spec.shape) && void 0 !== _b ? _b : "trapezoid", 
         this._isHorizontal() ? this._funnelAlign = [ "top", "bottom" ].includes(this._spec.funnelAlign) ? this._spec.funnelAlign : "center" : this._funnelAlign = [ "left", "right" ].includes(this._spec.funnelAlign) ? this._spec.funnelAlign : "center", 
-        this._spec.categoryField && this.setSeriesField(this._spec.categoryField);
+        !this._seriesField && this._spec.categoryField && this.setSeriesField(this._spec.categoryField);
     }
     initData() {
         if (super.initData(), !this._data) return;