eoss-ui 0.4.93 → 0.4.95

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/lib/button-group.js +32 -25
  2. package/lib/button.js +32 -25
  3. package/lib/checkbox-group.js +32 -25
  4. package/lib/clients.js +3 -3
  5. package/lib/data-table-form.js +32 -25
  6. package/lib/data-table.js +32 -25
  7. package/lib/date-picker.js +32 -25
  8. package/lib/dialog.js +32 -25
  9. package/lib/eoss-ui.common.js +101 -108
  10. package/lib/flow-group.js +32 -25
  11. package/lib/flow-list.js +32 -25
  12. package/lib/flow.js +32 -25
  13. package/lib/form.js +32 -25
  14. package/lib/handle-user.js +32 -25
  15. package/lib/handler.js +32 -25
  16. package/lib/index.js +1 -1
  17. package/lib/input-number.js +32 -25
  18. package/lib/input.js +32 -25
  19. package/lib/login.js +32 -25
  20. package/lib/main.js +87 -94
  21. package/lib/nav.js +32 -25
  22. package/lib/page.js +32 -25
  23. package/lib/player.js +32 -25
  24. package/lib/qr-code.js +32 -25
  25. package/lib/radio-group.js +32 -25
  26. package/lib/retrial-auth.js +32 -25
  27. package/lib/select-ganged.js +32 -25
  28. package/lib/select.js +32 -25
  29. package/lib/selector-panel.js +32 -25
  30. package/lib/selector.js +32 -25
  31. package/lib/sizer.js +32 -25
  32. package/lib/steps.js +32 -25
  33. package/lib/switch.js +32 -25
  34. package/lib/table-form.js +32 -25
  35. package/lib/tabs.js +32 -25
  36. package/lib/tips.js +32 -25
  37. package/lib/tree-group.js +32 -25
  38. package/lib/tree.js +32 -25
  39. package/lib/upload.js +32 -25
  40. package/lib/utils/util.js +32 -25
  41. package/lib/wujie.js +32 -25
  42. package/lib/wxlogin.js +32 -25
  43. package/package.json +1 -1
  44. package/packages/clients/src/main.vue +1 -1
  45. package/packages/main/src/main.vue +37 -41
  46. package/src/index.js +1 -1
  47. package/src/utils/util.js +64 -57
