@visactor/vchart 2.0.5-alpha.5 → 2.0.6

package/build/index.js

@@ -7593,7 +7593,15 @@
     const VGlobal = Symbol.for("VGlobal");
     const DEFAULT_TEXT_FONT_FAMILY$1 = "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol";
 
-    class Application {}
+    const container = new Container();
+
+    const RenderService = Symbol.for("RenderService");
+
+    class Application {
+      get renderService() {
+        return this._renderService || (this._renderService = container.get(RenderService)), this._renderService;
+      }
+    }
     const application = new Application();
 
     let idx = 0;
@@ -10011,6 +10019,9 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     let ATextMeasure = class {
+      constructor() {
+        this.id = "ATextMeasure";
+      }
       configure(service, env) {
         this.canvas = service.canvas, this.context = service.context, service.bindTextMeasure(this);
       }
@@ -10403,11 +10414,13 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     const TextMeasureContribution = Symbol.for("TextMeasureContribution");
-    let DefaultTextMeasureContribution = class extends ATextMeasure {};
+    let DefaultTextMeasureContribution = class extends ATextMeasure {
+      constructor() {
+        super(...arguments), this.id = "DefaultTextMeasureContribution";
+      }
+    };
     DefaultTextMeasureContribution = __decorate$1t([injectable()], DefaultTextMeasureContribution);
 
-    const container = new Container();
-
     const CanvasFactory = Symbol.for("CanvasFactory");
     const Context2dFactory = Symbol.for("Context2dFactory");
 
@@ -10984,13 +10997,17 @@
         return this.tryInitCanvas(), this._context;
       }
       constructor(contributions) {
-        this.contributions = contributions, this.configured = !1, this.global = application.global, this.global.hooks.onSetEnv.tap("graphic-util", (lastEnv, env, global) => {
+        this.contributions = contributions, this.configured = !1, this.global = application.global, this._textMeasureMap = new Map(), this.global.hooks.onSetEnv.tap("graphic-util", (lastEnv, env, global) => {
           this.configured = !1, this.configure(global, env);
         });
       }
       get textMeasure() {
         return this._textMeasure || this.configure(this.global, this.global.env), this._textMeasure;
       }
+      getTextMeasureInstance(textMeasureId) {
+        if (!textMeasureId) return this.textMeasure;
+        return this._textMeasureMap.get(textMeasureId) || this.textMeasure;
+      }
       configure(global, env) {
         this.configured || (this.contributions.getContributions().forEach(contribution => {
           contribution.configure(this, env);
@@ -11003,7 +11020,7 @@
         }
       }
       bindTextMeasure(tm) {
-        this._textMeasure = tm;
+        this._textMeasure && "DefaultTextMeasureContribution" !== tm.id || (this._textMeasure = tm), this._textMeasureMap.has(tm.id) || this._textMeasureMap.set(tm.id, tm);
       }
       measureText(text, tc, method = "native") {
         var _a;
@@ -15629,7 +15646,7 @@
           this.cache.layoutData.lines.forEach(item => {
             mergedText += item.str;
           });
-          return (Array.isArray(text) ? text.join("") : text) !== mergedText;
+          return (Array.isArray(text) ? text.join("") : text).toString() !== mergedText;
         }
         return "vertical" === attribute.direction && this.cache.verticalList && this.cache.verticalList[0] ? this.cache.verticalList[0].map(item => item.text).join("") !== attribute.text.toString() : null != this.clipedText && this.clipedText !== attribute.text.toString();
       }
@@ -15728,7 +15745,7 @@
         return fontSize ? .1 * fontSize : 0;
       }
       updateHorizontalMultilineAABBBounds(text) {
-        var _a;
+        var _a, _b;
         const textTheme = this.getGraphicTheme(),
           attribute = this.attribute,
           {
@@ -15755,7 +15772,7 @@
           const bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = application.graphicUtil.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
           layoutData = new CanvasTextLayout(fontFamily, {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -15773,7 +15790,7 @@
         return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
       }
       updateWrapAABBBounds(text) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const textTheme = this.getGraphicTheme(),
           {
             fontFamily = textTheme.fontFamily,
@@ -15799,7 +15816,7 @@
           const bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = application.graphicUtil.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
           textOptions = {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -15831,7 +15848,7 @@
             if ("" !== str && "" === clip.str || clip.wordBreaked) {
               if (ellipsis) {
                 const clipEllipsis = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
-                clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -15894,9 +15911,9 @@
         return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
       }
       updateVerticalMultilineAABBBounds(text) {
-        var _a, _b;
+        var _a, _b, _c;
         const textTheme = this.getGraphicTheme(),
-          textMeasure = application.graphicUtil.textMeasure;
+          textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_a = this.stage) || void 0 === _a ? void 0 : _a.textMeasureId));
         let width;
         const attribute = this.attribute,
           {
@@ -15917,7 +15934,7 @@
         } = attribute;
         if (!verticalMode) {
           const t = textAlign;
-          textAlign = null !== (_a = Text.baselineMapAlign[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = Text.alignMapBaseline[t]) && void 0 !== _b ? _b : "top";
+          textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
         }
         if (width = 0, !this.shouldUpdateShape() && this.cache) {
           this.cache.verticalList.forEach(item => {
@@ -18928,7 +18945,7 @@
         doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.fill()));
       }
       _runStroke(arc, context, x, y, arcAttribute, doStroke, isFullStroke, sVisible, strokeCb) {
-        doStroke && isFullStroke && (strokeCb || sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
+        doStroke && isFullStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
       }
       draw(arc, renderService, drawContext, params) {
         const arcAttribute = getTheme$1(arc, null == params ? void 0 : params.theme).arc;
@@ -20589,7 +20606,6 @@
           decorator(target, key, paramIndex);
         };
       };
-    const RenderService = Symbol.for("RenderService");
     let DefaultRenderService = class {
       constructor(drawContribution) {
         this.drawContribution = drawContribution;
@@ -21478,8 +21494,6 @@
     application.transformUtil = transformUtil;
     const graphicService = container.get(GraphicService);
     application.graphicService = graphicService;
-    const renderService = container.get(RenderService);
-    application.renderService = renderService;
     const layerService = container.get(LayerService);
     application.layerService = layerService;
 
@@ -32566,12 +32580,12 @@
         const parsedParams = this.parseParams(params, isTimeline);
         return animate = isTimeline ? this.executeTimelineItem(parsedParams, graphic, index, count) : this.executeTypeConfigItem(parsedParams, graphic, index, count), animate && this._trackAnimation(animate), animate;
       }
-      stop(type) {
+      stop(type, callEnd = !0) {
         for (; this._animates.length > 0;) {
           const animate = this._animates.pop();
-          null == animate || animate.stop(type);
+          !1 === callEnd && (animate.status = AnimateStatus.END), null == animate || animate.stop(type);
         }
-        this._animates = [], this._activeCount = 0, this._started && (this._started = !1, this.onEnd());
+        this._animates = [], this._activeCount = 0, this._started && (this._started = !1, callEnd && this.onEnd());
       }
     }
     AnimateExecutor.builtInAnimateMap = {};
@@ -32631,7 +32645,7 @@
             executor: new AnimateExecutor(this.graphic)
           });
         }), shouldStopState.forEach(state => {
-          state.executor.stop();
+          state.executor.stop(null, !1);
         }), shouldApplyState.length) {
           shouldApplyState[0].executor.execute(shouldApplyState[0].animationConfig);
           for (let i = 0; i < shouldApplyState.length; i++) {
@@ -32682,7 +32696,7 @@
       clearState() {
         var _a;
         null === (_a = this.stateList) || void 0 === _a || _a.forEach(state => {
-          state.executor.stop();
+          state.executor.stop(null, !1);
         }), this.stateList = null;
       }
       reApplyState(state) {
@@ -40640,7 +40654,7 @@
           const text = result[i],
             bounds = text.AABBBounds,
             range = boundToRange(bmpTool, bounds, !0);
-          if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) bitmap.setRange(range);else {
+          if (canPlace(bmpTool, bitmap, bounds, clampForce || hideOnOverflow, overlapPadding)) bitmap.setRange(range);else {
             if (hideOnOverflow) {
               if (this._processHideOnOverflow(text, bmpTool)) continue;
             } else if (clampForce && this._processClampForce(text, bmpTool, bitmap, overlapPadding)) continue;
@@ -40703,7 +40717,7 @@
           const text = labels[i],
             baseMark = this.getRelatedGraphic(text.attribute);
           if (text.update(), !this.isMarkInsideRect(baseMark, bmpTool)) continue;
-          if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce, overlapPadding)) {
+          if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce || hideOnOverflow, overlapPadding)) {
             if (!checkBounds) {
               bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
               continue;
@@ -45611,7 +45625,7 @@
               width: width,
               height: height
             } = item.attribute;
-            contentWidth < startX + width && (startX = 0, startY += height + spaceRow, pages += 1), index > 0 && item.setAttributes({
+            contentWidth < startX + width && index > 0 && (startX = 0, startY += height + spaceRow, pages += 1), index > 0 && item.setAttributes({
               x: startX,
               y: startY
             }), startX += spaceCol + width;
@@ -45622,9 +45636,10 @@
           if (compWidth = this._itemMaxWidth * maxCol + (maxCol - 1) * spaceCol, compHeight = maxHeight, contentWidth = compWidth, comp = this._createPager(compStyle), this._pagerComponent = comp, this._innerView.add(comp), contentHeight = maxHeight - comp.AABBBounds.height() - pagerSpace - renderStartY, contentHeight <= 0) return this._innerView.removeChild(comp), !1;
           itemsContainer.getChildren().forEach((item, index) => {
             const {
+              width: width,
               height: height
             } = item.attribute;
-            contentHeight < startY + height && (startY = 0, startX += this._itemMaxWidth + spaceCol, pages += 1), index > 0 && item.setAttributes({
+            contentHeight < startY + height && index > 0 && (startY = 0, startX += this._itemMaxWidth + spaceCol, pages += 1), index > 0 && item.setAttributes({
               x: startX,
               y: startY
             }), startY += spaceRow + height;
@@ -58316,7 +58331,7 @@
         });
     };
 
-    const version = "2.0.5-alpha.5";
+    const version = "2.0.6";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -59065,7 +59080,7 @@
                 traverseSpec(spec[index], transform, excludeKeys);
             });
         }
-        else if (isObject$2(spec)) {
+        else if (isObject$2(spec) && typeof spec !== 'function') {
             for (const key in spec) {
                 if (!excludeKeys.includes(key)) {
                     spec[key] = transform(spec[key], key);
@@ -70909,11 +70924,20 @@
             }
         }
         initEvent() {
+            var _a, _b, _c;
             this.event.on(exports.ChartEvent.scaleUpdate, { filter: ({ model }) => (model === null || model === void 0 ? void 0 : model.id) === this.id }, this.effect.scaleUpdate.bind(this));
             const { roam } = this._spec;
             if (roam) {
-                this.initZoomEventOfRegions(this._regions, null, this._handleChartZoom);
-                this.initDragEventOfRegions(this._regions, roam.blank ? null : () => true, this.pan);
+                let zoom = true;
+                let drag = true;
+                let blank = false;
+                if (roam !== true) {
+                    zoom = (_a = roam.zoom) !== null && _a !== void 0 ? _a : true;
+                    drag = (_b = roam.drag) !== null && _b !== void 0 ? _b : true;
+                    blank = (_c = roam.blank) !== null && _c !== void 0 ? _c : false;
+                }
+                zoom && this.initZoomEventOfRegions(this._regions, null, this._handleChartZoom);
+                drag && this.initDragEventOfRegions(this._regions, blank ? null : () => true, this.pan);
                 this._regions.forEach(r => {
                     r.getSeries().forEach(s => {
                         s.event.on('zoom', e => {
@@ -71415,10 +71439,13 @@
         if (!lastData || lastData.length === 0) {
             return lastData;
         }
-        const { indexField, total: totalSpec, groupData } = op;
+        const { indexField, total: totalSpec, groupData, calculationMode } = op;
         const totalData = [];
         const { dimensionValues, dimensionData } = groupData().latestData;
-        const indexValues = Array.from(dimensionValues[indexField]);
+        let indexValues = Array.from(dimensionValues[indexField]);
+        if (calculationMode === 'decrease') {
+            indexValues = indexValues.reverse();
+        }
         let temp = {
             start: 0,
             end: 0,
@@ -71625,7 +71652,7 @@
         if (!data) {
             return data;
         }
-        const { indexField, valueField, total, seriesField } = op;
+        const { indexField, valueField, total, seriesField, calculationMode } = op;
         const totalData = {
             [indexField]: (total === null || total === void 0 ? void 0 : total.text) || 'total',
             [valueField]: data.reduce((pre, cur) => precisionAdd(pre, +cur[valueField]), 0)
@@ -71633,7 +71660,12 @@
         if (seriesField) {
             totalData[seriesField] = 'total';
         }
-        data.push(totalData);
+        if (calculationMode === 'decrease') {
+            data.unshift(totalData);
+        }
+        else {
+            data.push(totalData);
+        }
         return data;
     };
 
@@ -72244,7 +72276,7 @@
             return super.getSeriesKeys();
         }
         initData() {
-            var _a;
+            var _a, _b, _c;
             super.initData();
             registerDataSetInstanceTransform(this._dataSet, 'waterfallFillTotal', waterfallFillTotal);
             registerDataSetInstanceTransform(this._dataSet, 'waterfall', waterfall$1);
@@ -72257,6 +72289,7 @@
                         seriesField: this.getSeriesField(),
                         seriesFieldName: this._theme.seriesFieldName,
                         total: this._spec.total,
+                        calculationMode: (_b = this._spec.calculationMode) !== null && _b !== void 0 ? _b : 'increase',
                         stackInverse: this.getRegion().getStackInverse()
                     }
                 }, false);
@@ -72276,6 +72309,7 @@
                     startAs: STACK_FIELD_START,
                     endAs: STACK_FIELD_END,
                     total: this._spec.total,
+                    calculationMode: (_c = this._spec.calculationMode) !== null && _c !== void 0 ? _c : 'increase',
                     groupData: () => this.getGroups().groupData,
                     stackInverse: this.getRegion().getStackInverse()
                 }
@@ -72400,6 +72434,7 @@
         }
         initMarkStyle() {
             super.initMarkStyle();
+            const isDecrease = this._spec.calculationMode === 'decrease';
             if (this._leaderLineMark) {
                 if (this._direction === "horizontal") {
                     this.setMarkStyle(this._leaderLineMark, {
@@ -72410,9 +72445,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionY(datum, 'lastIndex', 1);
+                            return this.totalPositionY(datum, 'lastIndex', isDecrease ? 0 : 1);
                         },
-                        y1: (datum) => this.totalPositionY(datum, 'index', 0)
+                        y1: (datum) => this.totalPositionY(datum, 'index', isDecrease ? 1 : 0)
                     }, 'normal', exports.AttributeLevel.Series);
                 }
                 else {
@@ -72422,9 +72457,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionX(datum, 'lastIndex', 1);
+                            return this.totalPositionX(datum, 'lastIndex', isDecrease ? 0 : 1);
                         },
-                        x1: (datum) => this.totalPositionX(datum, 'index', 0),
+                        x1: (datum) => this.totalPositionX(datum, 'index', isDecrease ? 1 : 0),
                         y: (datum) => this.totalPositionY(datum, 'lastEnd', 0),
                         y1: (datum) => this.totalPositionY(datum, datum.isTotal ? 'end' : 'start', 0)
                     }, 'normal', exports.AttributeLevel.Series);
@@ -89392,6 +89427,7 @@
             series.stackLabel = spec.stackLabel;
             series.leaderLine = spec.leaderLine;
             series.total = spec.total;
+            series.calculationMode = spec.calculationMode;
             return series;
         }
     }
@@ -94562,7 +94598,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     function isAggrSpec(spec) {
         return AGGR_TYPE.includes(spec);
     }
-    function xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange) {
+    function xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange, includeFullBand = false) {
         const regionStart = startRelativeSeries.getRegion();
         const regionStartLayoutStartPoint = regionStart.getLayoutStartPoint();
         const regionEnd = endRelativeSeries.getRegion();
@@ -94578,20 +94614,31 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         };
         const lines = [];
         const dataPoints = data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData;
-        const xDomain = relativeSeries.getXAxisHelper().getScale(0).domain();
-        const yDomain = relativeSeries.getYAxisHelper().getScale(0).domain();
+        const xAxisHelper = relativeSeries.getXAxisHelper();
+        const yAxisHelper = relativeSeries.getXAxisHelper();
+        const xDomain = xAxisHelper.getScale(0).domain();
+        const yDomain = yAxisHelper.getScale(0).domain();
+        const isXExpand = includeFullBand && !xAxisHelper.isContinuous && !!xAxisHelper.getBandwidth;
+        const isyExpand = includeFullBand && !yAxisHelper.isContinuous && !!yAxisHelper.getBandwidth;
+        const xTemp = { min: null, max: null };
+        const yTemp = { min: null, max: null };
         dataPoints.forEach((datum) => {
             const isValidX = isValid$1(datum.x);
             const isValidY = isValid$1(datum.y);
+            let x;
+            let y;
             if (isValidX && isValidY) {
-                const x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint);
-                const y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint);
+                x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint);
+                y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint);
+                setTempWithValid(x, isXExpand, xTemp, lines.length);
+                setTempWithValid(y, isyExpand, yTemp, lines.length);
                 lines.push([{ x, y }]);
             }
             else if (isValidX) {
-                const x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint);
-                const y = Math.max(regionStartLayoutStartPoint.y + regionStart.getLayoutRect().height, regionEndLayoutStartPoint.y + regionEnd.getLayoutRect().height);
+                x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint);
+                y = Math.max(regionStartLayoutStartPoint.y + regionStart.getLayoutRect().height, regionEndLayoutStartPoint.y + regionEnd.getLayoutRect().height);
                 const y1 = Math.min(regionStartLayoutStartPoint.y, regionEndLayoutStartPoint.y);
+                setTempWithValid(x, isXExpand, xTemp, lines.length);
                 lines.push([
                     {
                         x: x,
@@ -94604,9 +94651,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 ]);
             }
             else if (isValidY) {
-                const x = Math.min(regionStartLayoutStartPoint.x, regionEndLayoutStartPoint.x);
-                const y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint);
+                x = Math.min(regionStartLayoutStartPoint.x, regionEndLayoutStartPoint.x);
+                y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint);
                 const x1 = Math.max(regionStartLayoutStartPoint.x + regionStart.getLayoutRect().width, regionEndLayoutStartPoint.x + regionEnd.getLayoutRect().width);
+                setTempWithValid(y, isyExpand, yTemp, lines.length);
                 lines.push([
                     {
                         x: x,
@@ -94619,8 +94667,46 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 ]);
             }
         });
+        setTempToLines(lines, xAxisHelper, yAxisHelper, xTemp, yTemp);
         return lines;
     }
