ls-pro-common 1.0.75 → 1.0.77

package/es/components/DtlLayout.d.ts

@@ -36,6 +36,7 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     statusField?: string;
     /** 审核状态值 */
     auditStatus?: number;
+    isView?: boolean;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/es/components/DtlLayout.js

@@ -23,7 +23,9 @@ function DtlLayout(props) {
       btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
       btnStatus = props.btnStatus,
       statusField = props.statusField,
-      auditStatus = props.auditStatus;
+      auditStatus = props.auditStatus,
+      _props$isView = props.isView,
+      isView = _props$isView === void 0 ? false : _props$isView;
 
   var _usePermission = usePermission(),
       checkRight = _usePermission.checkRight;
@@ -43,7 +45,8 @@ function DtlLayout(props) {
   };
 
   var btnDisabled = function btnDisabled(btnKey) {
-    // 优先处理自定义的状态
+    if (isView) return true; // 优先处理自定义的状态
+
     if (btnStatus && typeof btnStatus(btnKey) === 'boolean') {
       return btnStatus(btnKey) || false;
     }
@@ -62,7 +65,7 @@ function DtlLayout(props) {
     // ]
     var b = []; // 有新增或更改权限且未审核，开放出保存按钮
 
-    if ((checkRight(2) || checkRight(4)) && !isAudit()) {
+    if ((checkRight(2) || checkRight(4)) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/React.createElement(_Button, {
         key: "btnSave",
         onClick: function onClick() {
@@ -80,7 +83,7 @@ function DtlLayout(props) {
     } // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
 
 
-    if (props.onAudit && checkRight(64) && !isAudit()) {
+    if (props.onAudit && checkRight(64) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/React.createElement(_Button, {
         key: "btnAudit",
         disabled: btnDisabled('btnAudit'),

package/es/components/IconSelector.js

@@ -81,13 +81,13 @@ function IconSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.clearableInput.containerRef.current.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (icon) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [icon]);

package/es/components/ImageSelector.js

@@ -241,13 +241,13 @@ function ImageSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.clearableInput.containerRef.current.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (imgUrl) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [imgUrl]);

package/es/components/InputTable.js

@@ -186,6 +186,8 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     if (!textName && formValue[name]) {
       formValue[textNameProp] = formValue[name];
       formRef === null || formRef === void 0 ? void 0 : formRef.current.setFieldsValue(_objectSpread({}, formValue));
+    } else if (textName && formValue[textName]) {
+      setText(formValue[textName]);
     }
   }, []); // 处理返回数据
 
@@ -343,18 +345,19 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       }, "\u786E\u8BA4")];
     },
     headerTitle: "\u53CC\u51FB\u9009\u4E2D\u5F53\u524D\u884C\u6570\u636E"
-  }, tableConfig));
+  }, tableConfig)); // 处理有值时，可清空
+
   useEffect(function () {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
 
     try {
-      var el = inputRef.current.clearableInput.containerRef.current.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (text) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [text, rest, fieldProps]);

package/es/components/common.less

@@ -186,11 +186,13 @@ body {
 }
 
 .loading {
-  height     : 100%;
-  width      : 100%;
-  text-align : center;
-  padding-top: 20%;
-  background : #fff;
+  height         : 100%;
+  width          : 100%;
+  position       : absolute;
+  display        : flex;
+  align-items    : center;
+  justify-content: center;
+  background     : #fff;
 }
 
 #myloading {
@@ -216,9 +218,9 @@ body {
   border-radius: 4px;
   border-color : var(--ant-primary-color);
   color        : var(--ant-primary-color);
-  height     : 28px;
-  line-height: 1.2;
-  padding    : 2px 15px;
+  height       : 28px;
+  line-height  : 1.2;
+  padding      : 2px 15px;
 
   &:active {
     border-color: var(--ant-primary-color-hover);
@@ -226,8 +228,8 @@ body {
   }
 }
 
-.ant-btn-icon-only{
-  padding    : 2px 0;
+.ant-btn-icon-only {
+  padding: 2px 0;
 }
 
 .ant-btn-primary {
@@ -305,6 +307,8 @@ a:hover {
   }
 }
 
-
-
-
+.ant-input-has-value:hover{
+   .ant-input-clear-icon{
+    visibility: visible;
+   }
+}

package/es/http/index.js

@@ -1,7 +1,7 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, toGatewayUrl, reLogin, showLoading, exitLoading } from '../utils'; //默认超时时间为1分钟
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading } from '../utils'; //默认超时时间为1分钟
 
 var request = extend({
   timeout: 60000
@@ -63,7 +63,7 @@ request.interceptors.request.use(function (url, options) {
 
 request.interceptors.response.use( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response, options) {
-    var noMsg, _data$flag, _data$flag2, data, _data$flag3, _data$flag4, _data$flag5, _data, retCode, retMsg, status;
+    var noMsg, _data$flag, _data$flag2, _data$flag3, _data$flag4, data, retCode, retMsg, requestId, faultCode, _data$flag5, _data$flag6, _data$flag7, _data$flag8, _data, _retCode, _retMsg, status, _requestId, _faultCode;
 
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -72,7 +72,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
             noMsg = getUrlQuery('noMsg', options.url); // http 状态码错误
 
             if (!(response.status < 200 || response.status >= 300)) {
-              _context.next = 14;
+              _context.next = 18;
               break;
             }
 
@@ -82,57 +82,71 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
           case 5:
             data = _context.sent;
+            retCode = (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode;
+            retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
+            requestId = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.requestId;
+            faultCode = (_data$flag4 = data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.faultCode;
 
-            if (((_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode) === 'timeout' || ((_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retCode) === '4011') {
+            if (retCode === 'timeout' || retCode === '4011') {
               reLogin();
             } else if (noMsg !== '1') {
-              showError(options.url + ((_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.retMsg));
+              if (faultCode) {
+                httpError(retMsg, retCode, faultCode, options.url);
+              } else {
+                showError(retMsg + options.url);
+              }
             }
 
-            _context.next = 12;
+            _context.next = 16;
             break;
 
-          case 9:
-            _context.prev = 9;
+          case 13:
+            _context.prev = 13;
             _context.t0 = _context["catch"](2);
-            showError(options.url + response.statusText);
+            showError(options.url + (_context.t0.message || response.statusText));
 
-          case 12:
-            _context.next = 22;
+          case 16:
+            _context.next = 28;
             break;
 
-          case 14:
+          case 18:
             if (!(noMsg !== '1')) {
-              _context.next = 22;
+              _context.next = 28;
               break;
             }
 
-            _context.next = 17;
+            _context.next = 21;
             return response.clone().json();
 
-          case 17:
+          case 21:
             _data = _context.sent;
-            retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
-            retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '访问接口出错';
+            _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retCode) || '0';
+            _retMsg = ((_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.retMsg) || '访问接口出错';
             status = (getUrlQuery('apiStatus') || '0').split(',');
+            _requestId = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.requestId;
+            _faultCode = (_data$flag8 = _data.flag) === null || _data$flag8 === void 0 ? void 0 : _data$flag8.faultCode;
 
-            if (retCode && !status.includes(retCode)) {
-              if (retCode === 'timeout' || retCode === '4011') {
+            if (_retCode && !status.includes(_retCode)) {
+              if (_retCode === 'timeout' || _retCode === '4011') {
                 reLogin();
               } else {
-                showError(retMsg);
+                if (_faultCode) {
+                  httpError(_retMsg, _retCode, _faultCode, options.url);
+                } else {
+                  showError(_retMsg);
+                }
               }
             }
 
-          case 22:
+          case 28:
             return _context.abrupt("return", response);
 
-          case 23:
+          case 29:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 9]]);
+    }, _callee, null, [[2, 13]]);
   }));
 
   return function (_x, _x2) {

package/es/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/es/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/es/utils/index.js

@@ -6,11 +6,11 @@ import _Modal from "antd/es/modal";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import React from "react";
 import ReactDOM from 'react-dom';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { dateFormat, toGatewayUrl } from 'ls-pro-table';
 import { httpPost } from '../http';
+import React from 'react';
 export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table';
 /**
  * 设置文档title
@@ -238,6 +238,39 @@ export var showWarn = function showWarn(text) {
 export var showSuccess = function showSuccess(text) {
   _message.success(text);
 };
+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({
+      title: title,
+      content: text
+    });
+  }
+
+  return _Modal.info({
+    title: title,
+    content: text
+  });
+};
+export var httpError = function httpError(retMsg, retCode, faultCode, url) {
+  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');
+};
+export var exitAlert = function exitAlert() {
+  _Modal.destroyAll();
+};
 /** @name 显示确认 */
 
 export var showConfirm = function showConfirm(text) {

package/lib/components/DtlLayout.d.ts

@@ -36,6 +36,7 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     statusField?: string;
     /** 审核状态值 */
     auditStatus?: number;
+    isView?: boolean;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/lib/components/DtlLayout.js

@@ -40,7 +40,9 @@ function DtlLayout(props) {
       btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
       btnStatus = props.btnStatus,
       statusField = props.statusField,
-      auditStatus = props.auditStatus;
+      auditStatus = props.auditStatus,
+      _props$isView = props.isView,
+      isView = _props$isView === void 0 ? false : _props$isView;
 
   var _usePermission = (0, _usePermission2.default)(),
       checkRight = _usePermission.checkRight;
@@ -60,7 +62,8 @@ function DtlLayout(props) {
   };
 
   var btnDisabled = function btnDisabled(btnKey) {
-    // 优先处理自定义的状态
+    if (isView) return true; // 优先处理自定义的状态
+
     if (btnStatus && typeof btnStatus(btnKey) === 'boolean') {
       return btnStatus(btnKey) || false;
     }
@@ -79,7 +82,7 @@ function DtlLayout(props) {
     // ]
     var b = []; // 有新增或更改权限且未审核，开放出保存按钮
 
-    if ((checkRight(2) || checkRight(4)) && !isAudit()) {
+    if ((checkRight(2) || checkRight(4)) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
         key: "btnSave",
         onClick: function onClick() {
@@ -97,7 +100,7 @@ function DtlLayout(props) {
     } // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
 
 
-    if (props.onAudit && checkRight(64) && !isAudit()) {
+    if (props.onAudit && checkRight(64) && !isAudit() && !isView) {
       b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
         key: "btnAudit",
         disabled: btnDisabled('btnAudit'),

package/lib/components/IconSelector.js

@@ -104,13 +104,13 @@ function IconSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.clearableInput.containerRef.current.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (icon) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [icon]);

package/lib/components/ImageSelector.js

@@ -271,13 +271,13 @@ function ImageSelector(prop) {
 
     try {
       if (!inputRef.current) return;
-      var el = inputRef.current.clearableInput.containerRef.current.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (imgUrl) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [imgUrl]);

package/lib/components/InputTable.js

@@ -214,6 +214,8 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     if (!textName && formValue[name]) {
       formValue[textNameProp] = formValue[name];
       formRef === null || formRef === void 0 ? void 0 : formRef.current.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+    } else if (textName && formValue[textName]) {
+      setText(formValue[textName]);
     }
   }, []); // 处理返回数据
 
@@ -372,19 +374,20 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
       }, "\u786E\u8BA4")];
     },
     headerTitle: "\u53CC\u51FB\u9009\u4E2D\u5F53\u524D\u884C\u6570\u636E"
-  }, tableConfig));
+  }, tableConfig)); // 处理有值时，可清空
+
 
   (0, _react.useEffect)(function () {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
 
     try {
-      var el = inputRef.current.clearableInput.containerRef.current.querySelector('.ant-input-clear-icon');
+      var el = inputRef.current.input.parentNode;
       if (!el) return;
 
       if (text) {
-        el.classList.remove('ant-input-clear-icon-hidden');
+        el.classList.add('ant-input-has-value');
       } else {
-        el.classList.add('ant-input-clear-icon-hidden');
+        el.classList.remove('ant-input-has-value');
       }
     } catch (e) {}
   }, [text, rest, fieldProps]);

package/lib/components/common.less

@@ -186,11 +186,13 @@ body {
 }
 
 .loading {
-  height     : 100%;
-  width      : 100%;
-  text-align : center;
-  padding-top: 20%;
-  background : #fff;
+  height         : 100%;
+  width          : 100%;
+  position       : absolute;
+  display        : flex;
+  align-items    : center;
+  justify-content: center;
+  background     : #fff;
 }
 
 #myloading {
@@ -216,9 +218,9 @@ body {
   border-radius: 4px;
   border-color : var(--ant-primary-color);
   color        : var(--ant-primary-color);
-  height     : 28px;
-  line-height: 1.2;
-  padding    : 2px 15px;
+  height       : 28px;
+  line-height  : 1.2;
+  padding      : 2px 15px;
 
   &:active {
     border-color: var(--ant-primary-color-hover);
@@ -226,8 +228,8 @@ body {
   }
 }
 
-.ant-btn-icon-only{
-  padding    : 2px 0;
+.ant-btn-icon-only {
+  padding: 2px 0;
 }
 
 .ant-btn-primary {
@@ -305,6 +307,8 @@ a:hover {
   }
 }
 
-
-
-
+.ant-input-has-value:hover{
+   .ant-input-clear-icon{
+    visibility: visible;
+   }
+}

package/lib/http/index.js

@@ -82,7 +82,7 @@ request.interceptors.request.use(function (url, options) {
 
 request.interceptors.response.use( /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(response, options) {
-    var noMsg, _data$flag, _data$flag2, data, _data$flag3, _data$flag4, _data$flag5, _data, retCode, retMsg, status;
+    var noMsg, _data$flag, _data$flag2, _data$flag3, _data$flag4, data, retCode, retMsg, requestId, faultCode, _data$flag5, _data$flag6, _data$flag7, _data$flag8, _data, _retCode, _retMsg, status, _requestId, _faultCode;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
@@ -91,7 +91,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
             noMsg = (0, _utils.getUrlQuery)('noMsg', options.url); // http 状态码错误
 
             if (!(response.status < 200 || response.status >= 300)) {
-              _context.next = 14;
+              _context.next = 18;
               break;
             }
 
@@ -101,57 +101,71 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
           case 5:
             data = _context.sent;
+            retCode = (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode;
+            retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
+            requestId = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.requestId;
+            faultCode = (_data$flag4 = data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.faultCode;
 
-            if (((_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode) === 'timeout' || ((_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retCode) === '4011') {
+            if (retCode === 'timeout' || retCode === '4011') {
               (0, _utils.reLogin)();
             } else if (noMsg !== '1') {
-              (0, _utils.showError)(options.url + ((_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.retMsg));
+              if (faultCode) {
+                (0, _utils.httpError)(retMsg, retCode, faultCode, options.url);
+              } else {
+                (0, _utils.showError)(retMsg + options.url);
+              }
             }
 
-            _context.next = 12;
+            _context.next = 16;
             break;
 
-          case 9:
-            _context.prev = 9;
+          case 13:
+            _context.prev = 13;
             _context.t0 = _context["catch"](2);
-            (0, _utils.showError)(options.url + response.statusText);
+            (0, _utils.showError)(options.url + (_context.t0.message || response.statusText));
 
-          case 12:
-            _context.next = 22;
+          case 16:
+            _context.next = 28;
             break;
 
-          case 14:
+          case 18:
             if (!(noMsg !== '1')) {
-              _context.next = 22;
+              _context.next = 28;
               break;
             }
 
-            _context.next = 17;
+            _context.next = 21;
             return response.clone().json();
 
-          case 17:
+          case 21:
             _data = _context.sent;
-            retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
-            retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '访问接口出错';
+            _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retCode) || '0';
+            _retMsg = ((_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.retMsg) || '访问接口出错';
             status = ((0, _utils.getUrlQuery)('apiStatus') || '0').split(',');
+            _requestId = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.requestId;
+            _faultCode = (_data$flag8 = _data.flag) === null || _data$flag8 === void 0 ? void 0 : _data$flag8.faultCode;
 
-            if (retCode && !status.includes(retCode)) {
-              if (retCode === 'timeout' || retCode === '4011') {
+            if (_retCode && !status.includes(_retCode)) {
+              if (_retCode === 'timeout' || _retCode === '4011') {
                 (0, _utils.reLogin)();
               } else {
-                (0, _utils.showError)(retMsg);
+                if (_faultCode) {
+                  (0, _utils.httpError)(_retMsg, _retCode, _faultCode, options.url);
+                } else {
+                  (0, _utils.showError)(_retMsg);
+                }
               }
             }
 
-          case 22:
+          case 28:
             return _context.abrupt("return", response);
 
-          case 23:
+          case 29:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 9]]);
+    }, _callee, null, [[2, 13]]);
   }));
 
   return function (_x, _x2) {