@visactor/vrender 0.18.15 → 0.18.17

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
 import '@visactor/vrender-core';
-export declare const version = "0.18.15";
+export declare const version = "0.18.17";
 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.18.15", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0, 
+exports.version = "0.18.17", (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,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.18.15\";\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,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.18.17\";\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

@@ -6594,7 +6594,6 @@
       symbol: DefaultSymbolAttribute,
       text: DefaultTextAttribute,
       rect: DefaultRectAttribute,
-      rect3d: DefaultRect3dAttribute,
       polygon: DefaultPolygonAttribute,
       richtext: DefaultRichTextAttribute,
       richtextIcon: DefaultRichTextIconAttribute,
@@ -6613,7 +6612,6 @@
       symbol: Object.assign({}, defaultThemeObj.symbol),
       text: Object.assign({}, defaultThemeObj.text),
       rect: Object.assign({}, defaultThemeObj.rect),
-      rect3d: Object.assign({}, defaultThemeObj.rect3d),
       polygon: Object.assign({}, defaultThemeObj.polygon),
       richtext: Object.assign({}, defaultThemeObj.richtext),
       richtextIcon: Object.assign({}, defaultThemeObj.richtextIcon),
@@ -13240,7 +13238,7 @@
   }
   function drawPathProxy(graphic, context, x, y, drawContext, params, fillCb, strokeCb) {
     if (!graphic.pathProxy) return !1;
-    var themeAttributes = getTheme(graphic, null == params ? void 0 : params.theme)[graphic.type],
+    var themeAttributes = getTheme(graphic, null == params ? void 0 : params.theme)[graphic.type.replace("3d", "")],
       _graphic$attribute = graphic.attribute,
       _graphic$attribute$fi = _graphic$attribute.fill,
       fill = _graphic$attribute$fi === void 0 ? themeAttributes.fill : _graphic$attribute$fi,
@@ -15531,7 +15529,7 @@
             vertices: [],
             edges: []
           },
-          rectTheme = getTheme(this).rect3d,
+          rectTheme = getTheme(this).rect,
           _this$attribute = this.attribute,
           x1 = _this$attribute.x1,
           y1 = _this$attribute.y1,
@@ -19331,13 +19329,18 @@
       key: "drawShape",
       value: function drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
         var _rect$attribute4 = rect.attribute,
-          _rect$attribute4$widt = _rect$attribute4.width,
-          width = _rect$attribute4$widt === void 0 ? groupAttribute.width : _rect$attribute4$widt,
-          _rect$attribute4$heig = _rect$attribute4.height,
-          height = _rect$attribute4$heig === void 0 ? groupAttribute.height : _rect$attribute4$heig,
+          x1 = _rect$attribute4.x1,
+          y1 = _rect$attribute4.y1,
+          _rect$attribute4$x = _rect$attribute4.x,
+          originX = _rect$attribute4$x === void 0 ? groupAttribute.x : _rect$attribute4$x,
+          _rect$attribute4$y = _rect$attribute4.y,
+          originY = _rect$attribute4$y === void 0 ? groupAttribute.y : _rect$attribute4$y,
           _rect$attribute4$stro = _rect$attribute4.stroke,
           stroke = _rect$attribute4$stro === void 0 ? groupAttribute.stroke : _rect$attribute4$stro;
-        if (Array.isArray(stroke) && stroke.some(function (s) {
+        var _rect$attribute5 = rect.attribute,
+          width = _rect$attribute5.width,
+          height = _rect$attribute5.height;
+        if (width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0, Array.isArray(stroke) && stroke.some(function (s) {
           return !1 === s;
         })) {
           if (context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute), context.beginPath(), context.moveTo(x, y), stroke[0] ? context.lineTo(x + width, y) : context.moveTo(x + width, y), stroke[1] ? context.lineTo(x + width, y + height) : context.moveTo(x + width, y + height), stroke[2] ? context.lineTo(x, y + height) : context.moveTo(x, y + height), stroke[3]) {
@@ -20922,7 +20925,7 @@
             strokeOpacity: fillOpacity
           };
         if (underline) {
-          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), context.setLineDash(underlineDash), context.beginPath();
+          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), underlineDash && context.setLineDash(underlineDash), context.beginPath();
           var dy = y + offsetY + fontSize + underlineOffset;
           context.moveTo(x + offsetX, dy, z), context.lineTo(x + offsetX + w, dy, z), context.stroke();
         }
@@ -20958,7 +20961,7 @@
           };
         var deltaY = -3;
         if (underline) {
-          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), context.setLineDash(underlineDash), context.beginPath();
+          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), underlineDash && context.setLineDash(underlineDash), context.beginPath();
           var dy = y + offsetY + fontSize + deltaY + underlineOffset;
           context.moveTo(x + 0, dy, z), context.lineTo(x + 0 + w, dy, z), context.stroke();
         }
