jmgraph 3.1.96 → 3.1.98

package/dist/jmgraph.js

@@ -268,6 +268,31 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+//样式名称，也当做白名单使用		
+var jmStyleMap = {
+  'fill': 'fillStyle',
+  'stroke': 'strokeStyle',
+  'shadow.blur': 'shadowBlur',
+  'shadow.x': 'shadowOffsetX',
+  'shadow.y': 'shadowOffsetY',
+  'shadow.color': 'shadowColor',
+  'lineWidth': 'lineWidth',
+  'miterLimit': 'miterLimit',
+  'fillStyle': 'fillStyle',
+  'strokeStyle': 'strokeStyle',
+  'font': 'font',
+  'opacity': 'globalAlpha',
+  'textAlign': 'textAlign',
+  'textBaseline': 'textBaseline',
+  'shadowBlur': 'shadowBlur',
+  'shadowOffsetX': 'shadowOffsetX',
+  'shadowOffsetY': 'shadowOffsetY',
+  'shadowColor': 'shadowColor',
+  'lineJoin': 'lineJoin',
+  //线交汇处的形状,miter(默认，尖角),bevel(斜角),round（圆角）
+  'lineCap': 'lineCap' //线条终端点,butt(默认，平),round(圆),square（方）
+
+};
 /**
  * 控件基础对象
  * 控件的基础属性和方法
@@ -275,6 +300,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
  * @class jmControl
  * @extends jmProperty
  */
