From 2b85822794992967c78ca23635029ef93894244b Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 7 Jun 2021 11:01:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8F=90=E7=A4=BA):=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/ChartViewService.java | 9 ++++++++ .../service/dataset/DataSetTableService.java | 6 ++++++ .../resources/i18n/messages_en_US.properties | 3 +++ .../resources/i18n/messages_zh_CN.properties | 5 +++-- .../resources/i18n/messages_zh_TW.properties | 3 +++ .../canvas/custom-component/UserView.vue | 17 +++++++++++---- frontend/src/lang/en.js | 4 +++- frontend/src/lang/tw.js | 4 +++- frontend/src/lang/zh.js | 4 +++- frontend/src/views/chart/view/ChartEdit.vue | 21 ++++++++++--------- 10 files changed, 57 insertions(+), 19 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 0ee4318af4..d80de80806 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -88,6 +88,9 @@ public class ChartViewService { public ChartViewDTO getData(String id, ChartExtRequest requestList) throws Exception { ChartViewWithBLOBs view = chartViewMapper.selectByPrimaryKey(id); + if (ObjectUtils.isEmpty(view)) { + throw new RuntimeException(Translator.get("i18n_chart_delete")); + } List xAxis = new Gson().fromJson(view.getXAxis(), new TypeToken>() { }.getType()); List yAxis = new Gson().fromJson(view.getYAxis(), new TypeToken>() { @@ -122,10 +125,16 @@ public class ChartViewService { // 获取数据集 DatasetTable table = dataSetTableService.get(view.getTableId()); + if (ObjectUtils.isEmpty(table)) { + throw new RuntimeException(Translator.get("i18n_dataset_delete")); + } // 判断连接方式，直连或者定时抽取 table.mode List data = new ArrayList<>(); if (table.getMode() == 0) {// 直连 Datasource ds = datasourceService.get(table.getDataSourceId()); + if (ObjectUtils.isEmpty(ds)) { + throw new RuntimeException(Translator.get("i18n_datasource_delete")); + } DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(ds); 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 7fccb515d7..9c88a595c2 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -238,6 +238,9 @@ public class DataSetTableService { } if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) { Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); + if (ObjectUtils.isEmpty(ds)) { + throw new RuntimeException(Translator.get("i18n_datasource_delete")); + } DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(ds); @@ -258,6 +261,9 @@ public class DataSetTableService { } } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) { Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); + if (ObjectUtils.isEmpty(ds)) { + throw new RuntimeException(Translator.get("i18n_datasource_delete")); + } DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(ds); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index f4fff1974d..1da183efbe 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -249,3 +249,6 @@ i18n_sql_not_empty=SQL can not be empty. i18n_datasource_not_allow_delete_msg= datasets are using this data source and cannot be deleted i18n_task_name_repeat=Name is used in same data set i18n_id_or_pwd_error=Invalid ID or password +i18n_datasource_delete=Data source is delete +i18n_dataset_delete=Data set is delete +i18n_chart_delete=Chart is delete diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 6374cc3094..32c16a21b7 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -159,7 +159,6 @@ quota_duration_excess_organization=压测时长超过组织限额 import_xmind_count_error=思维导图导入用例数量不能超过 500 条 license_valid_license_error=授权认证失败 import_xmind_not_found=未找到测试用例 - test_review_task_notice=测试评审任务通知 test_track.length_less_than=标题过长，字数必须小于 # check owner @@ -185,7 +184,6 @@ automation_exec_info=没有测试步骤，无法执行 authsource_name_already_exists=认证源名称已经存在 authsource_name_is_null=认证源名称不能为空 authsource_configuration_is_null=认证源配置不能为空 - 个人信息=个人信息 仪表板=仪表板 修改密码=修改密码 @@ -251,3 +249,6 @@ i18n_sql_not_empty=SQL 不能为空 i18n_datasource_not_allow_delete_msg= 个数据集正在使用此数据源，无法删除 i18n_task_name_repeat=同一数据集下任务名称已被使用 i18n_id_or_pwd_error=无效的ID或密码 +i18n_datasource_delete=当前用到的数据源已被删除 +i18n_dataset_delete=当前用到的数据集已被删除 +i18n_chart_delete=当前用到的视图已被删除 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index db3c5a3b6e..7b65513ca1 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -251,3 +251,6 @@ i18n_sql_not_empty=SQL 不能為空 i18n_datasource_not_allow_delete_msg= 個數據集正在使用此數據源，無法刪除 i18n_task_name_repeat=同一數據集下任務名稱已被使用 i18n_id_or_pwd_error=無效的ID或密碼 +i18n_datasource_delete=當前用到的數據源已被刪除 +i18n_dataset_delete=當前用到的數據集已被刪除 +i18n_chart_delete=當前用到的視圖已被刪除 diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 0c07d74df5..aef84fac77 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -1,9 +1,10 @@