eoss-ui 0.5.44 → 0.5.46

package/lib/button-group.js

@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+var getMyWinTop = function getMyWinTop(wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,

package/lib/button.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 69);
+/******/ 	return __webpack_require__(__webpack_require__.s = 70);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+var getMyWinTop = function getMyWinTop(wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,
@@ -3549,7 +3565,140 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 69:
+/***/ 7:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+
+
+
+var WebSocket = function () {
+  // 构造函数
+  function WebSocket() {
+    _classCallCheck(this, WebSocket);
+
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+  }
+
+  /** socket连接 */
+
+
+  WebSocket.prototype.connect = function connect() {
+    var _this = this;
+
+    if (!this.client) {
+      // 连接SockJS
+      var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
+      // 获取STOMP子协议的客户端对象
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      console.log(111);
+      this.client.debug = function () {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, function () {
+      _this.recon = true;
+      // tryTimes定义重置
+      _this.connects = 1;
+      // 订阅消息
+      _this.subscribe();
+    }, function (error) {
+      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
+      if (_this.connects > 5 && diffSecond < _this.interval) {
+        _this.client.disconnect();
+        _this.error && _this.error(error);
+      } else {
+        _this.reconTimeout = setTimeout(function () {
+          _this.connect();
+          _this.connects++;
+        }, 5000);
+      }
+    });
+  };
+  /** 订阅服务端 */
+
+
+  WebSocket.prototype.subscribe = function subscribe() {
+    var _this2 = this;
+
+    // 订阅服务端提供的某个topic
+    this.client.subscribe(this.take, function (response) {
+      if (response && (_this2.callback || _this2.success)) {
+        var callback = _this2.callback || _this2.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  };
+
+  /** 赋值、初始化socket */
+
+
+  WebSocket.prototype.init = function init(option, vm) {
+    for (var i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  };
+
+  /** 发送消息 */
+
+
+  WebSocket.prototype.send = function send(data) {
+    var _this3 = this;
+
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(function () {
+        _this3.send(data);
+      }, 1000);
+    }
+  };
+
+  /** 销毁 */
+
+
+  WebSocket.prototype.destroy = function destroy() {
+    // 断开连接,清除定时器
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  };
+
+  return WebSocket;
+}();
+
+/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
+
+/***/ }),
+
+/***/ 70:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3638,18 +3787,15 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           evt.preventDefault();
           var width = 0;
           var height = 0;
+          var win = void 0;
           try {
-            width = util["a" /* default */].win.top.screen.availWidth - 10;
-            height = util["a" /* default */].win.top.screen.availHeight - 60;
+            util["a" /* default */].win.top.document;
+            win = util["a" /* default */].win.top;
           } catch (error) {
-            try {
-              width = util["a" /* default */].win.parent.screen.availWidth - 10;
-              height = util["a" /* default */].win.parent.screen.availHeight - 60;
-            } catch (error) {
-              width = util["a" /* default */].win.screen.availWidth - 10;
-              height = util["a" /* default */].win.screen.availHeight - 60;
-            }
+            win = util["a" /* default */].getMyWinTop();
           }
+          width = win.screen.availWidth - 10;
+          height = win.screen.availHeight - 60;
           var flag = true;
           if (this.esForm) {
             var params = util["a" /* default */].getParams({ url: this.link });
@@ -3892,139 +4038,6 @@ main.install = function (Vue) {
 
 /***/ }),
 
-/***/ 7:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-
-
-
-var WebSocket = function () {
-  // 构造函数
-  function WebSocket() {
-    _classCallCheck(this, WebSocket);
-
-    this.host = sessionStorage.getItem('wshost') || '';
-    this.tryTimes = 1; // 重连次数
-    this.callback = null; // 回调函数
-    this.client = null; // stomp对象
-    this.reconTimeout = null; // 重连延时器
-    this.debug = true; // 调试
-    this.interval = 20; // 重连间隔时间
-    this.vm = null;
-    this.nextDate = 0;
-    this.connects = 1;
-    this.recon = false;
-    this.sendTimeout = null;
-  }
-
-  /** socket连接 */
-
-
-  WebSocket.prototype.connect = function connect() {
-    var _this = this;
-
-    if (!this.client) {
-      // 连接SockJS
-      var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
-      // 获取STOMP子协议的客户端对象
-      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
-    }
-
-    // 日志不打印
-    if (!this.debug) {
-      console.log(111);
-      this.client.debug = function () {};
-    }
-
-    // 向服务器发起websocket连接
-    this.client.connect({}, function () {
-      _this.recon = true;
-      // tryTimes定义重置
-      _this.connects = 1;
-      // 订阅消息
-      _this.subscribe();
-    }, function (error) {
-      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
-      if (_this.connects > 5 && diffSecond < _this.interval) {
-        _this.client.disconnect();
-        _this.error && _this.error(error);
-      } else {
-        _this.reconTimeout = setTimeout(function () {
-          _this.connect();
-          _this.connects++;
-        }, 5000);
-      }
-    });
-  };
-  /** 订阅服务端 */
-
-
-  WebSocket.prototype.subscribe = function subscribe() {
-    var _this2 = this;
-
-    // 订阅服务端提供的某个topic
-    this.client.subscribe(this.take, function (response) {
-      if (response && (_this2.callback || _this2.success)) {
-        var callback = _this2.callback || _this2.success;
-        callback(JSON.parse(response.body));
-      }
-    });
-  };
-
-  /** 赋值、初始化socket */
-
-
-  WebSocket.prototype.init = function init(option, vm) {
-    for (var i in option) {
-      this[i] = option[i];
-    }
-    this.vm = vm;
-    // 初始化连接
-    this.connect();
-  };
-
-  /** 发送消息 */
-
-
-  WebSocket.prototype.send = function send(data) {
-    var _this3 = this;
-
-    if (this.recon) {
-      clearTimeout(this.sendTimeout);
-      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
-    } else {
-      this.sendTimeout = setTimeout(function () {
-        _this3.send(data);
-      }, 1000);
-    }
-  };
-
-  /** 销毁 */
-
-
-  WebSocket.prototype.destroy = function destroy() {
-    // 断开连接,清除定时器
-    if (this.client) {
-      this.client.disconnect();
-    };
-    this.reconTimeout && clearTimeout(this.reconTimeout);
-    this.sendTimeout && clearTimeout(this.sendTimeout);
-  };
-
-  return WebSocket;
-}();
-
-/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
-
-/***/ }),
-
 /***/ 8:
 /***/ (function(module, exports) {