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"> 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" > 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 @@
{{$t('overall.option')}}
@@ -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 @@
{{$t('overall.option')}}
@@ -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列 diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 706a880fe..a71429815 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)