@visactor/vchart 1.8.5 → 1.8.6

package/build/index.js

@@ -8659,6 +8659,7 @@
       textureSize: 10,
       texturePadding: 2,
       backgroundMode: "no-repeat",
+      backgroundFit: !0,
       blur: 0,
       cursor: null,
       html: null
@@ -14930,11 +14931,11 @@
       get cliped() {
         const textTheme = getTheme$1(this).text,
           attribute = this.attribute;
-        if (!this.isSimplify()) return;
+        if (this.isMultiLine) return;
         const {
           maxLineWidth = textTheme.maxLineWidth
         } = attribute;
-        return !!Number.isFinite(maxLineWidth) && (this.tryUpdateAABBBounds(), null != this.clipedText && this.clipedText !== attribute.text.toString());
+        return !!Number.isFinite(maxLineWidth) && (this.tryUpdateAABBBounds(), "vertical" === attribute.direction && this.cache.verticalList && this.cache.verticalList[0] ? this.cache.verticalList[0].map(item => item.text).join("") !== attribute.text.toString() : null != this.clipedText && this.clipedText !== attribute.text.toString());
       }
       get multilineLayout() {
         if (this.isMultiLine) return this.tryUpdateAABBBounds(), this.cache.layoutData;
@@ -18540,7 +18541,8 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (background) if (graphic.backgroundImg && graphic.resources) {
           const res = graphic.resources.get(background);
@@ -18555,13 +18557,33 @@
           }
           context.clip();
           const b = graphic.AABBBounds;
-          context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), this.doDrawImage(context, res.data, b, backgroundMode), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
+          context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = background, context.fill(), context.highPerformanceRestore();
       }
-      doDrawImage(context, data, b, backgroundMode) {
+      doDrawImage(context, data, b, backgroundMode, backgroundFit) {
         if ("no-repeat" === backgroundMode) context.drawImage(data, b.x1, b.y1, b.width(), b.height());else {
+          const targetW = b.width(),
+            targetH = b.height();
+          let w = targetW,
+            h = targetH;
+          if (backgroundFit && "repeat" !== backgroundMode && (data.width || data.height)) {
+            const resW = data.width,
+              resH = data.height;
+            if ("repeat-x" === backgroundMode) {
+              w = resW * (targetH / resH);
+            } else if ("repeat-y" === backgroundMode) {
+              h = resH * (targetW / resW);
+            }
+            const canvas = canvasAllocate.allocate({
+                width: w,
+                height: h,
+                dpr: context.dpr
+              }),
+              ctx = canvas.getContext("2d");
+            ctx && (ctx.inuse = !0, ctx.clearMatrix(), ctx.setTransformForCurrent(!0), ctx.clearRect(0, 0, w, h), ctx.drawImage(data, 0, 0, w, h), data = canvas.nativeCanvas), document.body.appendChild(data), canvasAllocate.free(canvas);
+          }
           const pattern = context.createPattern(data, backgroundMode);
-          context.fillStyle = pattern, context.translate(b.x1, b.y1), context.fillRect(0, 0, b.width(), b.height()), context.translate(-b.x1, -b.y1);
+          context.fillStyle = pattern, context.translate(b.x1, b.y1), context.fillRect(0, 0, targetW, targetH), context.translate(-b.x1, -b.y1);
         }
       }
     }
@@ -18821,14 +18843,15 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (background) if (graphic.backgroundImg && graphic.resources) {
           const res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
           context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0);
           const b = graphic.AABBBounds;
-          this.doDrawImage(context, res.data, b, backgroundMode), context.highPerformanceRestore(), context.setTransformForCurrent();
+          this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.highPerformanceRestore(), context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.fillStyle = background, context.fill(), context.highPerformanceRestore();
       }
     }
@@ -18897,7 +18920,8 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (background) if (graphic.backgroundImg) {
           const res = graphic.resources.get(background);
@@ -18911,7 +18935,7 @@
             context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), context.translate(scrollX, scrollY);
           }
           const b = graphic.AABBBounds;
