Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

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"

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>

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>

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: [

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列

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)