From 80fdfd38509a4462e7c596cc928416b5fa23e3db Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 12 Apr 2021 12:23:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9group=E5=86=85=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=BD=E5=BA=A6=20=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-group.vue      | 2 +-
 nezha-fronted/src/components/charts/chart-list-group.vue | 5 +++--
 nezha-fronted/src/components/common/js/tools.js          | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-group.vue b/nezha-fronted/src/components/charts/chart-group.vue
index 4c8fdbe4c..9e70ef89d 100644
--- a/nezha-fronted/src/components/charts/chart-group.vue
+++ b/nezha-fronted/src/components/charts/chart-group.vue
@@ -47,7 +47,7 @@
         </div>
         <el-collapse-transition>
           <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>
         </el-collapse-transition>
         <div style="position: absolute;width: 100%; top:calc(50% - 50px);text-align: center;" v-if="showStatic">
diff --git a/nezha-fronted/src/components/charts/chart-list-group.vue b/nezha-fronted/src/components/charts/chart-list-group.vue
index 32d089135..3843eed7c 100644
--- a/nezha-fronted/src/components/charts/chart-list-group.vue
+++ b/nezha-fronted/src/components/charts/chart-list-group.vue
@@ -46,7 +46,7 @@
   }
 </style>
 <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>
 
@@ -216,7 +216,8 @@ export default {
     panelLock: { type: Boolean, default: false },
     hasGroup: { type: Boolean, default: true },
     groupList: {},
-    filterParent: {}
+    filterParent: {},
+    groupId: {}
   },
 
   components: {
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index aebb5da49..73f4b4a64 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -349,7 +349,6 @@ export const chartResizeTool = {
     return height - this.chartBlankHeight
   },
   start (vm, originalData, event, chartIndexs) {
-    console.log(vm, originalData, event, chartIndexs)
     const $self = this
     const data = JSON.parse(JSON.stringify(originalData)) // 将初始对象复制，后续操作使用复制对象
     let shadow = vm.$refs.resizeShadow // 缩放时底部阴影dom
@@ -364,7 +363,11 @@ export const chartResizeTool = {
     const chartBlankWidth = this.chartBlankWidth
     const chartBlankHeight = this.chartBlankHeight
     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 mouseOriginalX = event.clientX // 鼠标初始坐标