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

Merge pull request #13091 from dataease/pr@dev-v2@refactor_app-apply

Browse Source 
refactor(工作台): 应用保存时，出现重名数据集自动增加加后缀防止出现重名无法保存情况
This commit is contained in:
王嘉豪 2024-11-04 14:20:14 +08:00 committed by GitHub
commit 697a59688d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
View File

@ -300,7 +300,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
coreDatasetTableFieldMapper.insert(dsTableFields); coreDatasetTableFieldMapper.insert(dsTableFields);
}); });
List<String> dsGroupNameSave = new ArrayList<>();
// 持久化数据集 // 持久化数据集
newDsGroupInfo.forEach(dsGroup -> { newDsGroupInfo.forEach(dsGroup -> {
dsTableIdMap.forEach((key, value) -> { dsTableIdMap.forEach((key, value) -> {
@ -325,8 +325,10 @@ public class DataVisualizationServer implements DataVisualizationApi {
} }
}); });
if(dsGroupNameSave.contains(dsGroup.getName())){
dsGroup.setName(dsGroup.getName()+"-"+UUID.randomUUID().toString());
}
dsGroupNameSave.add(dsGroup.getName());
datasetGroupManage.innerSave(dsGroup); datasetGroupManage.innerSave(dsGroup);
}); });

5
core/core-frontend/src/views/common/DeAppApply.vue
View File

@ -13,7 +13,7 @@
ref="appSaveForm" ref="appSaveForm"
:model="state.form" :model="state.form"
:rules="state.rule" :rules="state.rule"
class="de-form-item" class="de-form-item app-form"
size="middle" size="middle"
label-width="180px" label-width="180px"
label-position="top" label-position="top"
@ -406,6 +406,9 @@ defineExpose({
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.app-form {
padding-bottom: 95px;
}
</style> </style>
<style lang="less"> <style lang="less">