@visactor/vrender 0.17.23 → 0.18.0-alpha.1

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
 import '@visactor/vrender-core';
-export declare const version = "0.17.23";
+export declare const version = "0.18.0-alpha.1";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,13 +21,14 @@ 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.17.23", (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)(), 
-(0, vrender_kits_2.registerGlyph)(), (0, vrender_kits_2.registerGroup)(), (0, vrender_kits_2.registerImage)(), 
-(0, vrender_kits_2.registerLine)(), (0, vrender_kits_2.registerPath)(), (0, vrender_kits_2.registerPolygon)(), 
-(0, vrender_kits_2.registerPyramid3d)(), (0, vrender_kits_2.registerRect)(), (0, 
-vrender_kits_2.registerRect3d)(), (0, vrender_kits_2.registerRichtext)(), (0, vrender_kits_2.registerShadowRoot)(), 
-(0, vrender_kits_2.registerSymbol)(), (0, vrender_kits_2.registerText)(), (0, vrender_kits_2.registerWrapText)(), 
-__exportStar(require("@visactor/vrender-core"), exports), __exportStar(require("@visactor/vrender-kits"), exports);
+exports.version = "0.18.0-alpha.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)(), (0, vrender_kits_2.registerGlyph)(), (0, vrender_kits_2.registerGroup)(), 
+(0, vrender_kits_2.registerImage)(), (0, vrender_kits_2.registerLine)(), (0, vrender_kits_2.registerPath)(), 
+(0, vrender_kits_2.registerPolygon)(), (0, vrender_kits_2.registerPyramid3d)(), 
+(0, vrender_kits_2.registerRect)(), (0, vrender_kits_2.registerRect3d)(), (0, vrender_kits_2.registerRichtext)(), 
+(0, vrender_kits_2.registerShadowRoot)(), (0, vrender_kits_2.registerSymbol)(), 
+(0, vrender_kits_2.registerText)(), (0, vrender_kits_2.registerWrapText)(), __exportStar(require("@visactor/vrender-core"), exports), 
+__exportStar(require("@visactor/vrender-kits"), exports);

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,SAAS,CAAC;AAEjC,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.17.23\";\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,gBAAgB,CAAC;AAExC,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.18.0-alpha.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

@@ -4784,11 +4784,6 @@
       value: function clear() {
         this.transformCbList = null, this.commandList.length = 0, this.curves.length = 0;
       }
-    }, {
-      key: "beginPath",
-      value: function beginPath() {
-        this.clear();
-      }
     }, {
       key: "toString",
       value: function toString() {
@@ -4808,8 +4803,6 @@
             var path = "";
             for (var i = 0; i < bezierPathList.length; i += 6) path += "C".concat(bezierPathList[i], " ").concat(bezierPathList[i + 1], " ").concat(bezierPathList[i + 2], " ").concat(bezierPathList[i + 3], " ").concat(bezierPathList[i + 4], " ").concat(bezierPathList[i + 5]);
             return path;
-          }, _list[enumCommandMap.R] = function (cmd) {
-            return "M".concat(cmd[1], " ").concat(cmd[2], " h").concat(cmd[3], " v").concat(cmd[4], " H").concat(cmd[1], "Z");
           }, _list[enumCommandMap.Z] = function (cmd) {
             return "Z";
           }, this.toStringCbList = _list;
@@ -5195,7 +5188,6 @@
     zIndex: 0,
     layout: null,
     boundsPadding: 0,
-    renderStyle: "default",
     pickMode: "accurate",
     customPickShape: null,
     boundsMode: "accurate",
@@ -5301,7 +5293,7 @@
     strokeBoundsBuffer: 0,
     keepDirIn3d: !0
   });
