@visactor/vchart 2.0.5 → 2.0.6

package/build/index.es.js

@@ -7587,7 +7587,15 @@ const EnvContribution = Symbol.for("EnvContribution");
 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;
@@ -10005,6 +10013,9 @@ var __decorate$1u = undefined && undefined.__decorate || function (decorators, t
   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);
   }
@@ -10397,11 +10408,13 @@ var __decorate$1t = undefined && undefined.__decorate || function (decorators, t
   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");
 
@@ -10978,13 +10991,17 @@ let DefaultGraphicUtil = class {
     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);
@@ -10997,7 +11014,7 @@ let DefaultGraphicUtil = class {
     }
   }
   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;
@@ -15623,7 +15640,7 @@ class Text extends Graphic {
       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();
   }
@@ -15722,7 +15739,7 @@ class Text extends Graphic {
     return fontSize ? .1 * fontSize : 0;
   }
   updateHorizontalMultilineAABBBounds(text) {
-    var _a;
+    var _a, _b;
     const textTheme = this.getGraphicTheme(),
       attribute = this.attribute,
       {
@@ -15749,7 +15766,7 @@ class Text extends Graphic {
       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,
@@ -15767,7 +15784,7 @@ class Text extends Graphic {
     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,
@@ -15793,7 +15810,7 @@ class Text extends Graphic {
       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,
@@ -15825,7 +15842,7 @@ class Text extends Graphic {
         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;
         }
@@ -15888,9 +15905,9 @@ class Text extends Graphic {
     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,
       {
@@ -15911,7 +15928,7 @@ class Text extends Graphic {
     } = 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 => {
@@ -18922,7 +18939,7 @@ let DefaultCanvasArcRender = class extends BaseRender {
     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;
@@ -20583,7 +20600,6 @@ var __decorate$19 = undefined && undefined.__decorate || function (decorators, t
       decorator(target, key, paramIndex);
     };
   };
-const RenderService = Symbol.for("RenderService");
 let DefaultRenderService = class {
   constructor(drawContribution) {
     this.drawContribution = drawContribution;
@@ -21472,8 +21488,6 @@ const transformUtil = container.get(TransformUtil);
 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;
 
@@ -32560,12 +32574,12 @@ class AnimateExecutor {
     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 = {};
@@ -32625,7 +32639,7 @@ class AnimationStateManager {
         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++) {
@@ -32676,7 +32690,7 @@ class AnimationStateManager {
   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) {
@@ -40634,7 +40648,7 @@ class LabelBase extends AnimateComponent {
       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;
@@ -40697,7 +40711,7 @@ class LabelBase extends AnimateComponent {
       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;
@@ -45605,7 +45619,7 @@ let DiscreteLegend$1 = class DiscreteLegend extends LegendBase {
           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;
@@ -45616,9 +45630,10 @@ let DiscreteLegend$1 = class DiscreteLegend extends LegendBase {
       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;
@@ -58310,7 +58325,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.5";
+const version = "2.0.6";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -71418,10 +71433,13 @@ const waterfall$1 = (lastData, op) => {
     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,
@@ -71628,7 +71646,7 @@ const waterfallFillTotal = (data, op) => {
     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)
@@ -71636,7 +71654,12 @@ const waterfallFillTotal = (data, op) => {
     if (seriesField) {
         totalData[seriesField] = 'total';
     }
-    data.push(totalData);
+    if (calculationMode === 'decrease') {
+        data.unshift(totalData);
+    }
+    else {
+        data.push(totalData);
+    }
     return data;
 };
 
@@ -72247,7 +72270,7 @@ class WaterfallSeries extends BarSeries {
         return super.getSeriesKeys();
     }
     initData() {
-        var _a;
+        var _a, _b, _c;
         super.initData();
         registerDataSetInstanceTransform(this._dataSet, 'waterfallFillTotal', waterfallFillTotal);
         registerDataSetInstanceTransform(this._dataSet, 'waterfall', waterfall$1);
@@ -72260,6 +72283,7 @@ class WaterfallSeries extends BarSeries {
                     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);
@@ -72279,6 +72303,7 @@ class WaterfallSeries extends BarSeries {
                 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()
             }
@@ -72403,6 +72428,7 @@ class WaterfallSeries extends BarSeries {
     }
     initMarkStyle() {
         super.initMarkStyle();
+        const isDecrease = this._spec.calculationMode === 'decrease';
         if (this._leaderLineMark) {
             if (this._direction === "horizontal") {
                 this.setMarkStyle(this._leaderLineMark, {
@@ -72413,9 +72439,9 @@ class WaterfallSeries extends BarSeries {
                         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', AttributeLevel.Series);
             }
             else {
@@ -72425,9 +72451,9 @@ class WaterfallSeries extends BarSeries {
                         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', AttributeLevel.Series);
@@ -89395,6 +89421,7 @@ class WaterfallChartSpecTransformer extends BarChartSpecTransformer {
         series.stackLabel = spec.stackLabel;
         series.leaderLine = spec.leaderLine;
         series.total = spec.total;
+        series.calculationMode = spec.calculationMode;
         return series;
     }
 }
@@ -95728,7 +95755,7 @@ class CartesianMarkLine extends BaseMarkLine {
         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;
@@ -95756,6 +95783,10 @@ class CartesianMarkLine extends BaseMarkLine {
                 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)) {
@@ -95767,11 +95798,11 @@ class CartesianMarkLine extends BaseMarkLine {
             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]],
@@ -95811,7 +95842,7 @@ class CartesianMarkLine extends BaseMarkLine {
             });
         }
         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() {
@@ -100264,8 +100295,41 @@ class FormatterPlugin extends BasePlugin {
         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;