Merge branch 'fix/datarange' into 'main_dev'

perf(src/hooks/external): 优化日期控件，选择其他区间，传递参数错误。

See merge request yunteng/thingskit-view!234

@@ -75,13 +75,21 @@ export const useChartDataFetch = (
                     const {Params} = requestParams
                     const {Params} = requestParams
                     const {entityType, startTs, endTs} = Params
                     const {entityType, startTs, endTs} = 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]
                     if (entityType === 'DEVICE') {
                     if (entityType === 'DEVICE') {
-                        days = days <= 2 ? 1 : days<= 8 ? 7 : 30
-                        startTsValue =  dayjs().subtract(days - 1, 'day').startOf('day').valueOf()
-                        startTsValue = dayjs(startTsValue).startOf('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.endTs as unknown as number) = endTsValue
+                        //等于这三个，说明是从快捷选项里面选的
+                        if(ShortcutsDays.includes(days)) {
+                            days = days <= 2 ? 1 : days<= 8 ? 7 : 30
+                            startTsValue =  dayjs().subtract(days - 1, 'day').startOf('day').valueOf()
+                            startTsValue = dayjs(startTsValue).startOf('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.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
+                        } 
                     }
                     }
                     const res = await customRequest(toRaw(targetComponent.request))
                     const res = await customRequest(toRaw(targetComponent.request))
                     if (res) {
                     if (res) {