From 719b6a1b7afda0afcd0c85bb735a36948a6984c9 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 2 Jul 2024 14:00:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8F=96=E6=B6=88=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=B6=E8=B7=B3=E8=BD=AC=E4=BE=9D=E7=84=B6?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/ExtVisualizationLinkJumpMapper.xml        |  3 ++-
 .../src/custom-component/scroll-text/Component.vue    | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
index 552eafae01..3d1ee7b7f7 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
@@ -255,7 +255,8 @@
         LEFT JOIN visualization_link_jump_info lji ON jtvi.link_jump_info_id = lji.id
         LEFT JOIN visualization_link_jump lj ON lji.link_jump_id = lj.id
         WHERE
-        lj.source_dv_id = #{request.sourceDvId}
+        lji.checked = 1
+        and lj.source_dv_id = #{request.sourceDvId}
         AND lj.source_view_id = #{request.sourceViewId}
         AND lji.target_dv_id = #{request.targetDvId}
         <if test="request.sourceFieldId != null">
diff --git a/core/core-frontend/src/custom-component/scroll-text/Component.vue b/core/core-frontend/src/custom-component/scroll-text/Component.vue
index 7d69057054..3f8fda8bf2 100644
--- a/core/core-frontend/src/custom-component/scroll-text/Component.vue
+++ b/core/core-frontend/src/custom-component/scroll-text/Component.vue
@@ -139,10 +139,8 @@ const varStyle = computed(() => [
 const init = () => {
   timeId = setInterval(() => {
     if (textOut.value && text.value) {
-      const result =
+      scrollScale.value =
         (element.value.style.width * canvasStyleData.value.scale) / text.value.clientWidth + '%'
-      console.log('===result=' + result)
-      scrollScale.value = result
     } else {
       scrollScale.value = '100%'
     }
@@ -180,12 +178,11 @@ onMounted(() => {
       @mousedown="handleMousedown"
       @blur="handleBlur"
       @input="handleInput"
-    >
-      {{ element['propValue'] }}
-    </div>
+      v-html="element['propValue']"
+    ></div>
   </div>
   <div v-else class="v-text preview" ref="textOut" :style="varStyle">
-    <div class="marquee-txt" :style="textStyle" ref="text">{{ element['propValue'] }}</div>
+    <div class="marquee-txt" :style="textStyle" ref="text" v-html="element['propValue']"></div>
   </div>
 </template>