tvcharts 0.5.60 → 0.5.62

package/dist/echarts.common.js

@@ -27653,6 +27653,7 @@
           });
         }
         function doUpdateZ(el, z, zlevel, maxZ2) {
+          var _a;
           // Group may also have textContent
           var label = el.getTextContent();
           var labelLine = el.getTextGuideLine();
@@ -27661,7 +27662,7 @@
             // set z & zlevel of children elements of Group
             var children = el.childrenRef();
             for (var i = 0; i < children.length; i++) {
-              maxZ2 = Math.max(doUpdateZ(children[i], z, zlevel, maxZ2), maxZ2);
+              maxZ2 = Math.max(doUpdateZ(children[i], z, (_a = el.zLevel) !== null && _a !== void 0 ? _a : zlevel, maxZ2), maxZ2);
             }
           } else {
             // not Group
@@ -42107,7 +42108,7 @@
       axisBackground: {
         show: false,
         backStyle: {
-          opacity: 0
+          // opacity: 1
         }
       }
     };
@@ -42531,7 +42532,6 @@
       // Axis position
       layout.position = [axisDim === 'y' ? posBound[idx[axisPosition]] : rectBound[0], axisDim === 'x' ? posBound[idx[axisPosition]] : rectBound[3]];
       // Axis rotation
-      // layout.rotation = 0;
       layout.rotation = Math.PI / 2 * (axisDim === 'x' ? 0 : 1);
       // Tick and label direction, x y is axisDim
       var dirMap = {
@@ -43101,6 +43101,7 @@
       };
     }
 
