From e0cc261758d7cf592fa4dfbcd92674216cc0036d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 7 Jan 2025 12:01:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E3=80=91excel=E6=95=B0=E6=8D=AE=E6=BA=90sheet=E9=A1=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9B=B8=E5=90=8C=EF=BC=8C=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 2 +- core/core-frontend/src/locales/tw.ts | 2 +- core/core-frontend/src/locales/zh-CN.ts | 2 +- .../src/views/visualized/data/datasource/form/ExcelDetail.vue | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index f32dcd8b39..608ca0fb80 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -2199,7 +2199,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr edit_calc_field: 'Edit calculated field', calc_field: 'Calculate fields', show_sql: 'Show SQL', - ple_select_excel: "The sheet names don't match. Please upload the file again.", + ple_select_excel: 'Please re-upload the Excel to be imported.', merge: 'Merge', no_merge: 'Do not merge', merge_msg: diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 28bc32e0b3..2209c3d3f3 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -2146,7 +2146,7 @@ export default { edit_calc_field: '編輯計算欄位', calc_field: '計算欄位', show_sql: '顯示SQL', - ple_select_excel: '工作表名稱不匹配,請重新上傳文件', + ple_select_excel: '請重新上傳要導入的 Excel', merge: '合併', no_merge: '不合併', merge_msg: '資料表中存在欄位一致的情況,是否合併到一個資料集中?', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 69ec3b9cb5..f477f423f8 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2148,7 +2148,7 @@ export default { edit_calc_field: '编辑计算字段', calc_field: '计算字段', show_sql: '显示SQL', - ple_select_excel: 'Sheet页名称不匹配,请重新上传文件', + ple_select_excel: '请重新上传要导入的 Excel', merge: '合并', no_merge: '不合并', merge_msg: '数据表中存在字段一致的情况,是否合并到一个数据集中?', diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue index 274c97e2a7..33dd6f4c11 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue @@ -192,6 +192,8 @@ const uploadSuccess = response => { return } columns.value = [] + Object.assign(sheetObj, cloneDeep(defaultSheetObj)) + multipleSelection.value = [] uploading.value = false if (!param.value.name) { param.value.name = response.data.excelLabel