-          this.doDrawImage(context, res.data, b, backgroundMode), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
+          this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
         } else if (isObject$2(background)) {
           const {
             stroke: stroke,
@@ -20212,14 +20236,15 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (!background) return;
         const b = graphic.AABBBounds;
         if (graphic.backgroundImg && graphic.resources) {
           const res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
-          context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), this.doDrawImage(context, res.data, b, backgroundMode), context.highPerformanceRestore(), context.setTransformForCurrent();
+          context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.highPerformanceRestore(), context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.fillStyle = background, context.fillRect(b.x1, b.y1, b.width(), b.height()), context.highPerformanceRestore();
       }
     }
@@ -22118,10 +22143,10 @@
         let left = 0,
           top = 0;
         if ("position" === anchorType) {
-          const matrix = graphic.transMatrix;
+          const matrix = graphic.globalTransMatrix;
           left = matrix.e, top = matrix.f;
         } else {
-          const b = graphic.AABBBounds;
+          const b = graphic.globalAABBBounds;
           left = b.x1, top = b.y1;
         }
         const containerTL = application.global.getElementTopLeft(nativeContainer, !1),
@@ -34498,11 +34523,28 @@
       }
       getGraphicBounds(graphic) {
         let point = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        return (null == graphic ? void 0 : graphic.AABBBounds) || {
-          x1: point.x,
-          x2: point.x,
-          y1: point.y,
-          y2: point.y
+        if (graphic) {
+          if (!1 !== graphic.attribute.visible) return graphic.AABBBounds;
+          const {
+            x: x,
+            y: y
+          } = graphic.attribute;
+          return {
+            x1: x,
+            x2: x,
+            y1: y,
+            y2: y
+          };
+        }
+        const {
+          x: x,
+          y: y
+        } = point;
+        return {
+          x1: x,
+          x2: x,
+          y1: y,
+          y2: y
         };
       }
       _renderLabels(labels) {
@@ -47693,9 +47735,10 @@
       return [];
     };
 
+    const HIDE_KEY = "_mo_hide_";
     function reset(elements) {
       return elements.forEach(element => {
-        element.setGraphicAttribute("visible", !0);
+        element.getGraphicAttribute("HIDE_KEY") && (element.setGraphicAttribute("visible", !0), element.setGraphicAttribute(HIDE_KEY, !1));
       }), elements;
     }
     function overlapX(elements, delta, deltaMul, useRadius) {
@@ -47705,9 +47748,10 @@
         const useDeltaMul = isNil$1(delta);
         let itemDelta = delta;
         elements.forEach(element => {
+          if (!1 === element.getGraphicAttribute("visible")) return;
           const r = element.getGraphicAttribute("size") / 2,
             currentX = element.getGraphicAttribute("x");
-          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastX = currentX, lastR = r;
+          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastX = currentX, lastR = r;
         });
       }
     }
@@ -47718,9 +47762,10 @@
         const useDeltaMul = isNil$1(delta);
         let itemDelta = delta;
         elements.forEach(element => {
+          if (!1 === element.getGraphicAttribute("visible")) return;
           const r = element.getGraphicAttribute("size") / 2,
             currentY = element.getGraphicAttribute("y");
-          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastY = currentY, lastR = r;
+          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         });
       }
     }
@@ -47733,10 +47778,11 @@
         const useDeltaMul = isNil$1(delta);
         let itemDelta = delta;
         elements.forEach(element => {
+          if (!1 === element.getGraphicAttribute("visible")) return;
           const r = element.getGraphicAttribute("size") / 2,
             currentX = element.getGraphicAttribute("x"),
             currentY = element.getGraphicAttribute("y");
-          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2, dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastY = currentY, lastR = r;
+          useDeltaMul && (itemDelta = (r + lastR) * deltaMul), dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2, dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         });
       }
     }
