fix(数据源): 修复 Excel 文件上传时超过 1 分钟被取消但是系统无提示信息给用户

core/core-frontend/src/api/datasource.ts

@@ -152,6 +152,7 @@ export const uploadFile = async (data): Promise<IResponse> => {
     .post({
       url: '/datasource/uploadFile',
       data,
+      loading: true,
       headersType: 'multipart/form-data;'
     })
     .then(res => {

core/core-frontend/src/config/axios/service.ts

@@ -210,7 +210,7 @@ service.interceptors.response.use(
     ) {
       ElMessage({
         type: 'error',
-        message: error.message,
+        message: error.response?.data?.msg ? error.response?.data?.msg : error.message,
         showClose: true
       })
     } else if (error?.config?.url.startsWith('/xpackComponent/content')) {

core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue

@@ -354,11 +354,24 @@ const uploadExcel = () => {
   formData.append('type', '')
   formData.append('editType', param.value.editType)
   formData.append('id', param.value.id || 0)
-  return uploadFile(formData).then(res => {
+  loading.value = true
-    upload.value?.clearFiles()
+  return uploadFile(formData)
-    uploadAgain.value?.clearFiles()
+    .then(res => {
-    uploadSuccess(res)
+      upload.value?.clearFiles()
-  })
+      uploadAgain.value?.clearFiles()
+      uploadSuccess(res)
+      loading.value = false
+    })
+    .catch(error => {
+      if (error.code === 'ECONNABORTED') {
+        ElMessage({
+          type: 'error',
+          message: error.message,
+          showClose: true
+        })
+      }
+      loading.value = false
+    })
 }
 const excelForm = ref()
 const submitForm = () => {
@@ -394,6 +407,7 @@ defineExpose({
         require-asterisk-position="right"
         :model="param"
         label-position="top"
+        v-loading="loading"
       >
         <el-form-item
           v-if="sheetFile.name"

sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java

@@ -1,5 +1,7 @@
 package io.dataease.filter;
 
+import io.dataease.result.ResultMessage;
+import io.dataease.utils.JsonUtil;
 import jakarta.servlet.*;
 import jakarta.servlet.FilterConfig;
 import jakarta.servlet.http.HttpServletResponse;
@@ -36,7 +38,14 @@ public class HtmlResourceFilter implements Filter, Ordered {
             httpResponse.setHeader(HttpHeaders.EXPIRES, "0");
         }
         // 继续执行过滤器链
-        filterChain.doFilter(servletRequest, httpResponse);
+        try {
+            filterChain.doFilter(servletRequest, httpResponse);
+        }catch (Exception e){
+            httpResponse.setContentType("application/json");
+            httpResponse.setCharacterEncoding("UTF-8");
+            httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            httpResponse.getWriter().write(JsonUtil.toJSONString(new ResultMessage(HttpServletResponse.SC_BAD_REQUEST,e.getMessage())).toString());
+        }
     }
 
     @Override