fix:DEFECT-1175 and 1176 报表配置刚开始为聚合数据,然后再点击编辑,选择聚合条件少了计数, and 编辑时,求和显示为count了

@@ -41,7 +41,7 @@
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, computed, unref, reactive, watch, Ref } from 'vue';
+  import { ref, computed, unref, reactive, watch, Ref, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, organizationId } from './config.data';
   import { formSchema, organizationId } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -198,6 +198,7 @@
   const isViewDetail = ref(false);
   const isViewDetail = ref(false);
 
 
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    await nextTick();
     await resetFields();
     await resetFields();
     setDrawerProps({ confirmLoading: false });
     setDrawerProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
     isUpdate.value = !!data?.isUpdate;
@@ -222,6 +223,10 @@
       await setFieldsValue(editResData.data);
       await setFieldsValue(editResData.data);
       //回显嵌套数据
       //回显嵌套数据
       await setFieldsValue({
       await setFieldsValue({
+        dateGroupGap:
+          editResData.data.queryCondition?.queryMode === 1
+            ? editResData.data.queryCondition?.interval
+            : null,
         agg: editResData.data.queryCondition?.agg,
         agg: editResData.data.queryCondition?.agg,
         interval: editResData.data.queryCondition?.interval,
         interval: editResData.data.queryCondition?.interval,
         limit: editResData.data.queryCondition?.limit,
         limit: editResData.data.queryCondition?.limit,
@@ -266,6 +271,7 @@
         { label: '最大值', value: AggregateDataEnum.MAX },
         { label: '最大值', value: AggregateDataEnum.MAX },
         { label: '平均值', value: AggregateDataEnum.AVG },
         { label: '平均值', value: AggregateDataEnum.AVG },
         { label: '求和', value: AggregateDataEnum.SUM },
         { label: '求和', value: AggregateDataEnum.SUM },
+        { label: '计数', value: AggregateDataEnum.COUNT },
         { label: '空', value: AggregateDataEnum.NONE },
         { label: '空', value: AggregateDataEnum.NONE },
       ];
       ];
       const updateSchemaAgg = (options: {}) => {
       const updateSchemaAgg = (options: {}) => {
@@ -276,8 +282,8 @@
           },
           },
         });
         });
       };
       };
-      if (editResData.data.dataType == 1) updateSchemaAgg(dataCompareOpions.slice(0, 4));
-      else updateSchemaAgg(dataCompareOpions.slice(4, 5));
+      if (editResData.data.dataType == 1) updateSchemaAgg(dataCompareOpions.slice(0, 5));
+      else updateSchemaAgg(dataCompareOpions.slice(5, 6));
       //回显执行方式和查询周期
       //回显执行方式和查询周期
       const dataQueryOpions = [
       const dataQueryOpions = [
         { label: '固定周期', value: QueryWay.LATEST },
         { label: '固定周期', value: QueryWay.LATEST },
@@ -442,7 +448,7 @@
       }
       }
       queryCondition = {
       queryCondition = {
         agg: values.agg,
         agg: values.agg,
-        interval: values.interval,
+        interval: values?.queryMode === 'latest' ? values.interval : values.dateGroupGap,
         limit: values.limit,
         limit: values.limit,
         ...{
         ...{
           startTs: startTs.value,
           startTs: startTs.value,