jmgraph 3.2.16 → 3.2.18

package/src/core/jmProperty.js

@@ -1,110 +1,71 @@
-
-import {jmUtils} from "./jmUtils.js";
-import { jmObject } from "./jmObject.js";
-
-const PROPERTY_KEY = Symbol("properties");
-
-/**
- * 对象属性管理
- * 
- * @class jmProperty
- * @extends jmObject
- * @require jmObject
- */
-export default class jmProperty extends jmObject {		
-	
-	constructor(params) {
-		super();
-		this[PROPERTY_KEY] = {};
-		if(params && params.mode) this.mode = params.mode;
-	}
-
-	/**
-	 * 基础属性读写接口
-	 * @method property
-	 * @param {string} name 属性名
-	 * @param {any} value 属性的值
-	 * @returns {any} 属性的值
-	 */
-	 property(...pars) {
-		if(pars) {
-			const pros = this[PROPERTY_KEY];
-			const name = pars[0];
-			if(pars.length > 1) {
-				const value = pars[1];
-				const args = {oldValue: pros[name], newValue: value};
-				pros[name] = pars[1];
-				if(this.emit) this.emit('propertyChange', name, args);
-				return pars[1];
-			}
-			else if(name) {
-				return pros[name];
-			}
-		}
-	}
-
-	/**
-	 * 是否需要刷新画板，属性的改变会导致它变为true
-	 * @property needUpdate
-	 * @type {boolean}
-	 */
-	get needUpdate() {
-		return this.property('needUpdate');
-	}
-	set needUpdate(v) {
-		this.property('needUpdate', v);
-		//子控件属性改变，需要更新整个画板
-		if(v && !this.is('jmGraph') && this.graph) {
-			this.graph.needUpdate = true;
-		}
-	}
-
-	/**
-	 * 当前所在的画布对象 jmGraph
-	 * @property graph
-	 * @type {jmGraph}
-	 */
-	get graph() {
-		let g = this.property('graph');
-		g = g || (this.property('graph', this.findParent('jmGraph')));
-		return g;
-	}
-	set graph(v) {
-		return this.property('graph', v);
-	}
-
-	/**
-	 * 绘制模式 2d/webgl
-	 * @property mode
-	 * @type {string}
-	 */
-	get mode() {
-		let m = this.property('mode');
-		if(m) return m;
-		else if(this.is('jmGraph')) return this.property('mode');		
-		return this.graph.mode;
-	}
-	set mode(v) {
-		return this.property('mode', v);
-	}
-
-	/**
-	 * 在下次进行重绘时执行
-	 * @param {Function} handler 
-	 */
-	requestAnimationFrame(handler) {
-		return jmUtils.requestAnimationFrame(handler, this.graph? this.graph.canvas: null);
-	}
-	/**
-	 * 清除执行回调
-	 * @param {Function} handler 
-	 * @returns 
-	 */
-	cancelAnimationFrame(handler) {
-		return jmUtils.cancelAnimationFrame(handler, this.graph? this.graph.canvas: null);
-	}
-}
-
-export { jmProperty };
-
-
+
+import {jmUtils} from "./jmUtils.js";
+import { jmObject } from "./jmObject.js";
+
+const PROPERTY_KEY = Symbol("properties");
+
+export default class jmProperty extends jmObject {
+	constructor(params) {
+		super();
+		this[PROPERTY_KEY] = {};
+		if(params && params.mode) this.mode = params.mode;
+	}
+
+	property(...pars) {
+		if(pars) {
+			const pros = this[PROPERTY_KEY];
+			const name = pars[0];
+			if(pars.length > 1) {
+				const value = pars[1];
+				const args = {oldValue: pros[name], newValue: value};
+				pros[name] = pars[1];
+				if(this.emit) this.emit('propertyChange', name, args);
+				return pars[1];
+			}
+			else if(name) {
+				return pros[name];
+			}
+		}
+	}
+
+	get needUpdate() {
+		return this.property('needUpdate');
+	}
+	set needUpdate(v) {
+		this.property('needUpdate', v);
+		if(v && !this.is('jmGraph') && this.graph) {
+			this.graph.needUpdate = true;
+		}
+	}
+
+	get graph() {
+		let g = this.property('graph');
+		g = g || (this.property('graph', this.findParent('jmGraph')));
+		return g;
+	}
+	set graph(v) {
+		return this.property('graph', v);
+	}
+
+	get mode() {
+		let m = this.property('mode');
+		if(m) return m;
+		else if(this.is('jmGraph')) return this.property('mode');
+		return this.graph.mode;
+	}
+	set mode(v) {
+		return this.property('mode', v);
+	}
+
+	requestAnimationFrame(handler) {
+		return jmUtils.requestAnimationFrame(handler, this.graph? this.graph.canvas: null);
+	}
+
+	cancelAnimationFrame(handler) {
+		return jmUtils.cancelAnimationFrame(handler, this.graph? this.graph.canvas: null);
+	}
+}
+
+export { jmProperty };
+
+

