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

NEZ-2479 fix：选中提示范围与实际点击生效范围不一致

Browse Source
This commit is contained in:
zhangyu
2022-12-27 13:46:56 +08:00
parent 9330b63674
commit 379f1c0ae4
9 changed files with 67 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nezha-fronted/src/assets/css/common.scss
View File

@@ -641,3 +641,25 @@ textarea {
transform: unset !important;
}
}
.nz-el-dropdown-menu{
.el-dropdown-menu__item{
padding: 0;
> div {
padding: 0 17px;
}
.el-checkbox{
display: inline-block;
width: 100%;
box-sizing: border-box;
padding: 0 5px 0 20px;
}
}
}
.nz-el-dropdown-menu-item{
padding: 0 !important;
.asset-list-delete{
width: 100%;
box-sizing: border-box;
//padding: 0 17px;
}
}

4
nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss
View File

@@ -28,6 +28,10 @@
flex: 1;
width: 0;
border-right: 1px solid $--border-color-light;
.el-checkbox{
width: 100% !important;
margin-right: 0;
}
//padding-left: 5px;
}
.container-item-content{

2
nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="detail-view-top-search" style="line-height: 32px;">
<div class="search-detail-box" :class="[selectValue[item.key].length?'select-dropdown':'',detailSearchListCopy[key].dropShow?'show-my-dropdpwn':'']" v-for="(item,key) in detailSearchListCopy" :key='key' v-show="item.children.length">
<div class="search-detail-box" :class="[selectValue[item.key].length?'select-dropdown':'',detailSearchListCopy[key].dropShow?'show-my-dropdpwn':'']" v-for="(item,key) in detailSearchListCopy" :key='key' v-show="item.oldChildren.length">
<span v-if="item.type === 'checkBox'">
<el-dropdown
:placement="'bottom-start'"

5
nezha-fronted/src/components/common/mixin/table.js
View File

@@ -51,6 +51,11 @@ export default {
}
break
}
case 'delete-rel': {
this.singleDelete = [row]
this.$refs.deleteButton.batchDelete()
break
}
case 'ack': {
this.$emit('acknowledge', row)
break

2
nezha-fronted/src/components/common/panel/panelVariables.vue
View File

@@ -7,7 +7,7 @@
placement="bottom-start"
v-model="item.visible"
v-clickoutside="close"
popper-class="no-style-class ping-popover panel-variables"
popper-class="no-style-class ping-popover panel-variables nz-el-dropdown-menu"
>
<ul class="pop-list-wrap">
<li class="el-dropdown-menu__item" v-if="item.allOption">

4
nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
View File

@@ -1,10 +1,10 @@
<template>
<div>
<el-dropdown trigger="click" :size="size">
<el-dropdown trigger="click" :size="size" class="nz-el-dropdown">
<button id="more" :class="triggerButtonClass" :title="$t('overall.more')">
<i class="nz-icon nz-icon-more2"></i>
</button>
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top nz-el-dropdown-menu">
<el-dropdown-item v-if="showLock">
<div @click="editPanel" id="edit-bottom-panel"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.panel.editPanelTitle')}}</div>
</el-dropdown-item>

33
nezha-fronted/src/components/common/table/asset/assetTable.vue
View File

@@ -165,23 +165,7 @@
<el-dropdown-item v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('config.system.terminal.terminal')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_delete'" :command="['delete', scope.row]">
<delete-button
ref="deleteButton"
:from="'asset'"
:forceDeleteShow="true"
:deleteTitle="'overall.asset'"
:type="'link'"
:title="$t('overall.delete')"
id="asset-list-delete"
v-has="'asset_delete'"
:api="api"
:single="true"
:delete-objs="singleDelete"
@before="delFlag=true"
></delete-button>
</el-dropdown-item>
<!-- <el-dropdown-item v-has="'asset_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item> -->
<el-dropdown-item v-has="'asset_delete'" :command="['delete-rel', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'asset']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['topology', scope.row, 'asset']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
</el-dropdown-menu>
@@ -205,6 +189,21 @@
:type="alertLabelType"
@tipHover='tipHover'
></alertLabel>
<delete-button
ref="deleteButton"
:from="'asset'"
:forceDeleteShow="true"
:deleteTitle="'overall.asset'"
:type="'hide'"
:title="$t('overall.delete')"
id="asset-list-delete"
class="asset-list-delete"
v-has="'asset_delete'"
:api="api"
:single="true"
:delete-objs="singleDelete"
@before="delFlag=true"
></delete-button>
</div>
</template>

32
nezha-fronted/src/components/common/table/settings/endpointTable.vue
View File

@@ -177,23 +177,7 @@
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
<!-- <el-dropdown-item v-if="!endpointTab" :command="['endpointQuery', scope.row]"><i class="nz-icon nz-icon-search"></i><span class="operation-dropdown-text">{{$t('overall.query')}}</span></el-dropdown-item>-->
<el-dropdown-item v-if="!endpointTab" v-has="'monitor_endpoint_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
<!-- <el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item> -->
<el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete', scope.row, `sys/endpoint?ids=${scope.row.id}`]">
<delete-button
ref="deleteButton"
:from="'endpoint'"
:forceDeleteShow="false"
:deleteTitle="'project.endpoint.endpoint'"
:type="'link'"
:title="$t('overall.delete')"
id="account-list-delete"
v-has="'monitor_endpoint_delete'"
:api="api"
:single="true"
:delete-objs="singleDelete"
@before="delFlag=true"
></delete-button>
</el-dropdown-item>
<el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete-rel', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'monitor_endpoint_edit'" :command="['copy', scope.row, 'project']"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'endpoint']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['topology', scope.row, 'endpoint']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
@@ -218,6 +202,20 @@
:that="alertLabelObj"
:type="alertLabelType"
></alertLabel>
<delete-button
ref="deleteButton"
:from="'endpoint'"
:forceDeleteShow="false"
:deleteTitle="'project.endpoint.endpoint'"
:type="'link'"
:title="$t('overall.delete')"
id="account-list-delete"
v-has="'monitor_endpoint_delete'"
:api="api"
:single="true"
:delete-objs="singleDelete"
@before="delFlag=true"
></delete-button>
</div>
</template>

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -30,7 +30,7 @@
:permissions="{
import: 'asset_add',
export: 'asset_edit'
}"
class="top-tool-export margin-l-10 margin-r-10"
export-file-name="asset"
export-url="/asset/asset/export"