@visactor/vchart 1.13.19-alpha.0 → 1.13.19

package/build/index.es.js

@@ -64255,7 +64255,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.13.19-alpha.0";
+const version = "1.13.19";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -81485,11 +81485,11 @@ class CloudLayout extends BaseLayout {
       if (1 === this._placeStatus) {
         const maxSize0 = d.fontSize * this._originSize[0] / this.options.minFontSize,
           distSize0 = Math.max(d.width, d.height);
-        if (distSize0 <= maxSize0) this.expandBoard(this._board, this._bounds, distSize0 / this._size[0]);else {
+        if (distSize0 <= maxSize0) this._board = this.expandBoard(this._board, this._bounds, distSize0 / this._size[0]);else {
           if (!this.options.clip) return !0;
-          this.expandBoard(this._board, this._bounds, maxSize0 / this._size[0]);
+          this._board = this.expandBoard(this._board, this._bounds, maxSize0 / this._size[0]);
         }
-      } else this._placeStatus, this.expandBoard(this._board, this._bounds);
+      } else this._placeStatus, this._board = this.expandBoard(this._board, this._bounds);
       return this.updateBoardExpandStatus(d.fontSize), !1;
     }
     return this._tTemp = null, this._dtTemp = null, !0;
@@ -81500,7 +81500,7 @@ class CloudLayout extends BaseLayout {
       width: 1,
       height: 1
     }));
-    this.contextAndRatio = contextAndRatio, this._board = new Array((this._size[0] >> 5) * this._size[1]).fill(0), this._bounds = null;
+    this.contextAndRatio = contextAndRatio, this._board = new Uint32Array((this._size[0] >> 5) * this._size[1]).fill(0), this._bounds = null;
     words.length;
     this.result = [];
     const data = words.map((d, i) => ({
@@ -81567,18 +81567,33 @@ class CloudLayout extends BaseLayout {
     this._size = this._size.map(v => v * (1 - minRatio));
   }
   expandBoard(board, bounds, factor) {
-    const expandedLeftWidth = this._size[0] * (factor || 1.1) - this._size[0] >> 5;
+    const oldW = this._size[0],
+      oldH = this._size[1],
+      oldRowStride = oldW >> 5,
+      expandedLeftWidth = oldW * (factor || 1.1) - oldW >> 5;
     let diffWidth = 2 * expandedLeftWidth > 2 ? expandedLeftWidth : 2;
     diffWidth % 2 != 0 && diffWidth++;
-    let diffHeight = Math.ceil(this._size[1] * (diffWidth << 5) / this._size[0]);
+    let diffHeight = Math.ceil(oldH * (diffWidth << 5) / oldW);
     diffHeight % 2 != 0 && diffHeight++;
-    const w = this._size[0],
-      h = this._size[1],
-      widthArr = new Array(diffWidth).fill(0),
-      heightArr = new Array(diffHeight / 2 * (diffWidth + (w >> 5))).fill(0);
-    this.insertZerosToArray(board, h * (w >> 5), heightArr.length + diffWidth / 2);
-    for (let i = h - 1; i > 0; i--) this.insertZerosToArray(board, i * (w >> 5), widthArr.length);
-    this.insertZerosToArray(board, 0, heightArr.length + diffWidth / 2), this._size = [w + (diffWidth << 5), h + diffHeight], bounds && (bounds[0].x += (diffWidth << 5) / 2, bounds[0].y += diffHeight / 2, bounds[1].x += (diffWidth << 5) / 2, bounds[1].y += diffHeight / 2);
+    const newW = oldW + (diffWidth << 5),
+      newH = oldH + diffHeight,
+      newRowStride = newW >> 5,
+      paddingLeft = diffWidth / 2,
+      paddingTop = diffHeight / 2,
+      newBoard = new Uint32Array(newH * newRowStride).fill(0);
+    for (let y = 0; y < oldH; y++) {
+      const sourceStartIndex = y * oldRowStride,
+        sourceEndIndex = sourceStartIndex + oldRowStride,
+        destStartIndex = (y + paddingTop) * newRowStride + paddingLeft,
+        rowData = board.slice(sourceStartIndex, sourceEndIndex);
+      newBoard.set(rowData, destStartIndex);
+    }
+    if (this._size = [newW, newH], bounds) {
+      const offsetX = (diffWidth << 5) / 2,
+        offsetY = diffHeight / 2;
+      bounds[0].x += offsetX, bounds[0].y += offsetY, bounds[1].x += offsetX, bounds[1].y += offsetY;
+    }
+    return newBoard;
   }
   insertZerosToArray(array, index, length) {
     if (this.options.customInsertZerosToArray) return this.options.customInsertZerosToArray(array, index, length);

package/build/index.js

@@ -64261,7 +64261,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.19-alpha.0";
+    const version = "1.13.19";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -81491,11 +81491,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           if (1 === this._placeStatus) {
             const maxSize0 = d.fontSize * this._originSize[0] / this.options.minFontSize,
               distSize0 = Math.max(d.width, d.height);
-            if (distSize0 <= maxSize0) this.expandBoard(this._board, this._bounds, distSize0 / this._size[0]);else {
+            if (distSize0 <= maxSize0) this._board = this.expandBoard(this._board, this._bounds, distSize0 / this._size[0]);else {
               if (!this.options.clip) return !0;
-              this.expandBoard(this._board, this._bounds, maxSize0 / this._size[0]);
+              this._board = this.expandBoard(this._board, this._bounds, maxSize0 / this._size[0]);
             }
-          } else this._placeStatus, this.expandBoard(this._board, this._bounds);
+          } else this._placeStatus, this._board = this.expandBoard(this._board, this._bounds);
           return this.updateBoardExpandStatus(d.fontSize), !1;
         }
         return this._tTemp = null, this._dtTemp = null, !0;
@@ -81506,7 +81506,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           width: 1,
           height: 1
         }));
