tvcharts 0.6.78 → 0.6.79
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 +37 -27
- package/dist/echarts.js.map +2 -2
- package/lib/chart/barPlot/BarPlotSeries.js +1 -0
- package/lib/chart/candlePlot/CandlePlotSeries.js +1 -0
- package/lib/chart/linesPlot/LinesPlotView.js +1 -1
- package/lib/core/echarts.js +21 -14
- package/lib/data/helper/dataProvider.js +4 -6
- package/lib/model/Series.js +12 -8
- package/lib/util/color.js +1 -1
- package/package.json +1 -1
- package/types/dist/echarts.d.ts +2 -0
- package/types/dist/shared.d.ts +2 -0
- package/types/src/chart/barPlot/BarPlotSeries.d.ts +1 -0
- package/types/src/chart/candlePlot/CandlePlotSeries.d.ts +1 -0
- package/types/src/core/echarts.d.ts +1 -0
- package/types/src/model/Series.d.ts +1 -0
package/dist/echarts.js
CHANGED
|
@@ -17967,18 +17967,16 @@ DefaultDataProvider.internalField = function() {
|
|
|
17967
17967
|
const data = this._data;
|
|
17968
17968
|
const extraIndex = isMustAppend && newData.length === 1 ? 1 : 0;
|
|
17969
17969
|
const lastIndex = data.length - 1 + extraIndex;
|
|
17970
|
-
let update = 0;
|
|
17971
17970
|
for (let i = 0; i < newData.length; i++) {
|
|
17972
17971
|
const ele = newData[i];
|
|
17973
|
-
if (
|
|
17972
|
+
if (i === 0) {
|
|
17974
17973
|
data[lastIndex] = ele;
|
|
17975
|
-
|
|
17976
|
-
|
|
17974
|
+
} else {
|
|
17975
|
+
data.push(ele);
|
|
17977
17976
|
}
|
|
17978
|
-
data.push(ele);
|
|
17979
17977
|
}
|
|
17980
17978
|
return {
|
|
17981
|
-
update
|
|
17979
|
+
update: newData.length - 1
|
|
17982
17980
|
};
|
|
17983
17981
|
}
|
|
17984
17982
|
}();
|
|
@@ -20186,21 +20184,24 @@ var SeriesModel2 = class extends Component_default {
|
|
|
20186
20184
|
data.resetUpdateData(formatData);
|
|
20187
20185
|
return;
|
|
20188
20186
|
}
|
|
20189
|
-
const isCandletick = isCandle(this.subType);
|
|
20187
|
+
const isCandletick = isCandle(this.subType) && !this.notAddOrdinal;
|
|
20190
20188
|
const extraIndex = params.isMustAppend && params.data.length === 1 ? 1 : 0;
|
|
20191
|
-
const
|
|
20189
|
+
const seriesDataIndex = data.count(true) - 1;
|
|
20190
|
+
const xAxisModel = this.ecModel.getComponent("xAxis", this.get("xAxisIndex"));
|
|
20191
|
+
const ordinalMeta = xAxisModel.getOrdinalMeta();
|
|
20192
|
+
if (!ordinalMeta) {
|
|
20193
|
+
return;
|
|
20194
|
+
}
|
|
20192
20195
|
const list = map(params.data, (item, index) => {
|
|
20193
|
-
const idx = lastIndex + index + extraIndex;
|
|
20194
20196
|
if (isCandletick) {
|
|
20197
|
+
const optionDataIndex = seriesDataIndex + index + extraIndex;
|
|
20195
20198
|
const newItem = {
|
|
20196
20199
|
...item,
|
|
20197
20200
|
value: item.value.slice()
|
|
20198
20201
|
};
|
|
20199
|
-
this.option.data[
|
|
20200
|
-
item.value.unshift(idx);
|
|
20201
|
-
} else {
|
|
20202
|
-
item.value[0] = idx;
|
|
20202
|
+
this.option.data[optionDataIndex] = newItem;
|
|
20203
20203
|
}
|
|
20204
|
+
item.value[0] = ordinalMeta.parseAndCollect(item.value[0]);
|
|
20204
20205
|
return item;
|
|
20205
20206
|
});
|
|
20206
20207
|
data.updateData(list, params.isMustAppend);
|
|
@@ -24779,16 +24780,21 @@ var ECharts = class extends Eventful_default {
|
|
|
24779
24780
|
if (!seriesModel) {
|
|
24780
24781
|
return;
|
|
24781
24782
|
}
|
|
24782
|
-
const
|
|
24783
|
-
const lastIndex =
|
|
24783
|
+
const dataLength = params.data.length - 1;
|
|
24784
|
+
const lastIndex = params.newIndex - dataLength;
|
|
24785
|
+
const xAxisModel = ecModel.getComponent("xAxis", seriesModel.get("xAxisIndex"));
|
|
24786
|
+
const ordinalMeta = xAxisModel.getOrdinalMeta();
|
|
24787
|
+
if (!ordinalMeta) {
|
|
24788
|
+
return;
|
|
24789
|
+
}
|
|
24784
24790
|
const isUpdate = params.operation === "update";
|
|
24785
24791
|
if (isUpdate) {
|
|
24786
24792
|
seriesModel.updateValue({data: map(params.data, (item, index2) => {
|
|
24787
24793
|
const idx = lastIndex + index2;
|
|
24788
|
-
const value = item.slice(
|
|
24794
|
+
const value = item.slice();
|
|
24789
24795
|
if (seriesModel.option.data[idx].value) {
|
|
24790
24796
|
seriesModel.option.data[idx].value = value.length === 1 ? value[0] : value;
|
|
24791
|
-
item[0] = idx;
|
|
24797
|
+
item[0] = ordinalMeta.parseAndCollect(idx);
|
|
24792
24798
|
return {
|
|
24793
24799
|
...seriesModel.option.data[idx],
|
|
24794
24800
|
value: item
|
|
@@ -24796,20 +24802,20 @@ var ECharts = class extends Eventful_default {
|
|
|
24796
24802
|
} else {
|
|
24797
24803
|
seriesModel.option.data[idx] = value.length === 1 ? value[0] : value;
|
|
24798
24804
|
}
|
|
24799
|
-
item[0] = idx;
|
|
24805
|
+
item[0] = ordinalMeta.parseAndCollect(idx);
|
|
24800
24806
|
return item;
|
|
24801
24807
|
})});
|
|
24802
24808
|
} else if (params.operation === "script") {
|
|
24803
|
-
seriesModel.updateData({data: params.data, isMustAppend: params.isMustAppend});
|
|
24809
|
+
seriesModel.updateData({data: params.data, isMustAppend: params.isMustAppend, lastIndex});
|
|
24804
24810
|
} else {
|
|
24805
|
-
const isCandletick = isCandle(seriesModel.subType);
|
|
24811
|
+
const isCandletick = isCandle(seriesModel.subType) && !seriesModel.notAddOrdinal;
|
|
24806
24812
|
const formatData = map(params.data, (item) => {
|
|
24807
|
-
const idx = lastIndex
|
|
24813
|
+
const idx = lastIndex;
|
|
24808
24814
|
if (isCandletick) {
|
|
24809
|
-
const value = item.slice(
|
|
24815
|
+
const value = item.slice();
|
|
24810
24816
|
seriesModel.option.data[idx] = value.length === 1 ? value[0] : value;
|
|
24811
24817
|
}
|
|
24812
|
-
item[0] = idx;
|
|
24818
|
+
item[0] = ordinalMeta.parseAndCollect(idx);
|
|
24813
24819
|
return item;
|
|
24814
24820
|
});
|
|
24815
24821
|
seriesModel.appendData({data: formatData});
|
|
@@ -24857,7 +24863,8 @@ var ECharts = class extends Eventful_default {
|
|
|
24857
24863
|
const payload = {
|
|
24858
24864
|
type: "dataZoom",
|
|
24859
24865
|
barSpace: scale4.barSpace,
|
|
24860
|
-
lastBarRightSideDiffBarCount: scale4.lastBarRightSideDiffBarCount - 1
|
|
24866
|
+
lastBarRightSideDiffBarCount: scale4.lastBarRightSideDiffBarCount - 1,
|
|
24867
|
+
isPushSync: true
|
|
24861
24868
|
};
|
|
24862
24869
|
doDispatchAction.call(chart, payload, false);
|
|
24863
24870
|
return;
|
|
@@ -24874,7 +24881,8 @@ var ECharts = class extends Eventful_default {
|
|
|
24874
24881
|
const payload = {
|
|
24875
24882
|
type: "dataZoom",
|
|
24876
24883
|
barSpace: scale4.barSpace,
|
|
24877
|
-
lastBarRightSideDiffBarCount: scale4.lastBarRightSideDiffBarCount - 1
|
|
24884
|
+
lastBarRightSideDiffBarCount: scale4.lastBarRightSideDiffBarCount - 1,
|
|
24885
|
+
isPushSync: true
|
|
24878
24886
|
};
|
|
24879
24887
|
doDispatchAction.call(this, payload, false);
|
|
24880
24888
|
return;
|
|
@@ -55832,7 +55840,7 @@ var LinesPlotView2 = class extends Chart_default {
|
|
|
55832
55840
|
const histbase = seriesModel.get("histbase") || 0;
|
|
55833
55841
|
const z2 = seriesModel.get("z2");
|
|
55834
55842
|
const barSpace = seriesModel.coordinateSystem.getAxesByScale("ordinal")[0].scale.barSpace || calculatebandWidth(seriesModel, data);
|
|
55835
|
-
const width = Math.floor(barSpace * 0.
|
|
55843
|
+
const width = Math.floor(barSpace * 0.95);
|
|
55836
55844
|
const baseY = seriesModel.coordinateSystem.dataToPoint([0, histbase])[1];
|
|
55837
55845
|
if (width <= 1) {
|
|
55838
55846
|
each(linePointsByKey, function(item, key) {
|
|
@@ -57814,6 +57822,7 @@ var CandlePlotSeriesModel2 = class extends Series_default {
|
|
|
57814
57822
|
constructor() {
|
|
57815
57823
|
super(...arguments);
|
|
57816
57824
|
this.type = CandlePlotSeriesModel2.type;
|
|
57825
|
+
this.notAddOrdinal = true;
|
|
57817
57826
|
this.defaultValueDimensions = [
|
|
57818
57827
|
{name: "open", defaultTooltip: true},
|
|
57819
57828
|
{name: "close", defaultTooltip: true},
|
|
@@ -58097,6 +58106,7 @@ var BarPlotSeriesModel2 = class extends Series_default {
|
|
|
58097
58106
|
constructor() {
|
|
58098
58107
|
super(...arguments);
|
|
58099
58108
|
this.type = BarPlotSeriesModel2.type;
|
|
58109
|
+
this.notAddOrdinal = true;
|
|
58100
58110
|
this.defaultValueDimensions = [
|
|
58101
58111
|
{name: "open", defaultTooltip: true},
|
|
58102
58112
|
{name: "close", defaultTooltip: true},
|
|
@@ -73742,7 +73752,7 @@ function parseColor(color2) {
|
|
|
73742
73752
|
function contrastColor2(color2) {
|
|
73743
73753
|
const [r, g, b] = parseColor(color2);
|
|
73744
73754
|
const brightness = (r * 299 + g * 587 + b * 114) / 1e3;
|
|
73745
|
-
return brightness >=
|
|
73755
|
+
return brightness >= 130 ? "#000000" : "#ffffff";
|
|
73746
73756
|
}
|
|
73747
73757
|
function removeTransparency(color2) {
|
|
73748
73758
|
const [r, g, b] = parseColor(color2);
|