@visactor/vchart-extension 2.1.0-alpha.9 → 2.1.1

package/cjs/charts/3d/layout.d.ts

@@ -1,6 +1,7 @@
-import type { IBaseLayout, IChart, ILayoutItem, IOffset, IRect } from '@visactor/vchart';
+import type { IBaseLayout, IChart, ILayoutItem, IOffset } from '@visactor/vchart';
 import { Layout } from '@visactor/vchart';
 import type { IBoundsLike } from '@visactor/vchart';
+import type { IRect } from '@visactor/vchart/src/typings/space';
 export declare class Layout3d extends Layout implements IBaseLayout {
     recomputeWidth: boolean;
     recomputeHeight: boolean;

package/cjs/charts/3d/layout.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/charts/3d/layout.ts"],"names":[],"mappings":"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","file":"layout.js","sourcesContent":["import type { IAxis, IBaseLayout, IChart, ILayoutItem, IOffset, IRect, LayoutSideType } from '@visactor/vchart';\nimport { Factory, isXAxis, isYAxis, Layout } from '@visactor/vchart';\nimport type { IBoundsLike } from '@visactor/vchart';\n\nexport class Layout3d extends Layout implements IBaseLayout {\n  declare recomputeWidth: boolean;\n  declare recomputeHeight: boolean;\n  static type = 'layout3d';\n\n  layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void {\n    // 布局初始化\n    this._layoutInit(_chart, items, chartLayoutRect, chartViewBox);\n\n    const recompute = {\n      recomputeWidth: this.recomputeWidth,\n      recomputeHeight: this.recomputeHeight\n    };\n    // 先布局 normal 类型的元素\n    this._layoutNormalItems(items, recompute);\n\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    // 计算3d轴\n    const absoluteItem = items.filter(x => x.layoutType === 'absolute');\n    const zItems = absoluteItem.filter(i => {\n      return i.layoutOrient === 'z';\n    });\n\n    // 计算z的宽高，让出一部分位置\n    let extraWH = { width: 0, height: 0 };\n    if (zItems.length) {\n      const layoutRect = zItems[0].getLayoutRect();\n      extraWH = layoutRect;\n    }\n    this.leftCurrent += extraWH.width / 8;\n    this.rightCurrent -= extraWH.width / 8;\n    this.topCurrent += extraWH.height / 8;\n    this.bottomCurrent -= extraWH.height / 8;\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, recompute);\n\n    // 缩进\n    this._processAutoIndent(\n      regionItems,\n      relativeItems,\n      relativeOverlapItems,\n      overlapItems,\n      allRelatives,\n      layoutTemp,\n      recompute\n    );\n\n    // z轴以外的绝对定位\n    const absoluteItemExceptZAxis = absoluteItem.filter(i => i.layoutOrient !== 'z');\n    this.layoutAbsoluteItems(absoluteItemExceptZAxis);\n\n    // 找到x轴\n    const xAxis = relativeItems.filter(item => {\n      return item.model.specKey === 'axes' && isXAxis(item.layoutOrient);\n    })[0];\n    const yAxis = relativeItems.filter(item => {\n      return item.model.specKey === 'axes' && isYAxis(item.layoutOrient);\n    })[0];\n    if (xAxis && zItems.length) {\n      const sp = xAxis.getLayoutStartPoint();\n      const lr = xAxis.getLayoutRect();\n      const zRect = {\n        x: yAxis.layoutOrient === 'left' ? sp.x + lr.width : sp.x,\n        y: sp.y,\n        width: this._chartLayoutRect.width,\n        height: this._chartLayoutRect.height\n      };\n      (zItems[0].model as IAxis).directionStr = yAxis.layoutOrient === 'left' ? 'r2l' : 'l2r';\n      // 将长宽高信息传给所有的轴\n      const xRect = xAxis.getLayoutRect();\n      const yRect = yAxis.getLayoutRect();\n      // const zRect = zItems[0].getLayoutRect();\n      const box3d = {\n        length: zItems[0].getLayoutRect().width,\n        width: xRect.width,\n        height: yRect.height\n      };\n\n      (<any>xAxis.model).setLayout3dBox && (<any>xAxis.model).setLayout3dBox(box3d);\n      (<any>yAxis.model).setLayout3dBox && (<any>yAxis.model).setLayout3dBox(box3d);\n      (<any>zItems[0].model).setLayout3dBox && (<any>zItems[0].model).setLayout3dBox(box3d);\n\n      this.layoutZAxisItems(zItems, zRect);\n    }\n  }\n\n  /**\n   * 对z轴进行布局\n   * @param zItems\n   */\n  protected layoutZAxisItems(zItems: ILayoutItem[], zRect: IRect) {\n    zItems.forEach(item => {\n      // 设置盒子\n      item.absoluteLayoutInRect(zRect);\n    });\n  }\n\n  /**\n   * 工具方法 根据item属性获取给item提供的布局空间\n   * @param item\n   */\n  getItemComputeLayoutRect(item: ILayoutItem, extraOffset?: IOffset) {\n    if (!extraOffset) {\n      extraOffset = { offsetLeft: 0, offsetRight: 0, offsetTop: 0, offsetBottom: 0 };\n    }\n    const result = {\n      width:\n        this.rightCurrent -\n        this.leftCurrent -\n        item.layoutPaddingLeft -\n        item.layoutPaddingRight -\n        (extraOffset.offsetLeft + extraOffset.offsetRight),\n      height:\n        this.bottomCurrent -\n        this.topCurrent -\n        item.layoutPaddingTop -\n        item.layoutPaddingBottom -\n        (extraOffset.offsetTop + extraOffset.offsetBottom)\n    };\n    return result;\n  }\n\n  protected _checkAutoIndent(items: ILayoutItem[]) {\n    const result = {\n      top: 0,\n      left: 0,\n      bottom: 0,\n      right: 0\n    };\n    const rightCurrent = this._chartViewBox.x2 - this._chartViewBox.x1 - this.rightCurrent;\n    const bottomCurrent = this._chartViewBox.y2 - this._chartViewBox.y1 - this.bottomCurrent;\n    items.forEach(i => {\n      if (!i.getModelVisible() || !i.autoIndent) {\n        return;\n      }\n      const vOrH = i.layoutOrient === 'left' || i.layoutOrient === 'right';\n      const outer = i.getLastComputeOutBounds();\n      if (vOrH) {\n        result.top = Math.max(result.top, outer.y1 - this.topCurrent);\n        result.bottom = Math.max(result.bottom, outer.y2 - bottomCurrent);\n      } else {\n        result.left = Math.max(result.left, outer.x1 - this.leftCurrent);\n        result.right = Math.max(result.right, outer.x2 - rightCurrent);\n      }\n    });\n    return result;\n  }\n}\n\nexport const registerLayout3d = () => {\n  Factory.registerLayout(Layout3d.type, Layout3d);\n};\n"]}
+{"version":3,"sources":["../src/charts/3d/layout.ts"],"names":[],"mappings":"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","file":"layout.js","sourcesContent":["import type { IAxis, IBaseLayout, IChart, ILayoutItem, IOffset, LayoutSideType } from '@visactor/vchart';\nimport { Factory, isXAxis, isYAxis, Layout } from '@visactor/vchart';\nimport type { IBoundsLike } from '@visactor/vchart';\nimport type { IRect } from '@visactor/vchart/src/typings/space';\n\nexport class Layout3d extends Layout implements IBaseLayout {\n  declare recomputeWidth: boolean;\n  declare recomputeHeight: boolean;\n  static type = 'layout3d';\n\n  layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void {\n    // 布局初始化\n    this._layoutInit(_chart, items, chartLayoutRect, chartViewBox);\n\n    const recompute = {\n      recomputeWidth: this.recomputeWidth,\n      recomputeHeight: this.recomputeHeight\n    };\n    // 先布局 normal 类型的元素\n    this._layoutNormalItems(items, recompute);\n\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    // 计算3d轴\n    const absoluteItem = items.filter(x => x.layoutType === 'absolute');\n    const zItems = absoluteItem.filter(i => {\n      return i.layoutOrient === 'z';\n    });\n\n    // 计算z的宽高，让出一部分位置\n    let extraWH = { width: 0, height: 0 };\n    if (zItems.length) {\n      const layoutRect = zItems[0].getLayoutRect();\n      extraWH = layoutRect;\n    }\n    this.leftCurrent += extraWH.width / 8;\n    this.rightCurrent -= extraWH.width / 8;\n    this.topCurrent += extraWH.height / 8;\n    this.bottomCurrent -= extraWH.height / 8;\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, recompute);\n\n    // 缩进\n    this._processAutoIndent(\n      regionItems,\n      relativeItems,\n      relativeOverlapItems,\n      overlapItems,\n      allRelatives,\n      layoutTemp,\n      recompute\n    );\n\n    // z轴以外的绝对定位\n    const absoluteItemExceptZAxis = absoluteItem.filter(i => i.layoutOrient !== 'z');\n    this.layoutAbsoluteItems(absoluteItemExceptZAxis);\n\n    // 找到x轴\n    const xAxis = relativeItems.filter(item => {\n      return item.model.specKey === 'axes' && isXAxis(item.layoutOrient);\n    })[0];\n    const yAxis = relativeItems.filter(item => {\n      return item.model.specKey === 'axes' && isYAxis(item.layoutOrient);\n    })[0];\n    if (xAxis && zItems.length) {\n      const sp = xAxis.getLayoutStartPoint();\n      const lr = xAxis.getLayoutRect();\n      const zRect = {\n        x: yAxis.layoutOrient === 'left' ? sp.x + lr.width : sp.x,\n        y: sp.y,\n        width: this._chartLayoutRect.width,\n        height: this._chartLayoutRect.height\n      };\n      (zItems[0].model as IAxis).directionStr = yAxis.layoutOrient === 'left' ? 'r2l' : 'l2r';\n      // 将长宽高信息传给所有的轴\n      const xRect = xAxis.getLayoutRect();\n      const yRect = yAxis.getLayoutRect();\n      // const zRect = zItems[0].getLayoutRect();\n      const box3d = {\n        length: zItems[0].getLayoutRect().width,\n        width: xRect.width,\n        height: yRect.height\n      };\n\n      (<any>xAxis.model).setLayout3dBox && (<any>xAxis.model).setLayout3dBox(box3d);\n      (<any>yAxis.model).setLayout3dBox && (<any>yAxis.model).setLayout3dBox(box3d);\n      (<any>zItems[0].model).setLayout3dBox && (<any>zItems[0].model).setLayout3dBox(box3d);\n\n      this.layoutZAxisItems(zItems, zRect);\n    }\n  }\n\n  /**\n   * 对z轴进行布局\n   * @param zItems\n   */\n  protected layoutZAxisItems(zItems: ILayoutItem[], zRect: IRect) {\n    zItems.forEach(item => {\n      // 设置盒子\n      item.absoluteLayoutInRect(zRect);\n    });\n  }\n\n  /**\n   * 工具方法 根据item属性获取给item提供的布局空间\n   * @param item\n   */\n  getItemComputeLayoutRect(item: ILayoutItem, extraOffset?: IOffset) {\n    if (!extraOffset) {\n      extraOffset = { offsetLeft: 0, offsetRight: 0, offsetTop: 0, offsetBottom: 0 };\n    }\n    const result = {\n      width:\n        this.rightCurrent -\n        this.leftCurrent -\n        item.layoutPaddingLeft -\n        item.layoutPaddingRight -\n        (extraOffset.offsetLeft + extraOffset.offsetRight),\n      height:\n        this.bottomCurrent -\n        this.topCurrent -\n        item.layoutPaddingTop -\n        item.layoutPaddingBottom -\n        (extraOffset.offsetTop + extraOffset.offsetBottom)\n    };\n    return result;\n  }\n\n  protected _checkAutoIndent(items: ILayoutItem[]) {\n    const result = {\n      top: 0,\n      left: 0,\n      bottom: 0,\n      right: 0\n    };\n    const rightCurrent = this._chartViewBox.x2 - this._chartViewBox.x1 - this.rightCurrent;\n    const bottomCurrent = this._chartViewBox.y2 - this._chartViewBox.y1 - this.bottomCurrent;\n    items.forEach(i => {\n      if (!i.getModelVisible() || !i.autoIndent) {\n        return;\n      }\n      const vOrH = i.layoutOrient === 'left' || i.layoutOrient === 'right';\n      const outer = i.getLastComputeOutBounds();\n      if (vOrH) {\n        result.top = Math.max(result.top, outer.y1 - this.topCurrent);\n        result.bottom = Math.max(result.bottom, outer.y2 - bottomCurrent);\n      } else {\n        result.left = Math.max(result.left, outer.x1 - this.leftCurrent);\n        result.right = Math.max(result.right, outer.x2 - rightCurrent);\n      }\n    });\n    return result;\n  }\n}\n\nexport const registerLayout3d = () => {\n  Factory.registerLayout(Layout3d.type, Layout3d);\n};\n"]}

package/cjs/charts/axis-3d/index.js

@@ -10,4 +10,5 @@ const layout_1 = require("../3d/layout"), plugin_1 = require("../3d/plugin"), ba
     (0, symlog_axis_1.registerCartesianSymlogAxis3d)(), (0, log_axis_1.registerCartesianLogAxis3d)();
 };
 
-exports.registerAxis3dPlugin = registerAxis3dPlugin;
+exports.registerAxis3dPlugin = registerAxis3dPlugin;
+//# sourceMappingURL=index.js.map

package/cjs/charts/axis-3d/linear-axis.js

@@ -12,5 +12,4 @@ const vchart_1 = require("@visactor/vchart"), theme_1 = require("./theme"), vcha
     }), (0, vchart_2.mixin)(AxisCls, axis_3d_mixin_1.Axis3dMixin);
 };
 