@@ -48346,7 +48392,7 @@
         };
       return points.forEach(point => {
         center.x += point.x, center.y += point.y;
-      }), center.x /= points.length, center.y /= points.length, options && options.center && (isValidNumber$1(options.center.x) && (center.x = options.center.x), isValidNumber$1(options.center.y) && (center.y = options.center.y)), points.map(() => Object.assign(center));
+      }), center.x /= points.length, center.y /= points.length, options && options.center && (isValidNumber$1(options.center.x) && (center.x = options.center.x), isValidNumber$1(options.center.y) && (center.y = options.center.y)), "area" === element.mark.markType && (center.x1 = center.x, center.y1 = center.y), points.map(() => Object.assign(center));
     };
     const growPointsIn = (element, options, animationParameters) => ({
       from: {
@@ -57849,7 +57895,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerChartPlugin(MediaQuery);
     };
 
-    const version = "1.8.5";
+    const version = "1.8.6";
 
     var ChartTypeEnum;
     (function (ChartTypeEnum) {
@@ -63223,7 +63269,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     (_a = this._option) === null || _a === void 0 ? void 0 : _a.onError(`${key}Field is required.`);
                     return spec;
                 }
-                if (spec.length > 2) {
+                if (defaultScaleType !== 'ordinal' && spec.length > 2) {
                     (_b = this._option) === null || _b === void 0 ? void 0 : _b.onError(`${key} length is invalid, specify up to 2 ${key}s.`);
                     return spec;
                 }
@@ -72483,7 +72529,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 themeSpec: (_a = this._theme) === null || _a === void 0 ? void 0 : _a.funnel,
                 morph: shouldMarkDoMorph(this._spec, this._funnelMarkName),
                 defaultMorphElementKey: this._seriesField,
-                key: this._seriesField,
                 groupKey: this._seriesField,
                 isSeriesMark: true,
                 customShape: (_b = this._spec.funnel) === null || _b === void 0 ? void 0 : _b.customShape
@@ -72491,7 +72536,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (this._spec.isTransform) {
                 this._funnelTransformMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.transform), { name: this._transformMarkName, type: this._transformMarkType }), {
                     themeSpec: (_c = this._theme) === null || _c === void 0 ? void 0 : _c.transform,
-                    key: this._seriesField,
                     skipBeforeLayouted: false,
                     dataView: this._viewDataTransform.getDataView(),
                     dataProductId: this._viewDataTransform.getProductId(),
@@ -72503,13 +72547,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const { line: lineTheme } = (_j = (_h = this._theme) === null || _h === void 0 ? void 0 : _h.outerLabel) !== null && _j !== void 0 ? _j : {};
                 this._funnelOuterLabelMark.label = this._createMark(FunnelSeries.mark.outerLabel, {
                     themeSpec: (_k = this._theme) === null || _k === void 0 ? void 0 : _k.outerLabel,
-                    key: this._seriesField,
                     markSpec: this._spec.outerLabel,
                     skipBeforeLayouted: true
                 });
                 this._funnelOuterLabelMark.line = this._createMark(FunnelSeries.mark.outerLabelLine, {
                     themeSpec: lineTheme,
-                    key: this._seriesField,
                     markSpec: line,
                     depend: [this._funnelOuterLabelMark.label]
                 });
@@ -72715,7 +72757,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         _getMainAxisLength(isTransform = false) {
             var _a;
-            const funnelCount = this.getViewDataStatistics().latestData[this.getCategoryField()].values.length;
+            const funnelCount = this.getViewData().latestData.length;
             const viewHeight = this._isHorizontal() ? this.getLayoutRect().width : this.getLayoutRect().height;
             const hasTransform = !!this._spec.isTransform;
             const gap = hasTransform ? 0 : (_a = this._spec.gap) !== null && _a !== void 0 ? _a : 0;
@@ -72734,7 +72776,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         _getPositionByData(datum) {
             var _a;
-            const index = (_a = this.getViewData().latestData) === null || _a === void 0 ? void 0 : _a.findIndex((d) => d[this._seriesField] === datum[this._seriesField]);
+            const index = (_a = this.getViewData().latestData) === null || _a === void 0 ? void 0 : _a.findIndex((d) => d[this._categoryField] === datum[this._categoryField] && d[DEFAULT_DATA_KEY] === datum[DEFAULT_DATA_KEY]);
             if (!isValid$1(index) || index < 0) {
                 return {};
             }