From 03bce59153bdc3d5fca5bb93a550743e5ec7e8f3 Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 25 Nov 2024 16:56:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=87=BA=E7=8E=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=E6=97=B6=EF=BC=8C=E7=BB=99=E5=87=BA?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E7=9A=84=E6=98=8E=E7=A1=AE=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #12745 --- .../chart/server/ChartDataServer.java | 3 +- core/core-frontend/src/locales/en.ts | 3 +- core/core-frontend/src/locales/tw.ts | 7 ++-- core/core-frontend/src/locales/zh-CN.ts | 3 +- .../views/components/ChartError.vue | 36 ++++++++++++++++++- 5 files changed, 45 insertions(+), 7 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 119dd15667..758cdd18dc 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -31,6 +31,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; @@ -89,7 +90,7 @@ public class ChartDataServer implements ChartDataApi { return chartDataManage.calcData(chartViewDTO); } } catch (Exception e) { - DEException.throwException(ResultCode.DATA_IS_WRONG.code(), e.getMessage()); + DEException.throwException(ResultCode.DATA_IS_WRONG.code(), e.getMessage() + "\n\n" + ExceptionUtils.getStackTrace(e)); } return null; } diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index bffff6860d..1da03f8775 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -1476,7 +1476,8 @@ export default { chartName: 'New Chart', chart_show_error: 'Cannot display normally', chart_error_tips: - 'Abnormal data acquisition, if you have any questions, please contact the administrator', + 'Abnormal data acquisition, if you have any questions, please contact the administrator, ', + chart_show_error_info: 'click to show error info', title_cannot_empty: 'Title cannot be empty', table_title_height: 'Header row height', table_item_height: 'Table row height', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 88d20438c6..6a052f4b27 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -1086,7 +1086,7 @@ export default { primary_key_change: '主鍵不能改變:', api_field_not_empty: '欄位不能為空', success_copy: '複製成功', - primary_key_length: '主键必须设置长度: ', + primary_key_length: '主鍵必須設置長度: ', valid: '有效', invalid: '無效', api_step_1: '連結API', @@ -1138,7 +1138,7 @@ export default { set_key: '設為主鍵', field_rename: '重命名', select_type: '選擇資料來源類型', - length: '字段长度', + length: '字段長度', sync_table: '同步指定表', req_completed: '請求成功', sync_rate: '更新頻率', @@ -1438,7 +1438,8 @@ export default { date_split: 'yyyy/MM/dd', chartName: '新建圖表', chart_show_error: '無法正常顯示', - chart_error_tips: '取得資料異常，如有疑問請聯絡管理員', + chart_error_tips: '取得資料異常，如有疑問請聯絡管理員，', + chart_show_error_info: '查看異常原因', title_cannot_empty: '標題不能為空', table_title_height: '表頭行高', table_item_height: '表格行高', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 16bc5390db..64ceae2816 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1440,7 +1440,8 @@ export default { date_split: 'yyyy/MM/dd', chartName: '新建图表', chart_show_error: '无法正常显示', - chart_error_tips: '获取数据异常，如有疑问请联系管理员', + chart_error_tips: '获取数据异常，如有疑问请联系管理员，', + chart_show_error_info: '查看异常原因', title_cannot_empty: '标题不能为空', table_title_height: '表头行高', table_item_height: '表格行高', diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartError.vue b/core/core-frontend/src/views/chart/components/views/components/ChartError.vue index a94e58c46d..6f98354888 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartError.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartError.vue @@ -1,5 +1,6 @@ @@ -30,4 +58,10 @@ const props = defineProps({ height: 100%; flex-direction: column; } +.m-dialog-footer { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; +}