@@ -724,7 +724,7 @@ var debounce = function debounce(callback, delay) {
724
724
  * @author huangbo
725
725
  * @date 2022年5月7日
726
726
  * @param {String} [url] - url地址
727
- * @param {String} [key] - 参数名
727
+ * @param {String,Array} [key] - 参数名
728
728
  **/
729
729
  var delUrlParam = function delUrlParam(_ref2) {
730
730
  var url = _ref2.url,
@@ -732,17 +732,37 @@ var delUrlParam = function delUrlParam(_ref2) {
732
732
 
733
733
  var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
734
734
  var param = getParams({ url: src });
735
- if (param && param.hasOwnProperty(key)) {
736
- var reg = key + '=' + param[key];
737
- if (Object.keys(param).length > 1) {
738
- if (src.indexOf(reg + '&') > -1) {
739
- src = src.replace(reg + '&', '');
740
- }
741
- if (src.indexOf('&' + reg) > -1) {
742
- src = src.replace('&' + reg, '');
743
- }
735
+ if (param && key.length) {
736
+ if (Array.isArray(key)) {
737
+ key.forEach(function (item) {
738
+ if (param.hasOwnProperty(item)) {
739
+ var reg = item + '=' + param[item];
740
+ if (src.indexOf(reg + '&') > -1) {
741
+ src = src.replace(reg + '&', '');
742
+ } else if (src.indexOf('&' + reg) > -1) {
743
+ src = src.replace('&' + reg, '');
744
+ } else {
745
+ src = src.replace(reg, '');
746
+ }
747
+ }
748
+ if (Object.keys(param).length === key.length) {
749
+ src = src.replace('?', '');
750
+ }
751
+ });
744
752
  } else {
745
- src = src.replace('?' + reg, '');
753
+ if (param.hasOwnProperty(key)) {
754
+ var reg = key + '=' + param[key];
755
+ if (Object.keys(param).length > 1) {
756
+ if (src.indexOf(reg + '&') > -1) {
757
+ src = src.replace(reg + '&', '');
758
+ }
759
+ if (src.indexOf('&' + reg) > -1) {
760
+ src = src.replace('&' + reg, '');
761
+ }
762
+ } else {
763
+ src = src.replace('?' + reg, '');
764
+ }
765
+ }
746
766
  }
747
767
  }
748
768
  return src;
@@ -1942,20 +1962,6 @@ var isLogined = function isLogined(_ref8) {
1942
1962
  } else {
1943
1963
  var token = getStorage('token') || getStorage('Authorization');
1944
1964
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1945
- var url = win.top.location.href;
1946
- if (to.query.openType) {
1947
- switch (to.query.openType) {
1948
- case 'self':
1949
- url = win.location.href;
1950
- break;
1951
- case 'blank':
1952
- url = win.open(url);
1953
- break;
1954
- case 'parent':
1955
- url = win.parent.location.href;
1956
- break;
1957
- }
1958
- }
1959
1965
  ajax({
1960
1966
  method: 'post',
1961
1967
  url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1983,6 +1989,7 @@ var isLogined = function isLogined(_ref8) {
1983
1989
  case 2:
1984
1990
  break;
1985
1991
  case 3:
1992
+ var url = win.top.location.href;
1986
1993
  var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
1987
1994
  if (to.query.openType) {
1988
1995
  switch (to.query.openType) {
@@ -5116,8 +5123,8 @@ cascader_src_main.install = function (Vue) {
5116
5123
  };
5117
5124
 
5118
5125
  /* harmony default export */ var cascader = (cascader_src_main);
5119
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/clients/src/main.vue?vue&type=template&id=343b6fd0&
5120
- var mainvue_type_template_id_343b6fd0_render = function () {
5126
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/clients/src/main.vue?vue&type=template&id=2f0c03c7&
5127
+ var mainvue_type_template_id_2f0c03c7_render = function () {
5121
5128
  var _vm = this
5122
5129
  var _h = _vm.$createElement
5123
5130
  var _c = _vm._self._c || _h
@@ -5163,7 +5170,7 @@ var mainvue_type_template_id_343b6fd0_render = function () {
5163
5170
  1
5164
5171
  )
5165
5172
  : _vm._e(),
5166
- _vm.mac || _vm.win || _vm.linux || 1
5173
+ _vm.mac || _vm.win || _vm.linux
5167
5174
  ? _c("li", { staticClass: "es-clients-item" }, [
5168
5175
  _c(
5169
5176
  "div",
@@ -5210,7 +5217,7 @@ var mainvue_type_template_id_343b6fd0_render = function () {
5210
5217
  ]),
5211
5218
  ])
5212
5219
  }
5213
- var mainvue_type_template_id_343b6fd0_staticRenderFns = [
5220
+ var mainvue_type_template_id_2f0c03c7_staticRenderFns = [
5214
5221
  function () {
5215
5222
  var _vm = this
5216
5223
  var _h = _vm.$createElement
@@ -5239,10 +5246,10 @@ var mainvue_type_template_id_343b6fd0_staticRenderFns = [
5239
5246
  ])
5240
5247
  },
5241
5248
  ]
5242
- mainvue_type_template_id_343b6fd0_render._withStripped = true
5249
+ mainvue_type_template_id_2f0c03c7_render._withStripped = true
5243
5250
 
5244
5251
 
5245
- // CONCATENATED MODULE: ./packages/clients/src/main.vue?vue&type=template&id=343b6fd0&
5252
+ // CONCATENATED MODULE: ./packages/clients/src/main.vue?vue&type=template&id=2f0c03c7&
5246
5253
 
5247
5254
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/clients/src/main.vue?vue&type=script&lang=js&
5248
5255
  var _props;
@@ -5356,8 +5363,8 @@ var _props;
5356
5363
 
5357
5364
  var clients_src_main_component = normalizeComponent(
5358
5365
  packages_clients_src_mainvue_type_script_lang_js_,
5359
- mainvue_type_template_id_343b6fd0_render,
5360
- mainvue_type_template_id_343b6fd0_staticRenderFns,
5366
+ mainvue_type_template_id_2f0c03c7_render,
5367
+ mainvue_type_template_id_2f0c03c7_staticRenderFns,
5361
5368
  false,
5362
5369
  null,
5363
5370
  null,
@@ -47328,8 +47335,8 @@ login_src_main.install = function (Vue) {
47328
47335
  };
47329
47336
 
47330
47337
  /* harmony default export */ var login = (login_src_main);
47331
- // 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=b2aea55c&
47332
- var mainvue_type_template_id_b2aea55c_render = function () {
47338
+ // 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&
47339
+ var mainvue_type_template_id_2264961b_render = function () {
47333
47340
  var _vm = this
47334
47341
  var _h = _vm.$createElement
47335
47342
  var _c = _vm._self._c || _h
@@ -47754,11 +47761,11 @@ var mainvue_type_template_id_b2aea55c_render = function () {
47754
47761
  1
47755
47762
  )
47756
47763
  }
47757
- var mainvue_type_template_id_b2aea55c_staticRenderFns = []
47758
- mainvue_type_template_id_b2aea55c_render._withStripped = true
47764
+ var mainvue_type_template_id_2264961b_staticRenderFns = []
47765
+ mainvue_type_template_id_2264961b_render._withStripped = true
47759
47766
 
47760
47767
 
47761
- // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=b2aea55c&
47768
+ // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=2264961b&
47762
47769
 
47763
47770
  // 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&
47764
47771
  var userinfovue_type_template_id_799780ee_render = function () {
@@ -50191,12 +50198,12 @@ var log = utils_util["a" /* default */].getParams('console');
50191
50198
  var _this = this;
50192
50199
 
50193
50200
  return main_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
50194
- var query, token, loginPage, pathname, url;
50201
+ var query, token, loginPage, pathname;
50195
50202
  return regenerator_default.a.wrap(function _callee$(_context) {
50196
50203
  while (1) {
50197
50204
  switch (_context.prev = _context.next) {
50198
50205
  case 0:
50199
- query = _this.$route.query;
50206
+ query = utils_util["a" /* default */].getParams();
50200
50207
  token = utils_util["a" /* default */].getStorage('token') || utils_util["a" /* default */].getStorage('Authorization');
50201
50208
  loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
50202
50209
 
@@ -50216,52 +50223,23 @@ var log = utils_util["a" /* default */].getParams('console');
50216
50223
  }
50217
50224
 
50218
50225
  if (!(!token && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
50219
- _context.next = 20;
50220
- break;
50221
- }
50222
-
50223
- url = utils_util["a" /* default */].win.top.location.href;
50224
-
50225
- if (!query.openType) {
50226
- _context.next = 16;
50226
+ _context.next = 9;
50227
50227
  break;
50228
50228
  }
50229
50229
 
50230
- _context.t0 = query.openType;
50231
- _context.next = _context.t0 === 'self' ? 10 : _context.t0 === 'blank' ? 12 : _context.t0 === 'parent' ? 14 : 16;
50232
- break;
50233
-
50234
- case 10:
50235
- url = utils_util["a" /* default */].win.location.href;
50236
- return _context.abrupt('break', 16);
50237
-
50238
- case 12:
50239
- url = utils_util["a" /* default */].win.open(url);
50240
- return _context.abrupt('break', 16);
50241
-
50242
- case 14:
50243
- url = utils_util["a" /* default */].win.parent.location.href;
50244
- return _context.abrupt('break', 16);
50245
-
50246
- case 16:
50247
- _context.next = 18;
50230
+ _context.next = 7;
50248
50231
  return utils_util["a" /* default */].ajax({
50249
50232
  method: 'post',
50250
50233
  url: api["b" /* authCenter */],
50251
50234
  data: query
50252
50235
  }).then(function (res) {
50253
50236
  if (res.rCode === 0) {
50254
- _this.getConfig();
50255
- if (_this.socket) {
50256
- _this.initWebSocket();
50257
- }
50258
50237
  var results = res.results;
50259
50238
 
50260
50239
  switch (results.statusCode) {
50261
50240
  case 0:
50262
- var storage = getStorage('storage');
50263
- setStorage({
50264
- type: storage,
50241
+ utils_util["a" /* default */].setStorage({
50242
+ type: _this.storage,
50265
50243
  key: {
50266
50244
  ssId: results.ssId,
50267
50245
  token: results.token,
@@ -50269,36 +50247,52 @@ var log = utils_util["a" /* default */].getParams('console');
50269
50247
  deviceUnique: results.deviceUnique
50270
50248
  }
50271
50249
  });
50272
- break;
50273
- case 1:
50274
- break;
50275
- case 2:
50276
- break;
50277
- case 3:
50278
- var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
50279
50250
  if (query.openType) {
50251
+ var _url2 = utils_util["a" /* default */].win.top.location.href;
50252
+ var newUrl = utils_util["a" /* default */].delUrlParam({
50253
+ url: _url2,
50254
+ key: ['serverId', 'authType', 'openType']
50255
+ });
50280
50256
  switch (query.openType) {
50281
50257
  case 'self':
50282
- utils_util["a" /* default */].win.location.href = href;
50258
+ utils_util["a" /* default */].win.location.href = newUrl;
50283
50259
  break;
50284
50260
  case 'blank':
50285
- utils_util["a" /* default */].win.open(href);
50286
- break;
50287
- case 'top':
50288
- utils_util["a" /* default */].win.top.location.href = href;
50261
+ utils_util["a" /* default */].win.open(newUrl);
50289
50262
  break;
50290
50263
  case 'parent':
50291
- utils_util["a" /* default */].win.parent.location.href = href;
50264
+ utils_util["a" /* default */].win.parent.location.href = _href;
50292
50265
  break;
50266
+ default:
50267
+ utils_util["a" /* default */].win.top.location.href = _href;
50293
50268
  }
50294
50269
  } else {
50295
- if (open) {
50296
- utils_util["a" /* default */].win.open(href);
50297
- } else {
50298
- utils_util["a" /* default */].win.top.location.href = href;
50270
+ _this.getConfig();
50271
+ if (_this.socket) {
50272
+ _this.initWebSocket();
50299
50273
  }
50300
50274
  }
50301
50275
  break;
50276
+ case 1:
50277
+ break;
50278
+ case 2:
50279
+ break;
50280
+ case 3:
50281
+ var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
50282
+ switch (query.openType) {
50283
+ case 'self':
50284
+ utils_util["a" /* default */].win.location.href = _href;
50285
+ break;
50286
+ case 'blank':
50287
+ utils_util["a" /* default */].win.open(_href);
50288
+ break;
50289
+ case 'parent':
50290
+ utils_util["a" /* default */].win.parent.location.href = _href;
50291
+ break;
50292
+ default:
50293
+ utils_util["a" /* default */].win.top.location.href = _href;
50294
+ }
50295
+ break;
50302
50296
  case 4:
50303
50297
  _this.$alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
50304
50298
  confirmButtonText: '确定',
@@ -50339,17 +50333,17 @@ var log = utils_util["a" /* default */].getParams('console');
50339
50333
  }
50340
50334
  }).catch(function (e) {});
50341
50335
 
50342
- case 18:
50343
- _context.next = 22;
50336
+ case 7:
50337
+ _context.next = 11;
50344
50338
  break;
50345
50339
 
50346
- case 20:
50340
+ case 9:
50347
50341
  _this.getConfig();
50348
50342
  if (_this.socket) {
50349
50343
  _this.initWebSocket();
50350
50344
  }
50351
50345
 
50352
- case 22:
50346
+ case 11:
50353
50347
  case 'end':
50354
50348
  return _context.stop();
50355
50349
  }
@@ -50693,8 +50687,8 @@ var log = utils_util["a" /* default */].getParams('console');
50693
50687
  return item.id;
50694
50688
  } else {
50695
50689
  if (path && item.url) {
50696
- var url = new URL(item.url, window.location.origin);
50697
- if (url.hash == res) {
50690
+ var _url3 = new URL(item.url, window.location.origin);
50691
+ if (_url3.hash == res) {
50698
50692
  return item.id;
50699
50693
  }
50700
50694
  }
@@ -50987,19 +50981,19 @@ var log = utils_util["a" /* default */].getParams('console');
50987
50981
  } else {
50988
50982
  if (item.children && item.children.length) {
50989
50983
  index++;
50990
- var url = this.getUrl(item.children, active, index);
50991
- if (url && index === active.length - 1) {
50984
+ var _url4 = this.getUrl(item.children, active, index);
50985
+ if (_url4 && index === active.length - 1) {
50992
50986
  this.tabs = '';
50993
50987
  }
50994
- return url;
50988
+ return _url4;
50995
50989
  }
50996
50990
  if (item.fourthTabs && item.fourthTabs.length) {
50997
50991
  index++;
50998
- var _url2 = this.getUrl(item.fourthTabs, active, index);
50999
- if (_url2) {
50992
+ var _url5 = this.getUrl(item.fourthTabs, active, index);
50993
+ if (_url5) {
51000
50994
  this.$set(this, 'tabs', item.fourthTabs);
51001
50995
  }
51002
- return _url2;
50996
+ return _url5;
51003
50997
  }
51004
50998
  }
51005
50999
  } else if (item.children && item.children.length) {
@@ -51263,7 +51257,6 @@ var log = utils_util["a" /* default */].getParams('console');
51263
51257
  var _this10 = this;
51264
51258
 
51265
51259
  var prevPage = sessionStorage.getItem('jump');
51266
- console.log(page);
51267
51260
  sessionStorage.setItem('jump', page);
51268
51261
  if (res) {
51269
51262
  if (res.fourthTabs && res.fourthTabs.length) {
@@ -51478,8 +51471,8 @@ var log = utils_util["a" /* default */].getParams('console');
51478
51471
  initWebSocket: function initWebSocket() {
51479
51472
  //初始化weosocket
51480
51473
  if (!this.websocket) {
51481
- var url = (utils_util["a" /* default */].getStorage('wshost') || '') + api["Zb" /* wss */];
51482
- this.websocket = new external_sockjs_client_default.a(url);
51474
+ var _url6 = (utils_util["a" /* default */].getStorage('wshost') || '') + api["Zb" /* wss */];
51475
+ this.websocket = new external_sockjs_client_default.a(_url6);
51483
51476
  }
51484
51477
  this.client = external_stompjs_default.a.over(this.websocket);
51485
51478
  if (!this.isConsole && this.client) {
@@ -51658,8 +51651,8 @@ var log = utils_util["a" /* default */].getParams('console');
51658
51651
 
51659
51652
  var main_src_main_component = normalizeComponent(
51660
51653
  packages_main_src_mainvue_type_script_lang_js_,
51661
- mainvue_type_template_id_b2aea55c_render,
51662
- mainvue_type_template_id_b2aea55c_staticRenderFns,
51654
+ mainvue_type_template_id_2264961b_render,
51655
+ mainvue_type_template_id_2264961b_staticRenderFns,
51663
51656
  false,
51664
51657
  null,
51665
51658
  null,
@@ -70867,7 +70860,7 @@ if (typeof window !== 'undefined' && window.Vue) {
70867
70860
  }
70868
70861
 
70869
70862
  /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
70870
- version: '0.4.93',
70863
+ version: '0.4.95',
70871
70864
  install: install,
70872
70865
  Button: packages_button,
70873
70866
  ButtonGroup: button_group,
package/lib/flow-group.js CHANGED
@@ -725,7 +725,7 @@ var debounce = function debounce(callback, delay) {
725
725
  * @author huangbo
726
726
  * @date 2022年5月7日
727
727
  * @param {String} [url] - url地址
728
- * @param {String} [key] - 参数名
728
+ * @param {String,Array} [key] - 参数名
729
729
  **/
730
730
  var delUrlParam = function delUrlParam(_ref2) {
731
731
  var url = _ref2.url,
@@ -733,17 +733,37 @@ var delUrlParam = function delUrlParam(_ref2) {
733
733
 
734
734
  var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
735
735
  var param = getParams({ url: src });
736
- if (param && param.hasOwnProperty(key)) {
737
- var reg = key + '=' + param[key];
738
- if (Object.keys(param).length > 1) {
739
- if (src.indexOf(reg + '&') > -1) {
740
- src = src.replace(reg + '&', '');
741
- }
742
- if (src.indexOf('&' + reg) > -1) {
743
- src = src.replace('&' + reg, '');
744
- }
736
+ if (param && key.length) {
737
+ if (Array.isArray(key)) {
738
+ key.forEach(function (item) {
739
+ if (param.hasOwnProperty(item)) {
740
+ var reg = item + '=' + param[item];
741
+ if (src.indexOf(reg + '&') > -1) {
742
+ src = src.replace(reg + '&', '');
743
+ } else if (src.indexOf('&' + reg) > -1) {
744
+ src = src.replace('&' + reg, '');
745
+ } else {
746
+ src = src.replace(reg, '');
747
+ }
748
+ }
749
+ if (Object.keys(param).length === key.length) {
750
+ src = src.replace('?', '');
751
+ }
752
+ });
745
753
  } else {
746
- src = src.replace('?' + reg, '');
754
+ if (param.hasOwnProperty(key)) {
755
+ var reg = key + '=' + param[key];
756
+ if (Object.keys(param).length > 1) {
757
+ if (src.indexOf(reg + '&') > -1) {
758
+ src = src.replace(reg + '&', '');
759
+ }
760
+ if (src.indexOf('&' + reg) > -1) {
761
+ src = src.replace('&' + reg, '');
762
+ }
763
+ } else {
764
+ src = src.replace('?' + reg, '');
765
+ }
766
+ }
747
767
  }
748
768
  }
749
769
  return src;
@@ -1943,20 +1963,6 @@ var isLogined = function isLogined(_ref8) {
1943
1963
  } else {
1944
1964
  var token = getStorage('token') || getStorage('Authorization');
1945
1965
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1946
- var url = win.top.location.href;
1947
- if (to.query.openType) {
1948
- switch (to.query.openType) {
1949
- case 'self':
1950
- url = win.location.href;
1951
- break;
1952
- case 'blank':
1953
- url = win.open(url);
1954
- break;
1955
- case 'parent':
1956
- url = win.parent.location.href;
1957
- break;
1958
- }
1959
- }
1960
1966
  ajax({
1961
1967
  method: 'post',
1962
1968
  url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1984,6 +1990,7 @@ var isLogined = function isLogined(_ref8) {
1984
1990
  case 2:
1985
1991
  break;
1986
1992
  case 3:
1993
+ var url = win.top.location.href;
1987
1994
  var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
1988
1995
  if (to.query.openType) {
1989
1996
  switch (to.query.openType) {
package/lib/flow-list.js CHANGED
@@ -725,7 +725,7 @@ var debounce = function debounce(callback, delay) {
725
725
  * @author huangbo
726
726
  * @date 2022年5月7日
727
727
  * @param {String} [url] - url地址
728
- * @param {String} [key] - 参数名
728
+ * @param {String,Array} [key] - 参数名
729
729
  **/
730
730
  var delUrlParam = function delUrlParam(_ref2) {
731
731
  var url = _ref2.url,
@@ -733,17 +733,37 @@ var delUrlParam = function delUrlParam(_ref2) {
733
733
 
734
734
  var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
735
735
  var param = getParams({ url: src });
736
- if (param && param.hasOwnProperty(key)) {
737
- var reg = key + '=' + param[key];
738
- if (Object.keys(param).length > 1) {
739
- if (src.indexOf(reg + '&') > -1) {
740
- src = src.replace(reg + '&', '');
741
- }
742
- if (src.indexOf('&' + reg) > -1) {
743
- src = src.replace('&' + reg, '');
744
- }
736
+ if (param && key.length) {
737
+ if (Array.isArray(key)) {
738
+ key.forEach(function (item) {
739
+ if (param.hasOwnProperty(item)) {
740
+ var reg = item + '=' + param[item];
741
+ if (src.indexOf(reg + '&') > -1) {
742
+ src = src.replace(reg + '&', '');
743
+ } else if (src.indexOf('&' + reg) > -1) {
744
+ src = src.replace('&' + reg, '');
745
+ } else {
746
+ src = src.replace(reg, '');
747
+ }
748
+ }
749
+ if (Object.keys(param).length === key.length) {
750
+ src = src.replace('?', '');
751
+ }
752
+ });
745
753
  } else {
746
- src = src.replace('?' + reg, '');
754
+ if (param.hasOwnProperty(key)) {
755
+ var reg = key + '=' + param[key];
756
+ if (Object.keys(param).length > 1) {
757
+ if (src.indexOf(reg + '&') > -1) {
758
+ src = src.replace(reg + '&', '');
759
+ }
760
+ if (src.indexOf('&' + reg) > -1) {
761
+ src = src.replace('&' + reg, '');
762
+ }
763
+ } else {
764
+ src = src.replace('?' + reg, '');
765
+ }
766
+ }
747
767
  }
748
768
  }
749
769
  return src;
@@ -1943,20 +1963,6 @@ var isLogined = function isLogined(_ref8) {
1943
1963
  } else {
1944
1964
  var token = getStorage('token') || getStorage('Authorization');
1945
1965
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1946
- var url = win.top.location.href;
1947
- if (to.query.openType) {
1948
- switch (to.query.openType) {
1949
- case 'self':
1950
- url = win.location.href;
1951
- break;
1952
- case 'blank':
1953
- url = win.open(url);
1954
- break;
1955
- case 'parent':
1956
- url = win.parent.location.href;
1957
- break;
1958
- }
1959
- }
1960
1966
  ajax({
1961
1967
  method: 'post',
1962
1968
  url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1984,6 +1990,7 @@ var isLogined = function isLogined(_ref8) {
1984
1990
  case 2:
1985
1991
  break;
1986
1992
  case 3:
1993
+ var url = win.top.location.href;
1987
1994
  var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
1988
1995
  if (to.query.openType) {
1989
1996
  switch (to.query.openType) {
package/lib/flow.js CHANGED
@@ -724,7 +724,7 @@ var debounce = function debounce(callback, delay) {
724
724
  * @author huangbo
725
725
  * @date 2022年5月7日
726
726
  * @param {String} [url] - url地址
727
- * @param {String} [key] - 参数名
727
+ * @param {String,Array} [key] - 参数名
728
728
  **/
729
729
  var delUrlParam = function delUrlParam(_ref2) {
730
730
  var url = _ref2.url,
@@ -732,17 +732,37 @@ var delUrlParam = function delUrlParam(_ref2) {
732
732
 
733
733
  var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
734
734
  var param = getParams({ url: src });
735
- if (param && param.hasOwnProperty(key)) {
736
- var reg = key + '=' + param[key];
737
- if (Object.keys(param).length > 1) {
738
- if (src.indexOf(reg + '&') > -1) {
739
- src = src.replace(reg + '&', '');
740
- }
741
- if (src.indexOf('&' + reg) > -1) {
742
- src = src.replace('&' + reg, '');
743
- }
735
+ if (param && key.length) {
736
+ if (Array.isArray(key)) {
737
+ key.forEach(function (item) {
738
+ if (param.hasOwnProperty(item)) {
739
+ var reg = item + '=' + param[item];
740
+ if (src.indexOf(reg + '&') > -1) {
741
+ src = src.replace(reg + '&', '');
742
+ } else if (src.indexOf('&' + reg) > -1) {
743
+ src = src.replace('&' + reg, '');
744
+ } else {
745
+ src = src.replace(reg, '');
746
+ }
747
+ }
748
+ if (Object.keys(param).length === key.length) {
749
+ src = src.replace('?', '');
750
+ }
751
+ });
744
752
  } else {
745
- src = src.replace('?' + reg, '');
753
+ if (param.hasOwnProperty(key)) {
754
+ var reg = key + '=' + param[key];
755
+ if (Object.keys(param).length > 1) {
756
+ if (src.indexOf(reg + '&') > -1) {
757
+ src = src.replace(reg + '&', '');
758
+ }
759
+ if (src.indexOf('&' + reg) > -1) {
760
+ src = src.replace('&' + reg, '');
761
+ }
762
+ } else {
763
+ src = src.replace('?' + reg, '');
764
+ }
765
+ }
746
766
  }
747
767
  }
748
768
  return src;
@@ -1942,20 +1962,6 @@ var isLogined = function isLogined(_ref8) {
1942
1962
  } else {
1943
1963
  var token = getStorage('token') || getStorage('Authorization');
1944
1964
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1945
- var url = win.top.location.href;
1946
- if (to.query.openType) {
1947
- switch (to.query.openType) {
1948
- case 'self':
1949
- url = win.location.href;
1950
- break;
1951
- case 'blank':
1952
- url = win.open(url);
1953
- break;
1954
- case 'parent':
1955
- url = win.parent.location.href;
1956
- break;
1957
- }
1958
- }
1959
1965
  ajax({
1960
1966
  method: 'post',
1961
1967
  url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1983,6 +1989,7 @@ var isLogined = function isLogined(_ref8) {
1983
1989
  case 2:
1984
1990
  break;
1985
1991
  case 3:
1992
+ var url = win.top.location.href;
1986
1993
  var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
1987
1994
  if (to.query.openType) {
1988
1995
  switch (to.query.openType) {