@visactor/vchart 2.1.0-alpha.10 → 2.1.0-alpha.12

package/build/index.es.js

@@ -71418,7 +71418,7 @@ class BaseLineMark extends BaseMark {
             : null));
     }
     _runPointsEncoder(newStyles, g, attrs = {}) {
-        var _a, _b, _c;
+        var _a, _b;
         const data = g.context.data;
         const lineAttrs = [];
         const points = [];
@@ -71443,7 +71443,7 @@ class BaseLineMark extends BaseMark {
             points[index].context = (_a = this._keyGetter(datum)) !== null && _a !== void 0 ? _a : index;
         });
         if (progressive) {
-            const segments = (_c = (_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) !== null && _c !== void 0 ? _c : [];
+            const segments = ((_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) ? [...g.attribute.segments] : [];
             segments.push({
                 points
             });
@@ -83113,6 +83113,17 @@ class WaterfallSeries extends BarSeries {
             bandPosition: this._bandPosition
         }));
     }
+    _isCategoryAxisInverse() {
+        var _a, _b, _c, _e;
+        return this._direction === "horizontal"
+            ? (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.isInverse) === null || _b === void 0 ? void 0 : _b.call(_a)
+            : (_e = (_c = this._xAxisHelper) === null || _c === void 0 ? void 0 : _c.isInverse) === null || _e === void 0 ? void 0 : _e.call(_c);
+    }
+    _getLeaderLineCategoryPos(isStart, isDecrease) {
+        const inverse = !!this._isCategoryAxisInverse();
+        const normalPos = isStart ? (isDecrease ? 0 : 1) : isDecrease ? 1 : 0;
+        return inverse ? 1 - normalPos : normalPos;
+    }
     initMarkStyle() {
         super.initMarkStyle();
         const isDecrease = this._spec.calculationMode === 'decrease';
@@ -83126,9 +83137,9 @@ class WaterfallSeries extends BarSeries {
                         if (!datum.lastIndex) {
                             return 0;
                         }
-                        return this.totalPositionY(datum, 'lastIndex', isDecrease ? 0 : 1);
+                        return this.totalPositionY(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                     },
-                    y1: (datum) => this.totalPositionY(datum, 'index', isDecrease ? 1 : 0)
+                    y1: (datum) => this.totalPositionY(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease))
                 }, 'normal', AttributeLevel.Series);
             }
             else {
@@ -83138,9 +83149,9 @@ class WaterfallSeries extends BarSeries {
                         if (!datum.lastIndex) {
                             return 0;
                         }
-                        return this.totalPositionX(datum, 'lastIndex', isDecrease ? 0 : 1);
+                        return this.totalPositionX(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                     },
-                    x1: (datum) => this.totalPositionX(datum, 'index', isDecrease ? 1 : 0),
+                    x1: (datum) => this.totalPositionX(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease)),
                     y: (datum) => this.totalPositionY(datum, 'lastEnd', 0),
                     y1: (datum) => this.totalPositionY(datum, datum.isTotal ? 'end' : 'start', 0)
                 }, 'normal', AttributeLevel.Series);
@@ -102366,6 +102377,7 @@ class BaseLegend extends BaseComponent {
     }
     clear() {
         super.clear();
+        this._legendComponent = null;
         this._cacheAttrs = null;
         this._preSelectedData = null;
     }
@@ -108171,6 +108183,7 @@ const MARKER_DOMAIN_POSITION_SPEC_KEYS = [
     'radius1'
 ];
 const MARKER_LAYOUT_POSITION_SPEC_KEYS = ['position', 'positions', 'coordinatesOffset', 'regionRelative'];
