gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改group内 修改宽度 不正确的问题

Browse Source
This commit is contained in:
zhangyu
2021-04-12 12:23:25 +08:00
parent 6c09cfea76
commit 80fdfd3850
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/charts/chart-group.vue
View File

@@ -47,7 +47,7 @@
</div> </div>
<el-collapse-transition> <el-collapse-transition>
<div :id="'chartUrl'+chartIndex" class="mt-10 url-container" v-show="showList"> <div :id="'chartUrl'+chartIndex" class="mt-10 url-container" v-show="showList">
<chart-list-group :groupList.sync="chartData.children" :panel-lock="panelLock" :filterParent="filter" :hasGroup="false" :from="from" ref="listGroup" :panelId="panelId" @on-edit-group-chart="editGroupItem" @on-duplicate-group-chart="duplicateGroupItem" @on-remove-chart="removeChartGroup" @moveGroupItem="moveGroupItem" @on-remove-group-chart="removeGroupItem"></chart-list-group> <chart-list-group :groupList.sync="chartData.children" :panel-lock="panelLock" :filterParent="filter" :hasGroup="false" :from="from" ref="listGroup" :panelId="panelId" @on-edit-group-chart="editGroupItem" @on-duplicate-group-chart="duplicateGroupItem" @on-remove-chart="removeChartGroup" @moveGroupItem="moveGroupItem" @on-remove-group-chart="removeGroupItem" :groupId="chartData.id"></chart-list-group>
</div> </div>
</el-collapse-transition> </el-collapse-transition>
<div style="position: absolute;width: 100%; top:calc(50% - 50px);text-align: center;" v-if="showStatic"> <div style="position: absolute;width: 100%; top:calc(50% - 50px);text-align: center;" v-if="showStatic">

5
nezha-fronted/src/components/charts/chart-list-group.vue
View File

@@ -46,7 +46,7 @@
} }
</style> </style>
<template> <template>
<div class="list-width chart-group" id="listContainer" ref="listContainer"><!--v-drag--> <div class="list-width chart-group" :id="'listContainer' + groupId" ref="listContainer"><!--v-drag-->
<span class="temp-dom"></span> <span class="temp-dom"></span>
@@ -216,7 +216,8 @@ export default {
panelLock: { type: Boolean, default: false }, panelLock: { type: Boolean, default: false },
hasGroup: { type: Boolean, default: true }, hasGroup: { type: Boolean, default: true },
groupList: {}, groupList: {},
filterParent: {} filterParent: {},
groupId: {}
}, },
components: { components: {

7
nezha-fronted/src/components/common/js/tools.js
View File

@@ -349,7 +349,6 @@ export const chartResizeTool = {
return height - this.chartBlankHeight return height - this.chartBlankHeight
}, },
start (vm, originalData, event, chartIndexs) { start (vm, originalData, event, chartIndexs) {
console.log(vm, originalData, event, chartIndexs)
const $self = this const $self = this
const data = JSON.parse(JSON.stringify(originalData)) // 将初始对象复制，后续操作使用复制对象 const data = JSON.parse(JSON.stringify(originalData)) // 将初始对象复制，后续操作使用复制对象
let shadow = vm.$refs.resizeShadow // 缩放时底部阴影dom let shadow = vm.$refs.resizeShadow // 缩放时底部阴影dom
@@ -364,7 +363,11 @@ export const chartResizeTool = {
const chartBlankWidth = this.chartBlankWidth const chartBlankWidth = this.chartBlankWidth
const chartBlankHeight = this.chartBlankHeight const chartBlankHeight = this.chartBlankHeight
const titleHeight = this.titleHeight const titleHeight = this.titleHeight
const stepWidth = this.stepWidth(document.getElementById('listContainer').offsetWidth) let stepWidth = document.getElementById('listContainer').offsetWidth
if (data.groupId) {
stepWidth = document.getElementById('listContainer' + data.groupId).offsetWidth - 20
}
stepWidth = this.stepWidth(stepWidth)
const stepHeight = this.stepHeight const stepHeight = this.stepHeight
const mouseOriginalX = event.clientX // 鼠标初始坐标 const mouseOriginalX = event.clientX // 鼠标初始坐标