@visactor/vrender 0.17.8 → 0.17.9

package/cjs/index.d.ts

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

@@ -2728,6 +2728,63 @@
     out.a = scaleX * a1, out.b = scaleX * b1, out.c = scaleY * c1, out.d = scaleY * d1, out.e = oe + oa * rotateCenterX + oc * rotateCenterY - a1 * offsetX - c1 * offsetY, out.f = of + ob * rotateCenterX + od * rotateCenterY - b1 * offsetX - d1 * offsetY;
   }
 
+  var LRU = /*#__PURE__*/function () {
+    function LRU() {
+      _classCallCheck(this, LRU);
+      this.CLEAN_THRESHOLD = 1e3, this.L_TIME = 1e3, this.R_COUNT = 1, this.R_TIMESTAMP_MAX_SIZE = 20;
+    }
+    _createClass(LRU, [{
+      key: "clearCache",
+      value: function clearCache(cache, params) {
+        var _params$CLEAN_THRESHO = params.CLEAN_THRESHOLD,
+          CLEAN_THRESHOLD = _params$CLEAN_THRESHO === void 0 ? this.CLEAN_THRESHOLD : _params$CLEAN_THRESHO,
+          _params$L_TIME = params.L_TIME,
+          L_TIME = _params$L_TIME === void 0 ? this.L_TIME : _params$L_TIME,
+          _params$R_COUNT = params.R_COUNT,
+          R_COUNT = _params$R_COUNT === void 0 ? this.R_COUNT : _params$R_COUNT;
+        if (cache.size < CLEAN_THRESHOLD) return 0;
+        var clearNum = 0;
+        var clear = function clear(key) {
+            clearNum++, cache["delete"](key);
+          },
+          now = Date.now();
+        return cache.forEach(function (item, key) {
+          if (item.timestamp.length < R_COUNT) return clear(key);
+          var useCount = 0;
+          for (; now - item.timestamp[item.timestamp.length - 1 - useCount] < L_TIME && (useCount++, !(useCount >= R_COUNT)););
+          if (useCount < R_COUNT) return clear(key);
+          for (; now - item.timestamp[0] > L_TIME;) item.timestamp.shift();
+        }), clearNum;
+      }
+    }, {
+      key: "addLimitedTimestamp",
+      value: function addLimitedTimestamp(cacheItem, t, params) {
+        var _params$R_TIMESTAMP_M = params.R_TIMESTAMP_MAX_SIZE,
+          R_TIMESTAMP_MAX_SIZE = _params$R_TIMESTAMP_M === void 0 ? this.R_TIMESTAMP_MAX_SIZE : _params$R_TIMESTAMP_M;
+        cacheItem.timestamp.length > R_TIMESTAMP_MAX_SIZE && cacheItem.timestamp.shift(), cacheItem.timestamp.push(t);
+      }
+    }, {
+      key: "clearTimeStamp",
+      value: function clearTimeStamp(cache, params) {
+        var _params$L_TIME2 = params.L_TIME,
+          L_TIME = _params$L_TIME2 === void 0 ? this.L_TIME : _params$L_TIME2,
+          now = Date.now();
+        cache.forEach(function (item) {
+          for (; now - item.timestamp[0] > L_TIME;) item.timestamp.shift();
+        });
+      }
+    }, {
+      key: "clearItemTimestamp",
+      value: function clearItemTimestamp(cacheItem, params) {
+        var _params$L_TIME3 = params.L_TIME,
+          L_TIME = _params$L_TIME3 === void 0 ? this.L_TIME : _params$L_TIME3,
+          now = Date.now();
+        for (; now - cacheItem.timestamp[0] > L_TIME;) cacheItem.timestamp.shift();
+      }
+    }]);
+    return LRU;
+  }();
+
   function hslToRgb(h, s, l) {
     s /= 100, l /= 100;
     var c = (1 - Math.abs(2 * l - 1)) * s,
@@ -13351,19 +13408,27 @@
     }]);
     return ConicalCanvas;
   }();
