Merge pull request #11847 from dataease/pr@dev-v2@fix_app-apply2

Pr@dev v2@fix app apply2
This commit is contained in:
王嘉豪 2024-08-29 16:02:17 +08:00 committed by GitHub
commit 92d2649f2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions

View File

@ -185,6 +185,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
List<DatasetGroupInfoDTO> newDsGroupInfo = new ArrayList<>();
Map<Long,Long> dsTableIdMap = new HashMap<>();
Map<Long,Long> dsTableFieldsIdMap = new HashMap<>();
List<CoreDatasetTableField> dsTableFieldsList = new ArrayList();
Map<Long,Long> datasourceIdMap = new HashMap<>();
Map<Long,Map<String,String>> dsTableNamesMap = new HashMap<>();
List<Long> newDatasourceId = new ArrayList<>();
@ -273,10 +274,19 @@ public class DataVisualizationServer implements DataVisualizationApi {
dsDsField.setDatasetTableId(dsTableIdMap.get(dsDsField.getDatasetTableId()));
dsDsField.setDatasourceId(datasourceIdMap.get(dsDsField.getDatasourceId()));
dsDsField.setId(newId);
coreDatasetTableFieldMapper.insert(dsDsField);
dsTableFieldsList.add(dsDsField);
dsTableFieldsIdMap.put(oldId,newId);
});
// dsTableFields 中存在计算字段在OriginName中 也需要替换
dsTableFieldsList.forEach(dsTableFields ->{
dsTableFieldsIdMap.forEach((key,value) ->{
dsTableFields.setOriginName(dsTableFields.getOriginName().replaceAll(key.toString(),value.toString()));
});
coreDatasetTableFieldMapper.insert(dsTableFields);
});
// 持久化数据集
newDsGroupInfo.forEach(dsGroup ->{
dsTableIdMap.forEach((key,value) ->{

View File

@ -454,7 +454,7 @@ export async function canvasSave(callBack) {
})
}
if (dsNameCheck === 'repeat') {
ElMessage.error('数据集名称已存在')
ElMessage.error('数据集分组名称已存在')
return
}