Merge pull request #9946 from dataease/pr@dev-v2@refactor_scroll-text

refactor(数据大屏): 跑马灯样式调整,编辑预览不滚动问题
This commit is contained in:
王嘉豪 2024-05-29 15:15:04 +08:00 committed by GitHub
commit 54d8a55b96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 14 deletions

View File

@ -1391,6 +1391,7 @@ onMounted(() => {
if (isMainCanvas(canvasId.value)) {
initSnapshotTimer()
initWatermark()
dvMainStore.setEditMode('edit')
}
//
composeStore.getEditor(canvasId.value)

View File

@ -319,13 +319,13 @@ const scrollSpeedList = [
{ name: '1', value: 80 },
{ name: '2', value: 60 },
{ name: '3', value: 40 },
{ name: '4', value: 20 },
{ name: '5', value: 10 },
{ name: '6', value: 8 },
{ name: '7', value: 6 },
{ name: '8', value: 4 },
{ name: '9', value: 2 },
{ name: '10', value: 1 }
{ name: '4', value: 30 },
{ name: '5', value: 20 },
{ name: '6', value: 15 },
{ name: '7', value: 10 },
{ name: '8', value: 8 },
{ name: '9', value: 6 },
{ name: '10', value: 3 }
]
const opacitySizeList = [

View File

@ -78,8 +78,6 @@ const clearStyle = e => {
if (text !== '') {
document.execCommand('insertText', false, text)
}
emit('input', element.value, e.target.innerHTML)
}
const handleBlur = e => {
@ -141,11 +139,12 @@ const textStyle = computed(() => {
@mousedown="handleMousedown"
@blur="handleBlur"
@input="handleInput"
v-html="element['propValue']"
></div>
>
{{ element['propValue'] }}
</div>
</div>
<div v-else class="v-text preview">
<div class="marquee-txt" :style="textStyle" v-html="element['propValue']"></div>
<div v-else class="v-text preview" :style="varStyle">
<div class="marquee-txt" :style="textStyle">{{ element['propValue'] }}</div>
</div>
</template>

View File

@ -33,7 +33,7 @@ export const dvMainStore = defineStore('dataVisualization', {
datasetAreaCollapse: false
},
embeddedCallBack: 'no', // 嵌入模式是否允许反馈参数
editMode: 'edit', // 编辑器模式 edit preview
editMode: 'preview', // 编辑器模式 edit preview
mobileInPc: false,
firstLoadMap: [],
canvasStyleData: { ...deepCopy(DEFAULT_CANVAS_STYLE_DATA_DARK), backgroundColor: null },