@visactor/vchart 2.0.23-alpha.0 → 2.0.23-alpha.1

package/build/index.es.js

@@ -16065,7 +16065,6 @@ const GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "scaleX", "scaleY", "angle", "ancho
 const tempConstantXYKey = ["x", "y"],
   tempConstantScaleXYKey = ["scaleX", "scaleY"],
   tempConstantAngleKey = ["angle"],
-  builtinTextureTypes = new Set(["circle", "diamond", "rect", "vertical-line", "horizontal-line", "bias-lr", "bias-rl", "grid", "wave"]),
   point = new Point();
 const NOWORK_ANIMATE_ATTR = {
   strokeSeg: 1,
@@ -16122,7 +16121,7 @@ class Graphic extends Node {
   }
   constructor(params = {}) {
     var _a;
-    super(), this._AABBBounds = new AABBBounds(), this._updateTag = UpdateTag.INIT, this.attribute = params, this.valid = this.isValid(), this.updateAABBBoundsStamp = 0, params.background && this.loadImage(null !== (_a = params.background.background) && void 0 !== _a ? _a : params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
+    super(), this._AABBBounds = new AABBBounds(), this._updateTag = UpdateTag.INIT, this.attribute = params, this.valid = this.isValid(), this.updateAABBBoundsStamp = 0, params.background ? this.loadImage(null !== (_a = params.background.background) && void 0 !== _a ? _a : params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
   }
   getGraphicService() {
     var _a, _b;
@@ -16311,7 +16310,7 @@ class Graphic extends Node {
     });
   }
   setAttributes(params, forceUpdateTag = !1, context) {
-    params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background && this.loadImage(params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
+    params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
   }
   _setAttributes(params, forceUpdateTag = !1, context) {
     const keys = Object.keys(params);
@@ -16326,7 +16325,7 @@ class Graphic extends Node {
     const params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate({
       [key]: value
     }, this.attribute, key, context);
-    params ? this._setAttributes(params, forceUpdateTag, context) : isNil$1(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key ? this.loadImage(value, !0) : "texture" === key && isExternalTexture(value) ? this.loadImage(value, !1) : "shadowGraphic" === key && this.setShadowGraphic(value);
+    params ? this._setAttributes(params, forceUpdateTag, context) : isNil$1(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key ? this.loadImage(value, !0) : "shadowGraphic" === key && this.setShadowGraphic(value);
   }
   needUpdateTags(keys, k = GRAPHIC_UPDATE_TAG_KEY) {
     for (let i = 0; i < k.length; i++) {
@@ -16345,7 +16344,7 @@ class Graphic extends Node {
     const context = {
       type: AttributeUpdateType.INIT
     };
-    params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background && this.loadImage(params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._updateTag = UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
+    params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._updateTag = UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
   }
   translate(x, y) {
     var _a, _b;
@@ -16736,9 +16735,6 @@ class Graphic extends Node {
 function backgroundNotImage(image) {
   return "string" == typeof image ? !(image.startsWith("<svg") || isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) : !(!image.fill && !image.stroke) || !("string" != typeof image.gradient || !Array.isArray(image.stops));
 }
-function isExternalTexture(texture) {
-  return !!texture && ("string" == typeof texture ? !builtinTextureTypes.has(texture) && (texture.startsWith("<svg") || isValidUrl$1(texture) || texture.includes("/") || isBase64$1(texture)) : isObject$2(texture));
-}
 Graphic.userSymbolMap = {}, Graphic.mixin(EventTarget);
 
 var GroupUpdateAABBBoundsMode;
@@ -20390,7 +20386,6 @@ class DefaultBaseClipRenderAfterContribution {
 }
 const defaultBaseClipRenderAfterContribution = new DefaultBaseClipRenderAfterContribution();
 
-const builtinProceduralTextureTypes = new Set(["circle", "diamond", "rect", "vertical-line", "horizontal-line", "bias-lr", "bias-rl", "grid"]);
 function formatRatio(ratio) {
   return ratio <= .5 ? 4 * ratio - 1 : -4 * ratio + 3;
 }
@@ -20504,43 +20499,38 @@ class DefaultBaseTextureRenderContribution {
     texture && this.drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding);
   }
   drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a;
     const {
       textureRatio = graphicAttribute.textureRatio,
       textureOptions = null
     } = graphic.attribute;
-    let pattern = null;
-    const textureRadius = null !== (_a = null == textureOptions ? void 0 : textureOptions.radius) && void 0 !== _a ? _a : 0,
-      patternKey = this.getPatternCacheKey(texture, textureSize, texturePadding, textureColor, context.dpr, textureRadius);
-    if (null !== patternKey && (pattern = this.textureMap.get(patternKey)), !pattern) {
-      if ("string" == typeof texture) switch (texture) {
-        case "circle":
-          pattern = this.createCirclePattern(textureSize, texturePadding, textureColor, context);
-          break;
-        case "diamond":
-          pattern = this.createDiamondPattern(textureSize, texturePadding, textureColor, context);
-          break;
-        case "rect":
-          pattern = this.createRectPattern(textureSize, texturePadding, textureColor, context);
-          break;
-        case "vertical-line":
-          pattern = this.createVerticalLinePattern(textureSize, texturePadding, textureColor, context);
-          break;
-        case "horizontal-line":
-          pattern = this.createHorizontalLinePattern(textureSize, texturePadding, textureColor, context);
-          break;
-        case "bias-lr":
-          pattern = this.createBiasLRLinePattern(textureSize, texturePadding, textureColor, context);
-          break;
-        case "bias-rl":
-          pattern = this.createBiasRLLinePattern(textureSize, texturePadding, textureColor, context);
-          break;
-        case "grid":
-          pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
-      }
-      pattern || (pattern = this.createResourcePattern(texture, graphic, context, texturePadding, textureRadius)), pattern && null !== patternKey && this.textureMap.set(patternKey, pattern);
+    let pattern = this.textureMap.get(texture);
+    if (!pattern) switch (texture) {
+      case "circle":
+        pattern = this.createCirclePattern(textureSize, texturePadding, textureColor, context);
+        break;
+      case "diamond":
+        pattern = this.createDiamondPattern(textureSize, texturePadding, textureColor, context);
+        break;
+      case "rect":
+        pattern = this.createRectPattern(textureSize, texturePadding, textureColor, context);
+        break;
+      case "vertical-line":
+        pattern = this.createVerticalLinePattern(textureSize, texturePadding, textureColor, context);
+        break;
+      case "horizontal-line":
+        pattern = this.createHorizontalLinePattern(textureSize, texturePadding, textureColor, context);
+        break;
+      case "bias-lr":
+        pattern = this.createBiasLRLinePattern(textureSize, texturePadding, textureColor, context);
+        break;
+      case "bias-rl":
+        pattern = this.createBiasRLLinePattern(textureSize, texturePadding, textureColor, context);
+        break;
+      case "grid":
+        pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
     }
-    if ("string" == typeof texture && textureOptions && textureOptions.dynamicTexture) {
+    if (textureOptions && textureOptions.dynamicTexture) {
       const {
           gridConfig = {},
           useNewCanvas: useNewCanvas
@@ -20585,24 +20575,10 @@ class DefaultBaseTextureRenderContribution {
       for (let i = 0; i < gridRows; i++) for (let j = 0; j < gridColumns; j++) {
         const _x = x + cellSize / 2 + j * cellSize,
           _y = y + cellSize / 2 + i * cellSize;
-        null === (_b = textureOptions.beforeDynamicTexture) || void 0 === _b || _b.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
+        null === (_a = textureOptions.beforeDynamicTexture) || void 0 === _a || _a.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
       }
       useNewCanvas && (originalContext.globalAlpha = 1, originalContext.drawImage(newCanvas.nativeCanvas, 0, 0, newCanvas.nativeCanvas.width, newCanvas.nativeCanvas.height, b.x1, b.y1, b.width() * originalContext.dpr, b.height() * originalContext.dpr)), originalContext.restore();
-    } else if (pattern) {
-      if (pattern.setTransform) {
-        const alignToGraphic = !!(null == textureOptions ? void 0 : textureOptions.alignToGraphic),
-          alignOffsetX = null !== (_c = null == textureOptions ? void 0 : textureOptions.alignOffsetX) && void 0 !== _c ? _c : 0,
-          alignOffsetY = null !== (_d = null == textureOptions ? void 0 : textureOptions.alignOffsetY) && void 0 !== _d ? _d : 0;
-        let translateX = 0,
-          translateY = 0;
-        if (alignToGraphic) {
-          const m = context.currentMatrix;
-          translateX = (null !== (_e = null == m ? void 0 : m.e) && void 0 !== _e ? _e : 0) + x + alignOffsetX, translateY = (null !== (_f = null == m ? void 0 : m.f) && void 0 !== _f ? _f : 0) + y + alignOffsetY;
-        } else (alignOffsetX || alignOffsetY) && (translateX = alignOffsetX, translateY = alignOffsetY);
-        pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, translateX, translateY]));
-      }
-      context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();
-    } else if ("wave" === texture) {
+    } else if (pattern) context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();else if ("wave" === texture) {
       context.save(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.clip();
       const b = graphic.AABBBounds;
       drawWave(context, textureRatio, b.width(), b.height(), Object.assign(Object.assign({}, textureOptions || {}), {
@@ -20610,45 +20586,6 @@ class DefaultBaseTextureRenderContribution {
       }), x + b.x1 - x, y + b.y1 - y), context.restore();
     }
   }
-  getPatternCacheKey(texture, textureSize, texturePadding, textureColor, dpr, textureRadius) {
-    return "string" != typeof texture ? texturePadding > 0 || textureRadius > 0 ? null : texture : "wave" === texture ? null : builtinProceduralTextureTypes.has(texture) ? `builtin:${texture}|size:${textureSize}|padding:${texturePadding}|color:${textureColor}|dpr:${dpr}` : `resource:${texture}|padding:${texturePadding}|radius:${textureRadius}|dpr:${dpr}`;
-  }
-  createResourcePattern(texture, graphic, context, texturePadding, textureRadius) {
-    var _a;
-    const resource = null === (_a = graphic.resources) || void 0 === _a ? void 0 : _a.get(texture),
-      data = "success" === (null == resource ? void 0 : resource.state) ? resource.data : "object" == typeof texture ? texture : null;
-    if (!data) return null;
-    if (texturePadding > 0 || textureRadius > 0) {
-      const w = data.naturalWidth || data.width,
-        h = data.naturalHeight || data.height;
-      if (w > 0 && h > 0) {
-        const tileW = w + 2 * texturePadding,
-          tileH = h + 2 * texturePadding,
-          canvas = canvasAllocate.allocate({
-            width: tileW,
-            height: tileH,
-            dpr: context.dpr
-          }),
-          ctx = canvas.getContext("2d");
-        if (ctx) {
-          if (ctx.inuse = !0, ctx.clearMatrix(), ctx.setTransformForCurrent(!0), ctx.clearRect(0, 0, tileW, tileH), textureRadius > 0) {
-            const r = Math.max(0, Math.min(textureRadius, Math.min(w, h) / 2)),
-              x0 = texturePadding,
-              y0 = texturePadding,
-              x1 = x0 + w,
-              y1 = y0 + h;
-            ctx.beginPath(), ctx.moveTo(x0 + r, y0), ctx.lineTo(x1 - r, y0), ctx.quadraticCurveTo(x1, y0, x1, y0 + r), ctx.lineTo(x1, y1 - r), ctx.quadraticCurveTo(x1, y1, x1 - r, y1), ctx.lineTo(x0 + r, y1), ctx.quadraticCurveTo(x0, y1, x0, y1 - r), ctx.lineTo(x0, y0 + r), ctx.quadraticCurveTo(x0, y0, x0 + r, y0), ctx.closePath(), ctx.clip();
-          }
-          ctx.drawImage(data, texturePadding, texturePadding, w, h);
-          const pattern = context.createPattern(canvas.nativeCanvas, "repeat");
-          return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), canvasAllocate.free(canvas), pattern;
-        }
-        canvasAllocate.free(canvas);
-      }
-    }
-    const pattern = context.createPattern(data, "repeat");
-    return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), pattern;
-  }
 }
 const defaultBaseTextureRenderContribution = new DefaultBaseTextureRenderContribution();
 
@@ -62239,7 +62176,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.21";
+const version = "2.0.22";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -66150,7 +66087,9 @@ function getDatumByValue(data, value, startField, endField) {
         if (record) {
             const startValue = record[startField];
             const endValue = record[endField || startField];
-            if (startValue <= value && endValue >= value) {
+            const min = Math.min(startValue, endValue);
+            const max = Math.max(startValue, endValue);
+            if (min <= value && max >= value) {
                 return record;
             }
         }
@@ -71921,15 +71860,17 @@ const layoutByValue$1 = (stateByField, series, layoutStartPoint, enableRemain =
                     const field2 = field === 'xField' ? series.fieldX2 : series.fieldY2;
                     const datum = getDatumByValue(series.getViewData().latestData, +value, field1, field2);
                     if (datum) {
-                        const startX = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
+                        const posStart = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
                         if (field2) {
-                            bandSize = Math.abs(startX - (field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum)));
+                            const posEnd = field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum);
+                            bandSize = Math.abs(posStart - posEnd);
+                            coord = Math.min(posStart, posEnd);
                             value = `${datum[field1]} ~ ${datum[field2]}`;
                         }
                         else {
                             bandSize = 1;
+                            coord = posStart;
                         }
-                        coord = startX;
                     }
                     niceLabelFormatter = axis.niceLabelFormatter;
                 }

package/build/index.js

@@ -16071,7 +16071,6 @@
     const tempConstantXYKey = ["x", "y"],
       tempConstantScaleXYKey = ["scaleX", "scaleY"],
       tempConstantAngleKey = ["angle"],
-      builtinTextureTypes = new Set(["circle", "diamond", "rect", "vertical-line", "horizontal-line", "bias-lr", "bias-rl", "grid", "wave"]),
       point = new Point();
     const NOWORK_ANIMATE_ATTR = {
       strokeSeg: 1,
@@ -16128,7 +16127,7 @@
       }
       constructor(params = {}) {
         var _a;
-        super(), this._AABBBounds = new AABBBounds(), this._updateTag = UpdateTag.INIT, this.attribute = params, this.valid = this.isValid(), this.updateAABBBoundsStamp = 0, params.background && this.loadImage(null !== (_a = params.background.background) && void 0 !== _a ? _a : params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
+        super(), this._AABBBounds = new AABBBounds(), this._updateTag = UpdateTag.INIT, this.attribute = params, this.valid = this.isValid(), this.updateAABBBoundsStamp = 0, params.background ? this.loadImage(null !== (_a = params.background.background) && void 0 !== _a ? _a : params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
       }
       getGraphicService() {
         var _a, _b;
@@ -16317,7 +16316,7 @@
         });
       }
       setAttributes(params, forceUpdateTag = !1, context) {
-        params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background && this.loadImage(params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
+        params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
       }
       _setAttributes(params, forceUpdateTag = !1, context) {
         const keys = Object.keys(params);
@@ -16332,7 +16331,7 @@
         const params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate({
           [key]: value
         }, this.attribute, key, context);
-        params ? this._setAttributes(params, forceUpdateTag, context) : isNil$1(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key ? this.loadImage(value, !0) : "texture" === key && isExternalTexture(value) ? this.loadImage(value, !1) : "shadowGraphic" === key && this.setShadowGraphic(value);
+        params ? this._setAttributes(params, forceUpdateTag, context) : isNil$1(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key ? this.loadImage(value, !0) : "shadowGraphic" === key && this.setShadowGraphic(value);
       }
       needUpdateTags(keys, k = GRAPHIC_UPDATE_TAG_KEY) {
         for (let i = 0; i < k.length; i++) {
@@ -16351,7 +16350,7 @@
         const context = {
           type: AttributeUpdateType.INIT
         };
-        params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background && this.loadImage(params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._updateTag = UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
+        params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._updateTag = UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
       }
       translate(x, y) {
         var _a, _b;
@@ -16742,9 +16741,6 @@
     function backgroundNotImage(image) {
       return "string" == typeof image ? !(image.startsWith("<svg") || isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) : !(!image.fill && !image.stroke) || !("string" != typeof image.gradient || !Array.isArray(image.stops));
     }
-    function isExternalTexture(texture) {
-      return !!texture && ("string" == typeof texture ? !builtinTextureTypes.has(texture) && (texture.startsWith("<svg") || isValidUrl$1(texture) || texture.includes("/") || isBase64$1(texture)) : isObject$2(texture));
-    }
     Graphic.userSymbolMap = {}, Graphic.mixin(EventTarget);
 
     var GroupUpdateAABBBoundsMode;
@@ -20396,7 +20392,6 @@
     }
     const defaultBaseClipRenderAfterContribution = new DefaultBaseClipRenderAfterContribution();
 
-    const builtinProceduralTextureTypes = new Set(["circle", "diamond", "rect", "vertical-line", "horizontal-line", "bias-lr", "bias-rl", "grid"]);
     function formatRatio(ratio) {
       return ratio <= .5 ? 4 * ratio - 1 : -4 * ratio + 3;
     }
@@ -20510,43 +20505,38 @@
         texture && this.drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding);
       }
       drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a;
         const {
           textureRatio = graphicAttribute.textureRatio,
           textureOptions = null
         } = graphic.attribute;
-        let pattern = null;
-        const textureRadius = null !== (_a = null == textureOptions ? void 0 : textureOptions.radius) && void 0 !== _a ? _a : 0,
-          patternKey = this.getPatternCacheKey(texture, textureSize, texturePadding, textureColor, context.dpr, textureRadius);
-        if (null !== patternKey && (pattern = this.textureMap.get(patternKey)), !pattern) {
-          if ("string" == typeof texture) switch (texture) {
-            case "circle":
-              pattern = this.createCirclePattern(textureSize, texturePadding, textureColor, context);
-              break;
-            case "diamond":
-              pattern = this.createDiamondPattern(textureSize, texturePadding, textureColor, context);
-              break;
-            case "rect":
-              pattern = this.createRectPattern(textureSize, texturePadding, textureColor, context);
-              break;
-            case "vertical-line":
-              pattern = this.createVerticalLinePattern(textureSize, texturePadding, textureColor, context);
-              break;
-            case "horizontal-line":
-              pattern = this.createHorizontalLinePattern(textureSize, texturePadding, textureColor, context);
-              break;
-            case "bias-lr":
-              pattern = this.createBiasLRLinePattern(textureSize, texturePadding, textureColor, context);
-              break;
-            case "bias-rl":
-              pattern = this.createBiasRLLinePattern(textureSize, texturePadding, textureColor, context);
-              break;
-            case "grid":
-              pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
-          }
-          pattern || (pattern = this.createResourcePattern(texture, graphic, context, texturePadding, textureRadius)), pattern && null !== patternKey && this.textureMap.set(patternKey, pattern);
+        let pattern = this.textureMap.get(texture);
+        if (!pattern) switch (texture) {
+          case "circle":
+            pattern = this.createCirclePattern(textureSize, texturePadding, textureColor, context);
+            break;
+          case "diamond":
+            pattern = this.createDiamondPattern(textureSize, texturePadding, textureColor, context);
+            break;
+          case "rect":
+            pattern = this.createRectPattern(textureSize, texturePadding, textureColor, context);
+            break;
+          case "vertical-line":
+            pattern = this.createVerticalLinePattern(textureSize, texturePadding, textureColor, context);
+            break;
+          case "horizontal-line":
+            pattern = this.createHorizontalLinePattern(textureSize, texturePadding, textureColor, context);
+            break;
+          case "bias-lr":
+            pattern = this.createBiasLRLinePattern(textureSize, texturePadding, textureColor, context);
+            break;
+          case "bias-rl":
+            pattern = this.createBiasRLLinePattern(textureSize, texturePadding, textureColor, context);
+            break;
+          case "grid":
+            pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
         }
-        if ("string" == typeof texture && textureOptions && textureOptions.dynamicTexture) {
+        if (textureOptions && textureOptions.dynamicTexture) {
           const {
               gridConfig = {},
               useNewCanvas: useNewCanvas
@@ -20591,24 +20581,10 @@
           for (let i = 0; i < gridRows; i++) for (let j = 0; j < gridColumns; j++) {
             const _x = x + cellSize / 2 + j * cellSize,
               _y = y + cellSize / 2 + i * cellSize;
-            null === (_b = textureOptions.beforeDynamicTexture) || void 0 === _b || _b.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
+            null === (_a = textureOptions.beforeDynamicTexture) || void 0 === _a || _a.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
           }
           useNewCanvas && (originalContext.globalAlpha = 1, originalContext.drawImage(newCanvas.nativeCanvas, 0, 0, newCanvas.nativeCanvas.width, newCanvas.nativeCanvas.height, b.x1, b.y1, b.width() * originalContext.dpr, b.height() * originalContext.dpr)), originalContext.restore();
-        } else if (pattern) {
-          if (pattern.setTransform) {
-            const alignToGraphic = !!(null == textureOptions ? void 0 : textureOptions.alignToGraphic),
-              alignOffsetX = null !== (_c = null == textureOptions ? void 0 : textureOptions.alignOffsetX) && void 0 !== _c ? _c : 0,
-              alignOffsetY = null !== (_d = null == textureOptions ? void 0 : textureOptions.alignOffsetY) && void 0 !== _d ? _d : 0;
-            let translateX = 0,
-              translateY = 0;
-            if (alignToGraphic) {
-              const m = context.currentMatrix;
-              translateX = (null !== (_e = null == m ? void 0 : m.e) && void 0 !== _e ? _e : 0) + x + alignOffsetX, translateY = (null !== (_f = null == m ? void 0 : m.f) && void 0 !== _f ? _f : 0) + y + alignOffsetY;
-            } else (alignOffsetX || alignOffsetY) && (translateX = alignOffsetX, translateY = alignOffsetY);
-            pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, translateX, translateY]));
-          }
-          context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();
-        } else if ("wave" === texture) {
+        } else if (pattern) context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();else if ("wave" === texture) {
           context.save(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.clip();
           const b = graphic.AABBBounds;
           drawWave(context, textureRatio, b.width(), b.height(), Object.assign(Object.assign({}, textureOptions || {}), {
@@ -20616,45 +20592,6 @@
           }), x + b.x1 - x, y + b.y1 - y), context.restore();
         }
       }
-      getPatternCacheKey(texture, textureSize, texturePadding, textureColor, dpr, textureRadius) {
-        return "string" != typeof texture ? texturePadding > 0 || textureRadius > 0 ? null : texture : "wave" === texture ? null : builtinProceduralTextureTypes.has(texture) ? `builtin:${texture}|size:${textureSize}|padding:${texturePadding}|color:${textureColor}|dpr:${dpr}` : `resource:${texture}|padding:${texturePadding}|radius:${textureRadius}|dpr:${dpr}`;
-      }
-      createResourcePattern(texture, graphic, context, texturePadding, textureRadius) {
-        var _a;
-        const resource = null === (_a = graphic.resources) || void 0 === _a ? void 0 : _a.get(texture),
-          data = "success" === (null == resource ? void 0 : resource.state) ? resource.data : "object" == typeof texture ? texture : null;
-        if (!data) return null;
-        if (texturePadding > 0 || textureRadius > 0) {
-          const w = data.naturalWidth || data.width,
-            h = data.naturalHeight || data.height;
-          if (w > 0 && h > 0) {
-            const tileW = w + 2 * texturePadding,
-              tileH = h + 2 * texturePadding,
-              canvas = canvasAllocate.allocate({
-                width: tileW,
-                height: tileH,
-                dpr: context.dpr
-              }),
-              ctx = canvas.getContext("2d");
-            if (ctx) {
-              if (ctx.inuse = !0, ctx.clearMatrix(), ctx.setTransformForCurrent(!0), ctx.clearRect(0, 0, tileW, tileH), textureRadius > 0) {
-                const r = Math.max(0, Math.min(textureRadius, Math.min(w, h) / 2)),
-                  x0 = texturePadding,
-                  y0 = texturePadding,
-                  x1 = x0 + w,
-                  y1 = y0 + h;
-                ctx.beginPath(), ctx.moveTo(x0 + r, y0), ctx.lineTo(x1 - r, y0), ctx.quadraticCurveTo(x1, y0, x1, y0 + r), ctx.lineTo(x1, y1 - r), ctx.quadraticCurveTo(x1, y1, x1 - r, y1), ctx.lineTo(x0 + r, y1), ctx.quadraticCurveTo(x0, y1, x0, y1 - r), ctx.lineTo(x0, y0 + r), ctx.quadraticCurveTo(x0, y0, x0 + r, y0), ctx.closePath(), ctx.clip();
-              }
-              ctx.drawImage(data, texturePadding, texturePadding, w, h);
-              const pattern = context.createPattern(canvas.nativeCanvas, "repeat");
-              return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), canvasAllocate.free(canvas), pattern;
-            }
-            canvasAllocate.free(canvas);
-          }
-        }
-        const pattern = context.createPattern(data, "repeat");
-        return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), pattern;
-      }
     }
     const defaultBaseTextureRenderContribution = new DefaultBaseTextureRenderContribution();
 
@@ -62245,7 +62182,7 @@
         });
     };
 
-    const version = "2.0.21";
+    const version = "2.0.22";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -66156,7 +66093,9 @@
             if (record) {
                 const startValue = record[startField];
                 const endValue = record[endField || startField];
-                if (startValue <= value && endValue >= value) {
+                const min = Math.min(startValue, endValue);
+                const max = Math.max(startValue, endValue);
+                if (min <= value && max >= value) {
                     return record;
                 }
             }
@@ -71927,15 +71866,17 @@
                         const field2 = field === 'xField' ? series.fieldX2 : series.fieldY2;
                         const datum = getDatumByValue(series.getViewData().latestData, +value, field1, field2);
                         if (datum) {
-                            const startX = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
+                            const posStart = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
                             if (field2) {
-                                bandSize = Math.abs(startX - (field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum)));
+                                const posEnd = field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum);
+                                bandSize = Math.abs(posStart - posEnd);
+                                coord = Math.min(posStart, posEnd);
                                 value = `${datum[field1]} ~ ${datum[field2]}`;
                             }
                             else {
                                 bandSize = 1;
+                                coord = posStart;
                             }
-                            coord = startX;
                         }
                         niceLabelFormatter = axis.niceLabelFormatter;
                     }