tvcharts 0.6.65 → 0.6.67

package/lib/chart/fills/FillsSeries.js

@@ -44,23 +44,18 @@
 import { __extends } from "tslib";
 import createSeriesData from '../helper/createSeriesData.js';
 import SeriesModel from '../../model/Series.js';
-import { WhiskerBoxCommonMixin } from '../helper/whiskerBoxCommon.js';
-import { mixin } from 'tvrender/lib/core/util.js';
 var FillsSeriesModel = /** @class */function (_super) {
   __extends(FillsSeriesModel, _super);
   function FillsSeriesModel() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
     _this.type = FillsSeriesModel.type;
-    _this.defaultValueDimensions = [{
-      name: 'plot1',
-      defaultTooltip: false
-    }, {
-      name: 'plot2',
-      defaultTooltip: false
-    }];
-    _this.notAddOrdinal = true;
     return _this;
   }
+  // defaultValueDimensions = [
+  //     { name: 'plot1', defaultTooltip: false },
+  //     { name: 'plot2', defaultTooltip: false },
+  //   ];
+  // notAddOrdinal = true;
   // hasSymbolVisual = true;
   FillsSeriesModel.prototype.getInitialData = function (option) {
     if (process.env.NODE_ENV !== 'production') {
@@ -101,9 +96,14 @@ var FillsSeriesModel = /** @class */function (_super) {
     },
     triggerLineEvent: false,
     // notFilterData: true,
-    statusLineInvisible: true
+    statusLineInvisible: true,
+    dimensions: ['extend', 'plot1', 'plot2'],
+    encode: {
+      x: ['base'],
+      y: ['plot1', 'plot2']
+    }
   };
   return FillsSeriesModel;
 }(SeriesModel);
-mixin(FillsSeriesModel, WhiskerBoxCommonMixin, true);
+// mixin(FillsSeriesModel, WhiskerBoxCommonMixin, true);
 export default FillsSeriesModel;

package/lib/core/echarts.js

@@ -79,6 +79,7 @@ import decal from '../visual/decal.js';
 import lifecycle from './lifecycle.js';
 import { platformApi, setPlatformAPI } from 'tvrender/lib/core/platform.js';
 import { getImpl } from './impl.js';
