gis-common 1.0.18 → 1.1.2

package/dist/resource.min.js

@@ -125,6 +125,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; });
@@ -262,10 +264,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
 
 
@@ -1448,9 +1468,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;
@@ -2285,40 +2305,40 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
     WebSocketClient_createClass(WebSocketClient, [{
         key: 'connect',
         value: function connect() {
-            var _this2 = this;
-
-            this.checkTimes++;
             this.disconnect();
             if (this.url) {
                 try {
                     console.info('创建ws连接' + this.url);
                     this.client = new WebSocket(this.url);
                     if (this.client) {
+                        var self = this;
                         this.client.onopen = function (message) {
-                            _this2.dispatchEvent({
+                            self.dispatchEvent({
                                 type: EventTypeConstant.WEB_SOCKET_CONNECT,
                                 message: message
                             });
                         };
                         this.client.onmessage = function (message) {
-                            _this2.connectStatus = true;
-                            _this2.dispatchEvent({
+                            self.connectStatus = true;
+                            self.dispatchEvent({
                                 type: EventTypeConstant.WEB_SOCKET_MESSAGE,
                                 message: message
                             });
                         };
                         this.client.onclose = function (message) {
-                            _this2.dispatchEvent({
+                            self.dispatchEvent({
                                 type: EventTypeConstant.WEB_SOCKET_CLOSE,
                                 message: message
                             });
                         };
-                        this.client.onerror = function (message) {
-                            _this2.dispatchEvent({
-                                type: EventTypeConstant.WEB_SOCKET_ERROR,
-                                message: message
-                            });
-                        };
+                        if (this.checkTimes === this.maxCheckTimes) {
+                            this.client.onerror = function (message) {
+                                self.dispatchEvent({
+                                    type: EventTypeConstant.WEB_SOCKET_ERROR,
+                                    message: message
+                                });
+                            };
+                        }
                     }
                 } catch (ex) {
                     console.error('创建ws连接失败' + this.url + ':' + ex);
@@ -2341,14 +2361,15 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
     }, {
         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);
         }
     }, {
@@ -2364,14 +2385,14 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
     }, {
         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);
         }
     }], [{

package/package.json

@@ -2,7 +2,7 @@
     "name": "gis-common",
     "description": "gis-common",
     "main": "dist/resource.min.js",
-    "version": "1.0.18",
+    "version": "1.1.2",
     "author": "Guo.Yan <luv02@vip.qq.com>",
     "license": "MIT",
     "private": false,