public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-20 19:48:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(仪表板): 修复社区板仪表板因不支持水印设置导致的控制台报错问题

Browse Source
This commit is contained in:
wangjiahao
2024-02-23 16:53:49 +08:00
parent a5328976c1
commit 45cd9cb300
4 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
View File

@@ -222,7 +222,7 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
isMainCanvas(canvasId.value)
) {
const scale = dashboardActive.value ? 1 : curScale.value
if (userInfo.value) {
if (userInfo.value && userInfo.value.model !== 'lose') {
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
@@ -235,14 +235,16 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
const method = personInfoApi
method().then(res => {
userInfo.value = res.data
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
waterDomId,
canvasId.value,
dvInfo.value.selfWatermarkStatus,
scale
)
if (userInfo.value && userInfo.value.model !== 'lose') {
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
waterDomId,
canvasId.value,
dvInfo.value.selfWatermarkStatus,
scale
)
}
})
}
}

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

@@ -190,7 +190,7 @@ const initRefreshTimer = () => {
const initWatermark = (waterDomId = 'preview-canvas-main') => {
if (dvInfo.value.watermarkInfo && isMainCanvas(canvasId.value)) {
if (userInfo.value) {
if (userInfo.value && userInfo.value.model !== 'lose') {
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
@@ -203,14 +203,16 @@ const initWatermark = (waterDomId = 'preview-canvas-main') => {
const method = personInfoApi
method().then(res => {
userInfo.value = res.data
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
waterDomId,
canvasId.value,
dvInfo.value.selfWatermarkStatus,
scaleWidth.value / 100
)
if (userInfo.value && userInfo.value.model !== 'lose') {
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
waterDomId,
canvasId.value,
dvInfo.value.selfWatermarkStatus,
scaleWidth.value / 100
)
}
})
}
}