+import { isCandle } from '../util/seriesType.js';
 export var version = '5.5.0';
 export var dependencies = {
   zrender: '5.5.0'
@@ -1179,12 +1180,14 @@ var ECharts = /** @class */function (_super) {
           data: params.data
         });
       } else {
+        var isCandletick_1 = isCandle(seriesModel.subType);
         // const categories: string[] = [];
         var formatData = map(params.data, function (item) {
           var idx = lastIndex + 1;
-          // const value = item.slice(1);
-          // (seriesModel.option.data as any)[idx] = value.length === 1 ? value[0] : value;
-          // categories.push(item[0]);
+          if (isCandletick_1) {
+            var value = item.slice(1);
+            seriesModel.option.data[idx] = value.length === 1 ? value[0] : value;
+          }
           item[0] = idx;
           return item;
         });

package/lib/data/DataStore.js

@@ -301,6 +301,8 @@ var DataStore = /** @class */function () {
     var rawExtent = this._rawExtent;
     var idx = this._rawCount - 1;
     // const emptyDataItem: number[] = [];
+    var provider = this._provider;
+    provider.updateValue(value);
     for (var dimIdx = 0; dimIdx < dimLen; dimIdx++) {
       // const dim = dimensions[dimIdx];
       // const val = defaultDimValueGetters.arrayRows.call(

package/lib/data/helper/dataProvider.js

@@ -160,7 +160,8 @@ var DefaultDataProvider = /** @class */function () {
       pure: true,
       appendData: appendDataSimply,
       updateData: updateDataSimply,
-      resetData: resetDataSimply
+      resetData: resetDataSimply,
+      updateValue: updateLastValueSimply
     }, _a[SOURCE_FORMAT_ARRAY_ROWS + '_' + SERIES_LAYOUT_BY_ROW] = {
       pure: true,
       appendData: function () {
@@ -170,7 +171,8 @@ var DefaultDataProvider = /** @class */function () {
       pure: true,
       appendData: appendDataSimply,
       updateData: updateDataSimply,
-      resetData: resetDataSimply
+      resetData: resetDataSimply,
+      updateValue: updateLastValueSimply
     }, _a[SOURCE_FORMAT_KEYED_COLUMNS] = {
       pure: true,
       appendData: function (newData) {
@@ -185,7 +187,8 @@ var DefaultDataProvider = /** @class */function () {
     }, _a[SOURCE_FORMAT_ORIGINAL] = {
       appendData: appendDataSimply,
       updateData: updateDataSimply,
-      resetData: resetDataSimply
+      resetData: resetDataSimply,
+      updateValue: updateLastValueSimply
     }, _a[SOURCE_FORMAT_TYPED_ARRAY] = {
       persistent: false,
       pure: true,
@@ -210,24 +213,17 @@ var DefaultDataProvider = /** @class */function () {
     function resetDataSimply(newData) {
       this._data = newData;
     }
+    function updateLastValueSimply(newData) {
+      var data = this._data;
+      var lastIndex = data.length - 1;
+      data[lastIndex] = newData;
+    }
     function updateDataSimply(newData) {
       var data = this._data;
       var lastIndex = data.length - 1;
       var update = 0;
       for (var i = 0; i < newData.length; i++) {
         var ele = newData[i];
-        // if (Array.isArray(ele)) {
-        //     if (ele[0] === data[lastIndex][0]) {
-        //         data[lastIndex] = ele;
-        //         update++;
-        //         continue;
-        //     }
-        // } 
-        // else if (typeof ele === 'object' && Array.isArray(ele.value) && ele.value[0] == data[lastIndex].value[0]) {
-        //     data[lastIndex] = ele;
-        //     update++;
-        //     continue;
-        // }
         if (!update) {
           data[lastIndex] = ele;
           update++;

package/lib/model/Series.js

@@ -188,6 +188,7 @@ var SeriesModel = /** @class */function (_super) {
     data.updateValue(params.data[0]);
   };
   SeriesModel.prototype.updateData = function (params) {
+    var _this = this;
     var data = this.getRawData();
     var formatData = this.getResetData(params.data);
     // formatData 有值的直接初始化所有内容
@@ -201,6 +202,8 @@ var SeriesModel = /** @class */function (_super) {
     var list = zrUtil.map(params.data, function (item, index) {
       var idx = lastIndex + index;
       if (isCandletick) {
+        var value = item.value.slice();
+        _this.option.data[idx] = value;
         item.value.unshift(idx);
       } else {
         item.value[0] = idx;

package/package.json

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

package/types/dist/echarts.d.ts

@@ -5008,6 +5008,7 @@ interface DataProvider {
     fillStorage?(start: number, end: number, out: ArrayLike$1<ParsedValue>[], extent: number[][]): void;
     appendData?(newData: ArrayLike$1<OptionDataItem>): void;
     resetData?(newData: ArrayLike$1<OptionDataItem>): void;
+    updateValue?(newData: OptionDataItem): void;
     updateData?(updateData: ArrayLike$1<OptionDataItem>): {
         update: number;
     };

package/types/dist/shared.d.ts

@@ -5009,6 +5009,7 @@ interface DataProvider {
     fillStorage?(start: number, end: number, out: ArrayLike$1<ParsedValue>[], extent: number[][]): void;
     appendData?(newData: ArrayLike$1<OptionDataItem>): void;
     resetData?(newData: ArrayLike$1<OptionDataItem>): void;
+    updateValue?(newData: OptionDataItem): void;
     updateData?(updateData: ArrayLike$1<OptionDataItem>): {
         update: number;
     };

package/types/src/chart/fills/FillsSeries.d.ts

@@ -51,11 +51,6 @@ declare class FillsSeriesModel extends SeriesModel<FillsSeriesOption> {
     type: string;
     static readonly dependencies: string[];
     coordinateSystem: Cartesian2D;
-    defaultValueDimensions: {
-        name: string;
-        defaultTooltip: boolean;
-    }[];
-    notAddOrdinal: boolean;
     getInitialData(option: FillsSeriesOption): SeriesData;
     static defaultOption: FillsSeriesOption;
 }

package/types/src/data/helper/dataProvider.d.ts

@@ -20,6 +20,7 @@ export interface DataProvider {
     fillStorage?(start: number, end: number, out: ArrayLike<ParsedValue>[], extent: number[][]): void;
     appendData?(newData: ArrayLike<OptionDataItem>): void;
     resetData?(newData: ArrayLike<OptionDataItem>): void;
+    updateValue?(newData: OptionDataItem): void;
     updateData?(updateData: ArrayLike<OptionDataItem>): {
         update: number;
     };