-exports.registerCartesianLinearAxis3d = registerCartesianLinearAxis3d;
-//# sourceMappingURL=linear-axis.js.map
+exports.registerCartesianLinearAxis3d = registerCartesianLinearAxis3d;

package/cjs/charts/bar-3d/chart-spec-transformer.js

@@ -16,4 +16,4 @@ class Bar3dChartSpecTransformer extends vchart_1.BarChartSpecTransformer {
 }
 
 exports.Bar3dChartSpecTransformer = Bar3dChartSpecTransformer;
-//# sourceMappingURL=chart-spec-transformer.js.map
+//# sourceMappingURL=chart-spec-transformer.js.map

package/cjs/charts/bar-3d/chart.js

@@ -22,4 +22,4 @@ const registerBar3dChart = () => {
 };
 
 exports.registerBar3dChart = registerBar3dChart;
-//# sourceMappingURL=chart.js.map
+//# sourceMappingURL=chart.js.map

package/cjs/charts/bar-3d/constant.js

@@ -12,4 +12,4 @@ Object.defineProperty(exports, "__esModule", {
         type: "rect3d"
     }
 };
-//# sourceMappingURL=constant.js.map
+//# sourceMappingURL=constant.js.map

package/cjs/charts/bar-3d/index.js

@@ -20,4 +20,4 @@ Object.defineProperty(exports, "__esModule", {
 }), __exportStar(require("./chart"), exports), __exportStar(require("./chart-spec-transformer"), exports), 
 __exportStar(require("./interface"), exports), __exportStar(require("./series"), exports), 
 __exportStar(require("./series-spec-transformer"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/charts/bar-3d/interface.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=interface.js.map

package/cjs/charts/bar-3d/series-spec-transformer.js

@@ -13,4 +13,4 @@ class Bar3dSeriesSpecTransformer extends vchart_1.BarSeriesSpecTransformer {
 }
 
 exports.Bar3dSeriesSpecTransformer = Bar3dSeriesSpecTransformer;
-//# sourceMappingURL=series-spec-transformer.js.map
+//# sourceMappingURL=series-spec-transformer.js.map

package/cjs/charts/bar-3d/series.js

@@ -25,4 +25,4 @@ const registerBar3dSeries = () => {
 };
 
 exports.registerBar3dSeries = registerBar3dSeries;
-//# sourceMappingURL=series.js.map
+//# sourceMappingURL=series.js.map

package/cjs/charts/bar-3d/theme.js

@@ -16,4 +16,4 @@ Object.defineProperty(exports, "__esModule", {
         }
     }
 };
-//# sourceMappingURL=theme.js.map
+//# sourceMappingURL=theme.js.map

package/cjs/charts/candlestick/candlestick-transformer.js

@@ -21,4 +21,4 @@ class CandlestickChartSpecTransformer extends vchart_1.CartesianChartSpecTransfo
 }
 
 exports.CandlestickChartSpecTransformer = CandlestickChartSpecTransformer;
-//# sourceMappingURL=candlestick-transformer.js.map
+//# sourceMappingURL=candlestick-transformer.js.map

package/cjs/charts/candlestick/candlestick.js

@@ -22,5 +22,4 @@ const registerCandlestickChart = () => {
     (0, candlestick_1.registerCandlestickSeries)(), vchart_1.Factory.registerChart(CandlestickChart.type, CandlestickChart);
 };
 
-exports.registerCandlestickChart = registerCandlestickChart;
-//# sourceMappingURL=candlestick.js.map
+exports.registerCandlestickChart = registerCandlestickChart;

package/cjs/charts/candlestick/index.js

@@ -20,4 +20,4 @@ Object.defineProperty(exports, "__esModule", {
 }), __exportStar(require("./candlestick"), exports), __exportStar(require("./interface"), exports), 
 __exportStar(require("./candlestick-transformer"), exports), __exportStar(require("./series/candlestick"), exports), 
 __exportStar(require("./util"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/charts/candlestick/interface.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=interface.js.map

package/cjs/charts/candlestick/util.js

@@ -7,4 +7,4 @@ function transformCandlestickSeriesSpec(spec) {
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.transformCandlestickSeriesSpec = void 0, exports.transformCandlestickSeriesSpec = transformCandlestickSeriesSpec;
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map

package/cjs/charts/combination-candlestick/combination-candlestick-transformer.js

@@ -201,4 +201,4 @@ class CombinationCandlestickChartSpecTransformer extends vchart_1.CartesianChart
 }
 
 exports.CombinationCandlestickChartSpecTransformer = CombinationCandlestickChartSpecTransformer;
-//# sourceMappingURL=combination-candlestick-transformer.js.map
+//# sourceMappingURL=combination-candlestick-transformer.js.map

package/cjs/charts/combination-candlestick/combination-candlestick.js

@@ -28,4 +28,4 @@ const registerCombinationCandlestickChart = () => {
 };
 
 exports.registerCombinationCandlestickChart = registerCombinationCandlestickChart;
-//# sourceMappingURL=combination-candlestick.js.map
+//# sourceMappingURL=combination-candlestick.js.map

package/cjs/charts/combination-candlestick/constant.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.CombinationCandlestickChart_TYPE = void 0, exports.CombinationCandlestickChart_TYPE = "combinationCandlestick";
-//# sourceMappingURL=constant.js.map
+//# sourceMappingURL=constant.js.map

package/cjs/charts/combination-candlestick/index.js

@@ -19,4 +19,4 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./combination-candlestick"), exports), __exportStar(require("./interface"), exports), 
 __exportStar(require("./constant"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/charts/combination-candlestick/interface.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=interface.js.map

package/cjs/charts/conversion-funnel/arrow-data-transform.js

@@ -95,5 +95,5 @@ function computeIndex(arrow, totalArrows) {
     return index;
 }
 
-exports.conversionArrowTransform = conversionArrowTransform;
 //# sourceMappingURL=arrow-data-transform.js.map
+exports.conversionArrowTransform = conversionArrowTransform;

package/cjs/charts/conversion-funnel/constants.js

@@ -21,4 +21,4 @@ exports.DEFAULT_ARROW_MARK_STYLE = {
 }, exports.DEFAULT_FUNNEL_BACKGROUND_MARK_STYLE = {
     fill: "#eff1f9"
 };
-//# sourceMappingURL=constants.js.map
+//# sourceMappingURL=constants.js.map

package/cjs/charts/conversion-funnel/conversion-funnel-transformer.js

@@ -193,5 +193,5 @@ function addFunnelBackgroundMark(funnelBackground) {
     });
 }
 
-exports.ConversionFunnelChartSpecTransformer = ConversionFunnelChartSpecTransformer;
 //# sourceMappingURL=conversion-funnel-transformer.js.map
+exports.ConversionFunnelChartSpecTransformer = ConversionFunnelChartSpecTransformer;

package/cjs/charts/conversion-funnel/conversion-funnel.js

@@ -59,4 +59,4 @@ const registerConversionFunnelChart = option => {
 };
 
 exports.registerConversionFunnelChart = registerConversionFunnelChart;
-//# sourceMappingURL=conversion-funnel.js.map
+//# sourceMappingURL=conversion-funnel.js.map

package/cjs/charts/conversion-funnel/index.js

@@ -18,4 +18,4 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./interface"), exports), __exportStar(require("./conversion-funnel"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/charts/conversion-funnel/interface.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=interface.js.map

package/cjs/charts/conversion-funnel/util.js

@@ -14,4 +14,4 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.isSameArrow = exports.isArrowCross = void 0, exports.isArrowCross = isArrowCross, 
 exports.isSameArrow = isSameArrow;
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map

package/cjs/charts/funnel-3d/chart.js

@@ -21,5 +21,4 @@ const registerFunnel3dChart = () => {
     (0, layout_1.registerLayout3d)(), (0, series_1.registerFunnel3dSeries)(), vchart_1.Factory.registerChart(Funnel3dChart.type, Funnel3dChart);
 };
 
-exports.registerFunnel3dChart = registerFunnel3dChart;
-//# sourceMappingURL=chart.js.map
+exports.registerFunnel3dChart = registerFunnel3dChart;

package/cjs/charts/funnel-3d/constant.js

@@ -28,4 +28,4 @@ exports.funnel3dSeriesMark = Object.assign(Object.assign({}, vchart_1.baseSeries
         type: "rule"
     }
 });
-//# sourceMappingURL=constant.js.map
+//# sourceMappingURL=constant.js.map

package/cjs/charts/funnel-3d/index.js

@@ -19,4 +19,4 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./chart"), exports), __exportStar(require("./series"), exports), 
 __exportStar(require("./series-spec-transformer"), exports), __exportStar(require("./interface"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/charts/funnel-3d/interface.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
     value: !0
 });
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=interface.js.map

package/cjs/charts/funnel-3d/series-spec-transformer.js

@@ -13,4 +13,4 @@ class Funnel3dSeriesSpecTransformer extends vchart_1.FunnelSeriesSpecTransformer
 }
 
 exports.Funnel3dSeriesSpecTransformer = Funnel3dSeriesSpecTransformer;
