Merge remote-tracking branch 'origin/master'

main
liu.shiyi 1 year ago
commit 5abf4b9b5d

@ -53,7 +53,7 @@ public class ScreenBorderChart extends Chart {
private String gradientDirection;
@ApiModelProperty(notes = "透明度")
private Integer opacity;
private Float opacity;
@ApiModelProperty(notes = "字体大小")
private Integer fontSize;

@ -63,18 +63,28 @@ export default {
},
data () {
return {
count: 0,
right: 0
}
},
watch: {
rightVisiable (value) {
if (value) {
const leftElement = document.querySelector('.bs-left-panel')
const contentElement = document.querySelector('.grid-wrap-box')
// const rightElement = document.querySelector('.bs-right-panel-wrap')
const mapElement = document.querySelector('.minimap')
if (value) {
if (parseInt(window.getComputedStyle(mapElement).right) > parseInt(window.getComputedStyle(leftElement).width) + parseInt(window.getComputedStyle(contentElement).width) - 320 - parseInt(window.getComputedStyle(mapElement).width)) {
//
this.count = 1
this.right = window.getComputedStyle(mapElement).right
mapElement.style.right = parseInt(window.getComputedStyle(leftElement).width) + parseInt(window.getComputedStyle(contentElement).width) - 320 - parseInt(window.getComputedStyle(mapElement).width) + 'px'
}
} else {
if (this.count === 1) {
mapElement.style.right = this.right
this.count--
}
}
}
},

Loading…
Cancel
Save