Merge branch 'fix/socket-filter' into 'main_dev'

fix: 修复websocket请求无法使用过滤器

See merge request yunteng/thingskit-view!207

@@ -154,7 +154,7 @@ export const customRequest = async (request: RequestConfigType) => {
    * 修改后代码 requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl: `${requestUrl}?${objConvertQuery(Params)}
    * 修改后代码 requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl: `${requestUrl}?${objConvertQuery(Params)}
    */
    */
   Params = handleParams(Params)
   Params = handleParams(Params)
-  console.log(Params)
+  
   return customHttp.request<any>({
   return customHttp.request<any>({
     url: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl : `${requestUrl}?${objConvertQuery(Params)}`,
     url: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl : `${requestUrl}?${objConvertQuery(Params)}`,
     baseURL: getOriginUrl(requestOriginUrl!),
     baseURL: getOriginUrl(requestOriginUrl!),

@@ -125,7 +125,7 @@ export const useChartDataSocket = () => {
   return {
   return {
     initial,
     initial,
     sendMessage,
     sendMessage,
-    disconnectWs
+    disconnectWs,
   }
   }
 }
 }
 
 

@@ -97,7 +97,7 @@
 </template>
 </template>
 
 
 <script lang="ts" setup>
 <script lang="ts" setup>
-import { ref, computed, watch } from 'vue'
+import { ref, computed, watch, unref } from 'vue'
 import { MonacoEditor } from '@/components/Pages/MonacoEditor'
 import { MonacoEditor } from '@/components/Pages/MonacoEditor'
 import { icon } from '@/plugins'
 import { icon } from '@/plugins'
 import { goDialog, toString } from '@/utils'
 import { goDialog, toString } from '@/utils'
@@ -105,6 +105,7 @@ import { useTargetData } from '../../../../hooks/useTargetData.hook'
 import { NButton, NCard, NCode, NDivider, NIcon, NModal, NScrollbar, NSpace, NTag, NText } from 'naive-ui'
 import { NButton, NCard, NCode, NDivider, NIcon, NModal, NScrollbar, NSpace, NTag, NText } from 'naive-ui'
 import { useFilterFn } from '@/hooks/external/useFilterFn'
 import { useFilterFn } from '@/hooks/external/useFilterFn'
 import { useFetchTargetData } from '@/hooks/external/useFetchTargetData'
 import { useFetchTargetData } from '@/hooks/external/useFetchTargetData'
+import { RequestContentTypeEnum } from '@/enums/external/httpEnum'
 
 
 const { DocumentTextIcon } = icon.ionicons5
 const { DocumentTextIcon } = icon.ionicons5
 const { FilterIcon, FilterEditIcon } = icon.carbon
 const { FilterIcon, FilterEditIcon } = icon.carbon
@@ -122,9 +123,15 @@ const sourceData = ref<any>('')
 const { fetchTargetData: fetchHandle } = useFetchTargetData()
 const { fetchTargetData: fetchHandle } = useFetchTargetData()
 // 动态获取数据
 // 动态获取数据
 const fetchTargetData = async () => {
 const fetchTargetData = async () => {
-  const res = await fetchHandle()
-  if (res) {
-    sourceData.value = res
+  if ((unref(targetData).request.requestContentType as RequestContentTypeEnum) === RequestContentTypeEnum.WEB_SOCKET) {
+    sourceData.value = {
+      data: unref(targetData).option.dataset
+    }
+  } else {
+    const res = await fetchHandle()
+    if (res) {
+      sourceData.value = res
+    }
   }
   }
 }
 }
 
 
@@ -134,7 +141,6 @@ const filterRes = computed(() => {
   // eslint-disable-next-line vue/no-side-effects-in-computed-properties
   // eslint-disable-next-line vue/no-side-effects-in-computed-properties
   errorFlag.value = !flag
   errorFlag.value = !flag
   return toString(flag ? value : `过滤函数错误，日志：${reason}`)
   return toString(flag ? value : `过滤函数错误，日志：${reason}`)
-
 })
 })
 
 
 // 新增过滤器
 // 新增过滤器
@@ -170,7 +176,7 @@ const saveFilter = () => {
 watch(
 watch(
   () => showModal.value,
   () => showModal.value,
   (newData: boolean) => {
   (newData: boolean) => {
-    if (newData) { 
+    if (newData) {
       fetchTargetData()
       fetchTargetData()
       filter.value = targetData.value.filter || `return res`
       filter.value = targetData.value.filter || `return res`
     }
     }