feat(提示):视图提示优化

2021-06-07 11:01:21 +08:00 · 2021-06-07 11:01:21 +08:00 · 2b85822794
commit 2b85822794
parent 1b7ae16fa6
10 changed files with 57 additions and 19 deletions
--- 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<ChartViewFieldDTO> xAxis = new Gson().fromJson(view.getXAxis(), new TypeToken<List<ChartViewFieldDTO>>() {
        }.getType());
        List<ChartViewFieldDTO> yAxis = new Gson().fromJson(view.getYAxis(), new TypeToken<List<ChartViewFieldDTO>>() {
@ -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<String[]> 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);
--- 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);
--- 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
--- 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=当前用到的视图已被删除
--- 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=當前用到的視圖已被刪除
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@ -1,9 +1,10 @@
 <template>
  <div v-loading="requestStatus==='waiting'" class="rect-shape">
-    <div v-if="requestStatus==='error'" style=";width: 100%;height: 100%;background-color: #ece7e7; text-align: center">
-      <div style="font-size: 12px; color: #9ea6b2;">
-        {{ $t('panel.error_data') }}<br>
-        {{ message }}
+    <div v-if="requestStatus==='error'" class="chart-error-class">
+      <div style="font-size: 12px; color: #9ea6b2;height: 100%;display: flex;align-items: center;justify-content: center;">
+        {{ message.response.data.message }},{{ $t('chart.chart_show_error') }}
+        <br>
+        {{ $t('chart.chart_error_tips') }}
      </div>
    </div>
    <chart-component v-if="requestStatus==='success'&&chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :ref="element.propValue.id" class="chart-class" :chart="chart" />
@ -189,4 +190,12 @@ export default {
 .table-class{
  height: 100%;
 }
+.chart-error-class{
+  text-align: center;
+  height: calc(100% - 84px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ece7e7;
+}
 </style>
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@ -713,7 +713,9 @@ export default {
    y_M_d_H_m_s: 'Year Month Day Hour Minute Second',
    date_sub: 'yyyy-MM-dd',
    date_split: 'yyyy/MM/dd',
-    chartName: 'New Chart'
+    chartName: 'New Chart',
+    chart_show_error: 'can not show normal',
+    chart_error_tips: 'Please contact admin '
  },
  dataset: {
    sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@ -713,7 +713,9 @@ export default {
    y_M_d_H_m_s: '年月日時分秒',
    date_sub: 'yyyy-MM-dd',
    date_split: 'yyyy/MM/dd',
-    chartName: '新建視圖'
+    chartName: '新建視圖',
+    chart_show_error: '無法正常顯示',
+    chart_error_tips: '如有疑問請聯系管理員'
  },
  dataset: {
    sheet_warn: '有多個sheet頁面，默認抽取第一個',
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@ -713,7 +713,9 @@ export default {
    y_M_d_H_m_s: '年月日时分秒',
    date_sub: 'yyyy-MM-dd',
    date_split: 'yyyy/MM/dd',
-    chartName: '新建视图'
+    chartName: '新建视图',
+    chart_show_error: '无法正常显示',
+    chart_error_tips: '如有疑问请联系管理员'
  },
  dataset: {
    sheet_warn: '有多个Sheet页，默认抽取第一个',
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@ -264,8 +264,9 @@
            <label-normal v-if="httpRequest.status && chart.type && chart.type.includes('text')" :chart="chart" class="table-class" />
            <div v-if="!httpRequest.status" class="chart-error-class">
              <div style="font-size: 12px; color: #9ea6b2;height: 100%;display: flex;align-items: center;justify-content: center;">
-                {{ $t('panel.error_data') }}<br>
-                {{ httpRequest.msg }}
+                {{ httpRequest.msg }},{{ $t('chart.chart_show_error') }}
+                <br>
+                {{ $t('chart.chart_error_tips') }}
              </div>
            </div>
          </div>
@ -464,8 +465,8 @@ export default {
          this.initTableField(id)
        }).catch(err => {
          this.resetView()
-          this.httpRequest.status = false
-          this.httpRequest.msg = err
+          this.httpRequest.status = err.response.data.success
+          this.httpRequest.msg = err.response.data.message
          return true
        })
      }
@ -476,8 +477,8 @@ export default {
        this.quota = response.data.quota
      }).catch(err => {
        this.resetView()
-        this.httpRequest.status = false
-        this.httpRequest.msg = err
+        this.httpRequest.status = err.response.data.success
+        this.httpRequest.msg = err.response.data.message
        return true
      })
    },
@ -643,8 +644,8 @@ export default {
          this.httpRequest.status = true
        }).catch(err => {
          this.resetView()
-          this.httpRequest.status = false
-          this.httpRequest.msg = err
+          this.httpRequest.status = err.response.data.success
+          this.httpRequest.msg = err.response.data.message
          return true
        })
      } else {
@ -668,8 +669,8 @@ export default {
          this.httpRequest.status = true
        }).catch(err => {
          this.resetView()
-          this.httpRequest.status = false
-          this.httpRequest.msg = err
+          this.httpRequest.status = err.response.data.success
+          this.httpRequest.msg = err.response.data.message
          return true
        })
      } else {