@visactor/vchart 1.9.4 → 1.9.5

package/build/index.js

@@ -50860,7 +50860,10 @@
         label: {
             visible: false,
             offset: 12,
-            position: 'inside'
+            position: 'inside',
+            style: {
+                lineWidth: 2
+            }
         }
     };
 
@@ -50951,6 +50954,7 @@
             offset: 5,
             position: 'inside',
             style: {
+                lineWidth: 2,
                 fill: { type: 'palette', key: 'axisMarkerFontColor' }
             },
             minLabel: {
@@ -51026,6 +51030,11 @@
             style: {
                 lineWidth: 1
             }
+        },
+        label: {
+            style: {
+                lineWidth: 2
+            }
         }
     };
 
@@ -54307,7 +54316,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     }
                 });
                 Object.keys(regionCombindInteractions).forEach(key => {
-                    this._view.interaction(regionCombindInteractions[key].type, regionCombindInteractions[key]);
+                    const interaction = this._view.interaction(regionCombindInteractions[key].type, regionCombindInteractions[key]);
+                    if (this._compileChart) {
+                        const region = this._compileChart.getRegionsInIds([regionCombindInteractions[key].regionId])[0];
+                        if (region) {
+                            region.interaction.addVgrammarInteraction(regionCombindInteractions[key].vchartState, interaction);
+                        }
+                    }
                 });
             }
         }
@@ -54958,8 +54973,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         constructor() {
             this._stateMarks = new Map();
             this._stateElements = new Map();
+            this._vgrammarInteractions = new Map();
             this._disableTriggerEvent = false;
         }
+        addVgrammarInteraction(state, i) {
+            if (!this._vgrammarInteractions.get(state)) {
+                !this._vgrammarInteractions.set(state, [i]);
+            }
+            else {
+                this._vgrammarInteractions.get(state).push(i);
+            }
+        }
         static markStateEnable(mark, state) {
             return !isEmpty(mark.stateStyle[state]);
         }
@@ -55091,6 +55115,22 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
             }
         }
+        startInteraction(stateValue, element) {
+            const interactions = this._vgrammarInteractions.get(stateValue);
+            if (interactions) {
+                interactions.forEach(vgInteraction => {
+                    vgInteraction.start(element);
+                });
+            }
+        }
+        resetInteraction(stateValue, element) {
+            const interactions = this._vgrammarInteractions.get(stateValue);
+            if (interactions) {
+                interactions.forEach(vgInteraction => {
+                    vgInteraction.reset(element);
+                });
+            }
+        }
     }
 
     class CompilableBase {
@@ -59873,7 +59913,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerChartPlugin(MediaQuery);
     };
 
