tvcharts 0.6.98 → 0.6.99

package/dist/echarts.js

@@ -55728,6 +55728,7 @@ function getVisualGradient2(data, coordSys, api2) {
 function getAreaGradient(data, seriesModel, api2) {
   const colorStopsInRange = [];
   const areaGradient = seriesModel.get("areaGradient");
+  const height = api2.getHeight();
   const valueByType = {
     start: 0,
     end: 1
@@ -55737,10 +55738,8 @@ function getAreaGradient(data, seriesModel, api2) {
   }
   const coordSys = seriesModel.coordinateSystem;
   const axis = coordSys.getAxis("y");
-  const extent3 = axis.getExtent();
-  const span = extent3[1] - extent3[0];
   each(areaGradient, function(item) {
-    const offset = valueByType[item.type] ?? axis.toGlobalCoord(axis.dataToCoord(item.value)) / span;
+    const offset = valueByType[item.type] ?? axis.toGlobalCoord(axis.dataToCoord(item.value)) / height;
     if (offset < 0 || offset > 1) {
       return;
     }
@@ -55749,7 +55748,7 @@ function getAreaGradient(data, seriesModel, api2) {
       offset
     });
   });
-  const gradient = new LinearGradient_default(0, extent3[0], 0, extent3[1], colorStopsInRange, true);
+  const gradient = new LinearGradient_default(0, 0, 0, height, colorStopsInRange, true);
   return gradient;
 }
 var LinesPlotView2 = class extends Chart_default {
@@ -55831,6 +55830,7 @@ var LinesPlotView2 = class extends Chart_default {
       const z2 = seriesModel.get("z2");
       const baseY = seriesModel.coordinateSystem.dataToPoint([0, histbase])[1];
       const visualColor = getAreaGradient(data, seriesModel, api2);
+      console.log("%c [ visualColor ]-353", "font-size:13px; background:pink; color:#bf2c9f;", visualColor);
       each(linePointsByKey, function(item, key) {
         const [stroke] = key.split(":");
         const {color: color2, isDefaultColor} = getFormatColor(stroke);
@@ -57219,8 +57219,8 @@ var MinePolyLinesLayout = {
         const linesPointLayouts = [];
         for (let i = params.start; i < params.end; i++) {
           const itemModel = data.getItemModel(i);
-          const {width, color: color2, lineStyle, fill = "none", closed = false, curved = false} = itemModel.get("itemStyle");
-          if (!color2) {
+          const {width, color: color2 = "none", lineStyle, fill = "none", closed = false, curved = false} = itemModel.get("itemStyle");
+          if (color2 === "none" && fill === "none") {
             continue;
           }
           const key = `${color2}:${width}:${lineStyle}:${fill}:${closed}:${curved}`;
@@ -57812,7 +57812,7 @@ var BoxesLayout = {
             text_valign,
             text_wrap
           } = itemModel.get("itemStyle");
-          if (!border_color) {
+          if (!border_color && !text && !bgcolor) {
             continue;
           }
           const key = `${border_color}:${border_width}:${style}:${bgcolor}`;
@@ -71762,21 +71762,21 @@ function getAlign(str) {
 function getTextXOffset(width, align, paddings) {
   switch (align) {
     case "center":
-      return width / 2 + paddings / 2;
+      return width / 2;
     case "right":
-      return width + paddings;
+      return width - paddings;
     default:
-      return 0;
+      return paddings;
   }
 }
 function getTextYOffset(height, align, paddings) {
   switch (align) {
     case "middle":
-      return height / 2 + paddings / 2;
+      return height / 2;
     case "bottom":
-      return height + paddings;
+      return height - paddings;
     default:
-      return 0;
+      return paddings;
   }
 }
 function getXYByPosition(rect, position2, width, height, frame_width = 0) {
@@ -71872,15 +71872,20 @@ var TableView2 = class extends Component_default2 {
             font
           });
           const textRect = computedText.getBoundingRect();
-          const textHight = height2 ? height2 / 100 * rect.height : textRect.height;
-          const textWidth = width2 ? width2 / 100 * rect.width : textRect.width + 2;
-          if (mergeCell) {
+          const textHight = height2 ? Math.max(height2 / 100 * rect.height, 1) : textRect.height + paddings;
+          const textWidth = width2 ? Math.max(width2 / 100 * rect.width, 1) : textRect.width + 2 + paddings;
+          const isMergeColumn = mergeCell && mergeCell.start_column !== mergeCell.end_column;
+          const isMergeRow = mergeCell && mergeCell.start_row !== mergeCell.end_row;
+          if (isMergeColumn) {
             columnWidthByIndex[column] = Math.floor(Math.max(0, columnWidthByIndex[column] || 0));
+          } else {
+            columnWidthByIndex[column] = Math.floor(Math.max(textWidth, columnWidthByIndex[column] || 0));
+          }
+          if (isMergeRow) {
+            rowHeightByIndex[row] = Math.floor(Math.max(0, rowHeightByIndex[row] || 0));
+          } else {
             rowHeightByIndex[row] = Math.floor(Math.max(textHight, rowHeightByIndex[row] || 0));
-            return;
           }
-          columnWidthByIndex[column] = Math.floor(Math.max(textWidth, columnWidthByIndex[column] || 0));
-          rowHeightByIndex[row] = Math.floor(Math.max(textHight, rowHeightByIndex[row] || 0));
         });
       });
       let width = 0;
@@ -71893,7 +71898,7 @@ var TableView2 = class extends Component_default2 {
         }
         const last = index2 === columnWidthByIndex.length - 1;
         columnObjByIndex[index2] = {x: width, width: columnWidth};
-        width = width + columnWidth + paddings + (last ? 0 : item.border_width || 0);
+        width = width + columnWidth + (last ? 0 : item.border_width || 0);
       }
       let height = 0;
       const rowObjByIndex = [];
@@ -71905,7 +71910,7 @@ var TableView2 = class extends Component_default2 {
         }
         const last = index2 === rowHeightByIndex.length - 1;
         rowObjByIndex[index2] = {y: height, height: rowHeight};
-        height = height + rowHeight + paddings + (last ? 0 : item.border_width || 0);
+        height = height + rowHeight + (last ? 0 : item.border_width || 0);
       }
       const {x, y} = getXYByPosition(rect, item.position, width, height, item.frame_width);
       tableAttrByIndex[index] = {
@@ -71956,7 +71961,7 @@ var TableView2 = class extends Component_default2 {
             for (let i = column + 1; i <= mergeColumnIndex; i++) {
               const w = columnObjByIndex[i]?.width;
               if (w) {
-                width2 = width2 + w + paddings + item.border_width;
+                width2 = width2 + w + item.border_width;
               }
             }
             ;
@@ -71964,7 +71969,7 @@ var TableView2 = class extends Component_default2 {
             for (let i = row + 1; i <= mergeRowIndex; i++) {
               const h = rowObjByIndex[i]?.height;
               if (h) {
-                height2 = height2 + h + paddings + item.border_width;
+                height2 = height2 + h + item.border_width;
               }
             }
             ;
@@ -71973,7 +71978,6 @@ var TableView2 = class extends Component_default2 {
             style: {
               text,
               backgroundColor: bgcolor2,
-              padding: paddings / 2,
               fill: text_color,
               width: width2,
               height: height2,
@@ -71983,8 +71987,8 @@ var TableView2 = class extends Component_default2 {
               align,
               overflow: "truncate"
             },
-            x: x2 + getTextXOffset(width2, align, paddings),
-            y: y2 + getTextYOffset(height2, verticalAlign, paddings),
+            x: x2 + getTextXOffset(width2, align, paddings / 2),
+            y: y2 + getTextYOffset(height2, verticalAlign, paddings / 2),
             z,
             z2: 10
           });
@@ -71994,12 +71998,12 @@ var TableView2 = class extends Component_default2 {
             const isLastColumn = cellColumn === columns - 1;
             const startPoint = [x2, y2 - border_width / 2];
             const midPoint = [
-              x2 + width2 + paddings + (isLastColumn ? 0 : border_width / 2),
+              x2 + width2 + (isLastColumn ? 0 : border_width / 2),
               y2 - (row ? border_width / 2 : 0)
             ];
             const endPoint = [
-              x2 + width2 + paddings + border_width / 2,
-              y2 + height2 + paddings
+              x2 + width2 + border_width / 2,
+              y2 + height2
             ];
             const points4 = [midPoint];
             if (row) {
@@ -74306,8 +74310,9 @@ var markerTypeCalculator2 = {
     const count2 = seriesData.count(true);
     const axisModel = seriesModel.getBaseAxis();
     const extent3 = axisModel.scale.getExtent();
-    const lastIndex = extent3[1];
-    if (lastIndex >= count2) {
+    const offset = seriesModel.get("offset") || 0;
+    const lastIndex = extent3[1] + offset;
+    if (lastIndex >= count2 || lastIndex < 0) {
       return null;
     }
     const backgroundColor2 = seriesModel.ecModel.get("backgroundColor");
@@ -74333,8 +74338,9 @@ var markerTypeCalculator2 = {
     const count2 = seriesData.count(true);
     const axisModel = seriesModel.getBaseAxis();
     const extent3 = axisModel.scale.getExtent();
-    const lastIndex = extent3[1];
-    if (lastIndex >= count2) {
+    const offset = seriesModel.get("offset") || 0;
+    const lastIndex = extent3[1] + offset;
+    if (lastIndex >= count2 || lastIndex < 0) {
       return markerTypeCalculator2.rawLast(item, seriesModel);
     }
     return markerTypeCalculator2.last(item, seriesModel);