Merge branch 'main_dev' into ft

fengwotao
2 parents 64b83211 ac726fa2
Showing 2 changed files with 60 additions and 59 deletions
src/hooks/external/useChartDataSocket.ts
src/store/external/modules/socketStore.ts
--- a/src/hooks/external/useChartDataSocket.ts
View file @80c1e4d
+++ b/src/hooks/external/useChartDataSocket.ts
View file @80c1e4d
 import { RequestContentTypeEnum } from "@/enums/external/httpEnum";
 import { CreateComponentType } from "@/packages/index.d";
-import { useSocketStore} from "@/store/external/modules/socketStore";
-import { SocketReceiveMessageType,SocketSendMessageType } from "@/store/external/modules/socketStore.d";
+import { useSocketStore } from "@/store/external/modules/socketStore";
+import { SocketReceiveMessageType, SocketSendMessageType } from "@/store/external/modules/socketStore.d";
 import { useChartEditStore } from "@/store/modules/chartEditStore/chartEditStore";
 import { getJwtToken, getShareJwtToken } from "@/utils/external/auth";
 import { useWebSocket, WebSocketResult } from "@vueuse/core";
-import {onMounted, ref, unref} from "vue";
+import { onMounted, ref, unref } from "vue";
 import { ExtraRequestConfigType } from "@/store/external/modules/extraComponentInfo.d";
 import { isShareMode } from "@/views/share/hook";
@@ -16,14 +16,14 @@ interface SocketConnectionPoolType {
   url: string
 }
