gis-common 2.0.2 → 2.1.1

package/dist/resource.min.js

@@ -119,6 +119,8 @@ __webpack_require__.d(__webpack_exports__, "Utils", function() { return /* reexp
 __webpack_require__.d(__webpack_exports__, "EventType", function() { return /* reexport */ EventTypeConstant; });
 __webpack_require__.d(__webpack_exports__, "ErrorType", function() { return /* reexport */ ErrorTypeConstant; });
 __webpack_require__.d(__webpack_exports__, "LayerType", function() { return /* reexport */ LayerType; });
+__webpack_require__.d(__webpack_exports__, "GraphicType", function() { return /* reexport */ GraphicType; });
+__webpack_require__.d(__webpack_exports__, "MeasureMode", function() { return /* reexport */ MeasureMode; });
 __webpack_require__.d(__webpack_exports__, "AudioPlayer", function() { return /* reexport */ core_AudioPlayer; });
 __webpack_require__.d(__webpack_exports__, "CanvasDrawer", function() { return /* reexport */ core_CanvasDrawer; });
 __webpack_require__.d(__webpack_exports__, "ElQuery", function() { return /* reexport */ core_ElQuery; });
@@ -126,6 +128,7 @@ __webpack_require__.d(__webpack_exports__, "EventDispatcher", function() { retur
 __webpack_require__.d(__webpack_exports__, "HashMap", function() { return /* reexport */ core_HashMap; });
 __webpack_require__.d(__webpack_exports__, "WebSocketClient", function() { return /* reexport */ core_WebSocketClient; });
 __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /* reexport */ core_WebStorage; });
