From 2d4840c4e54c5a2842349b777ba22355d26db6aa Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 4 Nov 2024 14:04:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8C=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E9=87=8D=E5=90=8D=E6=95=B0=E6=8D=AE=E9=9B=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A2=9E=E5=8A=A0=E5=8A=A0=E5=90=8E=E7=BC=80=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E5=87=BA=E7=8E=B0=E9=87=8D=E5=90=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visualization/server/DataVisualizationServer.java | 8 +++++--- core/core-frontend/src/views/common/DeAppApply.vue | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 1a6e8f1b85..7bf017ba72 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -300,7 +300,7 @@ public class DataVisualizationServer implements DataVisualizationApi { coreDatasetTableFieldMapper.insert(dsTableFields); }); - + List dsGroupNameSave = new ArrayList<>(); // 持久化数据集 newDsGroupInfo.forEach(dsGroup -> { 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); }); diff --git a/core/core-frontend/src/views/common/DeAppApply.vue b/core/core-frontend/src/views/common/DeAppApply.vue index a2079b3c25..223ed61b3f 100644 --- a/core/core-frontend/src/views/common/DeAppApply.vue +++ b/core/core-frontend/src/views/common/DeAppApply.vue @@ -13,7 +13,7 @@ ref="appSaveForm" :model="state.form" :rules="state.rule" - class="de-form-item" + class="de-form-item app-form" size="middle" label-width="180px" label-position="top" @@ -406,6 +406,9 @@ defineExpose({ align-items: center; justify-content: center; } +.app-form { + padding-bottom: 95px; +}