center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #3871 from dataease/pr@dev@refactor_panel-water

Browse Source 
refactor(仪表板): 优化仪表板水印层级
This commit is contained in:
fit2cloud-chenyw 2022-11-25 12:18:23 +08:00 committed by GitHub
commit 9933b47e8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/canvas/tools/watermark.js
View File

@ -71,7 +71,7 @@ export function watermark(settings, domId) {
mask_div.style.left = x + 'px' mask_div.style.left = x + 'px'
mask_div.style.top = y + 'px' mask_div.style.top = y + 'px'
mask_div.style.overflow = 'hidden' mask_div.style.overflow = 'hidden'
mask_div.style.zIndex = '9999' mask_div.style.zIndex = '10'
// 让水印不遮挡页面的点击事件 // 让水印不遮挡页面的点击事件
mask_div.style.pointerEvents = 'none' mask_div.style.pointerEvents = 'none'
mask_div.style.opacity = defaultSettings.watermark_alpha mask_div.style.opacity = defaultSettings.watermark_alpha
@ -124,7 +124,7 @@ export function activeWatermark(watermarkForm, userLoginInfo, domId, canvasId, w
if (watermarkForm.type === 'custom') { if (watermarkForm.type === 'custom') {
watermark_txt = watermarkForm.content watermark_txt = watermarkForm.content
watermark_txt = watermark_txt.replaceAll('${ip}', userLoginInfo.ip) 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('${nickName}', userLoginInfo.userInfo.nickName)
watermark_txt = watermark_txt.replaceAll('${time}', getNow()) watermark_txt = watermark_txt.replaceAll('${time}', getNow())
watermark_width = watermark_txt.length * watermarkForm.watermark_fontsize * 0.75 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_txt = getNow()
watermark_width = 200 watermark_width = 200
} else { } else {
watermark_txt = userLoginInfo.userInfo.userName watermark_txt = userLoginInfo.userInfo.username
} }
const settings = { const settings = {
watermark_txt: watermark_txt, watermark_txt: watermark_txt,