jmgraph 3.2.16 → 3.2.18

package/src/core/jmList.js

@@ -1,158 +1,93 @@
-/**
- * 自定义集合
- * 
- * @class jmList
- * @for jmUtils
- * @param {array} [arr] 数组，可转为当前list元素
- */
-export default class jmList extends Array {    
-    constructor(...arg) {
-        let ps = [];
-        if(arg && arg.length && Array.isArray(arg[0])) {
-            for(let i=0; i< arg[0].length; i++) ps.push(arg[0][i]);
-            super(...ps);
-        }
-        else {
-            super();
-        }
-        this.option = {}; //选项
-        this.type = 'jmList';
-    }
-    /**
-     * 往集合中添加对象
-     *
-     * @method add
-     * @for list
-     * @param {any} obj 往集合中添加的对象
-     */
-    add(obj) {        
-        if(obj && Array.isArray(obj)) {
-            for(let i=0; i < obj.length; i++) {
-                if(!this.includes(obj[i])) this.push(obj[i]);
-            } 
-            return obj;           
-        }
-        if(typeof obj == 'object' && this.includes(obj)) return obj;
-        this.push(obj);
-        return obj;
-    }
-
-    /**
-     * 从集合中移除指定对象
-     * 
-     * @method remove
-     * @for list
-     * @param {any} obj 将移除的对象
-     */
-    remove(obj) {
-        for(let i = this.length -1; i>=0; i--) {            
-            if(this[i] == obj) {
-                this.removeAt(i);
-            }
-        }
-    }
-
-    /**
-     * 按索引移除对象
-     * 
-     * @method removeAt
-     * @for list
-     * @param {integer} index 移除对象的索引
-     */
-    removeAt(index) {
-        if(this.length > index) {
-            let obj = this[index];
-            this.splice(index,1);
-            if(this.option.removeHandler)  this.option.removeHandler.call(this, obj, index);
-        }
-    }
-
-    /**
-     * 判断是否包含某个对象
-     * 
-     * @method contain
-     * @for list
-     * @param {any} obj 判断当前集合中是否包含此对象
-     */
-    contain(obj) {
-        return this.includes(obj);
-    }
-
-    /**
-     * 从集合中获取某个对象
-     * 
-     * @method get
-     * @for list
-     * @param {integer/function} index 如果为整型则表示为获取此索引的对象，如果为function为则通过此委托获取对象
-     * @return {any} 集合中的对象
-     */
-    get(index) {
-        if(typeof index == 'function') {
-            return this.find(index);
-        }
-        else {
-            return this[index];
-        }        
-    }
-
-    /**
-     * 遍历当前集合 
-     *
-     * @method each
-     * @for list
-     * @param {function} cb 遍历当前集合的委托
-     * @param {boolean} inverse 是否按逆序遍历
-     */
-    each(cb, inverse) {
-        if(cb && typeof cb == 'function') {
-            //如果按倒序循环
-            if(inverse) {
-                for(let i = this.length - 1;i>=0; i--) {
-                    let r = cb.call(this, i, this[i]);
-                    if(r === false) break;
-                }
-            }
-            else {
-                let len = this.length;
-               for(let i  = 0; i < len;i++) {
-                    let r = cb.call(this, i, this[i]);
-                    if(r === false) break;
-                } 
-            }            
-        }        
-    }
-
-    /**
-     * 获取当前集合对象个数
-     *
-     * @method count
-     * @param {function} [handler] 检查对象是否符合计算的条件
-     * @for list
-     * @return {integer} 当前集合的个数
-     */
-    count(handler) {
-        if(handler && typeof handler == 'function') {
-            let count = 0;
-            let len = this.length;
-            for(let i  = 0; i<len;i++) {
-                if(handler(this[i])) {
-                    count ++;
-                }
-            } 
-            return count;
-        }
-        return this.length;
-    }
-
-    /**
-     * 清空当前集合
-     *
-     * @method clear
-     * @for list
-     */
-    clear() {
-        this.splice(0, this.length);
-    }
-}
-
+export default class jmList extends Array {
+    constructor(...arg) {
+        const ps = [];
+        if(arg && arg.length && Array.isArray(arg[0])) {
+            for(let i=0; i< arg[0].length; i++) ps.push(arg[0][i]);
+            super(...ps);
+        }
+        else {
+            super();
+        }
+        this.option = {};
+        this.type = 'jmList';
+    }
+
+    add(obj) {
+        if(obj && Array.isArray(obj)) {
+            for(let i=0; i < obj.length; i++) {
+                if(!this.includes(obj[i])) this.push(obj[i]);
+            }
+            return obj;
+        }
+        if(typeof obj == 'object' && this.includes(obj)) return obj;
+        this.push(obj);
+        return obj;
+    }
+
+    remove(obj) {
+        for(let i = this.length -1; i>=0; i--) {
+            if(this[i] == obj) {
+                this.removeAt(i);
+            }
+        }
+    }
+
+    removeAt(index) {
+        if(this.length > index) {
+            const obj = this[index];
+            this.splice(index,1);
+            if(this.option.removeHandler) this.option.removeHandler.call(this, obj, index);
+        }
+    }
+
+    contain(obj) {
+        return this.includes(obj);
+    }
+
+    get(index) {
+        if(typeof index == 'function') {
+            return this.find(index);
+        }
+        else {
+            return this[index];
+        }
+    }
+
+    each(cb, inverse) {
+        if(cb && typeof cb == 'function') {
+            if(inverse) {
+                for(let i = this.length - 1;i>=0; i--) {
+                    const r = cb.call(this, i, this[i]);
+                    if(r === false) break;
+                }
+            }
+            else {
+                const len = this.length;
+                for(let i = 0; i < len;i++) {
+                    const r = cb.call(this, i, this[i]);
+                    if(r === false) break;
+                }
+            }
+        }
+    }
+
+    count(handler) {
+        if(handler && typeof handler == 'function') {
+            let count = 0;
+            const len = this.length;
+            for(let i = 0; i<len;i++) {
+                if(handler(this[i])) {
+                    count++;
+                }
+            }
+            return count;
+        }
+        return this.length;
+    }
+
+    clear() {
+        this.splice(0, this.length);
+    }
+}
+
 export { jmList };