+    // import InsideZoomModel from '../dataZoom/InsideZoomModel.js';
     var PI$5 = Math.PI;
     /**
      * A final axis is translated and rotated from a "standard axis".
@@ -43150,6 +43151,11 @@
         // this._transformGroup = transformGroup;
         transformGroup.updateTransform();
         this._transformGroup = transformGroup;
+        // todo 提高y轴层级
+        if (axisModel.axis.dim === 'y') {
+          // @ts-ignore
+          this.group.zLevel = 2;
+        }
       }
       AxisBuilder.prototype.hasBuilder = function (name) {
         return !!builders[name];
@@ -43293,73 +43299,25 @@
           // v2ApplyTransform(pt2, pt2, matrix);
         }
 
-        var style = extend({
-          // lineCap: 'round'
-        }, axisModel.getModel(['axisBackground', 'backStyle']).getLineStyle());
+        var style = extend({}, axisModel.getModel(['axisBackground', 'backStyle']).getAreaStyle());
         // const dataZoomModals =
         //     axisModel.ecModel.queryComponents({ mainType: 'dataZoom', id: axisModel.mainType }) as InsideZoomModel[];
         var position = axisModel.axis.position;
         // const ecInstance = axisModel.ecModel.scheduler.ecInstance;
         var api = axisModel.ecModel.scheduler.api;
-        var width = api.getWidth();
-        // globalListener.register('axisBackground', axisModel.ecModel.scheduler.api, (currTrigger, e) => {
-        //     if (!e || !e.offsetX || !e.offsetY) {
-        //         return;
-        //     }
-        //     const offsetX = e.offsetX;
-        //     const offsetY = e.offsetY;
-        //     if (offsetX > right || offsetX < left || offsetY < top || offsetY > bottom) {
-        //         return;
-        //     }
-        //     switch (currTrigger) {
-        //         case 'mouseup':
-        //             isMouseDown = false;
-        //             mouseY = 0;
-        //             break;
-        //         case 'mousedown':
-        //             isMouseDown = true;
-        //              break;
-        //         case 'mousemove':
-        //                 let zoomStep = 0.2; // 设置缩放步长
-        //                 if (isMouseDown && e.offsetY !== mouseY) {
-        //                     dataZoomModals.forEach(item => {
-        //                     const { settledOption, componentIndex } = item;
-        //                         // 下滑
-        //                         if (mouseY > e.offsetY) {
-        //                             zoomStep = -zoomStep;
-        //                         }
-        //                         ecInstance.dispatchAction({
-        //                             type: 'dataZoom',
-        //                             dataZoomIndex: componentIndex,
-        //                             start:
-        //                                 settledOption.start - zoomStep,
-        //                             end:
-        //                                 settledOption.end + zoomStep
-        //                         });
-        //                         mouseY = e.offsetY;
-        //                     });
-        //                 }
-        //             break;
-        //         case 'mousewheel': {
-        //                 const zoomStep = e.wheelDelta * 0.8;
-        //                 dataZoomModals.forEach(item => {
-        //                     const { settledOption, componentIndex } = item;
-        //                     ecInstance.dispatchAction({
-        //                         type: 'dataZoom',
-        //                         dataZoomIndex: componentIndex,
-        //                         start:
-        //                             settledOption.start + zoomStep,
-        //                         end:
-        //                             settledOption.end - zoomStep
-        //                     });
-        //                 });
-        //             }
-        //             break;
-        //     }
-        //     // console.log("y轴交互")
-        //     // if () {
-        //     // }
-        // });
+        // const width = api.getWidth();
+        // const rect = position === 'left' ? {
+        //     left: 0,
+        //     right: pt1[0],
+        //     top: 0,
+        //     bottom: pt1[1]
+        // } : {
+        //     left: pt1[0],
+        //     right: width,
+        //     top: 0,
+        //     bottom: pt1[1]
+        // };
+        // const { left, right, top, bottom } = rect;
         // todo 先不管x轴
         var background = new Rect({
           shape: position === 'left' ? {
@@ -44118,7 +44076,6 @@
       inner$6(axisView).splitAreaColors = null;
     }
 
-    // import * as globalListener from './globalListener.js';
     var axisBuilderAttrs = ['axisLine', 'axisTickLabel', 'axisName', 'axisBackground'];
     var selfBuilderAttrs = ['splitArea', 'splitLine', 'minorSplitLine'];
     var CartesianAxisView = /** @class */function (_super) {
@@ -44128,10 +44085,6 @@
         _this.type = CartesianAxisView.type;
         _this.axisPointerClass = 'CartesianAxisPointer';
         return _this;
-        // dispose(ecModel: GlobalModel, api: ExtensionAPI) {
-        //     super.dispose(ecModel, api);
-        //     // globalListener.unregister('axisBackground', api);
-        // }
       }
       /**
        * @override
@@ -44175,8 +44128,7 @@
         }
         _super.prototype.render.call(this, axisModel, ecModel, api, payload);
       };
-      CartesianAxisView.prototype.remove = function (ecModel, api) {
-        // globalListener.unregister('axisBackground', api);
+      CartesianAxisView.prototype.remove = function () {
         rectCoordAxisHandleRemove(this);
       };
       CartesianAxisView.type = 'cartesianAxis';
@@ -44412,6 +44364,8 @@
         var moveAnimation = this._moveAnimation = this.determineAnimation(axisModel, axisPointerModel);
         if (!group) {
           group = this._group = new Group();
+          // @ts-ignore //todo先这样写
+          this._group.zLevel = 2;
           this.createPointerEl(group, elOption, axisModel, axisPointerModel);
           this.createLabelEl(group, elOption, axisModel, axisPointerModel);
           api.getZr().add(group);
@@ -44488,6 +44442,8 @@
       BaseAxisPointer.prototype.createLabelEl = function (group, elOption, axisModel, axisPointerModel) {
         if (elOption.label) {
           var labelEl = inner$7(group).labelEl = new ZRText(clone$3(elOption.label));
+          // todo 因为y层级也提高了，所以这里也得调整
+          labelEl.zlevel = 2;
           group.add(labelEl);
           updateLabelShowHide(labelEl, axisPointerModel);
         }
@@ -46485,10 +46441,10 @@
         }
         if (['dataZoom', 'resize'].includes(payload === null || payload === void 0 ? void 0 : payload.type)) {
           this._dataZoomUpdateElements(graphicModel, ecIns);
-          this._updateLabels();
+          this._updateLabels(ecModel, api);
         }
         this._lastGraphicModel = graphicModel;
-        this._updateElements(graphicModel);
+        this._updateElements(graphicModel, ecModel, api);
         this._relocate(graphicModel, api);
       };
       GraphicComponentView.prototype._dataZoomUpdateChildrenElements = function (children) {
@@ -46538,7 +46494,7 @@
       /**
        * Update graphic elements.
        */
-      GraphicComponentView.prototype._updateElements = function (graphicModel) {
+      GraphicComponentView.prototype._updateElements = function (graphicModel, ecModel, api) {
         var elOptionsToUpdate = graphicModel.useElOptionsToUpdate();
         if (!elOptionsToUpdate) {
           return;
@@ -46666,16 +46622,90 @@
             applyKeyframeAnimation(el, elOption.keyframeAnimation, graphicModel);
           }
         });
-        this._updateLabels();
+        this._updateLabels(ecModel, api);
       };