+
 var jmControl = /*#__PURE__*/function (_jmProperty) {
   _inherits(jmControl, _jmProperty);
 
@@ -301,32 +327,7 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
 
     _this2.graph = params.graph || null;
     _this2.zIndex = params.zIndex || 0;
-    _this2.interactive = typeof params.interactive == 'undefined' ? true : params.interactive; //样式名称，也当做白名单使用		
-
-    _this2.jmStyleMap = {
-      'fill': 'fillStyle',
-      'stroke': 'strokeStyle',
-      'shadow.blur': 'shadowBlur',
-      'shadow.x': 'shadowOffsetX',
-      'shadow.y': 'shadowOffsetY',
-      'shadow.color': 'shadowColor',
-      'lineWidth': 'lineWidth',
-      'miterLimit': 'miterLimit',
-      'fillStyle': 'fillStyle',
-      'strokeStyle': 'strokeStyle',
-      'font': 'font',
-      'opacity': 'globalAlpha',
-      'textAlign': 'textAlign',
-      'textBaseline': 'textBaseline',
-      'shadowBlur': 'shadowBlur',
-      'shadowOffsetX': 'shadowOffsetX',
-      'shadowOffsetY': 'shadowOffsetY',
-      'shadowColor': 'shadowColor',
-      'lineJoin': 'lineJoin',
-      //线交汇处的形状,miter(默认，尖角),bevel(斜角),round（圆角）
-      'lineCap': 'lineCap' //线条终端点,butt(默认，平),round(圆),square（方）
-
-    };
+    _this2.interactive = typeof params.interactive == 'undefined' ? true : params.interactive;
 
     _this2.initializing();
 
@@ -670,77 +671,50 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
        */
 
       var __setStyle = function __setStyle(style, name, mpkey) {
-        //let styleValue = style[mpkey||name]||style;
         if (style) {
-          if (typeof style === 'function') {
+          var styleValue = style;
+
+          if (typeof styleValue === 'function') {
             try {
-              style = style.call(_this3);
+              styleValue = styleValue.call(_this3);
             } catch (e) {
               console.warn(e);
               return;
             }
           }
 
-          var t = _typeof(style);
+          var t = _typeof(styleValue);
 
-          var mpname = _this3.jmStyleMap[mpkey || name]; //如果为渐变对象
+          var mpname = jmStyleMap[mpkey || name]; //如果为渐变对象
 
-          if (style instanceof _jmGradient.jmGradient || t == 'string' && style.indexOf('-gradient') > -1) {
+          if (styleValue instanceof _jmGradient.jmGradient || t == 'string' && styleValue.indexOf('-gradient') > -1) {
             //如果是渐变，则需要转换
-            if (t == 'string' && style.indexOf('-gradient') > -1) {
-              style = new _jmGradient.jmGradient(style);
+            if (t == 'string' && styleValue.indexOf('-gradient') > -1) {
+              styleValue = new _jmGradient.jmGradient(styleValue);
             }
 
-            __setStyle(style.toGradient(_this3), mpname || name);
-          } else if (t == 'function') {
-            if (mpname) {
-              style = style.call(_this3, mpname);
-
-              if (style) {
-                __setStyle(style, mpname);
-              }
-            }
+            __setStyle(styleValue.toGradient(_this3), mpname || name);
           } else if (mpname) {
             //只有存在白名单中才处理
             //颜色转换
             if (t == 'string' && ['fillStyle', 'strokeStyle', 'shadowColor'].indexOf(mpname) > -1) {
-              style = _jmUtils.jmUtils.toColor(style);
-            } // 按比例需要放大的样式
-
-            /*if(scale && style) {
-            	switch(mpname) {
-            		case 'lineWidth': {
-            			style *= scale;
-            			break;
-            		}
-            		// 字体放大
-            		case 'fontSize':
-            		case 'font': {
-            			const ms = style.toString().match(/[\d\.]+/);
-            			if(ms && ms.length) {
-            				const size = Number(ms[0]) * scale;
-            				style = style.toString().replace(ms[0], size);
-            			}
-            			break;
-            		}
-            	}
-            }		*/
-
-
-            _this3.context[mpname] = style;
+              styleValue = _jmUtils.jmUtils.toColor(styleValue);
+            }
+
+            _this3.context[mpname] = styleValue;
           } else {
             switch (name) {
               //阴影样式
               case 'shadow':
                 {
                   if (t == 'string') {
-                    __setStyle(new _jmShadow.jmShadow(style), name);
+                    __setStyle(new _jmShadow.jmShadow(styleValue), name);
 
                     break;
                   }
 
-                  for (var k in style) {
-                    __setStyle(style[k], k, name + '.' + k);
+                  for (var k in styleValue) {
+                    __setStyle(styleValue[k], k, name + '.' + k);
                   }
 
                   break;
@@ -749,7 +723,7 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
 
               case 'translate':
                 {
-                  _this3.context.translate(style.x, style.y);
+                  _this3.context.translate(styleValue.x, styleValue.y);
 
                   break;
                 }
@@ -757,22 +731,22 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
 
               case 'rotation':
                 {
-                  if (!style.angle) break; //旋 转先移位偏移量
+                  if (!styleValue.angle) break; //旋 转先移位偏移量
 
                   var tranX = 0;
                   var tranY = 0; //旋转，则移位，如果有中心位则按中心旋转，否则按左上角旋转
                   //这里只有style中的旋转才能生效，不然会导至子控件多次旋转
 
-                  if (style.point) {
+                  if (styleValue.point) {
                     var bounds = _this3.absoluteBounds ? _this3.absoluteBounds : _this3.getAbsoluteBounds();
-                    style = _this3.getRotation(style);
-                    tranX = style.rotateX + bounds.left;
-                    tranY = style.rotateY + bounds.top;
+                    styleValue = _this3.getRotation(styleValue);
+                    tranX = styleValue.rotateX + bounds.left;
+                    tranY = styleValue.rotateY + bounds.top;
                   }
 
                   if (tranX != 0 || tranY != 0) _this3.context.translate(tranX, tranY);
 
-                  _this3.context.rotate(style.angle);
+                  _this3.context.rotate(styleValue.angle);
 
                   if (tranX != 0 || tranY != 0) _this3.context.translate(-tranX, -tranY);
                   break;
@@ -780,15 +754,15 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
 
               case 'transform':
                 {
-                  if (Array.isArray(style)) {
-                    _this3.context.transform.apply(_this3.context, style);
-                  } else if (_typeof(style) == 'object') {
-                    _this3.context.transform(style.scaleX, //水平缩放
-                    style.skewX, //水平倾斜
-                    style.skewY, //垂直倾斜
-                    style.scaleY, //垂直缩放
-                    style.offsetX, //水平位移
-                    style.offsetY); //垂直位移
+                  if (Array.isArray(styleValue)) {
+                    _this3.context.transform.apply(_this3.context, styleValue);
+                  } else if (_typeof(styleValue) == 'object') {
+                    _this3.context.transform(styleValue.scaleX, //水平缩放
+                    styleValue.skewX, //水平倾斜
+                    styleValue.skewY, //垂直倾斜
+                    styleValue.scaleY, //垂直缩放
+                    styleValue.offsetX, //水平位移
+                    styleValue.offsetY); //垂直位移
 
                   }
 
@@ -798,7 +772,7 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
 
               case 'cursor':
                 {
-                  _this3.cursor = style;
+                  _this3.cursor = styleValue;
                   break;
                 }
             }
@@ -852,16 +826,12 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
       if (this.type == 'jmGraph' && this.canvas) {
         if (typeof this.canvas.width === 'function') {
           rect.right = this.canvas.width();
-        } else if (this.canvas.width) {
-          rect.right = this.canvas.width;
         } else if (this.width) {
           rect.right = this.width;
         }
 
         if (typeof this.canvas.height === 'function') {
           rect.bottom = this.canvas.height();
-        } else if (this.canvas.height) {
-          rect.bottom = this.canvas.height;
         } else if (this.height) {
           rect.bottom = this.height;
         }
@@ -1273,9 +1243,7 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
         }
 
         this.emit('endDraw', this);
-        this.context.restore(); //兼容小程序
-
-        if (this.is('jmGraph') && this.context.draw) this.context.draw();
+        this.context.restore();
         this.needUpdate = false;
       }
     }
@@ -1441,8 +1409,8 @@ var jmControl = /*#__PURE__*/function (_jmProperty) {
         //获取dom位置
         var position = this.getPosition(); // 由于高清屏会有放大坐标，所以这里用pagex就只能用真实的canvas大小
 
-        var right = position.left + (this.canvas.clientWidth || this.canvas.offsetWidth || this.canvas.width);
-        var bottom = position.top + (this.canvas.clientHeight || this.canvas.offsetHeight || this.canvas.height);
+        var right = position.left + this.width;
+        var bottom = position.top + this.height;
 
         if (p.pageX > right || p.pageX < position.left) {
           return false;
@@ -2758,8 +2726,8 @@ var jmGraph = /*#__PURE__*/function (_jmControl) {
     function getPosition() {
       var p = _jmUtils.jmUtils.getElementPosition(this.canvas.canvas || this.canvas);
 
-      p.width = this.canvas.width;
-      p.height = this.canvas.height;
+      p.width = this.width;
+      p.height = this.height;
       p.right = p.left + p.width;
       p.bottom = p.top + p.height;
       return p;
@@ -3096,13 +3064,13 @@ var jmGraph = /*#__PURE__*/function (_jmControl) {
         if (self.needUpdate) self.redraw(); // 触发刷新事件
 
         self.emit('update');
-        self.__requestAnimationFrameFunHandler && _jmUtils.jmUtils.cancelAnimationFrame(self.__requestAnimationFrameFunHandler);
-        self.__requestAnimationFrameFunHandler = _jmUtils.jmUtils.requestAnimationFrame(update);
+        self.__requestAnimationFrameFunHandler && _jmUtils.jmUtils.cancelAnimationFrame(self.__requestAnimationFrameFunHandler, self.canvas);
+        self.__requestAnimationFrameFunHandler = _jmUtils.jmUtils.requestAnimationFrame(update, self.canvas);
         if (callback) callback();
       }
 
-      self.__requestAnimationFrameFunHandler && _jmUtils.jmUtils.cancelAnimationFrame(self.__requestAnimationFrameFunHandler);
-      self.__requestAnimationFrameFunHandler = _jmUtils.jmUtils.requestAnimationFrame(update);
+      self.__requestAnimationFrameFunHandler && _jmUtils.jmUtils.cancelAnimationFrame(self.__requestAnimationFrameFunHandler, self.canvas);
+      self.__requestAnimationFrameFunHandler = _jmUtils.jmUtils.requestAnimationFrame(update, self.canvas);
       return this;
     } // 销毁当前对象
 
@@ -3596,6 +3564,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.jmProperty = exports["default"] = void 0;
 
+var _jmUtils = require("./jmUtils.js");
+
 var _jmObject2 = require("./jmObject.js");
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -3711,6 +3681,27 @@ var jmProperty = /*#__PURE__*/function (_jmObject) {
     set: function set(v) {
       return this.__pro('graph', v);
     }
+    /**
+     * 在下次进行重绘时执行
+     * @param {Function} handler 
+     */
+
+  }, {
+    key: "requestAnimationFrame",
+    value: function requestAnimationFrame(handler) {
+      return _jmUtils.jmUtils.requestAnimationFrame(handler, this.graph ? this.graph.canvas : null);
+    }
+    /**
+     * 清除执行回调
+     * @param {Function} handler 
+     * @returns 
+     */
+
+  }, {
+    key: "cancelAnimationFrame",
+    value: function cancelAnimationFrame(handler) {
+      return _jmUtils.jmUtils.cancelAnimationFrame(handler, this.graph ? this.graph.canvas : null);
+    }
   }]);
 
   return jmProperty;
@@ -3718,7 +3709,7 @@ var jmProperty = /*#__PURE__*/function (_jmObject) {
 
 exports.jmProperty = exports["default"] = jmProperty;
 
-},{"./jmObject.js":7}],10:[function(require,module,exports){
+},{"./jmObject.js":7,"./jmUtils.js":11}],10:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -4326,12 +4317,12 @@ var jmUtils = /*#__PURE__*/function () {
           p[i].y = x1 * sin + y1 * cos + rp.y;
         }
       } else {
-        var _x4 = p.x - rp.x;
+        var _x2 = p.x - rp.x;
 
         var _y = p.y - rp.y;
 
-        p.x = _x4 * cos - _y * sin + rp.x;
-        p.y = _x4 * sin + _y * cos + rp.y;
+        p.x = _x2 * cos - _y * sin + rp.x;
+        p.y = _x2 * sin + _y * cos + rp.y;
       }
 
       return p;
@@ -4602,42 +4593,16 @@ var jmUtils = /*#__PURE__*/function () {
 
   }, {
     key: "requestAnimationFrame",
-    value: function (_requestAnimationFrame) {
-      function requestAnimationFrame(_x2) {
-        return _requestAnimationFrame.apply(this, arguments);
-      }
-
-      requestAnimationFrame.toString = function () {
-        return _requestAnimationFrame.toString();
-      };
-
-      return requestAnimationFrame;
-    }(function (callback) {
-      if (typeof requestAnimationFrame === 'undefined') {
-        return setTimeout(callback, 20);
-      } else {
-        return requestAnimationFrame(callback);
-      }
-    })
+    value: function requestAnimationFrame(callback, win) {
+      var fun = win && win.requestAnimationFrame ? win.requestAnimationFrame : typeof window !== 'undefined' && window.requestAnimationFrame ? window.requestAnimationFrame : setTimeout;
+      return fun(callback, 20);
+    }
   }, {
     key: "cancelAnimationFrame",
-    value: function (_cancelAnimationFrame) {
-      function cancelAnimationFrame(_x3) {
-        return _cancelAnimationFrame.apply(this, arguments);
-      }
-
-      cancelAnimationFrame.toString = function () {
-        return _cancelAnimationFrame.toString();
-      };
-
-      return cancelAnimationFrame;
-    }(function (handler) {
-      if (typeof requestAnimationFrame === 'undefined') {
-        return clearTimeout(handler);
-      } else {
-        return cancelAnimationFrame(handler);
-      }
-    })
+    value: function cancelAnimationFrame(handler, win) {
+      var fun = win && win.cancelAnimationFrame ? win.cancelAnimationFrame : typeof window !== 'undefined' && window.cancelAnimationFrame ? window.cancelAnimationFrame : clearTimeout;
+      return fun(handler);
+    }
   }]);
 
   return jmUtils;