gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8

Browse Source
This commit is contained in:
zyh
2023-07-13 16:06:13 +08:00
parent 27730934c7 2a8e03b5c7
commit 946abe2fa0
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
View File

@@ -28,16 +28,16 @@
<span slot="reference">{{ node.label }}</span>
</el-popover>
</span>
<el-row class="block-col-2" style="width: 35px;">
<el-row class="block-col-2" style="margin-left: 10px; margin-right: 8px;">
<el-col>
<el-dropdown placement="bottom-end" trigger="click" v-if="data.id != -1">
<span class="el-dropdown-link tree--operation" @click.stop><i class="nz-icon nz-icon-more1"></i></span>
<el-dropdown-menu class="right-box-select-top" slot="dropdown" v-has="['asset_label_delete', 'asset_label_edit']">
<el-dropdown-item class="hidden-padding">
<span @click.stop="edit(data)"><i v-has="'asset_label_edit'" class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</span>
<el-dropdown-menu class="right-box-select-top nz-el-dropdown-menu" slot="dropdown" v-has="['asset_label_delete', 'asset_label_edit']">
<el-dropdown-item>
<div @click="edit(data)"><i v-has="'asset_label_edit'" class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div>
</el-dropdown-item>
<el-dropdown-item class="hidden-padding">
<span @click.stop="del(data)" v-has="'asset_label_delete'"><i class="nz-icon nz-icon-delete"></i>{{$t('overall.delete')}}</span>
<el-dropdown-item>
<div @click="del(data)" v-has="'asset_label_delete'"><i class="nz-icon nz-icon-delete"></i>{{$t('overall.delete')}}</div>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -102,6 +102,7 @@ export default {
},
edit (data) {
this.$emit('edit', data)
this.esc()
},
esc () {
this.popBox.show = false

2
nezha-fronted/src/components/common/popBox/selectDashboard.vue
View File

@@ -42,7 +42,7 @@
<el-col>
<el-dropdown placement="bottom-end" trigger="click" style="margin-right:10px" v-has="['main_edit', 'main_delete']">
<span class="el-dropdown-link tree--operation" @click.stop><i class="nz-icon nz-icon-more1"></i></span>
<el-dropdown-menu class="right-box-select-top" slot="dropdown">
<el-dropdown-menu class="right-box-select-top nz-el-dropdown-menu" slot="dropdown">
<el-dropdown-item>
<div @click="editPanel(data)" v-has="'main_edit'"><i class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div>
</el-dropdown-item>

13
nezha-fronted/src/components/page/config/assetMeta.vue
View File

@@ -10,8 +10,16 @@
@search="search"
>
<template v-slot:top-tool-left>
<select-group ref="selectGroup" :filter-object="filterGroup" :object-data="groupData" :placement="'bottom-start'"
:show-object="showGroup" @del="delGroup" @edit="editGroup" @selectObject="groupChange">
<select-group
ref="selectGroup"
:filter-object="filterGroup"
:object-data="groupData"
:placement="'bottom-start'"
:show-object="showGroup"
@del="delGroup"
@edit="editGroup"
@selectObject="groupChange"
>
<template v-slot:header>
<div class="panel-select-header">
<el-input id="panel-list-search" v-model="filterGroup" :placeholder="$t('overall.search')" clearable size="mini" style="width: 280px;"></el-input>
@@ -231,6 +239,7 @@ export default {
addGroup () {
this.metaGroup = JSON.parse(JSON.stringify(this.blankMetaGroup))
this.rightBox.groupShow = true
this.$refs.selectGroup && this.$refs.selectGroup.esc()
},
editGroup (group) {
this.metaGroup = JSON.parse(JSON.stringify(group))