package/src/core/jmShadow.js

@@ -1,66 +1,66 @@
-import {jmUtils} from "./jmUtils.js";
-
-/**
- * 画图阴影对象表示法
- *
- * @class jmShadow
- * @param {number} x 横坐标偏移量
- * @param {number} y 纵坐标编移量
- * @param {number} blur 模糊值
- * @param {string} color 阴影的颜色
- */
-
-export default class jmShadow {
-	constructor(x, y, blur, color) {
-		if(typeof x == 'string' && !y && !blur && !color) {
-			this.fromString(x);
-		}
-		else {
-			this.x = x;
-			this.y = y;
-			this.blur = blur;
-			this.color = color;
-		}
-	}
-	/**
-	 * 根据字符串格式转为阴影
-	 * @method fromString
-	 * @param {string} s 阴影字符串 x,y,blur,color
-	 */
-	fromString(s) {
-		if(!s) return;
-		let ms = s.match(/\s*([^,]+)\s*,\s*([^,]+)\s*(,[^,]+)?\s*(,[\s\S]+)?\s*/i);
-		if(ms) {
-			this.x = ms[1]||0;
-			this.y = ms[2]||0;
-			if(ms[3]) {
-				ms[3] = jmUtils.trim(ms[3],', ');
-				//如果第三位是颜色格式，则表示为颜色
-				if(ms[3].indexOf('#')===0 || /^rgb/i.test(ms[3])) {
-					this.color = ms[3];
-				}
-				else {
-					this.blur = jmUtils.trim(ms[3],', ');
-				}
-			}
-			if(ms[4]) {
-				this.color = jmUtils.trim(ms[4],', ');
-			}
-		}
-		return this;
-	}
-
-	/**
-	 * 转为字符串格式 x,y,blur,color
-	 * @method toString
-	 * @returns {string} 阴影字符串
-	 */
-	toString() {
-		let s = this.x + ',' + this.y;
-		if(this.blur) s += ',' + this.blur;
-		if(this.color) s += ',' + this.color;
-		return s;
-	}
-}
-
+import {jmUtils} from "./jmUtils.js";
+
+/**
+ * 画图阴影对象表示法
+ *
+ * @class jmShadow
+ * @param {number} x 横坐标偏移量
+ * @param {number} y 纵坐标编移量
+ * @param {number} blur 模糊值
+ * @param {string} color 阴影的颜色
+ */
+
+export default class jmShadow {
+	constructor(x, y, blur, color) {
+		if(typeof x == 'string' && !y && !blur && !color) {
+			this.fromString(x);
+		}
+		else {
+			this.x = x;
+			this.y = y;
+			this.blur = blur;
+			this.color = color;
+		}
+	}
+	/**
+	 * 根据字符串格式转为阴影
+	 * @method fromString
+	 * @param {string} s 阴影字符串 x,y,blur,color
+	 */
+	fromString(s) {
+		if(!s) return;
+		let ms = s.match(/\s*([^,]+)\s*,\s*([^,]+)\s*(,[^,]+)?\s*(,[\s\S]+)?\s*/i);
+		if(ms) {
+			this.x = ms[1]||0;
+			this.y = ms[2]||0;
+			if(ms[3]) {
+				ms[3] = jmUtils.trim(ms[3],', ');
+				//如果第三位是颜色格式，则表示为颜色
+				if(ms[3].indexOf('#')===0 || /^rgb/i.test(ms[3])) {
+					this.color = ms[3];
+				}
+				else {
+					this.blur = jmUtils.trim(ms[3],', ');
+				}
+			}
+			if(ms[4]) {
+				this.color = jmUtils.trim(ms[4],', ');
+			}
+		}
+		return this;
+	}
+
+	/**
+	 * 转为字符串格式 x,y,blur,color
+	 * @method toString
+	 * @returns {string} 阴影字符串
+	 */
+	toString() {
+		let s = this.x + ',' + this.y;
+		if(this.blur) s += ',' + this.blur;
+		if(this.color) s += ',' + this.color;
+		return s;
+	}
+}
+
 export { jmShadow };