From 95f92b079e2120a71850318a7a5d2d1abc2c4895 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 27 May 2021 17:57:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Nez-687=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=A2=84=E8=A7=88=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/dashboard/chartBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 53afdcf8e..c94cc1eb3 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -886,7 +886,7 @@ export default {
             this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
             // this.$refs.chartForm.resetFields()// 清空表单
             this.$emit('on-create-success', 'create', response.data, chartParams, { id: this.panelId, name: this.panelName })
-            this.esc()
+            this.esc(true)
           } else {
             if (response.msg) {
               this.$message.error(response.msg)

From a90fa14ef086b525f2aec49fdc2635df26321cbd Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 27 May 2021 17:58:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E9=9A=90=E8=97=8F=20project=20?=
 =?UTF-8?q?=E5=8F=B3=E6=BB=91=E8=A1=A8=E6=A0=BC=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/project/popData/alertTable.vue   | 1 +
 .../src/components/common/project/popData/assetTable.vue   | 1 +
 .../components/common/project/popData/endpointTable.vue    | 1 +
 .../src/components/common/table/asset/assetTable.vue       | 7 +++++++
 .../src/components/common/table/settings/endpointTable.vue | 7 +++++++
 5 files changed, 17 insertions(+)

diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index 74dd09642..7506b75b7 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -25,6 +25,7 @@
             :height="mainTableHeight"
             :now-time="nowTime"
             :table-data="tableData"
+            :showOption="false"
             @del="del"
             @edit="edit"
             @orderBy="tableDataSort"
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index 8fa6e3a81..71cbc8f6b 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -19,6 +19,7 @@
             :custom-table-title="tableTitle"
             :height="mainTableHeight"
             :table-data="tableData"
+            :showOption="false"
             @orderBy="tableDataSort"
             @reload="getTableData"></asset-table>
         </template>
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index 6cfdf477f..c5baf3dd0 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -20,6 +20,7 @@
             :height="mainTableHeight"
             :table-data="tableData"
             :tableId="tableId"
+            :showOption="false"
             @orderBy="tableDataSort"
             @reload="getTableData"
            ></endpoint-table>
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 91032ae6d..f65209f4a 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -65,6 +65,7 @@
     </el-table-column>
     <el-table-column
       :resizable="false"
+      v-if="showOption"
       :width="operationWidth"
       fixed="right">
       <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
@@ -93,6 +94,12 @@ import bus from '@/libs/bus'
 export default {
   name: 'assetTable',
   mixins: [table],
+  props: {
+    showOption: {
+      type: Boolean,
+      default: true
+    }
+  },
   data () {
     return {
       tableTitle: [
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index d7d7b40c4..bed7accf0 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -92,6 +92,7 @@
     <el-table-column
       :resizable="false"
       :width="operationWidth"
+      v-if="showOption"
       fixed="right">
       <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
       <div slot-scope="scope" class="table-operation-items">
@@ -116,6 +117,12 @@ import table from '@/components/common/mixin/table'
 export default {
   name: 'endpointTable',
   mixins: [table],
+  props: {
+    showOption: {
+      type: Boolean,
+      default: true
+    }
+  },
   data () {
     return {
       tableTitle: [ // 原始table列