Merge branch 'fix/types-error' into 'main_dev'

fix: 修复类型错误

See merge request yunteng/thingskit-view!228

-import { ref, toRefs, toRaw, watch } from 'vue'
+import {ref, toRefs, toRaw, watch} from 'vue'
 import type VChart from 'vue-echarts'
 import type VChart from 'vue-echarts'
-import { useChartDataPondFetch } from '@/hooks/'
-import { CreateComponentType, ChartFrameEnum, CreateComponentGroupType } from '@/packages/index.d'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview, intervalUnitHandle } from '@/utils'
-import { setOption } from '@/packages/public/chart'
-import { useChartDataSocket } from './useChartDataSocket'
-import { customRequest } from '@/api/external/customRequest'
-import { useFilterFn } from './useFilterFn'
-import { RequestContentTypeEnum } from '@/enums/external/httpEnum'
+import {useChartDataPondFetch} from '@/hooks/'
+import {CreateComponentType, ChartFrameEnum, CreateComponentGroupType} from '@/packages/index.d'
+import {useChartEditStore} from '@/store/modules/chartEditStore/chartEditStore'
+import {isPreview, intervalUnitHandle} from '@/utils'
+import {setOption} from '@/packages/public/chart'
+import {useChartDataSocket} from './useChartDataSocket'
+import {customRequest} from '@/api/external/customRequest'
+import {useFilterFn} from './useFilterFn'
+import {RequestContentTypeEnum} from '@/enums/external/httpEnum'
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
 
 
 
 
@@ -22,123 +22,123 @@ type ChartEditStoreType = typeof useChartEditStore
  * @param updateCallback 自定义更新函数
  * @param updateCallback 自定义更新函数
  */
  */
 export const useChartDataFetch = (
 export const useChartDataFetch = (
-  targetComponent: CreateComponentType,
-  useChartEditStore: ChartEditStoreType,
-  updateCallback?: (...args: any) => any
+    targetComponent: CreateComponentType,
+    useChartEditStore: ChartEditStoreType,
+    updateCallback?: (...args: any) => any
 ) => {
 ) => {
-  const vChartRef = ref<typeof VChart | null>(null)
-  let fetchInterval: any = 0
+    const vChartRef = ref<typeof VChart | null>(null)
+    let fetchInterval: any = 0
 
 
-  // 组件类型
-  const { chartFrame } = targetComponent.chartConfig
+    // 组件类型
+    const {chartFrame} = targetComponent.chartConfig
 
 
-  // eCharts 组件配合 vChart 库更新方式
-  const echartsUpdateHandle = (dataset: any) => {
-    if (chartFrame === ChartFrameEnum.ECHARTS) {
-      if (vChartRef.value) {
-        setOption(vChartRef.value, { dataset: dataset })
-      }
+    // eCharts 组件配合 vChart 库更新方式
+    const echartsUpdateHandle = (dataset: any) => {
+        if (chartFrame === ChartFrameEnum.ECHARTS) {
+            if (vChartRef.value) {
+                setOption(vChartRef.value, {dataset: dataset})
+            }
+        }
     }
     }
-  }
 
 
-  const requestIntervalFn = () => {
-    const chartEditStore = useChartEditStore()
-    if ((targetComponent.request.requestContentType as RequestContentTypeEnum) === RequestContentTypeEnum.WEB_SOCKET) return
+    const requestIntervalFn = () => {
+        const chartEditStore = useChartEditStore()
+        if ((targetComponent.request.requestContentType as RequestContentTypeEnum) === RequestContentTypeEnum.WEB_SOCKET) return
 
 
-    // 全局数据
-    const {
-      requestOriginUrl,
-      requestIntervalUnit: globalUnit,
-      requestInterval: globalRequestInterval
-    } = toRefs(chartEditStore.getRequestGlobalConfig)
+        // 全局数据
+        const {
+            requestOriginUrl,
+            requestIntervalUnit: globalUnit,
+            requestInterval: globalRequestInterval
+        } = toRefs(chartEditStore.getRequestGlobalConfig)
 
 
-    // 目标组件
-    const {
-      requestUrl,
-      requestIntervalUnit: targetUnit,
-      requestInterval: targetInterval
-    } = toRefs(targetComponent.request)
+        // 目标组件
+        const {
+            requestUrl,
+            requestIntervalUnit: targetUnit,
+            requestInterval: targetInterval
+        } = toRefs(targetComponent.request)
 
 
-    try {
-      // 处理地址 
-      if (requestUrl?.value) {
-        // requestOriginUrl 允许为空
-        const completePath = requestOriginUrl && requestOriginUrl.value + requestUrl.value
-        if (!completePath) return
+        try {
+            // 处理地址
+            if (requestUrl?.value) {
+                // requestOriginUrl 允许为空
+                const completePath = requestOriginUrl && requestOriginUrl.value + requestUrl.value
+                if (!completePath) return
 
 
-        clearInterval(fetchInterval)
+                clearInterval(fetchInterval)
 
 
-        const fetchFn = async () => {
-          let startTsValue = null
-          let endTsValue = null
-          const { requestParams } = toRaw(targetComponent.request)
-          const { Params } = requestParams
-          const { entityType, startTs, endTs } = Params
-          const days = Math.ceil((endTs - startTs) / (1 * 60 * 60 * 24 * 1000))
-          if (entityType === 'DEVICE') {
-            startTsValue = Date.now() - days <= 32 ? 2592000000: days <= 8 ? 604800000 : startTs
-            endTsValue = Date.now()
-            toRaw(targetComponent.request).requestParams.Params.startTs = startTsValue
-            toRaw(targetComponent.request).requestParams.Params.endTs = endTsValue
-          }
-          const res = await customRequest(toRaw(targetComponent.request))
-          if (res) {
-            try {
-              const filter = targetComponent.filter
-              const { value } = useFilterFn(filter, res)
-              echartsUpdateHandle(value)
-              // 更新回调函数
-              if (updateCallback) {
-                updateCallback(value, targetComponent.request)//为了处理设备最新数据轮播列表，这里传过去当前组件的信息
-              }
-            } catch (error) {
-              console.error(error)
-            }
-          }
-        }
+                const fetchFn = async () => {
+                    let startTsValue = null
+                    let endTsValue = null
+                    const {requestParams} = toRaw(targetComponent.request)
+                    const {Params} = requestParams
+                    const {entityType, startTs, endTs} = Params
+                    const days = Math.ceil(((endTs as unknown as number) - (startTs as unknown as number)) / (1 * 60 * 60 * 24 * 1000))
+                    if (entityType === 'DEVICE') {
+                        startTsValue = Date.now() - days <= 32 ? 2592000000 : days <= 8 ? 604800000 : startTs
+                        endTsValue = Date.now()
+                        ;(toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTsValue as number
+                        ;(toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTsValue
+                    }
+                    const res = await customRequest(toRaw(targetComponent.request))
+                    if (res) {
+                        try {
+                            const filter = targetComponent.filter
+                            const {value} = useFilterFn(filter, res)
+                            echartsUpdateHandle(value)
+                            // 更新回调函数
+                            if (updateCallback) {
+                                updateCallback(value, targetComponent.request)//为了处理设备最新数据轮播列表，这里传过去当前组件的信息
+                            }
+                        } catch (error) {
+                            console.error(error)
+                        }
+                    }
+                }
 
 
-        // 普通初始化与组件交互处理监听
-        watch(
-          () => targetComponent.request,
-          () => {
-            fetchFn()
-          },
-          {
-            immediate: true,
-            deep: true
-          }
-        )
+                // 普通初始化与组件交互处理监听
+                watch(
+                    () => targetComponent.request,
+                    () => {
+                        fetchFn()
+                    },
+                    {
+                        immediate: true,
+                        deep: true
+                    }
+                )
 
 
-        // 定时时间
-        const time = targetInterval && targetInterval.value ? targetInterval.value : globalRequestInterval.value
-        // 单位
-        const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
-        // 开启轮询
-        if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
-      }
-      // eslint-disable-next-line no-empty
-    } catch (error) {
-      console.log(error)
+                // 定时时间
+                const time = targetInterval && targetInterval.value ? targetInterval.value : globalRequestInterval.value
+                // 单位
+                const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
+                // 开启轮询
+                if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
+            }
+            // eslint-disable-next-line no-empty
+        } catch (error) {
+            console.log(error)
+        }
     }
     }
-  }
 
 
-  if (isPreview()) {
-    requestIntervalFn()
-    const chartEditStore = useChartEditStore()
-    const { initial } = useChartDataSocket()
-    /**
-     * 支持分组也可以接受ws
-     * 如果是分组并且绑定了ws
-     */
-    chartEditStore.getComponentList?.forEach((item: CreateComponentType | CreateComponentGroupType) => {
-      if (item.isGroup) {
-        if (item.request.requestUrl?.includes('ws')) {
-          initial(item, useChartEditStore, updateCallback)
-        }
-      }
-    })
-    //
-    initial(targetComponent, useChartEditStore, updateCallback)
-  }
-  return { vChartRef }
+    if (isPreview()) {
+        requestIntervalFn()
+        const chartEditStore = useChartEditStore()
+        const {initial} = useChartDataSocket()
+        /**
+         * 支持分组也可以接受ws
+         * 如果是分组并且绑定了ws
+         */
+        chartEditStore.getComponentList?.forEach((item: CreateComponentType | CreateComponentGroupType) => {
+            if (item.isGroup) {
+                if (item.request.requestUrl?.includes('ws')) {
+                    initial(item, useChartEditStore, updateCallback)
+                }
+            }
+        })
+        //
+        initial(targetComponent, useChartEditStore, updateCallback)
+    }
+    return {vChartRef}
 }
 }