@visactor/vrender-components 0.16.9-alpha.1 → 0.16.9

package/dist/index.js

@@ -7658,9 +7658,7 @@
         var data = ResourceLoader.cache.get(url);
         data ? "fail" === data.loadState ? application.global.getRequestAnimationFrame()(function () {
           mark.imageLoadFail(url);
-        }) : "init" === data.loadState || "loading" === data.loadState ? null === (_a = data.waitingMark) || void 0 === _a || _a.push(mark) : mark && application.global.getRequestAnimationFrame()(function () {
-          mark.imageLoadSuccess(url, data.data);
-        }) : (data = {
+        }) : "init" === data.loadState || "loading" === data.loadState ? null === (_a = data.waitingMark) || void 0 === _a || _a.push(mark) : mark && mark.imageLoadSuccess(url, data.data) : (data = {
           type: "image",
           loadState: "init"
         }, ResourceLoader.cache.set(url, data), data.dataPromise = application.global.loadImage(url), data.dataPromise ? (data.waitingMark = [mark], data.dataPromise.then(function (res) {
@@ -8492,7 +8490,7 @@
           data: "init",
           state: null
         };
-        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", vutils.isValidUrl(image) || vutils.isBase64(image) ? (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background) : image.startsWith("<svg") && (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
+        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", image.startsWith("<svg") ? (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background) : (vutils.isValidUrl(image) || image.includes("/") || vutils.isBase64(image)) && (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
       }
     }, {
       key: "imageLoadSuccess",
@@ -17831,6 +17829,7 @@
     }, {
       key: "clearScreen",
       value: function clearScreen(renderService, context, drawContext) {
+        var _a;
         var clear = drawContext.clear;
         if (clear) {
           var canvas = context.getCanvas(),
@@ -17840,7 +17839,12 @@
             height = _drawContext$height === void 0 ? canvas.height : _drawContext$height,
             x = 0,
             y = 0;
-          context.clearRect(x, y, width, height), context.fillStyle = createColor(context, clear, {
+          context.clearRect(x, y, width, height);
+          var stage = null === (_a = renderService.drawParams) || void 0 === _a ? void 0 : _a.stage;
+          if (stage && stage.backgroundImg && stage.resources) {
+            var res = stage.resources.get(clear);
+            res && "success" === res.state && res.data && context.drawImage(res.data, x, y, width, height);
+          } else context.fillStyle = createColor(context, clear, {
             AABBBounds: {
               x1: x,
               y1: y,
@@ -20037,7 +20041,10 @@
           });
       }
       setAttribute(key, value, forceUpdateTag) {
-          if (vutils.isPlainObject(this.attribute[key]) && !vutils.isFunction(this.attribute[key]) && !vutils.isFunction(value)) {
+          if (vutils.isPlainObject(this.attribute[key]) &&
+              vutils.isPlainObject(value) &&
+              !vutils.isFunction(this.attribute[key]) &&
+              !vutils.isFunction(value)) {
               vutils.merge(this.attribute[key], value);
           }
           else {
@@ -22679,6 +22686,21 @@
               case 'inside-right':
                   sx = 0.5;
                   break;
+              case 'top-right':
+                  sx = 0.5;
+                  sy = -0.5;
+                  break;
+              case 'top-left':
+                  sx = -0.5;
+                  sy = -0.5;
+                  break;
+              case 'bottom-right':
+                  sx = 0.5;
+                  sy = 0.5;
+                  break;
+              case 'bottom-left':
+                  sx = -0.5;
+                  sy = 0.5;
           }
           anchorX += sx * rectWidth;
           anchorY += sy * rectHeight;
@@ -22697,6 +22719,16 @@
           else if (position.includes('right')) {
               vx = isInside ? -1 : 1;
           }
+          switch (position) {
+              case 'top-right':
+              case 'bottom-right':
+                  vx = -1;
+                  break;
+              case 'top-left':
+              case 'bottom-left':
+                  vx = 1;
+                  break;
+          }
           const x = anchorX + vx * offset + (vx * width) / 2;
           const y = anchorY + vy * offset + (vy * height) / 2;
           return { x, y };
@@ -24341,7 +24373,6 @@
               if (items.length > 1) {
                   vutils.last(items).setAttribute('opacity', 0);
               }
-              vutils.last(source).setAttribute('opacity', 1);
           }
       }
       source.forEach(item => {
@@ -26580,7 +26611,8 @@
               const groupClip = createGroup(Object.assign(Object.assign({}, limitRect), { clip: true, pickable: false }));
               group = createGroup({
                   x: -((_a = limitRect === null || limitRect === void 0 ? void 0 : limitRect.x) !== null && _a !== void 0 ? _a : 0),
-                  y: -((_b = limitRect === null || limitRect === void 0 ? void 0 : limitRect.y) !== null && _b !== void 0 ? _b : 0)
+                  y: -((_b = limitRect === null || limitRect === void 0 ? void 0 : limitRect.y) !== null && _b !== void 0 ? _b : 0),
+                  pickable: false
               });
               groupClip.add(group);
               this._containerClip = groupClip;
@@ -26589,7 +26621,8 @@
           else {
               group = createGroup({
                   x: 0,
-                  y: 0
+                  y: 0,
+                  pickable: false
               });
               this.add(group);
           }
@@ -26606,11 +26639,10 @@
           });
       }
       render() {
-          var _a, _b;
+          var _a;
+          this.setAttribute('pickable', false);
           const markerVisible = (_a = this.attribute.visible) !== null && _a !== void 0 ? _a : true;
-          const markerInteractive = (_b = this.attribute.interactive) !== null && _b !== void 0 ? _b : false;
-          if (!markerInteractive) {
-              this.setAttribute('pickable', false);
+          if (this.attribute.interactive === false) {
               this.setAttribute('childrenPickable', false);
           }
           if (markerVisible) {
@@ -26934,7 +26966,8 @@
               endSymbol,
               lineStyle,
               mainSegmentIndex,
-              multiSegment
+              multiSegment,
+              pickable: false
           });
           line.name = 'mark-line-line';
           this._line = line;
@@ -27211,7 +27244,8 @@
               y: position.y + ((itemContent === null || itemContent === void 0 ? void 0 : itemContent.offsetY) || 0)
           };
           const line = new Segment({
-              points: []
+              points: [],
+              pickable: false
           });
           line.name = 'mark-point-line';
           this._line = line;
@@ -31212,7 +31246,7 @@
       }
   };
 
-  const version = "0.16.9-alpha.1";
+  const version = "0.16.9";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;