-      GraphicComponentView.prototype._updateLabels = function () {
+      GraphicComponentView.prototype._updateLabels = function (ecModel, api) {
         var elLabelMap = this._elLabelMap;
         var elLabelGroupEls = [];
+        var rootGroup = this.group;
+        // this._clearSeriesLabels();
         elLabelMap.each(function (item) {
           if (item.isGroup && typeof item.y === 'number') {
             elLabelGroupEls.push(item);
           }
         });
+        var width = api.getWidth();
+        var seriesLabels = this._seriesLabels;
+        // const showLabelElIndex: {[index: number]: boolean } = {}
+        ecModel.eachSeries(function (seriesModel, index) {
+          // const seriesData = seriesModel.getData();
+          var axisModel = seriesModel.getBaseAxis();
+          var extent = axisModel.scale.getExtent();
+          // const dataIndex = extent[1] - extent[0];
+          // const store = seriesData.getStore();
+          var lastIndex = extent[1];
+          var dataSource = seriesModel.get('data');
+          var data = dataSource[lastIndex];
+          var coordSys = seriesModel.coordinateSystem;
+          var el = seriesLabels[index];
+          if (!data) {
+            if (el) {
+              el.ignore = true;
+            }
+            return;
+          }
+          var yAxisModel = coordSys.getAxis('y');
+          var yValue = Array.isArray(data) ? data[2] : data;
+          var y = coordSys.dataToPoint([0, yValue])[1] - 18;
+          var x = yAxisModel.position === 'right' ? width - 65 : 0;
+          var fill = '#26A69A';
+          var text = yValue.toFixed(4);
+          if (seriesModel.subType === 'candlestick') {
+            var sign = void 0;
+            var kSeriesModal = seriesModel;
+            var hasDojiColor = !!kSeriesModal.get(['itemStyle', 'borderColorDoji']);
+            var openVal = data[0],
+              closeVal = data[1];
+            if (openVal > closeVal) {
+              sign = -1;
+            } else if (openVal < closeVal) {
+              sign = 1;
+            } else {
+              sign = hasDojiColor ? 0 : lastIndex > 0 ? kSeriesModal.get('data')[lastIndex - 1][1] <= closeVal ? 1 : -1 : 1;
+            }
+            // const itemModel = seriesData.getItemModel(dataIndex) as any;
+            // const sign = seriesData.getItemLayout(dataIndex)?.sign;
+            fill = kSeriesModal.get(['itemStyle', sign > 0 ? 'color' : 'color0']);
+            // console.log('====', (seriesModel as any).get('itemStyle'))
+          }
+          // showLabelElIndex[index] = true;
+          if (el) {
+            el.x = x;
+            el.y = y;
+            el.ignore = false;
+            el.traverse(function (el) {
+              if (el.type === 'text') {
+                el.attr('style', {
+                  fill: fill,
+                  text: text
+                });
+              } else {
+                el.style.stroke = fill;
+              }
+            });
+            elLabelGroupEls.push(el);
+          } else {
+            el = getTipsGraphic({
+              x: x,
+              y: y,
+              text: text,
+              fill: fill
+            });
+            rootGroup.add(el);
+            seriesLabels[index] = el;
+          }
+          elLabelGroupEls.push(el);
+        });
         avoidOverlap$1(elLabelGroupEls);
       };
       /**
@@ -46784,16 +46814,35 @@
         removeLabelEl(labelOption, elLabelMap);
         this._mergeElementLabels(graphicModel, labelOption);
       };
+      /**
+       * Clear all elements.
+       */
+      GraphicComponentView.prototype._clearSeriesLabels = function () {
+        var seriesLabels = this._seriesLabels;
+        each(seriesLabels, function (el) {
+          var parentEl = el.parent;
+          if (parentEl) {
+            parentEl.remove(el);
+          }
+        });
+        this._seriesLabels = [];
+      };
       /**
        * Clear all elements.
        */
       GraphicComponentView.prototype._clear = function () {
         var _this = this;
         var elMap = this._elMap;
+        var elLabelMap = this._elLabelMap;
         elMap.each(function (el) {
           removeEl(el, inner$a(el).option, elMap, _this._lastGraphicModel);
         });
+        elLabelMap.each(function (el) {
+          removeEl(el, inner$a(el).option, elLabelMap, _this._lastGraphicModel);
+        });
+        this._clearSeriesLabels();
         this._elMap = createHashMap();
+        this._elLabelMap = createHashMap();
       };
       GraphicComponentView.prototype.getGraphicById = function (id) {
         return this._elMap.get(id);
@@ -46924,6 +46973,53 @@
         eventData.info = elOption.info;
       }
     }
+    function getWidthFromBytes(text, averageWidthInPixels) {
+      if (averageWidthInPixels === void 0) {
+        averageWidthInPixels = 8;
+      }
+      var byteCount = new TextEncoder().encode(text).length;
+      var width = byteCount * averageWidthInPixels;
+      return width;
+    }
+    var getTipsGraphic = function (_a) {
+      var x = _a.x,
+        y = _a.y,
+        text = _a.text,
+        _b = _a.fill,
+        fill = _b === void 0 ? '#26A69A' : _b;
+      var width = getWidthFromBytes(text);
+      var group = new Group({
+        x: x,
+        y: y
+      });
+      var rect = new Rect({
+        shape: {
+          width: width + 10,
+          height: 18
+        },
+        style: {
+          stroke: fill,
+          lineWidth: 1
+        },
+        z: 100,
+        zlevel: 2
+      });
+      var textEl = new ZRText({
+        style: {
+          fill: fill,
+          width: width,
+          overflow: 'break',
+          text: text
+        },
+        zlevel: 2,
+        z: 100,
+        x: 4,
+        y: 4
+      });
+      group.add(rect);
+      group.add(textEl);
+      return group;
+    };
 
     function install$9(registers) {
       registers.registerComponentModel(GraphicComponentModel);