wx app touch

fefeding · Oct 29, 2024 · c4c7276 · c4c7276
1 parent 0f21368
commit c4c7276
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/dist/jmgraph.core.min.js b/dist/jmgraph.core.min.js
diff --git a/dist/jmgraph.core.min.js.map b/dist/jmgraph.core.min.js.map
diff --git a/dist/jmgraph.js b/dist/jmgraph.js
@@ -3928,11 +3928,12 @@ var jmUtils = exports.jmUtils = exports["default"] = /*#__PURE__*/function () {
     key: "getEventPosition",
     value: function getEventPosition(evt, scale) {
       evt = evt || event;
+      var isWXMiniApp = evt.isWXMiniApp;
       var isTouch = false;
       var touches = evt.changedTouches || evt.targetTouches || evt.touches;
       var target = evt.target || evt.srcElement;
       if (touches && touches.length) {
-        evt = touches[0]; //兼容touch事件
+        evt = touches[0]; //兼容touch事件            
         if (!evt.target) evt.target = target;
         isTouch = true;
       }
@@ -3944,7 +3945,7 @@ var jmUtils = exports.jmUtils = exports["default"] = /*#__PURE__*/function () {
       var oy = evt.offsetY;
       if (typeof ox === 'undefined' && typeof oy === 'undefined') {
         // 小程序下取x,y就是它的相对坐标
-        if (evt.isWXMiniApp) {
+        if (isWXMiniApp) {
           ox = evt.x;
           oy = evt.y;
         } else {
@@ -3972,7 +3973,8 @@ var jmUtils = exports.jmUtils = exports["default"] = /*#__PURE__*/function () {
         x: ox,
         y: oy,
         isTouch: isTouch,
-        touches: touches
+        touches: touches,
+        isWXMiniApp: isWXMiniApp
       };
     }
 

diff --git a/dist/jmgraph.min.js b/dist/jmgraph.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "family": "jmgraph",
   "name": "jmgraph",
-  "version": "3.2.10",
+  "version": "3.2.11",
   "description": "一个简单的canvas画图库",
   "homepage": "http://graph.jm47.com/",
   "keywords": [

diff --git a/src/core/jmUtils.js b/src/core/jmUtils.js
@@ -317,12 +317,12 @@ export default class jmUtils {
      */
     static getEventPosition (evt, scale) {
         evt = evt || event;
-
+        const isWXMiniApp = evt.isWXMiniApp;
         let isTouch = false;
         let touches = evt.changedTouches || evt.targetTouches || evt.touches;
         let target = evt.target || evt.srcElement;
         if(touches && touches.length) {
-            evt = touches[0];//兼容touch事件
+            evt = touches[0];//兼容touch事件            
             if(!evt.target) evt.target = target;
             isTouch = true;
         }
@@ -335,7 +335,7 @@ export default class jmUtils {
         let oy = evt.offsetY;
         if(typeof ox === 'undefined' && typeof oy === 'undefined') {
             // 小程序下取x,y就是它的相对坐标
-            if(evt.isWXMiniApp) {
+            if(isWXMiniApp) {
                 ox = evt.x;
                 oy = evt.y;
             }
@@ -365,7 +365,8 @@ export default class jmUtils {
             x: ox,
             y: oy,
             isTouch: isTouch,
-            touches
+            touches,
+            isWXMiniApp
         };
     }