eoss-ui 0.8.4 → 0.8.5

package/src/utils/http.js

@@ -1,50 +1,50 @@
-// 封装请求参数
-import util from './util.js';
-
-// function request({
-//   method = 'get',
-//   url,
-//   data = {},
-//   params = {},
-//   headers = {},
-//   format = true,
-//   mix = true
-// }) {
-//   if (
-//     method.toLowerCase() === 'post' &&
-//     !Object.prototype.hasOwnProperty.call(data, 'userId') &&
-//     util.getStorage('userId')
-//   ) {
-//     data.userId = util.getStorage('userId');
-//   }
-//   if (
-//     (method === 'get' || method === 'GET') &&
-//     !Object.prototype.hasOwnProperty.call(params, 'userId') &&
-//     util.getStorage('userId')
-//   ) {
-//     params.userId = util.getStorage('userId');
-//   }
-//   if (format && (method === 'post' || method === 'POST')) {
-//     data = qs.stringify(data);
-//     headers['content-type'] = 'application/x-www-form-urlencoded';
-//   }
-//   if (!mix && (method === 'get' || method === 'GET')) {
-//     data = {};
-//   }
-//   if (!mix && (method === 'post' || method === 'POST')) {
-//     params = {};
-//   }
-//   return http({
-//     method,
-//     url,
-//     data,
-//     params,
-//     headers
-//   });
-// }
-
-function request(params) {
-  return util.ajax({mix: true, ...params});
-}
-
-export default request;
+// 封装请求参数
+import util from './util.js';
+
+// function request({
+//   method = 'get',
+//   url,
+//   data = {},
+//   params = {},
+//   headers = {},
+//   format = true,
+//   mix = true
+// }) {
+//   if (
+//     method.toLowerCase() === 'post' &&
+//     !Object.prototype.hasOwnProperty.call(data, 'userId') &&
+//     util.getStorage('userId')
+//   ) {
+//     data.userId = util.getStorage('userId');
+//   }
+//   if (
+//     (method === 'get' || method === 'GET') &&
+//     !Object.prototype.hasOwnProperty.call(params, 'userId') &&
+//     util.getStorage('userId')
+//   ) {
+//     params.userId = util.getStorage('userId');
+//   }
+//   if (format && (method === 'post' || method === 'POST')) {
+//     data = qs.stringify(data);
+//     headers['content-type'] = 'application/x-www-form-urlencoded';
+//   }
+//   if (!mix && (method === 'get' || method === 'GET')) {
+//     data = {};
+//   }
+//   if (!mix && (method === 'post' || method === 'POST')) {
+//     params = {};
+//   }
+//   return http({
+//     method,
+//     url,
+//     data,
+//     params,
+//     headers
+//   });
+// }
+
+function request(params) {
+  return util.ajax({mix: true, ...params});
+}
+
+export default request;

package/src/utils/store.js

@@ -1,21 +1,21 @@
-let store = {
-  state: {},
-  set(name, value) {
-    this.state[name] = value;
-  },
-  get(name) {
-    return this.state[name];
-  },
-  clear(name) {
-    this.state[name] = null;
-  },
-  remove(name) {
-    if (name) {
-      delete this.state[name];
-    } else {
-      this.state = {};
-    }
-  }
-};
-window.__store = store;
-export default store;
+let store = {
+  state: {},
+  set(name, value) {
+    this.state[name] = value;
+  },
+  get(name) {
+    return this.state[name];
+  },
+  clear(name) {
+    this.state[name] = null;
+  },
+  remove(name) {
+    if (name) {
+      delete this.state[name];
+    } else {
+      this.state = {};
+    }
+  }
+};
+window.__store = store;
+export default store;

package/src/utils/util.js

@@ -16,6 +16,7 @@ import WebSocket from './webSocket';
 import { UAParser } from 'ua-parser-js';
 
 const win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
+const winTop = getWinTop();
 const isIE = /MSIE|Trident/.test(navigator.userAgent);
 const parser = new UAParser();
 const $hueStep = 2;
