ls-pro-common 1.0.84 → 1.0.86

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/components/InputTable.js

@@ -387,6 +387,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       arrowPointAtCenter: arrowPointAtCenter
     }, /*#__PURE__*/React.createElement(MoreOutlined, {
       onClick: function onClick(e) {
+        if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
         setVisible(true);
       }
     })),
@@ -427,6 +428,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       arrowPointAtCenter: arrowPointAtCenter
     }, /*#__PURE__*/React.createElement(MoreOutlined, {
       onClick: function onClick(e) {
+        if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
         setVisible(true);
       }
     })),

package/es/components/common.less

@@ -1,44 +1,44 @@
 body {
-  --ant-primary-color: #1869ed;
-  --ant-primary-color-hover: #418efa;
-  --ant-primary-color-active: #0a4cc7;
-  --ant-primary-color-outline: rgba(24, 105, 237, 0.2);
-  --ant-primary-1: #e6f4ff;
-  --ant-primary-2: #bddfff;
-  --ant-primary-3: #94c8ff;
-  --ant-primary-4: #6baeff;
-  --ant-primary-5: #418efa;
-  --ant-primary-6: #1869ed;
-  --ant-primary-7: #0a4cc7;
-  --ant-primary-color-deprecated-pure: #bed5fa;
-  --ant-primary-color-deprecated-l-35: #bed5fa;
-  --ant-primary-color-deprecated-l-20: #77a6f4;
-  --ant-primary-color-deprecated-t-20: #4687f1;
-  --ant-primary-color-deprecated-t-50: #8cb4f6;
-  --ant-primary-color-deprecated-f-12: rgba(24, 105, 237, 0.12);
+  --ant-primary-color                       : #1869ed;
+  --ant-primary-color-hover                 : #418efa;
+  --ant-primary-color-active                : #0a4cc7;
+  --ant-primary-color-outline               : rgba(24, 105, 237, 0.2);
+  --ant-primary-1                           : #e6f4ff;
+  --ant-primary-2                           : #bddfff;
+  --ant-primary-3                           : #94c8ff;
+  --ant-primary-4                           : #6baeff;
+  --ant-primary-5                           : #418efa;
+  --ant-primary-6                           : #1869ed;
+  --ant-primary-7                           : #0a4cc7;
+  --ant-primary-color-deprecated-pure       : #bed5fa;
+  --ant-primary-color-deprecated-l-35       : #bed5fa;
+  --ant-primary-color-deprecated-l-20       : #77a6f4;
+  --ant-primary-color-deprecated-t-20       : #4687f1;
+  --ant-primary-color-deprecated-t-50       : #8cb4f6;
+  --ant-primary-color-deprecated-f-12       : rgba(24, 105, 237, 0.12);
   --ant-primary-color-active-deprecated-f-30: rgba(230, 244, 255, 0.3);
   --ant-primary-color-active-deprecated-d-02: #dcf0ff;
-  --ant-success-color: #52c41a;
-  --ant-success-color-hover: #73d13d;
-  --ant-success-color-active: #389e0d;
-  --ant-success-color-outline: rgba(82, 196, 26, 0.2);
-  --ant-success-color-deprecated-bg: #f6ffed;
-  --ant-success-color-deprecated-border: #b7eb8f;
-  --ant-error-color: #ff4d4f;
-  --ant-error-color-hover: #ff7875;
-  --ant-error-color-active: #d9363e;
-  --ant-error-color-outline: rgba(255, 77, 79, 0.2);
-  --ant-error-color-deprecated-bg: #fff2f0;
-  --ant-error-color-deprecated-border: #ffccc7;
-  --ant-warning-color: #faad14;
-  --ant-warning-color-hover: #ffc53d;
-  --ant-warning-color-active: #d48806;
-  --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
-  --ant-warning-color-deprecated-bg: #fffbe6;
-  --ant-warning-color-deprecated-border: #ffe58f;
-  --ant-info-color: #1869ed;
-  --ant-info-color-deprecated-bg: #e6f4ff;
-  --ant-info-color-deprecated-border: #94c8ff;
+  --ant-success-color                       : #52c41a;
+  --ant-success-color-hover                 : #73d13d;
+  --ant-success-color-active                : #389e0d;
+  --ant-success-color-outline               : rgba(82, 196, 26, 0.2);
+  --ant-success-color-deprecated-bg         : #f6ffed;
+  --ant-success-color-deprecated-border     : #b7eb8f;
+  --ant-error-color                         : #ff4d4f;
+  --ant-error-color-hover                   : #ff7875;
+  --ant-error-color-active                  : #d9363e;
+  --ant-error-color-outline                 : rgba(255, 77, 79, 0.2);
+  --ant-error-color-deprecated-bg           : #fff2f0;
+  --ant-error-color-deprecated-border       : #ffccc7;
+  --ant-warning-color                       : #faad14;
+  --ant-warning-color-hover                 : #ffc53d;
+  --ant-warning-color-active                : #d48806;
+  --ant-warning-color-outline               : rgba(250, 173, 20, 0.2);
+  --ant-warning-color-deprecated-bg         : #fffbe6;
+  --ant-warning-color-deprecated-border     : #ffe58f;
+  --ant-info-color                          : #1869ed;
+  --ant-info-color-deprecated-bg            : #e6f4ff;
+  --ant-info-color-deprecated-border        : #94c8ff;
 
   // --ant-primary-color                       : #4997E6;
   // --ant-primary-color-hover                 : #74b7f2;
@@ -335,4 +335,11 @@ a:hover {
   .ant-input-clear-icon {
     visibility: visible;
   }
+}
+
+.ant-modal-confirm-body {
+  .ant-modal-confirm-content {
+    max-height: 60vh;
+    overflow  : auto;
+  }
 }

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,11 +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, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => {
-    destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
-};
-export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
+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";
@@ -226,8 +227,13 @@ export var clearCache = function clearCache(key) {
     session ? sessionStorage.clear() : localStorage.clear();
   }
 };
