eoss-ui 0.5.43 → 0.5.45

package/lib/utils/util.js

@@ -175,7 +175,13 @@ var ajax = function ajax(_ref) {
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+        var href = '';
+        try {
+          href = win.top.location.href;
+        } catch (error) {
+          href = win.location.href;
+        }
+        if (href.indexOf('#/login') === -1 && href.indexOf('/login.html') === -1) {
           var remind = sessionStorage.getItem('remind');
           if (!remind) {
             clearTimeout(loginMsg);
@@ -191,33 +197,37 @@ var ajax = function ajax(_ref) {
                 closeOnClickModal: false,
                 type: 'warning'
               }).then(function () {
-                var loginPage = getStorage('login') || getStorage('loginPage');
-                if (loginPage) {
-                  var src = void 0;
-                  if (!startWith(loginPage, ['http', '/'], true)) {
-                    var pathname = win.top.location.pathname;
-                    if (pathname !== '/') {
-                      pathname = pathname.split('/');
-                      pathname.splice(pathname.length - 1);
-                      pathname = pathname.join('/');
-                      src = pathname + '/' + loginPage.replace('./', '');
+                try {
+                  var loginPage = getStorage('login') || getStorage('loginPage');
+                  if (loginPage) {
+                    var src = void 0;
+                    if (!startWith(loginPage, ['http', '/'], true)) {
+                      var pathname = win.top.location.pathname;
+                      if (pathname !== '/') {
+                        pathname = pathname.split('/');
+                        pathname.splice(pathname.length - 1);
+                        pathname = pathname.join('/');
+                        src = pathname + '/' + loginPage.replace('./', '');
+                      } else {
+                        src = pathname + loginPage.replace('./', '');
+                      }
                     } else {
-                      src = pathname + loginPage.replace('./', '');
+                      src = loginPage;
                     }
+                    win.top.location.href = src;
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
                   } else {
-                    src = loginPage;
-                  }
-                  win.top.location.href = src;
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  var hash = win.top.location.hash;
-                  if (hash) {
-                    var len = win.top.location.href.indexOf(hash);
-                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                  } else {
-                    win.top.location.href = '/login.html';
+                    var hash = win.top.location.hash;
+                    if (hash) {
+                      var len = win.top.location.href.indexOf(hash);
+                      win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                    } else {
+                      win.top.location.href = '/login.html';
+                    }
                   }
+                } catch (error) {
+                  win.postMessage({ type: 1 }, '*');
                 }
               }).catch(function (e) {
                 sessionStorage.removeItem('remind');
@@ -655,7 +665,13 @@ var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
       key = _ref2.key;
 
-  var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
+  var pUrl = '';
+  try {
+    pUrl = win.top.location.href;
+  } catch (error) {
+    pUrl = win.location.href;
+  }
+  var src = url ? decodeURI(url) : decodeURI(pUrl);
   var param = getParams({ url: src });
   if (param && key.length) {
     if (Array.isArray(key)) {
@@ -1151,6 +1167,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 当年第几周
@@ -1905,7 +1936,12 @@ var isLogined = function isLogined(_ref8) {
     }).catch(function () {});
     return;
   }
-  var pathname = win.top.location.pathname;
+  var pathname = '';
+  try {
+    pathname = win.top.location.pathname;
+  } catch (error) {
+    pathname = win.location.pathname;
+  }
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
@@ -1946,22 +1982,38 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              var url = delUrlParam({
-                url: win.top.location.href,
-                key: ['serverId', 'authType', 'code', 'sessionId']
-              });
-              win.top.location.href = url;
-              setTimeout(function () {
-                win.top.location.reload();
-              }, 200);
+              try {
+                var url = delUrlParam({
+                  url: win.top.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.top.location.href = url;
+                setTimeout(function () {
+                  win.top.location.reload();
+                }, 200);
+              } catch (error) {
+                var _url2 = delUrlParam({
+                  url: win.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.location.href = _url2;
+                setTimeout(function () {
+                  win.location.reload();
+                }, 200);
+              }
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
-              win.top.location.href = href;
+              try {
+                var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+                win.top.location.href = href;
+              } catch (error) {
+                var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
+                win.location.href = _href;
+              }
               break;
             case 4:
               _eossElement.MessageBox.alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
@@ -1969,14 +2021,18 @@ var isLogined = function isLogined(_ref8) {
                 type: 'error',
                 callback: function callback() {
                   sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                  if (loginPage) {
-                    win.top.location.replace(loginPage);
-                  } else if (document.referrer) {
-                    win.top.location.replace(document.referrer);
-                  } else if (win.top.location.href.indexOf('main.html') > -1) {
-                    win.top.location.href = './login.html';
-                  } else {
-                    next('/login');
+                  try {
+                    if (loginPage) {
+                      win.top.location.replace(loginPage);
+                    } else if (document.referrer) {
+                      win.top.location.replace(document.referrer);
+                    } else if (win.top.location.href.indexOf('main.html') > -1) {
+                      win.top.location.href = './login.html';
+                    } else {
+                      next('/login');
+                    }
+                  } catch (error) {
+                    win.postMessage({ type: 1 }, '*');
                   }
                 }
               });
@@ -1988,14 +2044,18 @@ var isLogined = function isLogined(_ref8) {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
-              if (loginPage) {
-                win.top.location.replace(loginPage);
-              } else if (document.referrer) {
-                win.top.location.replace(document.referrer);
-              } else if (win.top.location.href.indexOf('main.html') > -1) {
-                win.top.location.href = './login.html';
-              } else {
-                next('/login');
+              try {
+                if (loginPage) {
+                  win.top.location.replace(loginPage);
+                } else if (document.referrer) {
+                  win.top.location.replace(document.referrer);
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
+                } else {
+                  next('/login');
+                }
+              } catch (error) {
+                win.postMessage({ type: 1 }, '*');
               }
             }
           });
@@ -2008,14 +2068,18 @@ var isLogined = function isLogined(_ref8) {
         next();
       }
     } else {
-      if (loginPage) {
-        win.top.location.replace(loginPage);
-      } else if (document.referrer) {
-        win.top.location.replace(document.referrer);
-      } else if (win.top.location.href.indexOf('main.html') > -1) {
-        win.top.location.href = './login.html';
-      } else {
-        next('/login');
+      try {
+        if (loginPage) {
+          win.top.location.replace(loginPage);
+        } else if (document.referrer) {
+          win.top.location.replace(document.referrer);
+        } else if (win.top.location.href.indexOf('main.html') > -1) {
+          win.top.location.href = './login.html';
+        } else {
+          next('/login');
+        }
+      } catch (error) {
+        win.postMessage({ type: 1 }, '*');
       }
     }
   }
@@ -2445,30 +2509,30 @@ var setStorage = function setStorage(_ref14) {
   if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
     value = JSON.stringify(value);
   }
-  if (type === undefined || type === 'sessionStorage') {
+  if (type === 'localStorage') {
     if (typeof key === 'string') {
-      sessionStorage.setItem(key, value);
+      localStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (var i in key) {
-        sessionStorage.setItem(key[i], value);
+        localStorage.setItem(key[i], value);
       }
     } else {
       for (var _i6 in key) {
         var val = _typeof(key[_i6]) === 'object' ? JSON.stringify(key[_i6]) : key[_i6];
-        sessionStorage.setItem(_i6, val);
+        localStorage.setItem(_i6, val);
       }
     }
   } else {
     if (typeof key === 'string') {
-      localStorage.setItem(key, value);
+      sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (var _i7 in key) {
-        localStorage.setItem(key[_i7], value);
+        sessionStorage.setItem(key[_i7], value);
       }
     } else {
       for (var _i8 in key) {
         var _val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
-        localStorage.setItem(_i8, _val);
+        sessionStorage.setItem(_i8, _val);
       }
     }
   }
@@ -2871,6 +2935,7 @@ exports.default = {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,

package/lib/wujie.js

@@ -258,7 +258,13 @@ var ajax = function ajax(_ref) {
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+        var href = '';
+        try {
+          href = win.top.location.href;
+        } catch (error) {
+          href = win.location.href;
+        }
+        if (href.indexOf('#/login') === -1 && href.indexOf('/login.html') === -1) {
           var remind = sessionStorage.getItem('remind');
           if (!remind) {
             clearTimeout(loginMsg);
@@ -274,33 +280,37 @@ var ajax = function ajax(_ref) {
                 closeOnClickModal: false,
                 type: 'warning'
               }).then(function () {
-                var loginPage = getStorage('login') || getStorage('loginPage');
-                if (loginPage) {
-                  var src = void 0;
-                  if (!startWith(loginPage, ['http', '/'], true)) {
-                    var pathname = win.top.location.pathname;
-                    if (pathname !== '/') {
-                      pathname = pathname.split('/');
-                      pathname.splice(pathname.length - 1);
-                      pathname = pathname.join('/');
-                      src = pathname + '/' + loginPage.replace('./', '');
+                try {
+                  var loginPage = getStorage('login') || getStorage('loginPage');
+                  if (loginPage) {
+                    var src = void 0;
+                    if (!startWith(loginPage, ['http', '/'], true)) {
+                      var pathname = win.top.location.pathname;
+                      if (pathname !== '/') {
+                        pathname = pathname.split('/');
+                        pathname.splice(pathname.length - 1);
+                        pathname = pathname.join('/');
+                        src = pathname + '/' + loginPage.replace('./', '');
+                      } else {
+                        src = pathname + loginPage.replace('./', '');
+                      }
                     } else {
-                      src = pathname + loginPage.replace('./', '');
+                      src = loginPage;
                     }
+                    win.top.location.href = src;
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
                   } else {
-                    src = loginPage;
-                  }
-                  win.top.location.href = src;
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  var hash = win.top.location.hash;
-                  if (hash) {
-                    var len = win.top.location.href.indexOf(hash);
-                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                  } else {
-                    win.top.location.href = '/login.html';
+                    var hash = win.top.location.hash;
+                    if (hash) {
+                      var len = win.top.location.href.indexOf(hash);
+                      win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                    } else {
+                      win.top.location.href = '/login.html';
+                    }
                   }
+                } catch (error) {
+                  win.postMessage({ type: 1 }, '*');
                 }
               }).catch(function (e) {
                 sessionStorage.removeItem('remind');
@@ -738,7 +748,13 @@ var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
       key = _ref2.key;
 
-  var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
+  var pUrl = '';
+  try {
+    pUrl = win.top.location.href;
+  } catch (error) {
+    pUrl = win.location.href;
+  }
+  var src = url ? decodeURI(url) : decodeURI(pUrl);
   var param = getParams({ url: src });
   if (param && key.length) {
     if (Array.isArray(key)) {
@@ -1234,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 当年第几周
@@ -1988,7 +2019,12 @@ var isLogined = function isLogined(_ref8) {
     }).catch(function () {});
     return;
   }
-  var pathname = win.top.location.pathname;
+  var pathname = '';
+  try {
+    pathname = win.top.location.pathname;
+  } catch (error) {
+    pathname = win.location.pathname;
+  }
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
@@ -2029,22 +2065,38 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              var url = delUrlParam({
-                url: win.top.location.href,
-                key: ['serverId', 'authType', 'code', 'sessionId']
-              });
-              win.top.location.href = url;
-              setTimeout(function () {
-                win.top.location.reload();
-              }, 200);
+              try {
+                var url = delUrlParam({
+                  url: win.top.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.top.location.href = url;
+                setTimeout(function () {
+                  win.top.location.reload();
+                }, 200);
+              } catch (error) {
+                var _url2 = delUrlParam({
+                  url: win.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.location.href = _url2;
+                setTimeout(function () {
+                  win.location.reload();
+                }, 200);
+              }
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
-              win.top.location.href = href;
+              try {
+                var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+                win.top.location.href = href;
+              } catch (error) {
+                var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
+                win.location.href = _href;
+              }
               break;
             case 4:
               eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
@@ -2052,14 +2104,18 @@ var isLogined = function isLogined(_ref8) {
                 type: 'error',
                 callback: function callback() {
                   sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                  if (loginPage) {
-                    win.top.location.replace(loginPage);
-                  } else if (document.referrer) {
-                    win.top.location.replace(document.referrer);
-                  } else if (win.top.location.href.indexOf('main.html') > -1) {
-                    win.top.location.href = './login.html';
-                  } else {
-                    next('/login');
+                  try {
+                    if (loginPage) {
+                      win.top.location.replace(loginPage);
+                    } else if (document.referrer) {
+                      win.top.location.replace(document.referrer);
+                    } else if (win.top.location.href.indexOf('main.html') > -1) {
+                      win.top.location.href = './login.html';
+                    } else {
+                      next('/login');
+                    }
+                  } catch (error) {
+                    win.postMessage({ type: 1 }, '*');
                   }
                 }
               });
@@ -2071,14 +2127,18 @@ var isLogined = function isLogined(_ref8) {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
-              if (loginPage) {
-                win.top.location.replace(loginPage);
-              } else if (document.referrer) {
-                win.top.location.replace(document.referrer);
-              } else if (win.top.location.href.indexOf('main.html') > -1) {
-                win.top.location.href = './login.html';
-              } else {
-                next('/login');
+              try {
+                if (loginPage) {
+                  win.top.location.replace(loginPage);
+                } else if (document.referrer) {
+                  win.top.location.replace(document.referrer);
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
+                } else {
+                  next('/login');
+                }
+              } catch (error) {
+                win.postMessage({ type: 1 }, '*');
               }
             }
           });
@@ -2091,14 +2151,18 @@ var isLogined = function isLogined(_ref8) {
         next();
       }
     } else {
-      if (loginPage) {
-        win.top.location.replace(loginPage);
-      } else if (document.referrer) {
-        win.top.location.replace(document.referrer);
-      } else if (win.top.location.href.indexOf('main.html') > -1) {
-        win.top.location.href = './login.html';
-      } else {
-        next('/login');
+      try {
+        if (loginPage) {
+          win.top.location.replace(loginPage);
+        } else if (document.referrer) {
+          win.top.location.replace(document.referrer);
+        } else if (win.top.location.href.indexOf('main.html') > -1) {
+          win.top.location.href = './login.html';
+        } else {
+          next('/login');
+        }
+      } catch (error) {
+        win.postMessage({ type: 1 }, '*');
       }
     }
   }
@@ -2528,30 +2592,30 @@ var setStorage = function setStorage(_ref14) {
   if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
     value = JSON.stringify(value);
   }
-  if (type === undefined || type === 'sessionStorage') {
+  if (type === 'localStorage') {
     if (typeof key === 'string') {
-      sessionStorage.setItem(key, value);
+      localStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (var i in key) {
-        sessionStorage.setItem(key[i], value);
+        localStorage.setItem(key[i], value);
       }
     } else {
       for (var _i6 in key) {
         var val = _typeof(key[_i6]) === 'object' ? JSON.stringify(key[_i6]) : key[_i6];
-        sessionStorage.setItem(_i6, val);
+        localStorage.setItem(_i6, val);
       }
     }
   } else {
     if (typeof key === 'string') {
-      localStorage.setItem(key, value);
+      sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (var _i7 in key) {
-        localStorage.setItem(key[_i7], value);
+        sessionStorage.setItem(key[_i7], value);
       }
     } else {
       for (var _i8 in key) {
         var _val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
-        localStorage.setItem(_i8, _val);
+        sessionStorage.setItem(_i8, _val);
       }
     }
   }
@@ -2954,6 +3018,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,