@visactor/vrender 0.19.0 → 0.19.1

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
 import '@visactor/vrender-core';
-export declare const version = "0.19.0";
+export declare const version = "0.19.1";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_kits_2 = require("@visactor/vrender-kits");
 
-exports.version = "0.19.0", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0, 
+exports.version = "0.19.1", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0, 
 vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, vrender_core_1.isNodeEnv)() && (0, 
 vrender_kits_1.loadNodeEnv)(vrender_core_1.container), (0, vrender_kits_2.registerArc)(), 
 (0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(), (0, vrender_kits_2.registerCircle)(), 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AACnB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.19.0\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AACnB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.19.1\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.js

@@ -5324,7 +5324,7 @@
     textBaseline: "top",
     layoutDirection: "horizontal",
     textConfig: [],
-    forceBreakLine: !1,
+    disableAutoWrapLine: !1,
     maxHeight: void 0,
     maxWidth: void 0,
     singleLine: !1
@@ -15946,7 +15946,8 @@
               top = _this$lines$i2.top,
               _height4 = _this$lines$i2.height;
             if (top + _height4 < this[this.directionKey.top] || top + _height4 > this[this.directionKey.top] + frameHeight) ;else if (this.ellipsis && this.lines[i + 1] && this.lines[i + 1].top + this.lines[i + 1].height > this[this.directionKey.top] + frameHeight) {
-              var lineWidth = this.lines[i].getWidthWithEllips();
+              var ellipsis = !0 === this.ellipsis ? "..." : this.ellipsis || "",
+                lineWidth = this.lines[i].getWidthWithEllips(ellipsis);
               lineWidth > widthBound && (widthBound = lineWidth), heightBound += this.lines[i].height;
             } else this.lines[i].actualWidth > widthBound && (widthBound = this.lines[i].actualWidth), heightBound += this.lines[i].height;
           } else {
@@ -15960,7 +15961,8 @@
             y = frameHeight - this.lines[_i5].top - this.lines[_i5].height;
           if (0 === frameHeight) this.lines[_i5].actualWidth > widthBound && (widthBound = this.lines[_i5].actualWidth), heightBound += this.lines[_i5].height;else if (y + _height5 > this[this.directionKey.top] + frameHeight || y < this[this.directionKey.top]) ;else {
             if (this.ellipsis && this.lines[_i5 + 1] && y - this.lines[_i5 + 1].height < this[this.directionKey.top]) {
-              var _lineWidth = this.lines[_i5].getWidthWithEllips();
+              var _ellipsis = !0 === this.ellipsis ? "..." : this.ellipsis || "",
+                _lineWidth = this.lines[_i5].getWidthWithEllips(_ellipsis);
               _lineWidth > widthBound && (widthBound = _lineWidth), heightBound += this.lines[_i5].height;
             } else this.lines[_i5].actualWidth > widthBound && (widthBound = this.lines[_i5].actualWidth), heightBound += this.lines[_i5].height;
           }
@@ -15970,7 +15972,8 @@
             _height6 = _this$lines$_i4.height;
           if (0 === frameHeight) this.lines[_i6].actualWidth > widthBound && (widthBound = this.lines[_i6].actualWidth), heightBound += this.lines[_i6].height;else if (_top4 + _height6 < this[this.directionKey.top] || _top4 + _height6 > this[this.directionKey.top] + frameHeight) ;else {
             if (this.ellipsis && this.lines[_i6 + 1] && this.lines[_i6 + 1].top + this.lines[_i6 + 1].height > this[this.directionKey.top] + frameHeight) {
-              var _lineWidth2 = this.lines[_i6].getWidthWithEllips();
+              var _ellipsis2 = !0 === this.ellipsis ? "..." : this.ellipsis || "",
+                _lineWidth2 = this.lines[_i6].getWidthWithEllips(_ellipsis2);
               _lineWidth2 > widthBound && (widthBound = _lineWidth2), heightBound += this.lines[_i6].height;
             } else this.lines[_i6].actualWidth > widthBound && (widthBound = this.lines[_i6].actualWidth), heightBound += this.lines[_i6].height;
           }
@@ -15997,7 +16000,7 @@
       var halfDetaHeight = 0,
         deltaAscent = 0,
         deltaDescent = 0;
-      this.height > height && (halfDetaHeight = (this.height - height) / 2, deltaAscent = Math.ceil(halfDetaHeight), deltaDescent = Math.floor(halfDetaHeight)), "top" === this.textBaseline ? (this.ascent = halfDetaHeight, this.descent = height - halfDetaHeight) : "bottom" === this.textBaseline ? (this.ascent = height - halfDetaHeight, this.descent = halfDetaHeight) : "middle" === this.textBaseline ? (this.ascent = this.height / 2, this.descent = this.height / 2) : (this.ascent = ascent + deltaAscent, this.descent = descent + deltaDescent), this.length = text.length, this.width = width || 0, this.text = text || "", this.newLine = newLine || !1, this.character = character, this.left = 0, this.top = 0, this.ellipsis = "normal", this.ellipsisWidth = 0, this.ellipsisOtherParagraphWidth = 0, "vertical" === character.direction && (this.direction = character.direction, this.widthOrigin = this.width, this.heightOrigin = this.height, this.width = this.heightOrigin, this.height = this.widthOrigin, this.lineHeight = this.height);
+      this.height > height && (halfDetaHeight = (this.height - height) / 2, deltaAscent = Math.ceil(halfDetaHeight), deltaDescent = Math.floor(halfDetaHeight)), "top" === this.textBaseline ? (this.ascent = halfDetaHeight, this.descent = height - halfDetaHeight) : "bottom" === this.textBaseline ? (this.ascent = height - halfDetaHeight, this.descent = halfDetaHeight) : "middle" === this.textBaseline ? (this.ascent = this.height / 2, this.descent = this.height / 2) : (this.ascent = ascent + deltaAscent, this.descent = descent + deltaDescent), this.length = text.length, this.width = width || 0, this.text = text || "", this.newLine = newLine || !1, this.character = character, this.left = 0, this.top = 0, this.ellipsis = "normal", this.ellipsisWidth = 0, this.ellipsisOtherParagraphWidth = 0, "vertical" === character.direction && (this.direction = character.direction, this.widthOrigin = this.width, this.heightOrigin = this.height, this.width = this.heightOrigin, this.height = this.widthOrigin, this.lineHeight = this.height), this.ellipsisStr = "...";
     }
     return _createClass(Paragraph, [{
       key: "updateWidth",
@@ -16013,11 +16016,11 @@
           left = this.left + deltaLeft;
         baseline += this.top;
         var direction = this.direction;
-        if (this.verticalEllipsis) text = "...", direction = "vertical", baseline -= this.ellipsisWidth / 2;else {
+        if (this.verticalEllipsis) text = this.ellipsisStr, direction = "vertical", baseline -= this.ellipsisWidth / 2;else {
           if ("hide" === this.ellipsis) return;
-          if ("add" === this.ellipsis) text += "...", "right" !== textAlign && "end" !== textAlign || (left -= this.ellipsisWidth);else if ("replace" === this.ellipsis) {
+          if ("add" === this.ellipsis) text += this.ellipsisStr, "right" !== textAlign && "end" !== textAlign || (left -= this.ellipsisWidth);else if ("replace" === this.ellipsis) {
             var index = getStrByWithCanvas(text, ("vertical" === direction ? this.height : this.width) - this.ellipsisWidth + this.ellipsisOtherParagraphWidth, this.character, text.length - 1);
-            if (text = text.slice(0, index), text += "...", "right" === textAlign || "end" === textAlign) {
+            if (text = text.slice(0, index), text += this.ellipsisStr, "right" === textAlign || "end" === textAlign) {
               var _measureTextCanvas3 = measureTextCanvas(this.text.slice(index), this.character),
                 width = _measureTextCanvas3.width;
               "vertical" === direction || (left -= this.ellipsisWidth - width);
@@ -16042,7 +16045,7 @@
         if ("add" === this.ellipsis) return width + this.ellipsisWidth;
         if ("replace" === this.ellipsis) {
           var index = getStrByWithCanvas(text, width - this.ellipsisWidth + this.ellipsisOtherParagraphWidth, this.character, text.length - 1);
-          text = text.slice(0, index), text += "...";
+          text = text.slice(0, index), text += this.ellipsisStr;
           var _measureTextCanvas4 = measureTextCanvas(this.text.slice(index), this.character),
             measureWidth = _measureTextCanvas4.width;
           return width + this.ellipsisWidth - measureWidth;
@@ -16288,11 +16291,13 @@
               paragraph.verticalEllipsis = !0;
               break;
             }
-            var _measureTextCanvas = measureTextCanvas("...", paragraph.character),
+            var ellipsis = !0 === drawEllipsis ? "..." : drawEllipsis || "";
+            paragraph.ellipsisStr = ellipsis;
+            var _measureTextCanvas = measureTextCanvas(ellipsis, paragraph.character),
               width = _measureTextCanvas.width,
               ellipsisWidth = width || 0;
             if (ellipsisWidth <= this.blankWidth + otherParagraphWidth) {
-              paragraph.ellipsis = "add";
+              lastLine && (paragraph.ellipsis = "add");
               break;
             }
             if (ellipsisWidth <= this.blankWidth + otherParagraphWidth + paragraph.width) {
@@ -16312,13 +16317,13 @@
       }
     }, {
       key: "getWidthWithEllips",
-      value: function getWidthWithEllips() {
+      value: function getWidthWithEllips(ellipsis) {
         var _this3 = this;
         var otherParagraphWidth = 0;
         for (var i = this.paragraphs.length - 1; i >= 0; i--) {
           var paragraph = this.paragraphs[i];
           if (paragraph instanceof RichTextIcon) break;
-          var _measureTextCanvas2 = measureTextCanvas("...", paragraph.character),
+          var _measureTextCanvas2 = measureTextCanvas(ellipsis, paragraph.character),
             _width = _measureTextCanvas2.width,
             ellipsisWidth = _width || 0;
           if (ellipsisWidth <= this.blankWidth + otherParagraphWidth) {
@@ -16565,7 +16570,7 @@
           textBaseline = _this$attribute2.textBaseline,
           layoutDirection = _this$attribute2.layoutDirection,
           singleLine = _this$attribute2.singleLine,
-          forceBreakLine = _this$attribute2.forceBreakLine,
+          disableAutoWrapLine = _this$attribute2.disableAutoWrapLine,
           paragraphs = [];
         for (var i = 0; i < textConfig.length; i++) if ("image" in textConfig[i]) {
           var config = this.combinedStyleToCharacter(textConfig[i]),
@@ -16590,12 +16595,12 @@
           richTextHeightEnable = "number" == typeof height && Number.isFinite(height) && height > 0 && (!maxHeightFinite || height <= maxHeight),
           frame = new Frame(0, 0, (richTextWidthEnable ? width : maxWidthFinite ? maxWidth : 0) || 0, (richTextHeightEnable ? height : maxHeightFinite ? maxHeight : 0) || 0, ellipsis, wordBreak, verticalDirection, textAlign, textBaseline, layoutDirection || "horizontal", !richTextWidthEnable && maxWidthFinite, !richTextHeightEnable && maxHeightFinite, singleLine || !1, null === (_a = this._frameCache) || void 0 === _a ? void 0 : _a.icons),
           wrapper = new Wrapper(frame);
-        if (forceBreakLine) {
+        if (disableAutoWrapLine) {
           var lineCount = 0,
             skip = !1;
           for (var _i = 0; _i < paragraphs.length; _i++) {
             var p = paragraphs[_i];
-            skip ? (p.overflow = !0, p.left = 1 / 0, p.top = 1 / 0, !p.newLine && frame.lines[frame.lines.length - 1].paragraphs.push(p)) : wrapper.deal(p), frame.lines.length !== lineCount && (lineCount = frame.lines.length, wrapper.lineBuffer.length = 0, p.overflow = !0, p.left = 1e3, p.top = 1e3, frame.lines[frame.lines.length - 1].paragraphs.push(p), skip = !0), p.newLine && (skip = !1);
+            skip ? (p.overflow = !0, p.left = 1 / 0, p.top = 1 / 0, !p.newLine && frame.lines[frame.lines.length - 1].paragraphs.push(p)) : wrapper.deal(p), frame.lines.length !== lineCount && (lineCount = frame.lines.length, wrapper.lineBuffer.length = 0, p.overflow = !0, p.left = 1e3, p.top = 1e3, frame.lines[frame.lines.length - 1].paragraphs.push(p), skip = !0), p.newLine && (skip = !1, wrapper.lineWidth = 0);
           }
         } else for (var _i2 = 0; _i2 < paragraphs.length; _i2++) wrapper.deal(paragraphs[_i2]);
         wrapper.send();
@@ -21422,6 +21427,13 @@
       key: "beforeDrawInteractive",
       value: function beforeDrawInteractive(graphic, renderService, drawContext, drawContribution, params) {
         var baseGraphic = graphic.baseGraphic;
+        if (!baseGraphic.stage) {
+          var interactiveLayer = drawContext.stage.getLayer("_builtin_interactive");
+          if (interactiveLayer) {
+            this.getShadowRoot(interactiveLayer).removeChild(graphic);
+          }
+          return !0;
+        }
         if (baseGraphic) {
           this.processing = !0;
           var context = drawContext.context;
@@ -35125,7 +35137,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.19.0";
+  const version = "0.19.1";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);