Merge branch 'pref/issure' into 'main_dev'

perf(src/packages/components): 优化日期控件，区分是否是从快捷选项里选择的

See merge request yunteng/thingskit-view!236

@@ -73,10 +73,11 @@ export const useChartDataFetch = (
                     let endTsValue = null
                     let endTsValue = null
                     const {requestParams} = toRaw(targetComponent.request)
                     const {requestParams} = toRaw(targetComponent.request)
                     const {Params} = requestParams
                     const {Params} = requestParams
-                    const {entityType, startTs, endTs} = Params
+                    const {startTs, endTs, shortcutsSelect} = Params
                     let days = Math.ceil(((endTs as unknown as number) - (startTs as unknown as number)) / (1 * 60 * 60 * 24 * 1000))
                     let days = Math.ceil(((endTs as unknown as number) - (startTs as unknown as number)) / (1 * 60 * 60 * 24 * 1000))
                     const ShortcutsDays = [1, 7, 30]
                     const ShortcutsDays = [1, 7, 30]
-                    if (entityType === 'DEVICE') {
+                    // shortcutsSelect为真
+                    if (shortcutsSelect) {
                         //等于这三个，说明是从快捷选项里面选的
                         //等于这三个，说明是从快捷选项里面选的
                         if(ShortcutsDays.includes(days)) {
                         if(ShortcutsDays.includes(days)) {
                             days = days <= 2 ? 1 : days<= 8 ? 7 : 30
                             days = days <= 2 ? 1 : days<= 8 ? 7 : 30
@@ -85,12 +86,12 @@ export const useChartDataFetch = (
                             endTsValue = dayjs().endOf('day').valueOf()
                             endTsValue = dayjs().endOf('day').valueOf()
                             ;(toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTsValue as number
                             ;(toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTsValue as number
                             ;(toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTsValue
                             ;(toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTsValue
-                        } else {
-                            //否则，选择的是什么日期区间就是什么
-                            (toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTs as unknown as number
-                            (toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTs as unknown as number
                         } 
                         } 
-                    }
+                    } else {
+                        //否则，选择的是什么日期区间就是什么
+                        (toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTs as unknown as number
+                        (toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTs as unknown as number
+                    } 
                     const res = await customRequest(toRaw(targetComponent.request))
                     const res = await customRequest(toRaw(targetComponent.request))
                     if (res) {
                     if (res) {
                         try {
                         try {

@@ -245,8 +245,10 @@ const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, ne
       }
       }
     }
     }
   })
   })
-  //
-  addPieInterval(newData)
+  //动画为开启才执行动画
+  if (props.chartConfig.option.isCarousel) {
+    addPieInterval(newData)
+  }
   updateVChart(newData)
   updateVChart(newData)
 })
 })
 
 

@@ -244,8 +244,10 @@ const {vChartRef} = useChartDataFetch(props.chartConfig, useChartEditStore, (new
       }
       }
     }
     }
   })
   })
-  //
-  addPieInterval(newData)
+  //动画为开启才执行动画
+  if (props.chartConfig.option.isCarousel) {
+    addPieInterval(newData)
+  }
   updateVChart(newData)
   updateVChart(newData)
 })
 })
 
 

@@ -274,8 +274,10 @@ const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, ne
       }
       }
     }
     }
   })
   })
-  //
-  addPieInterval(newData)
+   //动画为开启才执行动画
+   if (props.chartConfig.option.isCarousel) {
+    addPieInterval(newData)
+  }
   updateVChart(newData)
   updateVChart(newData)
 })
 })
 
 

@@ -11,6 +11,7 @@ interface Value {
   startTs?: Nullable<number>
   startTs?: Nullable<number>
   endTs?: Nullable<number>
   endTs?: Nullable<number>
   limit?: Nullable<number>
   limit?: Nullable<number>
+  shortcutsSelect?: Nullable<boolean>
 }
 }
 
 
 const props = withDefaults(
 const props = withDefaults(
@@ -32,20 +33,25 @@ const timePeriod = ref<Nullable<[number, number]>>(null)
 const agg = ref()
 const agg = ref()
 const interval = ref()
 const interval = ref()
 const limit = ref(7)
 const limit = ref(7)
+//区分是否是从快捷选项里选择的
+const shortcutsSelect = ref(false)
 const rangeShortcuts = {
 const rangeShortcuts = {
   昨天: () => {
   昨天: () => {
+    shortcutsSelect.value = true
     return [
     return [
       dayjs().startOf('day').valueOf(),
       dayjs().startOf('day').valueOf(),
       dayjs().endOf('day').valueOf()
       dayjs().endOf('day').valueOf()
     ] as const
     ] as const
   },
   },
   最近7天: () => {
   最近7天: () => {
+    shortcutsSelect.value = true
     return [
     return [
       dayjs().subtract(6, 'day').startOf('day').valueOf(),
       dayjs().subtract(6, 'day').startOf('day').valueOf(),
       dayjs().endOf('day').valueOf()
       dayjs().endOf('day').valueOf()
     ] as const
     ] as const
   },
   },
   最近30天: () => {
   最近30天: () => {
+    shortcutsSelect.value = true
     return [
     return [
       dayjs().subtract(29, 'day').startOf('day').valueOf(),
       dayjs().subtract(29, 'day').startOf('day').valueOf(),
       dayjs().endOf('day').valueOf()
       dayjs().endOf('day').valueOf()
@@ -74,10 +80,15 @@ const getIntervalTimeOptions = computed(() => {
   return getRangeOptions(diff)
   return getRangeOptions(diff)
 })
 })
 
 
+const handleTimeRangeBlur = () => {
+  //从面板里面选择
+  shortcutsSelect.value = false
+}
+
 const handleTimePerionChange = (value: number[]) => {
 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})
+  emit('update:value', {...props.value, startTs, endTs, interval: null,  shortcutsSelect: shortcutsSelect.value})
+  emit('change', {...props.value || {}, startTs, endTs, interval: null,  shortcutsSelect: shortcutsSelect.value})
 }
 }
 
 
 const handleAggChange = (value: string) => {
 const handleAggChange = (value: string) => {
@@ -120,6 +131,7 @@ watch(() => props.value, (target) => {
       <NFormItem :show-label="false">
       <NFormItem :show-label="false">
         <NDatePicker :shortcuts="rangeShortcuts" v-model:value="timePeriod" type="datetimerange"
         <NDatePicker :shortcuts="rangeShortcuts" v-model:value="timePeriod" type="datetimerange"
                      placeholder="请选择时间范围"
                      placeholder="请选择时间范围"
+                     @blur="handleTimeRangeBlur"
                      @update-value="handleTimePerionChange" clearable
                      @update-value="handleTimePerionChange" clearable
                      :default-time="['00:00:00', '23:59:59']"></NDatePicker>
                      :default-time="['00:00:00', '23:59:59']"></NDatePicker>
       </NFormItem>
       </NFormItem>

@@ -61,7 +61,6 @@ const rangeModelStyle = computed(() => {
   @include fetch-bg-color('background-color2');
   @include fetch-bg-color('background-color2');
   @include go(edit-range-model) {
   @include go(edit-range-model) {
     z-index: -1;
     z-index: -1;
-    position: absolute;
     left: 0;
     left: 0;
     top: 0;
     top: 0;
   }
   }