-interface SaveHistoryWsMessage{
+interface SaveHistoryWsMessage {
   id: string
   message: SocketSendMessageType
 }
 const socketConnectionPool: SocketConnectionPoolType[] = []
-const saveHistoryWsMessage=ref([] as SaveHistoryWsMessage[])
+const saveHistoryWsMessage = ref([] as SaveHistoryWsMessage[])
 const parse = (value: string) => {
   try {
@@ -48,7 +48,7 @@ const getSocketInstance = (request: ExtraRequestConfigType) => {
   if (~index) {
     return socketConnectionPool[index].ws
   }
-  const token = isShareMode() ? getShareJwtToken() :  getJwtToken()
+  const token = isShareMode() ? getShareJwtToken() : getJwtToken()
   const socketUrl = `${getOriginUrl(requestOriginUrl || '')}${requestUrl}?token=${token}`
   const instance = useWebSocket(socketUrl, {
@@ -112,18 +112,18 @@ export const useChartDataSocket = () => {
    * @param targetComponent
    */
   //删除组件 发送断开消息
-  const disconnectWs=(targetComponent:CreateComponentType)=>{
-    try{
-      saveHistoryWsMessage.value.forEach((item)=>{
-      if(item.id===targetComponent.id){
+  const disconnectWs = (targetComponent: CreateComponentType) => {
+    try {
+      saveHistoryWsMessage.value.forEach((item) => {
+        if (item.id === targetComponent.id) {
           const { request } = unref(targetComponent)
-          if((request.requestContentType as RequestContentTypeEnum) !== RequestContentTypeEnum.WEB_SOCKET)return
+          if ((request.requestContentType as RequestContentTypeEnum) !== RequestContentTypeEnum.WEB_SOCKET) return
           const { send } = getSocketInstance(request)
-          item.message.tsSubCmds[0].unsubscribe=true
+          item.message.tsSubCmds[0].unsubscribe = true
           send(JSON.stringify(item.message))
-      }
-    })
-    }catch (e) {
+        }
+      })
+    } catch (e) {
       console.log(`
       错误位置：src/hooks/external/useChartDataSocket.ts
       错误原因：${e}
--- a/src/store/external/modules/socketStore.ts
View file @80c1e4d
+++ b/src/store/external/modules/socketStore.ts
View file @80c1e4d
 import { defineStore } from "pinia";
-import { KeyBoundComponentList, SocketComponentRecord, SocketReceiveMessageType, SocketSendMessageItemType, SocketSendMessageType, SocketStoreType, UnsubscribePoolType } from '@/store/external/modules/socketStore.d'
+import { KeyBoundComponentList, SocketComponentRecord, SocketConnectionPoolType, SocketReceiveMessageType, SocketSendMessageItemType, SocketSendMessageType, SocketStoreType, UnsubscribePoolType } from '@/store/external/modules/socketStore.d'
 import { CreateComponentType } from "@/packages/index.d";
 import { RequestContentTypeEnum } from "@/enums/external/httpEnum";
 import { useChartEditStore } from "@/store/modules/chartEditStore/chartEditStore";
@@ -59,13 +59,14 @@ export const useSocketStore = defineStore({
     updateConnectionPool(entityId: string, keys: string[], componentId: string) {
       const isExist = Reflect.has(this.connectionPool, entityId)
       if (isExist) {
-        const temp = Reflect.get(this.connectionPool, entityId)
+        const temp = Reflect.get(this.connectionPool, entityId) as { [key: string]: KeyBoundComponentList[] }
         keys.forEach(key => {
           const isExistKey = Reflect.has(temp, key)
           if (!isExistKey) {
             const keyBindEntityIdList = Reflect.get(temp, key) || []
             Reflect.set(temp, key, [...keyBindEntityIdList, { componentId }] as KeyBoundComponentList[])
-
+          } else {
+            temp[key].push({ componentId })
           }
         })
       } else {
@@ -260,53 +261,53 @@ export const useSocketStore = defineStore({
        * 修改后的代码
        * 修改ws绑定单个文本组件，然后有多个，并且进行分组，显示的信息为原始信息，而非过滤函数返回的信息
        */
-     chartEditStore.getComponentList.forEach(targetItem => {
-      if (targetItem.isGroup) {
-        /**
-         * 如果是分组，并且request里是ws，则分组组件这个整体是接受ws绑定的,之前分组是不能绑定ws的
-         */
-        if(targetItem.request.requestUrl?.includes('ws')){
-          const _value = this.getComponentValueByKeys(targetItem, value)
-          const { filter } = targetItem
-          const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
-          targetItem.option.dataset = flag ? filterValue : reason
-        try{
-          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(!Array.isArray(dumpSaveHistoryInput)) return
-          targetItem.groupList?.forEach((item:CreateComponentType)=>{
-           dumpSaveHistoryInput?.forEach((inputItem:{id:string,inputValue:string})=>{
-            if(item.id === inputItem.id){
-             item.option.dataset= Function('res', `return ${inputItem?.inputValue}`)(targetItem.option?.dataset)
+      chartEditStore.getComponentList.forEach(targetItem => {
+        if (targetItem.isGroup) {
+          /**
+           * 如果是分组，并且request里是ws，则分组组件这个整体是接受ws绑定的,之前分组是不能绑定ws的
+           */
+          if (targetItem.request.requestUrl?.includes('ws')) {
+            const _value = this.getComponentValueByKeys(targetItem, value)
+            const { filter } = targetItem
+            const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
+            targetItem.option.dataset = flag ? filterValue : reason
+            try {
+              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 (!Array.isArray(dumpSaveHistoryInput)) return
+              targetItem.groupList?.forEach((item: CreateComponentType) => {
+                dumpSaveHistoryInput?.forEach((inputItem: { id: string, inputValue: string }) => {
+                  if (item.id === inputItem.id) {
+                    item.option.dataset = Function('res', `return ${inputItem?.inputValue}`)(targetItem.option?.dataset)
+                  }
+                })
+              })
+            } catch (e) {
+              console.log(e)
             }
-          })
-        })
-        }catch(e){
-          console.log(e)
-        }
-        }
-        /**
-         * 这也是分组，但这个是分组这个整体不绑定ws，而是下面的子组件都绑定了ws
-         */
-        targetItem.groupList?.forEach(groupItem => {
-          if (groupItem.id === id) {
+          }
+          /**
+           * 这也是分组，但这个是分组这个整体不绑定ws，而是下面的子组件都绑定了ws
+           */
+          targetItem.groupList?.forEach(groupItem => {
+            if (groupItem.id === id) {
               const _value = this.getComponentValueByKeys(groupItem, value)
               const { filter } = groupItem
               const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
               groupItem.option.dataset = flag ? filterValue : reason
+            }
+          })
+        } else {
+          //单个
+          if (targetItem.id === id) {
+            const _value = this.getComponentValueByKeys(targetItem, value)
+            const { filter } = targetItem
+            const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
+            targetItem.option.dataset = flag ? filterValue : reason
           }
-        })
-      } else {
-         //单个
-        if (targetItem.id === id) {
-          const _value = this.getComponentValueByKeys(targetItem, value)
-              const { filter } = targetItem
-              const { value: filterValue, reason, flag } = useFilterFn(filter, _value)
-              targetItem.option.dataset = flag ? filterValue : reason
-          }
-      }
-      //
-    })
+        }
+        //
+      })
     },
     /**