@visactor/vchart 1.9.3-alpha.2 → 1.9.3-hotfix.0

package/build/index.js

@@ -26305,45 +26305,6 @@
     function distance(p1, p2 = { x: 0, y: 0 }) {
         return PointService.distancePP(p1, p2);
     }
-    function getPercentValue(valueList, idx, precision = 2) {
-        if (!valueList[idx]) {
-            return 0;
-        }
-        const sum = valueList.reduce((a, c) => {
-            return (a += isNaN(c) ? 0 : c);
-        }, 0);
-        if (sum === 0) {
-            return 0;
-        }
-        const digits = Math.pow(10, precision);
-        const votesPerQuota = valueList.map(val => {
-            return ((isNaN(val) ? 0 : val) / sum) * digits * 100;
-        });
-        const targetSeats = digits * 100;
-        const seats = votesPerQuota.map(votes => {
-            return Math.floor(votes);
-        });
-        let currentSum = seats.reduce((a, c) => {
-            return a + c;
-        }, 0);
-        const remainder = votesPerQuota.map((votes, idx) => {
-            return votes - seats[idx];
-        });
-        while (currentSum < targetSeats) {
-            let max = Number.NEGATIVE_INFINITY;
-            let maxId = null;
-            for (let i = 0; i < remainder.length; i++) {
-                if (remainder[i] > max) {
-                    max = remainder[i];
-                    maxId = i;
-                }
-            }
-            ++seats[maxId];
-            remainder[maxId] = 0;
-            ++currentSum;
-        }
-        return seats[idx] / digits;
-    }
 
     function eachSeries(regions, callback, filter) {
         let flag = false;
@@ -37320,10 +37281,10 @@
         }, this._statePointToData = state => state, this._onHandlerPointerDown = (e, tag) => {
           e.stopPropagation(), "start" === tag ? (this._activeTag = DataZoomActiveTag.startHandler, this._activeItem = this._startHandlerMask) : "end" === tag ? (this._activeTag = DataZoomActiveTag.endHandler, this._activeItem = this._endHandlerMask) : "middleRect" === tag ? (this._activeTag = DataZoomActiveTag.middleHandler, this._activeItem = this._middleHandlerRect) : "middleSymbol" === tag ? (this._activeTag = DataZoomActiveTag.middleHandler, this._activeItem = this._middleHandlerSymbol) : "background" === tag && (this._activeTag = DataZoomActiveTag.background, this._activeItem = this._background), this._activeState = !0, this._activeCache.startPos = this.eventPosToStagePos(e), this._activeCache.lastPos = this.eventPosToStagePos(e), "browser" === vglobal.env && (vglobal.addEventListener("pointermove", this._onHandlerPointerMove, {
             capture: !0
-          }), vglobal.addEventListener("pointerup", this._onHandlerPointerUp)), this.addEventListener("pointermove", this._onHandlerPointerMove, {
+          }), vglobal.addEventListener("pointerup", this._onHandlerPointerUp.bind(this))), this.addEventListener("pointermove", this._onHandlerPointerMove, {
             capture: !0
           });
