From ac235850a9287dae6977c964213176fa7c86b140 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 09 十二月 2021 14:42:20 +0800
Subject: [PATCH] Merge branch 'refactor/separate-vue' of ssh://192.168.0.10:29418/pcalife/PAM into refactor/separate-vue
---
PAMapp/assets/ts/errorService.ts | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/PAMapp/assets/ts/errorService.ts b/PAMapp/assets/ts/errorService.ts
index e9fa85f..69aed3e 100644
--- a/PAMapp/assets/ts/errorService.ts
+++ b/PAMapp/assets/ts/errorService.ts
@@ -1,9 +1,17 @@
import { MessageBox } from 'element-ui';
import { MessageBoxData } from 'element-ui/types/message-box';
+import * as _ from 'lodash';
-export default function ErrorMessageBox(errorMsg?:string):Promise<MessageBoxData>{
+export default function ErrorMessageBox(errorMsg?:string, errorObj?: any):Promise<MessageBoxData>{
+ errorMsg && console.info('Error: ', errorMsg);
+ errorObj && console.error('Error Details: ', errorObj?.response || errorObj);
+
return MessageBox({
- message: errorMsg ? errorMsg:'蝟餌絞���隤�',
+ message: errorMsg
+ ? `${breakTextByComma(errorMsg)}`
+ : `<div class="message-header"> 蝟餌絞���隤�: ${errorObj?.response?.status} </div>
+ <div class="message-content">${errorObj?.response?.data?.detail}</div>`,
+ dangerouslyUseHTMLString: true,
showClose:false,
showConfirmButton:true,
confirmButtonText:'蝣箄��',
@@ -11,3 +19,7 @@
closeOnClickModal:false,
});
}
+// ������銵�
+function breakTextByComma(errorMsg:string):string{
+ return _.split(errorMsg,"嚗�").join('<br>');
+}
--
Gitblit v1.8.0