From 9f98c73e08f37b1d108f461a36fbe3c7f36cd238 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 4 Jan 2022 12:04:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=85=88=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E6=9C=89=E6=95=88=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/ChartViewService.java    | 3 +++
 .../io/dataease/service/dataset/DataSetTableService.java    | 6 ++++++
 frontend/src/views/system/datasource/form.vue               | 2 --
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 217c8c8374..0890aa50af 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -344,6 +344,9 @@ public class ChartViewService {
             if (ObjectUtils.isEmpty(ds)) {
                 throw new RuntimeException(Translator.get("i18n_datasource_delete"));
             }
+            if(ds.getStatus().equalsIgnoreCase("Error")){
+                throw new Exception(Translator.get("i18n_invalid_ds"));
+            }
             DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
             datasourceRequest.setDatasource(ds);
             DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(table.getInfo(), DataTableInfoDTO.class);
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 734682dbc1..f2de11985f 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -578,6 +578,9 @@ public class DataSetTableService {
                 if (ObjectUtils.isEmpty(ds)) {
                     throw new RuntimeException(Translator.get("i18n_datasource_delete"));
                 }
+                if(ds.getStatus().equalsIgnoreCase("Error")){
+                    throw new Exception(Translator.get("i18n_invalid_ds"));
+                }
                 DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
                 DatasourceRequest datasourceRequest = new DatasourceRequest();
                 datasourceRequest.setDatasource(ds);
@@ -643,6 +646,9 @@ public class DataSetTableService {
                 if (ObjectUtils.isEmpty(ds)) {
                     throw new RuntimeException(Translator.get("i18n_datasource_delete"));
                 }
+                if(ds.getStatus().equalsIgnoreCase("Error")){
+                    throw new Exception(Translator.get("i18n_invalid_ds"));
+                }
                 DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
                 DatasourceRequest datasourceRequest = new DatasourceRequest();
                 datasourceRequest.setDatasource(ds);
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index 0599a70e33..56cdbc49a2 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -406,8 +406,6 @@ export default {
                 this.$error(res.message)
               }
               this.refreshType(data)
-            }).catch(res => {
-              this.$error(res.message)
             })
           } else {
             validateDs(data).then(res => {