eoss-ui 0.8.3 → 0.8.5

package/lib/wxlogin.js

@@ -287,6 +287,7 @@ var lodash = __webpack_require__(12);
 
 
 var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
+var winTop = getWinTop();
 var isIE = /MSIE|Trident/.test(navigator.userAgent);
 var parser = new external_ua_parser_js_["UAParser"]();
 var $hueStep = 2;
@@ -834,19 +835,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;
     }
@@ -1084,7 +1085,7 @@ var delUrlParam = function delUrlParam(_ref4) {
 
   var pUrl = '';
   try {
-    pUrl = win.top.location.href;
+    pUrl = winTop.location.href;
   } catch (error) {
     pUrl = win.location.href;
   }
@@ -2538,7 +2539,7 @@ var isLogined = function () {
             pathname = '';
 
             try {
-              pathname = win.top.location.pathname;
+              pathname = winTop.location.pathname;
             } catch (error) {
               pathname = win.location.pathname;
             }
@@ -2604,12 +2605,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({
@@ -2628,8 +2629,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;
@@ -2643,18 +2644,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');
                           }
@@ -2673,18 +2674,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');
                       }
@@ -2713,19 +2714,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');
                 }
@@ -2857,7 +2858,7 @@ var util_loading = function loading($loading, res) {
   }
   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',
@@ -2866,7 +2867,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',
@@ -3012,7 +3013,7 @@ var util_responses = function responses(data) {
     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;
     }
@@ -3037,7 +3038,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);
@@ -3049,16 +3050,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) {
@@ -3877,9 +3878,9 @@ var removeCookie = function removeCookie(key) {
 
 var winTopOpen = function winTopOpen(config) {
   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 }, '*');
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/calogin/src/plugin.js

@@ -57,8 +57,8 @@ class CA_ExtInterface {
      * @param {string} sendMsg - 发送的消息
      * @returns {string} 响应消息
      */
-  sendAndWaitMessageEx(operatorCmd, sendMsg) {
-    this.checkSessionWSURL();
+  async sendAndWaitMessageEx(operatorCmd, sendMsg) {
+    await this.checkSessionWSURL();
     const strSendMsg = operatorCmd + ':' + sendMsg;
     return this.sendAndWaitMessage(this.currentSessionWSURL, strSendMsg);
   }
@@ -80,13 +80,13 @@ class CA_ExtInterface {
       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;
   }
 
   /**

package/packages/data-table/src/main.vue

@@ -264,6 +264,7 @@ export default {
       default: false
     },
     readonly: Boolean,
+    allowToolbar: Boolean,
     url: {
       type: String,
       default: ''
@@ -691,31 +692,59 @@ export default {
     },
     showToolbar() {
       if (this.readonly) {
-        return false;
-      }
-      if (typeof this.toolbar === 'boolean') {
-        if (this.toolbar) {
-          this.toolbars = [
-            {
-              type: 'search',
-              contents: [
+        if (this.allowToolbar) {
+          if (typeof this.toolbar === 'boolean') {
+            if (this.toolbar) {
+              this.toolbars = [
                 {
-                  type: 'text',
-                  name: 'keyword',
-                  placeholder: '请输入关键字'
+                  type: 'search',
+                  contents: [
+                    {
+                      type: 'text',
+                      name: 'keyword',
+                      placeholder: '请输入关键字'
+                    }
+                  ]
                 }
-              ]
+              ];
             }
-          ];
+            return this.toolbar;
+          } else if (Array.isArray(this.toolbar)) {
+            this.toolbars = this.toolbar;
+            return true;
+          } else {
+            this.toolbars = this.toolbar.contents;
+            this.toolbarEvents = this.toolbar.events || {};
+            return true;
+          }
+        } else {
+          return false;
         }
-        return this.toolbar;
-      } else if (Array.isArray(this.toolbar)) {
-        this.toolbars = this.toolbar;
-        return true;
       } else {
-        this.toolbars = this.toolbar.contents;
-        this.toolbarEvents = this.toolbar.events || {};
-        return true;
+        if (typeof this.toolbar === 'boolean') {
+          if (this.toolbar) {
+            this.toolbars = [
+              {
+                type: 'search',
+                contents: [
+                  {
+                    type: 'text',
+                    name: 'keyword',
+                    placeholder: '请输入关键字'
+                  }
+                ]
+              }
+            ];
+          }
+          return this.toolbar;
+        } else if (Array.isArray(this.toolbar)) {
+          this.toolbars = this.toolbar;
+          return true;
+        } else {
+          this.toolbars = this.toolbar.contents;
+          this.toolbarEvents = this.toolbar.events || {};
+          return true;
+        }
       }
     },
     optionDatas: {