package/src/core/jmObject.js

@@ -1,104 +1,84 @@
-
-import {jmList} from "./jmList.js";
-
-var control_id_counter = 0;
-/**
- *  所有jm对象的基础对象
- * 
- * @class jmObject
- * @for jmGraph
- */
-export default class jmObject {
-	//id;
-	constructor(g) {
-		if(g && g.type == 'jmGraph') {
-			this.graph = g;
-		}
-		this.id = ++control_id_counter; //生成一个唯一id
-	}
-	
-	/**
-	 * 检 查对象是否为指定类型
-	 * 
-	 * @method is
-	 * @param {class} type 判断的类型
-	 * @for jmObject
-	 * @return {boolean} true=表示当前对象为指定的类型type,false=表示不是
-	 */
-	is(type) {
-		if(typeof type == 'string') {
-			return this.type == type;
-		}
-		return this instanceof type;
-	}
-
-	/**
-	 * 给控件添加动画处理,如果成功执行会导致画布刷新。
-	 *
-	 * @method animate
-	 * @for jmObject
-	 * @param {function} handle 动画委托
-	 * @param {integer} millisec 此委托执行间隔 （毫秒）
-	 */
-	animate(...args) {	
-		if(this.is('jmGraph')) {
-			if(args.length > 1) {			
-				if(!this.animateHandles) this.animateHandles = new jmList();
-				
-				var params = [];
-				if(args.length > 2) {
-					for(var i=2;i<args.length;i++) {
-						params.push(args[i]);
-					}
-				}		
-				this.animateHandles.add({
-					millisec: args[1] || 20, 
-					handle: args[0], 
-					params:params
-				});
-			}
-			if(this.animateHandles) {
-				if(this.animateHandles.count() > 0) {
-					var self = this;
-					//延时处理动画事件
-					this.dispatcher = setTimeout(function(_this) {
-						_this = _this || self;
-						//var needredraw = false;
-						var overduehandles = [];
-						var curTimes = new Date().getTime();
-						_this.animateHandles.each(function(i,ani) {						
-							try {
-								if(ani && ani.handle && (!ani.times || curTimes - ani.times >= ani.millisec)) {
-									var r = ani.handle.apply(_this, ani.params);
-									if(r === false) {
-										overduehandles.push(ani);//表示已完成的动画效果
-									}								
-									ani.times = curTimes;
-									//needredraw = true;								
-								}
-							}
-							catch(e) {
-								if(window.console && window.console.info) {
-									window.console.info(e.toString());
-								}
-								if(ani) overduehandles.push(ani);//异常的事件，不再执行
-							}						
-						});
-						for(var i in overduehandles) {
-							_this.animateHandles.remove(overduehandles[i]);//移除完成的效果
-						}
-						_this.animate();
-					},10,this);//刷新				
-				}
-			}
-		}	
-		else {
-			var graph = this.graph;
-			if(graph) {
-				graph.animate(...args);
-			}
-		}
-	}
-}
-
+
+import {jmList} from "./jmList.js";
+
+let control_id_counter = 0;
+
+export default class jmObject {
+	constructor(g) {
+		if(g && g.type == 'jmGraph') {
+			this.graph = g;
+		}
+		this.id = ++control_id_counter;
+	}
+	
+	/**
+	 * 检 查对象是否为指定类型
+	 * 
+	 * @method is
+	 * @param {class} type 判断的类型
+	 * @for jmObject
+	 * @return {boolean} true=表示当前对象为指定的类型type,false=表示不是
+	 */
+	is(type) {
+		if(typeof type == 'string') {
+			return this.type == type;
+		}
+		return this instanceof type;
+	}
+
+	animate(...args) {
+		if(this.is('jmGraph')) {
+			if(args.length > 1) {
+				if(!this.animateHandles) this.animateHandles = new jmList();
+				
+				const params = [];
+				if(args.length > 2) {
+					for(let i=2;i<args.length;i++) {
+						params.push(args[i]);
+					}
+				}
+				this.animateHandles.add({
+					millisec: args[1] || 20, 
+					handle: args[0], 
+					params: params
+				});
+			}
+			if(this.animateHandles) {
+				if(this.animateHandles.count() > 0) {
+					const self = this;
+					this.dispatcher = setTimeout(function(_this) {
+						_this = _this || self;
+						const overduehandles = [];
+						const curTimes = Date.now();
+						_this.animateHandles.each(function(i,ani) {
+							try {
+								if(ani && ani.handle && (!ani.times || curTimes - ani.times >= ani.millisec)) {
+									const r = ani.handle.apply(_this, ani.params);
+									if(r === false) {
+										overduehandles.push(ani);
+									}
+									ani.times = curTimes;
+								}
+							}
+							catch(e) {
+								if(ani) overduehandles.push(ani);
+							}
+						});
+						for(const i in overduehandles) {
+							_this.animateHandles.remove(overduehandles[i]);
+						}
+						_this.animate();
+					},10,this);
+				}
+			}
+		}
+		else {
+			const graph = this.graph;
+			if(graph) {
+				graph.animate(...args);
+			}
+		}
+	}
+}
+
 export { jmObject };