-//# sourceMappingURL=series-spec-transformer.js.map
+//# sourceMappingURL=series-spec-transformer.js.map

package/cjs/charts/funnel-3d/series.js

@@ -80,4 +80,4 @@ const registerFunnel3dSeries = () => {
 };
 
 exports.registerFunnel3dSeries = registerFunnel3dSeries;
-//# sourceMappingURL=series.js.map
+//# sourceMappingURL=series.js.map

package/cjs/charts/funnel-3d/theme.js

@@ -7,4 +7,4 @@ Object.defineProperty(exports, "__esModule", {
 const vchart_1 = require("@visactor/vchart");
 
 exports.funnel3d = (0, vchart_1.getFunnelTheme)(!0);
-//# sourceMappingURL=theme.js.map
+//# sourceMappingURL=theme.js.map

package/cjs/charts/histogram-3d/chart.js

@@ -28,4 +28,4 @@ const registerHistogram3dChart = () => {
 };
 
 exports.registerHistogram3dChart = registerHistogram3dChart;
-//# sourceMappingURL=chart.js.map
+//# sourceMappingURL=chart.js.map

package/cjs/charts/image-cloud/series/image-cloud.d.ts

@@ -112,7 +112,7 @@ export declare class ImageCloudSeries<T extends IImageCloudSeriesSpec> extends B
             style?: Partial<import("@visactor/vchart").IImageMarkSpec>;
         };
         layoutConfig: import("@visactor/vchart").LayoutConfigType;
-        createCanvas: (params: import("@visactor/vrender-core").ICreateCanvasParams) => any;
+        createCanvas: (params: import("@visactor/vrender-core/es/interface").ICreateCanvasParams) => any;
         createImage: typeof createImage;
         onUpdateMaskCanvas: (inputImage?: HTMLCanvasElement, maskImage?: HTMLCanvasElement) => void;
         onLayoutFinished: () => void;

package/cjs/charts/pictogram/series/pictogram.d.ts

@@ -1,5 +1,6 @@
-import { type SVGParsedElement, type SVGParserResult } from '@visactor/vchart';
+import { type SVGParsedElement } from '@visactor/vchart';
 import type { IPictogramSeriesSpec } from './interface';
+import { type SVGParserResultWithViewport } from './svg-source';
 import { PictogramSeriesSpecTransformer } from './pictogram-transformer';
 import type { IMatrix, IPoint, IPointLike, GraphicEventType } from '@visactor/vchart';
 import { type IGroup } from '@visactor/vchart';
@@ -80,7 +81,7 @@ export declare class PictogramSeries<T extends IPictogramSeriesSpec = IPictogram
     static readonly transformerConstructor: typeof PictogramSeriesSpecTransformer;
     svg: string;
     protected _pictogramMark: IGroupMark;
-    protected _parsedSvgResult: SVGParserResult;
+    protected _parsedSvgResult: SVGParserResultWithViewport;
     private _labelMark;
     private _idToMark;
     setAttrFromSpec(): void;
@@ -113,6 +114,12 @@ export declare class PictogramSeries<T extends IPictogramSeriesSpec = IPictogram
     coordToPosition(point: IPoint): IPoint | undefined;
     getRootMatrix(): IMatrix;
     getPictogramRootGraphic(): IGroup;
+    private _getSvgRootMatrix;
+    private _getSvgViewportRect;
+    private _getSvgRootBounds;
+    private _appendMatrixScale;
+    private _appendMatrixTranslate;
+    private _getFittedSvgRootMatrix;
     initData(): void;
     mapViewDataUpdate(): void;
     onLayoutEnd(): void;

package/cjs/charts/pictogram/series/pictogram.js

@@ -110,13 +110,13 @@ class PictogramSeries extends vchart_4.GeoSeries {
         }, vchart_4.STATE_VALUE_ENUM.STATE_NORMAL, vchart_4.AttributeLevel.Series);
     }
     initMarkStyle() {
-        const {root: root, viewBoxRect: viewBoxRect} = this._parsedSvgResult, elements = this._mapViewData.getDataView().latestData;
+        const {root: root} = this._parsedSvgResult, svgViewportRect = this._getSvgViewportRect(), elements = this._mapViewData.getDataView().latestData;
         root && (this.setMarkStyle(this._pictogramMark, transform_1.graphicAttributeTransform.group(root.attributes), "normal", vchart_4.AttributeLevel.Built_In), 
-        root.transform && this.setMarkStyle(this._pictogramMark, {
-            postMatrix: () => root.transform
-        }, "normal", vchart_4.AttributeLevel.Built_In), viewBoxRect && this._pictogramMark.setMarkConfig({
+        this.setMarkStyle(this._pictogramMark, {
+            postMatrix: () => this._getFittedSvgRootMatrix()
+        }, "normal", vchart_4.AttributeLevel.Built_In), svgViewportRect && this._pictogramMark.setMarkConfig({
             clip: !0,
-            clipPath: [ (0, vchart_3.createRect)(Object.assign(Object.assign({}, viewBoxRect), {
+            clipPath: [ (0, vchart_3.createRect)(Object.assign(Object.assign({}, svgViewportRect), {
                 fill: !0
             })) ]
         }));
@@ -179,6 +179,51 @@ class PictogramSeries extends vchart_4.GeoSeries {
     getPictogramRootGraphic() {
         return this._pictogramMark.getProduct();
     }
+    _getSvgRootMatrix() {
+        var _a, _b;
+        const transform = null === (_b = null === (_a = this._parsedSvgResult) || void 0 === _a ? void 0 : _a.root) || void 0 === _b ? void 0 : _b.transform;
+        return transform ? new vchart_2.Matrix(transform.a, transform.b, transform.c, transform.d, transform.e, transform.f) : new vchart_2.Matrix;
+    }
+    _getSvgViewportRect() {
+        var _a, _b, _c, _d;
+        const viewBoxRect = null === (_a = this._parsedSvgResult) || void 0 === _a ? void 0 : _a.viewBoxRect;
+        if (viewBoxRect) return viewBoxRect;
+        const {width: width, height: height} = null !== (_b = this._parsedSvgResult) && void 0 !== _b ? _b : {};
+        return Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0 ? {
+            x: 0,
+            y: 0,
+            width: width,
+            height: height
+        } : null !== (_d = null === (_c = this._parsedSvgResult) || void 0 === _c ? void 0 : _c[svg_source_1.SVG_VIEWPORT_RECT_KEY]) && void 0 !== _d ? _d : null;
+    }
+    _getSvgRootBounds(rootMatrix) {
+        const viewBoxRect = this._getSvgViewportRect();
+        if (!viewBoxRect) return null;
+        const bounds = (new vchart_2.Bounds).setValue(viewBoxRect.x, viewBoxRect.y, viewBoxRect.x + viewBoxRect.width, viewBoxRect.y + viewBoxRect.height);
+        return bounds.transformWithMatrix(rootMatrix), bounds;
+    }
+    _appendMatrixScale(matrix, scale, center) {
+        const nextMatrix = new vchart_2.Matrix;
+        return nextMatrix.translate(center.x, center.y), nextMatrix.scale(scale, scale), 
+        nextMatrix.translate(-center.x, -center.y), nextMatrix.multiply(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f), 
+        nextMatrix;
+    }
+    _appendMatrixTranslate(matrix, dx, dy) {
+        const nextMatrix = new vchart_2.Matrix;
+        return nextMatrix.translate(dx, dy), nextMatrix.multiply(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f), 
+        nextMatrix;
+    }
+    _getFittedSvgRootMatrix() {
+        const rootMatrix = this._getSvgRootMatrix(), bounds = this._getSvgRootBounds(rootMatrix);
+        if (!bounds) return rootMatrix;
+        const width = bounds.width(), height = bounds.height();
+        if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) return rootMatrix;
+        const {width: regionWidth, height: regionHeight} = this.getLayoutRect(), rootCenterX = (bounds.x1 + bounds.x2) / 2, rootCenterY = (bounds.y1 + bounds.y2) / 2, scale = Math.min(regionWidth / width, regionHeight / height), scaledMatrix = this._appendMatrixScale(rootMatrix, scale, {
+            x: rootCenterX,
+            y: rootCenterY
+        });
+        return this._appendMatrixTranslate(scaledMatrix, regionWidth / 2 - rootCenterX, regionHeight / 2 - rootCenterY);
+    }
     initData() {
         var _a, _b;
         super.initData();
@@ -224,19 +269,14 @@ class PictogramSeries extends vchart_4.GeoSeries {
         super.onLayoutEnd(), null === (_a = this._mapViewData) || void 0 === _a || _a.getDataView().reRunAllTransform();
     }
     updateSVGSize() {
-        const {width: regionWidth, height: regionHeight} = this.getLayoutRect(), regionCenterX = regionWidth / 2, regionCenterY = regionHeight / 2, root = this.getPictogramRootGraphic();
-        if (root) {
-            const bounds = root.AABBBounds, {x1: x1, x2: x2, y1: y1, y2: y2} = root.AABBBounds, rootCenterX = (x1 + x2) / 2, rootCenterY = (y1 + y2) / 2, scaleX = regionWidth / bounds.width(), scaleY = regionHeight / bounds.height(), scale = Math.min(scaleX, scaleY);
-            root.scale(scale, scale, {
-                x: rootCenterX,
-                y: rootCenterY
-            }), root.translate(regionCenterX - rootCenterX, regionCenterY - rootCenterY);
-        }
+        const root = this.getPictogramRootGraphic();
+        root && root.setAttributes({
+            postMatrix: this._getFittedSvgRootMatrix()
+        });
     }
     initEvent() {
         var _a;
-        super.initEvent(), null === (_a = this._mapViewData.getDataView()) || void 0 === _a || _a.target.addListener("change", this.mapViewDataUpdate.bind(this)), 
-        this.event.on(vchart_4.ChartEvent.afterMarkLayoutEnd, this.updateSVGSize.bind(this));
+        super.initEvent(), null === (_a = this._mapViewData.getDataView()) || void 0 === _a || _a.target.addListener("change", this.mapViewDataUpdate.bind(this));
     }
     handleZoom(e) {
         const {scale: scale, scaleCenter: scaleCenter} = e;