@@ -590,8 +591,8 @@ const busEmit = function (that, { method, args, opener }) {
     return;
   }
   if (isIE) {
-    if (win.top !== win.self) {
-      win.top.postMessage({ method, query: args, args }, '*');
+    if (winTop !== win.self) {
+      winTop.postMessage({ method, query: args, args }, '*');
       return;
     }
     const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
@@ -600,14 +601,14 @@ const busEmit = function (that, { method, args, opener }) {
         ? bus.$emit(method, ...args)
         : bus.$emit(method, args));
   } else {
-    if (win.top !== win.self) {
+    if (winTop !== win.self) {
       const bus = win.$wujie ? win.$wujie.bus : null;
       if (bus) {
         Array.isArray(args)
           ? bus.$emit(method, ...args)
           : bus.$emit(method, args);
       } else {
-        win.top.postMessage({ method, query: args, args }, '*');
+        winTop.postMessage({ method, query: args, args }, '*');
       }
       return;
     }
@@ -869,7 +870,7 @@ const debounce = function (callback, wait) {
 const delUrlParam = function ({ url, key }) {
   let pUrl = '';
   try {
-    pUrl = win.top.location.href;
+    pUrl = winTop.location.href;
   } catch (error) {
     pUrl = win.location.href;
   }
@@ -2359,7 +2360,7 @@ const isLogined = async function ({
   }
   let pathname = '';
   try {
-    pathname = win.top.location.pathname;
+    pathname = winTop.location.pathname;
   } catch (error) {
     pathname = win.location.pathname;
   }
@@ -2415,12 +2416,12 @@ const isLogined = async function ({
                 });
                 try {
                   let 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(() => {
-                    win.top.location.reload();
+                    winTop.location.reload();
                   }, 200);
                 } catch (error) {
                   let url = delUrlParam({
@@ -2441,9 +2442,9 @@ const isLogined = async function ({
                 try {
                   const href = results.authorizeUrl.replace(
                     '{redirectUri}',
-                    encodeURIComponent(win.top.location.href)
+                    encodeURIComponent(winTop.location.href)
                   );
-                  win.top.location.href = href;
+                  winTop.location.href = href;
                 } catch (error) {
                   const href = results.authorizeUrl.replace(
                     '{redirectUri}',
@@ -2468,25 +2469,25 @@ const isLogined = async function ({
                       );
                       try {
                         if (loginPage) {
-                          win.top.location.replace(loginPage);
+                          winTop.location.replace(loginPage);
                         } else if (document.referrer) {
                           const referrerUrl = new URL(document.referrer);
-                          if (referrerUrl.host !== win.top.location.host) {
-                            win.top.location.replace(document.referrer);
+                          if (referrerUrl.host !== winTop.location.host) {
+                            winTop.location.replace(document.referrer);
                           } else if (
-                            win.top.location.href.indexOf('main.html') > -1 ||
-                            win.top.location.href.indexOf('index.html') > -1 ||
+                            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
                           ) {
-                            win.top.location.href = './login.html';
+                            winTop.location.href = './login.html';
                           } else {
                             next('/login');
                           }
                         } else if (
-                          win.top.location.href.indexOf('main.html') > -1
+                          winTop.location.href.indexOf('main.html') > -1
                         ) {
-                          win.top.location.href = './login.html';
+                          winTop.location.href = './login.html';
                         } else {
                           next('/login');
                         }
@@ -2506,23 +2507,23 @@ const isLogined = async function ({
               callback: () => {
                 try {
                   if (loginPage) {
-                    win.top.location.replace(loginPage);
+                    winTop.location.replace(loginPage);
                   } else if (document.referrer) {
                     const referrerUrl = new URL(document.referrer);
-                    if (referrerUrl.host !== win.top.location.host) {
-                      win.top.location.replace(document.referrer);
+                    if (referrerUrl.host !== winTop.location.host) {
+                      winTop.location.replace(document.referrer);
                     } else if (
-                      win.top.location.href.indexOf('main.html') > -1 ||
-                      win.top.location.href.indexOf('index.html') > -1 ||
+                      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
                     ) {
-                      win.top.location.href = './login.html';
+                      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');
                   }
@@ -2558,23 +2559,23 @@ const isLogined = async function ({
     } else {
       try {
         if (loginPage) {
-          win.top.location.replace(loginPage);
+          winTop.location.replace(loginPage);
         } else if (document.referrer) {
           const referrerUrl = new URL(document.referrer);
-          if (referrerUrl.host !== win.top.location.host) {
-            win.top.location.replace(document.referrer);
+          if (referrerUrl.host !== winTop.location.host) {
+            winTop.location.replace(document.referrer);
           } else if (
-            win.top.location.href.indexOf('main.html') > -1 ||
-            win.top.location.href.indexOf('index.html') > -1 ||
+            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
           ) {
-            win.top.location.href = './login.html';
+            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');
         }
@@ -2694,7 +2695,7 @@ const loading = function ($loading, res) {
     const config = extend(
       {},
       {
-        target: win.top.document.body,
+        target: winTop.document.body,
         fullscreen: true,
         background: 'rgba(0, 0, 0, 0.65)',
         spinner: 'el-icon-loading',
@@ -2705,7 +2706,7 @@ const loading = function ($loading, res) {
     return $loading(config);
   } else {
     let loading = $loading({
-      target: win.top.document.body,
+      target: winTop.document.body,
       fullscreen: true,
       background: 'rgba(0, 0, 0, 0.65)',
       spinner: 'el-icon-loading',
@@ -2860,7 +2861,7 @@ const responses = function (data) {
     ]);
     let href = '';
     try {
-      href = win.top.location.href;
+      href = winTop.location.href;
     } catch (error) {
       href = win.location.href;
     }
@@ -2895,7 +2896,7 @@ const responses = function (data) {
                 if (loginPage) {
                   let src;
                   if (!startWith(loginPage, ['http', '/'], true)) {
-                    let pathname = win.top.location.pathname;
+                    let pathname = winTop.location.pathname;
                     if (pathname !== '/') {
                       pathname = pathname.split('/');
                       pathname.splice(pathname.length - 1);
@@ -2907,17 +2908,17 @@ const responses = function (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 {
-                  const hash = win.top.location.hash;
+                  const hash = winTop.location.hash;
                   if (hash) {
-                    const len = win.top.location.href.indexOf(hash);
-                    win.top.location.href =
+                    const 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) {
@@ -3797,9 +3798,9 @@ const removeCookie = function (key) {
 
 const winTopOpen = function (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/src/utils/webSocket.js

@@ -1,107 +1,107 @@
-import SockJS from 'sockjs-client';
-import Stomp from 'stompjs';
-class WebSocket {
-  // 构造函数
-  constructor() {
-    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;
-    this.socket = null;
-    this.subscription = null;
-  }
-
-  /** socket连接 */
-  connect() {
-    if (!this.client) {
-    // 连接SockJS
-      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
-      this.client = Stomp.over(this.socket);
-    }
-
-    // 日志不打印
-    if (!this.debug) {
-      this.client.debug = () => {};
-    }
-
-    // 向服务器发起websocket连接
-    this.client.connect({}, () => {
-      this.recon = true;
-      // tryTimes定义重置
-      this.connects = 1;
-      // 订阅消息
-      this.subscribe();
-    }, (error) => {
-      this.unsubscribe();
-      this.client = null;
-      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
-      if (this.connects > 5 && diffSecond < this.interval) {
-        this.error && this.error(error);
-      } else {
-        this.reconTimeout = setTimeout(() => {
-          this.connect();
-          this.connects++;
-        }, 5000);
-      }
-    });
-  }// 清除订阅
-  unsubscribe() {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-      this.subscription = null;
-    }
-  }
-  /** 订阅服务端 */
-  subscribe() {
-    // 订阅服务端提供的某个topic
-    this.subscription = this.client.subscribe(this.take, (response) => {
-      if (response && (this.callback || this.success)) {
-        let callback = this.callback || this.success;
-        callback(JSON.parse(response.body));
-      }
-    });
-  }
-
-  /** 赋值、初始化socket */
-  init(option, vm) {
-    for (let i in option) {
-      this[i] = option[i];
-    }
-    this.vm = vm;
-    // 初始化连接
-    this.connect();
-  }
-
-  /** 发送消息 */
-  send(data) {
-    if (this.recon) {
-      clearTimeout(this.sendTimeout);
-      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
-    } else {
-      this.sendTimeout = setTimeout(() => {
-        this.send(data);
-      }, 1000);
-    }
-  }
-
-  /** 销毁 */
-  destroy() {
-    // 断开连接,清除定时器
-    this.unsubscribe();
-    if (this.client) {
-      this.client.disconnect();
-    };
-    this.reconTimeout && clearTimeout(this.reconTimeout);
-    this.sendTimeout && clearTimeout(this.sendTimeout);
-  }
-}
-
-export default WebSocket;
+import SockJS from 'sockjs-client';
+import Stomp from 'stompjs';
+class WebSocket {
+  // 构造函数
+  constructor() {
+    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;
+    this.socket = null;
+    this.subscription = null;
+  }
+
+  /** socket连接 */
+  connect() {
+    if (!this.client) {
+    // 连接SockJS
+      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
+      this.client = Stomp.over(this.socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      this.client.debug = () => {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, () => {
+      this.recon = true;
+      // tryTimes定义重置
+      this.connects = 1;
+      // 订阅消息
+      this.subscribe();
+    }, (error) => {
+      this.unsubscribe();
+      this.client = null;
+      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
+      if (this.connects > 5 && diffSecond < this.interval) {
+        this.error && this.error(error);
+      } else {
+        this.reconTimeout = setTimeout(() => {
+          this.connect();
+          this.connects++;
+        }, 5000);
+      }
+    });
+  }// 清除订阅
+  unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
+  }
+  /** 订阅服务端 */
+  subscribe() {
+    // 订阅服务端提供的某个topic
+    this.subscription = this.client.subscribe(this.take, (response) => {
+      if (response && (this.callback || this.success)) {
+        let callback = this.callback || this.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  }
+
+  /** 赋值、初始化socket */
+  init(option, vm) {
+    for (let i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  }
+
+  /** 发送消息 */
+  send(data) {
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(() => {
+        this.send(data);
+      }, 1000);
+    }
+  }
+
+  /** 销毁 */
+  destroy() {
+    // 断开连接,清除定时器
+    this.unsubscribe();
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  }
+}
+
+export default WebSocket;