+const MARKER_ITEM_CONTENT_LAYOUT_SPEC_KEYS = ['offsetX', 'offsetY', 'confine'];
 const normalizeMarkerLabelFormatMethod = (label) => {
     if (Array.isArray(label)) {
         return label.map(normalizeMarkerLabelFormatMethod);
@@ -108202,7 +108215,6 @@ const normalizeMarkerStyles = (value) => {
     return normalized;
 };
 const normalizeMarkerSpecForComponentOnlyUpdate = (spec, options) => {
-    var _a;
     if (!spec || typeof spec !== 'object') {
         return spec;
     }
@@ -108226,9 +108238,18 @@ const normalizeMarkerSpecForComponentOnlyUpdate = (spec, options) => {
     Object.keys(normalized).forEach(key => {
         normalized[key] = normalizeMarkerStyles(normalized[key]);
     });
-    const text = (_a = normalized.itemContent) === null || _a === void 0 ? void 0 : _a.text;
-    if (text && typeof text === 'object') {
-        normalized.itemContent = Object.assign(Object.assign({}, normalized.itemContent), { text: Object.assign(Object.assign({}, normalizeMarkerLabelFormatMethod(text)), { text: MARKER_TEXT_PLACEHOLDER }) });
+    const itemContent = normalized.itemContent;
+    if (itemContent && typeof itemContent === 'object') {
+        normalized.itemContent = Object.assign({}, itemContent);
+        MARKER_ITEM_CONTENT_LAYOUT_SPEC_KEYS.forEach(key => {
+            if (key in normalized.itemContent) {
+                normalized.itemContent[key] = MARKER_COORDINATE_PLACEHOLDER;
+            }
+        });
+        const text = normalized.itemContent.text;
+        if (text && typeof text === 'object') {
+            normalized.itemContent.text = Object.assign(Object.assign({}, normalizeMarkerLabelFormatMethod(text)), { text: MARKER_TEXT_PLACEHOLDER });
+        }
     }
     return normalized;
 };
@@ -110664,6 +110685,7 @@ class BaseMarkPoint extends BaseMarker {
     _createMarkerComponent() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
         const { itemContent = {}, itemLine = {}, targetSymbol = {} } = this._spec;
+        const region = this._relativeSeries.getRegion();
         const _10 = itemContent, { type = 'text', text: label, symbol, image, richText, customMark, textStyle, symbolStyle, imageStyle, richTextStyle, customMarkStyle, style = {}, state = {} } = _10, restItemContent = __rest$h(_10, ["type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state"]);
         let itemContentState = null;
         let itemContentStyle = null;
@@ -110713,7 +110735,7 @@ class BaseMarkPoint extends BaseMarker {
             select: (_u = this._spec.interactive) !== null && _u !== void 0 ? _u : true,
             position: { x: 0, y: 0 },
             clipInRange: (_v = this._spec.clip) !== null && _v !== void 0 ? _v : false,
-            itemContent: Object.assign(Object.assign({ type, offsetX: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()), offsetY: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()) }, restItemContent), { style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext) }),
+            itemContent: Object.assign(Object.assign({ type, offsetX: transformOffset(itemContent.offsetX, region), offsetY: transformOffset(itemContent.offsetY, region) }, restItemContent), { style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext) }),
             targetSymbol: {
                 offset: (_w = targetSymbol.offset) !== null && _w !== void 0 ? _w : 0,
                 visible: (_x = targetSymbol.visible) !== null && _x !== void 0 ? _x : false,
@@ -110758,6 +110780,7 @@ class BaseMarkPoint extends BaseMarker {
                 : data.latestData
             : seriesData;
         const { itemLine = {}, itemContent = {} } = this._spec;
+        const region = this._relativeSeries.getRegion();
         const { visible: itemLineVisible, line = {} } = itemLine, restItemLine = __rest$h(itemLine, ["visible", "line"]);
         const itemLineAttrs = itemLineVisible !== false
             ? Object.assign(Object.assign({}, restItemLine), { visible: true, lineStyle: transformToGraphic(line.style) })
@@ -110779,6 +110802,8 @@ class BaseMarkPoint extends BaseMarker {
             const attribute = (_d = this._markerComponent.attribute) !== null && _d !== void 0 ? _d : {};
             const textStyle = (_f = (_e = attribute.itemContent) === null || _e === void 0 ? void 0 : _e.textStyle) !== null && _f !== void 0 ? _f : {};
             const specText = (_g = this._spec.itemContent.text) === null || _g === void 0 ? void 0 : _g.text;
+            const offsetX = transformOffset(itemContent.offsetX, region);
+            const offsetY = transformOffset(itemContent.offsetY, region);
             this._markerComponent.setAttributes({
                 position: point === undefined ? { x: null, y: null } : point,
                 itemContent: Object.assign(Object.assign({}, attribute.itemContent), { panel: (_h = labelAttrs.panel) !== null && _h !== void 0 ? _h : (_j = attribute.itemContent) === null || _j === void 0 ? void 0 : _j.panel, padding: (_k = labelAttrs.padding) !== null && _k !== void 0 ? _k : (_l = attribute.itemContent) === null || _l === void 0 ? void 0 : _l.padding, textStyle: Object.assign(Object.assign(Object.assign({}, textStyle), ((_m = labelAttrs.textStyle) !== null && _m !== void 0 ? _m : {})), { text: ((_o = this._spec.itemContent.text) === null || _o === void 0 ? void 0 : _o.formatMethod)
@@ -110786,7 +110811,7 @@ class BaseMarkPoint extends BaseMarker {
                                 this._spec.itemContent.text.formatMethod(dataPoints, seriesData)
                             : isValid$1(specText)
                                 ? specText
-                                : textStyle.text }), offsetX: computeOffsetFromRegion(point, attribute.itemContent.offsetX, this._relativeSeries.getRegion()), offsetY: computeOffsetFromRegion(point, attribute.itemContent.offsetY, this._relativeSeries.getRegion()) }),
+                                : textStyle.text }), offsetX: computeOffsetFromRegion(point, offsetX, region), offsetY: computeOffsetFromRegion(point, offsetY, region) }),
                 itemLine: itemLineAttrs,
                 limitRect,
                 dx: this._layoutOffsetX,

package/build/index.js

@@ -71424,7 +71424,7 @@
                 : null));
         }
         _runPointsEncoder(newStyles, g, attrs = {}) {
-            var _a, _b, _c;
+            var _a, _b;
             const data = g.context.data;
             const lineAttrs = [];
             const points = [];
@@ -71449,7 +71449,7 @@
                 points[index].context = (_a = this._keyGetter(datum)) !== null && _a !== void 0 ? _a : index;
             });
             if (progressive) {
-                const segments = (_c = (_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) !== null && _c !== void 0 ? _c : [];
+                const segments = ((_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) ? [...g.attribute.segments] : [];
                 segments.push({
                     points
                 });
@@ -83119,6 +83119,17 @@
                 bandPosition: this._bandPosition
             }));
         }
