gis-common 1.1.6 → 1.1.7

package/dist/resource.min.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("mqtt"));
+		module.exports = factory();
 	else if(typeof define === 'function' && define.amd)
-		define("Gis", ["mqtt"], factory);
+		define("Gis", [], factory);
 	else if(typeof exports === 'object')
-		exports["Gis"] = factory(require("mqtt"));
+		exports["Gis"] = factory();
 	else
-		root["Gis"] = factory(root["mqtt"]);
-})(window, function(__WEBPACK_EXTERNAL_MODULE__0__) {
+		root["Gis"] = factory();
+})(window, function() {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -91,17 +91,11 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE__0__;
-
-/***/ }),
-/* 1 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -132,7 +126,6 @@ __webpack_require__.d(__webpack_exports__, "CanvasDrawer", function() { return /
 __webpack_require__.d(__webpack_exports__, "ElQuery", function() { return /* reexport */ core_ElQuery; });
 __webpack_require__.d(__webpack_exports__, "EventDispatcher", function() { return /* reexport */ core_EventDispatcher; });
 __webpack_require__.d(__webpack_exports__, "HashMap", function() { return /* reexport */ core_HashMap; });
-__webpack_require__.d(__webpack_exports__, "MqttClient", function() { return /* reexport */ core_MqttClient; });
 __webpack_require__.d(__webpack_exports__, "WebSocketClient", function() { return /* reexport */ core_WebSocketClient; });
 __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /* reexport */ core_WebStorage; });
 
@@ -925,17 +918,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;
 };
@@ -948,28 +941,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:
@@ -979,11 +972,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}) *$/);
@@ -1012,21 +1008,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;
     },
@@ -2125,184 +2121,27 @@ var HashMap = function () {
 }();
 
 /* harmony default export */ var core_HashMap = (HashMap);