-    const version = "1.9.4";
+    const version = "1.9.5";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -60333,19 +60373,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     function userAnimationConfig(markName, spec, ctx) {
         var _a, _b, _c, _d, _e;
         const userConfig = {};
-        if (spec.animationAppear) {
+        if (isValid$3(spec.animationAppear)) {
             userConfig.appear = (_a = spec.animationAppear[markName]) !== null && _a !== void 0 ? _a : spec.animationAppear;
         }
-        if (spec.animationDisappear) {
+        if (isValid$3(spec.animationDisappear)) {
             userConfig.disappear = (_b = spec.animationDisappear[markName]) !== null && _b !== void 0 ? _b : spec.animationDisappear;
         }
-        if (spec.animationEnter) {
+        if (isValid$3(spec.animationEnter)) {
             userConfig.enter = (_c = spec.animationEnter[markName]) !== null && _c !== void 0 ? _c : spec.animationEnter;
         }
-        if (spec.animationExit) {
+        if (isValid$3(spec.animationExit)) {
             userConfig.exit = (_d = spec.animationExit[markName]) !== null && _d !== void 0 ? _d : spec.animationExit;
         }
-        if (spec.animationUpdate) {
+        if (isValid$3(spec.animationUpdate)) {
             userConfig.update = (_e = spec.animationUpdate[markName]) !== null && _e !== void 0 ? _e : spec.animationUpdate;
         }
         if (spec.animationNormal && spec.animationNormal[markName]) {
@@ -61002,7 +61042,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 dataView: false,
                 customShape: spec === null || spec === void 0 ? void 0 : spec.customShape,
                 componentType: spec.componentType,
-                depend: options.depend
+                depend: options.depend,
+                key: spec.dataKey
             });
             if (!mark) {
                 return;
@@ -61074,6 +61115,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const res = [];
             if (finalHoverSpec.enable) {
                 res.push({
+                    vchartState: STATE_VALUE_ENUM.STATE_HOVER,
                     seriesId: this.id,
                     regionId: this._region.id,
                     selector: mainMarks.map(mark => `#${mark.getProductId()}`),
@@ -61086,6 +61128,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             if (finalSelectSpec.enable) {
                 res.push({
+                    vchartState: STATE_VALUE_ENUM.STATE_SELECTED,
                     type: 'element-select',
                     seriesId: this.id,
                     regionId: this._region.id,
@@ -63744,7 +63787,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                                 }
                             }
                             pickElements.forEach(element => {
-                                r.interaction.addEventElement(stateKey, element);
+                                r.interaction.startInteraction(stateKey, element);
                             });
                         }
                     });
@@ -63816,28 +63859,32 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     }
 
     const getRelatedRegionInfo = (modelInfo, currentChartSpecInfo) => {
-        var _a, _b;
-        const { spec: { regionId, regionIndex } } = modelInfo;
+        var _a;
+        const spec = modelInfo.spec;
+        const { regionId, regionIndex } = spec;
         if (isValid$3(regionId)) {
-            return (_a = currentChartSpecInfo.region) === null || _a === void 0 ? void 0 : _a.find(({ spec }) => spec.id === regionId);
+            const regionIdList = array(regionId);
+            return (_a = currentChartSpecInfo.region) === null || _a === void 0 ? void 0 : _a.filter(({ spec }) => regionIdList.includes(spec.id));
         }
         else if (isValid$3(regionIndex)) {
-            return (_b = currentChartSpecInfo.region) === null || _b === void 0 ? void 0 : _b[regionIndex];
+            return array(regionIndex)
+                .map((index) => { var _a; return (_a = currentChartSpecInfo.region) === null || _a === void 0 ? void 0 : _a[index]; })
+                .filter(isValid$3);
         }
         return undefined;
     };
     const getRelatedSeriesInfo = (modelInfo, currentChartSpecInfo) => {
-        var _a, _b;
-        let series;
-        const { spec: { seriesId, seriesIndex } } = modelInfo;
+        var _a;
+        const spec = modelInfo.spec;
+        const { seriesId, seriesIndex } = spec;
         if (isValid$3(seriesId)) {
-            series = (_a = currentChartSpecInfo.series) === null || _a === void 0 ? void 0 : _a.find(({ spec }) => spec.id === seriesId);
+            const seriesIdList = array(seriesId);
+            return (_a = currentChartSpecInfo.series) === null || _a === void 0 ? void 0 : _a.filter(({ spec }) => seriesIdList.includes(spec.id));
         }
         else if (isValid$3(seriesIndex)) {
-            series = (_b = currentChartSpecInfo.series) === null || _b === void 0 ? void 0 : _b[seriesIndex];
-        }
-        if (series) {
-            return [series];
+            return array(seriesIndex)
+                .map((index) => { var _a; return (_a = currentChartSpecInfo.series) === null || _a === void 0 ? void 0 : _a[index]; })
+                .filter(isValid$3);
         }
         return undefined;
     };
@@ -63893,7 +63940,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.forEachSeriesInSpec(chartSpec, transform, currentChartSpecInfo);
             (_a = currentChartSpecInfo.series) === null || _a === void 0 ? void 0 : _a.forEach((seriesSpecInfo, i) => {
                 var _a, _b;
-                const region = (_a = getRelatedRegionInfo(seriesSpecInfo, currentChartSpecInfo)) !== null && _a !== void 0 ? _a : (_b = currentChartSpecInfo.region) === null || _b === void 0 ? void 0 : _b[0];
+                const relatedRegion = (_b = (_a = getRelatedRegionInfo(seriesSpecInfo, currentChartSpecInfo)) !== null && _a !== void 0 ? _a : currentChartSpecInfo.region) !== null && _b !== void 0 ? _b : [];
+                const region = relatedRegion[0];
                 if (region) {
                     if (!region.seriesIndexes) {
                         region.seriesIndexes = [];
@@ -63904,20 +63952,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
             this.forEachComponentInSpec(chartSpec, transform, currentChartSpecInfo);
             Object.values((_b = currentChartSpecInfo.component) !== null && _b !== void 0 ? _b : {}).forEach(specInfoList => specInfoList.forEach((componentSpecInfo, i) => {
-                var _a, _b;
+                var _a, _b, _c;
                 if (!componentSpecInfo) {
                     return;
                 }
                 if (!componentSpecInfo.regionIndexes) {
-                    const relatedRegion = getRelatedRegionInfo(componentSpecInfo, currentChartSpecInfo);
-                    const regionList = relatedRegion ? array(relatedRegion) : (_a = currentChartSpecInfo.region) !== null && _a !== void 0 ? _a : [];
-                    componentSpecInfo.regionIndexes = regionList.map(region => region.regionIndexes[0]);
+                    const relatedRegion = (_b = (_a = getRelatedRegionInfo(componentSpecInfo, currentChartSpecInfo)) !== null && _a !== void 0 ? _a : currentChartSpecInfo.region) !== null && _b !== void 0 ? _b : [];
+                    componentSpecInfo.regionIndexes = relatedRegion.map(region => region.regionIndexes[0]);
                 }
                 if (!componentSpecInfo.seriesIndexes) {
                     const seriesInfo = getRelatedSeriesInfo(componentSpecInfo, currentChartSpecInfo);
                     if (!seriesInfo) {
                         const seriesIndexSet = new Set();
-                        ((_b = componentSpecInfo.regionIndexes) !== null && _b !== void 0 ? _b : []).forEach(regionIndex => {
+                        ((_c = componentSpecInfo.regionIndexes) !== null && _c !== void 0 ? _c : []).forEach(regionIndex => {
                             var _a, _b;
                             const region = (_a = currentChartSpecInfo.region) === null || _a === void 0 ? void 0 : _a[regionIndex];
                             (_b = region === null || region === void 0 ? void 0 : region.seriesIndexes) === null || _b === void 0 ? void 0 : _b.forEach(seriesIndex => seriesIndexSet.add(seriesIndex));
@@ -65135,7 +65182,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return width;
         }
         _getPosition(direction, datum, scaleDepth, mark) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             let axisHelper;
             let sizeAttribute;
             let dataToPosition;
@@ -65167,9 +65214,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 let offSet = 0;
                 for (let index = groupFields.length - 1; index >= 1; index--) {
                     const groupField = groupFields[index];
-                    const groupValues = (_f = (_e = (_d = (_c = this.getViewDataStatistics()) === null || _c === void 0 ? void 0 : _c.latestData) === null || _d === void 0 ? void 0 : _d[groupField]) === null || _e === void 0 ? void 0 : _e.values) !== null && _f !== void 0 ? _f : [];
+                    const groupValues = (_d = (_c = axisHelper.getScale(index)) === null || _c === void 0 ? void 0 : _c.domain()) !== null && _d !== void 0 ? _d : [];
                     const groupCount = groupValues.length;
-                    const gap = getActualNumValue((_g = barInGroup[index - 1]) !== null && _g !== void 0 ? _g : last(barInGroup), bandWidth);
+                    const gap = getActualNumValue((_e = barInGroup[index - 1]) !== null && _e !== void 0 ? _e : last(barInGroup), bandWidth);
                     const i = groupValues.indexOf(datum[groupField]);
                     if (index === groupFields.length - 1) {
                         totalWidth += groupCount * size + (groupCount - 1) * gap;
@@ -67500,7 +67547,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (!lastData || lastData.length === 0) {
             return lastData;
         }
-        const { indexField, valueField, startAs, endAs, total: totalSpec, seriesField, seriesFieldName, groupData } = op;
+        const { indexField, total: totalSpec, groupData } = op;
         const totalData = [];
         const { dimensionValues, dimensionData } = groupData().latestData;
         const indexValues = Array.from(dimensionValues[indexField]);
@@ -67515,82 +67562,163 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 isTotal: false
             };
             const indexData = dimensionData[key];
-            indexData.forEach(d => {
-                let isTotalTag = false;
-                if (!totalSpec || totalSpec.type === 'end') {
-                    if (index === indexValues.length - 1) {
-                        total.start = 0;
-                        d[startAs] = total.start;
-                        d[endAs] = total.end;
-                        isTotalTag = true;
-                    }
-                }
-                else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {
-                    const tag = d[totalSpec.tagField];
-                    if (tag) {
-                        isTotalTag = true;
-                        if (totalSpec.type === 'custom') {
-                            const { start, end } = totalSpec.product(d, temp);
-                            d[startAs] = start;
-                            d[endAs] = end;
-                            total.end = end;
-                            total.start = start;
-                        }
-                        else {
-                            let start = 0;
-                            let end = total.end;
-                            if (totalSpec.collectCountField && !isNil$3(d[totalSpec.collectCountField])) {
-                                const startIndex = totalData.length - +d[totalSpec.collectCountField];
-                                const endIndex = totalData.length - 1;
-                                if (startIndex < 0) {
-                                    console.warn('total.collectCountField error');
-                                }
-                                else {
-                                    start = totalData[startIndex].start;
-                                }
-                                if (endIndex < 0) {
-                                    console.warn('total.collectCountField error');
-                                }
-                                else {
-                                    end = totalData[endIndex].end;
-                                }
-                            }
-                            else {
-                                if (totalSpec.startField && !isNil$3(d[totalSpec.startField])) {
-                                    start = +d[totalSpec.startField];
-                                }
-                                if (totalSpec.valueField && !isNil$3(d[totalSpec.valueField])) {
-                                    end = precisionAdd(start, +d[totalSpec.valueField]);
-                                }
-                            }
-                            d[startAs] = start;
-                            d[endAs] = end;
-                            d[valueField] = end - start;
-                            total.start = start;
-                            total.end = end;
+            if (indexData.length > 1) {
+                const isTotalCheck = (d) => {
+                    if (!totalSpec || totalSpec.type === 'end') {
+                        if (index === indexValues.length - 1) {
+                            return true;
                         }
                     }
-                }
-                if (!isTotalTag) {
-                    d[startAs] = +total.end;
-                    d[endAs] = precisionAdd(d[startAs], +d[valueField]);
-                    total.end = d[endAs];
-                }
-                total.isTotal = isTotalTag;
-                if (isNil$3(seriesField) || seriesField === WaterfallDefaultSeriesField) {
-                    if (isTotalTag) {
-                        d[WaterfallDefaultSeriesField] = seriesFieldName.total;
-                    }
-                    else {
-                        d[WaterfallDefaultSeriesField] = +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease;
+                    else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {
+                        const tag = d[totalSpec.tagField];
+                        return !!tag;
                     }
+                    return false;
+                };
+                const isTotalTag = indexData.some(d => isTotalCheck(d));
+                if (isTotalTag) {
+                    temp = computeTotalWithMultipleData(indexData, key, total, totalData, temp, indexValues, index, op, isTotalCheck);
+                    totalData.push(total);
+                    return;
                 }
-            });
-            temp = Object.assign(Object.assign({}, total), { lastIndex: key });
+            }
+            temp = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op);
             totalData.push(total);
         });
         return totalData;
     };
+    function computeTotalWithMultipleData(indexData, key, total, totalData, temp, indexValues, index, op, isTotalCheck) {
+        total.isTotal = true;
+        const { valueField, startAs, endAs, total: totalSpec } = op;
+        const _normalTemp = [];
+        const _totalTemp = [];
+        indexData.forEach(d => {
+            if (isTotalCheck(d)) {
+                _totalTemp.push(d);
+            }
+            else {
+                _normalTemp.push(d);
+            }
+        });
+        if (_totalTemp.length === indexData.length) {
+            const result = computeNormalData([indexData[0]], key, total, totalData, temp, indexValues, index, op);
+            _totalTemp.forEach(d => {
+                d[startAs] = indexData[0][startAs];
+                d[endAs] = indexData[0][endAs];
+                d[valueField] = indexData[0][valueField];
+            });
+            return result;
+        }
+        const totalConfigData = _totalTemp[0];
+        let { start, end } = getTotalStartEnd(totalConfigData, total, totalData, temp, totalSpec);
+        total.start = start;
+        total.end = end;
+        let valueTemp = end - start;
+        _normalTemp.forEach(d => {
+            d[startAs] = +start;
+            d[endAs] = precisionAdd(d[startAs], +d[valueField]);
+            start = d[endAs];
+            valueTemp = precisionSub(valueTemp, +d[valueField]);
+        });
+        _totalTemp.forEach(d => {
+            d[startAs] = +start;
+            d[endAs] = precisionAdd(d[startAs], valueTemp);
+            d[valueField] = valueTemp;
+        });
+        return Object.assign(Object.assign({}, total), { lastIndex: key });
+    }
+    function computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op) {
+        const { valueField, startAs, endAs, total: totalSpec, seriesField, seriesFieldName } = op;
+        indexData.forEach(d => {
+            let isTotalTag = false;
+            if (!totalSpec || totalSpec.type === 'end') {
+                if (index === indexValues.length - 1) {
+                    total.start = 0;
+                    d[startAs] = total.start;
+                    d[endAs] = total.end;
+                    isTotalTag = true;
+                }
+            }
+            else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {
+                const tag = d[totalSpec.tagField];
+                if (tag) {
+                    isTotalTag = true;
+                    const { start, end } = getTotalStartEnd(d, total, totalData, temp, totalSpec);
+                    d[startAs] = start;
+                    d[endAs] = end;
+                    d[valueField] = end - start;
+                    total.start = start;
+                    total.end = end;
+                }
+            }
+            if (!isTotalTag) {
+                d[startAs] = +total.end;
+                d[endAs] = precisionAdd(d[startAs], +d[valueField]);
+                total.end = d[endAs];
+            }
+            total.isTotal = isTotalTag;
+            if (isNil$3(seriesField) || seriesField === WaterfallDefaultSeriesField) {
+                if (isTotalTag) {
+                    d[WaterfallDefaultSeriesField] = seriesFieldName.total;
+                }
+                else {
+                    d[WaterfallDefaultSeriesField] = +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease;
+                }
+            }
+        });
+        return Object.assign(Object.assign({}, total), { lastIndex: key });
+    }
+    function getTotalStartEnd(d, total, totalData, temp, totalSpec) {
+        if (!totalSpec || totalSpec.type === 'end') {
+            return getTotalInEndType(total);
+        }
+        else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {
+            if (totalSpec.type === 'custom') {
+                return getTotalInCustomType(d, temp, totalSpec);
+            }
+            if (totalSpec.collectCountField && !isNil$3(d[totalSpec.collectCountField])) {
+                return getTotalInCollectField(d, totalData, total, totalSpec);
+            }
+            return getTotalInField(d, total, totalSpec);
+        }
+        return { start: 0, end: 0 };
+    }
+    function getTotalInEndType(total) {
+        return { start: 0, end: total.end };
+    }
+    function getTotalInCustomType(d, temp, totalSpec) {
+        return totalSpec.product(d, temp);
+    }
+    function getTotalInCollectField(d, totalData, total, totalSpec) {
+        let start = 0;
+        let end = total.end;
+        const startIndex = totalData.length - +d[totalSpec.collectCountField];
+        const endIndex = totalData.length - 1;
+        if (startIndex < 0) {
+            warn('total.collectCountField error');
+        }
+        else {
+            start = totalData[startIndex].start;
+        }
+        if (endIndex < 0) {
+            warn('total.collectCountField error');
+        }
+        else {
+            end = totalData[endIndex].end;
+        }
+        return { start, end };
+    }
+    function getTotalInField(d, total, totalSpec) {
+        let start = 0;
+        let end = total.end;
+        if (totalSpec.startField && !isNil$3(d[totalSpec.startField])) {
+            start = +d[totalSpec.startField];
+        }
+        if (totalSpec.valueField && !isNil$3(d[totalSpec.valueField])) {
+            end = precisionAdd(start, +d[totalSpec.valueField]);
+        }
+        return { start, end };
+    }
     const waterfallFillTotal = (data, op) => {
         if (!data) {
             return data;
@@ -82099,6 +82227,38 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             tickData.target.addListener('change', this._forceLayout.bind(this));
             this._tickData = [new CompilableData(this._option, tickData)];
         }
+        collectData(depth, rawData) {
+            const data = [];
+            eachSeries(this._regions, s => {
+                var _a;
+                let field = this.collectSeriesField(depth, s);
+                field = (isArray$3(field) ? (isContinuous(this._scale.type) ? field : [field[0]]) : [field]);
+                if (!depth) {
+                    this._dataFieldText = s.getFieldAlias(field[0]);
+                }
+                if (field) {
+                    const viewData = s.getViewData();
+                    if (rawData) {
+                        field.forEach(f => {
+                            data.push(s.getRawDataStatisticsByField(f, false));
+                        });
+                    }
+                    else if (viewData && viewData.latestData && viewData.latestData.length) {
+                        const seriesData = (_a = s.getViewDataStatistics) === null || _a === void 0 ? void 0 : _a.call(s);
+                        field.forEach(f => {
+                            var _a;
+                            if ((_a = seriesData === null || seriesData === void 0 ? void 0 : seriesData.latestData) === null || _a === void 0 ? void 0 : _a[f]) {
+                                data.push(seriesData.latestData[f]);
+                            }
+                        });
+                    }
+                }
+            }, {
+                userId: this._seriesUserId,
+                specIndex: this._seriesIndex
+            });
+            return data;
+        }
         isSeriesDataEnable() {
             let enable = true;
             eachSeries(this._regions, s => {
@@ -82821,55 +82981,24 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
             return scales;
         }
-        collectData(depth, rawData) {
-            const data = [];
-            eachSeries(this._regions, s => {
-                var _a, _b, _c;
-                let field;
-                if (depth > 0) {
-                    field = (_b = (_a = s.getGroups()) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[depth];
-                }
-                else {
-                    if (isXAxis(this.getOrient())) {
-                        field = s.getSpec().x2Field
-                            ? [...s.fieldX, s.fieldX2]
-                            : s.fieldX;
-                    }
-                    else if (isZAxis(this.getOrient())) {
-                        field = s.fieldZ;
-                    }
-                    else {
-                        field = s.getSpec().y2Field
-                            ? [...s.fieldY, s.fieldY2]
-                            : s.fieldY;
-                    }
+        collectSeriesField(depth, series) {
+            var _a, _b;
+            let field;
+            if (depth > 0) {
+                field = (_b = (_a = series.getGroups()) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[depth];
+            }
+            else {
+                if (isXAxis(this.getOrient())) {
+                    field = series.getSpec().x2Field ? [...series.fieldX, series.fieldX2] : series.fieldX;
                 }
-                field = (isArray$3(field) ? (isContinuous(this._scale.type) ? field : [field[0]]) : [field]);
-                if (!depth) {
-                    this._dataFieldText = s.getFieldAlias(field[0]);
+                else if (isZAxis(this.getOrient())) {
+                    field = series.fieldZ;
                 }
-                if (field) {
-                    const viewData = s.getViewData();
-                    if (rawData) {
-                        field.forEach(f => {
-                            data.push(s.getRawDataStatisticsByField(f, false));
-                        });
-                    }
-                    else if (viewData && viewData.latestData && viewData.latestData.length) {
-                        const seriesData = (_c = s.getViewDataStatistics) === null || _c === void 0 ? void 0 : _c.call(s);
-                        field.forEach(f => {
-                            var _a;
-                            if ((_a = seriesData === null || seriesData === void 0 ? void 0 : seriesData.latestData) === null || _a === void 0 ? void 0 : _a[f]) {
-                                data.push(seriesData.latestData[f]);
-                            }
-                        });
-                    }
+                else {
+                    field = series.getSpec().y2Field ? [...series.fieldY, series.fieldY2] : series.fieldY;
                 }
-            }, {
-                userId: this._seriesUserId,
-                specIndex: this._seriesIndex
-            });
-            return data;
+            }
+            return field;
         }
         updateSeriesScale() {
             const orient = this.getOrient();
@@ -84051,44 +84180,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._scale.range(newRange);
             return true;
         }
-        collectData(depth, rawData) {
-            const data = [];
-            eachSeries(this._regions, s => {
-                var _a, _b, _c;
-                let field;
-                if (depth > 0) {
-                    field = (_b = (_a = s.getGroups()) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[depth];
-                }
-                else {
-                    field =
-                        this.getOrient() === 'radius' ? s.getRadiusField() : s.getAngleField();
-                }
-                field = (isArray$3(field) ? (isContinuous(this._scale.type) ? field : [field[0]]) : [field]);
-                if (!depth) {
-                    this._dataFieldText = s.getFieldAlias(field[0]);
-                }
-                if (field) {
-                    const viewData = s.getViewData();
-                    if (rawData) {
-                        field.forEach(f => {
-                            data.push(s.getRawDataStatisticsByField(f, false));
-                        });
-                    }
-                    else if (viewData && viewData.latestData && viewData.latestData.length) {
-                        const seriesData = (_c = s.getViewDataStatistics) === null || _c === void 0 ? void 0 : _c.call(s);
-                        field.forEach(f => {
-                            var _a;
-                            if ((_a = seriesData === null || seriesData === void 0 ? void 0 : seriesData.latestData) === null || _a === void 0 ? void 0 : _a[f]) {
-                                data.push(seriesData.latestData[f]);
-                            }
-                        });
-                    }
-                }
-            }, {
-                userId: this._seriesUserId,
-                specIndex: this._seriesIndex
-            });
-            return data;
+        collectSeriesField(depth, series) {
+            var _a, _b;
+            let field;
+            if (depth > 0) {
+                field = (_b = (_a = series.getGroups()) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[depth];
+            }
+            else {
+                field = this.getOrient() === 'radius' ? series.getRadiusField() : series.getAngleField();
+            }
+            return field;
         }
         updateSeriesScale() {
             eachSeries(this._regions, s => {
@@ -91202,12 +91303,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     TotalLabel.type = ComponentTypeEnum.totalLabel;
     TotalLabel.specKey = 'totalLabel';
     function totalLabelPosition(series, type) {
+        var _a, _b;
         let position;
+        const { direction } = series;
+        const isInverse = direction === 'horizontal'
+            ? (_a = series.getXAxisHelper()) === null || _a === void 0 ? void 0 : _a.isInverse()
+            : (_b = series.getYAxisHelper()) === null || _b === void 0 ? void 0 : _b.isInverse();
+        const positionMap = { vertical: ['top', 'bottom'], horizontal: ['right', 'left'] };
+        const index = isInverse ? 1 : 0;
         switch (type) {
             case 'rect':
-                position = series.direction === 'horizontal' ? 'right' : 'top';
-                break;
             case 'symbol':
+                position = positionMap[direction][index];
+                break;
             default:
                 position = 'top';
         }
@@ -91884,7 +91992,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }, {
                 skipBeforeLayouted: true,
                 attributeContext: this._getMarkAttributeContext(),
-                componentType: spec.componentType
+                componentType: spec.componentType,
+                key: spec.dataKey
             });
             if (!mark) {
                 return;