center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(图表): 修复跳转取消对应的字段时跳转依然有效问题

Browse Source
This commit is contained in:
wangjiahao 2024-07-02 14:00:03 +08:00
parent 35a075bdfe
commit 719b6a1b7a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
View File

@ -255,7 +255,8 @@
LEFT JOIN visualization_link_jump_info lji ON jtvi.link_jump_info_id = lji.id 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 LEFT JOIN visualization_link_jump lj ON lji.link_jump_id = lj.id
WHERE 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 lj.source_view_id = #{request.sourceViewId}
AND lji.target_dv_id = #{request.targetDvId} AND lji.target_dv_id = #{request.targetDvId}
<if test="request.sourceFieldId != null"> <if test="request.sourceFieldId != null">

11
core/core-frontend/src/custom-component/scroll-text/Component.vue
View File

@ -139,10 +139,8 @@ const varStyle = computed(() => [
const init = () => { const init = () => {
timeId = setInterval(() => { timeId = setInterval(() => {
if (textOut.value && text.value) { if (textOut.value && text.value) {
const result = scrollScale.value =
(element.value.style.width * canvasStyleData.value.scale) / text.value.clientWidth + '%' (element.value.style.width * canvasStyleData.value.scale) / text.value.clientWidth + '%'
console.log('===result=' + result)
scrollScale.value = result
} else { } else {
scrollScale.value = '100%' scrollScale.value = '100%'
} }
@ -180,12 +178,11 @@ onMounted(() => {
@mousedown="handleMousedown" @mousedown="handleMousedown"
@blur="handleBlur" @blur="handleBlur"
@input="handleInput" @input="handleInput"
> v-html="element['propValue']"
{{ element['propValue'] }} ></div>
</div>
</div> </div>
<div v-else class="v-text preview" ref="textOut" :style="varStyle"> <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> </div>
</template> </template>