eoss-ui 0.4.94 → 0.4.95

package/lib/eoss-ui.common.js

@@ -724,7 +724,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -732,17 +732,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1942,20 +1962,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1983,6 +1989,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {
@@ -47328,8 +47335,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6cb9a388&
-var mainvue_type_template_id_6cb9a388_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=2264961b&
+var mainvue_type_template_id_2264961b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47754,11 +47761,11 @@ var mainvue_type_template_id_6cb9a388_render = function () {
     1
   )
 }
-var mainvue_type_template_id_6cb9a388_staticRenderFns = []
-mainvue_type_template_id_6cb9a388_render._withStripped = true
+var mainvue_type_template_id_2264961b_staticRenderFns = []
+mainvue_type_template_id_2264961b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6cb9a388&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=2264961b&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -50191,7 +50198,7 @@ var log = utils_util["a" /* default */].getParams('console');
       var _this = this;
 
       return main_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
-        var query, token, loginPage, pathname, url;
+        var query, token, loginPage, pathname;
         return regenerator_default.a.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -50216,35 +50223,11 @@ var log = utils_util["a" /* default */].getParams('console');
                 }
 
                 if (!(!token && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
-                  _context.next = 20;
-                  break;
-                }
-
-                url = utils_util["a" /* default */].win.top.location.href;
-
-                if (!query.openType) {
-                  _context.next = 16;
+                  _context.next = 9;
                   break;
                 }
 
-                _context.t0 = query.openType;
-                _context.next = _context.t0 === 'self' ? 10 : _context.t0 === 'blank' ? 12 : _context.t0 === 'parent' ? 14 : 16;
-                break;
-
-              case 10:
-                url = utils_util["a" /* default */].win.location.href;
-                return _context.abrupt('break', 16);
-
-              case 12:
-                url = utils_util["a" /* default */].win.open(url);
-                return _context.abrupt('break', 16);
-
-              case 14:
-                url = utils_util["a" /* default */].win.parent.location.href;
-                return _context.abrupt('break', 16);
-
-              case 16:
-                _context.next = 18;
+                _context.next = 7;
                 return utils_util["a" /* default */].ajax({
                   method: 'post',
                   url: api["b" /* authCenter */],
@@ -50255,9 +50238,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
                     switch (results.statusCode) {
                       case 0:
-                        var storage = getStorage('storage');
-                        setStorage({
-                          type: storage,
+                        utils_util["a" /* default */].setStorage({
+                          type: _this.storage,
                           key: {
                             ssId: results.ssId,
                             token: results.token,
@@ -50265,40 +50247,52 @@ var log = utils_util["a" /* default */].getParams('console');
                             deviceUnique: results.deviceUnique
                           }
                         });
-                        _this.getConfig();
-                        if (_this.socket) {
-                          _this.initWebSocket();
-                        }
-                        break;
-                      case 1:
-                        break;
-                      case 2:
-                        break;
-                      case 3:
-                        var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
                         if (query.openType) {
+                          var _url2 = utils_util["a" /* default */].win.top.location.href;
+                          var newUrl = utils_util["a" /* default */].delUrlParam({
+                            url: _url2,
+                            key: ['serverId', 'authType', 'openType']
+                          });
                           switch (query.openType) {
                             case 'self':
-                              utils_util["a" /* default */].win.location.href = href;
+                              utils_util["a" /* default */].win.location.href = newUrl;
                               break;
                             case 'blank':
-                              utils_util["a" /* default */].win.open(href);
-                              break;
-                            case 'top':
-                              utils_util["a" /* default */].win.top.location.href = href;
+                              utils_util["a" /* default */].win.open(newUrl);
                               break;
                             case 'parent':
-                              utils_util["a" /* default */].win.parent.location.href = href;
+                              utils_util["a" /* default */].win.parent.location.href = _href;
                               break;
+                            default:
+                              utils_util["a" /* default */].win.top.location.href = _href;
                           }
                         } else {
-                          if (open) {
-                            utils_util["a" /* default */].win.open(href);
-                          } else {
-                            utils_util["a" /* default */].win.top.location.href = href;
+                          _this.getConfig();
+                          if (_this.socket) {
+                            _this.initWebSocket();
                           }
                         }
                         break;
+                      case 1:
+                        break;
+                      case 2:
+                        break;
+                      case 3:
+                        var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
+                        switch (query.openType) {
+                          case 'self':
+                            utils_util["a" /* default */].win.location.href = _href;
+                            break;
+                          case 'blank':
+                            utils_util["a" /* default */].win.open(_href);
+                            break;
+                          case 'parent':
+                            utils_util["a" /* default */].win.parent.location.href = _href;
+                            break;
+                          default:
+                            utils_util["a" /* default */].win.top.location.href = _href;
+                        }
+                        break;
                       case 4:
                         _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                           confirmButtonText: '确定',
@@ -50339,17 +50333,17 @@ var log = utils_util["a" /* default */].getParams('console');
                   }
                 }).catch(function (e) {});
 
-              case 18:
-                _context.next = 22;
+              case 7:
+                _context.next = 11;
                 break;
 
-              case 20:
+              case 9:
                 _this.getConfig();
                 if (_this.socket) {
                   _this.initWebSocket();
                 }
 
-              case 22:
+              case 11:
               case 'end':
                 return _context.stop();
             }
@@ -50693,8 +50687,8 @@ var log = utils_util["a" /* default */].getParams('console');
           return item.id;
         } else {
           if (path && item.url) {
-            var url = new URL(item.url, window.location.origin);
-            if (url.hash == res) {
+            var _url3 = new URL(item.url, window.location.origin);
+            if (_url3.hash == res) {
               return item.id;
             }
           }
@@ -50987,19 +50981,19 @@ var log = utils_util["a" /* default */].getParams('console');
           } else {
             if (item.children && item.children.length) {
               index++;
-              var url = this.getUrl(item.children, active, index);
-              if (url && index === active.length - 1) {
+              var _url4 = this.getUrl(item.children, active, index);
+              if (_url4 && index === active.length - 1) {
                 this.tabs = '';
               }
-              return url;
+              return _url4;
             }
             if (item.fourthTabs && item.fourthTabs.length) {
               index++;
-              var _url2 = this.getUrl(item.fourthTabs, active, index);
-              if (_url2) {
+              var _url5 = this.getUrl(item.fourthTabs, active, index);
+              if (_url5) {
                 this.$set(this, 'tabs', item.fourthTabs);
               }
-              return _url2;
+              return _url5;
             }
           }
         } else if (item.children && item.children.length) {
@@ -51477,8 +51471,8 @@ var log = utils_util["a" /* default */].getParams('console');
     initWebSocket: function initWebSocket() {
       //初始化weosocket
       if (!this.websocket) {
-        var url = (utils_util["a" /* default */].getStorage('wshost') || '') + api["Zb" /* wss */];
-        this.websocket = new external_sockjs_client_default.a(url);
+        var _url6 = (utils_util["a" /* default */].getStorage('wshost') || '') + api["Zb" /* wss */];
+        this.websocket = new external_sockjs_client_default.a(_url6);
       }
       this.client = external_stompjs_default.a.over(this.websocket);
       if (!this.isConsole && this.client) {
@@ -51657,8 +51651,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6cb9a388_render,
-  mainvue_type_template_id_6cb9a388_staticRenderFns,
+  mainvue_type_template_id_2264961b_render,
+  mainvue_type_template_id_2264961b_staticRenderFns,
   false,
   null,
   null,
@@ -70866,7 +70860,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.94',
+  version: '0.4.95',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-group.js

@@ -725,7 +725,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -733,17 +733,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1943,20 +1963,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1984,6 +1990,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {

package/lib/flow-list.js

@@ -725,7 +725,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -733,17 +733,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1943,20 +1963,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1984,6 +1990,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {

package/lib/flow.js

@@ -724,7 +724,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -732,17 +732,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1942,20 +1962,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1983,6 +1989,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {