浏览代码

优化 所有提示消息合并相同消息

zhontai 2 年之前
父节点
当前提交
4ed464d140
共有 3 个文件被更改,包括 22 次插入10 次删除
  1. 3 3
      gen/templates/http-client.ejs
  2. 3 3
      src/api/admin/http-client.ts
  3. 16 4
      src/globalProperties/modal.ts

+ 3 - 3
gen/templates/http-client.ejs

@@ -198,7 +198,7 @@ export class HttpClient<SecurityDataType = unknown> {
      if (error.message.includes('Network')) message = window.navigator.onLine ? '服务端异常' : '您已断网'
      if (error.message.includes('Network')) message = window.navigator.onLine ? '服务端异常' : '您已断网'
  
  
      if (message) {
      if (message) {
-       ElMessage.error({ message })
+       ElMessage.error({ message, grouping: true })
      }
      }
    }
    }
  
  
@@ -365,11 +365,11 @@ export class HttpClient<SecurityDataType = unknown> {
             const data = res.data
             const data = res.data
             if (data.success) {
             if (data.success) {
               if (showSuccessMessage) {
               if (showSuccessMessage) {
-                ElMessage.success({ message: data.msg ? data.msg : '操作成功' })
+                ElMessage.success({ message: data.msg ? data.msg : '操作成功', grouping: true })
               }
               }
             } else {
             } else {
               if (showErrorMessage) {
               if (showErrorMessage) {
-                ElMessage.error({ message: data.msg ? data.msg : '操作失败' })
+                ElMessage.error({ message: data.msg ? data.msg : '操作失败', grouping: true })
               }
               }
               // return Promise.reject(res)
               // return Promise.reject(res)
             }
             }

+ 3 - 3
src/api/admin/http-client.ts

@@ -202,7 +202,7 @@ export class HttpClient<SecurityDataType = unknown> {
     if (error.message.includes('Network')) message = window.navigator.onLine ? '服务端异常' : '您已断网'
     if (error.message.includes('Network')) message = window.navigator.onLine ? '服务端异常' : '您已断网'
 
 
     if (message) {
     if (message) {
-      ElMessage.error({ message })
+      ElMessage.error({ message, grouping: true })
     }
     }
   }
   }
 
 
@@ -366,11 +366,11 @@ export class HttpClient<SecurityDataType = unknown> {
         const data = res.data
         const data = res.data
         if (data.success) {
         if (data.success) {
           if (showSuccessMessage) {
           if (showSuccessMessage) {
-            ElMessage.success({ message: data.msg ? data.msg : '操作成功' })
+            ElMessage.success({ message: data.msg ? data.msg : '操作成功', grouping: true })
           }
           }
         } else {
         } else {
           if (showErrorMessage) {
           if (showErrorMessage) {
-            ElMessage.error({ message: data.msg ? data.msg : '操作失败' })
+            ElMessage.error({ message: data.msg ? data.msg : '操作失败', grouping: true })
           }
           }
           // return Promise.reject(res)
           // return Promise.reject(res)
         }
         }

+ 16 - 4
src/globalProperties/modal.ts

@@ -8,19 +8,31 @@ let loadingInstance: any
 export default {
 export default {
   // 消息提示
   // 消息提示
   msg(content: any) {
   msg(content: any) {
-    ElMessage.info(content)
+    ElMessage.info({
+      message: content,
+      grouping: true,
+    })
   },
   },
   // 错误消息
   // 错误消息
   msgError(content: any) {
   msgError(content: any) {
-    ElMessage.error(content)
+    ElMessage.error({
+      message: content,
+      grouping: true,
+    })
   },
   },
   // 成功消息
   // 成功消息
   msgSuccess(content: any) {
   msgSuccess(content: any) {
-    ElMessage.success(content)
+    ElMessage.success({
+      message: content,
+      grouping: true,
+    })
   },
   },
   // 警告消息
   // 警告消息
   msgWarning(content: any) {
   msgWarning(content: any) {
-    ElMessage.warning(content)
+    ElMessage.warning({
+      message: content,
+      grouping: true,
+    })
   },
   },
   // 弹出提示
   // 弹出提示
   alert(content: any) {
   alert(content: any) {