+
+_message.config({
+  maxCount: 1
+});
 /** @name 显示错误 */
 
+
 export var showError = function showError(text) {
   _message.error(text);
 };
@@ -241,35 +247,41 @@ export var showWarn = function showWarn(text) {
 export var showSuccess = function showSuccess(text) {
   _message.success(text);
 };
+export var getFullScreenElement = function getFullScreenElement() {
+  //@ts-ignore
+  return document.fullscreenElement || document.mozFullScreenElement || document.msFullScreenElement || document.webkitFullscreenElement || null;
+};
+/**
+ * 弹框提示
+ * @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';
-
-  if (type === 'success') {
-    return _Modal.success({
-      title: title,
-      content: text
-    });
-  } else if (type === 'error') {
-    return _Modal.error({
-      title: title,
-      content: text
-    });
-  } else if (type === 'warn') {
-    return _Modal.warn({
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  return new Promise(function (resolve, reject) {
+    _Modal[type](_objectSpread({
+      content: text,
       title: title,
-      content: text
-    });
-  }
-
-  return _Modal.info({
-    title: title,
-    content: text
+      getContainer: getFullScreenElement() || false,
+      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));
-  showAlert(msg, '请求接口出错', 'error');
+  return showAlert(msg, '请求接口出错', 'error', opts);
 };
 export var exitAlert = function exitAlert() {
   _Modal.destroyAll();

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/components/InputTable.js

@@ -417,6 +417,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
       arrowPointAtCenter: arrowPointAtCenter
     }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, {
       onClick: function onClick(e) {
+        if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
         setVisible(true);
       }
     })),
@@ -457,6 +458,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
       arrowPointAtCenter: arrowPointAtCenter
     }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, {
       onClick: function onClick(e) {
+        if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
         setVisible(true);
       }
     })),

package/lib/components/common.less

@@ -1,44 +1,44 @@
 body {
-  --ant-primary-color: #1869ed;
-  --ant-primary-color-hover: #418efa;
-  --ant-primary-color-active: #0a4cc7;
-  --ant-primary-color-outline: rgba(24, 105, 237, 0.2);
-  --ant-primary-1: #e6f4ff;
-  --ant-primary-2: #bddfff;
-  --ant-primary-3: #94c8ff;
-  --ant-primary-4: #6baeff;
-  --ant-primary-5: #418efa;
-  --ant-primary-6: #1869ed;
-  --ant-primary-7: #0a4cc7;
-  --ant-primary-color-deprecated-pure: #bed5fa;
-  --ant-primary-color-deprecated-l-35: #bed5fa;
-  --ant-primary-color-deprecated-l-20: #77a6f4;
-  --ant-primary-color-deprecated-t-20: #4687f1;
-  --ant-primary-color-deprecated-t-50: #8cb4f6;
-  --ant-primary-color-deprecated-f-12: rgba(24, 105, 237, 0.12);
+  --ant-primary-color                       : #1869ed;
+  --ant-primary-color-hover                 : #418efa;
+  --ant-primary-color-active                : #0a4cc7;
+  --ant-primary-color-outline               : rgba(24, 105, 237, 0.2);
+  --ant-primary-1                           : #e6f4ff;
+  --ant-primary-2                           : #bddfff;
+  --ant-primary-3                           : #94c8ff;
+  --ant-primary-4                           : #6baeff;
+  --ant-primary-5                           : #418efa;
+  --ant-primary-6                           : #1869ed;
+  --ant-primary-7                           : #0a4cc7;
+  --ant-primary-color-deprecated-pure       : #bed5fa;
+  --ant-primary-color-deprecated-l-35       : #bed5fa;
+  --ant-primary-color-deprecated-l-20       : #77a6f4;
+  --ant-primary-color-deprecated-t-20       : #4687f1;
+  --ant-primary-color-deprecated-t-50       : #8cb4f6;
+  --ant-primary-color-deprecated-f-12       : rgba(24, 105, 237, 0.12);
   --ant-primary-color-active-deprecated-f-30: rgba(230, 244, 255, 0.3);
   --ant-primary-color-active-deprecated-d-02: #dcf0ff;
-  --ant-success-color: #52c41a;
-  --ant-success-color-hover: #73d13d;
-  --ant-success-color-active: #389e0d;
-  --ant-success-color-outline: rgba(82, 196, 26, 0.2);
-  --ant-success-color-deprecated-bg: #f6ffed;
-  --ant-success-color-deprecated-border: #b7eb8f;
-  --ant-error-color: #ff4d4f;
-  --ant-error-color-hover: #ff7875;
-  --ant-error-color-active: #d9363e;
-  --ant-error-color-outline: rgba(255, 77, 79, 0.2);
-  --ant-error-color-deprecated-bg: #fff2f0;
-  --ant-error-color-deprecated-border: #ffccc7;
-  --ant-warning-color: #faad14;
-  --ant-warning-color-hover: #ffc53d;
-  --ant-warning-color-active: #d48806;
-  --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
-  --ant-warning-color-deprecated-bg: #fffbe6;
-  --ant-warning-color-deprecated-border: #ffe58f;
-  --ant-info-color: #1869ed;
-  --ant-info-color-deprecated-bg: #e6f4ff;
-  --ant-info-color-deprecated-border: #94c8ff;
+  --ant-success-color                       : #52c41a;
+  --ant-success-color-hover                 : #73d13d;
+  --ant-success-color-active                : #389e0d;
+  --ant-success-color-outline               : rgba(82, 196, 26, 0.2);
+  --ant-success-color-deprecated-bg         : #f6ffed;
+  --ant-success-color-deprecated-border     : #b7eb8f;
+  --ant-error-color                         : #ff4d4f;
+  --ant-error-color-hover                   : #ff7875;
+  --ant-error-color-active                  : #d9363e;
+  --ant-error-color-outline                 : rgba(255, 77, 79, 0.2);
+  --ant-error-color-deprecated-bg           : #fff2f0;
+  --ant-error-color-deprecated-border       : #ffccc7;
+  --ant-warning-color                       : #faad14;
+  --ant-warning-color-hover                 : #ffc53d;
+  --ant-warning-color-active                : #d48806;
+  --ant-warning-color-outline               : rgba(250, 173, 20, 0.2);
+  --ant-warning-color-deprecated-bg         : #fffbe6;
+  --ant-warning-color-deprecated-border     : #ffe58f;
+  --ant-info-color                          : #1869ed;
+  --ant-info-color-deprecated-bg            : #e6f4ff;
+  --ant-info-color-deprecated-border        : #94c8ff;
 
   // --ant-primary-color                       : #4997E6;
   // --ant-primary-color-hover                 : #74b7f2;
@@ -335,4 +335,11 @@ a:hover {
   .ant-input-clear-icon {
     visibility: visible;
   }
+}
+
+.ant-modal-confirm-body {
+  .ant-modal-confirm-content {
+    max-height: 60vh;
+    overflow  : auto;
+  }
 }

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,11 +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, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => {
-    destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
-};
-export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
+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"));
@@ -316,11 +318,15 @@ var clearCache = function clearCache(key) {
     session ? sessionStorage.clear() : localStorage.clear();
   }
 };
-/** @name 显示错误 */
-
 
 exports.clearCache = clearCache;
 
+_message2.default.config({
+  maxCount: 1
+});
+/** @name 显示错误 */
+
+
 var showError = function showError(text) {
   _message2.default.error(text);
 };
@@ -343,39 +349,49 @@ var showSuccess = function showSuccess(text) {
 
 exports.showSuccess = showSuccess;
 
+var getFullScreenElement = function getFullScreenElement() {
+  //@ts-ignore
+  return document.fullscreenElement || document.mozFullScreenElement || document.msFullScreenElement || document.webkitFullscreenElement || null;
+};
+/**
+ * 弹框提示
+ * @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';
-
-  if (type === 'success') {
-    return _modal.default.success({
-      title: title,
-      content: text
-    });
-  } else if (type === 'error') {
-    return _modal.default.error({
-      title: title,
-      content: text
-    });
-  } else if (type === 'warn') {
-    return _modal.default.warn({
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  return new Promise(function (resolve, reject) {
+    _modal.default[type]((0, _objectSpread2.default)({
+      content: text,
       title: title,
-      content: text
-    });
-  }
-
-  return _modal.default.info({
-    title: title,
-    content: text
+      getContainer: getFullScreenElement() || false,
+      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));
 
-  showAlert(msg, '请求接口出错', 'error');
+  return showAlert(msg, '请求接口出错', 'error', opts);
 };
 
 exports.httpError = httpError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.62",
+    "ls-pro-table": "2.62.63",
     "ls-pro-form": "1.52.34",
     "ls-pro-descriptions":"^1.10.33",
     "@babel/runtime": "^7.16.3",