dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao 2022-05-25 13:41:30 +08:00
commit 46c00aa3f4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/pom.xml
View File

@ -150,7 +150,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.79</version>
<version>1.2.83</version>
</dependency>
<dependency>
<groupId>com.auth0</groupId>

2
frontend/src/views/dataset/add/AddExcel.vue
View File

@ -367,7 +367,7 @@ export default {
}
}
if (this.param.editType === 0 && this.param.tableId) {
$confirm(i18n.t('dataset.repeat_datasource_msg'), () => {
$confirm(i18n.t('dataset.excel_replace_msg'), () => {
this.saveExcelData(sheetFileMd5, table)
})
}else {