+__webpack_require__.d(__webpack_exports__, "DevicePixelRatio", function() { return /* reexport */ core_DevicePixelRatio; });
 
 // CONCATENATED MODULE: ./src/utils/AnimateUtils.js
 /* harmony default export */ var AnimateUtils = ({
@@ -226,24 +229,24 @@ __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /*
 });
 // CONCATENATED MODULE: ./src/constant/ErrorTypeConstant.js
 /* harmony default export */ var ErrorTypeConstant = ({
-    LOGIN_EXPIRED: "登录信息过期，请重新登录",
-    CROSS_ERROR: "跨域访问",
-    UNEXIST_RESOURCE: "资源不存在",
-    TIMEOUT: "请求超时",
-    INTERNAL_ERROR: "内部错误",
-    NETWORK_ERROR: "请求失败，请检查网络是否已连接",
-    PROCESS_FAIL: "处理失败",
-    AUTH_VERIFY_ERROR: "权限验证失败",
-    NO_DATA_FOUND: "未找到数据",
-    DUPLICATE_INSTANCE: "实例为单例模式，不允许重复构建",
-    COORDINATE_ERROR: "坐标验证失败",
-    JSON_PARSE_ERROR: "JSON解析失败，格式有误",
-    JSON_VALUE_ERROR: "JSON无此键",
-    PARAMETER_ERROR: "参数验证失败",
-    PARAMETER_ERROR_ARRAY: "参数格式验证失败：必须是数组",
-    PARAMETER_ERROR_STRING: "参数格式验证失败：必须是字符",
-    PARAMETER_ERROR_FUNCTION: "参数格式验证失败：必须是函数",
-    PARAMETER_ERROR_LACK: "参数缺失项"
+    LOGIN_EXPIRED: '登录信息过期，请重新登录',
+    CROSS_ERROR: '跨域访问',
+    UNEXIST_RESOURCE: '资源不存在',
+    TIMEOUT: '请求超时',
+    INTERNAL_ERROR: '内部错误',
+    NETWORK_ERROR: '请求失败，请检查网络是否已连接',
+    PROCESS_FAIL: '处理失败',
+    AUTH_VERIFY_ERROR: '权限验证失败',
+    NO_DATA_FOUND: '未找到数据',
+    DUPLICATE_INSTANCE: '实例为单例模式，不允许重复构建',
+    COORDINATE_ERROR: '坐标验证失败',
+    JSON_PARSE_ERROR: 'JSON解析失败，格式有误',
+    JSON_VALUE_ERROR: 'JSON无此键',
+    PARAMETER_ERROR: '参数验证失败',
+    PARAMETER_ERROR_ARRAY: '参数格式验证失败：必须是数组',
+    PARAMETER_ERROR_STRING: '参数格式验证失败：必须是字符',
+    PARAMETER_ERROR_FUNCTION: '参数格式验证失败：必须是函数',
+    PARAMETER_ERROR_LACK: '参数缺失'
 });
 // CONCATENATED MODULE: ./src/constant/LayerType.js
 /* harmony default export */ var LayerType = ({
@@ -255,10 +258,28 @@ __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /*
     S3M_GROUP: "S3MGroup", //  addS3MGroupLayer(url, options, index)  添加S3M分组图层。
     TERRAIN_LAYER: "TerrainFileLayer" // 地形图层, 需要单独处理
 });
+// CONCATENATED MODULE: ./src/constant/GraphicConstant.js
+var GraphicType = {
+    POINT: 'point',
+    POLYLINE: 'polyline',
+    POLYGON: 'polygon',
+    BILLBOARD: 'billboard',
+    CYLINDER: 'cylinder',
+    ELLIPSOID: 'ellipsoid',
+    LABEL: 'label',
+    MODEL: 'model',
+    WALL: 'wall'
+};
+var MeasureMode = {
+    DISTANCE: 'distance',
+    AREA: 'area',
+    HEIGHT: 'height'
+};
 // CONCATENATED MODULE: ./src/constant/index.js
 
 
 
+
 // CONCATENATED MODULE: ./src/utils/CommUtils.js
 
 
@@ -309,7 +330,7 @@ __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /*
      * @param {*} json
      * @returns {*}
      */
-    jsontoQuery: function jsontoQuery(json) {
+    json2Query: function json2Query(json) {
         var tempArr = [];
         for (var i in json) {
             var key = i;
@@ -438,24 +459,39 @@ __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /*
      * 异步加载script
      *
      * @param {*} url
-     * @param {function} callback
      */
-    loadScript: function loadScript(url, callback) {
-        var oscript = document.createElement('script');
-        if (oscript.readyState) {
-            // ie8及以下版本
-            oscript.onreadystatechange = function () {
-                if (oscript.readyState === 'complete' || oscript.readyState === 'loaded') {
-                    callback();
+    asyncLoadScript: function asyncLoadScript(url) {
+        return new Promise(function (resolve, reject) {
+            try {
+                var oscript = document.createElement('script');
+                if (oscript.readyState) {
+                    // ie8及以下版本
+                    oscript.onreadystatechange = function () {
+                        if (oscript.readyState === 'complete' || oscript.readyState === 'loaded') {
+                            resolve(oscript);
+                        }
+                    };
+                } else {
+                    oscript.onload = function () {
+                        resolve(oscript);
+                    };
                 }
-            };
-        } else {
-            oscript.onload = function () {
-                callback();
-            };
-        }
-        oscript.src = url;
-        document.body.appendChild(oscript);
+                oscript.type = 'text/javascript';
+                oscript.src = url;
+                document.body.appendChild(oscript);
+            } catch (error) {
+                reject(error);
+            }
+        });
+    },
+    loadStyle: function loadStyle(urls) {
+        urls.forEach(function (url) {
+            var css = document.createElement('link');
+            css.href = url;
+            css.rel = 'stylesheet';
+            css.type = 'text/css';
+            document.head.appendChild(css);
+        });
     },
 
     /**
@@ -477,6 +513,56 @@ __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /*
             }
             return value;
         });
+    },
+    deleteEmptyProperty: function deleteEmptyProperty(data) {
+        var _this = this;
+
+        return Object.fromEntries(Object.keys(data).filter(function (d) {
+            return !_this.isEmpty(data[d]);
+        }).map(function (i) {
+            return [i, data[i]];
+        }));
+    },
+    deepAssign: function deepAssign() {
+        var len = arguments.length,
+            target = arguments[0];
+        if (this.getDataType(target) !== 'Object') {
+            target = {};
+        }
+        for (var i = 1; i < len; i++) {
+            var source = arguments[i];
+            if (this.getDataType(source) === 'Object') {
+                for (var s in source) {
+                    if (s === '__proto__' || target === source[s]) {
+                        continue;
+                    }
+                    if (this.getDataType(source[s]) === 'Object') {
+                        target[s] = this.deepAssign(target[s], source[s]);
+                    } else {
+                        target[s] = source[s];
+                    }
+                }
+            }
+        }
+        return target;
+    },
+    handleCopyValue: function handleCopyValue(text) {
+        if (!navigator.clipboard && window.isSecureContext) {
+            return navigator.clipboard.writeText(text);
+        } else {
+            var textArea = document.createElement('textarea');
+            textArea.style.position = 'fixed';
+            textArea.style.top = textArea.style.left = '-100vh';
+            textArea.style.opacity = '0';
+            textArea.value = text;
+            document.body.appendChild(textArea);
+            textArea.focus();
+            textArea.select();
+            return new Promise(function (resolve, reject) {
+                document.execCommand('copy') ? resolve() : reject(new Error('copy failed'));
+                textArea.remove();
+            });
+        }
     }
 });
 // CONCATENATED MODULE: ./src/utils/ArrayUtils.js
@@ -525,6 +611,9 @@ Array.prototype.sum = function () {
         return prev + curr;
     }) : 0;
 };
+Array.prototype.avg = function () {
+    return this.length ? this.sum() / this.length : 0;
+};
 Array.prototype.desc = function (f) {
     return this.sort(function (n1, n2) {
         return (f ? f(n2) : n2) - (f ? f(n1) : n1);
@@ -615,8 +704,8 @@ Array.prototype.clear = function () {
         for (var i = 0; i < args.length; i++) {
             var str = args[i];
             if (str) {
-                var s = str.replace(/#|\//g, "");
-                var arr = s.split("?");
+                var s = str.replace(/#|\//g, '');
+                var arr = s.split('?');
                 if (arr.length > 1) {
                     for (var _i = 1; _i < arr.length; _i++) {
                         var res = void 0;
@@ -631,26 +720,35 @@ Array.prototype.clear = function () {
     },
     getExplorer: function getExplorer() {
         var explorer = window.navigator.userAgent;
-        if (explorer.indexOf("MSIE") >= 0) {
-            return "IE";
+        if (explorer.indexOf('MSIE') >= 0) {
+            return 'IE';
         }
-        if (!!window.ActiveXObject || "ActiveXObject" in window) {
+        if (!!window.ActiveXObject || 'ActiveXObject' in window) {
             // IE
-            return "IE";
-        } else if (explorer.indexOf("Firefox") >= 0) {
+            return 'IE';
+        } else if (explorer.indexOf('Firefox') >= 0) {
             // Firefox
-            return "Firefox";
-        } else if (explorer.indexOf("Chrome") >= 0) {
+            return 'Firefox';
+        } else if (explorer.indexOf('Chrome') >= 0) {
             // Chrome
-            return "Chrome";
-        } else if (explorer.indexOf("Opera") >= 0) {
+            return 'Chrome';
+        } else if (explorer.indexOf('Opera') >= 0) {
             // Opera
-            return "Opera";
-        } else if (explorer.indexOf("Safari") >= 0) {
+            return 'Opera';
+        } else if (explorer.indexOf('Safari') >= 0) {
             // Safari
-            return "Safari";
+            return 'Safari';
         }
     },
+    detectOS: function detectOS() {
+        var os_type = '';
+        var windows = navigator.userAgent.indexOf('Windows', 0) != -1 ? 1 : 0;
+        var mac = navigator.userAgent.indexOf('mac', 0) != -1 ? 1 : 0;
+        var linux = navigator.userAgent.indexOf('Linux', 0) != -1 ? 1 : 0;
+        var unix = navigator.userAgent.indexOf('X11', 0) != -1 ? 1 : 0;
+        if (windows) os_type = 'MS Windows';else if (mac) os_type = 'Apple mac';else if (linux) os_type = 'Linux';else if (unix) os_type = 'Unix';
+        return os_type;
+    },
     switchFullScreen: function switchFullScreen(status) {
         if (status) {
             var element = document.documentElement;
@@ -682,16 +780,16 @@ Array.prototype.clear = function () {
     refreshScale: function refreshScale() {
         var baseWidth = document.documentElement.clientWidth;
         var baseHeight = document.documentElement.clientHeight;
-        var appStyle = document.getElementById("app").style;
+        var appStyle = document.getElementById('app').style;
         var realRatio = baseWidth / baseHeight;
         var designRatio = 16 / 9;
         var scaleRate = baseWidth / 1920;
         if (realRatio > designRatio) {
             scaleRate = baseHeight / 1080;
         }
-        appStyle.transformOrigin = "left top";
-        appStyle.transform = "scale(" + scaleRate + ") translateX(-49.99%)";
-        appStyle.width = baseWidth / scaleRate + "px";
+        appStyle.transformOrigin = 'left top';
+        appStyle.transform = 'scale(' + scaleRate + ') translateX(-49.99%)';
+        appStyle.width = baseWidth / scaleRate + 'px';
     },
 
     /**
@@ -699,8 +797,8 @@ Array.prototype.clear = function () {
      */
     getHtmlFontSize: function getHtmlFontSize() {
         var htmlwidth = document.documentElement.clientWidth || document.body.clientWidth;
-        var htmlDom = document.querySelector("html");
-        htmlDom.style.fontSize = htmlwidth / 192 + "px";
+        var htmlDom = document.querySelector('html');
+        htmlDom.style.fontSize = htmlwidth / 192 + 'px';
     }
 });
 // CONCATENATED MODULE: ./src/utils/Cookie.js
@@ -710,22 +808,22 @@ Array.prototype.clear = function () {
 
         var exp = new Date();
         exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
-        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString();
+        document.cookie = name + '=' + escape(value) + ';expires=' + exp.toGMTString();
     },
     remove: function remove(name) {
         var exp = new Date();
         exp.setTime(exp.getTime() - 1);
-        var cval = getCookie(name);
+        var cval = this.get(name);
         if (cval != null) {
-            document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
+            document.cookie = name + '=' + cval + ';expires=' + exp.toGMTString();
         }
     },
     get: function get(name) {
-        var arr = document.cookie.match(new RegExp("(^| )" + name + "=([^;]*)(;|$)"));
+        var arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)'));
         if (arr != null) {
             return arr[2];
         } else {
-            return "";
+            return '';
         }
     }
 });
@@ -733,38 +831,38 @@ Array.prototype.clear = function () {
 /* harmony default export */ var CoordsUtils = ({
     PI: 3.14159265358979324,
     XPI: 3.14159265358979324 * 3000.0 / 180.0,
-    delta: function delta(lat, lon) {
+    delta: function delta(lat, lng) {
         var a = 6378245.0; //  a: 卫星椭球坐标投影到平面地图坐标系的投影因子。
         var ee = 0.00669342162296594323; //  ee: 椭球的偏心率。
-        var dLat = this.transformLat(lon - 105.0, lat - 35.0);
-        var dLon = this.transformLon(lon - 105.0, lat - 35.0);
+        var dLat = this.transformLat(lng - 105.0, lat - 35.0);
+        var dLon = this.transformLon(lng - 105.0, lat - 35.0);
         var radLat = lat / 180.0 * this.PI;
         var magic = Math.sin(radLat);
         magic = 1 - ee * magic * magic;
         var sqrtMagic = Math.sqrt(magic);
         dLat = dLat * 180.0 / (a * (1 - ee) / (magic * sqrtMagic) * this.PI);
         dLon = dLon * 180.0 / (a / sqrtMagic * Math.cos(radLat) * this.PI);
-        return { lat: dLat, lon: dLon };
+        return { lat: dLat, lng: dLon };
     },
 
     // WGS-84 to GCJ-02
     gcjEncrypt: function gcjEncrypt(wgsLat, wgsLon) {
         if (this.outOfChina(wgsLat, wgsLon)) {
-            return { lat: wgsLat, lon: wgsLon };
+            return { lat: wgsLat, lng: wgsLon };
         }
 
         var d = this.delta(wgsLat, wgsLon);
-        return { lat: wgsLat + d.lat, lon: wgsLon + d.lon };
+        return { lat: wgsLat + d.lat, lng: wgsLon + d.lng };
     },
 
     // GCJ-02 to WGS-84
     gcjDecrypt: function gcjDecrypt(gcjLat, gcjLon) {
         if (this.outOfChina(gcjLat, gcjLon)) {
-            return { lat: gcjLat, lon: gcjLon };
+            return { lat: gcjLat, lng: gcjLon };
         }
 
         var d = this.delta(gcjLat, gcjLon);
-        return { lat: gcjLat - d.lat, lon: gcjLon - d.lon };
+        return { lat: gcjLat - d.lat, lng: gcjLon - d.lng };
     },
 
     // GCJ-02 to WGS-84 exactly
@@ -785,7 +883,7 @@ Array.prototype.clear = function () {
             wgsLon = (mLon + pLon) / 2;
             var tmp = this.gcj_encrypt(wgsLat, wgsLon);
             dLat = tmp.lat - gcjLat;
-            dLon = tmp.lon - gcjLon;
+            dLon = tmp.lng - gcjLon;
             if (Math.abs(dLat) < threshold && Math.abs(dLon) < threshold) {
                 break;
             }
@@ -796,7 +894,7 @@ Array.prototype.clear = function () {
             if (++i > 10000) break;
         }
         // console.log(i);
-        return { lat: wgsLat, lon: wgsLon };
+        return { lat: wgsLat, lng: wgsLon };
     },
 
     // GCJ-02 to BD-09
@@ -805,9 +903,9 @@ Array.prototype.clear = function () {
         var y = gcjLat;
         var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * this.XPI);
         var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * this.XPI);
-        bdLon = z * Math.cos(theta) + 0.0065;
-        bdLat = z * Math.sin(theta) + 0.006;
-        return { lat: bdLat, lon: bdLon };
+        var bdLon = z * Math.cos(theta) + 0.0065;
+        var bdLat = z * Math.sin(theta) + 0.006;
+        return { lat: bdLat, lng: bdLon };
     },
 
     // BD-09 to GCJ-02
@@ -818,7 +916,7 @@ Array.prototype.clear = function () {
         var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * this.XPI);
         var gcjLon = z * Math.cos(theta);
         var gcjLat = z * Math.sin(theta);
-        return { lat: gcjLat, lon: gcjLon };
+        return { lat: gcjLat, lng: gcjLon };
     },
 
     // WGS-84 to Web mercator
@@ -827,16 +925,7 @@ Array.prototype.clear = function () {
         var x = wgsLon * 20037508.34 / 180.0;
         var y = Math.log(Math.tan((90.0 + wgsLat) * this.PI / 360.0)) / (this.PI / 180.0);
         y = y * 20037508.34 / 180.0;
-        return { lat: y, lon: x
-            /*
-            if ((Math.abs(wgsLon) > 180 || Math.abs(wgsLat) > 90))
-            return null;
-            var x = 6378137.0 * wgsLon * 0.017453292519943295;
-            var a = wgsLat * 0.017453292519943295;
-            var y = 3189068.5 * Math.log((1.0 + Math.sin(a)) / (1.0 - Math.sin(a)));
-            return {'lat' : y, 'lon' : x};
-            // */
-        };
+        return { lat: y, lng: x };
     },
 
     // Web mercator to WGS-84
@@ -845,24 +934,13 @@ Array.prototype.clear = function () {
         var x = mercatorLon / 20037508.34 * 180.0;
         var y = mercatorLat / 20037508.34 * 180.0;
         y = 180 / this.PI * (2 * Math.atan(Math.exp(y * this.PI / 180.0)) - this.PI / 2);
-        return { lat: y, lon: x
-            /*
-            if (Math.abs(mercatorLon) < 180 && Math.abs(mercatorLat) < 90)
-            return null;
-            if ((Math.abs(mercatorLon) > 20037508.3427892) || (Math.abs(mercatorLat) > 20037508.3427892))
-            return null;
-            var a = mercatorLon / 6378137.0 * 57.295779513082323;
-            var x = a - (Math.floor(((a + 180.0) / 360.0)) * 360.0);
-            var y = (1.5707963267948966 - (2.0 * Math.atan(Math.exp((-1.0 * mercatorLat) / 6378137.0)))) * 57.295779513082323;
-            return {'lat' : y, 'lon' : x};
-            // */
-        };
+        return { lat: y, lng: x };
     },
 
     // two point's distance
-    distance: function distance(latA, lonA, latB, lonB) {
+    distance: function distance(latA, lngA, latB, lngB) {
         var earthR = 6371000.0;
-        var x = Math.cos(latA * this.PI / 180.0) * Math.cos(latB * this.PI / 180.0) * Math.cos((lonA - lonB) * this.PI / 180);
+        var x = Math.cos(latA * this.PI / 180.0) * Math.cos(latB * this.PI / 180.0) * Math.cos((lngA - lngB) * this.PI / 180);
         var y = Math.sin(latA * this.PI / 180.0) * Math.sin(latB * this.PI / 180.0);
         var s = x + y;
         if (s > 1) s = 1;
@@ -871,8 +949,8 @@ Array.prototype.clear = function () {
         var distance = alpha * earthR;
         return distance;
     },
-    outOfChina: function outOfChina(lat, lon) {
-        if (lon < 72.004 || lon > 137.8347) {
+    outOfChina: function outOfChina(lat, lng) {
+        if (lng < 72.004 || lng > 137.8347) {
             return true;
         }
         if (lat < 0.8293 || lat > 55.8271) {
@@ -898,17 +976,17 @@ Array.prototype.clear = function () {
 // CONCATENATED MODULE: ./src/utils/DateUtils.js
 Date.prototype.format = function (fmt) {
     var o = {
-        "M+": this.getMonth() + 1, // 月份
-        "d+": this.getDate(), // 日
-        "h+": this.getHours(), // 小时
-        "m+": this.getMinutes(), // 分
-        "s+": this.getSeconds(), // 秒
-        "q+": Math.floor((this.getMonth() + 3) / 3), // 季度
+        'M+': this.getMonth() + 1, // 月份
+        'd+': this.getDate(), // 日
+        'h+': this.getHours(), // 小时
+        'm+': this.getMinutes(), // 分
+        's+': this.getSeconds(), // 秒
+        'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
         S: this.getMilliseconds() // 毫秒
     };
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length));
     for (var k in o) {
-        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+        if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
     }
     return fmt;
 };
@@ -921,28 +999,28 @@ Date.prototype.format = function (fmt) {
 Date.prototype.addDate = function (interval, number) {
     var date = new Date(this);
     switch (interval) {
-        case "y":
+        case 'y':
             date.setFullYear(this.getFullYear() + number);
             break;
-        case "q":
+        case 'q':
             date.setMonth(this.getMonth() + number * 3);
             break;
-        case "M":
+        case 'M':
             date.setMonth(this.getMonth() + number);
             break;
-        case "w":
+        case 'w':
             date.setDate(this.getDate() + number * 7);
             break;
-        case "d":
+        case 'd':
             date.setDate(this.getDate() + number);
             break;
-        case "h":
+        case 'h':
             date.setHours(this.getHours() + number);
             break;
-        case "m":
+        case 'm':
             date.setMinutes(this.getMinutes() + number);
             break;
-        case "s":
+        case 's':
             date.setSeconds(this.getSeconds() + number);
             break;
         default:
@@ -952,11 +1030,14 @@ Date.prototype.addDate = function (interval, number) {
     return date;
 };
 /* harmony default export */ var DateUtils = ({
-    lastMonthDay: new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1),
-    thisMonthDay: new Date(new Date().getFullYear(), new Date().getMonth(), 1),
-    nextMonthDay: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 1),
+    lastMonthDate: new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1),
+    thisMonthDate: new Date(new Date().getFullYear(), new Date().getMonth(), 1),
+    nextMonthDate: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 1),
+    lastDayDate: new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() - 1),
+    thisDayDate: new Date(new Date().setHours(0, 0, 0, 0)),
+    nextDayDate: new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() + 1),
     parseDate: function parseDate(str) {
-        if (typeof str == "string") {
+        if (typeof str == 'string') {
             var results = str.match(/^ *(\d{4})-(\d{1,2})-(\d{1,2}) *$/);
             if (results && results.length > 3) return new Date(parseInt(results[1]), parseInt(results[2]) - 1, parseInt(results[3]));
             results = str.match(/^ *(\d{4})-(\d{1,2})-(\d{1,2}) +(\d{1,2}):(\d{1,2}):(\d{1,2}) *$/);
@@ -985,21 +1066,21 @@ Date.prototype.addDate = function (interval, number) {
         var minutes = Math.floor(leave2 / (60 * 1000));
         var leave3 = leave2 % (60 * 1000);
         var seconds = Math.round(leave3 / 1000);
-        var intervalDes = "";
+        var intervalDes = '';
         if (days > 0) {
-            intervalDes += days + "天";
+            intervalDes += days + '天';
         }
         if (hours > 0) {
-            intervalDes += hours + "时";
+            intervalDes += hours + '时';
         }
         if (minutes > 0) {
-            intervalDes += minutes + "分";
+            intervalDes += minutes + '分';
         }
         if (seconds > 0) {
-            intervalDes += seconds + "秒";
+            intervalDes += seconds + '秒';
         }
         if (days === 0 && hours === 0 && minutes === 0 && seconds === 0) {
-            intervalDes = "少于1秒";
+            intervalDes = '少于1秒';
         }
         return intervalDes;
     },
@@ -1009,7 +1090,7 @@ Date.prototype.addDate = function (interval, number) {
 });
 // CONCATENATED MODULE: ./src/utils/DomUtils.js
 function trim(str) {
-    return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, "");
+    return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
 }
 function splitWords(str) {
     return trim(str).split(/\s+/);
@@ -1018,15 +1099,15 @@ function splitWords(str) {
     getStyle: function getStyle(el, style) {
         var value = el.style[style] || el.currentStyle && el.currentStyle[style];
 
-        if ((!value || value === "auto") && document.defaultView) {
+        if ((!value || value === 'auto') && document.defaultView) {
             var css = document.defaultView.getComputedStyle(el, null);
             value = css ? css[style] : null;
         }
-        return value === "auto" ? null : value;
+        return value === 'auto' ? null : value;
     },
     create: function create(tagName, className, container) {
         var el = document.createElement(tagName);
-        el.className = className || "";
+        el.className = className || '';
 
         if (container) {
             container.appendChild(el);
@@ -1067,7 +1148,7 @@ function splitWords(str) {
             return el.classList.contains(name);
         }
         var className = this.getClass(el);
-        return className.length > 0 && new RegExp("(^|\\s)" + name + "(\\s|$)").test(className);
+        return className.length > 0 && new RegExp('(^|\\s)' + name + '(\\s|$)').test(className);
     },
     addClass: function addClass(el, name) {
         if (el.classList !== undefined) {
@@ -1077,7 +1158,7 @@ function splitWords(str) {
             }
         } else if (!this.hasClass(el, name)) {
             var className = this.getClass(el);
-            this.setClass(el, (className ? className + " " : "") + name);
+            this.setClass(el, (className ? className + ' ' : '') + name);
         }
     },
     removeClass: function removeClass(el, name) {
@@ -1087,7 +1168,7 @@ function splitWords(str) {
                 return el.classList.remove(name);
             });
         } else {
-            this.setClass(el, trim((" " + this.getClass(el) + " ").replace(" " + name + " ", " ")));
+            this.setClass(el, trim((' ' + this.getClass(el) + ' ').replace(' ' + name + ' ', ' ')));
         }
     },
     setClass: function setClass(el, name) {
@@ -1097,10 +1178,74 @@ function splitWords(str) {
             // in case of SVG element
             el.className.baseVal = name;
         }
+    },
+    parseFromString: function parseFromString(str) {
+        var parser = new DOMParser();
+        var doc = parser.parseFromString(str, 'text/xml');
+        return doc.children[0];
+    }
+});
+// CONCATENATED MODULE: ./src/utils/MathUtils.js
+/* harmony default export */ var MathUtils = ({
+    DEG2RAD: Math.PI / 180,
+    RAD2DEG: 180 / Math.PI,
+    randInt: function randInt(low, high) {
+        return low + Math.floor(Math.random() * (high - low + 1));
+    },
+    randFloat: function randFloat(low, high) {
+        return low + Math.random() * (high - low);
+    },
+
+    /**
+     * 角度转弧度
+     *
+     * @param {*} degrees
+     * @returns {*}
+     */
+    degreesToRadians: function degreesToRadians(degrees) {
+        return degrees * this.DEG2RAD;
+    },
+
+    /**
+     * 角度转弧度
+     *
+     * @param {*} degrees
+     * @returns {*}
+     */
+    toRadians: function toRadians(degrees) {
+        return degrees * this.DEG2RAD;
+    },
+
+    /**
+     * 弧度转角度
+     *
+     * @param {*} radians
+     * @returns {*}
+     */
+    radiansToDegrees: function radiansToDegrees(radians) {
+        return radians * this.RAD2DEG;
+    },
+
+    /**
+     * 弧度转角度
+     *
+     * @param {*} radians
+     * @returns {*}
+     */
+    toDegrees: function toDegrees(radians) {
+        return radians * this.RAD2DEG;
+    },
+    formatFloat: function formatFloat(value) {
+        var n = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+
+        return Math.round(value * Math.pow(10, n)) / Math.pow(10, n);
     }
 });
 // CONCATENATED MODULE: ./src/utils/GeoUtils.js
+
 /* harmony default export */ var GeoUtils = ({
+    toRadian: Math.PI / 180,
+    R: 6371393,
     /**
      * 验证经纬度坐标
      *
@@ -1109,7 +1254,7 @@ function splitWords(str) {
      * @returns {*}  {boolean}
      */
     isLnglat: function isLnglat(lng, lat) {
-        return !!(+lat > 0 && +lat < 90 && +lng > 0 && +lng < 180);
+        return !!(+lat > -90 && +lat < 90 && +lng > -180 && +lng < 180);
     },
 
     /**
@@ -1125,14 +1270,8 @@ function splitWords(str) {
             var a = parseFloat(value);
             var degree = parseInt(a);
             var min = parseInt((a - degree) * 60);
-            if (min < 10) {
-                min = '0' + min;
-            }
-            var sec = parseInt((a - degree) * 3600 - min * 60);
-            if (sec < 10) {
-                sec = '0' + sec;
-            }
-            return degree + '°' + min + '′' + sec + '″';
+            var sec = (a - degree) * 3600 - min * 60;
+            return degree + '°' + min + '′' + sec.toFixed(2) + '″';
         }
         if (lng && lat) {
             res = format(lng) + ',' + format(lat);
@@ -1140,6 +1279,33 @@ function splitWords(str) {
         return res;
     },
 
+    /**
+     * 度分秒转十进制
+     *
+     * @param {*} lng
+     * @param {*} lat
+     * @returns {*}
+     */
+    transformLnglat: function transformLnglat(lng, lat) {
+        function dms2deg(s) {
+            var sw = /[sw]/i.test(s);
+            var f = sw ? -1 : 1;
+            var bits = s.match(/[\d.]+/g);
+            var result = 0;
+            for (var i = 0, iLen = bits.length; i < iLen; i++) {
+                result += bits[i] / f;
+                f *= 60;
+            }
+            return result;
+        }
+        if (lng && lat) {
+            return {
+                lng: dms2deg(lng),
+                lat: dms2deg(lat)
+            };
+        }
+    },
+
     /**
      * 判断点是否在多边形内
      *
@@ -1236,6 +1402,81 @@ function splitWords(str) {
         var fwdAz = Math.atan2(cosU2 * sinLambda, cosU1 * sinU2 - sinU1 * cosU2 * cosLambda);
         var revAz = Math.atan2(cosU1 * sinLambda, -sinU1 * cosU2 + cosU1 * sinU2 * cosLambda);
         return s;
+    },
+
+    /**
+     * P1绕一个坐标点P2旋转θ角度后,新的坐标的计算公式
+     *
+     * @param {*} p1
+     * @param {*} p2
+     * @param {*} θ 旋转角度，正：表示顺时针，负：表示逆时针
+     */
+    rotatePoint: function rotatePoint(p1, p2, θ) {
+        var x = (p1.x - p2.x) * Math.cos(Math.PI / 180 * -θ) - (p1.y - p2.y) * Math.sin(Math.PI / 180 * -θ) + p2.x;
+        var y = (p1.x - p2.x) * Math.sin(Math.PI / 180 * -θ) + (p1.y - p2.y) * Math.cos(Math.PI / 180 * -θ) + p2.y;
+        return { x: x, y: y };
+    },
+
+    /**
+     * 计算latlng2相对于latlng1的方位角和距离
+     *
+     * @param {*} latlng1
+     * @param {*} latlng2
+     * @returns {*}  {boolean}
+     */
+    calcBearAndDisByPoints: function calcBearAndDisByPoints(latlng1, latlng2) {
+        var f1 = parseFloat(latlng1.lat),
+            l1 = parseFloat(latlng1.lng),
+            f2 = parseFloat(latlng2.lat),
+            l2 = parseFloat(latlng2.lng);
+        var y = Math.sin((l2 - l1) * this.toRadian) * Math.cos(f2 * this.toRadian);
+        var x = Math.cos(f1 * this.toRadian) * Math.sin(f2 * this.toRadian) - Math.sin(f1 * this.toRadian) * Math.cos(f2 * this.toRadian) * Math.cos((l2 - l1) * this.toRadian);
+        var angle = Math.atan2(y, x) * (180 / Math.PI);
+        var deltaF = (f2 - f1) * this.toRadian;
+        var deltaL = (l2 - l1) * this.toRadian;
+        var a = Math.sin(deltaF / 2) * Math.sin(deltaF / 2) + Math.cos(f1 * this.toRadian) * Math.cos(f2 * this.toRadian) * Math.sin(deltaL / 2) * Math.sin(deltaL / 2);
+        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        var distance = this.R * c;
+        return {
+            angle: angle,
+            distance: distance
+        };
+    },
+
+    /**
+     * 根据方位角和距离生成新的坐标
+     *
+     * @param {*} latlng
+     * @param {*} angle
+     * @param {*} distance
+     * @returns {*}
+     */
+    calcPointByBearAndDis: function calcPointByBearAndDis(latlng, angle, distance) {
+        var sLat = MathUtils.toRadians(parseFloat(latlng.lat));
+        var sLng = MathUtils.toRadians(parseFloat(latlng.lng));
+        angle = parseFloat(angle);
+        distance = parseFloat(distance);
+        var d = distance / this.R;
+        angle = MathUtils.toRadians(angle);
+        var lat = Math.asin(Math.sin(sLat) * Math.cos(d) + Math.cos(sLat) * Math.sin(d) * Math.cos(angle));
+        var lon = sLng + Math.atan2(Math.sin(angle) * Math.sin(d) * Math.cos(sLat), Math.cos(d) - Math.sin(sLat) * Math.sin(lat));
+        return {
+            lat: MathUtils.toDegrees(lat),
+            lng: MathUtils.toDegrees(lon)
+        };
+    },
+    mercatorTolonlat: function mercatorTolonlat(x, y) {
+        var lon = x / 20037508.34 * 180;
+        var lat = y / 20037508.34 * 180;
+        y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2);
+        return { lon: lon, lat: lat };
+    },
+    lonlatToMercator: function lonlatToMercator(lon, lat) {
+        var x = lon * 20037508.34 / 180;
+        var y = Math.log(Math.tan((90 + lat) * Math.PI / 360)) / (Math.PI / 180);
+
+        y = y * 20037508.34 / 180;
+        return { x: x, y: y };
     }
 });
 // CONCATENATED MODULE: ./src/utils/FileUtils.js
@@ -1249,8 +1490,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
      * @returns {*}
      */
     convertBase64ToBlob: function convertBase64ToBlob(data) {
-        var mimeString = data.split(",")[0].split(":")[1].split(";")[0];
-        var byteString = window.atob(data.split(",")[1]);
+        var mimeString = data.split(',')[0].split(':')[1].split(';')[0];
+        var byteString = window.atob(data.split(',')[1]);
         var ab = new ArrayBuffer(byteString.length);
         var ia = new Uint8Array(ab);
 
@@ -1282,19 +1523,19 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     convertUrlToBase64: function convertUrlToBase64(url, width, height) {
         return new Promise(function (resolve, reject) {
             var img = new Image();
-            img.crossOrigin = "Anonymous";
+            img.crossOrigin = 'Anonymous';
             img.src = url;
             img.onload = function () {
-                var canvas = document.createElement("canvas");
+                var canvas = document.createElement('canvas');
                 canvas.width = width || img.width;
                 canvas.height = height || img.height;
-                var ctx = canvas.getContext("2d");
+                var ctx = canvas.getContext('2d');
                 ctx.drawImage(img, 0, 0, img.width, img.height);
-                var ext = img.src.substring(img.src.lastIndexOf(".") + 1).toLowerCase();
-                var dataURL = canvas.toDataURL("image/" + ext);
+                var ext = img.src.substring(img.src.lastIndexOf('.') + 1).toLowerCase();
+                var dataURL = canvas.toDataURL('image/' + ext);
                 var base64 = {
                     dataURL: dataURL,
-                    type: "image/" + ext,
+                    type: 'image/' + ext,
                     ext: ext
                 };
                 resolve(base64);
@@ -1310,7 +1551,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
      * @returns {*}
      */
     convertBase64ToFile: function convertBase64ToFile(dataurl, filename) {
-        var arr = dataurl.split(","),
+        var arr = dataurl.split(','),
             mime = arr[0].match(/:(.*?);/)[1],
             bstr = atob(arr[1]),
             n = bstr.length,
@@ -1325,56 +1566,30 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     /**
      * 直接下载文件,支持blob类型和url类型
      *
-     * @param {*} url
+     * @param {*} data
      * @param {*} saveName
      */
-    downloadFromFile: function downloadFromFile(url, saveName) {
-        if ((typeof url === "undefined" ? "undefined" : _typeof(url)) == "object" && url instanceof Blob) {
-            url = URL.createObjectURL(url); // 创建blob地址
+    downloadFromFile: function downloadFromFile(data, saveName) {
+        var url = void 0;
+        if ((typeof data === 'undefined' ? 'undefined' : _typeof(data)) == 'object') {
+            if (data instanceof Blob) {
+                url = URL.createObjectURL(data); // 创建blob地址
+            } else {
+                var str = JSON.stringify(data);
+                var blob = new Blob([str], { type: 'text/json' }); // json对象
+                url = window.URL.createObjectURL(blob);
+            }
+        } else if (typeof data == 'string') {
+            var _blob = new Blob([data], { type: 'text/json' }); //json文本
+            url = window.URL.createObjectURL(_blob);
         }
-        var link = document.createElement("a");
+        var link = document.createElement('a');
         link.href = url;
-        link.download = saveName || ""; // HTML5新增的属性，指定保存文件名，可以不要后缀，注意，file:///模式下不会生效
+        link.download = saveName || ''; // HTML5新增的属性，指定保存文件名，可以不要后缀，注意，file:///模式下不会生效
         link.click();
         window.URL.revokeObjectURL(link.href);
     }
 });
-// CONCATENATED MODULE: ./src/utils/MathUtils.js
-/* harmony default export */ var MathUtils = ({
-    DEG2RAD: Math.PI / 180,
-    RAD2DEG: 180 / Math.PI,
-    randInt: function randInt(low, high) {
-        return low + Math.floor(Math.random() * (high - low + 1));
-    },
-    randFloat: function randFloat(low, high) {
-        return low + Math.random() * (high - low);
-    },
-
-    /**
-     * 角度转弧度
-     *
-     * @param {*} degrees
-     * @returns {*}
-     */
-    degreesToRadians: function degreesToRadians(degrees) {
-        return degrees * this.DEG2RAD;
-    },
-
-    /**
-     * 弧度转角度
-     *
-     * @param {*} radians
-     * @returns {*}
-     */
-    radiansToDegrees: function radiansToDegrees(radians) {
-        return radians * this.RAD2DEG;
-    },
-    formatFloat: function formatFloat(value) {
-        var n = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
-
-        return Math.round(value * Math.pow(10, n)) / Math.pow(10, n);
-    }
-});
 // CONCATENATED MODULE: ./src/utils/OptimizeUtils.js
 /* harmony default export */ var OptimizeUtils = ({
     /**
@@ -1441,9 +1656,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
      */
     throttle: function throttle(func, wait, type) {
         if (type === 1) {
-            var _previous = 0;
+            var previous = 0;
         } else if (type === 2) {
-            var _timeout = void 0;
+            var timeout;
         }
         return function () {
             var context = this;
@@ -1486,6 +1701,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     }
 });
 // CONCATENATED MODULE: ./src/utils/StringUtils.js
+
 /* harmony default export */ var StringUtils = ({
     /**
      * 常用正则验证
@@ -1603,17 +1819,62 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
                 return str;
         }
     },
+
+    /**
+     * 处理字符串模板
+     * eg: tag`${abc}`
+     * @param {*} strArray
+     * @param {*} args
+     * @returns {*}
+     */
     tag: function tag(strArray) {
         for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
             args[_key - 1] = arguments[_key];
         }
 
         args = args.map(function (val) {
-            return val || '';
+            switch (CommUtils.getDataType(val)) {
+                case 'Object':
+                    return val || '{}';
+                case 'Array':
+                    return val || '[]';
+                default:
+                    return val || '';
+            }
         });
         return strArray.reduce(function (prev, next, index) {
             return '' + prev + args[index - 1] + next;
         });
+    },
+
+    /**
+     * 获取字符串字节长度
+     * @param {*} str
+     * @returns {*}
+     */
+    getByteLength: function getByteLength(str) {
+        return str.replace(/[\u0391-\uFFE5]/g, 'aa').length;
+    },
+
+    /**
+     * 根据字节长度截取字符串
+     * @param {*} str
+     * @param {*} n
+     * @returns {*}
+     */
+    subStringByte: function subStringByte(str, start, n) {
+        var r = /[^\x00-\xff]/g;
+        if (str.replace(r, 'mm').length <= n) {
+            return str;
+        }
+        var m = Math.floor(n / 2);
+        for (var i = m; i < str.length; i++) {
+            var sub = str.substring(start, i);
+            if (sub.replace(r, 'mm').length >= n) {
+                return sub;
+            }
+        }
+        return str;
     }
 });
 // CONCATENATED MODULE: ./src/utils/index.js
@@ -1846,6 +2107,9 @@ var ElQuery = function () {
             var _this3 = this;
 
             this.each(function (obj) {
+                obj.removeEventListener(type, function (e) {
+                    callback.call(_this3, e);
+                });
                 obj.addEventListener(type, function (e) {
                     callback.call(_this3, e);
                 });
@@ -2055,7 +2319,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
     _inherits(WebSocketClient, _EventDispatcher);
 
     function WebSocketClient() {
-        var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "ws://127.0.0.1:10088";
+        var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'ws://127.0.0.1:10088';
 
         WebSocketClient_classCallCheck(this, WebSocketClient);
 
@@ -2073,40 +2337,37 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
     }
 
     WebSocketClient_createClass(WebSocketClient, [{
-        key: "connect",
+        key: 'connect',
         value: function connect() {
-            var _this2 = this;
-
-            this.checkTimes++;
             this.disconnect();
             if (this.url) {
                 try {
-                    console.info("创建ws连接" + this.url);
+                    console.info('创建ws连接>>>' + this.url);
                     this.client = new WebSocket(this.url);
                     if (this.client) {
-                        // 当连接成功或连接失败达到最大重连次数的一半时
-                        if (!this.connectStatus && this.checkTimes === Math.floor(this.maxCheckTimes / 2) || this.connectStatus) {
-                            this.client.onopen = function (message) {
-                                _this2.dispatchEvent({
-                                    type: EventTypeConstant.WEB_SOCKET_CONNECT,
-                                    message: message
-                                });
-                            };
-                            this.client.onmessage = function (message) {
-                                _this2.connectStatus = true;
-                                _this2.dispatchEvent({
-                                    type: EventTypeConstant.WEB_SOCKET_MESSAGE,
-                                    message: message
-                                });
-                            };
-                            this.client.onclose = function (message) {
-                                _this2.dispatchEvent({
-                                    type: EventTypeConstant.WEB_SOCKET_CLOSE,
-                                    message: message
-                                });
-                            };
+                        var self = this;
+                        this.client.onopen = function (message) {
+                            self.dispatchEvent({
+                                type: EventTypeConstant.WEB_SOCKET_CONNECT,
+                                message: message
+                            });
+                        };
+                        this.client.onmessage = function (message) {
+                            self.connectStatus = true;
+                            self.dispatchEvent({
+                                type: EventTypeConstant.WEB_SOCKET_MESSAGE,
+                                message: message
+                            });
+                        };
+                        this.client.onclose = function (message) {
+                            self.dispatchEvent({
+                                type: EventTypeConstant.WEB_SOCKET_CLOSE,
+                                message: message
+                            });
+                        };
+                        if (this.checkTimes === this.maxCheckTimes) {
                             this.client.onerror = function (message) {
-                                _this2.dispatchEvent({
+                                self.dispatchEvent({
                                     type: EventTypeConstant.WEB_SOCKET_ERROR,
                                     message: message
                                 });
@@ -2114,16 +2375,16 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
                         }
                     }
                 } catch (ex) {
-                    console.error("创建ws连接失败" + this.url + ":" + ex);
+                    console.error('创建ws连接失败' + this.url + ':' + ex);
                 }
             }
         }
     }, {
-        key: "disconnect",
+        key: 'disconnect',
         value: function disconnect() {
             if (this.client) {
                 try {
-                    console.log("ws断开连接" + this.url);
+                    console.log('ws断开连接' + this.url);
                     this.client.close();
                     this.client = null;
                 } catch (ex) {
@@ -2132,43 +2393,44 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }
         }
     }, {
-        key: "connCheckStatus",
+        key: 'connCheckStatus',
         value: function connCheckStatus(times) {
-            var _this3 = this;
+            var _this2 = this;
 
             if (this.checkTimes > times) return;
             setTimeout(function () {
-                if (_this3.client && _this3.client.readyState !== 0 && _this3.client.readyState !== 1) {
-                    _this3.connect();
+                _this2.checkTimes++;
+                if (_this2.client && _this2.client.readyState !== 0 && _this2.client.readyState !== 1) {
+                    _this2.connect();
                 }
-                _this3.connCheckStatus(times);
+                _this2.connCheckStatus(times);
             }, 2000);
         }
     }, {
-        key: "send",
+        key: 'send',
         value: function send(message) {
             if (this.client && this.client.readyState === 1) {
                 this.client.send(message);
                 return true;
             }
-            console.error(this.url + "消息发送失败：" + message);
+            console.error(this.url + '消息发送失败：' + message);
             return false;
         }
     }, {
-        key: "heartbeat",
+        key: 'heartbeat',
         value: function heartbeat() {
-            var _this4 = this;
+            var _this3 = this;
 
             setTimeout(function () {
-                if (_this4.client && _this4.client.readyState === 1) {
-                    _this4.send("HeartBeat");
+                if (_this3.client && _this3.client.readyState === 1) {
+                    _this3.send('HeartBeat');
                 }
-                console.log("HeartBeat," + _this4.url);
-                setTimeout(_this4.heartbeat, 30000);
+                console.log('HeartBeat,' + _this3.url);
+                setTimeout(_this3.heartbeat, 30000);
             }, 1000);
         }
     }], [{
-        key: "getInstance",
+        key: 'getInstance',
         value: function getInstance() {
             if (WebSocketClient.instance) {
                 return WebSocketClient.instance;
@@ -2177,7 +2439,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }
         }
     }, {
-        key: "_instance",
+        key: '_instance',
         get: function get() {
             return this.getInstance();
         }
@@ -2290,6 +2552,122 @@ var WebStorage_WebStorage = function () {
 }();
 
 /* harmony default export */ var core_WebStorage = (WebStorage_WebStorage);
+// CONCATENATED MODULE: ./src/core/DevicePixelRatio.js
+var DevicePixelRatio_createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+function DevicePixelRatio_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var DevicePixelRatio = function () {
+    function DevicePixelRatio() {
+        var magnification = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+        DevicePixelRatio_classCallCheck(this, DevicePixelRatio);
+
+        this.magnification = magnification;
+    }
+    // 获取系统类型
+
+
+    DevicePixelRatio_createClass(DevicePixelRatio, [{
+        key: '_getSystem',
+        value: function _getSystem() {
+            // let flag = false;
+            var agent = navigator.userAgent.toLowerCase();
+            //		var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+            //		if(isMac) {
+            //			return false;
+            //		}
+            // 现只针对windows处理，其它系统暂无该情况，如有，继续在此添加
+            if (agent.indexOf('windows') >= 0) {
+                return true;
+            }
+        }
+        // 获取页面缩放比例
+        //	_getDevicePixelRatio() {
+        //		let t = this;
+        //	}
+        // 监听方法兼容写法
+
+    }, {
+        key: '_addHandler',
+        value: function _addHandler(element, type, handler) {
+            if (element.addEventListener) {
+                element.addEventListener(type, handler, false);
+            } else if (element.attachEvent) {
+                element.attachEvent('on' + type, handler);
+            } else {
+                element['on' + type] = handler;
+            }
+        }
+        // 校正浏览器缩放比例
+
+    }, {
+        key: '_correct',
+        value: function _correct() {
+            // 配合px2rem插件进行自适应布局
+            var pageWidth = window.innerWidth;
+            //为了ie也能拿到可视窗口宽度
+            if (typeof pageWidth != 'number') {
+                //标准模式
+                if (document.compatMode == 'CSS1Compat') {
+                    pageWidth = document.documentElement.clientWidth;
+                    //怪异模式
+                } else {
+                    pageWidth = document.body.clientWidth;
+                }
+            }
+            if (pageWidth <= 750) {
+                var baseSize = 75;
+                // 当前页面宽度相对于 750 宽的缩放比例，可根据自己需要修改。
+                var scale = document.documentElement.clientWidth / pageWidth;
+                // 设置页面根节点字体大小
+                document.documentElement.style.fontSize = this.magnification * baseSize * Math.min(scale, 2) + 'px';
+            } else if (pageWidth > 750 && pageWidth <= 1200) {
+                var _baseSize = 85;
+                // 当前页面宽度相对于 750 宽的缩放比例，可根据自己需要修改。
+                var _scale = document.documentElement.clientWidth / pageWidth;
+                // 设置页面根节点字体大小
+                document.documentElement.style.fontSize = this.magnification * _baseSize * Math.min(_scale, 2) + 'px';
+            } else {
+                var _baseSize2 = 100;
+                // 当前页面宽度相对于 750 宽的缩放比例，可根据自己需要修改。
+                var _scale2 = document.documentElement.clientWidth / 1920;
+                // 设置页面根节点字体大小
+                document.documentElement.style.fontSize = this.magnification * _baseSize2 * Math.min(_scale2, 2) + 'px';
+            }
+        }
+        // 监听页面缩放
+
+    }, {
+        key: '_watch',
+        value: function _watch() {
+            var t = this;
+            t._addHandler(window, 'resize', function () {
+                // 注意这个方法是解决全局有两个window.resize
+                // 重新校正
+                t._correct();
+            });
+        }
+        // 初始化页面比例
+
+    }, {
+        key: 'init',
+        value: function init() {
+            var t = this;
+            if (t._getSystem()) {
+                // 判断设备，目前只在windows系统下校正浏览器缩放比例
+                // 初始化页面校正浏览器缩放比例
+                t._correct();
+                // 开启监听页面缩放
+                t._watch();
+            }
+        }
+    }]);
+
+    return DevicePixelRatio;
+}();
+
+/* harmony default export */ var core_DevicePixelRatio = (DevicePixelRatio);
 // CONCATENATED MODULE: ./src/index.js
 
 
@@ -2298,7 +2676,8 @@ var WebStorage_WebStorage = function () {
 
 
 
-// export { default as MqttClient } from './core/MqttClient' vite不支持?
+// export { default as MqttClient } from './core/MqttClient' // vite不支持?
+