gis-common 1.0.19 → 2.0.1

package/dist/resource.min.js

@@ -316,7 +316,7 @@ __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /*
      * @param {*} json
      * @returns {*}
      */
-    json2Query: function json2Query(json) {
+    jsontoQuery: function jsontoQuery(json) {
         var tempArr = [];
         for (var i in json) {
             var key = i;
@@ -717,22 +717,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 = this.get(name);
+        var cval = getCookie(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 "";
         }
     }
 });
@@ -1493,7 +1493,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     }
 });
 // CONCATENATED MODULE: ./src/utils/StringUtils.js
-
 /* harmony default export */ var StringUtils = ({
     /**
      * 常用正则验证
@@ -1611,62 +1610,17 @@ 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) {
-            switch (CommUtils.getDataType(val)) {
-                case 'Object':
-                    return val || '{}';
-                case 'Array':
-                    return val || '[]';
-                default:
-                    return val || '';
-            }
+            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, 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(0, i);
-            if (sub.replace(r, 'mm').length >= n) {
-                return sub;
-            }
-        }
-        return str;
     }
 });
 // CONCATENATED MODULE: ./src/utils/index.js
@@ -2265,7 +2219,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
     WebSocketClient_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);
 
@@ -2283,53 +2237,57 @@ 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) {
-                        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
-                            });
-                        };
-                        this.client.onerror = function (message) {
-                            self.dispatchEvent({
-                                type: EventTypeConstant.WEB_SOCKET_ERROR,
-                                message: message
-                            });
-                        };
+                        // 当连接成功或连接失败达到最大重连次数的一半时
+                        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
+                                });
+                            };
+                            this.client.onerror = function (message) {
+                                _this2.dispatchEvent({
+                                    type: EventTypeConstant.WEB_SOCKET_ERROR,
+                                    message: message
+                                });
+                            };
+                        }
                     }
                 } 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) {
@@ -2338,43 +2296,43 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }
         }
     }, {
-        key: 'connCheckStatus',
+        key: "connCheckStatus",
         value: function connCheckStatus(times) {
-            var _this2 = this;
+            var _this3 = this;
 
             if (this.checkTimes > times) return;
             setTimeout(function () {
-                if (_this2.client && _this2.client.readyState !== 0 && _this2.client.readyState !== 1) {
-                    _this2.connect();
+                if (_this3.client && _this3.client.readyState !== 0 && _this3.client.readyState !== 1) {
+                    _this3.connect();
                 }
-                _this2.connCheckStatus(times);
+                _this3.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 _this3 = this;
+            var _this4 = this;
 
             setTimeout(function () {
-                if (_this3.client && _this3.client.readyState === 1) {
-                    _this3.send('HeartBeat');
+                if (_this4.client && _this4.client.readyState === 1) {
+                    _this4.send("HeartBeat");
                 }
-                console.log('HeartBeat,' + _this3.url);
-                setTimeout(_this3.heartbeat, 30000);
+                console.log("HeartBeat," + _this4.url);
+                setTimeout(_this4.heartbeat, 30000);
             }, 1000);
         }
     }], [{
-        key: 'getInstance',
+        key: "getInstance",
         value: function getInstance() {
             if (WebSocketClient.instance) {
                 return WebSocketClient.instance;
@@ -2383,7 +2341,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }
         }
     }, {
-        key: '_instance',
+        key: "_instance",
         get: function get() {
             return this.getInstance();
         }

package/package.json

@@ -1,35 +1,35 @@
-{
-    "name": "gis-common",
-    "description": "gis-common",
-    "main": "dist/resource.min.js",
-    "version": "1.0.19",
-    "author": "Guo.Yan <luv02@vip.qq.com>",
-    "license": "MIT",
-    "private": false,
-    "scripts": {
-        "dev": "cross-env NODE_ENV=development webpack-dev-server --hot --port 7000",
-        "build": "cross-env NODE_ENV=production webpack --progress"
-    },
-    "dependencies": {
-        "mqtt": "^4.2.8"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions",
-        "not ie <= 8"
-    ],
-    "files": [],
-    "devDependencies": {
-        "babel-core": "^6.26.0",
-        "babel-loader": "^7.1.2",
-        "babel-preset-env": "^1.6.0",
-        "babel-preset-stage-3": "^6.24.1",
-        "cross-env": "^5.0.5",
-        "css-loader": "^0.28.7",
-        "uglifyjs-webpack-plugin": "^2.2.0",
-        "webpack": "^4.23.1",
-        "webpack-cli": "^4.9.1",
-        "webpack-dev-server": "^2.9.1",
-        "clean-webpack-plugin": "^4.0.0-alpha.0"
-    }
-}
+{
+    "name": "gis-common",
+    "description": "gis-common",
+    "main": "dist/resource.min.js",
+    "version": "2.0.1",
+    "author": "Guo.Yan <luv02@vip.qq.com>",
+    "license": "MIT",
+    "private": false,
+    "scripts": {
+        "dev": "cross-env NODE_ENV=development webpack-dev-server --hot --port 7000",
+        "build": "cross-env NODE_ENV=production webpack --progress"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not ie <= 8"
+    ],
+    "files": [],
+    "devDependencies": {
+        "babel-core": "^6.26.0",
+        "babel-loader": "^7.1.2",
+        "babel-preset-env": "^1.6.0",
+        "babel-preset-stage-3": "^6.24.1",
+        "clean-webpack-plugin": "^4.0.0-alpha.0",
+        "cross-env": "^5.0.5",
+        "css-loader": "^0.28.7",
+        "uglifyjs-webpack-plugin": "^2.2.0",
+        "webpack": "^4.23.1",
+        "webpack-cli": "^4.9.1",
+        "webpack-dev-server": "^2.9.1"
+    },
+    "dependencies": {
+        "mqtt": "^4.3.7"
+    }
+}