-        }, this._pointerMove = e => {
+        }, this._onHandlerPointerMove = delayMap$2[this.attribute.delayType](e => {
           e.stopPropagation();
           const {
               start: startAttr,
@@ -37341,33 +37302,12 @@
             start: start,
             end: end
           } = this.state;
-          this._activeState && (this._activeTag === DataZoomActiveTag.middleHandler ? this.moveZoomWithMiddle((this.state.start + this.state.end) / 2 + dis) : this._activeTag === DataZoomActiveTag.startHandler ? start + dis > end ? (start = end, end = start + dis, this._activeTag = DataZoomActiveTag.endHandler) : start += dis : this._activeTag === DataZoomActiveTag.endHandler && (end + dis < start ? (end = start, start = end + dis, this._activeTag = DataZoomActiveTag.startHandler) : end += dis), this._activeCache.lastPos = pos, brushSelect && this.renderDragMask()), start = Math.min(Math.max(start, 0), 1), end = Math.min(Math.max(end, 0), 1), !realTime || startAttr === start && endAttr === end || (this.setStateAttr(start, end, !0), this._dispatchEvent("change", {
+          this._activeState && (this._activeTag === DataZoomActiveTag.middleHandler ? this.moveZoomWithMiddle((this.state.start + this.state.end) / 2 + dis) : this._activeTag === DataZoomActiveTag.startHandler ? start + dis > end ? (start = end, end = start + dis, this._activeTag = DataZoomActiveTag.endHandler) : start += dis : this._activeTag === DataZoomActiveTag.endHandler && (end + dis < start ? (end = start, start = end + dis, this._activeTag = DataZoomActiveTag.startHandler) : end += dis), this._activeCache.lastPos = pos, brushSelect && this.renderDragMask()), start = Math.min(Math.max(start, 0), 1), end = Math.min(Math.max(end, 0), 1), startAttr === start && endAttr === end || (this.setStateAttr(start, end, !0), this._dispatchEvent("change", {
             start: start,
             end: end,
             tag: this._activeTag
           }));
-        }, this._onHandlerPointerMove = 0 === this.attribute.delayTime ? this._pointerMove : delayMap$2[this.attribute.delayType](this._pointerMove, this.attribute.delayTime), this._onHandlerPointerUp = e => {
-          e.preventDefault();
-          const {
-            start: start,
-            end: end,
-            brushSelect: brushSelect,
-            realTime = !0
-          } = this.attribute;
-          if (this._activeState && this._activeTag === DataZoomActiveTag.background) {
-            const pos = this.eventPosToStagePos(e);
-            this.backgroundDragZoom(this._activeCache.startPos, pos);
-          }
-          this._activeState = !1, brushSelect && this.renderDragMask(), realTime && start === this.state.start && end === this.state.end || (this.setStateAttr(this.state.start, this.state.end, !0), this._dispatchEvent("change", {
-            start: this.state.start,
-            end: this.state.end,
-            tag: this._activeTag
-          })), "browser" === vglobal.env && (vglobal.removeEventListener("pointermove", this._onHandlerPointerMove, {
-            capture: !0
-          }), vglobal.removeEventListener("pointerup", this._onHandlerPointerUp)), this.removeEventListener("pointermove", this._onHandlerPointerMove, {
-            capture: !0
-          }), this.removeEventListener("pointerup", this._onHandlerPointerUp);
-        };
+        }, this.attribute.delayTime);
         const {
           position: position,
           showDetail: showDetail
@@ -37420,6 +37360,28 @@
           y: y - ((null === (_b = this.stage) || void 0 === _b ? void 0 : _b.y) || 0)
         };
       }
+      _onHandlerPointerUp(e) {
+        e.preventDefault();
+        const {
+          start: start,
+          end: end,
+          brushSelect: brushSelect,
+          realTime = !0
+        } = this.attribute;
+        if (this._activeState && this._activeTag === DataZoomActiveTag.background) {
+          const pos = this.eventPosToStagePos(e);
+          this.backgroundDragZoom(this._activeCache.startPos, pos);
+        }
+        this._activeState = !1, brushSelect && this.renderDragMask(), realTime && start === this.state.start && end === this.state.end || (this.setStateAttr(this.state.start, this.state.end, !0), this._dispatchEvent("change", {
+          start: this.state.start,
+          end: this.state.end,
+          tag: this._activeTag
+        })), "browser" === vglobal.env && (vglobal.removeEventListener("pointermove", this._onHandlerPointerMove, {
+          capture: !0
+        }), vglobal.removeEventListener("pointerup", this._onHandlerPointerUp.bind(this))), this.removeEventListener("pointermove", this._onHandlerPointerMove, {
+          capture: !0
+        });
+      }
       _onHandlerPointerEnter(e) {
         e.stopPropagation(), this._showText = !0, this.renderText();
       }
@@ -37608,7 +37570,7 @@
         }, this._layoutAttrFromConfig;
       }
       render() {
-        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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         this._layoutAttrFromConfig = null;
         const {
             orient: orient,
@@ -37641,15 +37603,15 @@
           height: height,
           cursor: brushSelect ? "crosshair" : "auto"
         }, backgroundStyle), {
-          pickable: !zoomLock && (null === (_c = backgroundStyle.pickable) || void 0 === _c || _c)
-        }), "rect"), (null === (_d = backgroundChartStyle.line) || void 0 === _d ? void 0 : _d.visible) && this.setPreviewAttributes("line", group), (null === (_e = backgroundChartStyle.area) || void 0 === _e ? void 0 : _e.visible) && this.setPreviewAttributes("area", group), brushSelect && this.renderDragMask(), this._isHorizontal ? this._selectedBackground = group.createOrUpdateChild("selectedBackground", Object.assign(Object.assign({
+          pickable: !zoomLock
+        }), "rect"), (null === (_c = backgroundChartStyle.line) || void 0 === _c ? void 0 : _c.visible) && this.setPreviewAttributes("line", group), (null === (_d = backgroundChartStyle.area) || void 0 === _d ? void 0 : _d.visible) && this.setPreviewAttributes("area", group), brushSelect && this.renderDragMask(), this._isHorizontal ? this._selectedBackground = group.createOrUpdateChild("selectedBackground", Object.assign(Object.assign({
           x: position.x + start * width,
           y: position.y,
           width: (end - start) * width,
           height: height,
           cursor: brushSelect ? "crosshair" : "move"
         }, selectedBackgroundStyle), {
-          pickable: !zoomLock && (null === (_f = selectedBackgroundChartStyle.pickable) || void 0 === _f || _f)
+          pickable: !zoomLock
         }), "rect") : this._selectedBackground = group.createOrUpdateChild("selectedBackground", Object.assign(Object.assign({
           x: position.x,
           y: position.y + start * height,
@@ -37657,41 +37619,41 @@
           height: (end - start) * height,
           cursor: brushSelect ? "crosshair" : "move"
         }, selectedBackgroundStyle), {
-          pickable: !zoomLock && (null === (_g = selectedBackgroundStyle.pickable) || void 0 === _g || _g)
-        }), "rect"), (null === (_h = selectedBackgroundChartStyle.line) || void 0 === _h ? void 0 : _h.visible) && this.setSelectedPreviewAttributes("line", group), (null === (_j = selectedBackgroundChartStyle.area) || void 0 === _j ? void 0 : _j.visible) && this.setSelectedPreviewAttributes("area", group), this._isHorizontal) {
+          pickable: !zoomLock
+        }), "rect"), (null === (_e = selectedBackgroundChartStyle.line) || void 0 === _e ? void 0 : _e.visible) && this.setSelectedPreviewAttributes("line", group), (null === (_f = selectedBackgroundChartStyle.area) || void 0 === _f ? void 0 : _f.visible) && this.setSelectedPreviewAttributes("area", group), this._isHorizontal) {
           if (middleHandlerStyle.visible) {
-            const middleHandlerBackgroundSize = (null === (_k = middleHandlerStyle.background) || void 0 === _k ? void 0 : _k.size) || 10;
+            const middleHandlerBackgroundSize = (null === (_g = middleHandlerStyle.background) || void 0 === _g ? void 0 : _g.size) || 10;
             this._middleHandlerRect = group.createOrUpdateChild("middleHandlerRect", Object.assign(Object.assign({
               x: position.x + start * width,
               y: position.y - middleHandlerBackgroundSize,
               width: (end - start) * width,
               height: middleHandlerBackgroundSize
-            }, null === (_l = middleHandlerStyle.background) || void 0 === _l ? void 0 : _l.style), {
-              pickable: !zoomLock && (null === (_p = null === (_o = null === (_m = middleHandlerStyle.background) || void 0 === _m ? void 0 : _m.style) || void 0 === _o ? void 0 : _o.pickable) || void 0 === _p || _p)
+            }, null === (_h = middleHandlerStyle.background) || void 0 === _h ? void 0 : _h.style), {
+              pickable: !zoomLock
             }), "rect"), this._middleHandlerSymbol = group.createOrUpdateChild("middleHandlerSymbol", Object.assign(Object.assign({
               x: position.x + (start + end) / 2 * width,
               y: position.y - middleHandlerBackgroundSize / 2,
               strokeBoundsBuffer: 0,
               angle: 0,
-              symbolType: null !== (_r = null === (_q = middleHandlerStyle.icon) || void 0 === _q ? void 0 : _q.symbolType) && void 0 !== _r ? _r : "square"
+              symbolType: null !== (_k = null === (_j = middleHandlerStyle.icon) || void 0 === _j ? void 0 : _j.symbolType) && void 0 !== _k ? _k : "square"
             }, middleHandlerStyle.icon), {
-              pickable: !zoomLock && (null === (_s = middleHandlerStyle.icon.pickable) || void 0 === _s || _s)
+              pickable: !zoomLock
             }), "symbol");
           }
           this._startHandler = group.createOrUpdateChild("startHandler", Object.assign(Object.assign(Object.assign({
             x: position.x + start * width,
             y: position.y + height / 2,
             size: height,
-            symbolType: null !== (_t = startHandlerStyle.symbolType) && void 0 !== _t ? _t : "square"
+            symbolType: null !== (_l = startHandlerStyle.symbolType) && void 0 !== _l ? _l : "square"
           }, DEFAULT_HANDLER_ATTR_MAP.horizontal), startHandlerStyle), {
-            pickable: !zoomLock && (null === (_u = startHandlerStyle.pickable) || void 0 === _u || _u)
+            pickable: !zoomLock
           }), "symbol"), this._endHandler = group.createOrUpdateChild("endHandler", Object.assign(Object.assign(Object.assign({
             x: position.x + end * width,
             y: position.y + height / 2,
             size: height,
-            symbolType: null !== (_v = endHandlerStyle.symbolType) && void 0 !== _v ? _v : "square"
+            symbolType: null !== (_m = endHandlerStyle.symbolType) && void 0 !== _m ? _m : "square"
           }, DEFAULT_HANDLER_ATTR_MAP.horizontal), endHandlerStyle), {
-            pickable: !zoomLock && (null === (_w = endHandlerStyle.pickable) || void 0 === _w || _w)
+            pickable: !zoomLock
           }), "symbol");
           const startHandlerWidth = Math.max(this._startHandler.AABBBounds.width(), startHandlerMinSize),
             startHandlerHeight = Math.max(this._startHandler.AABBBounds.height(), startHandlerMinSize),
