Merge remote-tracking branch 'origin/main' into main

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -100,7 +100,8 @@ public class ChartViewService {
         customFilter.forEach(ele -> ele.setField(dataSetTableFieldsService.get(ele.getFieldId())));
 
         if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
-            if (CollectionUtils.isEmpty(xAxis) && CollectionUtils.isEmpty(yAxis)) {
+            xAxis = new ArrayList<>();
+            if (CollectionUtils.isEmpty(yAxis)) {
                 ChartViewDTO dto = new ChartViewDTO();
                 BeanUtils.copyBean(dto, view);
                 return dto;

backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java

@@ -3,11 +3,13 @@ package io.dataease.service.dataset;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -61,6 +63,16 @@ public class DataSetTableFieldsService {
         return datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
     }
 
+    public List<DatasetTableField> getListByIdsEach(List<String> ids) {
+        List<DatasetTableField> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            ids.forEach(id -> {
+                list.add(datasetTableFieldMapper.selectByPrimaryKey(id));
+            });
+        }
+        return list;
+    }
+
     public List<DatasetTableField> getFieldsByTableId(String id) {
         DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample();
         datasetTableFieldExample.createCriteria().andTableIdEqualTo(id);

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -427,45 +427,49 @@ public class DataSetTableService {
         String sql = getCustomSQL(dataTableInfoDTO, list);
         // 使用输入的sql先预执行一次,并拿到所有字段
         datasourceRequest.setQuery(sql);
-        List<TableFiled> previewFields = jdbcProvider.fetchResultField(datasourceRequest);
 
-        QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-        datasourceRequest.setQuery(qp.createSQLPreview(sql, previewFields.get(0).getFieldName()));
-        Map<String, List> result = jdbcProvider.fetchResultAndField(datasourceRequest);
-        List<String[]> data = result.get("dataList");
-        List<TableFiled> fields = result.get("fieldList");
-        String[] fieldArray = fields.stream().map(TableFiled::getFieldName).toArray(String[]::new);
+        Map<String, Object> res = new HashMap<>();
+        try {
+            List<TableFiled> previewFields = jdbcProvider.fetchResultField(datasourceRequest);
 
-        List<Map<String, Object>> jsonArray = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(data)) {
-            jsonArray = data.stream().map(ele -> {
-                Map<String, Object> map = new HashMap<>();
-                for (int i = 0; i < ele.length; i++) {
-                    map.put(fieldArray[i], ele[i]);
-                }
-                return map;
-            }).collect(Collectors.toList());
-        }
+            QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
+            datasourceRequest.setQuery(qp.createSQLPreview(sql, previewFields.get(0).getFieldName()));
+            Map<String, List> result = jdbcProvider.fetchResultAndField(datasourceRequest);
+            List<String[]> data = result.get("dataList");
+            List<TableFiled> fields = result.get("fieldList");
+            String[] fieldArray = fields.stream().map(TableFiled::getFieldName).toArray(String[]::new);
+
+            List<Map<String, Object>> jsonArray = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(data)) {
+                jsonArray = data.stream().map(ele -> {
+                    Map<String, Object> map = new HashMap<>();
+                    for (int i = 0; i < ele.length; i++) {
+                        map.put(fieldArray[i], ele[i]);
+                    }
+                    return map;
+                }).collect(Collectors.toList());
+            }
 
-        // 获取每个字段在当前de数据库中的name，作为sql查询后的remarks返回前端展示
-        List<DatasetTableField> checkedFieldList = new ArrayList<>();
-        dataTableInfoDTO.getList().forEach(ele -> {
-            checkedFieldList.addAll(dataSetTableFieldsService.getListByIds(ele.getCheckedFields()));
-        });
-        for (DatasetTableField datasetTableField : checkedFieldList) {
-            for (TableFiled tableFiled : fields) {
-                if (StringUtils.equalsIgnoreCase(tableFiled.getFieldName(), DorisTableUtils.dorisFieldName(datasetTableField.getTableId() + "_" + datasetTableField.getDataeaseName()))) {
-                    tableFiled.setRemarks(datasetTableField.getName());
-                    break;
+            // 获取每个字段在当前de数据库中的name，作为sql查询后的remarks返回前端展示
+            List<DatasetTableField> checkedFieldList = new ArrayList<>();
+            dataTableInfoDTO.getList().forEach(ele -> {
+                checkedFieldList.addAll(dataSetTableFieldsService.getListByIds(ele.getCheckedFields()));
+            });
+            for (DatasetTableField datasetTableField : checkedFieldList) {
+                for (TableFiled tableFiled : fields) {
+                    if (StringUtils.equalsIgnoreCase(tableFiled.getFieldName(), DorisTableUtils.dorisFieldName(datasetTableField.getTableId() + "_" + datasetTableField.getDataeaseName()))) {
+                        tableFiled.setRemarks(datasetTableField.getName());
+                        break;
+                    }
                 }
             }
-        }
 
-        Map<String, Object> map = new HashMap<>();
-        map.put("fields", fields);
-        map.put("data", jsonArray);
-
-        return map;
+            res.put("fields", fields);
+            res.put("data", jsonArray);
+            return res;
+        } catch (Exception e) {
+            return res;
+        }
     }
 
     // 自助数据集从doris里预览数据
@@ -473,7 +477,7 @@ public class DataSetTableService {
         Map<String, String[]> customInfo = new TreeMap<>();
         dataTableInfoDTO.getList().forEach(ele -> {
             String table = DorisTableUtils.dorisName(ele.getTableId());
-            List<DatasetTableField> fields = dataSetTableFieldsService.getListByIds(ele.getCheckedFields());
+            List<DatasetTableField> fields = dataSetTableFieldsService.getListByIdsEach(ele.getCheckedFields());
             String[] array = fields.stream().map(f -> table + "." + f.getDataeaseName() + " AS " + DorisTableUtils.dorisFieldName(ele.getTableId() + "_" + f.getDataeaseName())).toArray(String[]::new);
             customInfo.put(table, array);
         });
@@ -503,8 +507,14 @@ public class DataSetTableService {
                     }
                 }
             }
+            if (StringUtils.isEmpty(f)) {
+                throw new RuntimeException(Translator.get("i18n_custom_ds_delete"));
+            }
             return MessageFormat.format("SELECT {0} FROM {1}", f, DorisTableUtils.dorisName(first.getTableId())) + join.toString();
         } else {
+            if (StringUtils.isEmpty(StringUtils.join(customInfo.get(DorisTableUtils.dorisName(first.getTableId())), ","))) {
+                throw new RuntimeException(Translator.get("i18n_custom_ds_delete"));
+            }
             return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(customInfo.get(DorisTableUtils.dorisName(first.getTableId())), ","), DorisTableUtils.dorisName(first.getTableId()));
         }
     }

backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java

@@ -226,6 +226,7 @@ public class ExtractDataService {
                     }else {
                         DatasetTableIncrementalConfig datasetTableIncrementalConfig = dataSetTableService.incrementalConfig(datasetTableId);
                         if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) {
+                            updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed);
                             return;
                         }
                         DatasetTableTaskLog request = new DatasetTableTaskLog();
@@ -233,6 +234,7 @@ public class ExtractDataService {
                         request.setStatus(JobStatus.Completed.name());
                         List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(request);
                         if (CollectionUtils.isEmpty(datasetTableTaskLogs)) {
+                            updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed);
                             return;
                         }
 

backend/src/main/resources/i18n/messages_en_US.properties

@@ -253,4 +253,5 @@ i18n_datasource_delete=Data source is delete
 i18n_dataset_delete=Data set is delete
 i18n_chart_delete=Chart is delete
 i18n_not_exec_add_sync=There is no completed synchronization task. Incremental synchronization cannot be performed
-i18n_excel_header_empty=Excel first row can not empty
\ No newline at end of file
+i18n_excel_header_empty=Excel first row can not empty
+i18n_custom_ds_delete=Custom dataset union data is deleted,can not display
\ No newline at end of file

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -254,3 +254,4 @@ i18n_dataset_delete=当前用到的数据集已被删除
 i18n_chart_delete=当前用到的视图已被删除
 i18n_not_exec_add_sync=没有已完成的同步任务，无法进行增量同步
 i18n_excel_header_empty=Excel第一行为空
+i18n_custom_ds_delete=自定义数据集所关联数据被删除，无法正常显示

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -255,4 +255,5 @@ i18n_datasource_delete=當前用到的數據源已被刪除
 i18n_dataset_delete=當前用到的數據集已被刪除
 i18n_chart_delete=當前用到的視圖已被刪除
 i18n_not_exec_add_sync=沒有已經完成的同步任務，無法進行增量同步
-i18n_excel_header_empty=Excel第一行為空
\ No newline at end of file
+i18n_excel_header_empty=Excel第一行為空
+i18n_custom_ds_delete=自定義數據集所關聯數據被刪除，無法正常顯示
\ No newline at end of file

frontend/src/views/chart/view/ChartEdit.vue

@@ -529,9 +529,6 @@ export default {
           view.yaxis.splice(1, view.yaxis.length)
         }
       }
-      if (view.type.startsWith('text') || view.type.startsWith('gauge')) {
-        view.xaxis = []
-      }
       if (view.type === 'line' && trigger === 'chart') {
         view.customAttr.size.lineArea = false
       }

frontend/src/views/dataset/common/DatasetTableData.vue

@@ -2,6 +2,7 @@
   <el-col ref="container" v-loading="dataLoading" style="width: 100%;height:100%">
     <span>{{ table.name }}</span>
     <ux-grid
+      id="dsData"
       ref="plxTable"
       size="mini"
       style="width: 100%;"
@@ -59,6 +60,7 @@ export default {
     //   })()
     // }
     // this.height = window.innerHeight / 3
+    this.height = document.getElementById('dsData').parentNode.offsetHeight - 16 - 14 - 5
     this.initData()
   },
   methods: {

frontend/src/views/dataset/data/UnionView.vue

@@ -51,7 +51,7 @@
     >
       <el-row style="display: flex;align-items: center;justify-content: center;">
         <el-col :span="6">
-          <p class="table-name-css">{{ table.name }}</p>
+          <p class="table-name-css" :title="table.name">{{ table.name }}</p>
           <el-select v-model="union.sourceTableFieldId" :placeholder="$t('dataset.pls_slc_union_field')" filterable clearable size="mini">
             <el-option
               v-for="item in sourceFieldOption"
@@ -93,7 +93,9 @@
             trigger="click"
           >
             <dataset-group-selector :mode="1" @getTable="getTable" />
-            <el-button slot="reference" size="mini">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</el-button>
+            <el-button slot="reference" size="mini" style="width: 100%;">
+              <p class="table-name-css" :title="targetTable.name || $t('dataset.pls_slc_union_table')">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</p>
+            </el-button>
           </el-popover>
 
           <el-select v-model="union.targetTableFieldId" :placeholder="$t('dataset.pls_slc_union_field')" filterable clearable size="mini">
@@ -282,6 +284,9 @@ export default {
 <style scoped>
   .table-name-css{
     margin: 4px 2px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
   }
   .union-relation-css{
     display: block;