From 57b1a0cfadfa61c095d9124b0849cc4bd37821fc Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 21 Sep 2023 17:48:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dnotebook=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E4=BF=9D=E5=AD=98=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartText.vue          |  4 ++--
 .../components/common/bottomBox/tabs/notebookTab.vue  | 11 +++++++----
 .../src/components/page/notebook/notebookList.vue     |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartText.vue b/nezha-fronted/src/components/chart/chart/chartText.vue
index a8c26abc8..8f5ab1a1d 100644
--- a/nezha-fronted/src/components/chart/chart/chartText.vue
+++ b/nezha-fronted/src/components/chart/chart/chartText.vue
@@ -44,12 +44,12 @@ export default {
   },
   methods: {
     save () {
-      this.chartInfo.param.oldText = this.chartInfo.param.text
       this.chartInfo.param.isEdit = false
+      this.chartInfo.param.oldText = this.chartInfo.param.text
     },
     cancel () {
-      this.chartInfo.param.text = this.chartInfo.param.oldText
       this.chartInfo.param.isEdit = false
+      this.chartInfo.param.text = this.chartInfo.param.oldText
     },
     textChange (val) {
       this.chartInfo.param.text = val
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
index 9564f2740..e6f550fe1 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
@@ -93,7 +93,6 @@
 </template>
 
 <script>
-import Vue from 'vue'
 import axios from 'axios'
 import bus from '../../../../libs/bus'
 import subDataListMixin from '@/components/common/mixin/subDataList'
@@ -171,12 +170,17 @@ export default {
     done () {
       this.$refs.notebookList.copyDataList.forEach(item => {
         if (item.type === 'text') {
-          Vue.delete(item.param, 'isEdit')
-          Vue.delete(item.param, 'oldText')
+          this.$set(item.param, 'isEdit', false)
         }
       })
       let charts = this.$lodash.cloneDeep(this.$refs.notebookList.copyDataList)
       charts = charts.filter(item => item.name !== 'groupTemp')
+      charts.forEach(item => {
+        if (item.type === 'text') {
+          delete item.param.isEdit
+          delete item.param.oldText
+        }
+      })
       const params = {
         name: this.notebookName,
         charts
@@ -666,7 +670,6 @@ export default {
       immediate: false,
       deep: true,
       handler (n) {
-        console.log(n)
         if (n) {
           this.disposeChart()
         } else {
diff --git a/nezha-fronted/src/components/page/notebook/notebookList.vue b/nezha-fronted/src/components/page/notebook/notebookList.vue
index 2c2c4542c..216e30f65 100644
--- a/nezha-fronted/src/components/page/notebook/notebookList.vue
+++ b/nezha-fronted/src/components/page/notebook/notebookList.vue
@@ -175,7 +175,7 @@ export default {
         this.firstInit = true
         const cloneDataList = this.$lodash.cloneDeep(n)
         const tempList = cloneDataList.map((item, index) => {
-          const height = item.height || ''
+          const height = item.h || item.height
           return {
             ...item,
             i: item.id,