tvcharts 0.6.38 → 0.6.40

package/dist/echarts.js

@@ -894,7 +894,12 @@ function hexToRgba(hex) {
 function parseRgbaString(rgba) {
   const match = rgba.match(/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(,\s*([\d.]+)\s*)?\)/);
   if (!match) {
-    throw new Error("Invalid RGBA string format.");
+    return {
+      r: 0,
+      g: 0,
+      b: 0,
+      a: 0
+    };
   }
   const a = match[5] !== void 0 ? parseFloat(match[5]) : 1;
   return {
@@ -904,7 +909,7 @@ function parseRgbaString(rgba) {
     a
   };
 }
-function colorToRgba(color2) {
+function colorToRgba(color2 = "") {
   if (colorCache.get(color2)) {
     return colorCache.get(color2);
   }
@@ -914,7 +919,12 @@ function colorToRgba(color2) {
   } else if (color2.startsWith("rgb")) {
     rgbaColor = parseRgbaString(color2);
   } else {
-    throw new Error("Unsupported color format.");
+    rgbaColor = {
+      r: 0,
+      g: 0,
+      b: 0,
+      a: 0
+    };
   }
   colorCache.put(color2, rgbaColor);
   return rgbaColor;
@@ -7185,7 +7195,7 @@ function getElementSSRData(el) {
 function registerSSRDataGetter(getter) {
   ssrDataGetter = getter;
 }
-var version = "5.6.5";
+var version = "5.6.6";
 
 // src/util/number.ts
 var RADIAN_EPSILON = 1e-4;
@@ -55255,7 +55265,10 @@ var linesPlotLayout = {
             return;
           }
           const dataModal = lineData.getItemModel(index);
-          const symbolColor = dataModal.get("itemStyle")?.color || defaultColor;
+          const symbolColor = dataModal.get("itemStyle")?.color;
+          if (!symbolColor) {
+            return;
+          }
           const symbol = dataModal.get("symbol");
           const symbolKey = `${symbol}`;
           const symbolData = symbolPointsByColor[symbolKey] || [];
@@ -68077,7 +68090,7 @@ TableModel.type = "table";
 TableModel.defaultOption = {
   z: 6,
   tables: [],
-  paddings: 8
+  paddings: 10
 };
 var TableModel_default = TableModel;
 
@@ -68175,20 +68188,35 @@ var TableView2 = class extends Component_default2 {
     each(tables, function(item, index) {
       const columnWidthByIndex = [];
       const rowHeightByIndex = [];
+      const margeCellByKey = {};
+      item.merge_cells?.forEach((item2) => {
+        margeCellByKey[item2.start_row + ":" + item2.start_column] = item2;
+      });
       each(item.cell, function(cell) {
         each(cell, function(cellItem) {
           if (!cellItem) {
             return;
           }
           const {column, row, text, width: width2, height: height2, text_size, text_font_family} = cellItem;
+          const mergeCell = margeCellByKey[row + ":" + column];
           const fontSize = getSymbolLabelFontSize(text_size);
           const font = getFont({
             fontSize,
             fontFamily: text_font_family
           }, ecModel);
-          const textRect = getBoundingRect(text, font);
+          const textRect = new Text_default({
+            style: {
+              text,
+              font
+            }
+          }).getBoundingRect();
           const textHight = height2 ? height2 / 100 * rect.height : textRect.height;
           const textWidth = width2 ? width2 / 100 * rect.width : textRect.width + 2;
+          if (mergeCell) {
+            columnWidthByIndex[column] = Math.floor(Math.max(0, columnWidthByIndex[column] || 0));
+            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));
         });
@@ -68198,6 +68226,7 @@ var TableView2 = class extends Component_default2 {
       for (let index2 = 0; index2 < columnWidthByIndex.length; index2++) {
         const columnWidth = columnWidthByIndex[index2];
         if (!columnWidth) {
+          columnObjByIndex[index2] = {x: width, width: 0};
           continue;
         }
         const last = index2 === columnWidthByIndex.length - 1;
@@ -68209,6 +68238,7 @@ var TableView2 = class extends Component_default2 {
       for (let index2 = 0; index2 < rowHeightByIndex.length; index2++) {
         const rowHeight = rowHeightByIndex[index2];
         if (!rowHeight) {
+          rowObjByIndex[index2] = {y: height, height: 0};
           continue;
         }
         const last = index2 === rowHeightByIndex.length - 1;
@@ -68228,19 +68258,55 @@ var TableView2 = class extends Component_default2 {
     const group = this.group;
     each(tables, function(item, index) {
       const {x, y, columnObjByIndex, rowObjByIndex, width, height} = tableAttrByIndex[index];
-      const {bgcolor, frame_color, frame_width = 0, border_width = 0, border_color} = item;
+      const {bgcolor, frame_color, frame_width = 0, border_width = 0, border_color, columns} = item;
       const tableGroup = new Group_default({x, y});
+      const margeCellByKey = {};
+      item.merge_cells?.forEach((item2) => {
+        margeCellByKey[item2.start_row + ":" + item2.start_column] = item2;
+      });
       each(item.cell, function(cell) {
         each(cell, function(cellItem) {
           if (!cellItem) {
             return;
           }
-          const {column, row, text, text_size, text_font_family, text_halign, text_color, bgcolor: bgcolor2, text_valign} = cellItem;
+          const {
+            column,
+            row,
+            text,
+            text_size,
+            text_font_family,
+            text_halign,
+            text_color,
+            bgcolor: bgcolor2,
+            text_valign
+          } = cellItem;
           const fontSize = getSymbolLabelFontSize(text_size);
-          const {width: width2, x: x2} = columnObjByIndex[column];
-          const {height: height2, y: y2} = rowObjByIndex[row];
+          const {x: x2} = columnObjByIndex[column];
+          let width2 = columnObjByIndex[column].width;
+          const {y: y2} = rowObjByIndex[row];
+          let height2 = rowObjByIndex[row].height;
           const align = getAlign(text_halign);
           const verticalAlign = getVerticalAlign(text_valign);
+          const mergeCell = margeCellByKey[row + ":" + column];
+          if (mergeCell) {
+            const {end_column, end_row} = mergeCell;
+            const mergeColumnIndex = end_column;
+            for (let i = column + 1; i <= mergeColumnIndex; i++) {
+              const w = columnObjByIndex[i]?.width;
+              if (w) {
+                width2 = width2 + w + paddings + item.border_width;
+              }
+            }
+            ;
+            const mergeRowIndex = end_row;
+            for (let i = row + 1; i <= mergeRowIndex; i++) {
+              const h = rowObjByIndex[i]?.height;
+              if (h) {
+                height2 = height2 + h + paddings + item.border_width;
+              }
+            }
+            ;
+          }
           const textEl = new Text_default({
             style: {
               text,
@@ -68261,54 +68327,43 @@ var TableView2 = class extends Component_default2 {
             z2: 10
           });
           tableGroup.add(textEl);
+          if (border_width && border_color) {
+            const cellColumn = mergeCell ? mergeCell.end_column : column;
+            const isLastColumn = cellColumn === columns - 1;
+            const startPoint = [x2, y2 - border_width / 2];
+            const midPoint = [
+              x2 + width2 + paddings + (isLastColumn ? 0 : border_width / 2),
+              y2 - (row ? border_width / 2 : 0)
+            ];
+            const endPoint = [
+              x2 + width2 + paddings + border_width / 2,
+              y2 + height2 + paddings
+            ];
+            const points4 = [midPoint];
+            if (row) {
+              points4.unshift(startPoint);
+            }
+            if (!isLastColumn) {
+              points4.push(endPoint);
+            }
+            if (points4.length < 2) {
+              return;
+            }
+            const lineEl = new Polyline_default({
+              shape: {
+                points: points4
+              },
+              style: {
+                stroke: border_color,
+                lineWidth: border_width
+              },
+              z,
+              z2: 11
+            });
+            tableGroup.add(lineEl);
+          }
         });
       });
-      if (border_width && border_color) {
-        for (let index2 = 0; index2 < columnObjByIndex.length; index2++) {
-          const obj = columnObjByIndex[index2];
-          const hide = index2 === 0 || !obj;
-          if (hide) {
-            continue;
-          }
-          const lineEl = new Line_default({
-            shape: {
-              x1: obj.x - border_width / 2,
-              y1: 0,
-              x2: obj.x - border_width / 2,
-              y2: height
-            },
-            style: {
-              stroke: border_color,
-              lineWidth: border_width
-            },
-            z,
-            z2: 11
-          });
-          tableGroup.add(lineEl);
-        }
-        for (let index2 = 0; index2 < rowObjByIndex.length; index2++) {
-          const obj = rowObjByIndex[index2];
-          const hide = index2 === 0 || !obj;
-          if (hide) {
-            continue;
-          }
-          const lineEl = new Line_default({
-            shape: {
-              x1: 0,
-              y1: obj.y - border_width / 2,
-              x2: width,
-              y2: obj.y - border_width / 2
-            },
-            style: {
-              stroke: border_color,
-              lineWidth: border_width
-            },
-            z,
-            z2: 11
-          });
-          tableGroup.add(lineEl);
-        }
-      }
       if (bgcolor) {
         const rectEl = new Rect_default({
           shape: {
@@ -70357,6 +70412,42 @@ MarkLabelModal.defaultOption = {
 };
 var MarkLabelModal_default = MarkLabelModal;
 
+// src/util/color.ts
+function parseColor(color2) {
+  if (color2.startsWith("#")) {
+    color2 = color2.slice(1);
+    if (color2.length === 3) {
+      color2 = color2.split("").map((c) => c + c).join("");
+    }
+    if (color2.length !== 6 || !/^[0-9A-Fa-f]{6}$/.test(color2)) {
+      return [0, 0, 0];
+    }
+    return [
+      parseInt(color2.slice(0, 2), 16),
+      parseInt(color2.slice(2, 4), 16),
+      parseInt(color2.slice(4, 6), 16)
+    ];
+  }
+  const match = color2.match(/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})(?:\s*,\s*[\d.]+)?\s*\)/);
+  if (!match) {
+    return [0, 0, 0];
+  }
+  return [
+    parseInt(match[1], 10),
+    parseInt(match[2], 10),
+    parseInt(match[3], 10)
+  ];
+}
+function contrastColor2(color2) {
+  const [r, g, b] = parseColor(color2);
+  const brightness = (r * 299 + g * 587 + b * 114) / 1e3;
+  return brightness >= 128 ? "#000000" : "#ffffff";
+}
+function removeTransparency(color2) {
+  const [r, g, b] = parseColor(color2);
+  return `rgb(${r}, ${g}, ${b})`;
+}
+
 // src/component/marker/MarkLabelView.ts
 var markerTypeCalculator2 = {
   dataMin: (item, seriesModel) => {
@@ -70401,8 +70492,8 @@ var markerTypeCalculator2 = {
     return {
       value: seriesData.getByRawIndex(item.valueDim, lastIndex),
       labelTextStyle: {
-        fill: "#fff",
-        backgroundColor: fill,
+        fill: contrastColor2(fill),
+        backgroundColor: removeTransparency(fill),
         borderWidth: 0
       }
     };