diff --git a/frontend/src/components/canvas/tools/watermark.js b/frontend/src/components/canvas/tools/watermark.js index ab14bb5e60..a70aa07757 100644 --- a/frontend/src/components/canvas/tools/watermark.js +++ b/frontend/src/components/canvas/tools/watermark.js @@ -71,7 +71,7 @@ export function watermark(settings, domId) { mask_div.style.left = x + 'px' mask_div.style.top = y + 'px' mask_div.style.overflow = 'hidden' - mask_div.style.zIndex = '9999' + mask_div.style.zIndex = '10' // 让水印不遮挡页面的点击事件 mask_div.style.pointerEvents = 'none' mask_div.style.opacity = defaultSettings.watermark_alpha @@ -124,7 +124,7 @@ export function activeWatermark(watermarkForm, userLoginInfo, domId, canvasId, w if (watermarkForm.type === 'custom') { watermark_txt = watermarkForm.content watermark_txt = watermark_txt.replaceAll('${ip}', userLoginInfo.ip) - watermark_txt = watermark_txt.replaceAll('${userName}', userLoginInfo.userInfo.userName) + watermark_txt = watermark_txt.replaceAll('${username}', userLoginInfo.userInfo.username) watermark_txt = watermark_txt.replaceAll('${nickName}', userLoginInfo.userInfo.nickName) watermark_txt = watermark_txt.replaceAll('${time}', getNow()) watermark_width = watermark_txt.length * watermarkForm.watermark_fontsize * 0.75 @@ -138,7 +138,7 @@ export function activeWatermark(watermarkForm, userLoginInfo, domId, canvasId, w watermark_txt = getNow() watermark_width = 200 } else { - watermark_txt = userLoginInfo.userInfo.userName + watermark_txt = userLoginInfo.userInfo.username } const settings = { watermark_txt: watermark_txt,