@visactor/vrender-components 0.21.1-alpha.0 → 0.21.1

package/dist/index.es.js

@@ -572,6 +572,7 @@ class SyncHook extends Hook {
 
 const EnvContribution = Symbol.for("EnvContribution");
 const VGlobal = Symbol.for("VGlobal");
+const DEFAULT_TEXT_FONT_FAMILY$1 = "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol";
 
 var __decorate$P = undefined && undefined.__decorate || function (decorators, target, key, desc) {
     var d,
@@ -2547,7 +2548,7 @@ const DIRECTION_KEY = {
 };
 const defaultFormatting = {
     fontSize: 16,
-    fontFamily: "sans-serif",
+    fontFamily: DEFAULT_TEXT_FONT_FAMILY$1,
     fill: !0,
     stroke: !1,
     fontWeight: "normal",
@@ -2573,7 +2574,7 @@ const setTextStyle = (ctx, character) => {
     fontStyle: character.fontStyle || "",
     fontWeight: character.fontWeight || "",
     fontSize: fontSize,
-    fontFamily: character.fontFamily || "sans-serif"
+    fontFamily: character.fontFamily
   });
 };
 function applyFillStyle(ctx, character, b) {
@@ -3619,19 +3620,19 @@ class Node extends EventEmitter {
   }
   insertBefore(newNode, referenceNode) {
     if (!referenceNode) return this.appendChild(newNode);
-    if (this._uid === newNode._uid) return null;
+    if (this === newNode || newNode === referenceNode) return null;
     if (newNode.isAncestorsOf(this)) throw new Error("【Node::insertBefore】不能将父辈元素insert为子元素");
     return referenceNode.parent !== this ? null : (newNode.parent && newNode.parent.removeChild(newNode), newNode.parent = this, newNode._prev = referenceNode._prev, referenceNode._prev ? referenceNode._prev._next = newNode : this._firstChild = newNode, referenceNode._prev = newNode, newNode._next = referenceNode, this._idMap || (this._idMap = new Map()), this._idMap.set(newNode._uid, newNode), this._structEdit = !0, this.setCount(newNode.count), newNode);
   }
   insertAfter(newNode, referenceNode) {
     if (!referenceNode) return this.appendChild(newNode);
-    if (this._uid === newNode._uid) return null;
+    if (this === newNode || newNode === referenceNode) return null;
     if (newNode.isAncestorsOf(this)) throw new Error("【Node::insertAfter】不能将父辈元素insert为子元素");
     return referenceNode.parent !== this ? null : (newNode.parent && newNode.parent.removeChild(newNode), newNode.parent = this, referenceNode._next ? (referenceNode._next._prev = newNode, newNode._next = referenceNode._next) : this._lastChild = newNode, referenceNode._next = newNode, newNode._prev = referenceNode, this._idMap || (this._idMap = new Map()), this._idMap.set(newNode._uid, newNode), this._structEdit = !0, this.setCount(newNode.count), newNode);
   }
   insertInto(newNode, idx) {
     if (!this._ignoreWarn && this._nodeList && Logger.getInstance().warn("insertIntoKeepIdx和insertInto混用可能会存在错误"), idx >= this.childrenCount) return this.appendChild(newNode);
-    if (this._uid === newNode._uid) return null;
+    if (this === newNode) return null;
     if (newNode.isAncestorsOf(this)) throw new Error("【Node::insertBefore】不能将父辈元素insert为子元素");
     if (newNode.parent && newNode.parent.removeChild(newNode), newNode.parent = this, 0 === idx) newNode._next = this._firstChild, this._firstChild && (this._firstChild._prev = newNode), newNode._prev = null, this._firstChild = newNode;else {
       let child = this._firstChild;
@@ -5896,14 +5897,21 @@ class Group extends Graphic {
       width: width,
       height: height,
       path: path,
-      clip = groupTheme.clip,
-      display: display
+      clip = groupTheme.clip
     } = attribute;
-    return path && path.length ? path.forEach(g => {
+    if (path && path.length ? path.forEach(g => {
       aabbBounds.union(g.AABBBounds);
-    }) : null != width && null != height && aabbBounds.set(0, 0, Math.max(0, width), Math.max(0, height)), clip || this.forEachChildren(node => {
-      aabbBounds.union(node.AABBBounds);
-    }), application.graphicService.updateTempAABBBounds(aabbBounds), application.graphicService.transformAABBBounds(attribute, aabbBounds, groupTheme, !1, this), originalAABBBounds.copy(aabbBounds), originalAABBBounds;
+    }) : null != width && null != height && aabbBounds.set(0, 0, Math.max(0, width), Math.max(0, height)), !clip) {
+      this.forEachChildren(node => {
+        aabbBounds.union(node.AABBBounds);
+      });
+      const {
+        scrollX = 0,
+        scrollY = 0
+      } = attribute;
+      aabbBounds.translate(scrollX, scrollY);
+    }
+    return application.graphicService.updateTempAABBBounds(aabbBounds), application.graphicService.transformAABBBounds(attribute, aabbBounds, groupTheme, !1, this), originalAABBBounds.copy(aabbBounds), originalAABBBounds;
   }
   doUpdateAABBBounds() {
     this.updateAABBBoundsStamp++;
@@ -7793,7 +7801,7 @@ function drawEachCurve(path, curve, lastCurve, defined0, offsetX, offsetY, offse
       originP2: originP2
     } = curve;
     let validP;
-    if (originP1 && !1 !== originP1.defined ? validP = p0 : originP1 && !1 !== originP2.defined && (validP = null !== (_a = curve.p3) && void 0 !== _a ? _a : curve.p1), defined0) {
+    if (originP1 && !1 !== originP1.defined && !lastCurve ? validP = p0 : originP1 && !1 !== originP2.defined && (validP = null !== (_a = curve.p3) && void 0 !== _a ? _a : curve.p1), defined0) {
       newDefined0 = !defined0;
       const x = validP ? validP.x : curve.p0.x,
         y = validP ? validP.y : curve.p0.y;
@@ -11477,7 +11485,7 @@ class Wrapper {
   }
 }
 
-const RICHTEXT_UPDATE_TAG_KEY = ["width", "height", "ellipsis", "wordBreak", "verticalDirection", "maxHeight", "maxWidth", "textAlign", "textBaseline", "textConfig", "layoutDirection", "fill", "stroke", "fontSize", ...GRAPHIC_UPDATE_TAG_KEY];
+const RICHTEXT_UPDATE_TAG_KEY = ["width", "height", "ellipsis", "wordBreak", "verticalDirection", "maxHeight", "maxWidth", "textAlign", "textBaseline", "textConfig", "layoutDirection", "fill", "stroke", "fontSize", "fontFamily", "fontStyle", "fontWeight", "lineWidth", "opacity", "fillOpacity", "strokeOpacity", ...GRAPHIC_UPDATE_TAG_KEY];
 class RichText extends Graphic {
   constructor(params) {
     super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE, this.onBeforeAttributeUpdate = (val, attributes, key) => {
@@ -12700,21 +12708,33 @@ let DefaultDrawContribution = class {
     const renderer = this.getRenderContribution(graphic);
     if (!renderer) return;
     let tempBounds,
-      retrans = !1;
+      retrans = this.scrollMatrix && (0 !== this.scrollMatrix.e || 0 !== this.scrollMatrix.f);
     if (graphic.parent) {
       const {
         scrollX = 0,
         scrollY = 0
       } = graphic.parent.attribute;
-      if (retrans = !(!scrollX && !scrollY), retrans) {
-        tempBounds = this.dirtyBounds.clone();
-        const m = graphic.globalTransMatrix.getInverse();
-        this.dirtyBounds.copy(this.backupDirtyBounds).transformWithMatrix(m), this.dirtyBounds.translate(-scrollX, -scrollY);
+      (scrollX || scrollY) && (retrans = !0, this.scrollMatrix || (this.scrollMatrix = matrixAllocate.allocate(1, 0, 0, 1, 0, 0)), this.scrollMatrix.translate(-scrollX, -scrollY));
+    }
+    if (retrans && (tempBounds = this.dirtyBounds.clone().transformWithMatrix(this.scrollMatrix)), this.useDirtyBounds && !graphic.isContainer && !isRectIntersect(graphic.AABBBounds, null != tempBounds ? tempBounds : this.dirtyBounds, !1)) {
+      if (retrans && graphic.parent) {
+        const {
+          scrollX = 0,
+          scrollY = 0
+        } = graphic.parent.attribute;
+        this.scrollMatrix && this.scrollMatrix.translate(scrollX, scrollY);
       }
+      return;
     }
-    if (this.useDirtyBounds && !graphic.isContainer && !isRectIntersect(graphic.AABBBounds, this.dirtyBounds, !1)) return void (retrans && this.dirtyBounds.copy(tempBounds));
     const skipDraw = null != drawContext.startAtId && graphic._uid !== drawContext.startAtId;
-    if (graphic._uid === drawContext.startAtId && (drawContext.startAtId = null), params && (params.skipDraw = skipDraw), skipDraw ? graphic.isContainer && renderer.draw(graphic, this.currentRenderService, drawContext, params) : renderer.draw(graphic, this.currentRenderService, drawContext, params), retrans && this.dirtyBounds.copy(tempBounds), this.InterceptorContributions.length) for (let i = 0; i < this.InterceptorContributions.length; i++) {
+    if (graphic._uid === drawContext.startAtId && (drawContext.startAtId = null), params && (params.skipDraw = skipDraw), skipDraw ? graphic.isContainer && renderer.draw(graphic, this.currentRenderService, drawContext, params) : renderer.draw(graphic, this.currentRenderService, drawContext, params), retrans && graphic.parent) {
+      const {
+        scrollX = 0,
+        scrollY = 0
+      } = graphic.parent.attribute;
+      this.scrollMatrix && this.scrollMatrix.translate(scrollX, scrollY);
+    }
+    if (this.InterceptorContributions.length) for (let i = 0; i < this.InterceptorContributions.length; i++) {
       const drawContribution = this.InterceptorContributions[i];
       if (drawContribution.afterDrawItem && drawContribution.afterDrawItem(graphic, this.currentRenderService, drawContext, this)) return;
     }
@@ -14599,7 +14619,13 @@ let ScrollBarPlugin = ScrollBarPlugin_1 = class ScrollBarPlugin {
                 this.clearScrollbar(this.scrollContainer.g, 'all');
             }
             this.scrollContainer = data !== null && data !== void 0 ? data : this.scrollContainer;
+            if (!data) {
+                return;
+            }
             const scrollContainer = data.g;
+            if (!scrollContainer) {
+                return;
+            }
             const { width, height, scrollX = 0, scrollY = 0 } = scrollContainer.attribute;
             let newScrollX = scrollX;
             let newScrollY = scrollY;
@@ -14615,29 +14641,31 @@ let ScrollBarPlugin = ScrollBarPlugin_1 = class ScrollBarPlugin {
                     showV = showV && true;
                 }
             }
-            const childrenBounds = this.childrenBounds;
-            childrenBounds.clear();
-            childrenBounds.set(0, 0, scrollContainer.AABBBounds.width(), scrollContainer.AABBBounds.height());
-            const scrollWidth = childrenBounds.width();
-            const scrollHeight = childrenBounds.height();
+            const scrollWidth = this.childrenBounds.width();
+            const scrollHeight = this.childrenBounds.height();
             if (showH) {
-                newScrollX = Math.max(Math.min(((_a = e.deltaX) !== null && _a !== void 0 ? _a : 0) - scrollX, scrollWidth - width), 0);
-            }
-            else {
-                newScrollX = -scrollX;
+                newScrollX = scrollX - ((_a = e.deltaX) !== null && _a !== void 0 ? _a : 0);
+                if (newScrollX > 0) {
+                    newScrollX = 0;
+                }
+                else if (newScrollX < width - scrollWidth) {
+                    newScrollX = width - scrollWidth;
+                }
             }
             if (showV) {
-                newScrollY = Math.max(Math.min(((_b = e.deltaY) !== null && _b !== void 0 ? _b : 0) - scrollY, scrollHeight - height), 0);
-            }
-            else {
-                newScrollY = -scrollY;
+                newScrollY = scrollY - ((_b = e.deltaY) !== null && _b !== void 0 ? _b : 0);
+                if (newScrollY > 0) {
+                    newScrollY = 0;
+                }
+                else if (newScrollY < height - scrollHeight) {
+                    newScrollY = height - scrollHeight;
+                }
             }
-            childrenBounds.translate(-newScrollX, -newScrollY);
-            this.addOrUpdateScroll(showH, showV, scrollContainer.parent, scrollContainer);
             scrollContainer.setAttributes({
-                scrollX: -newScrollX,
-                scrollY: -newScrollY
+                scrollX: newScrollX,
+                scrollY: newScrollY
             });
+            this.addOrUpdateScroll(showH, showV, scrollContainer.parent, scrollContainer);
         };
         this.handleScrollBarChange = (params) => {
             if (!this.scrollContainer ||
@@ -14711,7 +14739,7 @@ let ScrollBarPlugin = ScrollBarPlugin_1 = class ScrollBarPlugin {
         return isHorozntal ? 'horizontal' : 'vertical';
     }
     addOrUpdateHScroll(scrollContainer, container, isHorozntal) {
-        var _a;
+        var _a, _b;
         const direction = this.getDirection(isHorozntal);
         const name = `${(_a = scrollContainer.name) !== null && _a !== void 0 ? _a : scrollContainer._uid}_${this.getDirection(isHorozntal)}_${this.name}`;
         const scrollbars = container.children.filter((g) => g.name === name);
@@ -14754,16 +14782,17 @@ let ScrollBarPlugin = ScrollBarPlugin_1 = class ScrollBarPlugin {
             });
         }
         const childrenBounds = this.childrenBounds;
+        const { scrollX, scrollY } = scrollContainer.attribute;
         if (isHorozntal) {
             const ratio = Math.min(this.scrollContainerBounds.width() / childrenBounds.width(), 1);
-            const start = Math.max(Math.min(this.childrenBounds.x1 / this.childrenBounds.width(), 0), ratio - 1);
+            const start = Math.max(Math.min(scrollX / this.childrenBounds.width(), 0), ratio - 1);
             attrs.x = x + dx;
-            attrs.y = y + dy + height - this.scrollContainerBounds.height();
+            attrs.y = y + dy + height - ((_b = attrs.height) !== null && _b !== void 0 ? _b : 0);
             attrs.range = [-start, -start + ratio];
         }
         else {
             const ratio = Math.min(this.scrollContainerBounds.height() / childrenBounds.height(), 1);
-            const start = Math.max(Math.min(this.childrenBounds.y1 / this.childrenBounds.height(), 0), ratio - 1);
+            const start = Math.max(Math.min(scrollY / this.childrenBounds.height(), 0), ratio - 1);
             attrs.x = x + dx + width - this.scrollContainerBounds.width();
             attrs.y = y + dy;
             attrs.range = [-start, -start + ratio];
@@ -14803,12 +14832,17 @@ let ScrollBarPlugin = ScrollBarPlugin_1 = class ScrollBarPlugin {
             showH = overflow === 'scroll-x';
             showV = !showH;
         }
+        const childrenBounds = this.childrenBounds;
+        childrenBounds.clear();
+        g.forEachChildren((g) => {
+            childrenBounds.union(g.AABBBounds);
+        });
         if (!g.AABBBounds.empty()) {
             if (showH) {
-                showH = width < g.AABBBounds.width();
+                showH = width < childrenBounds.width();
             }
             if (showV) {
-                showV = height < g.AABBBounds.height();
+                showV = height < childrenBounds.height();
             }
         }
         return showH || showV ? { g: g, showH, showV } : null;
@@ -16242,14 +16276,19 @@ function canPlace($, bitmap, bound, checkBound = true, pad = 0) {
     }
     return !bitmap.getRange(range);
 }
-function placeToCandidates($, bitmap, text, candidates = [], clampForce = true, pad = 0) {
+function placeToCandidates($, bitmap, text, candidates = [], clampForce = true, pad = 0, changePosition = false) {
     const validCandidates = candidates.filter(candidate => isValid(candidate));
     for (let i = 0; i < validCandidates.length; i++) {
-        const tempText = text.clone();
-        tempText.setAttributes(validCandidates[i]);
-        tempText.update();
-        if (canPlace($, bitmap, tempText.AABBBounds, clampForce, pad)) {
-            bitmap.setRange(boundToRange($, tempText.AABBBounds, true));
+        let measureText;
+        if (changePosition) {
+            measureText = text;
+        }
+        else {
+            measureText = text.clone();
+        }
+        measureText.setAttributes(validCandidates[i]);
+        if (canPlace($, bitmap, measureText.AABBBounds, clampForce, pad)) {
+            bitmap.setRange(boundToRange($, measureText.AABBBounds, true));
             return validCandidates[i];
         }
     }
@@ -16264,7 +16303,8 @@ function place($, bitmap, s, attrs, text, bounds, labeling) {
             const userPosition = isFunction(s.position) ? s.position(text.attribute) : s.position;
             const positions = (userPosition || defaultLabelPosition(attrs.type));
             const candidates = positions.map(p => labeling(text.AABBBounds, bounds, p, attrs.offset));
-            return placeToCandidates($, bitmap, text, candidates, clampForce, overlapPadding);
+            const shouldClone = s.restorePosition === false;
+            return placeToCandidates($, bitmap, text, candidates, clampForce, overlapPadding, shouldClone);
         }
         return false;
     }
@@ -16661,14 +16701,12 @@ function shiftY(texts, option) {
         textInformation.get(text).attempts = attempts;
     };
     function adjustPositionInOneGroup(texts) {
-        if (texts.length === 1) {
-            return;
-        }
-        for (let i = texts.length - 1; i > 0; i--) {
+        for (let i = texts.length - 1; i >= 0; i--) {
             const curText = texts[i];
             const upperText = texts[i - 1];
             const lowerText = texts[i + 1];
-            if (isIntersect(getY1(upperText) + getHeight(upperText), getY1(curText))) {
+            if ((upperText && isIntersect(getY1(upperText) + getHeight(upperText), getY1(curText))) ||
+                (getY1(curText) === 0 && curText._isClamped)) {
                 const { y } = labelling(curText);
                 if (!lowerText || !isIntersect(y + getHeight(curText) / 2, getY1(lowerText))) {
                     if (y + getHeight(curText) / 2 <= maxY) {
@@ -17159,10 +17197,16 @@ class LabelBase extends AbstractComponent {
             const text = result[i];
             const bounds = text.AABBBounds;
             const range = boundToRange(bmpTool, bounds, true);
-            if (canPlace(bmpTool, bitmap, bounds, clampForce, text._isClamped ? 0 : overlapPadding)) {
+            if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) {
                 bitmap.setRange(range);
             }
             else {
+                if (clampForce) {
+                    const placedAfterClampForce = this._processClampForce(text, bmpTool, bitmap);
+                    if (placedAfterClampForce) {
+                        continue;
+                    }
+                }
                 if (hideOnHit) {
                     text.setAttributes({ visible: false });
                 }
@@ -17173,6 +17217,26 @@ class LabelBase extends AbstractComponent {
         }
         return result;
     }
+    _processClampForce(text, bmpTool, bitmap) {
+        const { dy = 0, dx = 0 } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
+        if (dx === 0 && dy === 0) {
+            if (canPlace(bmpTool, bitmap, text.AABBBounds)) {
+                bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true));
+                return true;
+            }
+        }
+        else if (canPlace(bmpTool, bitmap, {
+            x1: text.AABBBounds.x1 + dx,
+            x2: text.AABBBounds.x2 + dx,
+            y1: text.AABBBounds.y1 + dy,
+            y2: text.AABBBounds.y2 + dy
+        })) {
+            text.setAttributes({ x: text.attribute.x + dx, y: text.attribute.y + dy });
+            bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true));
+            return true;
+        }
+        return false;
+    }
     _overlapByStrategy(labels, option, bmpTool, bitmap) {
         var _a;
         const { avoidBaseMark, strategy = [], hideOnHit = true, clampForce = true, avoidMarks = [], overlapPadding } = option;
@@ -17232,22 +17296,8 @@ class LabelBase extends AbstractComponent {
                 }
             }
             if (!hasPlace && clampForce) {
-                const { dx = 0, dy = 0 } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
-                if (dx === 0 && dy === 0) {
-                    if (canPlace(bmpTool, bitmap, text.AABBBounds)) {
-                        bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true));
-                        result.push(text);
-                        continue;
-                    }
-                }
-                else if (canPlace(bmpTool, bitmap, {
-                    x1: text.AABBBounds.x1 + dx,
-                    x2: text.AABBBounds.x2 + dx,
-                    y1: text.AABBBounds.y1 + dy,
-                    y2: text.AABBBounds.y2 + dy
-                })) {
-                    text.setAttributes({ x: text.attribute.x + dx, y: text.attribute.y + dy });
-                    bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true));
+                const placedAfterClampForce = this._processClampForce(text, bmpTool, bitmap);
+                if (placedAfterClampForce) {
                     result.push(text);
                     continue;
                 }
@@ -22796,11 +22846,19 @@ var IMarkAreaLabelPosition;
     IMarkAreaLabelPosition["right"] = "right";
     IMarkAreaLabelPosition["top"] = "top";
     IMarkAreaLabelPosition["bottom"] = "bottom";
+    IMarkAreaLabelPosition["topLeft"] = "topLeft";
+    IMarkAreaLabelPosition["topRight"] = "topRight";
+    IMarkAreaLabelPosition["bottomLeft"] = "bottomLeft";
+    IMarkAreaLabelPosition["bottomRight"] = "bottomRight";
     IMarkAreaLabelPosition["middle"] = "middle";
     IMarkAreaLabelPosition["insideLeft"] = "insideLeft";
     IMarkAreaLabelPosition["insideRight"] = "insideRight";
     IMarkAreaLabelPosition["insideTop"] = "insideTop";
     IMarkAreaLabelPosition["insideBottom"] = "insideBottom";
+    IMarkAreaLabelPosition["insideTopLeft"] = "insideTopLeft";
+    IMarkAreaLabelPosition["insideTopRight"] = "insideTopRight";
+    IMarkAreaLabelPosition["insideBottomLeft"] = "insideBottomLeft";
+    IMarkAreaLabelPosition["insideBottomRight"] = "insideBottomRight";
 })(IMarkAreaLabelPosition || (IMarkAreaLabelPosition = {}));
 var IMarkCommonArcLabelPosition;
 (function (IMarkCommonArcLabelPosition) {
@@ -23630,6 +23688,38 @@ const DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP = {
     middle: {
         textAlign: 'center',
         textBaseline: 'middle'
+    },
+    topLeft: {
+        textAlign: 'right',
+        textBaseline: 'top'
+    },
+    insideTopLeft: {
+        textAlign: 'left',
+        textBaseline: 'top'
+    },
+    topRight: {
+        textAlign: 'left',
+        textBaseline: 'top'
+    },
+    insideTopRight: {
+        textAlign: 'right',
+        textBaseline: 'top'
+    },
+    bottomLeft: {
+        textAlign: 'right',
+        textBaseline: 'bottom'
+    },
+    insideBottomLeft: {
+        textAlign: 'left',
+        textBaseline: 'bottom'
+    },
+    bottomRight: {
+        textAlign: 'left',
+        textBaseline: 'bottom'
+    },
+    insideBottomRight: {
+        textAlign: 'right',
+        textBaseline: 'bottom'
     }
 };
 const DEFAULT_MARK_POINT_THEME = {
@@ -24528,11 +24618,23 @@ class MarkPoint extends Marker {
     }
     computeNewPositionAfterTargetItem(position) {
         var _a, _b;
-        const { itemContent = {}, targetSymbol } = this.attribute;
+        const { itemContent = {}, targetSymbol, itemLine } = this.attribute;
         const { offsetX: itemContentOffsetX = 0, offsetY: itemContentOffsetY = 0 } = itemContent;
         const { offset: targetSymbolOffset = 0, style: targetSymbolStyle, visible: targetItemvisible = false, size: targetSymbolSize } = targetSymbol;
         const targetSize = targetItemvisible ? (_b = (_a = targetSymbolStyle.size) !== null && _a !== void 0 ? _a : targetSymbolSize) !== null && _b !== void 0 ? _b : 20 : 0;
-        const targetOffsetAngle = deltaXYToAngle(itemContentOffsetY, itemContentOffsetX);
+        let targetOffsetAngle;
+        if (itemLine.type === 'type-do') {
+            targetOffsetAngle = deltaXYToAngle(itemContentOffsetY, itemContentOffsetX / 2);
+        }
+        else if (itemLine.type === 'type-po') {
+            targetOffsetAngle = deltaXYToAngle(0, itemContentOffsetX);
+        }
+        else if (itemLine.type === 'type-op') {
+            targetOffsetAngle = deltaXYToAngle(itemContentOffsetY, 0);
+        }
+        else {
+            targetOffsetAngle = deltaXYToAngle(itemContentOffsetY, itemContentOffsetX);
+        }
         const newPosition = {
             x: position.x + (targetSize / 2 + targetSymbolOffset) * Math.cos(targetOffsetAngle),
             y: position.y + (targetSize / 2 + targetSymbolOffset) * Math.sin(targetOffsetAngle)
@@ -29989,6 +30091,6 @@ EmptyTip.defaultAttributes = {
     }
 };
 
-const version = "0.21.1-alpha.0";
+const version = "0.21.1";
 
 export { AXIS_ELEMENT_NAME, AbstractComponent, ArcInfo, ArcLabel, ArcSegment, AxisStateValue, BasePlayer, Brush, CheckBox, CircleAxis, CircleAxisGrid, CircleCrosshair, ColorContinuousLegend, ContinuousPlayer, DEFAULT_ITEM_SPACE_COL, DEFAULT_ITEM_SPACE_ROW, DEFAULT_LABEL_SPACE, DEFAULT_PAGER_SPACE, DEFAULT_SHAPE_SIZE, DEFAULT_SHAPE_SPACE, DEFAULT_STATES$1 as DEFAULT_STATES, DEFAULT_TITLE_SPACE, DEFAULT_VALUE_SPACE, DataLabel, DataZoom, DataZoomActiveTag, DirectionEnum, DiscreteLegend, DiscretePlayer, EmptyTip, GroupTransition, IMarkAreaLabelPosition, IMarkCommonArcLabelPosition, IMarkLineLabelPosition, IMarkPointItemPosition, IOperateType, Indicator, LEGEND_ELEMENT_NAME, LabelBase, LegendEvent, LegendStateValue, LineAxis, LineAxisGrid, LineCrosshair, LineLabel, LinkPath, MarkArcArea, MarkArcLine, MarkArea, MarkLine, MarkPoint, Pager, PlayerEventEnum, PolygonCrosshair, PopTip, Radio, RectCrosshair, RectLabel, SLIDER_ELEMENT_NAME, ScrollBar, SectorCrosshair, Segment, SizeContinuousLegend, Slider, SymbolLabel, Tag, Timeline, Title, Tooltip, TopZIndex, VTag, alignTextInLine, angle, angleLabelOrientAttribute, angleTo, cartesianTicks, clampRadian, computeOffsetForlimit, continuousTicks, contrastAccessibilityChecker, convertDomainToTickData, createTextGraphicByType, deltaXYToAngle, fuzzyEqualNumber, getAxisBreakSymbolAttrs, getCircleLabelPosition, getCirclePoints, getCircleVerticalVector, getElMap, getHorizontalPath, getMarksByName, getNoneGroupMarksByName, getPolarAngleLabelPosition, getPolygonPath, getSizeHandlerPath, getTextAlignAttrOfVerticalDir, getTextType, getVerticalCoord, getVerticalPath, hasOverlap, htmlAttributeTransform, initTextMeasure, isInRange, isPostiveXAxis, isRichText, isVisible, labelSmartInvert, length, limitShapeInBounds, linearDiscreteTicks, loadPoptip, loadScrollbar, measureTextSize, normalize, polarAngleAxisDiscreteTicks, polarTicks, reactAttributeTransform, registerArcDataLabel, registerLineDataLabel, registerMarkArcAreaAnimate, registerMarkArcLineAnimate, registerMarkAreaAnimate, registerMarkLineAnimate, registerMarkPointAnimate, registerRectDataLabel, registerSymbolDataLabel, removeRepeatPoint, richTextAttributeTransform, scale, scrollbarModule, setPoptipTheme, smartInvertStrategy, tan2AngleToAngle, textIntersect, ticks, traverseGroup, version };

package/es/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.21.1-alpha.0";
+export declare const version = "0.21.1";
 export * from './core/base';
 export * from './core/type';
 export * from './scrollbar';

package/es/index.js

@@ -1,4 +1,4 @@
-export const version = "0.21.1-alpha.0";
+export const version = "0.21.1";
 
 export * from "./core/base";
 

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAExC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.21.1-alpha.0\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './util';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.21.1\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './util';\n"]}

package/es/label/base.d.ts

@@ -50,6 +50,7 @@ export declare class LabelBase<T extends BaseLabelAttrs> extends AbstractCompone
     protected _layout(texts: (IText | IRichText)[]): (IText | IRichText)[];
     protected _overlapping(labels: (IText | IRichText)[]): (IRichText | IText)[];
     protected _overlapGlobal(labels: (IText | IRichText)[], option: OverlapAttrs, bmpTool: BitmapTool, bitmap: Bitmap): (IRichText | IText)[];
+    protected _processClampForce(text: IText, bmpTool: BitmapTool, bitmap: Bitmap): boolean;
     protected _overlapByStrategy(labels: (IText | IRichText)[], option: OverlapAttrs, bmpTool: BitmapTool, bitmap: Bitmap): (IRichText | IText)[];
     protected getBaseMarkGroup(): IGroup;
     protected getGraphicBounds(graphic?: IGraphic, point?: Partial<PointLocationCfg>, position?: string): IBoundsLike;

package/es/label/base.js

@@ -236,12 +236,33 @@ export class LabelBase extends AbstractComponent {
         }));
         for (let i = 0; i < result.length; i++) {
             const text = result[i], bounds = text.AABBBounds, range = boundToRange(bmpTool, bounds, !0);
-            canPlace(bmpTool, bitmap, bounds, clampForce, text._isClamped ? 0 : overlapPadding) ? bitmap.setRange(range) : hideOnHit ? text.setAttributes({
-                visible: !1
-            }) : bitmap.setRange(range);
+            if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) bitmap.setRange(range); else {
+                if (clampForce) {
+                    if (this._processClampForce(text, bmpTool, bitmap)) continue;
+                }
+                hideOnHit ? text.setAttributes({
+                    visible: !1
+                }) : bitmap.setRange(range);
+            }
         }
         return result;
     }
+    _processClampForce(text, bmpTool, bitmap) {
+        const {dy: dy = 0, dx: dx = 0} = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
+        if (0 === dx && 0 === dy) {
+            if (canPlace(bmpTool, bitmap, text.AABBBounds)) return bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), 
+            !0;
+        } else if (canPlace(bmpTool, bitmap, {
+            x1: text.AABBBounds.x1 + dx,
+            x2: text.AABBBounds.x2 + dx,
+            y1: text.AABBBounds.y1 + dy,
+            y2: text.AABBBounds.y2 + dy
+        })) return text.setAttributes({
+            x: text.attribute.x + dx,
+            y: text.attribute.y + dy
+        }), bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), !0;
+        return !1;
+    }
     _overlapByStrategy(labels, option, bmpTool, bitmap) {
         var _a;
         const {avoidBaseMark: avoidBaseMark, strategy: strategy = [], hideOnHit: hideOnHit = !0, clampForce: clampForce = !0, avoidMarks: avoidMarks = [], overlapPadding: overlapPadding} = option, result = [], checkBounds = strategy.some((s => "bound" === s.type));
@@ -281,22 +302,8 @@ export class LabelBase extends AbstractComponent {
                 break;
             }
             if (!hasPlace && clampForce) {
-                const {dx: dx = 0, dy: dy = 0} = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
-                if (0 === dx && 0 === dy) {
-                    if (canPlace(bmpTool, bitmap, text.AABBBounds)) {
-                        bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
-                        continue;
-                    }
-                } else if (canPlace(bmpTool, bitmap, {
-                    x1: text.AABBBounds.x1 + dx,
-                    x2: text.AABBBounds.x2 + dx,
-                    y1: text.AABBBounds.y1 + dy,
-                    y2: text.AABBBounds.y2 + dy
-                })) {
-                    text.setAttributes({
-                        x: text.attribute.x + dx,
-                        y: text.attribute.y + dy
-                    }), bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
+                if (this._processClampForce(text, bmpTool, bitmap)) {
+                    result.push(text);
                     continue;
                 }
             }