From 399e75b777fe79b11719cc3500e5bebee2ac2885 Mon Sep 17 00:00:00 2001 From: Shenwei Wang Date: Mon, 22 Aug 2022 15:24:16 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(handleHttpError):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=AF=B7=E6=B1=82=E6=8A=A5=E9=94=99msg=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E5=BC=B9=E7=AA=97=E7=9A=84=E9=97=AE=E9=A2=98=20=20ref?= =?UTF-8?q?s=20INSTANCE-2681"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/brick-kit/src/handleHttpError.spec.tsx | 9 +-------- packages/brick-kit/src/handleHttpError.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/brick-kit/src/handleHttpError.spec.tsx b/packages/brick-kit/src/handleHttpError.spec.tsx index f7caca8690..0872b8adcd 100644 --- a/packages/brick-kit/src/handleHttpError.spec.tsx +++ b/packages/brick-kit/src/handleHttpError.spec.tsx @@ -129,14 +129,7 @@ describe("handleHttpError", () => { handleHttpError(new Error("oops")); expect(spyOnModalError).toBeCalledWith({ title: "brick-kit:REQUEST_FAILED", - content: ( -
- ), + content:
Error: oops
, okText: "brick-kit:MODAL_OK", }); }); diff --git a/packages/brick-kit/src/handleHttpError.tsx b/packages/brick-kit/src/handleHttpError.tsx index a0db3b56b7..901f8dfb92 100644 --- a/packages/brick-kit/src/handleHttpError.tsx +++ b/packages/brick-kit/src/handleHttpError.tsx @@ -79,6 +79,7 @@ export function handleHttpError( }); return; } + return Modal.error({ title: i18next.t(`${NS_BRICK_KIT}:${K.REQUEST_FAILED}`), content: ( @@ -86,8 +87,9 @@ export function handleHttpError( style={{ whiteSpace: "pre-wrap", }} - dangerouslySetInnerHTML={{ __html: httpErrorToString(error) }} - /> + > + {httpErrorToString(error)} +
), okText: i18next.t(`${NS_BRICK_KIT}:${K.MODAL_OK}`), });