Merge pull request #9924 from dataease/pr@dev-v2_export_data

Pr@dev v2 export data

core/core-frontend/src/assets/svg/variable.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1716884731544" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3731" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M872 561.7V93.4c0-17.3-15.1-31.4-33.8-31.4-18.6 0-33.8 14.1-33.8 31.4v468.3c-51.9 14.7-90 62.4-90 119.1s38.1 104.4 90 119.1v130.8c0 17.3 15.1 31.4 33.8 31.4 18.6 0 33.8-14.1 33.8-31.4V799.8c51.9-14.7 90-62.4 90-119.1s-38.1-104.3-90-119z m6 158.8c-11 11-24.2 16.5-39.8 16.5s-28.8-5.5-39.8-16.5c-11-11-16.5-24.2-16.5-39.8 0-15.5 5.5-28.8 16.5-39.8 11-11 24.2-16.5 39.8-16.5S867 630 878 641c11 11 16.5 24.2 16.5 39.8 0 15.5-5.5 28.7-16.5 39.7zM557 201.7V93.4c0-17.3-15.1-31.4-33.8-31.4-18.6 0-33.8 14.1-33.8 31.4v108.3c-51.9 14.7-90 62.4-90 119.1 0 56.6 38.1 104.4 90 119.1v490.8c0 17.3 15.1 31.4 33.8 31.4 18.6 0 33.8-14.1 33.8-31.4V439.8c51.9-14.7 90-62.4 90-119.1 0-56.6-38.1-104.4-90-119z m6 158.8c-11 11-24.2 16.5-39.8 16.5s-28.8-5.5-39.8-16.5c-11-11-16.5-24.2-16.5-39.8s5.5-28.8 16.5-39.8c11-11 24.2-16.5 39.8-16.5S552 270 563 281c11 11 16.5 24.2 16.5 39.8s-5.5 28.7-16.5 39.7zM219.5 561.7V93.4c0-17.3-15.1-31.4-33.8-31.4-18.6 0-33.7 14.1-33.7 31.4v468.3c-51.9 14.7-90 62.4-90 119.1s38.1 104.4 90 119.1v130.8c0 17.3 15.1 31.4 33.8 31.4 18.6 0 33.8-14.1 33.8-31.4V799.8c51.9-14.7 90-62.4 90-119.1s-38.2-104.3-90.1-119z m6 158.8c-11 11-24.2 16.5-39.8 16.5s-28.8-5.5-39.8-16.5c-11-11-16.5-24.2-16.5-39.8 0-15.5 5.5-28.8 16.5-39.8 11-11 24.2-16.5 39.8-16.5s28.8 5.5 39.8 16.5c11 11 16.5 24.2 16.5 39.8 0 15.6-5.5 28.8-16.5 39.8z" p-id="3732"></path></svg>

core/core-frontend/src/components/data-visualization/canvas/DePreview.vue

@@ -238,7 +238,6 @@ const initWatermark = (waterDomId = 'preview-canvas-main') => {
 
 // 目标校验： 需要校验targetSourceId 是否是当前可视化资源ID
 const winMsgHandle = event => {
-  console.info('PostMessage Params Received')
   const msgInfo = event.data
   // 校验targetSourceId
   if (

core/core-frontend/src/pages/panel/ViewWrapper.vue

@@ -29,7 +29,6 @@ const state = reactive({
 
 // 目标校验： 需要校验targetSourceId 是否是当前可视化资源ID
 const winMsgHandle = event => {
-  console.info('PostMessage Params Received')
   const msgInfo = event.data
   // 校验targetSourceId
   if (msgInfo && msgInfo.type === 'attachParams' && msgInfo.targetSourceId === state.chartId + '') {

core/core-frontend/src/websocket/index.ts

@@ -2,11 +2,9 @@ import SockJS from 'sockjs-client/dist/sockjs.min.js'
 import Stomp from 'stompjs'
 import eventBus from '@/utils/eventBus'
 import { useCache } from '@/hooks/web/useCache'
-import { ref } from 'vue'
 const { wsCache } = useCache()
 let stompClient: Stomp.Client
 let timeInterval: NodeJS.Timer | null = null
-const isDisconnect = ref(true)
 
 export default {
   install() {
@@ -32,14 +30,10 @@ export default {
       if (!isLoginStatus()) {
         return
       }
-      let prefix = '/'
-      if (window.DataEaseBi?.baseUrl) {
-        prefix = window.DataEaseBi.baseUrl
-      } else {
-        const href = window.location.href
-        prefix = href.substring(0, href.indexOf('#'))
+      if (stompClient !== null && stompClient != undefined && stompClient.connected) {
+        return
       }
-      const socket = new SockJS(prefix + 'websocket?userId=' + wsCache.get('user.uid'))
+      const socket = new SockJS('http://localhost:8100/websocket?userId=' + wsCache.get('user.uid'))
       stompClient = Stomp.over(socket)
       const heads = {
         userId: wsCache.get('user.uid')
@@ -47,7 +41,6 @@ export default {
       stompClient.connect(
         heads,
         res => {
-          isDisconnect.value = false
           channels.forEach(channel => {
             stompClient.subscribe('/user/' + wsCache.get('user.uid') + channel.topic, res => {
               res && res.body && eventBus.emit(channel.event, res.body)
@@ -61,13 +54,13 @@ export default {
     }
 
     function disconnect() {
-      if (!isDisconnect.value && stompClient != undefined) {
+      if (stompClient !== null && stompClient != undefined && !stompClient.connected) {
         stompClient.disconnect(
           function () {
-            isDisconnect.value = true
+            console.log('断开连接')
           },
           function (error) {
-            isDisconnect.value = false
+            console.log('断开连接失败: ' + error)
           }
         )
       }
@@ -80,12 +73,7 @@ export default {
           disconnect()
           return
         }
-        if (isDisconnect.value) {
-          connection()
-        }
-        try {
-          stompClient.send('heart detection')
-        } catch (error) {
+        if (stompClient !== null && stompClient != undefined && !stompClient.connected) {
           connection()
         }
       }, 5000)