eoss-ui 0.8.4 → 0.8.6

package/lib/calogin.js

@@ -825,6 +825,7 @@ var busEmit = function busEmit(that, _ref3) {
       args = _ref3.args,
       opener = _ref3.opener;
 
+  var winTop = getWinTop();
   if (opener) {
     var source = opener.source,
         origin = opener.origin;
@@ -833,19 +834,19 @@ var busEmit = function busEmit(that, _ref3) {
     return;
   }
   if (isIE) {
-    if (win.top !== win.self) {
-      win.top.postMessage({ method: method, query: args, args: args }, '*');
+    if (winTop !== win.self) {
+      winTop.postMessage({ method: method, query: args, args: args }, '*');
       return;
     }
     var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
     bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    if (win.top !== win.self) {
+    if (winTop !== win.self) {
       var _bus2 = win.$wujie ? win.$wujie.bus : null;
       if (_bus2) {
         Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
       } else {
-        win.top.postMessage({ method: method, query: args, args: args }, '*');
+        winTop.postMessage({ method: method, query: args, args: args }, '*');
       }
       return;
     }
@@ -1081,9 +1082,10 @@ var delUrlParam = function delUrlParam(_ref4) {
   var url = _ref4.url,
       key = _ref4.key;
 
+  var winTop = getWinTop();
   var pUrl = '';
   try {
-    pUrl = win.top.location.href;
+    pUrl = winTop.location.href;
   } catch (error) {
     pUrl = win.location.href;
   }
@@ -2511,18 +2513,20 @@ var isLogined = function () {
         cookie = _ref11.cookie,
         loginPage = _ref11.loginPage,
         redirect = _ref11.redirect;
-    var quit, pathname, path, token, loadingInstance, referrerUrl;
+    var winTop, quit, pathname, path, token, loadingInstance, referrerUrl;
     return regenerator_default.a.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            winTop = getWinTop();
+
             if (cookie === undefined) {
               cookie = getParams({ name: 'cookie' });
             }
             quit = getParams('quit') || getParams('logout');
 
             if (!quit) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
 
@@ -2533,11 +2537,11 @@ var isLogined = function () {
             }).catch(function () {});
             return _context.abrupt('return');
 
-          case 5:
+          case 6:
             pathname = '';
 
             try {
-              pathname = win.top.location.pathname;
+              pathname = winTop.location.pathname;
             } catch (error) {
               pathname = win.location.pathname;
             }
@@ -2563,17 +2567,17 @@ var isLogined = function () {
             // eslint-disable-next-line eqeqeq
 
             if (!(token || cookie == true || cookie == 1)) {
-              _context.next = 13;
+              _context.next = 14;
               break;
             }
 
             next && next();
-            _context.next = 20;
+            _context.next = 21;
             break;
 
-          case 13:
+          case 14:
             if (!(!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType'))) {
-              _context.next = 19;
+              _context.next = 20;
               break;
             }
 
@@ -2582,7 +2586,7 @@ var isLogined = function () {
               spinner: 'el-icon-loading',
               background: 'rgba(0, 0, 0, 0.65)'
             });
-            _context.next = 17;
+            _context.next = 18;
             return util_ajax({
               method: 'post',
               url: api["b" /* authCenter */],
@@ -2603,12 +2607,12 @@ var isLogined = function () {
                     });
                     try {
                       var url = delUrlParam({
-                        url: win.top.location.href,
+                        url: winTop.location.href,
                         key: ['serverId', 'authType', 'code', 'sessionId']
                       });
-                      win.top.location.href = url;
+                      winTop.location.href = url;
                       setTimeout(function () {
-                        win.top.location.reload();
+                        winTop.location.reload();
                       }, 200);
                     } catch (error) {
                       var _url2 = delUrlParam({
@@ -2627,8 +2631,8 @@ var isLogined = function () {
                     break;
                   case 3:
                     try {
-                      var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
-                      win.top.location.href = href;
+                      var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(winTop.location.href));
+                      winTop.location.href = href;
                     } catch (error) {
                       var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
                       win.location.href = _href;
@@ -2642,18 +2646,18 @@ var isLogined = function () {
                         sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
                         try {
                           if (loginPage) {
-                            win.top.location.replace(loginPage);
+                            winTop.location.replace(loginPage);
                           } else if (document.referrer) {
                             var referrerUrl = new URL(document.referrer);
-                            if (referrerUrl.host !== win.top.location.host) {
-                              win.top.location.replace(document.referrer);
-                            } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
-                              win.top.location.href = './login.html';
+                            if (referrerUrl.host !== winTop.location.host) {
+                              winTop.location.replace(document.referrer);
+                            } else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
+                              winTop.location.href = './login.html';
                             } else {
                               next('/login');
                             }
-                          } else if (win.top.location.href.indexOf('main.html') > -1) {
-                            win.top.location.href = './login.html';
+                          } else if (winTop.location.href.indexOf('main.html') > -1) {
+                            winTop.location.href = './login.html';
                           } else {
                             next('/login');
                           }
@@ -2672,18 +2676,18 @@ var isLogined = function () {
                   callback: function callback() {
                     try {
                       if (loginPage) {
-                        win.top.location.replace(loginPage);
+                        winTop.location.replace(loginPage);
                       } else if (document.referrer) {
                         var referrerUrl = new URL(document.referrer);
-                        if (referrerUrl.host !== win.top.location.host) {
-                          win.top.location.replace(document.referrer);
-                        } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
-                          win.top.location.href = './login.html';
+                        if (referrerUrl.host !== winTop.location.host) {
+                          winTop.location.replace(document.referrer);
+                        } else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
+                          winTop.location.href = './login.html';
                         } else {
                           next('/login');
                         }
-                      } else if (win.top.location.href.indexOf('main.html') > -1) {
-                        win.top.location.href = './login.html';
+                      } else if (winTop.location.href.indexOf('main.html') > -1) {
+                        winTop.location.href = './login.html';
                       } else {
                         next('/login');
                       }
@@ -2698,11 +2702,11 @@ var isLogined = function () {
               loadingInstance.close();
             });
 
-          case 17:
-            _context.next = 20;
+          case 18:
+            _context.next = 21;
             break;
 
-          case 19:
+          case 20:
             if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
               if (redirect && (to.path === '/main' || to.path === '/login')) {
                 window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
@@ -2712,19 +2716,19 @@ var isLogined = function () {
             } else {
               try {
                 if (loginPage) {
-                  win.top.location.replace(loginPage);
+                  winTop.location.replace(loginPage);
                 } else if (document.referrer) {
                   referrerUrl = new URL(document.referrer);
 
-                  if (referrerUrl.host !== win.top.location.host) {
-                    win.top.location.replace(document.referrer);
-                  } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
-                    win.top.location.href = './login.html';
+                  if (referrerUrl.host !== winTop.location.host) {
+                    winTop.location.replace(document.referrer);
+                  } else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
+                    winTop.location.href = './login.html';
                   } else {
                     next('/login');
                   }
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
+                } else if (winTop.location.href.indexOf('main.html') > -1) {
+                  winTop.location.href = './login.html';
                 } else {
                   next('/login');
                 }
@@ -2733,7 +2737,7 @@ var isLogined = function () {
               }
             }
 
-          case 20:
+          case 21:
           case 'end':
             return _context.stop();
         }
@@ -2851,12 +2855,13 @@ var loadJs = function loadJs(_ref13) {
  * @param {String} [text] - 显示的文本内容
  **/
 var util_loading = function loading($loading, res) {
+  var winTop = getWinTop();
   if (!$loading) {
     $loading = external_eoss_element_["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
-      target: win.top.document.body,
+      target: winTop.document.body,
       fullscreen: true,
       background: 'rgba(0, 0, 0, 0.65)',
       spinner: 'el-icon-loading',
@@ -2865,7 +2870,7 @@ var util_loading = function loading($loading, res) {
     return $loading(config);
   } else {
     var _loading = $loading({
-      target: win.top.document.body,
+      target: winTop.document.body,
       fullscreen: true,
       background: 'rgba(0, 0, 0, 0.65)',
       spinner: 'el-icon-loading',
@@ -3007,11 +3012,12 @@ var replenish = function replenish(_ref15) {
  * @param {object} [data] - 数字或字符串型数字
  **/
 var util_responses = function responses(data) {
+  var winTop = getWinTop();
   if (data.rCode === 64 || data.rCode === 65 || data.rCode === 67 || data.rCode === 69) {
     removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
     var href = '';
     try {
-      href = win.top.location.href;
+      href = winTop.location.href;
     } catch (error) {
       href = win.location.href;
     }
@@ -3036,7 +3042,7 @@ var util_responses = function responses(data) {
               if (loginPage) {
                 var src = void 0;
                 if (!startWith(loginPage, ['http', '/'], true)) {
-                  var pathname = win.top.location.pathname;
+                  var pathname = winTop.location.pathname;
                   if (pathname !== '/') {
                     pathname = pathname.split('/');
                     pathname.splice(pathname.length - 1);
@@ -3048,16 +3054,16 @@ var util_responses = function responses(data) {
                 } else {
                   src = loginPage;
                 }
-                win.top.location.href = src;
-              } else if (win.top.location.href.indexOf('main.html') > -1) {
-                win.top.location.href = './login.html';
+                winTop.location.href = src;
+              } else if (winTop.location.href.indexOf('main.html') > -1) {
+                winTop.location.href = './login.html';
               } else {
-                var hash = win.top.location.hash;
+                var hash = winTop.location.hash;
                 if (hash) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  var len = winTop.location.href.indexOf(hash);
+                  winTop.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
-                  win.top.location.href = '/login.html';
+                  winTop.location.href = '/login.html';
                 }
               }
             } catch (error) {
@@ -3875,10 +3881,11 @@ var removeCookie = function removeCookie(key) {
 };
 
 var winTopOpen = function winTopOpen(config) {
+  var winTop = getWinTop();
   if (isIE) {
-    if (win.top !== win.self) {
+    if (winTop !== win.self) {
       try {
-        win.top.windowOpen(config);
+        winTop.windowOpen(config);
       } catch (error) {
         win.postMessage({ method: 'windowOpen', query: config }, '*');
       }
@@ -4673,15 +4680,23 @@ render._withStripped = true
 // EXTERNAL MODULE: ./src/utils/util.js + 1 modules
 var util = __webpack_require__(0);
 
+// EXTERNAL MODULE: external "babel-runtime/regenerator"
+var regenerator_ = __webpack_require__(4);
+var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
+
 // CONCATENATED MODULE: ./packages/calogin/src/plugin.js
+
+
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 /**
  * JIT_GW_ExtInterface 模块，提供与客户端交互的功能
  */
-var CA_ExtInterface = function () {
+var plugin_CA_ExtInterface = function () {
   function CA_ExtInterface() {
     _classCallCheck(this, CA_ExtInterface);
 
@@ -4747,11 +4762,34 @@ var CA_ExtInterface = function () {
      */
 
 
-  CA_ExtInterface.prototype.sendAndWaitMessageEx = function sendAndWaitMessageEx(operatorCmd, sendMsg) {
-    this.checkSessionWSURL();
-    var strSendMsg = operatorCmd + ':' + sendMsg;
-    return this.sendAndWaitMessage(this.currentSessionWSURL, strSendMsg);
-  };
+  CA_ExtInterface.prototype.sendAndWaitMessageEx = function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(operatorCmd, sendMsg) {
+      var strSendMsg;
+      return regenerator_default.a.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return this.checkSessionWSURL();
+
+            case 2:
+              strSendMsg = operatorCmd + ':' + sendMsg;
+              return _context.abrupt('return', this.sendAndWaitMessage(this.currentSessionWSURL, strSendMsg));
+
+            case 4:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    function sendAndWaitMessageEx(_x, _x2) {
+      return _ref.apply(this, arguments);
+    }
+
+    return sendAndWaitMessageEx;
+  }();
 
   /**
      * 发送消息并等待响应
@@ -4772,13 +4810,13 @@ var CA_ExtInterface = function () {
       globalXmlHttpRequest.setRequestHeader('Content-Type', 'text/plain;charset=UTF-8');
       globalXmlHttpRequest.send(sendMsg);
       ResultMsg = globalXmlHttpRequest.responseText;
+      return ResultMsg;
     } catch (e) {
       this.currentSessionWSURL = '';
       if (this.options.onError) {
         this.options.onError.call(undefined, e);
       }
     }
-    return ResultMsg;
   };
 
   /**
@@ -5541,12 +5579,12 @@ var CA_ExtInterface = function () {
    */
 
 
-  CA_ExtInterface.prototype.getMessage = function getMessage(_ref) {
+  CA_ExtInterface.prototype.getMessage = function getMessage(_ref2) {
     var _this = this;
 
-    var action = _ref.action,
-        _ref$params = _ref.params,
-        params = _ref$params === undefined ? [] : _ref$params;
+    var action = _ref2.action,
+        _ref2$params = _ref2.params,
+        params = _ref2$params === undefined ? [] : _ref2$params;
 
     return new Promise(function (resolve, reject) {
       var obj = JSON.stringify({
@@ -5708,7 +5746,7 @@ var CA_ExtInterface = function () {
   return CA_ExtInterface;
 }();
 
-var caPlugin = new CA_ExtInterface();
+var caPlugin = new plugin_CA_ExtInterface();
 /* harmony default export */ var src_plugin = (caPlugin);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/calogin/src/main.vue?vue&type=script&lang=js&
 //