@aliyun-obv/api 4.5.3 → 4.5.4

package/dist/api.d.ts

@@ -119,7 +119,7 @@ declare const sseClient: (api: string, params: Record<string, any>, options: Iss
  * @param response easyfeatch 返回体
  * @returns
  */
-declare function showAlertDialog(response: any, config?: ShowConfig, request?: any): boolean;
+declare function showAlertDialog(response: any, config?: ShowConfig, request?: any, extra?: any): boolean;
 declare function showAlertDialogWhenNeedLogin(response: any, config?: {}): void;
 
 declare namespace metaService {

package/dist/api.es.js

@@ -21,23 +21,23 @@ function getPostParam(obj = {}) {
   }).join("&");
 }
 
-var __defProp$5 = Object.defineProperty;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
+var __defProp$6 = Object.defineProperty;
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$6 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$6(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
     }
   return a;
 };
-var __publicField$1 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$1 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async$a = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -113,7 +113,7 @@ class BaseFetch {
     } catch (e) {
     }
     if ((url.startsWith("http:") || url.startsWith("https:")) && !url.startsWith(window.location.host)) {
-      newInit = __spreadValues$5({}, Object.assign({}, init, { credentials: "include" }));
+      newInit = __spreadValues$6({}, Object.assign({}, init, { credentials: "include" }));
     }
     if (this.defaults.beforeRequest) {
       return this.defaults.beforeRequest(url, params, newInit, options);
@@ -373,6 +373,18 @@ function convertErrorDetaisAuth(o) {
 function createNoXSS(htmlString) {
   return htmlString.substr(0, 400);
 }
+function structuredErrorMessage(message) {
+  try {
+    const parsed = JSON.parse(message);
+    const isStructured = parsed && typeof parsed === "object" && parsed.result && parsed.level && Array.isArray(parsed.items) && parsed.items.length > 0 && parsed.items.every((item) => item == null ? void 0 : item.code);
+    if (isStructured) {
+      return parsed.items;
+    }
+    return false;
+  } catch (e) {
+    return false;
+  }
+}
 const errorMsgHandler = (err) => {
   let msg = window.ALIYUN_SLS_CONSOLE_MESSAGE && window.ALIYUN_SLS_CONSOLE_MESSAGE[err.code];
   if (err.code === "OnlyInternalAccess") {
@@ -419,25 +431,25 @@ function addRUMLog(log) {
   }
 }
 
-var __defProp$4 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$5 = Object.defineProperty;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 var __async$9 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -464,7 +476,7 @@ commonEasyFetch.defaults.postDefaultInit.headers["Accept"] = "application/json";
 commonEasyFetch.defaults.afterResponse = (response) => __async$9(void 0, null, function* () {
   if (response.status >= 200 && response.status < 300) {
     const data = yield response.json();
-    return __spreadProps$4(__spreadValues$4({}, data != null ? data : {}), {
+    return __spreadProps$5(__spreadValues$5({}, data != null ? data : {}), {
       response
     });
   } else {
@@ -472,10 +484,29 @@ commonEasyFetch.defaults.afterResponse = (response) => __async$9(void 0, null, f
   }
 });
 
+var __defProp$4 = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const ERROR_TITLE = i18n.ERROR;
 i18n.OK;
 let isGlobalAlertShow = false;
-function showConsoleBaseAlertDialog(response, config = {}, request) {
+function showConsoleBaseAlertDialog(response, config = {}, request, extra = {}) {
   var _a, _b, _c;
   if ((response == null ? void 0 : response.code) === "200") {
     return false;
@@ -486,10 +517,10 @@ function showConsoleBaseAlertDialog(response, config = {}, request) {
     message: response.message,
     code: response.code,
     requestId: response.requestId,
-    details: {
+    details: __spreadValues$4({
       url: request ? request.api : void 0,
       method: request ? request.method : void 0
-    }
+    }, extra || {})
   };
   if (response.code === "Unauthorized") {
     if ((_a = response == null ? void 0 : response.rawResponseError) == null ? void 0 : _a.accessDeniedDetail) {
@@ -592,7 +623,7 @@ function showNeedLoginDialog(config) {
     ]
   });
 }
-function showAlertDialog(response, config = {}, request) {
+function showAlertDialog(response, config = {}, request, extra = {}) {
   if (isGlobalAlertShow || response == null) {
     return false;
   }
@@ -611,7 +642,7 @@ function showAlertDialog(response, config = {}, request) {
     title: ERROR_TITLE,
     message: /* @__PURE__ */ React.createElement("div", null, config.content ? config.content : "")
   };
-  showConsoleBaseAlertDialog(response, _params, request);
+  showConsoleBaseAlertDialog(response, _params, request, extra);
   return true;
 }
 function showAlertDialogWhenNeedLogin(response, config = {}) {
@@ -660,13 +691,42 @@ const errorHandler = (request, error, options) => {
         );
       }
     } else {
-      showAlertDialog(
-        error,
-        {
-          content: errorMsgHandler(error)
-        },
-        request
-      );
+      const errorItems = structuredErrorMessage(error.message);
+      if (errorItems && Array.isArray(errorItems) && errorItems.length > 0) {
+        errorItems.forEach((item) => {
+          try {
+            const content = createNoXSS(item.message);
+            delete item.message;
+            delete item.code;
+            showAlertDialog(
+              __spreadProps$4(__spreadValues$4({}, error), {
+                code: item.code
+              }),
+              {
+                content
+              },
+              request,
+              item
+            );
+          } catch (e) {
+            showAlertDialog(
+              error,
+              {
+                content: errorMsgHandler(error)
+              },
+              request
+            );
+          }
+        });
+      } else {
+        showAlertDialog(
+          error,
+          {
+            content: errorMsgHandler(error)
+          },
+          request
+        );
+      }
     }
   }
   let errorMessage = error.message;

package/package.json

@@ -15,5 +15,5 @@
     "styled-components": "^5.2.0",
     "urijs": "^1.19.1"
   },
-  "version": "4.5.3"
+  "version": "4.5.4"
 }