-  var ColorInterpolate = /*#__PURE__*/function () {
+  var ColorInterpolate = /*#__PURE__*/function (_LRU) {
+    _inherits(ColorInterpolate, _LRU);
+    var _super = _createSuper(ColorInterpolate);
     function ColorInterpolate() {
+      var _this;
       var stops = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
       _classCallCheck(this, ColorInterpolate);
+      _this = _super.call(this), _this.cacheParams = {
+        CLEAN_THRESHOLD: 100,
+        L_TIME: 1e3
+      }, _this.dataMap = new Map();
       var canvas = ConicalCanvas.GetCanvas(),
         conicalCtx = ConicalCanvas.GetCtx();
-      if (canvas.width = precision, canvas.height = 1, !conicalCtx) return;
+      if (canvas.width = precision, canvas.height = 1, !conicalCtx) return _possibleConstructorReturn(_this);
       if (conicalCtx.translate(0, 0), !conicalCtx) throw new Error("获取ctx发生错误");
       var gradient = conicalCtx.createLinearGradient(0, 0, precision, 0);
       stops.forEach(function (stop) {
         gradient.addColorStop(stop[0], stop[1]);
-      }), conicalCtx.fillStyle = gradient, conicalCtx.fillRect(0, 0, precision, 1), this.rgbaSet = conicalCtx.getImageData(0, 0, precision, 1).data;
+      }), conicalCtx.fillStyle = gradient, conicalCtx.fillRect(0, 0, precision, 1), _this.rgbaSet = conicalCtx.getImageData(0, 0, precision, 1).data;
+      return _this;
     }
     _createClass(ColorInterpolate, [{
       key: "getColor",
@@ -13371,32 +13436,32 @@
         var rgba = this.rgbaSet.slice(4 * offset, 4 * offset + 4);
         return "rgba(".concat(rgba[0], ", ").concat(rgba[1], ", ").concat(rgba[2], ", ").concat(rgba[3] / 255, ")");
       }
-    }], [{
+    }, {
       key: "GetOrCreate",
-      value: function GetOrCreate() {
-        var stops = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        var precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
-        var str = "";
+      value: function GetOrCreate(x, y, w, h) {
+        var stops = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+        var precision = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 100;
+        var str = "".concat(x).concat(y).concat(w).concat(h);
         stops.forEach(function (item) {
           return str += item.join();
         }), str += precision;
-        var colorInter = ColorInterpolate.dataMap.get(str);
-        return colorInter || (colorInter = new ColorInterpolate(stops, precision), ColorInterpolate.dataMap.set(str, colorInter)), colorInter;
-      }
-    }, {
-      key: "SetColorInterpolateInstance",
-      value: function SetColorInterpolateInstance(stops, ins) {
-        ColorInterpolate.dataMap.set(stops, ins);
+        var colorInter = this.dataMap.get(str);
+        if (!colorInter) {
+          colorInter = {
+            data: new ColorInterpolate(stops, precision),
+            timestamp: []
+          }, this.addLimitedTimestamp(colorInter, Date.now(), {}), this.dataMap.set(str, colorInter);
+        }
+        return this.clearCache(this.dataMap, this.cacheParams), colorInter.data;
       }
-    }, {
-      key: "GetColorInterpolateInstance",
-      value: function GetColorInterpolateInstance(stops) {
-        return ColorInterpolate.dataMap.get(stops);
+    }], [{
+      key: "getInstance",
+      value: function getInstance() {
+        return ColorInterpolate._instance || (ColorInterpolate._instance = new ColorInterpolate()), ColorInterpolate._instance;
       }
     }]);
     return ColorInterpolate;
-  }();
-  ColorInterpolate.dataMap = new Map();
+  }(LRU);
   var ConicalPatternStore = /*#__PURE__*/function () {
     function ConicalPatternStore() {
       _classCallCheck(this, ConicalPatternStore);
@@ -13468,7 +13533,7 @@
     var r = Math.sqrt(Math.max(Math.max(Math.pow(x, 2) + Math.pow(y, 2), Math.pow(width - x, 2) + Math.pow(y, 2)), Math.max(Math.pow(width - x, 2) + Math.pow(height - y, 2), Math.pow(x, 2) + Math.pow(height - y, 2)))),
       stepNum = deltaDeg + 1,
       step = deltaAngle / Math.max(1, stepNum - 1),
-      colorInter = ColorInterpolate.GetOrCreate(stops, stepNum),
+      colorInter = ColorInterpolate.getInstance().GetOrCreate(x, y, width, height, stops, stepNum),
       lineWidth = 2 * Math.PI * r / 360;
     conicalCanvas.width = width, conicalCanvas.height = height, conicalCtx.setTransform(1, 0, 0, 1, 0, 0), conicalCtx.clearRect(0, 0, width, height), conicalCtx.translate(x, y), conicalCtx.rotate(startAngle);
     for (var i = 0, len = stepNum - 1; i < len && !(startAngle + i * step > endAngle); i++) {
@@ -34437,7 +34502,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.17.8";
+  const version = "0.17.9";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);