tvcharts 0.9.11 → 0.9.13

package/lib/chart/candlePlot/candlePlotLayout.js

@@ -44,6 +44,7 @@
 import { subPixelOptimize } from '../../util/graphic.js';
 import createRenderPlanner from '../helper/createRenderPlanner.js';
 import { map } from 'tvrender/lib/core/util.js';
+import { isMobileRender } from "../../util/mobile.js";
 var positiveBorderColorQuery = ['itemStyle', 'borderColor'];
 var negativeBorderColorQuery = ['itemStyle', 'borderColor0'];
 var dojiBorderColorQuery = ['itemStyle', 'borderColorDoji'];
@@ -82,9 +83,8 @@ var candlePlotLayout = {
     }
     var showLast = seriesModel.get('showLast');
     var ignoreParentColor = seriesModel.get('ignoreParentColor');
-    var isMobile = seriesModel.get('isMobile');
-    var offsetX = isMobile ? 0 : 0.5;
-    var formatY = isMobile ? function (y) {
+    var offsetX = isMobileRender ? 0 : 0.5;
+    var formatY = isMobileRender ? function (y) {
       return y;
     } : function (y) {
       return Math.floor(y);
@@ -228,7 +228,7 @@ function optimalCandlestickWidth(barSpacing, pixelRatio) {
   var barSpacingSpecialCaseTo = 4;
   var barSpacingSpecialCaseCoeff = 3;
   if (barSpacing >= barSpacingSpecialCaseFrom && barSpacing <= barSpacingSpecialCaseTo) {
-    return Math.floor(barSpacingSpecialCaseCoeff * pixelRatio) - 2;
+    return Math.floor(barSpacingSpecialCaseCoeff * pixelRatio) - 1;
   }
   // coeff should be 1 on small barspacing and go to 0.8 while groing bar spacing
   var barSpacingReducingCoeff = 0.2;

package/lib/component/events/EventsView.js

@@ -46,6 +46,9 @@ import ComponentView from "../../view/Component.js";
 import { each } from "tvrender/lib/core/util.js";
 import * as graphic from "../../util/graphic.js";
 var r = 15;
+var optimizeX = function (x, lineWidth) {
+  return lineWidth % 2 === 0 ? x : Math.floor(x) + 0.5;
+};
 var EventsView = /** @class */function (_super) {
   __extends(EventsView, _super);
   function EventsView() {
@@ -59,7 +62,7 @@ var EventsView = /** @class */function (_super) {
   }
   EventsView.prototype.init = function (ecModel, api) {
     this._api = api;
-    // api.getZr().on('mousemove', this._mouseMove, this);
+    // api.getZr().on('mousemove', this._eventClick, this);
   };
 
   EventsView.prototype.render = function (eventsModel, ecModel, api) {
@@ -118,6 +121,7 @@ var EventsView = /** @class */function (_super) {
         var id = time + "_" + item.id;
         var isSelected = selectedEventViewId === id;
         var renderZ = isSelected ? z + 1 : z;
+        var imgGroup = new graphic.Group();
         var img = new graphic.Image({
           style: {
             image: item.url,
@@ -139,7 +143,7 @@ var EventsView = /** @class */function (_super) {
           }
         });
         img.setClipPath(clipPath);
-        group.add(img);
+        imgGroup.add(img);
         var rect = new graphic.Rect({
           shape: {
             x: x + 5 - borderWidth / 2,
@@ -150,7 +154,8 @@ var EventsView = /** @class */function (_super) {
           },
           style: {
             stroke: "#ED544F",
-            fill: "none"
+            fill: "none",
+            lineWidth: borderWidth
           },
           z2: z2,
           z: renderZ
@@ -162,7 +167,7 @@ var EventsView = /** @class */function (_super) {
             this.hoverEventId = '';
           }
         }
-        group.add(rect);
+        imgGroup.add(rect);
         if (i !== list.length - 1) {
           y = y - 24;
         }
@@ -195,21 +200,23 @@ var EventsView = /** @class */function (_super) {
             }
           });
         };
-        img.onmouseout = mouseout;
-        img.onmousemove = mouseMove;
-        img.onmouseover = mouseover;
-        img.onclick = click;
-        rect.onmouseout = mouseout;
-        rect.onmousemove = mouseMove;
-        rect.onmouseover = mouseover;
-        rect.onclick = click;
+        imgGroup.onmouseout = mouseout;
+        imgGroup.onmousemove = mouseMove;
+        imgGroup.onmouseover = mouseover;
+        imgGroup.onmouseup = click;
+        group.add(imgGroup);
+        // rect.onmouseout = mouseout;
+        // rect.onmousemove = mouseMove;
+        // rect.onmouseover = mouseover;
+        // rect.onclick = click;
       }, this_1);
       if (lineVisible && list.length) {
+        var linex = optimizeX(x + 15, lineStyle.width);
         var line = new graphic.Line({
           shape: {
-            x1: x + 15,
+            x1: linex,
             y1: 0,
-            x2: x + 15,
+            x2: linex,
             y2: y
           },
           silent: true,
@@ -230,6 +237,8 @@ var EventsView = /** @class */function (_super) {
       if (state_1 === "break") break;
     }
   };
+  // _eventClick(e: any){
+  // }
   EventsView.prototype._mouseMove = function (e) {
     this._lastPoint = {
       x: e.offsetX,
@@ -242,7 +251,9 @@ var EventsView = /** @class */function (_super) {
       x: 0,
       y: 0
     };
+    // this._api && this._api.getZr()?.off('mousemove', this._eventClick);
   };
+
   EventsView.type = "events";
   return EventsView;
 }(ComponentView);

package/lib/coord/Axis.js

@@ -44,28 +44,8 @@
 import { each, map } from 'tvrender/lib/core/util.js';
 import { linearMap, getPixelPrecision, round } from '../util/number.js';
 import { createAxisTicks, createAxisLabels, calculateCategoryInterval } from './axisTickLabelBuilder.js';
+import { isMobileRender } from "../util/mobile.js";
 var NORMALIZED_EXTENT = [0, 1];
-function isMobileByWidth(breakPoint) {
-  if (breakPoint === void 0) {
-    breakPoint = 768;
-  }
-  // 服务端渲染(SSR)或非浏览器环境返回false
-  if (typeof window === "undefined") return false;
-  // 获取当前视口宽度（实时检测）
-  var viewportWidth = window.innerWidth;
-  // 判断是否小于断点
-  return viewportWidth < breakPoint && window.devicePixelRatio !== 1;
-}
-function isMobileView() {
-  // 其次检查 User Agent
-  var userAgent = navigator.userAgent;
-  var mobileRegex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i;
-  if (isMobileByWidth() && mobileRegex.test(userAgent)) {
-    return true;
-  }
-  return false;
-}
-var isMobile = isMobileView();
 /**
  * Base class of Axis.
  */
@@ -124,7 +104,7 @@ var Axis = /** @class */function () {
       var deltaFromRight = dataCount + scale.lastBarRightSideDiffBarCount - dataIndex;
       // return this._extent[1] - (deltaFromRight + 0.5) * scale.barSpace - 1;
       // return Math.floor(this._extent[1] - deltaFromRight * scale.barSpace) + 0.5;
-      return isMobile ? this._extent[1] - deltaFromRight * scale.barSpace : Math.round(this._extent[1] - deltaFromRight * scale.barSpace);
+      return isMobileRender ? this._extent[1] - deltaFromRight * scale.barSpace : Math.round(this._extent[1] - deltaFromRight * scale.barSpace);
     }
     if (this.onBand && scale.type === 'ordinal') {
       extent = extent.slice();

package/lib/util/mobile.js

@@ -0,0 +1,47 @@
+
+/*
+* 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.
+ */
+
+function isMobileByWidth(breakPoint) {
+  if (breakPoint === void 0) {
+    breakPoint = 768;
+  }
+  // 服务端渲染(SSR)或非浏览器环境返回false
+  if (typeof window === "undefined") return false;
+  // 获取当前视口宽度（实时检测）
+  var viewportWidth = window.innerWidth;
+  // 判断是否小于断点
+  return viewportWidth < breakPoint && window.devicePixelRatio !== 1;
+}
+function isMobileView() {
+  // 其次检查 User Agent
+  var userAgent = navigator.userAgent;
+  var mobileRegex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i;
+  if (isMobileByWidth() && mobileRegex.test(userAgent)) {
+    return true;
+  }
+  return false;
+}
+var isMobileRender = isMobileView();
+export { isMobileRender };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.9.11",
+  "version": "0.9.13",
   "main": "dist/echarts.js",
   "module": "index.js",
   "jsdelivr": "dist/echarts.min.js",

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

@@ -0,0 +1,2 @@
+declare const isMobileRender: boolean;
+export { isMobileRender };