tvcharts 0.6.57 → 0.6.58
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 +92 -25
- package/dist/echarts.js.map +2 -2
- package/lib/chart/labels/LabelsSeries.js +30 -0
- package/lib/core/echarts.js +31 -42
- package/lib/data/DataStore.js +10 -0
- package/lib/data/SeriesData.js +8 -0
- package/lib/data/helper/dataProvider.js +10 -3
- package/lib/model/Series.js +17 -1
- package/package.json +1 -1
- package/types/dist/echarts.d.ts +8 -0
- package/types/dist/shared.d.ts +8 -0
- package/types/src/chart/labels/LabelsSeries.d.ts +5 -1
- package/types/src/data/DataStore.d.ts +1 -0
- package/types/src/data/SeriesData.d.ts +5 -0
- package/types/src/data/helper/dataProvider.d.ts +2 -0
- package/types/src/model/Series.d.ts +1 -0
package/dist/echarts.js
CHANGED
|
@@ -17802,6 +17802,8 @@ var DefaultDataProvider2 = class {
|
|
|
17802
17802
|
}
|
|
17803
17803
|
appendData(newData) {
|
|
17804
17804
|
}
|
|
17805
|
+
resetData(newData) {
|
|
17806
|
+
}
|
|
17805
17807
|
updateData(newData) {
|
|
17806
17808
|
return {update: 0};
|
|
17807
17809
|
}
|
|
@@ -17873,7 +17875,8 @@ DefaultDataProvider.internalField = function() {
|
|
|
17873
17875
|
[SOURCE_FORMAT_ARRAY_ROWS + "_" + SERIES_LAYOUT_BY_COLUMN]: {
|
|
17874
17876
|
pure: true,
|
|
17875
17877
|
appendData: appendDataSimply,
|
|
17876
|
-
updateData: updateDataSimply
|
|
17878
|
+
updateData: updateDataSimply,
|
|
17879
|
+
resetData: resetDataSimply
|
|
17877
17880
|
},
|
|
17878
17881
|
[SOURCE_FORMAT_ARRAY_ROWS + "_" + SERIES_LAYOUT_BY_ROW]: {
|
|
17879
17882
|
pure: true,
|
|
@@ -17884,7 +17887,8 @@ DefaultDataProvider.internalField = function() {
|
|
|
17884
17887
|
[SOURCE_FORMAT_OBJECT_ROWS]: {
|
|
17885
17888
|
pure: true,
|
|
17886
17889
|
appendData: appendDataSimply,
|
|
17887
|
-
updateData: updateDataSimply
|
|
17890
|
+
updateData: updateDataSimply,
|
|
17891
|
+
resetData: resetDataSimply
|
|
17888
17892
|
},
|
|
17889
17893
|
[SOURCE_FORMAT_KEYED_COLUMNS]: {
|
|
17890
17894
|
pure: true,
|
|
@@ -17900,7 +17904,8 @@ DefaultDataProvider.internalField = function() {
|
|
|
17900
17904
|
},
|
|
17901
17905
|
[SOURCE_FORMAT_ORIGINAL]: {
|
|
17902
17906
|
appendData: appendDataSimply,
|
|
17903
|
-
updateData: updateDataSimply
|
|
17907
|
+
updateData: updateDataSimply,
|
|
17908
|
+
resetData: resetDataSimply
|
|
17904
17909
|
},
|
|
17905
17910
|
[SOURCE_FORMAT_TYPED_ARRAY]: {
|
|
17906
17911
|
persistent: false,
|
|
@@ -17922,6 +17927,9 @@ DefaultDataProvider.internalField = function() {
|
|
|
17922
17927
|
this._data.push(newData[i]);
|
|
17923
17928
|
}
|
|
17924
17929
|
}
|
|
17930
|
+
function resetDataSimply(newData) {
|
|
17931
|
+
this._data = newData;
|
|
17932
|
+
}
|
|
17925
17933
|
function updateDataSimply(newData) {
|
|
17926
17934
|
const data = this._data;
|
|
17927
17935
|
let lastIndex = data.length - 1;
|
|
@@ -18873,6 +18881,16 @@ var DataStore2 = class {
|
|
|
18873
18881
|
}
|
|
18874
18882
|
return [start2, end2];
|
|
18875
18883
|
}
|
|
18884
|
+
resetUpdateData(data) {
|
|
18885
|
+
if (true) {
|
|
18886
|
+
assert(!this._indices, "appendData can only be called on raw data.");
|
|
18887
|
+
}
|
|
18888
|
+
const provider = this._provider;
|
|
18889
|
+
provider.resetData(data);
|
|
18890
|
+
const end2 = provider.count();
|
|
18891
|
+
this._initDataFromProvider(0, end2);
|
|
18892
|
+
return [0, end2];
|
|
18893
|
+
}
|
|
18876
18894
|
updateData(data) {
|
|
18877
18895
|
if (true) {
|
|
18878
18896
|
assert(!this._indices, "appendData can only be called on raw data.");
|
|
@@ -20064,6 +20082,7 @@ var SeriesModel2 = class extends Component_default {
|
|
|
20064
20082
|
inner2(this).dataBeforeProcessed = data;
|
|
20065
20083
|
autoSeriesName(this);
|
|
20066
20084
|
this._initSelectedMapFromData(data);
|
|
20085
|
+
console.log("%c [ data ]-241", "font-size:13px; background:pink; color:#bf2c9f;", data);
|
|
20067
20086
|
}
|
|
20068
20087
|
mergeDefaultAndTheme(option, ecModel) {
|
|
20069
20088
|
const layoutMode = fetchLayoutMode(this);
|
|
@@ -20121,7 +20140,18 @@ var SeriesModel2 = class extends Component_default {
|
|
|
20121
20140
|
}
|
|
20122
20141
|
updateData(params) {
|
|
20123
20142
|
const data = this.getRawData();
|
|
20124
|
-
|
|
20143
|
+
const formatData = this.getFormatUpdateData(params.data);
|
|
20144
|
+
if (formatData) {
|
|
20145
|
+
data.resetUpdateData(formatData);
|
|
20146
|
+
return;
|
|
20147
|
+
}
|
|
20148
|
+
const lastIndex = data.count(true) - 1;
|
|
20149
|
+
const list = map(params.data, (item, index) => {
|
|
20150
|
+
const idx = lastIndex + index;
|
|
20151
|
+
item.value[0] = idx;
|
|
20152
|
+
return item;
|
|
20153
|
+
});
|
|
20154
|
+
data.updateData(list);
|
|
20125
20155
|
}
|
|
20126
20156
|
getData(dataType) {
|
|
20127
20157
|
const task = getCurrentTask(this);
|
|
@@ -20278,6 +20308,9 @@ var SeriesModel2 = class extends Component_default {
|
|
|
20278
20308
|
}
|
|
20279
20309
|
return universalTransitionOpt && universalTransitionOpt.enabled;
|
|
20280
20310
|
}
|
|
20311
|
+
getFormatUpdateData(data) {
|
|
20312
|
+
return;
|
|
20313
|
+
}
|
|
20281
20314
|
_innerSelect(data, innerDataIndices) {
|
|
20282
20315
|
const option = this.option;
|
|
20283
20316
|
const selectedMode = option.selectedMode;
|
|
@@ -24493,7 +24526,7 @@ var ECharts = class extends Eventful_default {
|
|
|
24493
24526
|
const seriesName = params.seriesName;
|
|
24494
24527
|
if (params.type === "component") {
|
|
24495
24528
|
const tableModal = ecModel.findComponents({mainType: "table", query: {name: seriesName}})[0];
|
|
24496
|
-
tableModal.
|
|
24529
|
+
tableModal.mergeTables(params.data);
|
|
24497
24530
|
tableModal.setAbleDataZoomUpdate(true);
|
|
24498
24531
|
return;
|
|
24499
24532
|
}
|
|
@@ -24507,27 +24540,16 @@ var ECharts = class extends Eventful_default {
|
|
|
24507
24540
|
if (isUpdate) {
|
|
24508
24541
|
seriesModel.updateValue({data: map(params.data, (item, index2) => {
|
|
24509
24542
|
const idx = lastIndex + index2;
|
|
24510
|
-
|
|
24543
|
+
const value = item.slice(1);
|
|
24544
|
+
seriesModel.option.data[idx] = value.length === 1 ? value[0] : value;
|
|
24511
24545
|
item[0] = idx;
|
|
24512
24546
|
return item;
|
|
24513
24547
|
})});
|
|
24514
24548
|
} else if (params.operation === "script") {
|
|
24515
|
-
|
|
24516
|
-
const data = map(params.data, (item, index2) => {
|
|
24517
|
-
const idx = lastIndex + index2;
|
|
24518
|
-
if (index2 !== 0) {
|
|
24519
|
-
categories.push(item.value[0]);
|
|
24520
|
-
}
|
|
24521
|
-
item.value[0] = idx;
|
|
24522
|
-
return item;
|
|
24523
|
-
});
|
|
24524
|
-
seriesModel.updateData({data});
|
|
24549
|
+
seriesModel.updateData({data: params.data});
|
|
24525
24550
|
} else {
|
|
24526
|
-
const categories = [];
|
|
24527
24551
|
const formatData = map(params.data, (item) => {
|
|
24528
|
-
const idx = lastIndex +
|
|
24529
|
-
seriesModel.option.data[idx] = item.slice(1);
|
|
24530
|
-
categories.push(item[0]);
|
|
24552
|
+
const idx = lastIndex + 1;
|
|
24531
24553
|
item[0] = idx;
|
|
24532
24554
|
return item;
|
|
24533
24555
|
});
|
|
@@ -24550,14 +24572,14 @@ var ECharts = class extends Eventful_default {
|
|
|
24550
24572
|
const scale4 = xAxisModal.axis.scale;
|
|
24551
24573
|
const ordinalMeta = scale4.getOrdinalMeta();
|
|
24552
24574
|
const lastTime = ordinalMeta.getLastCategories();
|
|
24553
|
-
const isMove = isAdd && scale4.lastBarRightSideDiffBarCount < 1.5;
|
|
24575
|
+
const isMove = isAdd && scale4.lastBarRightSideDiffBarCount < 1.5 && lastTime !== time;
|
|
24554
24576
|
if (isAdd && lastTime !== time) {
|
|
24555
24577
|
ordinalMeta.appendData([time]);
|
|
24556
24578
|
}
|
|
24557
24579
|
const payload = {
|
|
24558
24580
|
type: "dataZoom",
|
|
24559
24581
|
barSpace: scale4.barSpace,
|
|
24560
|
-
lastBarRightSideDiffBarCount: isMove
|
|
24582
|
+
lastBarRightSideDiffBarCount: isMove ? scale4.lastBarRightSideDiffBarCount - 1 : scale4.lastBarRightSideDiffBarCount
|
|
24561
24583
|
};
|
|
24562
24584
|
doDispatchAction.call(chart, payload, false);
|
|
24563
24585
|
});
|
|
@@ -26318,6 +26340,10 @@ var SeriesData2 = class {
|
|
|
26318
26340
|
const range = this._store.updateData(data);
|
|
26319
26341
|
this._doInit(range[0], range[1]);
|
|
26320
26342
|
}
|
|
26343
|
+
resetUpdateData(data) {
|
|
26344
|
+
const range = this._store.resetUpdateData(data);
|
|
26345
|
+
this._doInit(range[0], range[1]);
|
|
26346
|
+
}
|
|
26321
26347
|
updateValue(value) {
|
|
26322
26348
|
this._store.updateValue(value);
|
|
26323
26349
|
}
|
|
@@ -55759,7 +55785,6 @@ var StrategyView2 = class extends Chart_default {
|
|
|
55759
55785
|
} else {
|
|
55760
55786
|
this._symbolGroup.removeAll();
|
|
55761
55787
|
}
|
|
55762
|
-
console.log("\u6E32\u67D3\u7B56\u75651213123");
|
|
55763
55788
|
const symbolGroup = this._symbolGroup;
|
|
55764
55789
|
const z2 = seriesModel.get("z2");
|
|
55765
55790
|
const upTriangle = data.getLayout("upTriangle");
|
|
@@ -56085,8 +56110,16 @@ var LabelsSeriesModel2 = class extends Series_default {
|
|
|
56085
56110
|
constructor() {
|
|
56086
56111
|
super(...arguments);
|
|
56087
56112
|
this.type = LabelsSeriesModel2.type;
|
|
56113
|
+
this.dataIndexById = {};
|
|
56088
56114
|
}
|
|
56089
56115
|
getInitialData(option, ecModel) {
|
|
56116
|
+
const dataIndexById = {};
|
|
56117
|
+
if (!option.isShape) {
|
|
56118
|
+
each(option.data, function(item, index) {
|
|
56119
|
+
dataIndexById[item.id] = index;
|
|
56120
|
+
});
|
|
56121
|
+
}
|
|
56122
|
+
this.dataIndexById = dataIndexById;
|
|
56090
56123
|
return createSeriesData_default(null, this, {
|
|
56091
56124
|
useEncodeDefaulter: true
|
|
56092
56125
|
});
|
|
@@ -56111,6 +56144,20 @@ var LabelsSeriesModel2 = class extends Series_default {
|
|
|
56111
56144
|
getZLevelKey() {
|
|
56112
56145
|
return this.getData().count() > this.getProgressiveThreshold() ? this.id : "";
|
|
56113
56146
|
}
|
|
56147
|
+
getFormatUpdateData(data) {
|
|
56148
|
+
if (this.option.isShape) {
|
|
56149
|
+
return;
|
|
56150
|
+
}
|
|
56151
|
+
const dataIndexById = this.dataIndexById;
|
|
56152
|
+
const that = this;
|
|
56153
|
+
each(data, function(item) {
|
|
56154
|
+
const index = dataIndexById[item.id];
|
|
56155
|
+
if (typeof index === "number") {
|
|
56156
|
+
that.option.data = item;
|
|
56157
|
+
}
|
|
56158
|
+
});
|
|
56159
|
+
return that.option.data;
|
|
56160
|
+
}
|
|
56114
56161
|
};
|
|
56115
56162
|
var LabelsSeriesModel = LabelsSeriesModel2;
|
|
56116
56163
|
LabelsSeriesModel.type = "series.labels";
|
|
@@ -68828,6 +68875,15 @@ var TableModel2 = class extends Component_default {
|
|
|
68828
68875
|
this.type = TableModel2.type;
|
|
68829
68876
|
this.ableDataZoomUpdate = false;
|
|
68830
68877
|
}
|
|
68878
|
+
mergeTables(tables) {
|
|
68879
|
+
const newTableById = {};
|
|
68880
|
+
each(tables, function(table) {
|
|
68881
|
+
newTableById[table.id] = table;
|
|
68882
|
+
});
|
|
68883
|
+
this.option.tables = map(this.option.tables, function(table) {
|
|
68884
|
+
return newTableById[table.id] || table;
|
|
68885
|
+
});
|
|
68886
|
+
}
|
|
68831
68887
|
setAbleDataZoomUpdate(ableDataZoomUpdate) {
|
|
68832
68888
|
this.ableDataZoomUpdate = ableDataZoomUpdate;
|
|
68833
68889
|
}
|
|
@@ -68931,12 +68987,23 @@ var TableView2 = class extends Component_default2 {
|
|
|
68931
68987
|
return;
|
|
68932
68988
|
}
|
|
68933
68989
|
const tables = tableModel.get("tables");
|
|
68990
|
+
const tableByPosition = {};
|
|
68991
|
+
each(tables, function(table) {
|
|
68992
|
+
if (tableByPosition[table.position] && tableByPosition[table.position].line > table.line) {
|
|
68993
|
+
return;
|
|
68994
|
+
}
|
|
68995
|
+
tableByPosition[table.position] = table;
|
|
68996
|
+
});
|
|
68997
|
+
const visibleTables = [];
|
|
68998
|
+
each(tableByPosition, function(table) {
|
|
68999
|
+
visibleTables.push(table);
|
|
69000
|
+
});
|
|
68934
69001
|
const grid = ecModel.getComponent("grid", 0);
|
|
68935
69002
|
const z = tableModel.get("z");
|
|
68936
69003
|
const rect = grid.coordinateSystem.getRect();
|
|
68937
69004
|
const paddings = tableModel.get("paddings");
|
|
68938
69005
|
const tableAttrByIndex = {};
|
|
68939
|
-
each(
|
|
69006
|
+
each(visibleTables, function(item, index) {
|
|
68940
69007
|
const columnWidthByIndex = [];
|
|
68941
69008
|
const rowHeightByIndex = [];
|
|
68942
69009
|
const margeCellByKey = {};
|
|
@@ -69006,7 +69073,7 @@ var TableView2 = class extends Component_default2 {
|
|
|
69006
69073
|
};
|
|
69007
69074
|
});
|
|
69008
69075
|
const group = this.group;
|
|
69009
|
-
each(
|
|
69076
|
+
each(visibleTables, function(item, index) {
|
|
69010
69077
|
const {x, y, columnObjByIndex, rowObjByIndex, width, height} = tableAttrByIndex[index];
|
|
69011
69078
|
const {bgcolor, frame_color, frame_width = 0, border_width = 0, border_color, columns} = item;
|
|
69012
69079
|
const tableGroup = new Group_default({x, y});
|