From 8cec3560141c7b1270b14fa558e406518c8290e9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 17 Dec 2021 14:28:49 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E6=96=B0=E5=A2=9E=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=20=20=E8=AE=A1=E7=AE=97=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/tools.js   |  4 ++--
 nezha-fronted/src/components/chart/chartList.vue    | 13 +++++++++----
 .../common/rightBox/chart/chartConfig.vue           |  2 +-
 .../common/rightBox/chart/chartRightBox.vue         |  9 +++++++++
 .../common/rightBox/chart/systemChartConfig.vue     |  2 +-
 nezha-fronted/src/store/panel.js                    | 12 +++++++++++-
 6 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/tools.js b/nezha-fronted/src/components/chart/chart/tools.js
index 3b87e3343..099a49b8a 100644
--- a/nezha-fronted/src/components/chart/chart/tools.js
+++ b/nezha-fronted/src/components/chart/chart/tools.js
@@ -134,8 +134,8 @@ export function getLayoutPosition (arr) {
     })
     let maxX = 0
     lastItem.forEach(last => {
-      if (maxX < last.x) {
-        maxX = last.x
+      if (maxX < last.x + last.span) {
+        maxX = last.x + last.span
       }
     })
     return {
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 7479ef0b4..7d196b35f 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -86,7 +86,7 @@
 <script>
 import VueGridLayout from 'vue-grid-layout'
 import { fromRoute } from '@/components/common/js/constants'
-import { getGroupHeight } from './chart/tools'
+import { getGroupHeight, getLayoutPosition } from './chart/tools'
 import panelChart from '@/components/chart/panelChart'
 import bus from '@/libs/bus'
 import groupData from '@/components/chart/tempGroup'
@@ -264,8 +264,11 @@ export default {
           charts: charts
         }
         // console.log(this.copyDataList)
-        this.$put('/visual/panel/chart/weights', params)
-      }, 200)
+        this.$put('/visual/panel/chart/weights', params).then(() => {
+          const position = getLayoutPosition(this.copyDataList)
+          this.$store.commit('setChartLastPosition', position)
+        })
+      }, 300)
     }
   },
   created () {
@@ -286,6 +289,8 @@ export default {
         this.firstInit = true
         this.gridLayoutLoading = true
         this.noData = !n || n.length < 1
+        const position = getLayoutPosition(n)
+        this.$store.commit('setChartLastPosition', position)
         const tempList = n.map(item => {
           let param = ''
           let height = ''
@@ -327,7 +332,7 @@ export default {
           })
           setTimeout(() => {
             this.firstInit = false
-          },200)
+          }, 200)
           this.gridLayoutLoading = false
         })
       }
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 216bbd517..803cc0067 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -468,7 +468,7 @@
                 <div class='mapping-display'>Title</div>
               </div>
               <el-form-item :prop="'param.columns.' + index + '.title'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item" style="flex: 1">
-                <el-input size="small" v-model="item.title" placeholder="regx" @change="change"></el-input>
+                <el-input size="small" v-model="item.title" @change="change"></el-input>
               </el-form-item>
               <div>
                 <div class='mapping-display'>Unit</div>
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 3573c95b9..38c9d78ef 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -126,6 +126,11 @@ export default {
     systemChartConfig,
     otherChartConfig
   },
+  computed: {
+    chartLastPosition () {
+      return this.$store.getters.getChartLastPosition
+    }
+  },
   data () {
     return {
       fromRoute,
@@ -169,6 +174,10 @@ export default {
         if (!params.groupId) {
           params.groupId = 0
         }
+        if (!params.x || !params.y) {
+          params.x = this.chartLastPosition.x + params.span > 12 ? 0 : this.chartLastPosition.x
+          params.y = this.chartLastPosition.y + 12
+        }
         delete params.panel
         if (params.type === 'table') {
           delete params.param.tags
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index c71fbf303..021b87cbe 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -247,7 +247,7 @@
                 <div class='mapping-display'>Title</div>
               </div>
               <el-form-item :prop="'param.columns.' + index + '.title'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item" style="flex: 1">
-                <el-input size="small" v-model="item.title" placeholder="regx" @change="change"></el-input>
+                <el-input size="small" v-model="item.title" @change="change"></el-input>
               </el-form-item>
               <div>
                 <div class='mapping-display'>Unit</div>
diff --git a/nezha-fronted/src/store/panel.js b/nezha-fronted/src/store/panel.js
index 58a133bc1..243d5ec67 100644
--- a/nezha-fronted/src/store/panel.js
+++ b/nezha-fronted/src/store/panel.js
@@ -10,7 +10,11 @@ const panel = {
     headerH: 0.5,
     headerHPadding: 0.5,
     rowHeight: 150,
-    chartListId: ''
+    chartListId: '',
+    chartLastPosition: {
+      x: 0,
+      y: 0
+    }
   },
   mutations: {
     setShowRightBox (state, flag) {
@@ -34,6 +38,9 @@ const panel = {
     setPanelNowTimeType (state, nowTimeType) {
       state.nowTimeType = nowTimeType
     },
+    setChartLastPosition (state, position) {
+      state.chartLastPosition = position
+    },
     setHeaderH (state, h) {
       state.headerH = h.headerH
       state.headerHPadding = h.headerHPadding
@@ -81,6 +88,9 @@ const panel = {
     getRowHeight (state) {
       return state.rowHeight
     },
+    getChartLastPosition (state, position) {
+      return state.chartLastPosition
+    },
     getChartListId (state, id) {
       return state.chartListId
     }