jmgraph 3.2.11 → 3.2.13

package/package.json

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

package/src/core/jmControl.js

@@ -48,6 +48,8 @@ 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) {
 			this.position = params.position;
@@ -149,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);
+	}
 		
 	/**
 	 * 当前控件的子控件集合
@@ -1125,16 +1142,32 @@ export default class jmControl extends jmProperty {
 			// 由于高清屏会有放大坐标，所以这里用pagex就只能用真实的canvas大小
 			const right = position.left + this.width;
 			const 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;
 		}
 		
 		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;
 		//如果不是路径组成，则采用边界做为顶点
@@ -1381,33 +1414,37 @@ export default class jmControl extends jmProperty {
 
 				if(_this.__mvMonitor.mouseDown) {
 					_this.parent.bounds = null;
-					let parentbounds = _this.parent.getAbsoluteBounds();		
+					//let parentbounds = _this.parent.getAbsoluteBounds();		
 					let offsetx = evt.position.offsetX - _this.__mvMonitor.curposition.x;
 					let offsety = evt.position.offsetY - _this.__mvMonitor.curposition.y;				
 					//console.log(offsetx + ',' + offsety);
 					//如果锁定边界
-					if(_this.lockSide) {
+					if(_this.option.lockSide) {
 						let thisbounds = _this.bounds || _this.getAbsoluteBounds();					
 						//检查边界出界
-						let outside = jmUtils.checkOutSide(parentbounds,thisbounds,{x:offsetx,y:offsety});
+						let outside = 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;

package/src/core/jmGraph.js

@@ -226,7 +226,11 @@ export default class jmGraph extends jmControl {
 	 * @return {postion} 返回定位坐标
 	 */
 	getPosition() {
-		const p = jmUtils.getElementPosition(this.canvas.canvas || this.canvas);
+		const p = this.isWXMiniApp? {
+			left: 0,
+			top: 0
+		} :jmUtils.getElementPosition(this.canvas.canvas || this.canvas);
+		
 		p.width = this.width;
 		p.height = this.height;
 		p.right = p.left + p.width;