@visactor/vchart 1.13.16 → 1.13.18

package/build/index.es.js

@@ -37743,19 +37743,22 @@ class LabelBase extends AbstractComponent {
     const {
       clampForce = !0,
       hideOnHit = !0,
+      hideOnOverflow = !1,
       overlapPadding: overlapPadding,
       strategy: strategy
     } = option;
-    if (clampForce) for (let i = 0; i < result.length; i++) {
+    if (clampForce || hideOnOverflow) for (let i = 0; i < result.length; i++) {
       const text = labels[i],
         {
           dx = 0,
           dy = 0
         } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
-      0 === dx && 0 === dy || (text.setAttributes({
+      0 === dx && 0 === dy || (hideOnOverflow ? text.setAttributes({
+        visible: !1
+      }) : (text.setAttributes({
         x: text.attribute.x + dx,
         y: text.attribute.y + dy
-      }), text._isClamped = !0);
+      }), text._isClamped = !0));
     }
     result = shiftY(result, Object.assign(Object.assign({
       maxY: bmpTool.height
@@ -37771,9 +37774,9 @@ class LabelBase extends AbstractComponent {
         bounds = text.AABBBounds,
         range = boundToRange(bmpTool, bounds, !0);
       if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) bitmap.setRange(range);else {
-        if (clampForce) {
-          if (this._processClampForce(text, bmpTool, bitmap, overlapPadding)) continue;
-        }
+        if (hideOnOverflow) {
+          if (this._processHideOnOverflow(text, bmpTool)) continue;
+        } else if (clampForce && this._processClampForce(text, bmpTool, bitmap, overlapPadding)) continue;
         hideOnHit ? text.setAttributes({
           visible: !1
         }) : bitmap.setRange(range);
@@ -37781,6 +37784,15 @@ class LabelBase extends AbstractComponent {
     }
     return result;
   }
+  _processHideOnOverflow(text, bmpTool) {
+    const {
+      dy = 0,
+      dx = 0
+    } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
+    return 0 === dx && 0 === dy || (text.setAttributes({
+      visible: !1
+    }), !1);
+  }
   _processClampForce(text, bmpTool, bitmap) {
     let overlapPadding = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
     const {
@@ -37808,7 +37820,8 @@ class LabelBase extends AbstractComponent {
         hideOnHit = !0,
         clampForce = !0,
         avoidMarks = [],
-        overlapPadding: overlapPadding
+        overlapPadding: overlapPadding,
+        hideOnOverflow = !1
       } = option,
       result = [],
       checkBounds = strategy.some(s => "bound" === s.type);
@@ -37835,15 +37848,16 @@ class LabelBase extends AbstractComponent {
         }
       }
       let hasPlace = !1;
-      for (let j = 0; j < strategy.length; j++) if (hasPlace = place$2(bmpTool, bitmap, strategy[j], this.attribute, text, this._isCollectionBase ? this.getGraphicBounds(null, this._idToPoint.get(labels[i].attribute.id)) : this.getGraphicBounds(baseMark, labels[i].attribute), this.labeling), !1 !== hasPlace) {
-        text.setAttributes({
-          x: hasPlace.x,
-          y: hasPlace.y
-        }), result.push(text);
+      for (let j = 0; j < strategy.length; j++) if (hasPlace = place$2(bmpTool, bitmap, strategy[j], this.attribute, text, this._isCollectionBase ? this.getGraphicBounds(null, this._idToPoint.get(labels[i].attribute.id)) : this.getGraphicBounds(baseMark, labels[i].attribute), this.labeling), !1 !== hasPlace && (text.setAttributes({
+        x: hasPlace.x,
+        y: hasPlace.y
+      }), !hideOnOverflow || this._processHideOnOverflow(text, bmpTool))) {
+        result.push(text);
         break;
       }
-      if (!hasPlace && clampForce) {
-        if (this._processClampForce(text, bmpTool, bitmap, overlapPadding)) {
+      if (!hasPlace) {
+        if (hideOnOverflow && !this._processHideOnOverflow(text, bmpTool)) continue;
+        if (clampForce && this._processClampForce(text, bmpTool, bitmap, overlapPadding)) {
           result.push(text);
           continue;
         }
@@ -64241,7 +64255,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.13.16";
+const version = "1.13.18";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -92738,6 +92752,8 @@ class RangeAreaChartSpecTransformer extends CartesianChartSpecTransformer {
         var _a, _b;
         const series = super._getDefaultSeriesSpec(spec);
         series.area = spec.area;
+        series.point = spec.point;
+        series.line = spec.line;
         if (spec.direction === "horizontal") {
             series.xField = (_a = spec.xField) !== null && _a !== void 0 ? _a : [spec.minField, spec.maxField];
         }

package/build/index.js

@@ -37749,19 +37749,22 @@
         const {
           clampForce = !0,
           hideOnHit = !0,
+          hideOnOverflow = !1,
           overlapPadding: overlapPadding,
           strategy: strategy
         } = option;
-        if (clampForce) for (let i = 0; i < result.length; i++) {
+        if (clampForce || hideOnOverflow) for (let i = 0; i < result.length; i++) {
           const text = labels[i],
             {
               dx = 0,
               dy = 0
             } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
-          0 === dx && 0 === dy || (text.setAttributes({
+          0 === dx && 0 === dy || (hideOnOverflow ? text.setAttributes({
+            visible: !1
+          }) : (text.setAttributes({
             x: text.attribute.x + dx,
             y: text.attribute.y + dy
-          }), text._isClamped = !0);
+          }), text._isClamped = !0));
         }
         result = shiftY(result, Object.assign(Object.assign({
           maxY: bmpTool.height
@@ -37777,9 +37780,9 @@
             bounds = text.AABBBounds,
             range = boundToRange(bmpTool, bounds, !0);
           if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) bitmap.setRange(range);else {
-            if (clampForce) {
-              if (this._processClampForce(text, bmpTool, bitmap, overlapPadding)) continue;
-            }
+            if (hideOnOverflow) {
+              if (this._processHideOnOverflow(text, bmpTool)) continue;
+            } else if (clampForce && this._processClampForce(text, bmpTool, bitmap, overlapPadding)) continue;
             hideOnHit ? text.setAttributes({
               visible: !1
             }) : bitmap.setRange(range);
@@ -37787,6 +37790,15 @@
         }
         return result;
       }
+      _processHideOnOverflow(text, bmpTool) {
+        const {
+          dy = 0,
+          dx = 0
+        } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
+        return 0 === dx && 0 === dy || (text.setAttributes({
+          visible: !1
+        }), !1);
+      }
       _processClampForce(text, bmpTool, bitmap) {
         let overlapPadding = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
         const {
@@ -37814,7 +37826,8 @@
             hideOnHit = !0,
             clampForce = !0,
             avoidMarks = [],
-            overlapPadding: overlapPadding
+            overlapPadding: overlapPadding,
+            hideOnOverflow = !1
           } = option,
           result = [],
           checkBounds = strategy.some(s => "bound" === s.type);
@@ -37841,15 +37854,16 @@
             }
           }
           let hasPlace = !1;
-          for (let j = 0; j < strategy.length; j++) if (hasPlace = place$2(bmpTool, bitmap, strategy[j], this.attribute, text, this._isCollectionBase ? this.getGraphicBounds(null, this._idToPoint.get(labels[i].attribute.id)) : this.getGraphicBounds(baseMark, labels[i].attribute), this.labeling), !1 !== hasPlace) {
-            text.setAttributes({
-              x: hasPlace.x,
-              y: hasPlace.y
-            }), result.push(text);
+          for (let j = 0; j < strategy.length; j++) if (hasPlace = place$2(bmpTool, bitmap, strategy[j], this.attribute, text, this._isCollectionBase ? this.getGraphicBounds(null, this._idToPoint.get(labels[i].attribute.id)) : this.getGraphicBounds(baseMark, labels[i].attribute), this.labeling), !1 !== hasPlace && (text.setAttributes({
+            x: hasPlace.x,
+            y: hasPlace.y
+          }), !hideOnOverflow || this._processHideOnOverflow(text, bmpTool))) {
+            result.push(text);
             break;
           }
-          if (!hasPlace && clampForce) {
-            if (this._processClampForce(text, bmpTool, bitmap, overlapPadding)) {
+          if (!hasPlace) {
+            if (hideOnOverflow && !this._processHideOnOverflow(text, bmpTool)) continue;
+            if (clampForce && this._processClampForce(text, bmpTool, bitmap, overlapPadding)) {
               result.push(text);
               continue;
             }
@@ -64247,7 +64261,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.16";
+    const version = "1.13.18";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -92744,6 +92758,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             var _a, _b;
             const series = super._getDefaultSeriesSpec(spec);
             series.area = spec.area;
+            series.point = spec.point;
+            series.line = spec.line;
             if (spec.direction === "horizontal") {
                 series.xField = (_a = spec.xField) !== null && _a !== void 0 ? _a : [spec.minField, spec.maxField];
             }