center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 国际化

Browse Source
This commit is contained in:
taojinlong 2022-02-23 18:29:55 +08:00
parent 85012cb42e
commit eb4dcab708
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1698,8 +1698,12 @@ public class DataSetTableService {
if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) {
return;
}
datasetTableIncrementalConfig.setIncrementalAdd(datasetTableIncrementalConfig.getIncrementalAdd().trim());
datasetTableIncrementalConfig.setIncrementalDelete(datasetTableIncrementalConfig.getIncrementalDelete().trim());
if(StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd())){
datasetTableIncrementalConfig.setIncrementalAdd(datasetTableIncrementalConfig.getIncrementalAdd().trim());
}
if(StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete())){
datasetTableIncrementalConfig.setIncrementalDelete(datasetTableIncrementalConfig.getIncrementalDelete().trim());
}
if (StringUtils.isEmpty(datasetTableIncrementalConfig.getId())) {
datasetTableIncrementalConfig.setId(UUID.randomUUID().toString());
datasetTableIncrementalConfigMapper.insertSelective(datasetTableIncrementalConfig);

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

@ -2,7 +2,7 @@
<el-row style="display: flex;flex-direction: column;height: 100%">
<el-row style="height: 26px;" class="title-text">
<span style="line-height: 26px;">
{{ $t('dataset.add_api_table') }}
{{ $t('datasource.add_api_table') }}
</span>
<el-row style="float: right">
<el-button size="mini" @click="cancel">