gis-common 1.0.17 → 1.1.1

package/dist/resource.min.js

@@ -316,7 +316,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;
@@ -1494,26 +1494,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 });
 // CONCATENATED MODULE: ./src/utils/StringUtils.js
 
-/**
- *  获取字节长度
- */
-String.prototype.bLength = function () {
-    return this.replace(/[\u0391-\uFFE5]/g, 'aa').length;
-};
-String.prototype.subStringByte = function (n) {
-    var r = /[^\x00-\xff]/g;
-    if (this.replace(r, 'mm').length <= n) {
-        return this;
-    }
-    var m = Math.floor(n / 2);
-    for (var i = m; i < this.length; i++) {
-        var sub = this.substring(0, i);
-        if (sub.replace(r, 'mm').length >= n) {
-            return sub;
-        }
-    }
-    return this;
-};
 /* harmony default export */ var StringUtils = ({
     /**
      * 常用正则验证
@@ -1631,6 +1611,14 @@ String.prototype.subStringByte = function (n) {
                 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];
@@ -1649,6 +1637,36 @@ String.prototype.subStringByte = function (n) {
         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
@@ -2247,7 +2265,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);
 
@@ -2265,40 +2283,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
                                 });
@@ -2306,16 +2321,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) {
@@ -2324,43 +2339,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;
@@ -2369,7 +2385,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }
         }
     }, {
-        key: "_instance",
+        key: '_instance',
         get: function get() {
             return this.getInstance();
         }

package/package.json

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