tvcharts 0.5.91 → 0.5.93

package/dist/echarts.js

@@ -16266,11 +16266,6 @@ echarts.use([${seriesImportName}]);`);
     delete option[OPTION_INNER_KEY];
     return option;
   }
-  setTheme(theme2) {
-    this._theme = new Model_default(theme2);
-    mergeTheme(this.option, this._theme.option);
-    this._mergeOption(this.option, null);
-  }
   getTheme() {
     return this._theme;
   }
@@ -16467,7 +16462,6 @@ GlobalModel.internalField = function() {
     mergeTheme(baseOption, ecModel._theme.option);
     merge(baseOption, globalDefault_default, false);
     ecModel._mergeOption(baseOption, null);
-    console.log("%c [ baseOption ]-970", "font-size:13px; background:pink; color:#bf2c9f;", baseOption, ecModel._optionManager);
   };
 }();
 function isNotTargetSeries(seriesModel, payload) {
@@ -23522,16 +23516,6 @@ var ECharts = class extends Eventful_default {
     };
     doDispatchAction.call(this, payload, true);
   }
-  changeTheme(theme2) {
-    if (isString(theme2)) {
-      theme2 = themeStorage[theme2];
-    }
-    theme2 = clone(theme2);
-    theme2 && globalBackwardCompat(theme2, true);
-    this._theme = theme2;
-    this._model.setTheme(theme2);
-    updateMethods.update.call(this);
-  }
 };
 PENDING_UPDATE, IN_MAIN_PROCESS_KEY, CONNECT_STATUS_KEY, STATUS_NEEDS_UPDATE_KEY;
 ECharts.internalField = function() {
@@ -26275,11 +26259,11 @@ var intradayWeightDivisors = [
   {divisor: hours(12), weight: TickMarkWeight.Hour12}
 ];
 function weightByTime(currentDate, prevDate) {
-  if (currentDate.getUTCFullYear() !== prevDate.getUTCFullYear()) {
+  if (currentDate.getFullYear() !== prevDate.getFullYear()) {
     return TickMarkWeight.Year;
-  } else if (currentDate.getUTCMonth() !== prevDate.getUTCMonth()) {
+  } else if (currentDate.getMonth() !== prevDate.getMonth()) {
     return TickMarkWeight.Month;
-  } else if (currentDate.getUTCDate() !== prevDate.getUTCDate()) {
+  } else if (currentDate.getDate() !== prevDate.getDate()) {
     return TickMarkWeight.Day;
   }
   for (let i = intradayWeightDivisors.length - 1; i >= 0; --i) {
@@ -26337,12 +26321,7 @@ var OrdinalMeta = class {
       timePoints.push({
         originalTime: value,
         index,
-        timestamp: d.getTime() / 1e3,
-        businessDay: {
-          day: d.getUTCDate(),
-          month: d.getUTCMonth() + 1,
-          year: d.getUTCFullYear()
-        }
+        timestamp: d.getTime() / 1e3
       });
     };
     const categories = data && map(data, (val, index) => {
@@ -27901,18 +27880,19 @@ function niceScaleExtent(scale4, inModel) {
   const extentInfo = getScaleExtent(scale4, model);
   const extent3 = extentInfo.extent;
   let splitNumber = model.get("splitNumber");
-  const splitDistance = model.get("splitDistance");
+  const splitIntervalByFontSize = model.get("splitIntervalByFontSize");
   if (scale4 instanceof Log_default) {
     scale4.base = model.get("logBase");
   }
   const scaleType = scale4.type;
   const interval = model.get("interval");
   const isIntervalOrTime = scaleType === "interval" || scaleType === "time";
-  if (splitDistance) {
+  if (splitIntervalByFontSize) {
+    const fontSize = model.get("axisLabel").fontSize ?? 12;
     const axis = model.axis;
     const rect = axis.grid.getRect();
     const length2 = axis.dim === "y" ? rect.height : rect.width;
-    splitNumber = Math.ceil(length2 / splitDistance);
+    splitNumber = Math.ceil(length2 / (fontSize * 4));
   }
   scale4.setExtent(extent3[0], extent3[1]);
   scale4.calcNiceExtent({
@@ -28550,7 +28530,7 @@ function weightToTickMarkType(weight, timeVisible, secondsVisible) {
   }
 }
 function defaultTickMarkFormatter(timePoint, tickMarkType, locale) {
-  const formatOptions = {};
+  const formatOptions = {timeZone: "Asia/Shanghai"};
   switch (tickMarkType) {
     case TickMarkType.Year:
       formatOptions.year = "numeric";
@@ -28575,7 +28555,7 @@ function defaultTickMarkFormatter(timePoint, tickMarkType, locale) {
     default:
       return "";
   }
-  const date = timePoint.businessDay === void 0 ? new Date(timePoint.timestamp * 1e3) : new Date(Date.UTC(timePoint.businessDay.year, timePoint.businessDay.month - 1, timePoint.businessDay.day));
+  const date = new Date(timePoint.timestamp * 1e3);
   return date.toLocaleString(locale, formatOptions);
 }
 
@@ -28679,7 +28659,9 @@ function calculateCategoryInterval(axis) {
   const axisExtent = axis.getExtent();
   const ordinalExtent = ordinalScale.getExtent();
   if (axis.model.get("segmentedByTime")) {
-    return Math.round(80 / ordinalScale.barSpace);
+    const labelModel = axis.getLabelModel();
+    const fontSize = typeof labelModel.get("fontSize") === "number" ? +labelModel.get("fontSize") : 12;
+    return Math.round((fontSize + 4) * 5 / ordinalScale.barSpace);
   }
   const params = fetchAutoCategoryIntervalCalculationParams(axis);
   const labelFormatter = makeLabelFormatter(axis);
@@ -38037,7 +38019,9 @@ var builders = {
       applyTransform(pt12, pt12, matrix13);
       applyTransform(pt22, pt22, matrix13);
     }
-    const style = extend({}, axisModel.getModel(["axisBackground", "backStyle"]).getAreaStyle());
+    const style = {
+      fill: axisModel.ecModel.get("backgroundColor")
+    };
     const position2 = axisModel.axis.position;
     const api2 = axisModel.ecModel.scheduler.api;
     const pt = inverse ? pt22 : pt12;
@@ -60592,8 +60576,6 @@ var GraphicComponentView2 = class extends Component_default2 {
     }
     const elMap = this._elMap;
     const rootGroup = this.group;
-    const that = this;
-    const elLabelMap = that._elLabelMap;
     const globalZ = graphicModel.get("z");
     const globalZLevel = graphicModel.get("zlevel");
     each(elOptionsToUpdate, function(elOption) {
@@ -65090,23 +65072,6 @@ var TitleView2 = class extends Component_default2 {
     };
     textEl.setStyle(alignStyle);
     subTextEl.setStyle(alignStyle);
-    groupRect = group.getBoundingRect();
-    const padding = layoutRect.margin;
-    const style = titleModel.getItemStyle(["color", "opacity"]);
-    style.fill = titleModel.get("backgroundColor");
-    const rect = new Rect_default({
-      shape: {
-        x: groupRect.x - padding[3],
-        y: groupRect.y - padding[0],
-        width: groupRect.width + padding[1] + padding[3],
-        height: groupRect.height + padding[0] + padding[2],
-        r: titleModel.get("borderRadius")
-      },
-      style,
-      subPixelOptimize: true,
-      silent: true
-    });
-    group.add(rect);
   }
 };
 var TitleView = TitleView2;
@@ -67051,7 +67016,6 @@ function install43(registers) {
 // src/component/marker/MarkLabelModal.ts
 var defaultDataOption = {
   textStyle: {
-    padding: [4, 6, 2, 8],
     fill: "#fff",
     backgroundColor: "#26A69A"
   },
@@ -67248,6 +67212,7 @@ var MarkLabelView2 = class extends Component_default2 {
         }
         item.text = ["last"].includes(item.type) ? yAxisModel.scale.getLabel({value}, {precision: item.precision}) : value.toFixed(item.precision);
         const y = yAxisModel.toGlobalCoord(yAxisModel.dataToCoord(value));
+        const fontSize = yAxisModel.getLabelModel().option.fontSize;
         if (el) {
           updateLabel({
             el,
@@ -67257,7 +67222,8 @@ var MarkLabelView2 = class extends Component_default2 {
             labelData: item,
             markerModel,
             position: yAxisModel.position,
-            labelTextStyle
+            labelTextStyle,
+            fontSize
           });
         } else {
           el = createLabel({
@@ -67267,7 +67233,8 @@ var MarkLabelView2 = class extends Component_default2 {
             labelData: item,
             markerModel,
             position: yAxisModel.position,
-            labelTextStyle
+            labelTextStyle,
+            fontSize
           });
           markerGroupMap.set(item.name, el);
           this.group.add(el);
@@ -67324,16 +67291,17 @@ var MarkLabelView2 = class extends Component_default2 {
         each(label.children, (item) => {
           const option = item;
           let el = graphicLabelElMap.get(option.id);
-          const y = yAxisModel.toGlobalCoord(yAxisModel.dataToCoord(option.y)) - 9;
+          const y = yAxisModel.toGlobalCoord(yAxisModel.dataToCoord(option.y));
           const style = option.style;
           if (yAxisModel.scale.type === "percentage") {
             const formatLabel2 = yAxisModel.scale.getLabel({value: +option.style.text});
             option.style = Object.assign({}, option.style, {text: formatLabel2});
           }
+          const fontSize = yAxisModel.getLabelModel().option.fontSize;
           if (el) {
-            updateText({el, gridRect, position: position2, option, ecModel, y, offset});
+            updateText({el, gridRect, position: position2, option, ecModel, y, offset, fontSize});
           } else {
-            el = createText({gridRect, position: position2, option, ecModel, y, offset});
+            el = createText({gridRect, position: position2, option, ecModel, y, offset, fontSize});
             graphLabelGroup.add(el);
             graphicLabelElMap.set(option.id, el);
             inner21(el).yAxisIndex = yAxisModel.index;
@@ -67355,7 +67323,7 @@ var MarkLabelView2 = class extends Component_default2 {
       }
       const gridRect = yAxisModel.grid.getRect();
       const position2 = yAxisModel.position;
-      const y = yAxisModel.toGlobalCoord(yAxisModel.dataToCoord(inner21(el).originalValue)) - 9;
+      const y = yAxisModel.toGlobalCoord(yAxisModel.dataToCoord(inner21(el).originalValue));
       const offset = yAxisModel.model.get("offset") || 0;
       let style = inner21(el).style;
       if (yAxisModel.scale.type === "percentage") {
@@ -67408,23 +67376,25 @@ var MarkLabelView = MarkLabelView2;
 MarkLabelView.type = "markLabel";
 function labelAvoidOverlap(labels, marginTop = 0) {
   labels.sort((a, b) => inner21(a).y - inner21(b).y);
+  const height = labels[0].isGroup ? labels[0].children().find((item) => item.type === "text").getBoundingRect().height : labels[0].getBoundingRect().height;
   const sortYbyId = {};
+  const offestY = height / 2;
   for (let i = 1; i < labels.length; i++) {
     const prevLabel = labels[i - 1];
     const prevLabelY = sortYbyId[prevLabel.id] ?? inner21(prevLabel).y;
     const currentLabel = labels[i];
-    const prevHeight = 18 + marginTop;
+    const prevHeight = height + marginTop;
     let currentLabelY = inner21(currentLabel).y;
     if (prevLabelY > currentLabelY || Math.abs(currentLabelY - prevLabelY) < prevHeight) {
       currentLabelY = prevLabelY + prevHeight;
     }
     sortYbyId[currentLabel.id] = currentLabelY;
     if (currentLabel.type === "text") {
-      currentLabel.y = Math.floor(currentLabelY);
+      currentLabel.y = Math.floor(currentLabelY) - offestY;
     } else {
       each(currentLabel.children(), (item) => {
         if (item.type === "text") {
-          item.y = Math.floor(currentLabelY);
+          item.y = Math.floor(currentLabelY) - offestY;
         }
       });
     }
@@ -67436,7 +67406,14 @@ function getLeftTextX(x, text, textStyle, ecModel) {
   const paddings = normalizeCssArray2(textStyle.padding || 0);
   return x - textRect.width - paddings[1] - paddings[3] - (textStyle.borderWidth || 0) - 1;
 }
-function createText({option, gridRect, position: position2, ecModel, y, offset}) {
+function getPaddingByStyle(fontsize, borderWidth = 0) {
+  const [top, right, bottom, left] = [4, 6, 2, 8];
+  const diff = fontsize - 12;
+  const xLength = diff - borderWidth;
+  const yLength = diff * 0.25;
+  return [top + yLength, right + xLength, bottom + yLength, left + xLength];
+}
+function createText({option, gridRect, position: position2, ecModel, y, offset, fontSize}) {
   const isLeft = position2 === "left";
   const {style, zlevel} = option;
   const startX = isLeft ? gridRect.x - offset : gridRect.x + gridRect.width + offset;
@@ -67444,31 +67421,32 @@ function createText({option, gridRect, position: position2, ecModel, y, offset})
   const textEl = new Text_default({
     x,
     y,
-    style,
+    style: Object.assign(style, {fontSize, padding: getPaddingByStyle(fontSize, style.borderWidth)}),
     z: 101,
     zlevel
   });
   inner21(textEl).y = y;
   return textEl;
 }
-function updateText({option, gridRect, position: position2, ecModel, el, y, offset}) {
+function updateText({option, gridRect, position: position2, ecModel, el, y, offset, fontSize}) {
   const isLeft = position2 === "left";
   const startX = isLeft ? gridRect.x - offset : gridRect.x + gridRect.width + offset;
   const {style} = option;
   const x = isLeft ? getLeftTextX(startX, style.text, style, ecModel) : startX;
   el.x = x;
   el.y = y;
-  el.attr("style", style);
+  el.attr("style", fontSize ? Object.assign(style, {fontSize, padding: getPaddingByStyle(fontSize, style.borderWidth)}) : style);
   inner21(el).y = y;
 }
-function createLabel({x, y, labelData, markerModel, gridRect, position: position2, labelTextStyle}) {
+function createLabel({x, y, labelData, markerModel, gridRect, position: position2, labelTextStyle, fontSize}) {
   const {zlevel} = markerModel.option;
-  const {textStyle, lineStyle, showLine, showName, showTitle, title} = labelData;
+  const {lineStyle, showLine, showName, showTitle, title} = labelData;
+  const textStyle = Object.assign(labelData.textStyle ?? {}, {fontSize, padding: getPaddingByStyle(fontSize, labelData.textStyle.borderWidth)});
   const text = labelData.text;
   const labelTitle = title || labelData.name;
   const isLeft = position2 === "left";
   const group = new Group_default();
-  const labelY = y - 9;
+  const labelY = y;
   const borderWidth = textStyle.borderWidth ?? 0;
   const textEl = new Text_default({
     x: isLeft ? getLeftTextX(x, text, textStyle, markerModel.ecModel) : x,
@@ -67506,14 +67484,15 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   group.add(textNameEl);
   return group;
 }
-function updateLabel({x, y, labelData, markerModel, gridRect, position: position2, el, labelTextStyle}) {
-  const {textStyle = {}, lineStyle, showLine, showName, showTitle, title} = labelData;
+function updateLabel({x, y, labelData, markerModel, gridRect, position: position2, el, labelTextStyle, fontSize}) {
+  const {lineStyle, showLine, showName, showTitle, title} = labelData;
+  const textStyle = Object.assign(labelData.textStyle ?? {}, {fontSize, padding: getPaddingByStyle(fontSize, labelData.textStyle.borderWidth)});
   const borderWidth = textStyle.borderWidth ?? 0;
   const isLeft = position2 === "left";
   if (el.ignore) {
     el.ignore = false;
   }
-  const labelY = y - 9;
+  const labelY = y;
   inner21(el).y = labelY;
   each(el.children(), (element) => {
     const labelType = inner21(element).labelType;