@visactor/vrender 0.17.18-alpha.0 → 0.17.18

package/dist/index.js

@@ -5158,6 +5158,7 @@
   var DefaultStyle = Object.assign(Object.assign(Object.assign(Object.assign({
     opacity: 1,
     background: null,
+    backgroundCornerRadius: 0,
     texture: null,
     textureColor: "black",
     textureSize: 10,
@@ -11360,7 +11361,15 @@
         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 && mark.imageLoadSuccess(url, data.data) : ResourceLoader.loadImage(url, mark);
+        }) : "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) {
+          var _a;
+          data.loadState = (null == res ? void 0 : res.data) ? "success" : "fail", data.data = null == res ? void 0 : res.data, null === (_a = data.waitingMark) || void 0 === _a || _a.map(function (mark, index) {
+            (null == res ? void 0 : res.data) ? (data.loadState = "success", data.data = res.data, mark.imageLoadSuccess(url, res.data)) : (data.loadState = "fail", mark.imageLoadFail(url));
+          });
+        })) : (data.loadState = "fail", mark.imageLoadFail(url)));
       }
     }, {
       key: "GetSvg",
@@ -11394,68 +11403,10 @@
           return data.data;
         }));
       }
-    }, {
-      key: "loading",
-      value: function loading() {
-        setTimeout(function () {
-          if (!ResourceLoader.isLoading && ResourceLoader.toLoadAueue.length) {
-            ResourceLoader.isLoading = !0;
-            var tasks = ResourceLoader.toLoadAueue.splice(0, 10),
-              promises = [];
-            tasks.forEach(function (task) {
-              var url = task.url,
-                marks = task.marks,
-                data = {
-                  type: "image",
-                  loadState: "init"
-                };
-              if (ResourceLoader.cache.set(url, data), data.dataPromise = application.global.loadImage(url), data.dataPromise) {
-                data.waitingMark = marks;
-                var end = data.dataPromise.then(function (res) {
-                  var _a;
-                  data.loadState = (null == res ? void 0 : res.data) ? "success" : "fail", data.data = null == res ? void 0 : res.data, null === (_a = data.waitingMark) || void 0 === _a || _a.map(function (mark, index) {
-                    (null == res ? void 0 : res.data) ? (data.loadState = "success", data.data = res.data, mark.imageLoadSuccess(url, res.data)) : (data.loadState = "fail", mark.imageLoadFail(url));
-                  });
-                });
-                promises.push(end);
-              } else data.loadState = "fail", marks.forEach(function (mark) {
-                return mark.imageLoadFail(url);
-              });
-            }), Promise.all(promises).then(function () {
-              ResourceLoader.isLoading = !1, ResourceLoader.loading();
-            })["catch"](function (error) {
-              console.error(error), ResourceLoader.isLoading = !1, ResourceLoader.loading();
-            });
-          }
-        }, 0);
-      }
-    }, {
-      key: "loadImage",
-      value: function loadImage(url, mark) {
-        var index = getIndex(url, ResourceLoader.toLoadAueue);
-        if (-1 !== index) return ResourceLoader.toLoadAueue[index].marks.push(mark), void ResourceLoader.loading();
-        ResourceLoader.toLoadAueue.push({
-          url: url,
-          marks: [mark]
-        }), ResourceLoader.loading();
-      }
-    }, {
-      key: "improveImageLoading",
-      value: function improveImageLoading(url) {
-        var index = getIndex(url, ResourceLoader.toLoadAueue);
-        if (-1 !== index) {
-          var elememt = ResourceLoader.toLoadAueue.splice(index, 1);
-          ResourceLoader.toLoadAueue.unshift(elememt[0]);
-        }
-      }
     }]);
     return ResourceLoader;
   }();
-  function getIndex(url, arr) {
-    for (var i = 0; i < arr.length; i++) if (arr[i].url === url) return i;
-    return -1;
-  }
-  ResourceLoader.cache = new Map(), ResourceLoader.isLoading = !1, ResourceLoader.toLoadAueue = [];
+  ResourceLoader.cache = new Map();
 
   var tempMatrix = new Matrix(),
     tempBounds$1 = new AABBBounds();
