tvcharts 0.6.55 → 0.6.57
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 +199 -175
- package/dist/echarts.js.map +2 -2
- package/lib/component/table/TableModel.js +15 -0
- package/lib/component/table/TableView.js +30 -10
- package/lib/core/echarts.js +87 -47
- package/package.json +1 -1
- package/types/dist/echarts.d.ts +1 -2
- package/types/dist/shared.d.ts +1 -2
- package/types/src/component/table/TableModel.d.ts +6 -1
- package/types/src/core/echarts.d.ts +1 -2
package/dist/echarts.js
CHANGED
|
@@ -24487,15 +24487,14 @@ var ECharts = class extends Eventful_default {
|
|
|
24487
24487
|
disposedWarning(this.id);
|
|
24488
24488
|
return;
|
|
24489
24489
|
}
|
|
24490
|
-
let firstSeriesModel = void 0;
|
|
24491
|
-
let isUpdateData = false;
|
|
24492
24490
|
each(batch, (params, index) => {
|
|
24493
24491
|
const ecModel = this.getModel();
|
|
24494
24492
|
const seriesIndex = params.seriesIndex;
|
|
24495
24493
|
const seriesName = params.seriesName;
|
|
24496
24494
|
if (params.type === "component") {
|
|
24497
|
-
const tableModal = ecModel.findComponents({mainType: "table"})[0];
|
|
24498
|
-
|
|
24495
|
+
const tableModal = ecModel.findComponents({mainType: "table", query: {name: seriesName}})[0];
|
|
24496
|
+
tableModal.option.tables = params.data;
|
|
24497
|
+
tableModal.setAbleDataZoomUpdate(true);
|
|
24499
24498
|
return;
|
|
24500
24499
|
}
|
|
24501
24500
|
const seriesModel = seriesIndex !== void 0 ? ecModel.getSeriesByIndex(seriesIndex) : ecModel.getSeriesByName(seriesName)[0];
|
|
@@ -24504,8 +24503,6 @@ var ECharts = class extends Eventful_default {
|
|
|
24504
24503
|
}
|
|
24505
24504
|
const seriesData = seriesModel.getData();
|
|
24506
24505
|
const lastIndex = seriesData.count(true) - 1;
|
|
24507
|
-
const scale5 = seriesModel.coordinateSystem.getBaseAxis().scale;
|
|
24508
|
-
const ordinalMeta = scale5.getOrdinalMeta();
|
|
24509
24506
|
const isUpdate = params.operation === "update";
|
|
24510
24507
|
if (isUpdate) {
|
|
24511
24508
|
seriesModel.updateValue({data: map(params.data, (item, index2) => {
|
|
@@ -24514,7 +24511,6 @@ var ECharts = class extends Eventful_default {
|
|
|
24514
24511
|
item[0] = idx;
|
|
24515
24512
|
return item;
|
|
24516
24513
|
})});
|
|
24517
|
-
isUpdateData = true;
|
|
24518
24514
|
} else if (params.operation === "script") {
|
|
24519
24515
|
const categories = [];
|
|
24520
24516
|
const data = map(params.data, (item, index2) => {
|
|
@@ -24525,9 +24521,6 @@ var ECharts = class extends Eventful_default {
|
|
|
24525
24521
|
item.value[0] = idx;
|
|
24526
24522
|
return item;
|
|
24527
24523
|
});
|
|
24528
|
-
if (params.isMainSeries && data.length > 1) {
|
|
24529
|
-
ordinalMeta.appendData(categories);
|
|
24530
|
-
}
|
|
24531
24524
|
seriesModel.updateData({data});
|
|
24532
24525
|
} else {
|
|
24533
24526
|
const categories = [];
|
|
@@ -24538,46 +24531,51 @@ var ECharts = class extends Eventful_default {
|
|
|
24538
24531
|
item[0] = idx;
|
|
24539
24532
|
return item;
|
|
24540
24533
|
});
|
|
24541
|
-
if (params.isMainSeries) {
|
|
24542
|
-
ordinalMeta.appendData(categories);
|
|
24543
|
-
}
|
|
24544
24534
|
seriesModel.appendData({data: formatData});
|
|
24545
24535
|
}
|
|
24546
|
-
if (!firstSeriesModel) {
|
|
24547
|
-
firstSeriesModel = seriesModel;
|
|
24548
|
-
}
|
|
24549
24536
|
});
|
|
24550
|
-
if (!firstSeriesModel) {
|
|
24551
|
-
return;
|
|
24552
|
-
}
|
|
24553
|
-
const coordSys = firstSeriesModel.coordinateSystem;
|
|
24554
|
-
const baseAxis = coordSys.getBaseAxis();
|
|
24555
|
-
const scale4 = baseAxis.scale;
|
|
24556
|
-
const isMove = !isUpdateData && scale4.lastBarRightSideDiffBarCount < 1.5;
|
|
24557
|
-
const payload = {
|
|
24558
|
-
type: "dataZoom",
|
|
24559
|
-
barSpace: scale4.barSpace,
|
|
24560
|
-
lastBarRightSideDiffBarCount: isMove ? scale4.lastBarRightSideDiffBarCount - 1 : scale4.lastBarRightSideDiffBarCount
|
|
24561
|
-
};
|
|
24562
|
-
doDispatchAction.call(this, payload, true);
|
|
24563
24537
|
}
|
|
24564
|
-
updateXAxisData(time) {
|
|
24538
|
+
updateXAxisData(time, isAdd = true, connect2 = true) {
|
|
24565
24539
|
if (this._disposed) {
|
|
24566
24540
|
disposedWarning(this.id);
|
|
24567
24541
|
return;
|
|
24568
24542
|
}
|
|
24569
|
-
const
|
|
24570
|
-
|
|
24571
|
-
|
|
24572
|
-
|
|
24573
|
-
|
|
24574
|
-
|
|
24543
|
+
const groupId = this.group;
|
|
24544
|
+
if (connect2 && connectedGroups[groupId]) {
|
|
24545
|
+
each(instances2, function(chart) {
|
|
24546
|
+
if (chart.group !== groupId) {
|
|
24547
|
+
return;
|
|
24548
|
+
}
|
|
24549
|
+
const xAxisModal = chart._model.getComponent("xAxis", 0);
|
|
24550
|
+
const scale4 = xAxisModal.axis.scale;
|
|
24551
|
+
const ordinalMeta = scale4.getOrdinalMeta();
|
|
24552
|
+
const lastTime = ordinalMeta.getLastCategories();
|
|
24553
|
+
const isMove = isAdd && scale4.lastBarRightSideDiffBarCount < 1.5;
|
|
24554
|
+
if (isAdd && lastTime !== time) {
|
|
24555
|
+
ordinalMeta.appendData([time]);
|
|
24556
|
+
}
|
|
24557
|
+
const payload = {
|
|
24558
|
+
type: "dataZoom",
|
|
24559
|
+
barSpace: scale4.barSpace,
|
|
24560
|
+
lastBarRightSideDiffBarCount: isMove && lastTime !== time ? scale4.lastBarRightSideDiffBarCount - 1 : scale4.lastBarRightSideDiffBarCount
|
|
24561
|
+
};
|
|
24562
|
+
doDispatchAction.call(chart, payload, false);
|
|
24563
|
+
});
|
|
24564
|
+
} else {
|
|
24565
|
+
const xAxisModal = this._model.getComponent("xAxis", 0);
|
|
24566
|
+
const scale4 = xAxisModal.axis.scale;
|
|
24567
|
+
const ordinalMeta = scale4.getOrdinalMeta();
|
|
24568
|
+
const lastTime = ordinalMeta.getLastCategories();
|
|
24569
|
+
const isMove = isAdd && scale4.lastBarRightSideDiffBarCount < 1.5;
|
|
24570
|
+
if (isAdd && lastTime !== time) {
|
|
24571
|
+
ordinalMeta.appendData([time]);
|
|
24572
|
+
}
|
|
24575
24573
|
const payload = {
|
|
24576
24574
|
type: "dataZoom",
|
|
24577
24575
|
barSpace: scale4.barSpace,
|
|
24578
|
-
lastBarRightSideDiffBarCount:
|
|
24576
|
+
lastBarRightSideDiffBarCount: isMove && lastTime !== time ? scale4.lastBarRightSideDiffBarCount - 1 : scale4.lastBarRightSideDiffBarCount
|
|
24579
24577
|
};
|
|
24580
|
-
doDispatchAction.call(this, payload,
|
|
24578
|
+
doDispatchAction.call(this, payload, false);
|
|
24581
24579
|
}
|
|
24582
24580
|
}
|
|
24583
24581
|
scrollByDistance(distance2, animationDuration) {
|
|
@@ -55761,148 +55759,167 @@ var StrategyView2 = class extends Chart_default {
|
|
|
55761
55759
|
} else {
|
|
55762
55760
|
this._symbolGroup.removeAll();
|
|
55763
55761
|
}
|
|
55762
|
+
console.log("\u6E32\u67D3\u7B56\u75651213123");
|
|
55764
55763
|
const symbolGroup = this._symbolGroup;
|
|
55765
55764
|
const z2 = seriesModel.get("z2");
|
|
55766
55765
|
const upTriangle = data.getLayout("upTriangle");
|
|
55767
|
-
|
|
55768
|
-
|
|
55769
|
-
|
|
55770
|
-
|
|
55771
|
-
|
|
55772
|
-
|
|
55773
|
-
|
|
55774
|
-
|
|
55775
|
-
|
|
55776
|
-
|
|
55777
|
-
|
|
55778
|
-
|
|
55766
|
+
if (upTriangle && upTriangle.length) {
|
|
55767
|
+
const upTriangleEl = new SymbolPath_default2({
|
|
55768
|
+
shape: {
|
|
55769
|
+
points: upTriangle,
|
|
55770
|
+
size: TriangleSize
|
|
55771
|
+
},
|
|
55772
|
+
style: {
|
|
55773
|
+
fill: LongColor
|
|
55774
|
+
},
|
|
55775
|
+
z2
|
|
55776
|
+
});
|
|
55777
|
+
upTriangleEl.symbolProxy = createSymbol("triangleRight", 0, 0, 0, 0);
|
|
55778
|
+
symbolGroup.add(upTriangleEl);
|
|
55779
|
+
}
|
|
55779
55780
|
const closeUpTriangle = data.getLayout("closeUpTriangle");
|
|
55780
|
-
|
|
55781
|
-
|
|
55782
|
-
|
|
55783
|
-
|
|
55784
|
-
|
|
55785
|
-
|
|
55786
|
-
|
|
55787
|
-
|
|
55788
|
-
|
|
55789
|
-
|
|
55790
|
-
|
|
55791
|
-
|
|
55781
|
+
if (closeUpTriangle && closeUpTriangle.length) {
|
|
55782
|
+
const closeUpTriangleEl = new SymbolPath_default2({
|
|
55783
|
+
shape: {
|
|
55784
|
+
points: closeUpTriangle,
|
|
55785
|
+
size: TriangleSize
|
|
55786
|
+
},
|
|
55787
|
+
style: {
|
|
55788
|
+
fill: CloseColor
|
|
55789
|
+
},
|
|
55790
|
+
z2
|
|
55791
|
+
});
|
|
55792
|
+
closeUpTriangleEl.symbolProxy = createSymbol("triangleRight", 0, 0, 0, 0);
|
|
55793
|
+
symbolGroup.add(closeUpTriangleEl);
|
|
55794
|
+
}
|
|
55792
55795
|
const upArrow = data.getLayout("upArrow");
|
|
55793
|
-
|
|
55794
|
-
|
|
55795
|
-
|
|
55796
|
-
|
|
55797
|
-
|
|
55798
|
-
|
|
55799
|
-
|
|
55800
|
-
|
|
55801
|
-
|
|
55802
|
-
|
|
55803
|
-
|
|
55804
|
-
|
|
55805
|
-
|
|
55806
|
-
|
|
55807
|
-
|
|
55808
|
-
|
|
55809
|
-
|
|
55796
|
+
if (upArrow && upArrow.length) {
|
|
55797
|
+
const arrowUpEl = new SymbolPath_default2({
|
|
55798
|
+
shape: {
|
|
55799
|
+
points: upArrow,
|
|
55800
|
+
size: ArrowSize
|
|
55801
|
+
},
|
|
55802
|
+
style: {
|
|
55803
|
+
fill: LongColor
|
|
55804
|
+
},
|
|
55805
|
+
z2
|
|
55806
|
+
});
|
|
55807
|
+
arrowUpEl.symbolProxy = createSymbol("arrowUp", 0, 0, 0, 0);
|
|
55808
|
+
arrowUpEl.symbolProxy.shape = {
|
|
55809
|
+
...arrowUpEl.symbolProxy.shape,
|
|
55810
|
+
triangleWidth: 4,
|
|
55811
|
+
triangleHeight: 6
|
|
55812
|
+
};
|
|
55813
|
+
symbolGroup.add(arrowUpEl);
|
|
55814
|
+
}
|
|
55810
55815
|
const closeUpArrow = data.getLayout("closeUpArrow");
|
|
55811
|
-
|
|
55812
|
-
|
|
55813
|
-
|
|
55814
|
-
|
|
55815
|
-
|
|
55816
|
-
|
|
55817
|
-
|
|
55818
|
-
|
|
55819
|
-
|
|
55820
|
-
|
|
55821
|
-
|
|
55822
|
-
|
|
55823
|
-
|
|
55824
|
-
|
|
55825
|
-
|
|
55826
|
-
|
|
55827
|
-
|
|
55816
|
+
if (closeUpArrow && closeUpArrow.length) {
|
|
55817
|
+
const closeUpArrowEl = new SymbolPath_default2({
|
|
55818
|
+
shape: {
|
|
55819
|
+
points: closeUpArrow,
|
|
55820
|
+
size: ArrowSize
|
|
55821
|
+
},
|
|
55822
|
+
style: {
|
|
55823
|
+
fill: CloseColor
|
|
55824
|
+
},
|
|
55825
|
+
z2
|
|
55826
|
+
});
|
|
55827
|
+
closeUpArrowEl.symbolProxy = createSymbol("arrowUpClose", 0, 0, 0, 0);
|
|
55828
|
+
closeUpArrowEl.symbolProxy.shape = {
|
|
55829
|
+
...closeUpArrowEl.symbolProxy.shape,
|
|
55830
|
+
triangleWidth: 4,
|
|
55831
|
+
triangleHeight: 6
|
|
55832
|
+
};
|
|
55833
|
+
symbolGroup.add(closeUpArrowEl);
|
|
55834
|
+
}
|
|
55828
55835
|
const downTriangle = data.getLayout("downTriangle");
|
|
55829
|
-
|
|
55830
|
-
|
|
55831
|
-
|
|
55832
|
-
|
|
55833
|
-
|
|
55834
|
-
|
|
55835
|
-
|
|
55836
|
-
|
|
55837
|
-
|
|
55838
|
-
|
|
55839
|
-
|
|
55840
|
-
|
|
55836
|
+
if (downTriangle && downTriangle.length) {
|
|
55837
|
+
const downTriangleEl = new SymbolPath_default2({
|
|
55838
|
+
shape: {
|
|
55839
|
+
points: downTriangle,
|
|
55840
|
+
size: TriangleSize
|
|
55841
|
+
},
|
|
55842
|
+
style: {
|
|
55843
|
+
fill: ShortColor
|
|
55844
|
+
},
|
|
55845
|
+
z2
|
|
55846
|
+
});
|
|
55847
|
+
downTriangleEl.symbolProxy = createSymbol("triangleLeft", 0, 0, 0, 0);
|
|
55848
|
+
symbolGroup.add(downTriangleEl);
|
|
55849
|
+
}
|
|
55841
55850
|
const closeDownTriangle = data.getLayout("closeDownTriangle");
|
|
55842
|
-
|
|
55843
|
-
|
|
55844
|
-
|
|
55845
|
-
|
|
55846
|
-
|
|
55847
|
-
|
|
55848
|
-
|
|
55849
|
-
|
|
55850
|
-
|
|
55851
|
-
|
|
55852
|
-
|
|
55853
|
-
|
|
55851
|
+
if (closeDownTriangle && closeDownTriangle.length) {
|
|
55852
|
+
const closeDownTriangleEl = new SymbolPath_default2({
|
|
55853
|
+
shape: {
|
|
55854
|
+
points: closeDownTriangle,
|
|
55855
|
+
size: TriangleSize
|
|
55856
|
+
},
|
|
55857
|
+
style: {
|
|
55858
|
+
fill: CloseColor
|
|
55859
|
+
},
|
|
55860
|
+
z2
|
|
55861
|
+
});
|
|
55862
|
+
closeDownTriangleEl.symbolProxy = createSymbol("triangleLeft", 0, 0, 0, 0);
|
|
55863
|
+
symbolGroup.add(closeDownTriangleEl);
|
|
55864
|
+
}
|
|
55854
55865
|
const downArrow = data.getLayout("downArrow");
|
|
55855
|
-
|
|
55856
|
-
|
|
55857
|
-
|
|
55858
|
-
|
|
55859
|
-
|
|
55860
|
-
|
|
55861
|
-
|
|
55862
|
-
|
|
55863
|
-
|
|
55864
|
-
|
|
55865
|
-
|
|
55866
|
-
|
|
55867
|
-
|
|
55868
|
-
|
|
55869
|
-
|
|
55870
|
-
|
|
55871
|
-
|
|
55866
|
+
if (downArrow && downArrow.length) {
|
|
55867
|
+
const arrowDownEl = new SymbolPath_default2({
|
|
55868
|
+
shape: {
|
|
55869
|
+
points: downArrow,
|
|
55870
|
+
size: ArrowSize
|
|
55871
|
+
},
|
|
55872
|
+
style: {
|
|
55873
|
+
fill: ShortColor
|
|
55874
|
+
},
|
|
55875
|
+
z2
|
|
55876
|
+
});
|
|
55877
|
+
arrowDownEl.symbolProxy = createSymbol("arrowDown", 0, 0, 0, 0);
|
|
55878
|
+
arrowDownEl.symbolProxy.shape = {
|
|
55879
|
+
...arrowDownEl.symbolProxy.shape,
|
|
55880
|
+
triangleWidth: 4,
|
|
55881
|
+
triangleHeight: 6
|
|
55882
|
+
};
|
|
55883
|
+
symbolGroup.add(arrowDownEl);
|
|
55884
|
+
}
|
|
55872
55885
|
const closeDownArrow = data.getLayout("closeDownArrow");
|
|
55873
|
-
|
|
55874
|
-
|
|
55875
|
-
|
|
55876
|
-
|
|
55877
|
-
|
|
55878
|
-
|
|
55879
|
-
fill: CloseColor
|
|
55880
|
-
},
|
|
55881
|
-
z2
|
|
55882
|
-
});
|
|
55883
|
-
closeDownArrowEl.symbolProxy = createSymbol("arrowDownClose", 0, 0, 0, 0);
|
|
55884
|
-
closeDownArrowEl.symbolProxy.shape = {
|
|
55885
|
-
...closeDownArrowEl.symbolProxy.shape,
|
|
55886
|
-
triangleWidth: 4,
|
|
55887
|
-
triangleHeight: 6
|
|
55888
|
-
};
|
|
55889
|
-
symbolGroup.add(closeDownArrowEl);
|
|
55890
|
-
const texts = data.getLayout("texts");
|
|
55891
|
-
const textColor = seriesModel.get("textColor");
|
|
55892
|
-
each(texts, function(item) {
|
|
55893
|
-
const {text, point} = item;
|
|
55894
|
-
const el = new Text_default({
|
|
55886
|
+
if (closeDownArrow && closeDownArrow.length) {
|
|
55887
|
+
const closeDownArrowEl = new SymbolPath_default2({
|
|
55888
|
+
shape: {
|
|
55889
|
+
points: closeDownArrow,
|
|
55890
|
+
size: ArrowSize
|
|
55891
|
+
},
|
|
55895
55892
|
style: {
|
|
55896
|
-
|
|
55897
|
-
align: "center",
|
|
55898
|
-
fill: textColor ?? "#fff",
|
|
55899
|
-
fontSize: 12
|
|
55893
|
+
fill: CloseColor
|
|
55900
55894
|
},
|
|
55901
|
-
|
|
55902
|
-
y: point[1]
|
|
55895
|
+
z2
|
|
55903
55896
|
});
|
|
55904
|
-
|
|
55905
|
-
|
|
55897
|
+
closeDownArrowEl.symbolProxy = createSymbol("arrowDownClose", 0, 0, 0, 0);
|
|
55898
|
+
closeDownArrowEl.symbolProxy.shape = {
|
|
55899
|
+
...closeDownArrowEl.symbolProxy.shape,
|
|
55900
|
+
triangleWidth: 4,
|
|
55901
|
+
triangleHeight: 6
|
|
55902
|
+
};
|
|
55903
|
+
symbolGroup.add(closeDownArrowEl);
|
|
55904
|
+
}
|
|
55905
|
+
const texts = data.getLayout("texts");
|
|
55906
|
+
if (texts && texts.length) {
|
|
55907
|
+
const textColor = seriesModel.get("textColor");
|
|
55908
|
+
each(texts, function(item) {
|
|
55909
|
+
const {text, point} = item;
|
|
55910
|
+
const el = new Text_default({
|
|
55911
|
+
style: {
|
|
55912
|
+
text,
|
|
55913
|
+
align: "center",
|
|
55914
|
+
fill: textColor ?? "#fff",
|
|
55915
|
+
fontSize: 12
|
|
55916
|
+
},
|
|
55917
|
+
x: point[0],
|
|
55918
|
+
y: point[1]
|
|
55919
|
+
});
|
|
55920
|
+
symbolGroup.add(el);
|
|
55921
|
+
});
|
|
55922
|
+
}
|
|
55906
55923
|
}
|
|
55907
55924
|
remove(ecModel, api2) {
|
|
55908
55925
|
this._symbolGroup && this._symbolGroup.removeAll();
|
|
@@ -68809,6 +68826,10 @@ var TableModel2 = class extends Component_default {
|
|
|
68809
68826
|
constructor() {
|
|
68810
68827
|
super(...arguments);
|
|
68811
68828
|
this.type = TableModel2.type;
|
|
68829
|
+
this.ableDataZoomUpdate = false;
|
|
68830
|
+
}
|
|
68831
|
+
setAbleDataZoomUpdate(ableDataZoomUpdate) {
|
|
68832
|
+
this.ableDataZoomUpdate = ableDataZoomUpdate;
|
|
68812
68833
|
}
|
|
68813
68834
|
};
|
|
68814
68835
|
var TableModel = TableModel2;
|
|
@@ -68892,6 +68913,7 @@ function getXYByPosition(rect, position2, width, height, frame_width = 0) {
|
|
|
68892
68913
|
y: Math.floor(y)
|
|
68893
68914
|
};
|
|
68894
68915
|
}
|
|
68916
|
+
var computedText = new Text_default();
|
|
68895
68917
|
var TableView2 = class extends Component_default2 {
|
|
68896
68918
|
constructor() {
|
|
68897
68919
|
super(...arguments);
|
|
@@ -68899,16 +68921,19 @@ var TableView2 = class extends Component_default2 {
|
|
|
68899
68921
|
}
|
|
68900
68922
|
render(tableModel, ecModel, api2, payload) {
|
|
68901
68923
|
if (payload?.type === "dataZoom") {
|
|
68902
|
-
|
|
68924
|
+
if (!tableModel.ableDataZoomUpdate) {
|
|
68925
|
+
return;
|
|
68926
|
+
}
|
|
68927
|
+
tableModel.setAbleDataZoomUpdate(false);
|
|
68903
68928
|
}
|
|
68904
68929
|
this.group.removeAll();
|
|
68905
68930
|
if (!tableModel.get("show")) {
|
|
68906
68931
|
return;
|
|
68907
68932
|
}
|
|
68933
|
+
const tables = tableModel.get("tables");
|
|
68908
68934
|
const grid = ecModel.getComponent("grid", 0);
|
|
68909
68935
|
const z = tableModel.get("z");
|
|
68910
68936
|
const rect = grid.coordinateSystem.getRect();
|
|
68911
|
-
const tables = tableModel.get("tables");
|
|
68912
68937
|
const paddings = tableModel.get("paddings");
|
|
68913
68938
|
const tableAttrByIndex = {};
|
|
68914
68939
|
each(tables, function(item, index) {
|
|
@@ -68930,12 +68955,11 @@ var TableView2 = class extends Component_default2 {
|
|
|
68930
68955
|
fontSize,
|
|
68931
68956
|
fontFamily: text_font_family
|
|
68932
68957
|
}, ecModel);
|
|
68933
|
-
|
|
68934
|
-
|
|
68935
|
-
|
|
68936
|
-
|
|
68937
|
-
|
|
68938
|
-
}).getBoundingRect();
|
|
68958
|
+
computedText.useStyle({
|
|
68959
|
+
text,
|
|
68960
|
+
font
|
|
68961
|
+
});
|
|
68962
|
+
const textRect = computedText.getBoundingRect();
|
|
68939
68963
|
const textHight = height2 ? height2 / 100 * rect.height : textRect.height;
|
|
68940
68964
|
const textWidth = width2 ? width2 / 100 * rect.width : textRect.width + 2;
|
|
68941
68965
|
if (mergeCell) {
|