-        this.contextAndRatio = contextAndRatio, this._board = new Array((this._size[0] >> 5) * this._size[1]).fill(0), this._bounds = null;
+        this.contextAndRatio = contextAndRatio, this._board = new Uint32Array((this._size[0] >> 5) * this._size[1]).fill(0), this._bounds = null;
         words.length;
         this.result = [];
         const data = words.map((d, i) => ({
@@ -81573,18 +81573,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         this._size = this._size.map(v => v * (1 - minRatio));
       }
       expandBoard(board, bounds, factor) {
-        const expandedLeftWidth = this._size[0] * (factor || 1.1) - this._size[0] >> 5;
+        const oldW = this._size[0],
+          oldH = this._size[1],
+          oldRowStride = oldW >> 5,
+          expandedLeftWidth = oldW * (factor || 1.1) - oldW >> 5;
         let diffWidth = 2 * expandedLeftWidth > 2 ? expandedLeftWidth : 2;
         diffWidth % 2 != 0 && diffWidth++;
-        let diffHeight = Math.ceil(this._size[1] * (diffWidth << 5) / this._size[0]);
+        let diffHeight = Math.ceil(oldH * (diffWidth << 5) / oldW);
         diffHeight % 2 != 0 && diffHeight++;
-        const w = this._size[0],
-          h = this._size[1],
-          widthArr = new Array(diffWidth).fill(0),
-          heightArr = new Array(diffHeight / 2 * (diffWidth + (w >> 5))).fill(0);
-        this.insertZerosToArray(board, h * (w >> 5), heightArr.length + diffWidth / 2);
-        for (let i = h - 1; i > 0; i--) this.insertZerosToArray(board, i * (w >> 5), widthArr.length);
-        this.insertZerosToArray(board, 0, heightArr.length + diffWidth / 2), this._size = [w + (diffWidth << 5), h + diffHeight], bounds && (bounds[0].x += (diffWidth << 5) / 2, bounds[0].y += diffHeight / 2, bounds[1].x += (diffWidth << 5) / 2, bounds[1].y += diffHeight / 2);
+        const newW = oldW + (diffWidth << 5),
+          newH = oldH + diffHeight,
+          newRowStride = newW >> 5,
+          paddingLeft = diffWidth / 2,
+          paddingTop = diffHeight / 2,
+          newBoard = new Uint32Array(newH * newRowStride).fill(0);
+        for (let y = 0; y < oldH; y++) {
+          const sourceStartIndex = y * oldRowStride,
+            sourceEndIndex = sourceStartIndex + oldRowStride,
+            destStartIndex = (y + paddingTop) * newRowStride + paddingLeft,
+            rowData = board.slice(sourceStartIndex, sourceEndIndex);
+          newBoard.set(rowData, destStartIndex);
+        }
+        if (this._size = [newW, newH], bounds) {
+          const offsetX = (diffWidth << 5) / 2,
+            offsetY = diffHeight / 2;
+          bounds[0].x += offsetX, bounds[0].y += offsetY, bounds[1].x += offsetX, bounds[1].y += offsetY;
+        }
+        return newBoard;
       }
       insertZerosToArray(array, index, length) {
         if (this.options.customInsertZerosToArray) return this.options.customInsertZerosToArray(array, index, length);