From 60c22a257f18ed9e482de8434850ec4688fd6707 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 03 十二月 2021 16:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/assets/ts/errorService.ts | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/PAMapp/assets/ts/errorService.ts b/PAMapp/assets/ts/errorService.ts
index 240370b..69aed3e 100644
--- a/PAMapp/assets/ts/errorService.ts
+++ b/PAMapp/assets/ts/errorService.ts
@@ -1,5 +1,6 @@
import { MessageBox } from 'element-ui';
import { MessageBoxData } from 'element-ui/types/message-box';
+import * as _ from 'lodash';
export default function ErrorMessageBox(errorMsg?:string, errorObj?: any):Promise<MessageBoxData>{
errorMsg && console.info('Error: ', errorMsg);
@@ -7,7 +8,7 @@
return MessageBox({
message: errorMsg
- ? errorMsg
+ ? `${breakTextByComma(errorMsg)}`
: `<div class="message-header"> 蝟餌絞���隤�: ${errorObj?.response?.status} </div>
<div class="message-content">${errorObj?.response?.data?.detail}</div>`,
dangerouslyUseHTMLString: true,
@@ -18,3 +19,7 @@
closeOnClickModal:false,
});
}
+// ������銵�
+function breakTextByComma(errorMsg:string):string{
+ return _.split(errorMsg,"嚗�").join('<br>');
+}
--
Gitblit v1.8.0