From db369f9ec74cd025e162b99f7ec1ac343733bbc8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 16 十二月 2021 11:07:48 +0800
Subject: [PATCH] refactor: login 1. 整理 methods 順序 2. 使用 loginService

---
 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