-// EXTERNAL MODULE: external "mqtt"
-var external_mqtt_ = __webpack_require__(0);
-
-// CONCATENATED MODULE: ./src/core/MqttClient.js
-var MqttClient_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 MqttClient_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-
-
-
-
-
-
-var MqttClient_MqttClient = function (_EventDispatcher) {
-    _inherits(MqttClient, _EventDispatcher);
-
-    /**
-     * Creates an instance of MqttClient.
-     * @param {*} config mqtt实例参数
-     */
-    function MqttClient() {
-        var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-        MqttClient_classCallCheck(this, MqttClient);
-
-        var _this = _possibleConstructorReturn(this, (MqttClient.__proto__ || Object.getPrototypeOf(MqttClient)).call(this));
-
-        _this.context = CommUtils.extend(MqttClient.defaultContext, config);
-        _this.options = {
-            connectTimeout: _this.context.MQTT_TIMEOUTM,
-            clientId: CommUtils.generateGuid(),
-            username: _this.context.MQTT_USERNAME,
-            password: _this.context.MQTT_PASSWORD,
-            clean: true
-        };
-        _this.client = Object(external_mqtt_["connect"])(_this.context.MQTT_SERVICE, _this.options);
-        _this._onConnect();
-        _this._onMessage();
-        MqttClient.instance = _this;
-        return _this;
-    }
-
-    MqttClient_createClass(MqttClient, [{
-        key: "_onConnect",
-        value: function _onConnect() {
-            var _this2 = this;
-
-            this.client.on("connect", function () {
-                console.log("链接mqtt成功==>" + _this2.context.MQTT_SERVICE);
-                _this2.dispatchEvent({ type: EventTypeConstant.MQTT_CONNECT, message: _this2 });
-            });
-            this.client.on("error", function (err) {
-                console.log("链接mqtt报错", err);
-                _this2.dispatchEvent({ type: EventTypeConstant.MQTT_ERROR, message: _this2 });
-                _this2.client.end();
-                _this2.client.reconnect();
-            });
-        }
-    }, {
-        key: "_onMessage",
-        value: function _onMessage() {
-            var _this3 = this;
-
-            this.client.on("message", function (topic, message) {
-                var dataString = message;
-                var data = "";
-                if (message instanceof Uint8Array) {
-                    dataString = message.toString();
-                }
-                try {
-                    data = JSON.parse(dataString);
-                } catch (error) {
-                    throw new Error(ErrorTypeConstant.JSON_PARSE_ERROR);
-                }
-                _this3.dispatchEvent({
-                    type: EventTypeConstant.MQTT_MESSAGE,
-                    message: { topic: topic, data: data }
-                });
-            });
-        }
-    }, {
-        key: "sendMsg",
-        value: function sendMsg(topic, msg) {
-            if (!this.client.connected) {
-                console.error("客户端未连接");
-                return;
-            }
-            this.client.publish(topic, msg, { qos: 1, retain: true });
-        }
-    }, {
-        key: "subscribe",
-        value: function subscribe(topic) {
-            this.client.subscribe(topic, { qos: 1 }, function (error, res) {
-                if (error instanceof Error || res.length === 0) {
-                    console.error("\u8BA2\u9605\u5931\u8D25==>" + topic, error);
-                } else {
-                    console.log("\u8BA2\u9605\u6210\u529F==>" + topic);
-                }
-            });
-            return this;
-        }
-    }, {
-        key: "unsubscribe",
-        value: function unsubscribe(topic) {
-            this.client.unsubscribe(topic, { qos: 1 }, function (error, res) {
-                if (error instanceof Error || res.length === 0) {
-                    console.error("\u53D6\u6D88\u8BA2\u9605\u5931\u8D25==>" + topic, error);
-                } else {
-                    console.log("\u53D6\u6D88\u8BA2\u9605\u6210\u529F==>" + topic);
-                }
-            });
-            return this;
-        }
-    }, {
-        key: "unconnect",
-        value: function unconnect() {
-            this.client.end();
-            this.client = null;
-            this.dispatchEvent({ type: EventTypeConstant.MQTT_CLOSE, message: null });
-            console.log("断开mqtt成功==>" + this.context.MQTT_SERVICE);
-        }
-        /**
-         * @description 获取并冻结mqtt实例
-         * @static
-         * @param {*} [config={}]
-         * @returns {MqttClient}
-         */
-
-    }], [{
-        key: "getInstance",
-        value: function getInstance() {
-            var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-            if (MqttClient.instance) {
-                return Object.freeze(MqttClient.instance);
-            } else {
-                return Object.freeze(new MqttClient(config));
-            }
-        }
-    }]);
-
-    return MqttClient;
-}(core_EventDispatcher);
-
-/* harmony default export */ var core_MqttClient = (MqttClient_MqttClient);
-
-MqttClient_MqttClient.defaultContext = {
-    MQTT_TIMEOUTM: 20000,
-    MQTT_USERNAME: "iRVMS-WEB",
-    MQTT_PASSWORD: "novasky888",
-    MQTT_SERVICE: "ws://" + window.document.domain + ":20007/mqtt"
-};
 // CONCATENATED MODULE: ./src/core/WebSocketClient.js
 var WebSocketClient_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 WebSocketClient_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function WebSocketClient_possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function WebSocketClient_inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 
 
 
 var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
-    WebSocketClient_inherits(WebSocketClient, _EventDispatcher);
+    _inherits(WebSocketClient, _EventDispatcher);
 
     function WebSocketClient() {
         var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'ws://127.0.0.1:10088';
 
         WebSocketClient_classCallCheck(this, WebSocketClient);
 
-        var _this = WebSocketClient_possibleConstructorReturn(this, (WebSocketClient.__proto__ || Object.getPrototypeOf(WebSocketClient)).call(this));
+        var _this = _possibleConstructorReturn(this, (WebSocketClient.__proto__ || Object.getPrototypeOf(WebSocketClient)).call(this));
 
         _this.maxCheckTimes = 10;
         _this.url = url;
@@ -2539,7 +2378,7 @@ var WebStorage_WebStorage = function () {
 
 
 
- // vite不支持?
+// export { default as MqttClient } from './core/MqttClient' // vite不支持?
 
 
 

package/package.json

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