chore: Merge conflicts

core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java

@@ -224,19 +224,33 @@ public class ChartViewManege {
             return Collections.emptyList();
         }
         return list.stream().map(ele -> {
-            ChartViewDTO dto = transRecord2DTO(ele);
-            return dto;
+            return transRecord2DTO(ele);
         }).collect(Collectors.toList());
     }
 
-    public ChartViewDTO getChart(Long id, String resourceTable) throws Exception {
+    public ChartViewDTO getChart(Long id, String resourceTable, boolean forThreshold) throws Exception {
         ChartViewDTO details = getDetails(id, resourceTable);
         if (details == null) {
             return null;
         }
+        if (forThreshold) {
+            ChartExtRequest chartExtRequest = details.getChartExtRequest();
+            if (chartExtRequest == null) {
+                chartExtRequest = new ChartExtRequest();
+                chartExtRequest.setResultMode("all");
+                chartExtRequest.setResultCount(1000);
+                chartExtRequest.setGoPage(1L);
+                chartExtRequest.setPageSize(50000L);
+            }
+            details.setChartExtRequest(chartExtRequest);
+        }
         return chartDataManage.calcData(details);
     }
 
+    public ChartViewDTO getChart(Long id, String resourceTable) throws Exception {
+        return getChart(id, resourceTable, false);
+    }
+
     public Map<String, List<ChartViewFieldDTO>> listByDQ(Long id, Long chartId, ChartViewDTO chartViewDTO) {
         QueryWrapper<CoreDatasetTableField> wrapper = new QueryWrapper<>();
         wrapper.eq("dataset_group_id", id);

core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java

@@ -252,7 +252,7 @@ public class ChartViewThresholdManage {
         String thresholdRules = request.getThresholdRules();
         Long chartId = request.getChartId();
         try {
-            ChartViewDTO chart = chartViewManege.getChart(chartId, request.getResourceTable());
+            ChartViewDTO chart = chartViewManege.getChart(chartId, request.getResourceTable(), true);
             Map<String, Object> data = null;
             if (ObjectUtils.isEmpty(chart) || MapUtils.isEmpty(data = chart.getData())) {
                 return new ThresholdCheckVO(false, null, "查询图表异常！", null);

core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue

@@ -1447,7 +1447,7 @@ const validate = () => {
         (Array.isArray(ele.defaultValue) && !ele.defaultValue.length) ||
         (!Array.isArray(ele.defaultValue) && isNaN(ele.defaultValue))
       ) {
-        ElMessage.error(t('v_query.cannot_be_empty_de'))
+        ElMessage.error(t('report.filter.title'))
         return true
       }
     }

core/core-frontend/src/style/index.less

@@ -701,3 +701,9 @@ strong {
 .ed-upload-list__item .ed-icon--close-tip {
   display: none !important;
 }
+
+.is-dark.ed-select__popper.ed-tree-select__popper {
+  .ed-tree {
+    background-color: transparent;
+  }
+}