ls-pro-common 1.0.75 → 1.0.77

package/lib/typing.d.ts

@@ -4,6 +4,8 @@ export declare type ApiResponse = Record<string, any> & {
         retCode?: string;
         retMsg?: string;
         retDetail?: string;
+        faultCode?: string;
+        requestId?: string;
     };
     rows?: [];
     data?: any;

package/lib/utils/index.d.ts

@@ -1,3 +1,5 @@
+import ReactDOM from 'react-dom';
+import React from 'react';
 export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table';
 /**
  * 设置文档title
@@ -98,6 +100,12 @@ 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 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.deepClone = exports.debounce = void 0;
+exports.getLoginName = 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() {
@@ -25,14 +25,14 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _lsProTable.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.openPageInMain = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
+exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.openPageInMain = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.httpError = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
     return _lsProTable.setUrlQuery;
   }
 });
-exports.throttle = exports.statusList = exports.showWarn = exports.showSuccess = exports.showLoading = exports.showError = exports.showConfirm = void 0;
+exports.throttle = exports.statusList = exports.showWarn = exports.showSuccess = exports.showLoading = exports.showError = exports.showConfirm = exports.showAlert = void 0;
 Object.defineProperty(exports, "toGatewayUrl", {
   enumerable: true,
   get: function get() {
@@ -57,8 +57,6 @@ var _message2 = _interopRequireDefault(require("antd/es/message"));
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
-var _react = _interopRequireDefault(require("react"));
-
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
 var _icons = require("@ant-design/icons");
@@ -67,6 +65,8 @@ var _lsProTable = require("ls-pro-table");
 
 var _http = require("../http");
 
+var _react = _interopRequireDefault(require("react"));
+
 /**
  * 设置文档title
  * @param {*} title
@@ -338,10 +338,53 @@ exports.showWarn = showWarn;
 var showSuccess = function showSuccess(text) {
   _message2.default.success(text);
 };
+
+exports.showSuccess = showSuccess;
+
+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({
+      title: title,
+      content: text
+    });
+  }
+
+  return _modal.default.info({
+    title: title,
+    content: text
+  });
+};
+
+exports.showAlert = showAlert;
+
+var httpError = function httpError(retMsg, retCode, faultCode, url) {
+  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');
+};
+
+exports.httpError = httpError;
+
+var exitAlert = function exitAlert() {
+  _modal.default.destroyAll();
+};
 /** @name 显示确认 */
 
 
-exports.showSuccess = showSuccess;
+exports.exitAlert = exitAlert;
 
 var showConfirm = function showConfirm(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.75",
+  "version": "1.0.77",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.55",
+    "ls-pro-table": "2.62.57",
     "ls-pro-form": "1.52.33",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",