Merge branch 'ft' into 'main_dev'

fix(external/Composes): 修复日期区间如果聚合条件为空的话，日期区间验证还存在问题

See merge request yunteng/thingskit-view!58

@@ -312,11 +312,18 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     return [{
       trigger: ['blur', 'change'],
       validator() {
+          /**
+           * ft 修改在公共接口下拉框里加上接口类型
+           * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+           * 源代码 record[SelectTimeAggregationFieldEnum.INTERVAL]
+           * 修改后代码在//ft之间 record[SelectTimeAggregationFieldEnum.AGG]!=='NONE'?record[SelectTimeAggregationFieldEnum.INTERVAL]:[]
+          */
         const record = params[BuiltInVariable.SELECT_TIME_AGGREGATION]
-        if (required && ![record[SelectTimeAggregationFieldEnum.AGG], record[SelectTimeAggregationFieldEnum.INTERVAL], record[SelectTimeAggregationFieldEnum.END_TS], record[SelectTimeAggregationFieldEnum.START_TS]].every(Boolean)) {
+        if (required && ![record[SelectTimeAggregationFieldEnum.AGG],record[SelectTimeAggregationFieldEnum.AGG]!=='NONE'?record[SelectTimeAggregationFieldEnum.INTERVAL]:[], record[SelectTimeAggregationFieldEnum.END_TS], record[SelectTimeAggregationFieldEnum.START_TS]].every(Boolean)) {
           validFlag.value = false
           return new Error(`${message}需要填写完整`)
         }
+        //ft
         validFlag.value = true
       }
     }] as FormItemRule