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

Merge pull request #4077 from dataease/pr@dev@fix_panel-watermark-link

Browse Source 
fix(仪表板): 修复公共链接中水印导致的控制台异常 #4060
This commit is contained in:
王嘉豪 2022-12-12 17:44:42 +08:00 committed by GitHub
commit 4512094cd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/canvas/components/editor/Preview.vue
View File

@ -156,7 +156,7 @@ import bus from '@/utils/bus'
import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil' import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
import { hasDataPermission } from '@/utils/permission' import { hasDataPermission } from '@/utils/permission'
import { activeWatermark } from '@/components/canvas/tools/watermark' import { activeWatermark } from '@/components/canvas/tools/watermark'
import { userLoginInfo } from '@/api/systemInfo/userLogin' import { proxyUserLoginInfo, userLoginInfo } from '@/api/systemInfo/userLogin'
import html2canvas from 'html2canvasde' import html2canvas from 'html2canvasde'
import { queryAll } from '@/api/panel/pdfTemplate' import { queryAll } from '@/api/panel/pdfTemplate'
import PDFPreExport from '@/views/panel/export/PDFPreExport' import PDFPreExport from '@/views/panel/export/PDFPreExport'
@ -457,7 +457,8 @@ export default {
if (this.userInfo) { if (this.userInfo) {
activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, this.canvasId, this.panelInfo.watermarkOpen) activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, this.canvasId, this.panelInfo.watermarkOpen)
} else { } else {
userLoginInfo().then(res => { const method = this.userId ? proxyUserLoginInfo : userLoginInfo
method(this.userId).then(res => {
this.userInfo = res.data this.userInfo = res.data
activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, this.canvasId, this.panelInfo.watermarkOpen) activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, this.canvasId, this.panelInfo.watermarkOpen)
}) })

23
frontend/src/views/panel/edit/index.vue
View File

@ -565,6 +565,7 @@ export default {
}, },
data() { data() {
return { return {
userInfo: null,
canvasId: 'canvas-main', canvasId: 'canvas-main',
panelCacheExist: false, panelCacheExist: false,
viewData: [], viewData: [],
@ -798,6 +799,18 @@ export default {
this.initWatermark() this.initWatermark()
}, },
deep: true deep: true
},
rightDrawOpen: {
handler(newVal, oldVla) {
this.initWatermark()
},
deep: true
},
outStyle: {
handler(newVal, oldVla) {
this.initWatermark()
},
deep: true
} }
}, },
created() { created() {
@ -831,9 +844,15 @@ export default {
methods: { methods: {
initWatermark() { initWatermark() {
if (this.panelInfo.watermarkInfo) { if (this.panelInfo.watermarkInfo) {
this.$nextTick(() => {
if (this.userInfo) {
activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, 'canvasInfo-main', this.canvasId, this.panelInfo.watermarkOpen)
} else {
userLoginInfo().then(res => { userLoginInfo().then(res => {
const userInfo = res.data this.userInfo = res.data
activeWatermark(this.panelInfo.watermarkInfo.settingContent, userInfo, 'canvasInfo-main', this.canvasId, this.panelInfo.watermarkOpen) activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, 'canvasInfo-main', this.canvasId, this.panelInfo.watermarkOpen)
})
}
}) })
} }
}, },