feat: 公共接口管理新增聚合和最大条数

 import { FormSchema } from '/@/components/Form';
 
 export const scheme: FormSchema[] = [
-  {
-    field: 'effectScope',
-    label: '时间周期',
-    colProps: { span: 24 },
-    component: 'Input',
-    defaultValue: 'effectScope',
-    componentProps: {
-      disabled: true,
-    },
-  },
+  // {
+  //   field: 'effectScope',
+  //   label: '时间周期',
+  //   colProps: { span: 24 },
+  //   component: 'Input',
+  //   defaultValue: 'effectScope',
+  //   componentProps: {
+  //     disabled: true,
+  //   },
+  // },
   {
     field: 'agg',
     label: '聚合方式',

@@ -14,7 +14,7 @@
           </td>
           <td style="width: 12vw">
             <Select
-              :disabled="item.key === 'effectScope,agg,interval' ? true : false"
+              :disabled="item.key === 'agg,interval' ? true : false"
               v-model:value="item.key"
               placeholder="请选择"
               :options="selectOptions"
@@ -30,13 +30,9 @@
                 <span>~</span>
                 <a-input style="width: 6vw" placeholder="请输入" v-model:value="item.date2" />
               </div>
-              <div>
-                <a-checkbox
-                  style="position: relative; left: -3.1vw"
-                  @change="onHandleCheck"
-                  v-model:checked="isDateRange"
-                  >更多选项</a-checkbox
-                >
+              <div class="flex mt-2">
+                <a-checkbox @change="onHandleCheck" v-model:checked="mores">更多选项</a-checkbox>
+                <span v-if="mores">{{ `聚合方式：agg` }}</span>
               </div>
             </div>
             <div v-else>
@@ -97,21 +93,21 @@
 
   const dateRangeSelectRef = ref<InstanceType<typeof DateRangeSelect>>();
 
-  const [registerModal, { openModal, closeModal }] = useModal();
+  const [registerModal, { closeModal }] = useModal();
 
-  const isDateRange = ref(false);
+  const mores = ref(false);
 
   const onHandleCheck = ({ target }) => {
-    isDateRange.value = target?.checked;
-    if (isDateRange.value) {
-      openModal(true);
+    mores.value = target?.checked;
+    if (mores.value) {
+      // openModal(true);
     }
   };
 
   const handleCancelModal = () => {
     closeModal();
     dateRangeSelectRef.value?.resetValue();
-    isDateRange.value = false;
+    mores.value = false;
   };
 
   const getDateRangeValue = ref<any>({});
@@ -202,28 +198,28 @@
       return {
         key: it.key,
         value: it.key === 'date_range' ? `${it.date1},${it.date2}` : it.value,
+        mores: it.key === 'date_range' ? mores.value : null,
         editDisabled: it.editDisabled,
         required: it.required,
       };
     });
-    assemblyData = assemblyData.filter((item) => item.key !== 'effectScope,agg,interval');
-    if (getDateRangeValue.value) {
-      const joinStr = Object.keys(getDateRangeValue.value)?.join(',');
-      if (isDateRange.value) {
-        assemblyData.push({
-          key: joinStr,
-          value: '',
-          isDateRange: isDateRange.value,
-        });
-      }
-    }
+    // assemblyData = assemblyData.filter((item) => item.key !== 'agg,interval');
+    // if (getDateRangeValue.value) {
+    //   const joinStr = Object.keys(getDateRangeValue.value)?.join(',');
+    //   if (mores.value) {
+    //     assemblyData.push({
+    //       key: joinStr,
+    //       value: '',
+    //       mores: mores.value,
+    //     });
+    //   }
+    // }
     return assemblyData;
   };
 
   //设置数据
   const setValue = async (data) => {
     await nextTick();
-    console.log(data);
     let assemblyData = data.map((it) => {
       return {
         key: it.key,
@@ -234,18 +230,15 @@
         date2: it.key === 'date_range' ? it.value?.split(',')?.at(-1) : '',
       };
     });
-    const findIsDateRange = data.find((it) => it?.isDateRange === true);
-    if (findIsDateRange?.isDateRange) {
-      isDateRange.value = findIsDateRange?.isDateRange;
+    const findIsDateRange = data.find((it) => it?.mores === true);
+    if (findIsDateRange?.mores) {
+      mores.value = findIsDateRange?.mores;
       getDateRangeValue.value = {
-        effectScope: 'effectScope',
         agg: 'agg',
         interval: 'interval',
       };
     } else {
-      assemblyData = assemblyData.filter(
-        (item) => item?.isDateRange == false || !item?.isDateRange
-      );
+      assemblyData = assemblyData.filter((item) => item?.mores == false || !item?.mores);
     }
     tableArray.content = assemblyData;
     tableArray.content.forEach(() => {
@@ -255,7 +248,7 @@
 
   //重置数据
   const resetValue = () => {
-    isDateRange.value = false;
+    mores.value = false;
     tableArray.content = [];
     tableArray.content.push({
       key: undefined,

@@ -145,12 +145,17 @@
     await nextTick(() => {
       //拆分"xx,xx,xx"多个
       const getSingleKey = props.data?.list;
-      const findDateRange = [getSingleKey.find((item) => item?.key == 'effectScope,agg,interval')];
-      const getMuteKey = props.data?.list?.filter(
-        (it: any) => it.key?.split(',').length > 1 && it?.key !== 'effectScope,agg,interval'
+      let getMuteDateRangeKeys: any = null;
+      const findDateRange = getSingleKey.find(
+        (item) => item?.key == 'date_range' && item?.mores === true
       );
+      if (findDateRange) {
+        getMuteDateRangeKeys = getMultipleKeys([{ key: 'agg', value: '' }]);
+      } else {
+        getMuteDateRangeKeys = [];
+      }
+      const getMuteKey = props.data?.list?.filter((it: any) => it.key?.split(',').length > 1);
       const getMuteKeys = getMultipleKeys(getMuteKey);
-      const getMuteDateRangeKeys = getMultipleKeys(findDateRange);
       let mergeKeys = [...getSingleKey, ...getMuteKeys, ...getMuteDateRangeKeys]?.filter(
         (it: any) => it.key?.split(',').length === 1
       );
@@ -163,6 +168,7 @@
   const getTestTableKeyValue = () => {
     //把日期拆分成多个
     const keyValueList: any = [];
+    console.log(testEditCellTableRef.value?.getValue());
     testEditCellTableRef.value?.getValue()?.forEach((item: any) => {
       const splitDateKey = item?.key === 'date_range' ? item?.value?.split(',') : [];
       const splitDateValue = item?.key === 'date_range' ? item?.dateValue : [];
@@ -186,9 +192,12 @@
             ? moment(it?.fixed_date_value).valueOf()
             : it?.value;
         const key = it?.key === 'scope' || it?.key === 'fixed_date' ? it?.value : it?.key;
+        const limit = it?.limit;
+        console.log(limit);
         return {
           key,
           value,
+          limit,
           required: it.required,
         };
       });
@@ -203,10 +212,19 @@
       throw new Error('参数不能为空');
     }
     const params: any = {};
-    getTable?.map((it) => (params[it.key!] = it.value!));
+    getTable?.map((it) => {
+      console.log(it);
+      params[it.key!] = it.value!;
+      if (it.key === 'agg') {
+        params.limit = it.limit;
+      }
+    });
     if (params['keys']) {
       Reflect.set(params, 'keys', params['keys'].join(','));
     }
+    if (params['agg'] !== 'NONE') {
+      Reflect.set(params, 'limit', null);
+    }
     excuteData.value = {
       params,
       token: getToken.value,

 <!-- eslint-disable vue/valid-v-model -->
 <template>
+  <!-- {{ tableTestArray.content }} -->
   <div class="table-content">
     <!-- TODO: 待优化测试表格 -->
     <table align="center">
@@ -74,6 +75,9 @@
               mode="multiple"
               allowClear
             />
+            <!-- <div v-else-if="item.value === 'NONE'">
+              <a-input-number id="inputNumber" v-model:value="item.value" :min="7" :max="5000000" />
+            </div> -->
             <div v-else-if="item.key === 'date_range'">
               <a-button disabled type="primary">{{ item.value?.split(',').at(-2) }}</a-button>
               <span>~</span>
@@ -88,6 +92,33 @@
                   return triggerNode.parentNode;
                 }
               "
+              v-else-if="item.key === 'agg'"
+              v-model:value="item.value"
+              @change="onHandleAgg"
+              placeholder="请选择"
+              notFoundContent="请选择"
+              :options="aggOptions"
+              allowClear
+            />
+            <Select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode;
+                }
+              "
+              v-else-if="item.key === 'interval' && item.value !== 'NONE'"
+              v-model:value="item.value"
+              placeholder="请选择"
+              notFoundContent="请选择"
+              :options="intervalOptions"
+              allowClear
+            />
+            <Select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode;
+                }
+              "
               v-else
               v-model:value="item.value"
               placeholder="请选择"
@@ -113,17 +144,27 @@
             />
             <a-range-picker
               v-else-if="item.key == 'date_range'"
-              style="width: 6.5vw"
+              style="width: 10vw"
               v-model:value="item.dateValue"
-              :show-time="{ format: 'HH:mm' }"
-              format="YYYY-MM-DD HH:mm"
+              :disabled-date="disabledDate"
+              :show-time="{ format: 'HH:mm:ss' }"
+              @calendarChange="calendarPriceRangeChange"
+              @change="changePriceRangeDate"
+              format="YYYY-MM-DD HH:mm:ss"
               :placeholder="['开始', '结束']"
             />
+            <a-input-number
+              v-else-if="item.value == 'NONE'"
+              v-model:value="item.limit"
+              :min="7"
+              :max="50000"
+            />
             <a-input v-else disabled placeholder="请输入" v-model:value="item.keyValue" />
           </td>
         </tr>
       </tbody>
     </table>
+    <!-- {{ tableTestArray.content }} -->
   </div>
 </template>
 <script lang="ts" setup name="editCellTable">
@@ -136,6 +177,10 @@
   import { tableItems, selectType } from '../../../types';
   import { editTestCellTableTHeadConfig } from '../../../config';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+  import moment from 'moment';
+  import { AggregateDataEnum } from '/@/views/report/config/timeConfig';
+  import { getPacketIntervalByRange } from '/@/views/device/localtion/cpns/TimePeriodForm/helper';
+  import { uniqBy } from 'lodash';
 
   const props = defineProps({
     method: {
@@ -147,6 +192,14 @@
   });
 
   onMounted(async () => {
+    aggOptions.value = [
+      { label: '最小值', value: AggregateDataEnum.MIN },
+      { label: '最大值', value: AggregateDataEnum.MAX },
+      { label: '平均值', value: AggregateDataEnum.AVG },
+      { label: '求和', value: AggregateDataEnum.SUM },
+      { label: '计数', value: AggregateDataEnum.COUNT },
+      { label: '空', value: AggregateDataEnum.NONE },
+    ];
     const res = await findDictItemByCode({ dictCode: 'dataview_builtin_params' });
     selectOptions.value = res.map((m) => ({ label: m.itemText, value: m.itemValue }));
     selectOptions.value.push({
@@ -167,6 +220,10 @@
 
   const attributeOptions = ref<selectType[]>([]);
 
+  const aggOptions = ref<selectType[]>([]);
+
+  const intervalOptions = ref<selectType[]>([]);
+
   const treeData = ref([]);
 
   const tableTestArray = reactive<{
@@ -177,12 +234,50 @@
         key: undefined,
         value: undefined,
         keyValue: null,
+        limit: 7,
         editDisabled: false,
         dateValue: null,
       },
     ],
   });
 
+  const onHandleAgg = (e) => {
+    if (e === 'NONE') {
+      tableTestArray.content = tableTestArray.content.filter((item) => item.key !== 'interval');
+    } else {
+      tableTestArray.content.push({
+        key: 'interval',
+        value: '',
+      });
+      tableTestArray.content = uniqBy(tableTestArray.content, 'key');
+    }
+  };
+
+  const selectPriceDate = ref('');
+
+  const offsetDays = 86400000 * 365;
+
+  const calendarPriceRangeChange = (date) => {
+    selectPriceDate.value = date[0];
+    intervalOptions.value = getPacketIntervalByRange(date) as any;
+  };
+
+  const changePriceRangeDate = () => {
+    selectPriceDate.value = '';
+  };
+
+  const disabledDate = (current) => {
+    if (selectPriceDate.value) {
+      let selectV = moment(selectPriceDate.value, 'YYYY-MM-DD').valueOf();
+      return (
+        current > moment(new Date(selectV + offsetDays), 'YYYY-MM-DD') ||
+        current < moment(new Date(selectV - offsetDays), 'YYYY-MM-DD')
+      );
+    } else {
+      return false;
+    }
+  };
+
   //设置数据
   const setTableArray = (data) => {
     const list = cloneDeep(data);

@@ -15,6 +15,7 @@ export type tableItems = {
   editDisabled?: boolean;
   required?: boolean;
   data_range_select?: boolean;
+  limit?: number;
   isDateRange?: boolean;
   date1?: string;
   date2?: string;