Merge pull request #336 from dataease/pr@dev@refactor_数据集字段将维度指标归类展示

backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java

@@ -7,7 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author gin
@@ -29,6 +31,21 @@ public class DataSetTableFieldController {
         return dataSetTableFieldsService.list(datasetTableField);
     }
 
+    @PostMapping("listByDQ/{tableId}")
+    public Map<String, List<DatasetTableField>> listByDQ(@PathVariable String tableId) {
+        DatasetTableField datasetTableField = DatasetTableField.builder().build();
+        datasetTableField.setTableId(tableId);
+        datasetTableField.setGroupType("d");
+        List<DatasetTableField> dimensionList = dataSetTableFieldsService.list(datasetTableField);
+        datasetTableField.setGroupType("q");
+        List<DatasetTableField> quotaList = dataSetTableFieldsService.list(datasetTableField);
+
+        Map<String, List<DatasetTableField>> map = new HashMap<>();
+        map.put("dimensionList", dimensionList);
+        map.put("quotaList", quotaList);
+        return map;
+    }
+
     @PostMapping("batchEdit")
     public void batchEdit(@RequestBody List<DatasetTableField> list) {
         dataSetTableFieldsService.batchEdit(list);

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -47,6 +48,9 @@ public class DataSetTableFieldsService {
         if (ObjectUtils.isNotEmpty(datasetTableField.getChecked())) {
             criteria.andCheckedEqualTo(datasetTableField.getChecked());
         }
+        if (ObjectUtils.isNotEmpty(datasetTableField.getGroupType())) {
+            criteria.andGroupTypeEqualTo(datasetTableField.getGroupType());
+        }
         datasetTableFieldExample.setOrderByClause("column_index asc");
         return datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
     }

frontend/src/api/dataset/dataset.js

@@ -94,6 +94,14 @@ export function fieldList(id, showLoading = true) {
   })
 }
 
+export function fieldListDQ(id, showLoading = true) {
+  return request({
+    url: '/dataset/field/listByDQ/' + id,
+    loading: showLoading,
+    method: 'post'
+  })
+}
+
 export function batchEdit(data) {
   return request({
     url: '/dataset/field/batchEdit',

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

@@ -1574,11 +1574,6 @@ export default {
     padding: 0;
     height: 100%;
   }
-  .collapse-style>>>.el-collapse-item__header{
-    height: 40px;
-    line-height: 40px;
-    padding: 0 0 0 10px;
-  }
   .tree-select-span {
       >>>div.vue-treeselect__control {
           height: 32px !important;