github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 【数据源】excel数据源sheet页名称相同，进行追加提示信息错误

Browse Source
This commit is contained in:
taojinlong 2025-01-07 12:01:26 +08:00 committed by taojinlong
parent df30d6c570
commit e0cc261758
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/locales/en.ts
View File

@ -2199,7 +2199,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
edit_calc_field: 'Edit calculated field', edit_calc_field: 'Edit calculated field',
calc_field: 'Calculate fields', calc_field: 'Calculate fields',
show_sql: 'Show SQL', 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', merge: 'Merge',
no_merge: 'Do not merge', no_merge: 'Do not merge',
merge_msg: merge_msg:

2
core/core-frontend/src/locales/tw.ts
View File

@ -2146,7 +2146,7 @@ export default {
edit_calc_field: '編輯計算欄位', edit_calc_field: '編輯計算欄位',
calc_field: '計算欄位', calc_field: '計算欄位',
show_sql: '顯示SQL', show_sql: '顯示SQL',
ple_select_excel: '工作表名稱不匹配，請重新上傳文件', ple_select_excel: '請重新上傳要導入的 Excel',
merge: '合併', merge: '合併',
no_merge: '不合併', no_merge: '不合併',
merge_msg: '資料表中存在欄位一致的情況，是否合併到一個資料集中?', merge_msg: '資料表中存在欄位一致的情況，是否合併到一個資料集中?',

2
core/core-frontend/src/locales/zh-CN.ts
View File

@ -2148,7 +2148,7 @@ export default {
edit_calc_field: '编辑计算字段', edit_calc_field: '编辑计算字段',
calc_field: '计算字段', calc_field: '计算字段',
show_sql: '显示SQL', show_sql: '显示SQL',
ple_select_excel: 'Sheet页名称不匹配，请重新上传文件', ple_select_excel: '请重新上传要导入的 Excel',
merge: '合并', merge: '合并',
no_merge: '不合并', no_merge: '不合并',
merge_msg: '数据表中存在字段一致的情况，是否合并到一个数据集中?', merge_msg: '数据表中存在字段一致的情况，是否合并到一个数据集中?',

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

@ -192,6 +192,8 @@ const uploadSuccess = response => {
return return
} }
columns.value = [] columns.value = []
Object.assign(sheetObj, cloneDeep(defaultSheetObj))
multipleSelection.value = []
uploading.value = false uploading.value = false
if (!param.value.name) { if (!param.value.name) {
param.value.name = response.data.excelLabel param.value.name = response.data.excelLabel