From e8917d676644ccc9048706875ba868bd13cce9e1 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 25 Nov 2022 11:30:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=B0=B4=E5=8D=B0=E8=AE=BE=E7=BD=AE=E4=B8=BA=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/tools/watermark.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/tools/watermark.js b/frontend/src/components/canvas/tools/watermark.js index ab14bb5e60..2253f4bd09 100644 --- a/frontend/src/components/canvas/tools/watermark.js +++ b/frontend/src/components/canvas/tools/watermark.js @@ -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,