package/src/core/jmPath.js

@@ -1,35 +1,35 @@
-import {jmControl} from "./jmControl.js";
-/**
- * 基础路径,大部分图型的基类
- * 指定一系列点，画出图形
- *
- * @class jmPath
- * @extends jmControl
- * @param {object} params 路径参数 points=所有描点
- */
-
-export default class jmPath extends jmControl {	
-
-	constructor(params, t='jmPath') {
-		super(params, t);		
-		this.points = params && params.points ? params.points : [];	
-	}
-	
-	/**
-	 * 描点集合
-	 * point格式：{x:0,y:0,m:true}
-	 * @property points
-	 * @type {array}
-	 */
-	get points() {
-		let s = this.property('points');
-		return s;
-	}
-	set points(v) {
-		this.needUpdate = true;
-		return this.property('points', v);
-	}	
-	
-}
-
-export { jmPath };
+import {jmControl} from "./jmControl.js";
+/**
+ * 基础路径,大部分图型的基类
+ * 指定一系列点，画出图形
+ *
+ * @class jmPath
+ * @extends jmControl
+ * @param {object} params 路径参数 points=所有描点
+ */
+
+export default class jmPath extends jmControl {	
+
+	constructor(params, t='jmPath') {
+		super(params, t);		
+		this.points = params && params.points ? params.points : [];	
+	}
+	
+	/**
+	 * 描点集合
+	 * point格式：{x:0,y:0,m:true}
+	 * @property points
+	 * @type {array}
+	 */
+	get points() {
+		let s = this.property('points');
+		return s;
+	}
+	set points(v) {
+		this.needUpdate = true;
+		return this.property('points', v);
+	}	
+	
+}
+
+export { jmPath };