Merge branch 'main_dev' into 'main'

thingskit1.1.0

See merge request yunteng/thingskit-view!62

@@ -136,7 +136,9 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
 
     if (Reflect.has(value, BuiltInVariable.DATE_RANGE)) {
       const fieldMapping = unref(getParams).find(item => item.key === BuiltInVariable.DATE_RANGE)
-      const [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR)
+      let [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR)
+      start = start ? start : SelectTimeAggregationFieldEnum.START_TS
+      end = end ? end : SelectTimeAggregationFieldEnum.END_TS
       const dateRangeValue = value[BuiltInVariable.DATE_RANGE]
       const [startValue, endValue] = isArray(dateRangeValue) ? dateRangeValue : [null, null]
       value[start] = startValue
@@ -146,12 +148,16 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
 
     if (Reflect.has(value, BuiltInVariable.SELECT_TIME_AGGREGATION)) {
       const fieldMapping = unref(getParams).find(item => item.key === BuiltInVariable.DATE_RANGE)
-      const [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR)
-      const aggregation = Reflect.get(value, BuiltInVariable.SELECT_TIME_AGGREGATION) || {}
-      const result = { ...aggregation, [start]: aggregation.startTs, [end]: aggregation.endTs }
-      Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.START_TS)
-      Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.END_TS)
-      Object.assign(value, { ...result, [start]: aggregation.startTs, [end]: aggregation.endTs })
+      if (fieldMapping?.mores) {
+        const [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR)
+        const aggregation = Reflect.get(value, BuiltInVariable.SELECT_TIME_AGGREGATION) || {}
+        const result = { ...aggregation, [start]: aggregation.startTs, [end]: aggregation.endTs }
+        if (start && end) {
+          Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.START_TS)
+          Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.END_TS)
+        }
+        Object.assign(value, { ...result, [start]: aggregation.startTs, [end]: aggregation.endTs })
+      }
       Reflect.deleteProperty(value, BuiltInVariable.SELECT_TIME_AGGREGATION)
     }
 
@@ -241,7 +247,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
       value: params[BuiltInVariable.DATE_RANGE],
       type: 'datetimerange',
       clearable: true,
-      defaultTime: ['00:00:00', '00:00:00'],
+      defaultTime: ['00:00:00', '23:59:59'],
       onUpdateValue(value) {
         params[BuiltInVariable.DATE_RANGE] = value
       }
@@ -312,11 +318,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
@@ -337,7 +350,6 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     }] as FormItemRule
   }
 
-  const uuid = () => Number(Math.random().toString().substring(2)).toString(32)
   const toFormSchemas = (builtInVariableKey: string, required: boolean, value: any, mores: boolean) => {
     const groupList = (builtInVariableKey || '').split(GROUP_SEPARATOR)
     return groupList.reduce((prev, next) => {
@@ -394,18 +406,21 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
   const setParams = (Params: Recordable = {}) => {
     for (const { key, value, mores } of unref(getParams)) {
       const splitKeys = value ? value.split(GROUP_SEPARATOR) : (key || '').split(GROUP_SEPARATOR)
+      let [start, end] = splitKeys
+      start = start ? start : SelectTimeAggregationFieldEnum.START_TS
+      end = end ? end : SelectTimeAggregationFieldEnum.END_TS
       if (isDateComponent(key as BuiltInVariable)) {
         if (key as BuiltInVariable === BuiltInVariable.DATE_FIXED) {
-          params[key] = Params[splitKeys[0]] || null
+          params[key] = Params[start] || null
           continue
         }
         if (mores) {
           const { agg, interval, limit } = Params
-          const startTs = Params[splitKeys[0]]
-          const endTs = Params[splitKeys[1]]
+          const startTs = Params[start]
+          const endTs = Params[end]
           params[BuiltInVariable.SELECT_TIME_AGGREGATION] = { agg, interval, startTs, endTs, limit }
         } else {
-          const value = [Params[splitKeys[0]], Params[splitKeys[1]]]
+          const value = [Params[start], Params[end]]
           params[key] = value.every(Boolean) ? value : null
         }
         continue
@@ -419,9 +434,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
   const clearParams = () => {
     Object.keys(params).forEach(key => {
       Reflect.deleteProperty(params, key)
-      // params[key] = null
     })
-    // params[BuiltInVariable.SELECT_TIME_AGGREGATION] = { startTs: null, endTs: null, limit: null, interval: null }
     params[BuiltInVariable.SELECT_TIME_AGGREGATION] = {}
   }
 

@@ -54,7 +54,7 @@ const getIntervalTimeOptions = computed(() => {
 })
 
 const handleTimePerionChange = (value: number[]) => {
-  const [startTs, endTs] = value
+  const [startTs, endTs] = value || []
   emit('update:value', { ...props.value, startTs, endTs, interval: null })
   emit('change', { ...props.value || {}, startTs, endTs, interval: null })
 }
@@ -98,7 +98,7 @@ watch(() => props.value, (target) => {
     <NGi :span="16">
       <NFormItem :show-label="false">
         <NDatePicker v-model:value="timePeriod" type="datetimerange" placeholder="请选择时间范围"
-          @update-value="handleTimePerionChange" clearable></NDatePicker>
+          @update-value="handleTimePerionChange" clearable :default-time="['00:00:00', '23:59:59']"></NDatePicker>
       </NFormItem>
     </NGi>
     <NGi :span="4">