From 539d407342aa6d427a41eea20312a3a130c743ad Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 15 Jan 2024 18:08:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/datasource/server/DatasourceServer.java   | 8 ++++++--
 .../visualized/data/datasource/form/CreatDsGroup.vue      | 1 +
 .../src/views/visualized/data/datasource/form/index.vue   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
index 454e1f80be..ee875b83aa 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
@@ -136,6 +136,9 @@ public class DatasourceServer implements DatasourceApi {
                 dataSourceManage.move(dataSourceDTO);
             }
             case "rename" -> {
+                if(StringUtils.isEmpty(dataSourceDTO.getName())){
+                    DEException.throwException("名称不能为空！");
+                }
                 CoreDatasource datasource = datasourceMapper.selectById(dataSourceDTO.getId());
                 datasource.setName(dataSourceDTO.getName());
                 dataSourceManage.innerEdit(datasource);
@@ -464,8 +467,9 @@ public class DatasourceServer implements DatasourceApi {
         CoreDatasource coreDatasource = new CoreDatasource();
         BeanUtils.copyBean(coreDatasource, dataSourceDTO);
         checkDatasourceStatus(coreDatasource);
-        dataSourceDTO.setStatus(coreDatasource.getStatus());
-        return dataSourceDTO;
+        DatasourceDTO result = new DatasourceDTO();
+        result.setStatus(coreDatasource.getStatus());
+        return result;
     }
 
     @Override
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
index 9acd0a2a6a..bce89ddff3 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
@@ -272,6 +272,7 @@ const saveDataset = () => {
           showClose: false,
           tip: ''
         }
+        request.apiConfiguration = ''
         checkRepeat(request).then(res => {
           if (res) {
             ElMessageBox.confirm(t('datasource.has_same_ds'), options as ElMessageBoxOptions).then(
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index 1650f7a9c3..9b8fc58a6d 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -391,6 +391,7 @@ const saveDS = () => {
     request.configuration = Base64.encode(JSON.stringify(request.configuration))
   }
   const validate = detail.value.submitForm()
+  request.apiConfiguration = ''
   validate(val => {
     if (val) {
       if (editDs.value && form.id) {
@@ -401,7 +402,6 @@ const saveDS = () => {
           showClose: false,
           tip: ''
         }
-
         checkRepeat(request).then(res => {
           if (res) {
             ElMessageBox.confirm(t('datasource.has_same_ds'), options as ElMessageBoxOptions).then(