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

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

See merge request yunteng/thingskit-view!214

@@ -191,6 +191,7 @@ export interface CreateComponentType extends PublicConfigType, requestConfig {
   option: GlobalThemeJsonType
   option: GlobalThemeJsonType
   groupList?: Array<CreateComponentType>
   groupList?: Array<CreateComponentType>
   saveHistoryInput?: string // THINGS_KIT 新增一个接口字段 saveHistoryInput,用于记录当前组件id和输入框的内容，这里不能重写，有很多地方引用到的，这里升级版本有冲突
   saveHistoryInput?: string // THINGS_KIT 新增一个接口字段 saveHistoryInput,用于记录当前组件id和输入框的内容，这里不能重写，有很多地方引用到的，这里升级版本有冲突
+  wsOriginalMessage?: any
 }
 }
 
 
 // 组件成组实例类
 // 组件成组实例类

@@ -273,6 +273,7 @@ export const useSocketStore = defineStore({
             const { filter } = targetItem
             const { filter } = targetItem
             const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
             const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
             targetItem.option.dataset = flag ? filterValue : reason
             targetItem.option.dataset = flag ? filterValue : reason
+            targetItem.wsOriginalMessage = _value
             try {
             try {
               const dumpSaveHistoryInput = JSON.parse((!targetItem.saveHistoryInput ? null : targetItem.saveHistoryInput) as string) || JSON.parse(window.localStorage.getItem('CACHE_HISTORY_INPUT_VALUE') as string)
               const dumpSaveHistoryInput = JSON.parse((!targetItem.saveHistoryInput ? null : targetItem.saveHistoryInput) as string) || JSON.parse(window.localStorage.getItem('CACHE_HISTORY_INPUT_VALUE') as string)
               if (!dumpSaveHistoryInput) return
               if (!dumpSaveHistoryInput) return
@@ -299,6 +300,7 @@ export const useSocketStore = defineStore({
               const { filter } = groupItem
               const { filter } = groupItem
               const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
               const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
               groupItem.option.dataset = flag ? filterValue : reason
               groupItem.option.dataset = flag ? filterValue : reason
+              groupItem.wsOriginalMessage = _value
             }
             }
           })
           })
         } else {
         } else {
@@ -308,6 +310,7 @@ export const useSocketStore = defineStore({
             const { filter } = targetItem
             const { filter } = targetItem
             const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
             const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
             targetItem.option.dataset = flag ? filterValue : reason
             targetItem.option.dataset = flag ? filterValue : reason
+            targetItem.wsOriginalMessage = _value
           }
           }
         }
         }
         //
         //

@@ -60,7 +60,7 @@
                 <NSpace>
                 <NSpace>
                   <NText depth="3">接口返回数据(res)：</NText>
                   <NText depth="3">接口返回数据(res)：</NText>
                   <NScrollbar style="max-height: 300px;">
                   <NScrollbar style="max-height: 300px;">
-                    <NCode :code="toString(sourceData) || '暂无'" language="json" :word-wrap="true"></NCode>
+                    <NCode :code="toString(isSocketRequest ? targetData.wsOriginalMessage : sourceData) || '暂无'" language="json" :word-wrap="true"></NCode>
                   </NScrollbar>
                   </NScrollbar>
                 </NSpace>
                 </NSpace>
               </div>
               </div>
@@ -123,21 +123,24 @@ const sourceData = ref<any>('')
 const { fetchTargetData: fetchHandle } = useFetchTargetData()
 const { fetchTargetData: fetchHandle } = useFetchTargetData()
 // 动态获取数据
 // 动态获取数据
 const fetchTargetData = async () => {
 const fetchTargetData = async () => {
-  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
-    }
+  const res = await fetchHandle()
+  if (res) {
+    sourceData.value = res
   }
   }
 }
 }
 
 
+const isSocketRequest = computed(() => {
+  return (unref(targetData).request.requestContentType as RequestContentTypeEnum) === RequestContentTypeEnum.WEB_SOCKET
+})
+
 // 过滤结果
 // 过滤结果
 const filterRes = computed(() => {
 const filterRes = computed(() => {
-  const { value, flag, reason } = useFilterFn(filter.value, sourceData.value)
+  let res = sourceData.value
+  if (unref(isSocketRequest)) {
+    res = unref(targetData).wsOriginalMessage
+  }
+
+  const { value, flag, reason } = useFilterFn(filter.value, res)
   // 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}`)