refactor(仪表板): 优化仪表板公共链接水印展示逻辑,用户信息取分享人

This commit is contained in:
wangjiahao
2022-11-16 13:54:50 +08:00
parent 1f996118e8
commit 65b6e88203
6 changed files with 44 additions and 7 deletions

View File

@@ -8,6 +8,15 @@ export function userLoginInfo() {
})
}
export default {
userLoginInfo
export function proxyUserLoginInfo(userId) {
return request({
url: '/systemInfo/proxyUserLoginInfo/' + userId,
method: 'get',
loading: false
})
}
export default {
userLoginInfo,
proxyUserLoginInfo
}

View File

@@ -5,7 +5,7 @@
:style="customStyle"
@scroll="canvasScroll"
>
<canvas-opt-bar />
<canvas-opt-bar/>
<div
:id="previewDomId"
:ref="previewRefId"
@@ -74,7 +74,7 @@ import bus from '@/utils/bus'
import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
import { hasDataPermission } from '@/utils/permission'
import { activeWatermark } from '@/components/canvas/tools/watermark'
import { userLoginInfo } from '@/api/systemInfo/userLogin'
import { proxyUserLoginInfo, userLoginInfo } from '@/api/systemInfo/userLogin'
const erd = elementResizeDetectorMaker()
@@ -140,6 +140,10 @@ export default {
type: String,
require: false,
default: 'canvas-main'
},
userId: {
type: String,
require: false
}
},
data() {
@@ -316,7 +320,8 @@ export default {
methods: {
initWatermark() {
if (this.panelInfo.watermarkInfo) {
userLoginInfo().then(res => {
const method = this.userId ? proxyUserLoginInfo : userLoginInfo
method(this.userId).then(res => {
const userInfo = res.data
activeWatermark(this.panelInfo.watermarkInfo.settingContent, userInfo, 'preview-main-canvas-main', this.canvasId, this.panelInfo.watermarkOpen)
})

View File

@@ -5,6 +5,7 @@
:component-data="mainCanvasComponentData"
:canvas-style-data="canvasStyleData"
:panel-info="panelInfo"
:user-id="user"
/>
</div>
</template>