+        _isCategoryAxisInverse() {
+            var _a, _b, _c, _e;
+            return this._direction === "horizontal"
+                ? (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.isInverse) === null || _b === void 0 ? void 0 : _b.call(_a)
+                : (_e = (_c = this._xAxisHelper) === null || _c === void 0 ? void 0 : _c.isInverse) === null || _e === void 0 ? void 0 : _e.call(_c);
+        }
+        _getLeaderLineCategoryPos(isStart, isDecrease) {
+            const inverse = !!this._isCategoryAxisInverse();
+            const normalPos = isStart ? (isDecrease ? 0 : 1) : isDecrease ? 1 : 0;
+            return inverse ? 1 - normalPos : normalPos;
+        }
         initMarkStyle() {
             super.initMarkStyle();
             const isDecrease = this._spec.calculationMode === 'decrease';
@@ -83132,9 +83143,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionY(datum, 'lastIndex', isDecrease ? 0 : 1);
+                            return this.totalPositionY(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                         },
-                        y1: (datum) => this.totalPositionY(datum, 'index', isDecrease ? 1 : 0)
+                        y1: (datum) => this.totalPositionY(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease))
                     }, 'normal', exports.AttributeLevel.Series);
                 }
                 else {
@@ -83144,9 +83155,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionX(datum, 'lastIndex', isDecrease ? 0 : 1);
+                            return this.totalPositionX(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                         },
-                        x1: (datum) => this.totalPositionX(datum, 'index', isDecrease ? 1 : 0),
+                        x1: (datum) => this.totalPositionX(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease)),
                         y: (datum) => this.totalPositionY(datum, 'lastEnd', 0),
                         y1: (datum) => this.totalPositionY(datum, datum.isTotal ? 'end' : 'start', 0)
                     }, 'normal', exports.AttributeLevel.Series);
@@ -102372,6 +102383,7 @@
         }
         clear() {
             super.clear();
+            this._legendComponent = null;
             this._cacheAttrs = null;
             this._preSelectedData = null;
         }
@@ -108177,6 +108189,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         'radius1'
     ];
     const MARKER_LAYOUT_POSITION_SPEC_KEYS = ['position', 'positions', 'coordinatesOffset', 'regionRelative'];
