ls-pro-common 1.0.85 → 1.0.87

package/es/components/ImageSelector.js

@@ -377,9 +377,7 @@ function ImageSelector(prop) {
         return loadData(searchKey);
       }
     }, nextMarker ? '加载更多' : '刷新')),
-    getContainer: function getContainer() {
-      return document.body;
-    }
+    getContainer: false
   }, modalProps), /*#__PURE__*/React.createElement("div", {
     style: {
       minHeight: '120px'

package/es/utils/index.d.ts

@@ -1,3 +1,4 @@
+import { ModalFuncProps } from 'antd';
 import ReactDOM from 'react-dom';
 import React from 'react';
 export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table';
@@ -100,8 +101,17 @@ export declare const showError: (text: string) => void;
 export declare const showWarn: (text: string) => void;
 /** @name 显示成功 */
 export declare const showSuccess: (text: string) => void;
-export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => Promise<unknown>;
-export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => Promise<unknown>;
+export declare const getFullScreenElement: () => any;
+/**
+ * 弹框提示
+ * @param text 提示信息
+ * @param title 标题，默认 系统提示
+ * @param type 类型
+ * @param opts 附加参数
+ * @returns Promise<Boolean>
+ */
+export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn', opts?: ModalFuncProps) => Promise<unknown>;
+export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, opts?: ModalFuncProps) => Promise<unknown>;
 export declare const exitAlert: () => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;

package/es/utils/index.js

@@ -1,6 +1,7 @@
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import "antd/es/message/style";
@@ -234,37 +235,68 @@ _message.config({
 
 
 export var showError = function showError(text) {
-  _message.error(text);
+  _message.error({
+    content: text,
+    getPopupContainer: function getPopupContainer(e) {
+      return getFullScreenElement();
+    }
+  });
 };
 /** @name 显示警示 */
 
 export var showWarn = function showWarn(text) {
-  _message.warn(text);
+  _message.warn({
+    content: text,
+    getPopupContainer: function getPopupContainer(e) {
+      return getFullScreenElement();
+    }
+  });
 };
 /** @name 显示成功 */
 
 export var showSuccess = function showSuccess(text) {
-  _message.success(text);
+  _message.success({
+    content: text,
+    getPopupContainer: function getPopupContainer(e) {
+      return getFullScreenElement();
+    }
+  });
 };
+export var getFullScreenElement = function getFullScreenElement() {
+  //@ts-ignore
+  return document.fullscreenElement || document.mozFullScreenElement || document.msFullScreenElement || document.webkitFullscreenElement || undefined;
+};
+/**
+ * 弹框提示
+ * @param text 提示信息
+ * @param title 标题，默认 系统提示
+ * @param type 类型
+ * @param opts 附加参数
+ * @returns Promise<Boolean>
+ */
+
 export var showAlert = function showAlert(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return new Promise(function (resolve, reject) {
-    _Modal[type]({
+    _Modal[type](_objectSpread({
       content: text,
       title: title,
+      getContainer: getFullScreenElement(),
       onOk: function onOk() {
         resolve(true);
       },
       onCancel: function onCancel() {
         reject(false);
       }
-    });
+    }, opts));
   });
 };
-export var httpError = function httpError(retMsg, retCode, faultCode, url) {
+export var httpError = function httpError(retMsg, retCode, faultCode) {
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var msg = /*#__PURE__*/React.createElement(React.Fragment, null, "\u9519\u8BEF\u539F\u56E0:", /*#__PURE__*/React.createElement("b", null, retMsg), /*#__PURE__*/React.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/React.createElement("b", null, retCode), /*#__PURE__*/React.createElement("br", null), "\u6545\u969C\u7801:", /*#__PURE__*/React.createElement("b", null, faultCode));
-  return showAlert(msg, '请求接口出错', 'error');
+  return showAlert(msg, '请求接口出错', 'error', opts);
 };
 export var exitAlert = function exitAlert() {
   _Modal.destroyAll();
@@ -280,6 +312,7 @@ export var showConfirm = function showConfirm(text) {
       icon: /*#__PURE__*/React.createElement(QuestionCircleOutlined, null),
       okType: 'danger',
       closable: true,
+      getContainer: getFullScreenElement(),
       onOk: function onOk() {
         resolve(true);
       },

package/lib/components/ImageSelector.js

@@ -407,9 +407,7 @@ function ImageSelector(prop) {
         return loadData(searchKey);
       }
     }, nextMarker ? '加载更多' : '刷新')),
-    getContainer: function getContainer() {
-      return document.body;
-    }
+    getContainer: false
   }, modalProps), /*#__PURE__*/_react.default.createElement("div", {
     style: {
       minHeight: '120px'

package/lib/utils/index.d.ts

@@ -1,3 +1,4 @@
+import { ModalFuncProps } from 'antd';
 import ReactDOM from 'react-dom';
 import React from 'react';
 export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table';
@@ -100,8 +101,17 @@ export declare const showError: (text: string) => void;
 export declare const showWarn: (text: string) => void;
 /** @name 显示成功 */
 export declare const showSuccess: (text: string) => void;
-export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => Promise<unknown>;
-export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => Promise<unknown>;
+export declare const getFullScreenElement: () => any;
+/**
+ * 弹框提示
+ * @param text 提示信息
+ * @param title 标题，默认 系统提示
+ * @param type 类型
+ * @param opts 附加参数
+ * @returns Promise<Boolean>
+ */
+export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn', opts?: ModalFuncProps) => Promise<unknown>;
+export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, opts?: ModalFuncProps) => Promise<unknown>;
 export declare const exitAlert: () => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;

package/lib/utils/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "dateFormat", {
     return _lsProTable.dateFormat;
   }
 });
-exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.exitLoading = exports.exitAlert = exports.deepClone = exports.debounce = void 0;
+exports.getLoginName = exports.getFullScreenElement = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.exitLoading = exports.exitAlert = exports.deepClone = exports.debounce = void 0;
 Object.defineProperty(exports, "getResourceProps", {
   enumerable: true,
   get: function get() {
@@ -47,6 +47,8 @@ var _spin = _interopRequireDefault(require("antd/es/spin"));
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 require("antd/es/modal/style");
 
 var _modal = _interopRequireDefault(require("antd/es/modal"));
@@ -326,7 +328,12 @@ _message2.default.config({
 
 
 var showError = function showError(text) {
-  _message2.default.error(text);
+  _message2.default.error({
+    content: text,
+    getPopupContainer: function getPopupContainer(e) {
+      return getFullScreenElement();
+    }
+  });
 };
 /** @name 显示警示 */
 
@@ -334,7 +341,12 @@ var showError = function showError(text) {
 exports.showError = showError;
 
 var showWarn = function showWarn(text) {
-  _message2.default.warn(text);
+  _message2.default.warn({
+    content: text,
+    getPopupContainer: function getPopupContainer(e) {
+      return getFullScreenElement();
+    }
+  });
 };
 /** @name 显示成功 */
 
@@ -342,34 +354,59 @@ var showWarn = function showWarn(text) {
 exports.showWarn = showWarn;
 
 var showSuccess = function showSuccess(text) {
-  _message2.default.success(text);
+  _message2.default.success({
+    content: text,
+    getPopupContainer: function getPopupContainer(e) {
+      return getFullScreenElement();
+    }
+  });
 };
 
 exports.showSuccess = showSuccess;
 
+var getFullScreenElement = function getFullScreenElement() {
+  //@ts-ignore
+  return document.fullscreenElement || document.mozFullScreenElement || document.msFullScreenElement || document.webkitFullscreenElement || undefined;
+};
+/**
+ * 弹框提示
+ * @param text 提示信息
+ * @param title 标题，默认 系统提示
+ * @param type 类型
+ * @param opts 附加参数
+ * @returns Promise<Boolean>
+ */
+
+
+exports.getFullScreenElement = getFullScreenElement;
+
 var showAlert = function showAlert(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return new Promise(function (resolve, reject) {
-    _modal.default[type]({
+    _modal.default[type]((0, _objectSpread2.default)({
       content: text,
       title: title,
+      getContainer: getFullScreenElement(),
       onOk: function onOk() {
         resolve(true);
       },
       onCancel: function onCancel() {
         reject(false);
       }
-    });
+    }, opts));
   });
 };
 
 exports.showAlert = showAlert;
 
-var httpError = function httpError(retMsg, retCode, faultCode, url) {
+var httpError = function httpError(retMsg, retCode, faultCode) {
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+
   var msg = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "\u9519\u8BEF\u539F\u56E0:", /*#__PURE__*/_react.default.createElement("b", null, retMsg), /*#__PURE__*/_react.default.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/_react.default.createElement("b", null, retCode), /*#__PURE__*/_react.default.createElement("br", null), "\u6545\u969C\u7801:", /*#__PURE__*/_react.default.createElement("b", null, faultCode));
 
-  return showAlert(msg, '请求接口出错', 'error');
+  return showAlert(msg, '请求接口出错', 'error', opts);
 };
 
 exports.httpError = httpError;
@@ -391,6 +428,7 @@ var showConfirm = function showConfirm(text) {
       icon: /*#__PURE__*/_react.default.createElement(_icons.QuestionCircleOutlined, null),
       okType: 'danger',
       closable: true,
+      getContainer: getFullScreenElement(),
       onOk: function onOk() {
         resolve(true);
       },

package/package.json

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