+    function setTempToLines(lines, xAxisHelper, yAxisHelper, xTemp, yTemp) {
+        if (xTemp.min || xTemp.max) {
+            const xBandSize = xAxisHelper.getBandwidth(0) * (1 + xAxisHelper.getScale(0).paddingInner());
+            if (xTemp.min) {
+                lines[xTemp.min.index].forEach(p => (p.x -= xBandSize / 2));
+            }
+            if (xTemp.max) {
+                lines[xTemp.max.index].forEach(p => (p.x += xBandSize / 2));
+            }
+        }
+        if (yTemp.min || yTemp.max) {
+            const yBandSize = yAxisHelper.getBandwidth(0) * (1 + yAxisHelper.getScale(0).paddingInner());
+            if (yTemp.min) {
+                lines[yTemp.min.index].forEach(p => (p.y -= yBandSize / 2));
+            }
+            if (yTemp.max) {
+                lines[yTemp.max.index].forEach(p => (p.y += yBandSize / 2));
+            }
+        }
+    }
+    function setTempWithValid(v, isExpand, temp, index) {
+        if (isExpand) {
+            if (temp.min === null || temp.min.value > v) {
+                temp.min = {
+                    value: v,
+                    index
+                };
+            }
+            if (temp.max === null || temp.max.value < v) {
+                temp.max = {
+                    value: v,
+                    index
+                };
+            }
+        }
+        return v;
+    }
     function polarLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange) {
         const refSeries = {
             relativeSeries,
@@ -95675,7 +95761,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return { points };
         }
         _markerLayout() {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const updateAttrs = this._getUpdateMarkerAttrs();
             if (this._spec.type === 'type-step') {
                 const startRelativeSeries = this._startRelativeSeries;
@@ -95703,6 +95789,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     expandDistanceValue = expandDistance;
                 }
                 const { points, limitRect } = updateAttrs;
+                if (!points || points.length < 2) {
+                    (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.setAttributes(updateAttrs);
+                    return;
+                }
                 const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
                 let labelPositionAttrs;
                 if (multiSegment && isValid$1(mainSegmentIndex)) {
@@ -95714,11 +95804,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 else {
                     labelPositionAttrs = Object.assign({ position: 'start', autoRotate: false }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue));
                 }
-                const markerComponentAttr = (_b = (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.attribute) !== null && _b !== void 0 ? _b : {};
+                const markerComponentAttr = (_c = (_b = this._markerComponent) === null || _b === void 0 ? void 0 : _b.attribute) !== null && _c !== void 0 ? _c : {};
                 const prevLabelAttrs = array(markerComponentAttr.label);
                 const updateLabels = array(updateAttrs.label);
                 const labelsInSpec = array(this._spec.label);
-                (_c = this._markerComponent) === null || _c === void 0 ? void 0 : _c.setAttributes({
+                (_d = this._markerComponent) === null || _d === void 0 ? void 0 : _d.setAttributes({
                     points: multiSegment
                         ? [
                             [joinPoints[0], joinPoints[1]],
@@ -95758,7 +95848,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             }
             else {
-                (_d = this._markerComponent) === null || _d === void 0 ? void 0 : _d.setAttributes(updateAttrs);
+                (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(updateAttrs);
             }
         }
         _computeOptions() {
@@ -96251,7 +96341,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return new MarkArea(attr);
         }
         _computePointsAttr() {
-            var _a;
+            var _a, _b;
             const spec = this._spec;
             const data = this._markerData;
             const startRelativeSeries = this._startRelativeSeries;
@@ -96260,10 +96350,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const { doXProcess, doYProcess, doXYProcess, doCoordinatesProcess } = getMarkAreaProcessInfo(spec);
             const isPositionLayout = isValid$1(spec.positions);
             const autoRange = (_a = spec.autoRange) !== null && _a !== void 0 ? _a : false;
+            const includeFullBand = (_b = spec.includeFullBand) !== null && _b !== void 0 ? _b : false;
             let points = [];
             let lines = [];
             if (doXYProcess) {
-                lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);
+                lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange, includeFullBand);
                 const [start, end] = lines;
                 if (start && start.length && end && end.length) {
                     points = [
@@ -96281,7 +96372,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
             }
             else if (doXProcess || doYProcess) {
-                lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);
+                lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange, includeFullBand);
                 const [start, end] = lines;
                 if (start && start.length && end && end.length) {
                     points = [...start, end[1], end[0]];
@@ -98624,6 +98715,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
         }
         clearLayoutSize() {
+            this._gridInfo.colWidth &&
+                this.setSizeFromUserSetting(this._gridInfo.colWidth, this._colSize, this._col, this._chartLayoutRect.width);
+            this._gridInfo.rowHeight &&
+                this.setSizeFromUserSetting(this._gridInfo.rowHeight, this._rowSize, this._row, this._chartLayoutRect.height);
             this._colSize.forEach(c => {
                 c.isLayoutSetting = false;
                 if (!c.isUserSetting) {
@@ -99398,7 +99493,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return '';
         }
         const styleString = `style="display:inline-block;vertical-align:middle;"`;
-        const { shapeType, shapeFill, shapeStroke, shapeHollow = false } = option;
+        const { shapeType, shapeStroke, shapeHollow = false, shapeFill } = option;
         const size = (_a = option.shapeSize) !== null && _a !== void 0 ? _a : 8;
         const lineWidth = option.shapeLineWidth ? escapeHTML(option.shapeLineWidth) + 'px' : '0px';
         let fillString = 'currentColor';
@@ -99427,7 +99522,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const lw = Number(lineWidth.slice(0, -2));
             viewBox = `${x - lw / 2} ${y - lw / 2} ${w + lw} ${h + lw}`;
         }
-        if (!shapeFill || isString$1(shapeFill) || shapeHollow) {
+        const isFillGradientStr = GradientParser.IsGradientStr(shapeFill);
+        if (!shapeFill || (isString$1(shapeFill) && !isFillGradientStr) || shapeHollow) {
             fillString = shapeHollow ? 'none' : shapeFill ? escapeHTML(shapeFill) : 'currentColor';
             return `
     <svg ${styleString} width="${size}" height="${size}" viewBox="${viewBox}">
@@ -99438,19 +99534,20 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
       </path>
     </svg>`;
         }
-        if (isObject$2(shapeFill)) {
+        const shapeFillObject = isFillGradientStr ? GradientParser.Parse(shapeFill) : isObject$2(shapeFill) ? shapeFill : null;
+        if (shapeFillObject) {
             fillString = 'gradientColor' + (gradientId !== null && gradientId !== void 0 ? gradientId : '');
             let gradient = '';
-            const stops = ((_b = shapeFill.stops) !== null && _b !== void 0 ? _b : [])
+            const stops = ((_b = shapeFillObject.stops) !== null && _b !== void 0 ? _b : [])
                 .map(s => `<stop offset="${escapeHTML(s.offset.toString())}" stop-color="${escapeHTML(s.color)}"/>`)
                 .join('');
-            if (shapeFill.gradient === 'radial') {
+            if (shapeFillObject.gradient === 'radial') {
                 gradient = `<radialGradient id="${fillString}" cx="50%" cy="50%" r="50%" fx="0%" fy="0%">
       ${stops}
       </radialGradient>`;
             }
-            else if (shapeFill.gradient === 'linear') {
-                gradient = `<linearGradient id="${fillString}" x1="${((_c = shapeFill.x0) !== null && _c !== void 0 ? _c : 0) * 100}%" y1="${((_d = shapeFill.y0) !== null && _d !== void 0 ? _d : 0) * 100}%" x2="${((_e = shapeFill.x1) !== null && _e !== void 0 ? _e : 0) * 100}%" y2="${((_f = shapeFill.y1) !== null && _f !== void 0 ? _f : 0) * 100}%">
+            else if (shapeFillObject.gradient === 'linear') {
+                gradient = `<linearGradient id="${fillString}" x1="${((_c = shapeFillObject.x0) !== null && _c !== void 0 ? _c : 0) * 100}%" y1="${((_d = shapeFillObject.y0) !== null && _d !== void 0 ? _d : 0) * 100}%" x2="${((_e = shapeFillObject.x1) !== null && _e !== void 0 ? _e : 0) * 100}%" y2="${((_f = shapeFillObject.y1) !== null && _f !== void 0 ? _f : 0) * 100}%">
       ${stops}
       </linearGradient>`;
             }
@@ -100204,8 +100301,41 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             else if (formatter.includes('%') && this._timeFormatter) {
                 return this._timeFormatter(formatter, text);
             }
+            else if (formatter.startsWith('calc(')) {
+                return this._calcFormatter(formatter, text);
+            }
             return text;
         }
+        _calcFormatter(formatter, text) {
+            try {
+                const expression = formatter.slice(5, -1).replace(/v/g, String(text));
+                return this._calculateMathExpression(expression, text);
+            }
+            catch (e) {
+                return text;
+            }
+        }
+        _calculateMathExpression(expression, text) {
+            const cleanExpression = expression.replace(/\s+/g, '');
+            if (!this._isValidMathExpression(cleanExpression)) {
+                return text;
+            }
+            try {
+                const safeFunction = new Function('return (' + cleanExpression + ')');
+                const result = safeFunction();
+                if (typeof result !== 'number' || isNaN(result) || !isFinite(result)) {
+                    throw new Error('Invalid calculation result');
+                }
+                return result;
+            }
+            catch (error) {
+                return text;
+            }
+        }
+        _isValidMathExpression(expression) {
+            const validPattern = /^[0-9+\-*/().]+$/;
+            return validPattern.test(expression);
+        }
         release() {
             super.release();
             this._format = null;
@@ -101826,6 +101956,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     exports.ScatterSeries = ScatterSeries;
     exports.ScrollBar = ScrollBar;
     exports.SequenceChart = SequenceChart;
+    exports.Stack = Stack;
+    exports.StackChartMixin = StackChartMixin;
     exports.StreamLight = StreamLight;
     exports.SunburstChart = SunburstChart;
     exports.SunburstSeries = SunburstSeries;