eoss-ui 0.5.43 → 0.5.44

package/lib/selector-panel.js

@@ -257,7 +257,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);
@@ -273,33 +279,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');
@@ -737,7 +747,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)) {
@@ -1987,7 +2003,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)) {
@@ -2028,22 +2049,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 : '账号未绑定，账号密码登录后自动绑定！', '提示', {
@@ -2051,14 +2088,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 }, '*');
                   }
                 }
               });
@@ -2070,14 +2111,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 }, '*');
               }
             }
           });
@@ -2090,14 +2135,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 }, '*');
       }
     }
   }
@@ -2527,30 +2576,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);
       }
     }
   }
@@ -4217,8 +4266,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var tree = (component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=template&id=66e09547&
-var selectionvue_type_template_id_66e09547_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=template&id=0ec05c7a&
+var selectionvue_type_template_id_0ec05c7a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4266,6 +4315,7 @@ var selectionvue_type_template_id_66e09547_render = function () {
                           disabled:
                             typeof item == "string" ? false : item.disabled,
                           "value-key": _vm.valueKey,
+                          tooltip: item[_vm.tipKey],
                         },
                       },
                       "el-radio",
@@ -4320,6 +4370,7 @@ var selectionvue_type_template_id_66e09547_render = function () {
                           disabled:
                             typeof item == "string" ? false : item.disabled,
                           "value-key": _vm.valueKey,
+                          tooltip: item[_vm.tipKey],
                         },
                       },
                       "el-checkbox",
@@ -4357,11 +4408,11 @@ var selectionvue_type_template_id_66e09547_render = function () {
     1
   )
 }
-var selectionvue_type_template_id_66e09547_staticRenderFns = []
-selectionvue_type_template_id_66e09547_render._withStripped = true
+var selectionvue_type_template_id_0ec05c7a_staticRenderFns = []
+selectionvue_type_template_id_0ec05c7a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=66e09547&
+// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=0ec05c7a&
 
 // EXTERNAL MODULE: external "sortablejs"
 var external_sortablejs_ = __webpack_require__(24);
@@ -4420,6 +4471,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
 
 
 
@@ -4436,6 +4489,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       type: String,
       default: 'showname'
     },
+    tipKey: {
+      type: String,
+      default: 'pathname'
+    },
     valueType: {
       type: String,
       default: 'object',
@@ -4525,8 +4582,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selection_component = Object(componentNormalizer["a" /* default */])(
   src_selectionvue_type_script_lang_js_,
-  selectionvue_type_template_id_66e09547_render,
-  selectionvue_type_template_id_66e09547_staticRenderFns,
+  selectionvue_type_template_id_0ec05c7a_render,
+  selectionvue_type_template_id_0ec05c7a_staticRenderFns,
   false,
   null,
   null,

package/lib/selector.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)) {
@@ -1988,7 +2004,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 +2050,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 +2089,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 +2112,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 +2136,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 +2577,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);
       }
     }
   }