jmgraph 3.2.11 → 3.2.13

package/dist/jmgraph.js

@@ -275,6 +275,9 @@ var jmControl = exports.jmControl = exports["default"] = /*#__PURE__*/function (
     //this.position = params.position || {x:0,y:0};
     _this2.width = params.width || 0;
     _this2.height = params.height || 0;
+    _this2.hitArea = params.hitArea || null;
+    //this.lockSide = params.lockSide || null;
+
     if (params.position) {
       _this2.position = params.position;
     }
@@ -383,6 +386,23 @@ var jmControl = exports.jmControl = exports["default"] = /*#__PURE__*/function (
       return this.property('interactive', v);
     }
 
+    /**
+     * 事件命中区域，如果不给定就会自动计算
+     *  这个区域是相对于当前控件本身的，也就是说从左上角开始 {x:0,y:0}
+     * @property hitArea
+     * @default bounds
+     * @type { x: number, y: number, width: number, height: number}
+     */
+  }, {
+    key: "hitArea",
+    get: function get() {
+      var s = this.property('hitArea');
+      return s;
+    },
+    set: function set(v) {
+      return this.property('hitArea', v);
+    }
+
     /**
      * 当前控件的子控件集合
      * @property children
@@ -1406,15 +1426,31 @@ var jmControl = exports.jmControl = exports["default"] = /*#__PURE__*/function (
         // 由于高清屏会有放大坐标，所以这里用pagex就只能用真实的canvas大小
         var right = position.left + this.width;
         var bottom = position.top + this.height;
-        if (p.pageX > right || p.pageX < position.left) {
+        if (p.x > right || p.x < position.left) {
           return false;
         }
-        if (p.pageY > bottom || p.pageY < position.top) {
+        if (p.y > bottom || p.y < position.top) {
           return false;
         }
         return true;
       }
       var bounds = this.getBounds();
+      // 如果指定了合中区域，则以命中区域为准
+      if (this.hitArea) {
+        var hitArea = {
+          left: this.hitArea.x + bounds.left,
+          top: this.hitArea.y + bounds.top,
+          right: this.hitArea.width + bounds.left,
+          bottom: this.hitArea.height + bounds.top
+        };
+        if (p.x > hitArea.right || p.x < hitArea.left) {
+          return false;
+        }
+        if (p.y > hitArea.bottom || p.y < hitArea.top) {
+          return false;
+        }
+        return true;
+      }
       var ps = this.points;
       //如果不是路径组成，则采用边界做为顶点
       if (!ps || !ps.length) {
@@ -1672,33 +1708,37 @@ var jmControl = exports.jmControl = exports["default"] = /*#__PURE__*/function (
 
           if (_this.__mvMonitor.mouseDown) {
             _this.parent.bounds = null;
-            var parentbounds = _this.parent.getAbsoluteBounds();
+            //let parentbounds = _this.parent.getAbsoluteBounds();		
             var offsetx = evt.position.offsetX - _this.__mvMonitor.curposition.x;
             var offsety = evt.position.offsetY - _this.__mvMonitor.curposition.y;
             //console.log(offsetx + ',' + offsety);
             //如果锁定边界
-            if (_this.lockSide) {
+            if (_this.option.lockSide) {
               var thisbounds = _this.bounds || _this.getAbsoluteBounds();
               //检查边界出界
-              var outside = _jmUtils.jmUtils.checkOutSide(parentbounds, thisbounds, {
+              var outside = _jmUtils.jmUtils.checkOutSide(_this.option.lockSide, thisbounds, {
                 x: offsetx,
                 y: offsety
               });
               if (outside.left < 0) {
-                if (_this.lockSide.left) offsetx -= outside.left;
+                //offsetx -= outside.left;
+                offsetx = 0;
               } else if (outside.right > 0) {
-                if (_this.lockSide.right) offsetx -= outside.right;
+                //offsetx -= outside.right;
+                offsetx = 0;
               }
               if (outside.top < 0) {
-                if (_this.lockSide.top) offsety -= outside.top;
+                //offsety -= outside.top;
+                offsety = 0;
               } else if (outside.bottom > 0) {
-                if (_this.lockSide.bottom) offsety -= outside.bottom;
+                //offsety -= outside.bottom;
+                offsety = 0;
               }
             }
             if (offsetx || offsety) {
               _this.offset(offsetx, offsety, true, evt);
-              _this.__mvMonitor.curposition.x = evt.position.offsetX;
-              _this.__mvMonitor.curposition.y = evt.position.offsetY;
+              if (offsetx) _this.__mvMonitor.curposition.x = evt.position.offsetX;
+              if (offsety) _this.__mvMonitor.curposition.y = evt.position.offsetY;
               //console.log(offsetx + '.' + offsety);
             }
             return false;
@@ -2610,7 +2650,10 @@ var jmGraph = exports.jmGraph = exports["default"] = /*#__PURE__*/function (_jmC
      * @return {postion} 返回定位坐标
      */
     function getPosition() {
-      var p = _jmUtils.jmUtils.getElementPosition(this.canvas.canvas || this.canvas);
+      var p = this.isWXMiniApp ? {
+        left: 0,
+        top: 0
+      } : _jmUtils.jmUtils.getElementPosition(this.canvas.canvas || this.canvas);
       p.width = this.width;
       p.height = this.height;
       p.right = p.left + p.width;