@@ -37720,38 +37682,38 @@
           }), "rect");
         } else {
           if (middleHandlerStyle.visible) {
-            const middleHandlerBackgroundSize = (null === (_x = middleHandlerStyle.background) || void 0 === _x ? void 0 : _x.size) || 10;
+            const middleHandlerBackgroundSize = (null === (_o = middleHandlerStyle.background) || void 0 === _o ? void 0 : _o.size) || 10;
             this._middleHandlerRect = group.createOrUpdateChild("middleHandlerRect", Object.assign(Object.assign({
               x: "left" === orient ? position.x - middleHandlerBackgroundSize : position.x + width,
               y: position.y + start * height,
               width: middleHandlerBackgroundSize,
               height: (end - start) * height
-            }, null === (_y = middleHandlerStyle.background) || void 0 === _y ? void 0 : _y.style), {
-              pickable: !zoomLock && (null === (_1 = null === (_0 = null === (_z = middleHandlerStyle.background) || void 0 === _z ? void 0 : _z.style) || void 0 === _0 ? void 0 : _0.pickable) || void 0 === _1 || _1)
+            }, null === (_p = middleHandlerStyle.background) || void 0 === _p ? void 0 : _p.style), {
+              pickable: !zoomLock
             }), "rect"), this._middleHandlerSymbol = group.createOrUpdateChild("middleHandlerSymbol", Object.assign(Object.assign({
               x: "left" === orient ? position.x - middleHandlerBackgroundSize / 2 : position.x + width + middleHandlerBackgroundSize / 2,
               y: position.y + (start + end) / 2 * height,
               angle: Math.PI / 180 * 90,
-              symbolType: null !== (_3 = null === (_2 = middleHandlerStyle.icon) || void 0 === _2 ? void 0 : _2.symbolType) && void 0 !== _3 ? _3 : "square",
+              symbolType: null !== (_r = null === (_q = middleHandlerStyle.icon) || void 0 === _q ? void 0 : _q.symbolType) && void 0 !== _r ? _r : "square",
               strokeBoundsBuffer: 0
             }, middleHandlerStyle.icon), {
-              pickable: !zoomLock && (null === (_5 = null === (_4 = middleHandlerStyle.icon) || void 0 === _4 ? void 0 : _4.pickable) || void 0 === _5 || _5)
+              pickable: !zoomLock
             }), "symbol");
           }
           this._startHandler = group.createOrUpdateChild("startHandler", Object.assign(Object.assign(Object.assign({
             x: position.x + width / 2,
             y: position.y + start * height,
             size: width,
-            symbolType: null !== (_6 = startHandlerStyle.symbolType) && void 0 !== _6 ? _6 : "square"
+            symbolType: null !== (_s = startHandlerStyle.symbolType) && void 0 !== _s ? _s : "square"
           }, DEFAULT_HANDLER_ATTR_MAP.vertical), startHandlerStyle), {
-            pickable: !zoomLock && (null === (_7 = startHandlerStyle.pickable) || void 0 === _7 || _7)
+            pickable: !zoomLock
           }), "symbol"), this._endHandler = group.createOrUpdateChild("endHandler", Object.assign(Object.assign(Object.assign({
             x: position.x + width / 2,
             y: position.y + end * height,
             size: width,
-            symbolType: null !== (_8 = endHandlerStyle.symbolType) && void 0 !== _8 ? _8 : "square"
+            symbolType: null !== (_t = endHandlerStyle.symbolType) && void 0 !== _t ? _t : "square"
           }, DEFAULT_HANDLER_ATTR_MAP.vertical), endHandlerStyle), {
-            pickable: !zoomLock && (null === (_9 = endHandlerStyle.pickable) || void 0 === _9 || _9)
+            pickable: !zoomLock
           }), "symbol");
           const startHandlerWidth = Math.max(this._startHandler.AABBBounds.width(), startHandlerMinSize),
             startHandlerHeight = Math.max(this._startHandler.AABBBounds.height(), startHandlerMinSize),