@@ -23438,7 +23441,7 @@
           }
         } else if ("flex-end" === justifyContent) {
           var _pos = main.len;
-          for (var _i = lastIdx; _i <= currSeg.idx; _i++) {
+          for (var _i = currSeg.idx; _i >= lastIdx; _i--) {
             _pos -= mianLenArray[_i].mainLen;
             var _posBaseLeftTop = _pos + getPadding(children[_i], main.field),
               _b = this.getAABBBounds(children[_i]);
@@ -25807,7 +25810,7 @@
       key: "drawShape",
       value: function drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
-        var rectAttribute = getTheme(rect, null == params ? void 0 : params.theme).rect3d,
+        var rectAttribute = getTheme(rect, null == params ? void 0 : params.theme).rect,
           _rect$attribute = rect.attribute,
           _rect$attribute$fill = _rect$attribute.fill,
           fill = _rect$attribute$fill === void 0 ? rectAttribute.fill : _rect$attribute$fill,
@@ -29945,7 +29948,7 @@
       value: function setLineDash(segments) {
         var a = arguments,
           _context = this.nativeContext;
-        this.nativeContext.setLineDash ? _context.setLineDash(a[0]) : "mozDash" in _context ? _context.mozDash = a[0] : "webkitLineDash" in _context && (_context.webkitLineDash = a[0]);
+        this.nativeContext.setLineDash ? a[0] && _context.setLineDash(a[0]) : "mozDash" in _context ? _context.mozDash = a[0] : "webkitLineDash" in _context && (_context.webkitLineDash = a[0]);
       }
     }, {
       key: "stroke",
@@ -30066,7 +30069,7 @@
             lineCap = _attribute$lineCap === void 0 ? defaultParams.lineCap : _attribute$lineCap,
             _attribute$miterLimit = attribute.miterLimit,
             miterLimit = _attribute$miterLimit === void 0 ? defaultParams.miterLimit : _attribute$miterLimit;
-          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
+          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
     }, {
@@ -31525,7 +31528,7 @@
         if (this.nativeContext.setLineDash) {
           var lineDash = a[0];
           if (0 === lineDash[0] && 0 === lineDash[1]) return;
-          _context.setLineDash(lineDash);
+          lineDash && _context.setLineDash(lineDash);
         }
       }
     }, {
@@ -31550,7 +31553,7 @@
             lineCap = _attribute$lineCap === void 0 ? defaultParams.lineCap : _attribute$lineCap,
             _attribute$miterLimit = attribute.miterLimit,
             miterLimit = _attribute$miterLimit === void 0 ? defaultParams.miterLimit : _attribute$miterLimit;
-          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
+          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
     }, {
@@ -32432,7 +32435,7 @@
             lineCap = _attribute$lineCap === void 0 ? defaultParams.lineCap : _attribute$lineCap,
             _attribute$miterLimit = attribute.miterLimit,
             miterLimit = _attribute$miterLimit === void 0 ? defaultParams.miterLimit : _attribute$miterLimit;
-          _context.setGlobalAlpha(strokeOpacity * opacity), _context.setLineWidth(getScaledStroke(this, lineWidth, this.dpr)), _context.setStrokeStyle(createColor(this, stroke, params, offsetX, offsetY)), _context.setLineJoin(lineJoin), _context.setLineDash(lineDash), _context.setLineCap(lineCap), _context.setMiterLimit(miterLimit);
+          _context.setGlobalAlpha(strokeOpacity * opacity), _context.setLineWidth(getScaledStroke(this, lineWidth, this.dpr)), _context.setStrokeStyle(createColor(this, stroke, params, offsetX, offsetY)), _context.setLineJoin(lineJoin), lineDash && _context.setLineDash(lineDash), _context.setLineCap(lineCap), _context.setMiterLimit(miterLimit);
         }
       }
     }, {
@@ -34952,7 +34955,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.18.15";
+  const version = "0.18.17";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);