@@ -12241,7 +12192,7 @@
           data: "init",
           state: null
         };
-        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", image.startsWith("<svg") ? (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background) : (isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) && (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background)) : isObject$1(image) ? (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background) : cache.state = "fail";
+        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", image.startsWith("<svg") ? (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background) : (isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) && (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
       }
     }, {
       key: "imageLoadSuccess",
@@ -12815,7 +12766,7 @@
       value: function doUpdateAABBBounds() {
         var attribute = this.attribute,
           groupTheme = getTheme(this).group;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var bounds = application.graphicService.updateGroupAABBBounds(attribute, groupTheme, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
           boundsPadding = _attribute$boundsPadd === void 0 ? groupTheme.boundsPadding : _attribute$boundsPadd,
@@ -13636,7 +13587,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds(full) {
         var circleTheme = getTheme(this).circle;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateCircleAABBBounds(attribute, getTheme(this).circle, this._AABBBounds, full, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -13823,7 +13774,7 @@
     return CanvasTextLayout;
   }();
 
-  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak", "heightLimit", "lineClamp"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
+  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "textAlign", "textBaseline", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak", "heightLimit", "lineClamp"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
   var Text = /*#__PURE__*/function (_Graphic) {
     _inherits(Text, _Graphic);
     var _super = _createSuper(Text);
@@ -13903,7 +13854,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var textTheme = getTheme(this).text;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateTextAABBBounds(attribute, textTheme, this._AABBBounds, this),
           _this$attribute$bound = this.attribute.boundsPadding,
@@ -15382,7 +15333,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds(full) {
         var symbolTheme = getTheme(this).symbol;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateSymbolAABBBounds(attribute, getTheme(this).symbol, this._AABBBounds, full, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -15472,7 +15423,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var lineTheme = getTheme(this).line;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateLineAABBBounds(attribute, getTheme(this).line, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -15563,7 +15514,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var rectTheme = getTheme(this).rect;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateRectAABBBounds(attribute, getTheme(this).rect, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -15793,7 +15744,7 @@
     }, {
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var bounds = application.graphicService.updateGlyphAABBBounds(this.attribute, getTheme(this).glyph, this._AABBBounds, this);
         return this.clearUpdateBoundTag(), bounds;
       }
@@ -16179,7 +16130,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var imageTheme = getTheme(this).image;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateImageAABBBounds(attribute, getTheme(this).image, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -16538,7 +16489,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var richTextTheme = getTheme(this).richtext;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateRichTextAABBBounds(attribute, getTheme(this).richtext, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -16601,10 +16552,13 @@
               _this2.addUpdateBoundTag(), null === (_a = _this2.stage) || void 0 === _a || _a.renderNextFrame();
             }, icon.richtextId = config.id, paragraphs.push(icon);
           }
-        } else if (textConfig[i].text.includes("\n")) {
-          var textParts = textConfig[i].text.split("\n");
-          for (var j = 0; j < textParts.length; j++) paragraphs.push(new Paragraph(textParts[j], 0 !== j, textConfig[i]));
-        } else paragraphs.push(new Paragraph(textConfig[i].text, !1, textConfig[i]));
+        } else {
+          var richTextConfig = textConfig[i];
+          if (isNumber$2(richTextConfig.text) && (richTextConfig.text = "".concat(richTextConfig.text)), richTextConfig.text.includes("\n")) {
+            var textParts = richTextConfig.text.split("\n");
+            for (var j = 0; j < textParts.length; j++) paragraphs.push(new Paragraph(textParts[j], 0 !== j, richTextConfig));
+          } else paragraphs.push(new Paragraph(richTextConfig.text, !1, richTextConfig));
+        }
         var maxWidthFinite = "number" == typeof maxWidth && Number.isFinite(maxWidth) && maxWidth > 0,
           maxHeightFinite = "number" == typeof maxHeight && Number.isFinite(maxHeight) && maxHeight > 0,
           richTextWidthEnable = "number" == typeof width && Number.isFinite(width) && width > 0 && (!maxWidthFinite || width <= maxWidth),
@@ -16723,7 +16677,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var pathTheme = getTheme(this).path;
-        this.doUpdatePathShape(), this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this.doUpdatePathShape(), this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updatePathAABBBounds(attribute, getTheme(this).path, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -16811,7 +16765,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var areaTheme = getTheme(this).area;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateAreaAABBBounds(attribute, getTheme(this).area, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -17014,7 +16968,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds(full) {
         var arcTheme = getTheme(this).arc;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateArcAABBBounds(attribute, getTheme(this).arc, this._AABBBounds, full, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -17100,7 +17054,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var polygonTheme = getTheme(this).arc;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updateArc3dAABBBounds(attribute, getTheme(this).polygon, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -17148,7 +17102,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var polygonTheme = getTheme(this).polygon;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updatePolygonAABBBounds(attribute, getTheme(this).polygon, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -17221,7 +17175,7 @@
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
         var polygonTheme = getTheme(this).polygon;
-        this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
+        this._AABBBounds.clear();
         var attribute = this.attribute,
           bounds = application.graphicService.updatePyramid3dAABBBounds(attribute, getTheme(this).polygon, this._AABBBounds, this),
           _attribute$boundsPadd = attribute.boundsPadding,
@@ -18181,35 +18135,37 @@
     }, {
       key: "transformAABBBounds",
       value: function transformAABBBounds(attribute, aabbBounds, theme, miter, graphic) {
-        var _attribute$scaleX2 = attribute.scaleX,
-          scaleX = _attribute$scaleX2 === void 0 ? theme.scaleX : _attribute$scaleX2,
-          _attribute$scaleY2 = attribute.scaleY,
-          scaleY = _attribute$scaleY2 === void 0 ? theme.scaleY : _attribute$scaleY2,
-          _attribute$stroke = attribute.stroke,
-          stroke = _attribute$stroke === void 0 ? theme.stroke : _attribute$stroke,
-          _attribute$shadowBlur2 = attribute.shadowBlur,
-          shadowBlur = _attribute$shadowBlur2 === void 0 ? theme.shadowBlur : _attribute$shadowBlur2,
-          _attribute$lineWidth = attribute.lineWidth,
-          lineWidth = _attribute$lineWidth === void 0 ? theme.lineWidth : _attribute$lineWidth,
-          _attribute$pickStroke = attribute.pickStrokeBuffer,
-          pickStrokeBuffer = _attribute$pickStroke === void 0 ? theme.pickStrokeBuffer : _attribute$pickStroke,
-          _attribute$strokeBoun2 = attribute.strokeBoundsBuffer,
-          strokeBoundsBuffer = _attribute$strokeBoun2 === void 0 ? theme.strokeBoundsBuffer : _attribute$strokeBoun2,
-          tb1 = this.tempAABBBounds1,
-          tb2 = this.tempAABBBounds2;
-        if (stroke && lineWidth) {
-          var scaledHalfLineWidth = (lineWidth + pickStrokeBuffer) / Math.abs(scaleX + scaleY);
-          boundStroke(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
+        if (!aabbBounds.empty()) {
+          var _attribute$scaleX2 = attribute.scaleX,
+            scaleX = _attribute$scaleX2 === void 0 ? theme.scaleX : _attribute$scaleX2,
+            _attribute$scaleY2 = attribute.scaleY,
+            scaleY = _attribute$scaleY2 === void 0 ? theme.scaleY : _attribute$scaleY2,
+            _attribute$stroke = attribute.stroke,
+            stroke = _attribute$stroke === void 0 ? theme.stroke : _attribute$stroke,
+            _attribute$shadowBlur2 = attribute.shadowBlur,
+            shadowBlur = _attribute$shadowBlur2 === void 0 ? theme.shadowBlur : _attribute$shadowBlur2,
+            _attribute$lineWidth = attribute.lineWidth,
+            lineWidth = _attribute$lineWidth === void 0 ? theme.lineWidth : _attribute$lineWidth,
+            _attribute$pickStroke = attribute.pickStrokeBuffer,
+            pickStrokeBuffer = _attribute$pickStroke === void 0 ? theme.pickStrokeBuffer : _attribute$pickStroke,
+            _attribute$strokeBoun2 = attribute.strokeBoundsBuffer,
+            strokeBoundsBuffer = _attribute$strokeBoun2 === void 0 ? theme.strokeBoundsBuffer : _attribute$strokeBoun2,
+            tb1 = this.tempAABBBounds1,
+            tb2 = this.tempAABBBounds2;
+          if (stroke && lineWidth) {
+            var scaledHalfLineWidth = (lineWidth + pickStrokeBuffer) / Math.abs(scaleX + scaleY);
+            boundStroke(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
+          }
+          if (shadowBlur) {
+            var _attribute$shadowOffs = attribute.shadowOffsetX,
+              shadowOffsetX = _attribute$shadowOffs === void 0 ? theme.shadowOffsetX : _attribute$shadowOffs,
+              _attribute$shadowOffs2 = attribute.shadowOffsetY,
+              shadowOffsetY = _attribute$shadowOffs2 === void 0 ? theme.shadowOffsetY : _attribute$shadowOffs2,
+              shadowBlurWidth = shadowBlur / Math.abs(scaleX + scaleY) * 2;
+            boundStroke(tb1, shadowBlurWidth, !1, strokeBoundsBuffer + 1), tb1.translate(shadowOffsetX, shadowOffsetY), aabbBounds.union(tb1);
+          }
         }
-        if (shadowBlur) {
-          var _attribute$shadowOffs = attribute.shadowOffsetX,
-            shadowOffsetX = _attribute$shadowOffs === void 0 ? theme.shadowOffsetX : _attribute$shadowOffs,
-            _attribute$shadowOffs2 = attribute.shadowOffsetY,
-            shadowOffsetY = _attribute$shadowOffs2 === void 0 ? theme.shadowOffsetY : _attribute$shadowOffs2,
-            shadowBlurWidth = shadowBlur / Math.abs(scaleX + scaleY) * 2;
-          boundStroke(tb1, shadowBlurWidth, !1, strokeBoundsBuffer + 1), tb1.translate(shadowOffsetX, shadowOffsetY), aabbBounds.union(tb1);
-        }
-        this.combindShadowAABBBounds(aabbBounds, graphic);
+        if (this.combindShadowAABBBounds(aabbBounds, graphic), aabbBounds.empty()) return;
         var updateMatrix = !0;
         var m = graphic.transMatrix;
         graphic && graphic.isContainer && (updateMatrix = !(1 === m.a && 0 === m.b && 0 === m.c && 1 === m.d && 0 === m.e && 0 === m.f)), updateMatrix && transformBoundsWithMatrix(aabbBounds, aabbBounds, m);
@@ -20805,7 +20761,10 @@
           var res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
           context.highPerformanceSave(), onlyTranslate && context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.highPerformanceRestore(), context.setTransformForCurrent();
-        } else context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = background, context.fillRect(b.x1, b.y1, b.width(), b.height()), context.highPerformanceRestore();
+        } else {
+          var backgroundCornerRadius = graphic.attribute.backgroundCornerRadius;
+          context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = background, backgroundCornerRadius ? (createRectPath(context, b.x1, b.y1, b.width(), b.height(), backgroundCornerRadius), context.fill()) : context.fillRect(b.x1, b.y1, b.width(), b.height()), context.highPerformanceRestore();
+        }
         shouldReCalBounds && boundsAllocate.free(b);
       }
     }]);
@@ -21240,9 +21199,7 @@
       value: function draw(image, renderService, drawContext) {
         var url = image.attribute.image;
         if (!url || !image.resources) return;
-        var res = image.resources.get(url);
-        if ("loading" === res.state && isString$1(url)) return void ResourceLoader.improveImageLoading(url);
-        if ("success" !== res.state) return;
+        if ("success" !== image.resources.get(url).state) return;
         var context = renderService.drawParams.context;
         if (!context) return;
         var imageAttribute = getTheme(image).image;
@@ -22270,7 +22227,7 @@
         var d = context.dpr % 1;
         (d || .5 !== d) && (dirtyBounds.x1 = Math.floor(dirtyBounds.x1 * context.dpr) / context.dpr, dirtyBounds.y1 = Math.floor(dirtyBounds.y1 * context.dpr) / context.dpr, dirtyBounds.x2 = Math.ceil(dirtyBounds.x2 * context.dpr) / context.dpr, dirtyBounds.y2 = Math.ceil(dirtyBounds.y2 * context.dpr) / context.dpr), this.backupDirtyBounds.copy(dirtyBounds), context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0);
         var drawInArea = dirtyBounds.width() * context.dpr < context.canvas.width || dirtyBounds.height() * context.dpr < context.canvas.height;
-        context.save(), context.translate(x, y, !0), drawInArea && (context.beginPath(), context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height()), context.clip()), stage.camera && (this.dirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), this.backupDirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0)), this.clearScreen(renderService, context, drawContext), context.save(), renderService.renderTreeRoots.sort(function (a, b) {
+        context.save(), context.translate(x, y, !0), drawInArea && (context.beginPath(), context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height()), context.clip()), stage.camera && (this.dirtyBounds.clear(), this.backupDirtyBounds.clear()), this.clearScreen(renderService, context, drawContext), context.save(), renderService.renderTreeRoots.sort(function (a, b) {
           var _a, _b;
           return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : DefaultAttribute.zIndex);
         }).forEach(function (group) {
@@ -22333,7 +22290,7 @@
         }, subLayers.set(group._uid, incrementalLayer));
         var incrementalContext = incrementalLayer.layer.getNativeHandler().getContext(),
           idc = incrementalLayer.drawContribution || container.get(IncrementalDrawContribution);
-        idc.dirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), idc.backupDirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), idc.draw(this.currentRenderService, Object.assign(Object.assign({}, drawContext), {
+        idc.dirtyBounds.clear(), idc.backupDirtyBounds.clear(), idc.draw(this.currentRenderService, Object.assign(Object.assign({}, drawContext), {
           drawContribution: idc,
           clear: "transparent",
           layer: incrementalLayer.layer,
@@ -31126,6 +31083,105 @@
     c.load(mathModule), c.load(mathPickerModule);
   }
 
+  var CanvasWrapDisableWH = /*#__PURE__*/function () {
+    function CanvasWrapDisableWH(nativeCanvas, ctx, dpr, w, h, id) {
+      _classCallCheck(this, CanvasWrapDisableWH);
+      this.nativeCanvas = nativeCanvas, this.ctx = ctx, this._w = w, this._h = h, this.id = id, nativeCanvas.id = id, this.dpr = dpr;
+    }
+    _createClass(CanvasWrapDisableWH, [{
+      key: "width",
+      get: function get() {
+        return this._w * this.dpr;
+      },
+      set: function set(w) {}
+    }, {
+      key: "height",
+      get: function get() {
+        return this._h * this.dpr;
+      },
+      set: function set(h) {}
+    }, {
+      key: "offsetWidth",
+      get: function get() {
+        return this._w;
+      },
+      set: function set(w) {}
+    }, {
+      key: "offsetHeight",
+      get: function get() {
+        return this._h;
+      },
+      set: function set(h) {}
+    }, {
+      key: "getContext",
+      value: function getContext() {
+        return this.ctx;
+      }
+    }, {
+      key: "getBoundingClientRect",
+      value: function getBoundingClientRect() {
+        return {
+          width: this._w,
+          height: this._h
+        };
+      }
+    }]);
+    return CanvasWrapDisableWH;
+  }();
+  var CanvasWrapEnableWH = /*#__PURE__*/function () {
+    function CanvasWrapEnableWH(nativeCanvas, ctx, dpr, w, h, id) {
+      _classCallCheck(this, CanvasWrapEnableWH);
+      this.nativeCanvas = nativeCanvas, this.ctx = ctx, this._w = w, this._h = h, this.id = id, nativeCanvas.id = id, this.dpr = dpr;
+    }
+    _createClass(CanvasWrapEnableWH, [{
+      key: "width",
+      get: function get() {
+        return this._w * this.dpr;
+      },
+      set: function set(w) {
+        this._w = w / this.dpr, this.nativeCanvas.width = w;
+      }
+    }, {
+      key: "height",
+      get: function get() {
+        return this._h * this.dpr;
+      },
+      set: function set(h) {
+        this._h = h / this.dpr, this.nativeCanvas.height = h;
+      }
+    }, {
+      key: "offsetWidth",
+      get: function get() {
+        return this._w;
+      },
+      set: function set(w) {
+        this._w = w, this.nativeCanvas.width = w * this.dpr;
+      }
+    }, {
+      key: "offsetHeight",
+      get: function get() {
+        return this._h;
+      },
+      set: function set(h) {
+        this._h = h, this.nativeCanvas.height = h * this.dpr;
+      }
+    }, {
+      key: "getContext",
+      value: function getContext() {
+        return this.ctx;
+      }
+    }, {
+      key: "getBoundingClientRect",
+      value: function getBoundingClientRect() {
+        return {
+          width: this._w,
+          height: this._h
+        };
+      }
+    }]);
+    return CanvasWrapEnableWH;
+  }();
+
   var __decorate$H = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
@@ -31136,31 +31192,12 @@
     __metadata$z = undefined && undefined.__metadata || function (k, v) {
       if ("object" == (typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
     };
-  function makeUpCanvas$3(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList) {
-    var dpr = tt.getSystemInfoSync().pixelRatio;
+  function makeUpCanvas$3(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList, pixelRatio) {
+    var dpr = null != pixelRatio ? pixelRatio : tt.getSystemInfoSync().pixelRatio;
     canvasIdLists.forEach(function (id, i) {
-      var ctx = tt.createCanvasContext(id);
-      ctx.canvas = {
-        width: domref.width * dpr,
-        height: domref.height * dpr
-      };
-      var canvas = {
-        width: domref.width * dpr,
-        height: domref.height * dpr,
-        offsetWidth: domref.width,
-        offsetHeight: domref.height,
-        id: null != id ? id : "",
-        getContext: function getContext() {
-          return ctx;
-        },
-        getBoundingClientRect: function getBoundingClientRect() {
-          return {
-            height: domref.height,
-            width: domref.width
-          };
-        }
-      };
-      canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas);
+      var ctx = tt.createCanvasContext(id),
+        canvas = new CanvasWrapDisableWH(ctx.canvas || {}, ctx, dpr, domref.width, domref.height, id);
+      ctx.canvas = canvas, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas);
     });
   }
   var FeishuEnvContribution = /*#__PURE__*/function (_BaseEnvContribution) {
@@ -31191,7 +31228,7 @@
     }, {
       key: "configure",
       value: function configure(service, params) {
-        service.env === this.type && (service.setActiveEnvContribution(this), makeUpCanvas$3(params.domref, params.canvasIdLists, this.canvasMap, params.freeCanvasIdx, this.freeCanvasList));
+        service.env === this.type && (service.setActiveEnvContribution(this), makeUpCanvas$3(params.domref, params.canvasIdLists, this.canvasMap, params.freeCanvasIdx, this.freeCanvasList, params.pixelRatio));
       }
     }, {
       key: "loadImage",
@@ -31369,11 +31406,11 @@
       value: function draw() {
         var _this = this;
         var _context = this.nativeContext;
-        this.drawPromise = new Promise(function (resolve) {
+        _context.draw && (this.drawPromise = new Promise(function (resolve) {
           _context.draw(!0, function () {
             _this.drawPromise = null, resolve(null);
           });
-        });
+        }));
       }
     }]);
     return LynxContext2d;
@@ -31642,32 +31679,13 @@
   try {
     ng = !!lynx.createCanvasNG;
   } catch (err) {}
-  function makeUpCanvas$2(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList) {
-    var dpr = SystemInfo.pixelRatio;
+  function makeUpCanvas$2(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList, pixelRatio) {
+    var dpr = null != pixelRatio ? pixelRatio : SystemInfo.pixelRatio;
     canvasIdLists.forEach(function (id, i) {
       var _canvas = ng ? lynx.createCanvasNG(id) : lynx.createCanvas(id);
       _canvas.width = domref.width * dpr, _canvas.height = domref.height * dpr, ng && _canvas.attachToCanvasView(id);
-      var ctx = _canvas.getContext("2d");
-      ctx.draw = function (a, b) {
-        b();
-      };
-      var canvas = {
-        width: domref.width * dpr,
-        height: domref.height * dpr,
-        offsetWidth: domref.width,
-        offsetHeight: domref.height,
-        id: null != id ? id : "",
-        getContext: function getContext() {
-          return ctx;
-        },
-        getBoundingClientRect: function getBoundingClientRect() {
-          return {
-            height: domref.height,
-            width: domref.width
-          };
-        },
-        nativeCanvas: _canvas
-      };
+      var ctx = _canvas.getContext("2d"),
+        canvas = new CanvasWrapEnableWH(_canvas, ctx, dpr, domref.width, domref.height, id);
       canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas);
     });
   }
@@ -31701,7 +31719,7 @@
     _createClass(LynxEnvContribution, [{
       key: "configure",
       value: function configure(service, params) {
-        service.env === this.type && (service.setActiveEnvContribution(this), makeUpCanvas$2(params.domref, params.canvasIdLists, this.canvasMap, params.freeCanvasIdx, this.freeCanvasList));
+        service.env === this.type && (service.setActiveEnvContribution(this), makeUpCanvas$2(params.domref, params.canvasIdLists, this.canvasMap, params.freeCanvasIdx, this.freeCanvasList, params.pixelRatio));
       }
     }, {
       key: "getDynamicCanvasCount",
@@ -32293,6 +32311,34 @@
       value: function createPattern(image, repetition) {
         return null;
       }
+    }, {
+      key: "getImageData",
+      value: function getImageData(sx, sy, sw, sh) {
+        var _this = this;
+        var ctx = this.nativeContext,
+          taro = ctx.taro;
+        if (ctx && taro) return !ctx.getImageData && taro.canvasGetImageData ? new Promise(function (resolve, reject) {
+          try {
+            taro.canvasGetImageData({
+              canvasId: _this.canvas.nativeCanvas.id,
+              sx: sx,
+              sy: sy,
+              sw: sw,
+              sh: sh,
+              success: function success(res) {
+                resolve(res);
+              }
+            });
+          } catch (err) {
+            reject(err);
+          }
+        }) : void 0;
+      }
+    }, {
+      key: "createRadialGradient",
+      value: function createRadialGradient(x0, y0, r0, x1, y1, r1) {
+        return this.nativeContext.createCircularGradient && this.nativeContext.createCircularGradient(x0, y0, r0, x1, y1, r1);
+      }
     }]);
     return TaroContext2d;
   }(BrowserContext2d);
@@ -32560,47 +32606,9 @@
     };
   function makeUpCanvas$1(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList, taro, dpr) {
     canvasIdLists.forEach(function (id, i) {
-      var ctx = taro.createCanvasContext(id);
-      ctx.canvas = {
-        width: domref.width * dpr,
-        height: domref.height * dpr
-      }, ctx.createRadialGradient || (ctx.createRadialGradient = function () {
-        return ctx.createCircularGradient.apply(ctx, arguments);
-      }), !ctx.getImageData && taro.canvasGetImageData && (ctx.getImageData = function (x, y, width, height) {
-        return new Promise(function (resolve, reject) {
-          try {
-            taro.canvasGetImageData({
-              canvasId: id,
-              x: x,
-              y: y,
-              width: width,
-              height: height,
-              success: function success(res) {
-                resolve(res);
-              }
-            });
-          } catch (err) {
-            reject(err);
-          }
-        });
-      });
-      var canvas = {
-        id: id,
-        width: domref.width * dpr,
-        height: domref.height * dpr,
-        offsetWidth: domref.width,
-        offsetHeight: domref.height,
-        getContext: function getContext() {
-          return ctx;
-        },
-        getBoundingClientRect: function getBoundingClientRect() {
-          return {
-            height: domref.height,
-            width: domref.width
-          };
-        }
-      };
-      return canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas), canvas;
+      var ctx = taro.createCanvasContext(id),
+        canvas = new CanvasWrapDisableWH(ctx.canvas || {}, ctx, dpr, domref.width, domref.height, id);
+      return ctx.canvas = canvas, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas), canvas;
     });
   }
   var TaroEnvContribution = /*#__PURE__*/function (_BaseEnvContribution) {
@@ -34845,7 +34853,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.17.18-alpha.0";
+  const version = "0.17.18";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);