jmgraph 3.2.12 → 3.2.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "family": "jmgraph",
   "name": "jmgraph",
-  "version": "3.2.12",
+  "version": "3.2.13",
   "description": "一个简单的canvas画图库",
   "homepage": "http://graph.jm47.com/",
   "keywords": [

package/src/core/jmControl.js

@@ -48,6 +48,7 @@ export default class jmControl extends jmProperty {
 		//this.position = params.position || {x:0,y:0};
 		this.width = params.width || 0;
 		this.height = params.height  || 0;
+		this.hitArea = params.hitArea || null;
 		//this.lockSide = params.lockSide || null;
 
 		if(params.position) {
@@ -150,6 +151,21 @@ export default class jmControl extends jmProperty {
 	set interactive(v) {
 		return this.property('interactive', v);
 	}
+
+	/**
+	 * 事件命中区域，如果不给定就会自动计算
+	 *  这个区域是相对于当前控件本身的，也就是说从左上角开始 {x:0,y:0}
+	 * @property hitArea
+	 * @default bounds
+	 * @type { x: number, y: number, width: number, height: number}
+	 */
+	get hitArea() {
+		const s = this.property('hitArea');
+		return s;
+	}
+	set hitArea(v) {
+		return this.property('hitArea', v);
+	}
 		
 	/**
 	 * 当前控件的子控件集合
@@ -1136,6 +1152,22 @@ export default class jmControl extends jmProperty {
 		}
 		
 		const bounds = this.getBounds();	
+		// 如果指定了合中区域，则以命中区域为准
+		if(this.hitArea) {
+			const 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;
+		}
 		
 		let ps = this.points;
 		//如果不是路径组成，则采用边界做为顶点
@@ -1383,8 +1415,8 @@ export default class jmControl extends jmProperty {
 				if(_this.__mvMonitor.mouseDown) {
 					_this.parent.bounds = null;
 					//let parentbounds = _this.parent.getAbsoluteBounds();		
-					const offsetx = evt.position.offsetX - _this.__mvMonitor.curposition.x;
-					const offsety = evt.position.offsetY - _this.__mvMonitor.curposition.y;				
+					let offsetx = evt.position.offsetX - _this.__mvMonitor.curposition.x;
+					let offsety = evt.position.offsetY - _this.__mvMonitor.curposition.y;				
 					//console.log(offsetx + ',' + offsety);
 					//如果锁定边界
 					if(_this.option.lockSide) {