forked from github/dataease
fix(图表): 修复跳转取消对应的字段时跳转依然有效问题
This commit is contained in:
parent
35a075bdfe
commit
719b6a1b7a
@ -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">
|
||||
|
@ -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>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user