jmgraph 3.1.91 → 3.1.92

package/src/core/jmGraph.js

@@ -45,7 +45,7 @@ export default class jmGraph extends jmControl {
 
 		//如果是小程序
 		if(typeof wx != 'undefined' && wx.canIUse && wx.canIUse('canvas')) {			
-			canvas = wx.createSelectorQuery().select('#' + canvas);
+			if(typeof canvas === 'string') canvas = wx.createSelectorQuery().select('#' + canvas);
 			this.isWXMiniApp = true;// 微信小程序平台
 		}
 		else {
@@ -67,9 +67,9 @@ export default class jmGraph extends jmControl {
 			else {
 				this.container = canvas.parentElement;
 			}
-		}		
+		}	
+		this.canvas = canvas;	
 		if(!this.context) this.context = canvas.getContext('2d');
-		this.canvas = canvas;
 		this.__init(callback);
 	}
 
@@ -120,19 +120,28 @@ export default class jmGraph extends jmControl {
 	//  重置canvas大小，并判断高清屏，画图先放大二倍
 	resize(w, h) {
 
-		const scale = typeof window != 'undefined' && window.devicePixelRatio > 1? window.devicePixelRatio : 1;
+		let scale = typeof window != 'undefined' && window.devicePixelRatio > 1? window.devicePixelRatio : 1;
+		if(this.isWXMiniApp) {
+			scale = wx.getSystemInfoSync().pixelRatio || 1;
+		}
 		if (scale > 1) {
 		  this.__normalSize = this.__normalSize || { width: 0, height: 0};
 		  w = w || this.__normalSize.width || this.width, h = h || this.__normalSize.height || this.height;
 
 		  if(w) this.__normalSize.width = w;
 		  if(h) this.__normalSize.height = h;
-
-		  this.canvas.style.width = w + "px";
-		  this.canvas.style.height = h + "px";
-		  this.canvas.height = h * scale;
-		  this.canvas.width = w *scale;
-		  this.context.scale(scale, scale);
+		
+		  if(this.canvas.style) {
+			this.canvas.style.width = w + "px";
+			this.canvas.style.height = h + "px";
+			this.canvas.height = h * scale;
+			this.canvas.width = w *scale;
+			this.context.scale(scale, scale);
+		  }
+		  else {			
+			this.canvas.height = h;
+			this.canvas.width = w;
+		  }
 		  this.devicePixelRatio = scale;
 		}
 	}

package/src/shapes/jmImage.js

@@ -85,39 +85,21 @@ export default class jmImage extends jmControl {
 	 */
 	draw() {	
 		try {
-			let bounds = this.parent && this.parent.absoluteBounds?this.parent.absoluteBounds:this.absoluteBounds;
-			if(!bounds) bounds = this.parent && this.parent.getAbsoluteBounds?this.parent.getAbsoluteBounds():this.getAbsoluteBounds();
-			let p = this.getLocation();
-			p.left += bounds.left;
-			p.top += bounds.top;
 			
-			let sp = this.sourcePosition;
-			let sw = this.sourceWidth;
-			let sh = this.sourceHeight;
 			let img = this.getImage();
-				
-			if(sp || typeof sw != 'undefined' || typeof sh != 'undefined') {	
-				if(typeof sw == 'undefined') sw= p.width || img.width || 0;
-				if(typeof sh == 'undefined') sh= p.height || img.height || 0;
-				sp = sp || {x:0, y:0};
-
-				if(p.width && p.height) this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,p.width,p.height);
-				else if(p.width) {
-					this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,p.width,sh);
-				}		
-				else if(p.height) {
-					this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,sw,p.height);
-				}		
-				else this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,sw,sh);		
-			}
-			else if(p) {
-				if(p.width && p.height) this.context.drawImage(img,p.left,p.top,p.width,p.height);
-				else if(p.width) this.context.drawImage(img,p.left,p.top,p.width,img.height);
-				else if(p.height) this.context.drawImage(img,p.left,p.top,img.width,p.height);
-				else this.context.drawImage(img,p.left,p.top);
+			if(this.graph.isWXMiniApp && this.graph.canvas) {
+				// 图片对象
+				const image = this.graph.canvas.createImage();
+				// 图片加载完成回调
+				image.onload = () => {
+					// 将图片绘制到 canvas 上
+					this.drawImg(image);
+				}
+				// 设置图片src
+				image.src = img;
 			}
 			else {
-				this.context.drawImage(img);
+				this.drawImg(img);
 			}
 		}
 		catch(e) {
@@ -125,6 +107,43 @@ export default class jmImage extends jmControl {
 		}
 	}
 
+	// 绘制
+	drawImg(img) {
+		let bounds = this.parent && this.parent.absoluteBounds?this.parent.absoluteBounds:this.absoluteBounds;
+		if(!bounds) bounds = this.parent && this.parent.getAbsoluteBounds?this.parent.getAbsoluteBounds():this.getAbsoluteBounds();
+		let p = this.getLocation();
+		p.left += bounds.left;
+		p.top += bounds.top;
+
+		let sp = this.sourcePosition;
+		let sw = this.sourceWidth;
+		let sh = this.sourceHeight;
+
+		if(sp || typeof sw != 'undefined' || typeof sh != 'undefined') {	
+			if(typeof sw == 'undefined') sw= p.width || img.width || 0;
+			if(typeof sh == 'undefined') sh= p.height || img.height || 0;
+			sp = sp || {x:0, y:0};
+
+			if(p.width && p.height) this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,p.width,p.height);
+			else if(p.width) {
+				this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,p.width,sh);
+			}		
+			else if(p.height) {
+				this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,sw,p.height);
+			}		
+			else this.context.drawImage(img,sp.x,sp.y,sw,sh,p.left,p.top,sw,sh);		
+		}
+		else if(p) {
+			if(p.width && p.height) this.context.drawImage(img,p.left,p.top,p.width,p.height);
+			else if(p.width) this.context.drawImage(img,p.left,p.top,p.width,img.height);
+			else if(p.height) this.context.drawImage(img,p.left,p.top,img.width,p.height);
+			else this.context.drawImage(img,p.left,p.top);
+		}
+		else {
+			this.context.drawImage(img);
+		}
+	}
+
 	/**
 	 * 获取当前控件的边界 
 	 * 
@@ -160,7 +179,7 @@ export default class jmImage extends jmControl {
 		else if(src && src.src) {
 			this.__img = src;
 		}
-		else if(document && document.createElement) {
+		else if(typeof document !== 'undefined' && document.createElement) {
 			this.__img = document.createElement('img');
 			if(src && typeof src == 'string') this.__img.src = src;
 		}