tvcharts 0.8.59 → 0.8.60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/echarts.js +52 -14
- package/dist/echarts.js.map +2 -2
- package/lib/util/states.js +1 -1
- package/package.json +2 -2
- package/types/dist/echarts.d.ts +1 -1
- package/types/dist/shared.d.ts +1 -1
package/dist/echarts.js
CHANGED
|
@@ -11945,7 +11945,7 @@ function handleGlobalMouseOverForHighDown(dispatcher, e2, api2) {
|
|
|
11945
11945
|
const groupId = ecData.groupId;
|
|
11946
11946
|
if (groupId) {
|
|
11947
11947
|
const highlightDisabled = api2.getHighlightDisabled();
|
|
11948
|
-
if (highlightDisabled) {
|
|
11948
|
+
if (highlightDisabled || e2.zrByTouch) {
|
|
11949
11949
|
return;
|
|
11950
11950
|
}
|
|
11951
11951
|
const dispatchers2 = findGroupHighDownDispatchers(groupId, api2);
|
|
@@ -42032,7 +42032,7 @@ var RoamController = class extends Eventful_default {
|
|
|
42032
42032
|
if (isTaken(this._zr, "globalPan")) {
|
|
42033
42033
|
return;
|
|
42034
42034
|
}
|
|
42035
|
-
const scale4 = e2.pinchScale;
|
|
42035
|
+
const scale4 = e2.pinchScale > 1 ? 1.05 : 1 / 1.05;
|
|
42036
42036
|
checkPointerAndTrigger(this, "zoom", "zoomOnMouseWheel", e2, {
|
|
42037
42037
|
scale: scale4,
|
|
42038
42038
|
originX: e2.pinchX,
|
|
@@ -42053,6 +42053,8 @@ var RoamController = class extends Eventful_default {
|
|
|
42053
42053
|
lastBarRightSideDiffBarCount: Math.round(newPos / this.minScrollUnit) * this.minScrollUnit
|
|
42054
42054
|
});
|
|
42055
42055
|
requestAnimationFrame_default(() => this._kineticScroll());
|
|
42056
|
+
} else {
|
|
42057
|
+
trigger(this, "dragEnd", "moveOnMouseMove", {}, {isAvailableBehavior: null});
|
|
42056
42058
|
}
|
|
42057
42059
|
}
|
|
42058
42060
|
_startKineticScroll() {
|
|
@@ -58345,7 +58347,9 @@ var BoxesView2 = class extends Chart_default {
|
|
|
58345
58347
|
align: item.align,
|
|
58346
58348
|
fill: item.text_color ?? "#fff",
|
|
58347
58349
|
fontSize: item.text_size,
|
|
58348
|
-
overflow: item.text_wrap === "wrap_auto" ? "breakAll" : "none"
|
|
58350
|
+
overflow: item.text_wrap === "wrap_auto" ? "breakAll" : "none",
|
|
58351
|
+
fontStyle: item.fontStyle,
|
|
58352
|
+
fontWeight: item.fontWeight
|
|
58349
58353
|
};
|
|
58350
58354
|
const el = new Text_default({
|
|
58351
58355
|
style: {
|
|
@@ -58584,7 +58588,9 @@ var BoxesLayout = {
|
|
|
58584
58588
|
text_halign,
|
|
58585
58589
|
text_size,
|
|
58586
58590
|
text_valign,
|
|
58587
|
-
text_wrap
|
|
58591
|
+
text_wrap,
|
|
58592
|
+
fontStyle,
|
|
58593
|
+
fontWeight
|
|
58588
58594
|
} = itemModel.get("itemStyle");
|
|
58589
58595
|
if (!border_color && !text && !bgcolor) {
|
|
58590
58596
|
continue;
|
|
@@ -58612,7 +58618,9 @@ var BoxesLayout = {
|
|
|
58612
58618
|
width: width2,
|
|
58613
58619
|
height,
|
|
58614
58620
|
x,
|
|
58615
|
-
y
|
|
58621
|
+
y,
|
|
58622
|
+
fontStyle,
|
|
58623
|
+
fontWeight
|
|
58616
58624
|
});
|
|
58617
58625
|
}
|
|
58618
58626
|
points4.push(left, right, startPoint[1], endPoint[1]);
|
|
@@ -59869,7 +59877,9 @@ var LabelsView2 = class extends Chart_default {
|
|
|
59869
59877
|
point,
|
|
59870
59878
|
offset = [0, 0],
|
|
59871
59879
|
textBorderColor,
|
|
59872
|
-
textBorderWidth
|
|
59880
|
+
textBorderWidth,
|
|
59881
|
+
fontStyle,
|
|
59882
|
+
fontWeight
|
|
59873
59883
|
} = item;
|
|
59874
59884
|
const el = new Text_default({
|
|
59875
59885
|
style: {
|
|
@@ -59881,7 +59891,9 @@ var LabelsView2 = class extends Chart_default {
|
|
|
59881
59891
|
stroke: textBorderColor,
|
|
59882
59892
|
lineWidth: textBorderWidth,
|
|
59883
59893
|
x: point[0] + offset[0],
|
|
59884
|
-
y: point[1] + offset[1]
|
|
59894
|
+
y: point[1] + offset[1],
|
|
59895
|
+
fontStyle,
|
|
59896
|
+
fontWeight
|
|
59885
59897
|
}
|
|
59886
59898
|
});
|
|
59887
59899
|
el.states.emphasis = emphasisState;
|
|
@@ -60279,6 +60291,8 @@ var labelsLayout = {
|
|
|
60279
60291
|
const textShow = labelModel.show;
|
|
60280
60292
|
let fontSize = labelModel.fontSize;
|
|
60281
60293
|
let position2 = labelModel.position || "top";
|
|
60294
|
+
const fontStyle = labelModel.fontStyle;
|
|
60295
|
+
const fontWeight = labelModel.fontWeight;
|
|
60282
60296
|
if (location === "top" || location === "belowbar") {
|
|
60283
60297
|
position2 = "bottom";
|
|
60284
60298
|
}
|
|
@@ -60291,7 +60305,13 @@ var labelsLayout = {
|
|
|
60291
60305
|
let textRect = void 0;
|
|
60292
60306
|
if (textShow) {
|
|
60293
60307
|
const textSize = fontSize ? fontSize + "px" : gfontSize;
|
|
60294
|
-
|
|
60308
|
+
const font = trim([
|
|
60309
|
+
fontStyle || "",
|
|
60310
|
+
fontWeight || "",
|
|
60311
|
+
textSize,
|
|
60312
|
+
labelModel.fontFamily || gfontFamily
|
|
60313
|
+
].join(" "));
|
|
60314
|
+
textRect = getTextRect2(text, font);
|
|
60295
60315
|
if (isLabel) {
|
|
60296
60316
|
symbolSize = [textRect.width + HPadding, textRect.height + VPadding];
|
|
60297
60317
|
}
|
|
@@ -60353,7 +60373,9 @@ var labelsLayout = {
|
|
|
60353
60373
|
fontFamily: labelModel.fontFamily,
|
|
60354
60374
|
offset: [oldOffset[0] + symbolOffset[0], oldOffset[1] + symbolOffset[1]],
|
|
60355
60375
|
textBorderColor: labelModel.textBorderColor,
|
|
60356
|
-
textBorderWidth: labelModel.textBorderWidth
|
|
60376
|
+
textBorderWidth: labelModel.textBorderWidth,
|
|
60377
|
+
fontStyle,
|
|
60378
|
+
fontWeight
|
|
60357
60379
|
});
|
|
60358
60380
|
}
|
|
60359
60381
|
}
|
|
@@ -73085,12 +73107,24 @@ var TableView2 = class extends Component_default2 {
|
|
|
73085
73107
|
if (!cellItem) {
|
|
73086
73108
|
return;
|
|
73087
73109
|
}
|
|
73088
|
-
const {
|
|
73110
|
+
const {
|
|
73111
|
+
column,
|
|
73112
|
+
row,
|
|
73113
|
+
text,
|
|
73114
|
+
width: width2,
|
|
73115
|
+
height: height2,
|
|
73116
|
+
text_size,
|
|
73117
|
+
text_font_family = DefaultFamily,
|
|
73118
|
+
fontStyle,
|
|
73119
|
+
fontWeight
|
|
73120
|
+
} = cellItem;
|
|
73089
73121
|
const mergeCell = margeCellByKey[row + ":" + column];
|
|
73090
73122
|
const fontSize = getSymbolLabelFontSize(text_size);
|
|
73091
73123
|
const font = getFont({
|
|
73092
73124
|
fontSize,
|
|
73093
|
-
fontFamily: text_font_family
|
|
73125
|
+
fontFamily: text_font_family,
|
|
73126
|
+
fontStyle,
|
|
73127
|
+
fontWeight
|
|
73094
73128
|
}, ecModel);
|
|
73095
73129
|
computedText.useStyle({
|
|
73096
73130
|
text,
|
|
@@ -73178,7 +73212,9 @@ var TableView2 = class extends Component_default2 {
|
|
|
73178
73212
|
text_halign,
|
|
73179
73213
|
text_color,
|
|
73180
73214
|
bgcolor: bgcolor2,
|
|
73181
|
-
text_valign
|
|
73215
|
+
text_valign,
|
|
73216
|
+
fontStyle,
|
|
73217
|
+
fontWeight
|
|
73182
73218
|
} = cellItem;
|
|
73183
73219
|
const fontSize = getSymbolLabelFontSize(text_size);
|
|
73184
73220
|
const {x: x2} = columnObjByIndex[column];
|
|
@@ -73219,7 +73255,9 @@ var TableView2 = class extends Component_default2 {
|
|
|
73219
73255
|
fontFamily: text_font_family,
|
|
73220
73256
|
verticalAlign,
|
|
73221
73257
|
align,
|
|
73222
|
-
overflow: "truncate"
|
|
73258
|
+
overflow: "truncate",
|
|
73259
|
+
fontStyle,
|
|
73260
|
+
fontWeight
|
|
73223
73261
|
},
|
|
73224
73262
|
x: x2 + getTextXOffset(width2, align, 0),
|
|
73225
73263
|
y: y2 + getTextYOffset(height2, verticalAlign, 0),
|
|
@@ -76498,7 +76536,7 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
|
|
|
76498
76536
|
el.ignore = false;
|
|
76499
76537
|
}
|
|
76500
76538
|
const text = labelData.text;
|
|
76501
|
-
const countDownText = countDown && countDown.show && formatSeconds(countDown.value) || "";
|
|
76539
|
+
const countDownText = countDown && countDown.show && countDown.value > 0 && formatSeconds(countDown.value) || "";
|
|
76502
76540
|
const renderText = countDownText.length > text.length ? countDownText : text;
|
|
76503
76541
|
const font = getFont(textStyle, markerModel.ecModel);
|
|
76504
76542
|
const textRect = getBoundingRect(renderText, font);
|