tvcharts 0.6.21 → 0.6.22

package/lib/chart/labels/labelsLayout.js

@@ -78,13 +78,18 @@ var labelsLayout = {
     var dimIdx1 = data.getDimensionIndex(dims[1]);
     var xOffset = seriesModel.get("offset") || 0;
     var price = getYByLocation(seriesModel);
+    var showLast = seriesModel.get("showLast");
     return {
       progress: function (params, labelsData) {
         // const segCount = params.end - params.start;
         // const points = createFloat32Array(segCount * dimLen);
         var tmpIn = [];
         var tmpOut = [];
+        var lastIndex = data.count(true) - 1;
         for (var i = params.start; i < params.end; i++) {
+          if (showLast && lastIndex - data.getRawIndex(i) >= showLast) {
+            continue;
+          }
           tmpIn[0] = store.get(dimIdx0, i) + xOffset;
           tmpIn[1] = store.get(dimIdx1, i);
           // Let coordinate system to handle the NaN data.

package/lib/chart/labels/labelsVisual.js

@@ -104,6 +104,7 @@ var LabelsVisual = {
     var data = seriesModel.getData();
     // const bandWidth = getBandWidth(seriesModel, data);
     var location = seriesModel.get('location');
+    var showLast = seriesModel.get("showLast");
     var symbolOptions = {};
     // const symbolOptionsCb = {} as Record<(typeof SYMBOL_PROPS_WITH_CB)[number], any>;
     for (var i = 0; i < SYMBOL_PROPS_WITH_CB.length; i++) {
@@ -116,8 +117,12 @@ var LabelsVisual = {
       // legendIcon: seriesModel.legendIcon || symbolOptions.symbol,
       symbolKeepAspect: seriesModel.get('symbolKeepAspect')
     }, symbolOptions));
+    var lastIndex = data.count(true) - 1;
     function dataEach(data, idx) {
       var _a;
+      if (showLast && lastIndex - data.getRawIndex(idx) >= showLast) {
+        return;
+      }
       var itemModel = data.getItemModel(idx);
       var symbol = itemModel.getShallow('symbol');
       var symbolSize = itemModel.getShallow('symbolSize');

package/lib/chart/linesPlot/linesPlotLayout.js

@@ -77,7 +77,8 @@ var linesPlotLayout = {
     var xOffset = seriesModel.get("offset") || 0;
     var symbolVisible = seriesModel.get("symbolVisible");
     var symbolSize = seriesModel.get("symbolSize");
-    var globalSymbol = seriesModel.get('symbol');
+    var showLast = seriesModel.get("showLast");
+    // const globalSymbol = seriesModel.get('symbol')
     return {
       progress: function (params, lineData) {
         // const lineCoords: number[][] = [];
@@ -87,7 +88,7 @@ var linesPlotLayout = {
         var symbolPointsByColor = {};
         // const allLinePoints = [];
         var lastKey = "";
-        var offset = 0;
+        // let offset = 0;
         var stroke = seriesModel.getLineStyle().stroke;
         var defaultColor = Array.isArray(stroke) ? stroke[0] : stroke;
         function setSymbolPoint(point, index) {
@@ -108,8 +109,12 @@ var linesPlotLayout = {
           });
           symbolPointsByColor[symbolKey] = symbolData;
         }
+        var lastIndex = data.count(true) - 1;
         for (var i = params.start; i < params.end; i++) {
-          var isRawLast = i + 1 === params.end ? data.getRawIndex(i) === data.count(true) - 1 : false;
+          if (showLast && lastIndex - data.getRawIndex(i) >= showLast) {
+            continue;
+          }
+          var isRawLast = i + 1 === params.end ? data.getRawIndex(i) === lastIndex : false;
           var isRawFirst = i === 0 ? data.getRawIndex(i) === 0 : false;
           var x = store.get(dimIdx0, i);
           var y = store.get(dimIdx1, i);

package/lib/core/echarts.js

@@ -207,7 +207,8 @@ var triggerSelectItem = function (_a) {
     _b = _a.eventObj,
     eventObj = _b === void 0 ? {} : _b;
   var data = getSeriesPointData(ecModel, {
-    dataIndex: eventObj.dataIndexInside
+    dataIndex: eventObj.dataIndexInside,
+    rawDataIndex: eventObj.dataIndex
   });
   messageCenter.trigger('selectitem', {
     data: data,
@@ -221,7 +222,7 @@ var ECharts = /** @class */function (_super) {
   // Theme name or themeOption.
   theme, opts) {
     var _this = _super.call(this, new ECEventProcessor()) || this;
-    _this._throttledSelectItem = throttle(triggerSelectItem, 60);
+    _this._throttledSelectItem = throttle(triggerSelectItem, 80);
     _this._chartsViews = [];
     _this._chartsMap = {};
     _this._componentsViews = [];
@@ -1184,12 +1185,13 @@ var ECharts = /** @class */function (_super) {
     var coordSys = firstSeriesModel.coordinateSystem;
     var baseAxis = coordSys.getBaseAxis();
     var scale = baseAxis.scale;
+    var isMove = !isUpdateData && scale.lastBarRightSideDiffBarCount < 1.5;
     var payload = {
       type: 'dataZoom',
       barSpace: scale.barSpace,
-      lastBarRightSideDiffBarCount: !isUpdateData && scale.lastBarRightSideDiffBarCount < 1.5 ? scale.lastBarRightSideDiffBarCount - 1 : scale.lastBarRightSideDiffBarCount
+      lastBarRightSideDiffBarCount: isMove ? scale.lastBarRightSideDiffBarCount - 1 : scale.lastBarRightSideDiffBarCount
     };
-    doDispatchAction.call(this, payload, true);
+    doDispatchAction.call(this, payload, !isMove);
   };
   ECharts.prototype.updateXAxisData = function (time) {
     if (this._disposed) {
@@ -1870,11 +1872,13 @@ var ECharts = /** @class */function (_super) {
       // If use hover layer
       updateHoverLayerStatus(ecIns, ecModel);
       // todo 这个数据推送先这样
-      var data = getSeriesPointData(ecModel);
-      var messageCenter = ecIns._messageCenter;
-      messageCenter.trigger('selectitem', {
-        data: data,
-        type: 'series'
+      // const data = getSeriesPointData(ecModel);
+      // const messageCenter = ecIns._messageCenter;
+      // messageCenter.trigger('selectitem', { data, type: 'series' });
+      ecIns._throttledSelectItem({
+        messageCenter: ecIns._messageCenter,
+        ecModel: ecModel,
+        type: "series"
       });
       lifecycle.trigger('series:afterupdate', ecModel, api, updateParams);
     };

package/lib/util/states.js

@@ -571,20 +571,29 @@ export function getSeriesPointData(ecModel, payload) {
     payload = {};
   }
   var seriesPointData = {};
+  var dataIndex = payload.dataIndex,
+    rawDataIndex = payload.rawDataIndex;
   // let id = '';
   ecModel.eachSeries(function (seriesModel) {
-    var _a;
+    var _a, _b, _c;
     if (seriesModel.get('statusLineInvisible')) {
       return;
     }
     var formatter = seriesModel.get('formatter');
+    var offset = (_a = seriesModel.get('offset')) !== null && _a !== void 0 ? _a : 0;
+    var showLast = (_b = seriesModel.get('showLast')) !== null && _b !== void 0 ? _b : 0;
     var data = seriesModel.getData();
-    var isRaw = !payload.dataIndex;
-    var index = (_a = payload.dataIndex) !== null && _a !== void 0 ? _a : data.count(isRaw) - 1;
+    var isRaw = !dataIndex;
+    var lastIndex = data.count(true) - 1;
+    var index = dataIndex ? dataIndex - offset : rawDataIndex ? rawDataIndex - offset : lastIndex;
+    if (showLast && (isRaw ? index : data.getRawIndex(index)) <= lastIndex - showLast) {
+      index = lastIndex;
+      isRaw = true;
+    }
+    index = Math.min(lastIndex, index);
     var values = isRaw ? data.getValuesByRawIndex(index) : data.getValues(index);
-    var color = data.getItemVisual(index, 'style').fill;
+    var color = (_c = data.getItemVisual(index, 'style')) === null || _c === void 0 ? void 0 : _c.fill;
     var isCandlesStick = seriesModel.subType === 'candlestick';
-    var isLinesPlot = seriesModel.subType === 'linesPlot';
     var dim = seriesModel.subType === 'candlestick' ? 'close' : 'y';
     var fnKey = isRaw ? "getByRawIndex" : "get";
     if (isCandlesStick) {
@@ -596,9 +605,13 @@ export function getSeriesPointData(ecModel, payload) {
       if (fill) {
         color = fill;
       }
-    } else if (isLinesPlot) {
+    } else if (['linesPlot', 'labels'].includes(seriesModel.subType)) {
+      var isLinesPlot = seriesModel.subType === 'linesPlot';
       var dataItem = data.getItemModel(index, isRaw);
-      var fill = dataItem.get(['lineStyle', 'color']);
+      var fill = dataItem.get([isLinesPlot ? 'lineStyle' : 'itemStyle', 'color']);
+      if (!isLinesPlot) {
+        values = [index, dataItem.get('showValue')];
+      }
       if (fill) {
         color = fill;
       }
@@ -618,10 +631,6 @@ export function getSeriesPointData(ecModel, payload) {
     var changePercent = (diffValue / prevValue * 100).toFixed(2) + '%';
     var seriesId = seriesModel.id;
     var seriesName = seriesModel.name;
-    // if (!id) {
-    //     const axisInfo = seriesModel.getBaseAxis();
-    //     id = axisInfo.scale.getLabel({ value: data.getRawIndex(index) })
-    // }
     seriesPointData[seriesName] = {
       name: seriesName,
       data: values.map(function (item, index) {
@@ -630,7 +639,8 @@ export function getSeriesPointData(ecModel, payload) {
       color: color,
       seriesId: seriesId,
       changePercent: changePercent,
-      diffValue: diffValue
+      diffValue: diffValue,
+      type: seriesModel.subType
     };
   });
   return seriesPointData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.6.21",
+  "version": "0.6.22",
   "description": "基于echarts5.5.0二次开发",
   "license": "Apache-2.0",
   "keywords": [

package/types/dist/echarts.d.ts

@@ -7798,6 +7798,7 @@ interface SeriesOption<StateOption = unknown, StatesMixin extends StatesMixinBas
     formatter?: (val: string | number) => string | number;
     notFilterData?: boolean;
     offset?: number;
+    showLast?: number;
 }
 interface SeriesOnCartesianOptionMixin {
     xAxisIndex?: number;
@@ -10742,6 +10743,7 @@ interface LinesPlotSeriesOption extends SeriesOption<LinesStateOption$1, LinesSt
     shadowShape?: boolean;
     step?: boolean;
     z2?: number;
+    showLast?: number;
 }
 
 declare type HeatmapDataValue = OptionDataValue[];

package/types/dist/shared.d.ts

@@ -7799,6 +7799,7 @@ interface SeriesOption<StateOption = unknown, StatesMixin extends StatesMixinBas
     formatter?: (val: string | number) => string | number;
     notFilterData?: boolean;
     offset?: number;
+    showLast?: number;
 }
 interface SeriesOnCartesianOptionMixin {
     xAxisIndex?: number;
@@ -10798,6 +10799,7 @@ interface LinesPlotSeriesOption extends SeriesOption<LinesStateOption$1, LinesSt
     shadowShape?: boolean;
     step?: boolean;
     z2?: number;
+    showLast?: number;
 }
 
 declare type HeatmapDataValue = OptionDataValue[];

package/types/src/chart/labels/LabelsSeries.d.ts

@@ -9,6 +9,7 @@ interface LabelsStateOption<TCbParams = never> {
     size?: "auto" | "huge" | "large" | "normal" | "small" | "tiny";
     location?: "abovebar" | "absolute" | "belowbar" | "bottom" | "top";
     isShape?: boolean;
+    showValue?: boolean | number;
 }
 interface LabelsStatesOptionMixin {
     emphasis?: {

package/types/src/chart/linesPlot/LinesPlotSeries.d.ts

@@ -58,6 +58,7 @@ export interface LinesPlotSeriesOption extends SeriesOption<LinesStateOption, Li
     shadowShape?: boolean;
     step?: boolean;
     z2?: number;
+    showLast?: number;
 }
 declare class LinesPlotSeriesModel extends SeriesModel<LinesPlotSeriesOption> {
     static readonly type = "series.linesPlot";

package/types/src/util/states.d.ts

@@ -66,9 +66,11 @@ interface ISeriesPointData {
     color: string;
     changePercent: string;
     diffValue: number;
+    type: string;
 }
 export declare function getSeriesPointData(ecModel: GlobalModel, payload?: {
     dataIndex?: number;
+    rawDataIndex?: number;
 }): Record<string, ISeriesPointData>;
 /**
  * Enable the function that mouseover will trigger the emphasis state.

package/types/src/util/types.d.ts

@@ -1246,6 +1246,7 @@ export interface SeriesOption<StateOption = unknown, StatesMixin extends StatesM
     formatter?: (val: string | number) => string | number;
     notFilterData?: boolean;
     offset?: number;
+    showLast?: number;
 }
 export interface SeriesOnCartesianOptionMixin {
     xAxisIndex?: number;