tvcharts 0.6.11 → 0.6.13

package/lib/chart/linesPlot/LinesPlotSeries.js

@@ -45,30 +45,6 @@ import { __extends } from "tslib";
 /* global Uint32Array, Float64Array, Float32Array */
 import SeriesModel from '../../model/Series.js';
 import createSeriesData from '../helper/createSeriesData.js';
-import { mergeAll, map } from 'zrender/lib/core/util.js';
-var Uint32Arr = typeof Uint32Array === 'undefined' ? Array : Uint32Array;
-var Float64Arr = typeof Float64Array === 'undefined' ? Array : Float64Array;
-function compatEc2(seriesOpt) {
-  var data = seriesOpt.data;
-  if (data && data[0] && data[0][0] && data[0][0].coord) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.warn('Lines data configuration has been changed to' + ' { coords:[[1,2],[2,3]] }');
-    }
-    seriesOpt.data = map(data, function (itemOpt) {
-      var coords = [itemOpt[0].coord, itemOpt[1].coord];
-      var target = {
-        coords: coords
-      };
-      if (itemOpt[0].name) {
-        target.fromName = itemOpt[0].name;
-      }
-      if (itemOpt[1].name) {
-        target.toName = itemOpt[1].name;
-      }
-      return mergeAll([target, itemOpt[0], itemOpt[1]]);
-    });
-  }
-}
 var LinesPlotSeriesModel = /** @class */function (_super) {
   __extends(LinesPlotSeriesModel, _super);
   function LinesPlotSeriesModel() {
@@ -110,12 +86,12 @@ var LinesPlotSeriesModel = /** @class */function (_super) {
     symbol: 'emptyCircle',
     symbolSize: 10,
     // symbolRotate: null,
-    showSymbol: true,
+    // showSymbol: true,
     // `false`: follow the label interval strategy.
     // `true`: show all symbols.
     // `'auto'`: If possible, show all symbols, otherwise
     //           follow the label interval strategy.
-    showAllSymbol: 'auto',
+    // showAllSymbol: 'auto',
     // Geo coordinate system
     geoIndex: 0,
     // effect: {

package/lib/chart/linesPlot/LinesPlotView.js

@@ -55,6 +55,7 @@ import LinePlotPath from "./LinePlotPath.js";
 import PolyPlotPath from "./PolyPlotPath.js";
 import HistogramPlotPath from "./HistogramPlotPath.js";
 import BarPath from "./BarPath.js";
+// import SymbolPath from "./SymbolPath.js";
 var LinesPlotView = /** @class */function (_super) {
   __extends(LinesPlotView, _super);
   function LinesPlotView() {
@@ -77,35 +78,6 @@ var LinesPlotView = /** @class */function (_super) {
     this._renderSymbol(data, seriesModel);
     this._renderHistogram(data, seriesModel);
     this._renderBar(data, seriesModel);
-    // const lineDraw = this._updateLineDraw(data, seriesModel);
-    // const zlevel = seriesModel.get('zlevel');
-    // const trailLength = seriesModel.get(['effect', 'trailLength']);
-    // const zr = api.getZr();
-    // // Avoid the drag cause ghost shadow
-    // // FIXME Better way ?
-    // // SVG doesn't support
-    // const isSvg = zr.painter.getType() === 'svg';
-    // if (!isSvg) {
-    //     (zr.painter as CanvasPainter).getLayer(zlevel).clear(true);
-    // }
-    // Config layer with motion blur
-    // if (this._lastZlevel != null && !isSvg) {
-    //     zr.configLayer(this._lastZlevel, {
-    //         motionBlur: false
-    //     });
-    // }
-    // if (this._showEffect(seriesModel) && trailLength > 0) {
-    //     if (!isSvg) {
-    //         zr.configLayer(zlevel, {
-    //             motionBlur: true,
-    //             lastFrameAlpha: Math.max(Math.min(trailLength / 10 + 0.9, 1), 0)
-    //         });
-    //     }
-    //     else if (__DEV__) {  
-    //         console.warn('SVG render mode doesn\'t support lines with trail effect');
-    //     }
-    // }
-    // lineDraw.updateData(data as SeriesData);
     var clipPath = seriesModel.get('clip', true) && createClipPath(seriesModel.coordinateSystem, false, seriesModel);
     if (clipPath) {
       this.group.setClipPath(clipPath);
@@ -231,6 +203,50 @@ var LinesPlotView = /** @class */function (_super) {
   };
   LinesPlotView.prototype._renderSymbol = function (data, seriesModel) {
     var symbolVisible = seriesModel.get('symbolVisible');
+    // const symbolPointsByColor = data.getLayout("symbolPointsByColor")
+    // const shadowShape =  seriesModel.get('shadowShape');
+    // if (symbolVisible) {
+    //     if (!this._symbolGroup) {
+    //         this._symbolGroup = new graphic.Group();
+    //         this.group.add(this._symbolGroup)
+    //     } else {
+    //         this._symbolGroup.removeAll();
+    //     }
+    //     const symbolGroup = this._symbolGroup;
+    //     console.log('%c [ symbolPointsByColor ]-219', 'font-size:13px; background:pink; color:#bf2c9f;', symbolPointsByColor)
+    //     each(symbolPointsByColor, function(item: { point: number[]; size: number }[], key: string) {
+    //         const [stroke, type] = key.split("_");
+    //         // if (shadowShape) {
+    //         //     const shadowEl = new SymbolPath({ shape: {
+    //         //             points: item,
+    //         //             isShadow: true,
+    //         //         },
+    //         //         style: {
+    //         //             fill: stroke,
+    //         //             opacity: 0.5,
+    //         //         }
+    //         //     })
+    //         //     shadowEl.symbolProxy = createSymbol(type, 0, 0, 0, 0) as ECSymbol;
+    //         //     symbolGroup.add(shadowEl)
+    //         //  }
+    //         const el = new SymbolPath({ shape: {
+    //                 points: item,
+    //             },
+    //             style: {
+    //                 fill: null,
+    //                 stroke: null,
+    //             }
+    //          })
+    //          el.symbolProxy = createSymbol(type, 0, 0, 0, 0, "pink") as ECSymbol;
+    //         //  el.symbolProxy.setColor("pink")
+    //         //  console.log('%c [ symbolProxy ]-228', 'font-size:13px; background:pink; color:#bf2c9f;', el.symbolProxy)
+    //          symbolGroup.add(el)
+    //     })
+    // } else if (this._symbolGroup) {
+    //     this._symbolGroup.removeAll();
+    //     this.group.remove(this._symbolGroup)
+    //     this._symbolGroup = null
+    // }
     var symbolDraw = this._symbolDraw;
     if (symbolVisible) {
       var symbolDraw_1 = this._updateSymbolDraw(data, seriesModel);
@@ -417,6 +433,8 @@ var LinesPlotView = /** @class */function (_super) {
     this._polygonGroup = null;
     this._symbolDraw && this._symbolDraw.remove();
     this._symbolDraw = null;
+    // this._symbolGroup && this._symbolGroup.removeAll();
+    // this._symbolGroup = null;
     this._histogramGroup && this._histogramGroup.removeAll();
     this._histogramGroup = null;
     this._barGroup && this._barGroup.removeAll();
@@ -433,11 +451,11 @@ var LinesPlotView = /** @class */function (_super) {
   return LinesPlotView;
 }(ChartView);
 function getIsIgnoreFunc(seriesModel, data, coordSys) {
-  var showAllSymbol = seriesModel.get('showAllSymbol');
-  var isAuto = showAllSymbol === 'auto';
-  if (showAllSymbol && !isAuto) {
-    return;
-  }
+  // const showAllSymbol = seriesModel.get('showAllSymbol');
+  // const isAuto = showAllSymbol === 'auto';
+  // if (showAllSymbol && !isAuto) {
+  //     return;
+  // }
   var categoryAxis = coordSys.getAxesByScale('ordinal')[0];
   if (!categoryAxis) {
     return;

package/lib/chart/linesPlot/SymbolPath.js

@@ -0,0 +1,88 @@
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+
+/**
+ * AUTO-GENERATED FILE. DO NOT MODIFY.
+ */
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+import { __extends } from "tslib";
+/* global Float32Array */
+// TODO Batch by color
+import * as graphic from '../../util/graphic.js';
+// const BOOST_SIZE_THRESHOLD = 4;
+var LargeSymbolPathShape = /** @class */function () {
+  function LargeSymbolPathShape() {}
+  return LargeSymbolPathShape;
+}();
+var SymbolPath = /** @class */function (_super) {
+  __extends(SymbolPath, _super);
+  function SymbolPath(opts) {
+    return _super.call(this, opts) || this;
+  }
+  SymbolPath.prototype.getDefaultShape = function () {
+    return new LargeSymbolPathShape();
+  };
+  SymbolPath.prototype.buildPath = function (path, shape) {
+    var points = shape.points;
+    var isShadow = shape.isShadow;
+    var symbolProxy = this.symbolProxy;
+    var symbolProxyShape = symbolProxy.shape;
+    var ctx = path.getContext ? path.getContext() : path;
+    // this._ctx = ctx;
+    ctx.fillStyle = "red";
+    ctx.strokeStyle = "red";
+    for (var i = 0; i < points.length; i++) {
+      var point = points[i].point;
+      var size = isShadow ? points[i].size * 2 : points[i].size;
+      var x = point[0],
+        y = point[1];
+      if (isNaN(x) || isNaN(y)) {
+        continue;
+      }
+      symbolProxyShape.x = x - size / 2;
+      symbolProxyShape.y = y - size / 2;
+      symbolProxyShape.width = size;
+      symbolProxyShape.height = size;
+      symbolProxy.style.fill = "pink";
+      symbolProxy.buildPath(path, symbolProxyShape, true);
+    }
+  };
+  return SymbolPath;
+}(graphic.Path);
+export default SymbolPath;

package/lib/chart/linesPlot/linesPlotLayout.js

@@ -24,50 +24,48 @@
  */
 
 /*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* global Float32Array */
-import createRenderPlanner from '../helper/createRenderPlanner.js';
-import { error } from '../../util/log.js';
-import { map } from 'zrender/lib/core/util.js';
-import { createFloat32Array } from '../../util/vendor.js';
+import createRenderPlanner from "../helper/createRenderPlanner.js";
+import { error } from "../../util/log.js";
+import { map } from "zrender/lib/core/util.js";
+import { createFloat32Array } from "../../util/vendor.js";
 function optimizePixels(point) {
   point[0] = point[0] + 0.5;
   return point;
 }
 var linesPlotLayout = {
-  seriesType: 'linesPlot',
+  seriesType: "linesPlot",
   plan: createRenderPlanner(),
   reset: function (seriesModel) {
     var coordSys = seriesModel.coordinateSystem;
     if (!coordSys) {
       if (process.env.NODE_ENV !== 'production') {
-        error('The lines series must have a coordinate system.');
+        error("The lines series must have a coordinate system.");
       }
       return;
     }
     var data = seriesModel.getData();
     var pipelineContext = seriesModel.pipelineContext;
-    var useTypedArray = pipelineContext.large;
     var dims = map(coordSys.dimensions, function (dim) {
       return data.mapDimension(dim);
     }).slice(0, 2);
-    var dimLen = dims.length;
     var store = data.getStore();
     var dimIdx0 = data.getDimensionIndex(dims[0]);
     var dimIdx1 = data.getDimensionIndex(dims[1]);
@@ -75,20 +73,43 @@ var linesPlotLayout = {
     // const isLarge = seriesModel.pipelineContext.large;
     var connectNulls = seriesModel.get("connectNulls");
     var step = seriesModel.get("step");
-    var isSingle = seriesModel.get('histogramVisible') || seriesModel.get('barVisible');
-    var symbolByStep = seriesModel.get('symbolByStep');
-    var xOffset = seriesModel.get('offset') || 0;
+    var isSingle = seriesModel.get("histogramVisible") || seriesModel.get("barVisible");
+    var symbolByStep = seriesModel.get("symbolByStep");
+    var xOffset = seriesModel.get("offset") || 0;
+    var symbolVisible = seriesModel.get("symbolVisible");
+    var symbolSize = seriesModel.get("symbolSize");
+    var globalSymbol = seriesModel.get('symbol');
     return {
       progress: function (params, lineData) {
         // const lineCoords: number[][] = [];
         var segCount = params.end - params.start;
         var symbolPoints = createFloat32Array(segCount * 2);
         var linePointsByKey = {};
+        // const symbolPointsByColor: Record<
+        //   string,
+        //   { point: number[]; size: number[] | number }[]
+        // > = {};
         var allLinePoints = [];
         var lastKey = "";
         var offset = 0;
         var stroke = seriesModel.getLineStyle().stroke;
         var defaultColor = Array.isArray(stroke) ? stroke[0] : stroke;
+        // function setSymbolPoint(point: number[], index: number) {
+        //   if (!symbolVisible) {
+        //     return;
+        //   }
+        //   const dataModal = lineData.getItemModel<LinesDataItemOption>(index);
+        //   const symbolColor = dataModal.get("itemStyle").color as string;
+        //   const symbol = dataModal.get("symbol");
+        //   // const symbolSize = dataModal.get("symbolSize");
+        //   const symbolKey = `${symbolColor}_${symbol}`;
+        //   const symbolData = symbolPointsByColor[symbolKey] || [];
+        //   symbolData.push({
+        //     point,
+        //     size: symbolSize || dataModal.get("symbolSize"),
+        //   });
+        //   symbolPointsByColor[symbolKey] = symbolData;
+        // }
         for (var i = params.start; i < params.end; i++) {
           var isRawLast = i + 1 === params.end ? data.getRawIndex(i) === data.count(true) - 1 : false;
           var isRawFirst = i === 0 ? data.getRawIndex(i) === 0 : false;
@@ -98,7 +119,9 @@ var linesPlotLayout = {
           if (symbolByStep ? connectNulls && isNaN(y) || isRawLast : true) {
             symbolPoints[offset++] = point[0];
             symbolPoints[offset++] = point[1];
+            // setSymbolPoint(point, i);
           }
+
           if (connectNulls && isNaN(y)) {
             continue;
           }
@@ -129,7 +152,7 @@ var linesPlotLayout = {
             nextPoint[0] = midX;
           }
           var itemModel = lineData.getItemModel(isSingle ? i : i + 1);
-          var _a = itemModel.get('lineStyle'),
+          var _a = itemModel.get("lineStyle"),
             _b = _a.color,
             color = _b === void 0 ? defaultColor : _b,
             _c = _a.type,
@@ -150,21 +173,24 @@ var linesPlotLayout = {
             points.push(0);
           }
           points.push(point);
-          allLinePoints.push(point);
+          // allLinePoints.push(point);
           if (isStep) {
             points.push(nextPoint);
             if (symbolByStep) {
               symbolPoints[offset++] = nextPoint[0];
               symbolPoints[offset++] = nextPoint[1];
+              // setSymbolPoint(point, i);
             }
-            allLinePoints.push(nextPoint);
+            // allLinePoints.push(nextPoint);
           }
+
           linePointsByKey[key] = points;
           lastKey = key;
         }
         lineData.setLayout({
           linePointsByKey: linePointsByKey,
-          allLinePoints: allLinePoints,
+          // allLinePoints,
+          // symbolPointsByColor,
           points: symbolPoints
         });
       }

package/lib/chart/scatter/ScatterView.js

@@ -61,7 +61,8 @@ var ScatterView = /** @class */function (_super) {
       // If this parameter should be a shape or a bounding volume
       // shape will be more general.
       // But bounding volume like bounding rect will be much faster in the contain calculation
-      clipShape: this._getClipShape(seriesModel)
+      clipShape: this._getClipShape(seriesModel),
+      useNameLabel: true
     });
     this._finished = true;
   };

package/lib/export/charts.js

@@ -64,6 +64,7 @@ export { install as CandlestickChart } from '../chart/candlestick/install.js';
 export { install as EffectScatterChart } from '../chart/effectScatter/install.js';
 export { install as LinesChart } from '../chart/lines/install.js';
 export { install as LinesPlotChart } from '../chart/linesPlot/install.js';
+export { install as LabelsChart } from '../chart/labels/install.js';
 export { install as HLinesChart } from '../chart/hlines/install.js';
 export { install as BgColorChart } from '../chart/bgColor/install.js';
 export { install as HeatmapChart } from '../chart/heatmap/install.js';

package/lib/model/Global.js

@@ -121,6 +121,7 @@ var BUILTIN_CHARTS_MAP = {
   effectScatter: 'EffectScatterChart',
   lines: 'LinesChart',
   linesPlot: 'LinesPlotChart',
+  labels: 'LabelsChart',
   hlines: 'HLinesChart',
   bgcolor: 'BgColorChart',
   heatmap: 'HeatmapChart',