+    const MARKER_ITEM_CONTENT_LAYOUT_SPEC_KEYS = ['offsetX', 'offsetY', 'confine'];
     const normalizeMarkerLabelFormatMethod = (label) => {
         if (Array.isArray(label)) {
             return label.map(normalizeMarkerLabelFormatMethod);
@@ -108208,7 +108221,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return normalized;
     };
     const normalizeMarkerSpecForComponentOnlyUpdate = (spec, options) => {
-        var _a;
         if (!spec || typeof spec !== 'object') {
             return spec;
         }
@@ -108232,9 +108244,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         Object.keys(normalized).forEach(key => {
             normalized[key] = normalizeMarkerStyles(normalized[key]);
         });
-        const text = (_a = normalized.itemContent) === null || _a === void 0 ? void 0 : _a.text;
-        if (text && typeof text === 'object') {
-            normalized.itemContent = Object.assign(Object.assign({}, normalized.itemContent), { text: Object.assign(Object.assign({}, normalizeMarkerLabelFormatMethod(text)), { text: MARKER_TEXT_PLACEHOLDER }) });
+        const itemContent = normalized.itemContent;
+        if (itemContent && typeof itemContent === 'object') {
+            normalized.itemContent = Object.assign({}, itemContent);
+            MARKER_ITEM_CONTENT_LAYOUT_SPEC_KEYS.forEach(key => {
+                if (key in normalized.itemContent) {
+                    normalized.itemContent[key] = MARKER_COORDINATE_PLACEHOLDER;
+                }
+            });
+            const text = normalized.itemContent.text;
+            if (text && typeof text === 'object') {
+                normalized.itemContent.text = Object.assign(Object.assign({}, normalizeMarkerLabelFormatMethod(text)), { text: MARKER_TEXT_PLACEHOLDER });
+            }
         }
         return normalized;
     };
@@ -110670,6 +110691,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         _createMarkerComponent() {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
             const { itemContent = {}, itemLine = {}, targetSymbol = {} } = this._spec;
+            const region = this._relativeSeries.getRegion();
             const _10 = itemContent, { type = 'text', text: label, symbol, image, richText, customMark, textStyle, symbolStyle, imageStyle, richTextStyle, customMarkStyle, style = {}, state = {} } = _10, restItemContent = __rest$h(_10, ["type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state"]);
             let itemContentState = null;
             let itemContentStyle = null;
@@ -110719,7 +110741,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 select: (_u = this._spec.interactive) !== null && _u !== void 0 ? _u : true,
                 position: { x: 0, y: 0 },
                 clipInRange: (_v = this._spec.clip) !== null && _v !== void 0 ? _v : false,
-                itemContent: Object.assign(Object.assign({ type, offsetX: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()), offsetY: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()) }, restItemContent), { style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext) }),
+                itemContent: Object.assign(Object.assign({ type, offsetX: transformOffset(itemContent.offsetX, region), offsetY: transformOffset(itemContent.offsetY, region) }, restItemContent), { style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext) }),
                 targetSymbol: {
                     offset: (_w = targetSymbol.offset) !== null && _w !== void 0 ? _w : 0,
                     visible: (_x = targetSymbol.visible) !== null && _x !== void 0 ? _x : false,
@@ -110764,6 +110786,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     : data.latestData
                 : seriesData;
             const { itemLine = {}, itemContent = {} } = this._spec;
+            const region = this._relativeSeries.getRegion();
             const { visible: itemLineVisible, line = {} } = itemLine, restItemLine = __rest$h(itemLine, ["visible", "line"]);
             const itemLineAttrs = itemLineVisible !== false
                 ? Object.assign(Object.assign({}, restItemLine), { visible: true, lineStyle: transformToGraphic(line.style) })
@@ -110785,6 +110808,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const attribute = (_d = this._markerComponent.attribute) !== null && _d !== void 0 ? _d : {};
                 const textStyle = (_f = (_e = attribute.itemContent) === null || _e === void 0 ? void 0 : _e.textStyle) !== null && _f !== void 0 ? _f : {};
                 const specText = (_g = this._spec.itemContent.text) === null || _g === void 0 ? void 0 : _g.text;
+                const offsetX = transformOffset(itemContent.offsetX, region);
+                const offsetY = transformOffset(itemContent.offsetY, region);
                 this._markerComponent.setAttributes({
                     position: point === undefined ? { x: null, y: null } : point,
                     itemContent: Object.assign(Object.assign({}, attribute.itemContent), { panel: (_h = labelAttrs.panel) !== null && _h !== void 0 ? _h : (_j = attribute.itemContent) === null || _j === void 0 ? void 0 : _j.panel, padding: (_k = labelAttrs.padding) !== null && _k !== void 0 ? _k : (_l = attribute.itemContent) === null || _l === void 0 ? void 0 : _l.padding, textStyle: Object.assign(Object.assign(Object.assign({}, textStyle), ((_m = labelAttrs.textStyle) !== null && _m !== void 0 ? _m : {})), { text: ((_o = this._spec.itemContent.text) === null || _o === void 0 ? void 0 : _o.formatMethod)
@@ -110792,7 +110817,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                                     this._spec.itemContent.text.formatMethod(dataPoints, seriesData)
                                 : isValid$1(specText)
                                     ? specText
-                                    : textStyle.text }), offsetX: computeOffsetFromRegion(point, attribute.itemContent.offsetX, this._relativeSeries.getRegion()), offsetY: computeOffsetFromRegion(point, attribute.itemContent.offsetY, this._relativeSeries.getRegion()) }),
+                                    : textStyle.text }), offsetX: computeOffsetFromRegion(point, offsetX, region), offsetY: computeOffsetFromRegion(point, offsetY, region) }),
                     itemLine: itemLineAttrs,
                     limitRect,
                     dx: this._layoutOffsetX,