-  var DefaultRichTextAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
+  var DefaultRichTextAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultTextStyle), {
     width: 300,
     height: 300,
     ellipsis: !0,
@@ -16563,28 +16555,47 @@
       value: function getFrameCache() {
         return this.shouldUpdateShape() && (this.doUpdateFrameCache(), this.clearUpdateShapeTag()), this._frameCache;
       }
+    }, {
+      key: "combinedStyleToCharacter",
+      value: function combinedStyleToCharacter(config) {
+        var _this$attribute = this.attribute,
+          fill = _this$attribute.fill,
+          stroke = _this$attribute.stroke,
+          fontSize = _this$attribute.fontSize,
+          fontFamily = _this$attribute.fontFamily,
+          fontStyle = _this$attribute.fontStyle,
+          fontWeight = _this$attribute.fontWeight;
+        return Object.assign({
+          fill: fill,
+          stroke: stroke,
+          fontSize: fontSize,
+          fontFamily: fontFamily,
+          fontStyle: fontStyle,
+          fontWeight: fontWeight
+        }, config);
+      }
     }, {
       key: "doUpdateFrameCache",
       value: function doUpdateFrameCache() {
         var _this2 = this;
         var _a;
-        var _this$attribute = this.attribute,
-          _this$attribute$textC = _this$attribute.textConfig,
-          textConfig = _this$attribute$textC === void 0 ? [] : _this$attribute$textC,
-          maxWidth = _this$attribute.maxWidth,
-          maxHeight = _this$attribute.maxHeight,
-          width = _this$attribute.width,
-          height = _this$attribute.height,
-          ellipsis = _this$attribute.ellipsis,
-          wordBreak = _this$attribute.wordBreak,
-          verticalDirection = _this$attribute.verticalDirection,
-          textAlign = _this$attribute.textAlign,
-          textBaseline = _this$attribute.textBaseline,
-          layoutDirection = _this$attribute.layoutDirection,
-          singleLine = _this$attribute.singleLine,
+        var _this$attribute2 = this.attribute,
+          _this$attribute2$text = _this$attribute2.textConfig,
+          textConfig = _this$attribute2$text === void 0 ? [] : _this$attribute2$text,
+          maxWidth = _this$attribute2.maxWidth,
+          maxHeight = _this$attribute2.maxHeight,
+          width = _this$attribute2.width,
+          height = _this$attribute2.height,
+          ellipsis = _this$attribute2.ellipsis,
+          wordBreak = _this$attribute2.wordBreak,
+          verticalDirection = _this$attribute2.verticalDirection,
+          textAlign = _this$attribute2.textAlign,
+          textBaseline = _this$attribute2.textBaseline,
+          layoutDirection = _this$attribute2.layoutDirection,
+          singleLine = _this$attribute2.singleLine,
           paragraphs = [];
         for (var i = 0; i < textConfig.length; i++) if ("image" in textConfig[i]) {
-          var config = textConfig[i],
+          var config = this.combinedStyleToCharacter(textConfig[i]),
             iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
           if (iconCache) paragraphs.push(iconCache);else {
             var icon = new RichTextIcon(config);
@@ -16594,7 +16605,7 @@
             }, icon.richtextId = config.id, paragraphs.push(icon);
           }
         } else {
-          var richTextConfig = textConfig[i];
+          var richTextConfig = this.combinedStyleToCharacter(textConfig[i]);
           if (isNumber$1(richTextConfig.text) && (richTextConfig.text = "".concat(richTextConfig.text)), 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));
@@ -22370,7 +22381,7 @@
       key: "getRenderContribution",
       value: function getRenderContribution(graphic) {
         var renderer;
-        return renderer || (renderer = this.selectRenderByNumberType(graphic.numberType, graphic)), renderer || (renderer = this.selectRenderByType(graphic.type)), renderer;
+        return renderer || (renderer = this.selectRenderByNumberType(graphic.numberType)), renderer || (renderer = this.selectRenderByType(graphic.type)), renderer;
       }
     }, {
       key: "renderItem",
@@ -22409,13 +22420,8 @@
       }
     }, {
       key: "selectRenderByNumberType",
-      value: function selectRenderByNumberType(type, graphic) {
-        var data;
-        if (graphic.attribute.renderStyle) {
-          var currentRenderMap = this.styleRenderMap.get(graphic.attribute.renderStyle);
-          data = currentRenderMap && currentRenderMap.get(type);
-        }
-        return data || this.currentRenderMap.get(type) || this.defaultRenderMap.get(type);
+      value: function selectRenderByNumberType(type) {
+        return this.currentRenderMap.get(type) || this.defaultRenderMap.get(type);
       }
     }, {
       key: "clearScreen",
@@ -35054,7 +35060,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.17.23";
+  const version = "0.18.0-alpha.1";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);