@@ -58832,7 +58794,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerChartPlugin(MediaQuery);
     };
 
-    const version = "1.9.3-alpha.2";
+    const version = "1.9.3-hotfix.0";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -66434,7 +66396,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (!lastData || lastData.length === 0) {
             return lastData;
         }
-        const { indexField, total: totalSpec, groupData } = op;
+        const { indexField, valueField, startAs, endAs, total: totalSpec, seriesField, seriesFieldName, groupData } = op;
         const totalData = [];
         const { dimensionValues, dimensionData } = groupData().latestData;
         const indexValues = Array.from(dimensionValues[indexField]);
@@ -66449,163 +66411,82 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 isTotal: false
             };
             const indexData = dimensionData[key];
-            if (indexData.length > 1) {
-                const isTotalCheck = (d) => {
-                    if (!totalSpec || totalSpec.type === 'end') {
-                        if (index === indexValues.length - 1) {
-                            return true;
+            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$1(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$1(d[totalSpec.startField])) {
+                                    start = +d[totalSpec.startField];
+                                }
+                                if (totalSpec.valueField && !isNil$1(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;
                         }
                     }
-                    else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {
-                        const tag = d[totalSpec.tagField];
-                        return !!tag;
+                }
+                if (!isTotalTag) {
+                    d[startAs] = +total.end;
+                    d[endAs] = precisionAdd(d[startAs], +d[valueField]);
+                    total.end = d[endAs];
+                }
+                total.isTotal = isTotalTag;
+                if (isNil$1(seriesField) || seriesField === WaterfallDefaultSeriesField) {
+                    if (isTotalTag) {
+                        d[WaterfallDefaultSeriesField] = seriesFieldName.total;
+                    }
+                    else {
+                        d[WaterfallDefaultSeriesField] = +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease;
                     }
-                    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 = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op);
+            });
+            temp = Object.assign(Object.assign({}, total), { lastIndex: key });
             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$1(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$1(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) {
-            console.warn('total.collectCountField error');
-        }
-        else {
-            start = totalData[startIndex].start;
-        }
-        if (endIndex < 0) {
-            console.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$1(d[totalSpec.startField])) {
-            start = +d[totalSpec.startField];
-        }
-        if (totalSpec.valueField && !isNil$1(d[totalSpec.valueField])) {
-            end = precisionAdd(start, +d[totalSpec.valueField]);
-        }
-        return { start, end };
-    }
     const waterfallFillTotal = (data, op) => {
         if (!data) {
             return data;
@@ -68257,12 +68138,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             max = Math.max(angleFieldValue, max);
             data[index][ARC_TRANSFORM_VALUE] = angleFieldValue;
         }
-        const valueList = data.map(d => Number(d[angleField]));
         const angleRange = endAngle - startAngle;
         let lastAngle = startAngle;
         let restAngle = angleRange;
         let largeThanMinAngleTotal = 0;
-        data.forEach((d, i) => {
+        data.forEach(d => {
             const angleFieldValue = d[ARC_TRANSFORM_VALUE];
             const ratio = total ? angleFieldValue / total : 0;
             let radian = ratio * angleRange;
@@ -68277,7 +68157,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const dEndAngle = lastAngle + radian;
             d[asRatio] = ratio;
             d[asK] = max ? angleFieldValue / max : 0;
-            d._percent_ = getPercentValue(valueList, i);
             appendArcInfo(d, dStartAngle, radian);
             lastAngle = dEndAngle;
         });
@@ -71051,8 +70930,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         'star',
         'cardioid',
         'circle',
-        'pentagon',
-        'rect'
+        'pentagon'
     ];
 
     const WORD_CLOUD_ANGLE = `${PREFIX}_WORD_CLOUD_ANGLE`;
@@ -81790,7 +81668,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
                 else {
                     if (isXAxis(this.getOrient())) {
-                        field = s.getSpec().x2Field
+                        field = s.fieldX2
                             ? [...s.fieldX, s.fieldX2]
                             : s.fieldX;
                     }
@@ -81798,9 +81676,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         field = s.fieldZ;
                     }
                     else {
-                        field = s.getSpec().y2Field
-                            ? [...s.fieldY, s.fieldY2]
-                            : s.fieldY;
+                        field = s.fieldY;
                     }
                 }
                 field = (isArray$1(field) ? (isContinuous(this._scale.type) ? field : [field[0]]) : [field]);
@@ -82821,20 +82697,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         Factory.registerComponent(CartesianSymlogAxis.type, CartesianSymlogAxis);
     };
 
-    const getPolarAxisInfo = (spec, chartSpec) => {
-        var _a, _b, _c, _d, _e, _f;
+    const getPolarAxisInfo = (spec) => {
+        var _a;
         const axisType = (_a = spec.type) !== null && _a !== void 0 ? _a : (spec.orient === 'angle' ? 'band' : 'linear');
         const componentName = `${ComponentTypeEnum.polarAxis}-${axisType}`;
-        const startAngleFromSpec = (_b = spec.startAngle) !== null && _b !== void 0 ? _b : chartSpec.startAngle;
-        const endAngleFromSpec = (_c = spec.endAngle) !== null && _c !== void 0 ? _c : chartSpec.endAngle;
-        return {
-            axisType,
-            componentName,
-            startAngle: startAngleFromSpec !== null && startAngleFromSpec !== void 0 ? startAngleFromSpec : POLAR_START_ANGLE$1,
-            endAngle: endAngleFromSpec !== null && endAngleFromSpec !== void 0 ? endAngleFromSpec : (isValid$1(startAngleFromSpec) ? startAngleFromSpec + 360 : POLAR_END_ANGLE$1),
-            center: chartSpec.center,
-            outerRadius: (_f = (_e = (_d = spec.radius) !== null && _d !== void 0 ? _d : chartSpec.outerRadius) !== null && _e !== void 0 ? _e : chartSpec.radius) !== null && _f !== void 0 ? _f : POLAR_DEFAULT_RADIUS
-        };
+        return { axisType, componentName };
     };
 
     class PolarAxis extends AxisComponent {
@@ -82854,6 +82721,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return this._groupScales;
         }
         static getSpecInfo(chartSpec) {
+            var _a, _b;
             const axesSpec = chartSpec[this.specKey];
             if (!axesSpec) {
                 return null;
@@ -82862,11 +82730,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 if (!isValidPolarAxis(axesSpec)) {
                     return null;
                 }
-                const { axisType, componentName, startAngle, endAngle, center, outerRadius } = getPolarAxisInfo(axesSpec, chartSpec);
-                axesSpec.center = center;
-                axesSpec.startAngle = startAngle;
-                axesSpec.endAngle = endAngle;
-                axesSpec.outerRadius = outerRadius;
+                const { axisType, componentName } = getPolarAxisInfo(axesSpec);
+                axesSpec.center = chartSpec.center;
+                axesSpec.startAngle = (_a = chartSpec.startAngle) !== null && _a !== void 0 ? _a : POLAR_START_ANGLE$1;
+                axesSpec.endAngle =
+                    (_b = chartSpec.endAngle) !== null && _b !== void 0 ? _b : (isValid$1(chartSpec.startAngle) ? chartSpec.startAngle + 360 : POLAR_END_ANGLE$1);
                 axesSpec.type = axisType;
                 return [
                     {
@@ -82881,14 +82749,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             let angleAxisIndex;
             const radiusAxisSpecInfos = [];
             axesSpec.forEach((s, i) => {
+                var _a, _b, _c, _d, _e;
                 if (!isValidPolarAxis(s)) {
                     return;
                 }
-                const { axisType, componentName, startAngle, endAngle, center, outerRadius } = getPolarAxisInfo(s, chartSpec);
-                s.center = center;
-                s.startAngle = startAngle;
-                s.endAngle = endAngle;
-                s.outerRadius = outerRadius;
+                const { axisType, componentName } = getPolarAxisInfo(s);
+                s.center = chartSpec.center;
+                s.startAngle = (_a = chartSpec.startAngle) !== null && _a !== void 0 ? _a : POLAR_START_ANGLE$1;
+                s.endAngle = (_b = chartSpec.endAngle) !== null && _b !== void 0 ? _b : (isValid$1(chartSpec.startAngle) ? chartSpec.startAngle + 360 : POLAR_END_ANGLE$1);
+                s.outerRadius = (_e = (_d = (_c = s.radius) !== null && _c !== void 0 ? _c : chartSpec.outerRadius) !== null && _d !== void 0 ? _d : chartSpec.radius) !== null && _e !== void 0 ? _e : POLAR_DEFAULT_RADIUS;
                 s.type = axisType;
                 const info = {
                     spec: s,
@@ -82957,6 +82826,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._coordinateType = 'polar';
         }
         setAttrFromSpec() {
+            var _a, _b;
             super.setAttrFromSpec();
             if (this.visible) {
                 this._axisStyle = this._getAxisAttributes();
@@ -82965,8 +82835,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._tick = this._spec.tick;
             this._orient = this._spec.orient === 'angle' ? 'angle' : 'radius';
             this._center = this._spec.center;
-            this._startAngle = degreeToRadian(this._spec.startAngle);
-            this._endAngle = degreeToRadian(this._spec.endAngle);
+            const chartSpec = this.getChart().getSpec();
+            const startAngle = (_a = this._spec.startAngle) !== null && _a !== void 0 ? _a : chartSpec.startAngle;
+            const endAngle = (_b = this._spec.endAngle) !== null && _b !== void 0 ? _b : chartSpec.endAngle;
+            this._startAngle = degreeToRadian(startAngle !== null && startAngle !== void 0 ? startAngle : POLAR_START_ANGLE$1);
+            this._endAngle = degreeToRadian(endAngle !== null && endAngle !== void 0 ? endAngle : (isValid$1(startAngle) ? startAngle + 360 : POLAR_END_ANGLE$1));
             this._inverse = this._spec.inverse;
         }
         onLayoutEnd(ctx) {
@@ -88774,12 +88647,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     options
                 });
             }
-            if (needAggr || needRegr) {
-                data.transform({
-                    type: 'markerFilter',
-                    options: this._getAllRelativeSeries()
-                });
-            }
+            data.transform({
+                type: 'markerFilter',
+                options: this._getAllRelativeSeries()
+            });
             data.target.on('change', () => {
                 this._markerLayout();
             });
@@ -88999,28 +88870,22 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             let lines = [];
             if (isXYLayout) {
                 lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);
-                const [start, end] = lines;
-                if (start && start.length && end && end.length) {
-                    points = [
-                        {
-                            x: start[0].x,
-                            y: end[0].y
-                        },
-                        start[0],
-                        {
-                            x: end[0].x,
-                            y: start[0].y
-                        },
-                        end[0]
-                    ];
-                }
+                points = [
+                    {
+                        x: lines[0][0].x,
+                        y: lines[1][0].y
+                    },
+                    lines[0][0],
+                    {
+                        x: lines[1][0].x,
+                        y: lines[0][0].y
+                    },
+                    lines[1][0]
+                ];
             }
             else if (isXLayout || isYLayout) {
                 lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);
-                const [start, end] = lines;
-                if (start && start.length && end && end.length) {
-                    points = [...start, end[1], end[0]];
-                }
+                points = [...lines[0], lines[1][1], lines[1][0]];
             }
             else if (isCoordinateLayout) {
                 points = coordinateLayout(data, relativeSeries, autoRange, spec.coordinatesOffset);
@@ -89094,12 +88959,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 type: 'markerAggregation',
                 options
             });
-            if (options) {
-                data.transform({
-                    type: 'markerFilter',
-                    options: this._getAllRelativeSeries()
-                });
-            }
+            data.transform({
+                type: 'markerFilter',
+                options: this._getAllRelativeSeries()
+            });
             data.target.on('change', () => {
                 this._markerLayout();
             });
@@ -89125,7 +88988,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return result;
     };
     const transformToAttrs = (spec) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const trackStyle = rectToAttribute((_b = (_a = spec === null || spec === void 0 ? void 0 : spec.slider) === null || _a === void 0 ? void 0 : _a.trackStyle) !== null && _b !== void 0 ? _b : {});
         const railStyle = rectToAttribute((_d = (_c = spec === null || spec === void 0 ? void 0 : spec.slider) === null || _c === void 0 ? void 0 : _c.railStyle) !== null && _d !== void 0 ? _d : {});
         const handlerStyle = symbolToAttribute((_f = (_e = spec === null || spec === void 0 ? void 0 : spec.slider) === null || _e === void 0 ? void 0 : _e.handlerStyle) !== null && _f !== void 0 ? _f : {});
@@ -89133,7 +88996,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         const pause = baseToAttribute((_k = (_j = spec === null || spec === void 0 ? void 0 : spec.controller) === null || _j === void 0 ? void 0 : _j.pause) !== null && _k !== void 0 ? _k : {});
         const backward = baseToAttribute((_m = (_l = spec === null || spec === void 0 ? void 0 : spec.controller) === null || _l === void 0 ? void 0 : _l.backward) !== null && _m !== void 0 ? _m : {});
         const forward = baseToAttribute((_p = (_o = spec === null || spec === void 0 ? void 0 : spec.controller) === null || _o === void 0 ? void 0 : _o.forward) !== null && _p !== void 0 ? _p : {});
-        return Object.assign(Object.assign({}, spec), { direction: spec.direction, interval: spec.interval, visible: spec.visible, orient: (_q = spec.orient) !== null && _q !== void 0 ? _q : 'bottom', slider: Object.assign(Object.assign({}, spec.slider), { trackStyle: trackStyle, railStyle: railStyle, handlerStyle: handlerStyle }), controller: Object.assign(Object.assign({}, spec.controller), { start: start, pause: pause, backward: backward, forward: forward }) });
+        return Object.assign(Object.assign({}, spec), { direction: spec.direction, interval: spec.interval, visible: spec.visible, orient: spec.orient, slider: Object.assign(Object.assign({}, spec.slider), { trackStyle: trackStyle, railStyle: railStyle, handlerStyle: handlerStyle }), controller: Object.assign(Object.assign({}, spec.controller), { start: start, pause: pause, backward: backward, forward: forward }) });
     };
     const transformContinuousSpecToAttrs = (spec, data) => (Object.assign(Object.assign({}, transformToAttrs(spec)), { data, type: 'continuous' }));
     const transformDiscreteSpecToAttrs = (spec, data) => (Object.assign(Object.assign({}, transformToAttrs(spec)), { data, type: 'discrete' }));
@@ -89453,6 +89316,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             textAttribute.text = formatMethod(textAttribute.text, datum, { series });
         }
         if (formatter) {
+            if (series.type === 'pie') {
+                datum._percent_ = (datum[ARC_RATIO] * 100).toFixed(2) + '%';
+            }
+            else if (datum[STACK_FIELD_END_PERCENT]) {
+                datum._percent_ = (datum[STACK_FIELD_END_PERCENT] * 100).toFixed(2) + '%';
+            }
             textAttribute.text = substitute(formatter, datum);
         }
         return textAttribute;
@@ -90283,7 +90152,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const attribute = (_c = this._markerComponent.attribute) !== null && _c !== void 0 ? _c : {};
                 const textStyle = (_e = (_d = attribute.itemContent) === null || _d === void 0 ? void 0 : _d.textStyle) !== null && _e !== void 0 ? _e : {};
                 this._markerComponent.setAttributes({
-                    position: point,
+                    position: point === undefined ? { x: null, y: null } : point,
                     itemContent: Object.assign(Object.assign({}, attribute.itemContent), { textStyle: Object.assign(Object.assign({}, textStyle), { text: ((_f = this._spec.itemContent.text) === null || _f === void 0 ? void 0 : _f.formatMethod)
                                 ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData)
                                 : textStyle.text }) }),
@@ -90318,12 +90187,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 type: 'markerAggregation',
                 options
             });
-            if (options) {
-                data.transform({
-                    type: 'markerFilter',
-                    options: this._getAllRelativeSeries()
-                });
-            }
+            data.transform({
+                type: 'markerFilter',
+                options: this._getAllRelativeSeries()
+            });
             data.target.on('change', () => {
                 this._markerLayout();
             });