eoss-ui 0.4.94 → 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.
package/lib/form.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) {
@@ -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/handler.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) {