Merge pull request #8138 from dataease/pr@v2.3@fix_watermark

fix(仪表板): 修复社区板仪表板因不支持水印设置导致的控制台报错问题
This commit is contained in:
王嘉豪 2024-02-23 12:47:44 +08:00 committed by GitHub
commit 56e20bda87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -214,25 +214,14 @@ watch(
)
const initWatermark = (waterDomId = 'editor-canvas-main') => {
if (
dvInfo.value.watermarkInfo &&
dvInfo.value.watermarkInfo.settingContent &&
isMainCanvas(canvasId.value)
) {
const scale = dashboardActive.value ? 1 : curScale.value
if (userInfo.value) {
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
waterDomId,
canvasId.value,
dvInfo.value.selfWatermarkStatus,
scale
)
} else {
const method = personInfoApi
method().then(res => {
userInfo.value = res.data
try {
if (
dvInfo.value.watermarkInfo &&
dvInfo.value.watermarkInfo.settingContent &&
isMainCanvas(canvasId.value)
) {
const scale = dashboardActive.value ? 1 : curScale.value
if (userInfo.value) {
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
@ -241,8 +230,23 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
dvInfo.value.selfWatermarkStatus,
scale
)
})
} else {
const method = personInfoApi
method().then(res => {
userInfo.value = res.data
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
waterDomId,
canvasId.value,
dvInfo.value.selfWatermarkStatus,
scale
)
})
}
}
} catch (e) {
console.warn('Watermarks are not supported!')
}
}