ls-pro-common 1.0.87 → 1.0.88

package/es/http/index.js

@@ -43,7 +43,7 @@ request.interceptors.request.use(function (url, options) {
     options.headers['x-asm-prefer-tag'] = tag;
   }
 
-  url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
+  url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var param = {
     resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()
@@ -168,6 +168,9 @@ function ajax(url) {
 
   if (loadText) {
     showLoading(loadText);
+    url = setUrlQuery(url, {
+      _loading: ''
+    }).replace('&_loading=', '').replace('_loading=', '');
   }
 
   if (type === 'get') {

package/es/utils/index.js

@@ -238,7 +238,7 @@ export var showError = function showError(text) {
   _message.error({
     content: text,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement();
+      return getFullScreenElement() || document.body;
     }
   });
 };
@@ -248,7 +248,7 @@ export var showWarn = function showWarn(text) {
   _message.warn({
     content: text,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement();
+      return getFullScreenElement() || document.body;
     }
   });
 };
@@ -258,7 +258,7 @@ export var showSuccess = function showSuccess(text) {
   _message.success({
     content: text,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement();
+      return getFullScreenElement() || document.body;
     }
   });
 };
@@ -283,7 +283,7 @@ export var showAlert = function showAlert(text) {
     _Modal[type](_objectSpread({
       content: text,
       title: title,
-      getContainer: getFullScreenElement(),
+      getContainer: getFullScreenElement() || document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -312,7 +312,7 @@ export var showConfirm = function showConfirm(text) {
       icon: /*#__PURE__*/React.createElement(QuestionCircleOutlined, null),
       okType: 'danger',
       closable: true,
-      getContainer: getFullScreenElement(),
+      getContainer: getFullScreenElement() || document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -763,7 +763,8 @@ export var showLoading = function showLoading() {
   ReactDOM.render( /*#__PURE__*/React.createElement(_Spin, {
     tip: text
   }), loadWrapper);
-  document.body.appendChild(loadWrapper);
+  var pNode = getFullScreenElement() || document.body;
+  pNode.appendChild(loadWrapper);
 };
 export var exitLoading = function exitLoading() {
   var loading = document.getElementById('myloading');

package/lib/http/index.js

@@ -62,7 +62,7 @@ request.interceptors.request.use(function (url, options) {
     options.headers['x-asm-prefer-tag'] = tag;
   }
 
-  url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
+  url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var param = {
     resCode: (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId'),
     _t1: Date.now()
@@ -187,6 +187,9 @@ function ajax(url) {
 
   if (loadText) {
     (0, _utils.showLoading)(loadText);
+    url = (0, _utils.setUrlQuery)(url, {
+      _loading: ''
+    }).replace('&_loading=', '').replace('_loading=', '');
   }
 
   if (type === 'get') {

package/lib/utils/index.js

@@ -331,7 +331,7 @@ var showError = function showError(text) {
   _message2.default.error({
     content: text,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement();
+      return getFullScreenElement() || document.body;
     }
   });
 };
@@ -344,7 +344,7 @@ var showWarn = function showWarn(text) {
   _message2.default.warn({
     content: text,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement();
+      return getFullScreenElement() || document.body;
     }
   });
 };
@@ -357,7 +357,7 @@ var showSuccess = function showSuccess(text) {
   _message2.default.success({
     content: text,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement();
+      return getFullScreenElement() || document.body;
     }
   });
 };
@@ -388,7 +388,7 @@ var showAlert = function showAlert(text) {
     _modal.default[type]((0, _objectSpread2.default)({
       content: text,
       title: title,
-      getContainer: getFullScreenElement(),
+      getContainer: getFullScreenElement() || document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -428,7 +428,7 @@ var showConfirm = function showConfirm(text) {
       icon: /*#__PURE__*/_react.default.createElement(_icons.QuestionCircleOutlined, null),
       okType: 'danger',
       closable: true,
-      getContainer: getFullScreenElement(),
+      getContainer: getFullScreenElement() || document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -940,7 +940,8 @@ var showLoading = function showLoading() {
     tip: text
   }), loadWrapper);
 
-  document.body.appendChild(loadWrapper);
+  var pNode = getFullScreenElement() || document.body;
+  pNode.appendChild(loadWrapper);
 };
 
 exports.showLoading = showLoading;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.87",
+  "version": "1.0.88",
   "description": "ls-pro-common",
   "keywords": [
     "antd",