NEZ-2480 fix:下拉框无内容样式问题

This commit is contained in:
zyh
2022-12-27 16:17:50 +08:00
parent 038079cadd
commit c99e345b38
18 changed files with 39 additions and 24 deletions

View File

@@ -98,13 +98,13 @@
</div> </div>
<!-- dashboardTemp --> <!-- dashboardTemp -->
<div v-else-if="from === fromRoute.dashboardTemp"> <div v-else-if="from === fromRoute.dashboardTemp">
<button id="endpoint-create-chart" v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" @click.stop="addChart"> <button v-has="'main_add'" id="endpoint-create-chart" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" @click.stop="addChart">
<i class="nz-icon nz-icon-create-square"></i> <i class="nz-icon nz-icon-create-square"></i>
</button> </button>
<button id="panel-lock" :title='panelLock ? $t("overall.unlocked") : $t("overall.locked")' class="top-tool-btn margin-r-10" @click="panelLockChange(!panelLock)" type="button"> <button v-has="'main_edit'" id="panel-lock" :title='panelLock ? $t("overall.unlocked") : $t("overall.locked")' class="top-tool-btn margin-r-10" @click="panelLockChange(!panelLock)" type="button">
<i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i> <i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>
</button> </button>
<button @click="chartBySync" id="chart-sync" :title="$t('overall.syncChart')" class="top-tool-btn margin-r-10" type="button"> <button v-has="'main_edit'" @click="chartBySync" id="chart-sync" :title="$t('overall.syncChart')" class="top-tool-btn margin-r-10" type="button">
<i class="nz-icon nz-icon-sync"></i> <i class="nz-icon nz-icon-sync"></i>
</button> </button>
</div> </div>
@@ -617,7 +617,7 @@ export default {
this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) this.showPanel = this.$loadsh.cloneDeep(this.panelData[0])
this.variables = this.$loadsh.get(this.panelData, '[0].param.variables') this.variables = this.$loadsh.get(this.panelData, '[0].param.variables')
this.getData(this.filter) this.getData(this.filter)
}else { } else {
this.chartListLoading = false this.chartListLoading = false
} }
} else { } else {

View File

@@ -36,9 +36,9 @@
<HighlightText :queries="filterPanel" :highlightClass="'highlight-keyword'" style="vertical-align: middle" :title="node.label + ' (' + data.chartNum +' charts' ">{{node.label}}</HighlightText> <HighlightText :queries="filterPanel" :highlightClass="'highlight-keyword'" style="vertical-align: middle" :title="node.label + ' (' + data.chartNum +' charts' ">{{node.label}}</HighlightText>
<el-row class="block-col-2" style="margin-left:10px;margin-right:8px"> <el-row class="block-col-2" style="margin-left:10px;margin-right:8px">
<el-col> <el-col>
<el-dropdown placement="bottom-end" trigger="click" style="margin-right:10px"> <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> <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="['main_edit', 'main_delete']"> <el-dropdown-menu class="right-box-select-top" slot="dropdown">
<el-dropdown-item> <el-dropdown-item>
<div @click="editPanel(data)" v-has="'main_edit'"><i class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div> <div @click="editPanel(data)" v-has="'main_edit'"><i class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div>
</el-dropdown-item> </el-dropdown-item>
@@ -75,9 +75,9 @@
<HighlightText :queries="filterPanel" :highlightClass="'highlight-keyword'" style="vertical-align: middle" :title="node.label + ' (' + data.chartNum +' charts' ">{{node.label}}</HighlightText> <HighlightText :queries="filterPanel" :highlightClass="'highlight-keyword'" style="vertical-align: middle" :title="node.label + ' (' + data.chartNum +' charts' ">{{node.label}}</HighlightText>
<el-row class="block-col-2" style="margin-left:10px;margin-right:8px"> <el-row class="block-col-2" style="margin-left:10px;margin-right:8px">
<el-col> <el-col>
<el-dropdown placement="bottom-end" trigger="click" style="margin-right:10px"> <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> <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="['main_edit', 'main_delete']"> <el-dropdown-menu class="right-box-select-top" slot="dropdown">
<el-dropdown-item> <el-dropdown-item>
<div @click="editPanel(data)" v-has="'main_edit'"><i class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div> <div @click="editPanel(data)" v-has="'main_edit'"><i class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div>
</el-dropdown-item> </el-dropdown-item>

View File

@@ -5,10 +5,10 @@
<i class="nz-icon nz-icon-more2"></i> <i class="nz-icon nz-icon-more2"></i>
</button> </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">
<el-dropdown-item v-if="showLock"> <el-dropdown-item v-if="showLock" v-has="'main_edit'">
<div @click="editPanel" id="edit-bottom-panel"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.panel.editPanelTitle')}}</div> <div @click="editPanel" id="edit-bottom-panel"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.panel.editPanelTitle')}}</div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="showLock"> <el-dropdown-item v-if="showLock" v-has="'main_edit'">
<div @click="panelLock=!panelLock" id="panel-lock"><i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>{{!panelLock ? $t("overall.locked") : $t("overall.unlocked")}}</div> <div @click="panelLock=!panelLock" id="panel-lock"><i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>{{!panelLock ? $t("overall.locked") : $t("overall.unlocked")}}</div>
</el-dropdown-item> </el-dropdown-item>
<!-- importexport之前的内容 --> <!-- importexport之前的内容 -->

View File

@@ -106,13 +106,13 @@
<div slot="header" class="table-operation-title">{{$t('overall.option')}}</div> <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
<div slot-scope="scope" class="table-operation-items"> <div slot-scope="scope" class="table-operation-items">
<button v-if="scope.row.alertRule" class="table-operation-item" @click="$emit('messageDetail', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button> <button v-if="scope.row.alertRule" class="table-operation-item" @click="$emit('messageDetail', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
<el-dropdown v-has="['alertMessage_expired', 'alertSilence_add']" size="medium" trigger="click" @command="tableOperation"> <el-dropdown v-has="['alertMessage_delete','alertMessage_expired', 'alertSilence_add']" size="medium" trigger="click" @command="tableOperation">
<div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')"> <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
<i class="nz-icon nz-icon-more3"></i> <i class="nz-icon nz-icon-more3"></i>
</div> </div>
<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">
<!-- <el-dropdown-item :command="['showText', scope.row]"><i class="nz-icon nz-icon-guzhangshuju"></i><span class="operation-dropdown-text">{{$t('alert.config.trbShot')}}</span></el-dropdown-item>--> <!-- <el-dropdown-item :command="['showText', scope.row]"><i class="nz-icon nz-icon-guzhangshuju"></i><span class="operation-dropdown-text">{{$t('alert.config.trbShot')}}</span></el-dropdown-item>-->
<el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row, 'singleDel']"><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="'alertMessage_delete'" :command="['delete', scope.row, 'singleDel']"><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="'alertMessage_view'" :command="['delete', scope.row]"> <!-- <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row]">
<delete-button <delete-button
ref="deleteButton" ref="deleteButton"

View File

@@ -81,7 +81,7 @@
popper-class="schedEnableTitle nz-tooltip-bac" popper-class="schedEnableTitle nz-tooltip-bac"
> >
<div> <div>
<div class="margin-b-10"> <div class="margin-b-10" v-has="'alertRule_edit'">
{{$t('alert.config.schedEnable')}} {{$t('alert.config.schedEnable')}}
<el-switch <el-switch
style="margin-left: 14px" style="margin-left: 14px"

View File

@@ -108,7 +108,7 @@
fixed="right"> fixed="right">
<div slot="header" class="table-operation-title">{{$t('overall.option')}}</div> <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
<div slot-scope="scope" class="table-operation-items"> <div slot-scope="scope" class="table-operation-items">
<button class="table-operation-item" v-has="'dc_edit'" @click="showBottomBox('cabinet', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button> <button class="table-operation-item" v-has="'dc_view'" @click="showBottomBox('cabinet', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
<el-dropdown size="medium" v-has="['dc_delete','dc_edit']" trigger="click" @command="tableOperation"> <el-dropdown size="medium" v-has="['dc_delete','dc_edit']" trigger="click" @command="tableOperation">
<div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')"> <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
<i class="nz-icon nz-icon-more3"></i> <i class="nz-icon nz-icon-more3"></i>

View File

@@ -19,7 +19,7 @@
<i class="nz-icon nz-icon-funnel"></i> <i class="nz-icon nz-icon-funnel"></i>
</button> </button>
<pick-time v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time> <pick-time v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
<button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcel')" class="top-tool-btn margin-r-10" type="button" @click="showExportDialog"> <button id="roles-add" v-has="'alertMessage_edit'" :title="$t('overall.exportExcel')" class="top-tool-btn margin-r-10" type="button" @click="showExportDialog">
<i class="nz-icon-download1 nz-icon"></i> <i class="nz-icon-download1 nz-icon"></i>
</button> </button>
<top-tool-more-options <top-tool-more-options
@@ -31,6 +31,7 @@
export-file-name="AlertMessage" export-file-name="AlertMessage"
class="top-tool-export margin-r-10" class="top-tool-export margin-r-10"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['alertMessage_delete','alertMessage_expired']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>
@@ -42,7 +43,7 @@
:forceDeleteShow="false" :forceDeleteShow="false"
:deleteTitle="'alert.alertMessage'" :deleteTitle="'alert.alertMessage'"
id="alert-msg-batch-delete" id="alert-msg-batch-delete"
v-has="'alertMessage_expired'" v-has="'alertMessage_delete'"
:api="url" :api="url"
:clickFunction="batchDel" :clickFunction="batchDel"
:delete-objs="batchDeleteObjs" :delete-objs="batchDeleteObjs"

View File

@@ -33,6 +33,7 @@
export-url="/alert/rule/export" export-url="/alert/rule/export"
import-url="/alert/rule/import" import-url="/alert/rule/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['alertRule_add','alertRule_edit',]"
> >
</top-tool-more-options> </top-tool-more-options>
</template> </template>
@@ -95,6 +96,7 @@
export-url="/alert/rule/export" export-url="/alert/rule/export"
import-url="/alert/rule/import" import-url="/alert/rule/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['alertRule_add','alertRule_edit','alertRule_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -36,6 +36,7 @@
export-url="/asset/asset/export" export-url="/asset/asset/export"
import-url="/asset/asset/import" import-url="/asset/asset/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['asset_add','asset_edit']"
> >
</top-tool-more-options> </top-tool-more-options>
</template> </template>
@@ -108,6 +109,7 @@
export-url="/asset/asset/export" export-url="/asset/asset/export"
import-url="/asset/asset/import" import-url="/asset/asset/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['asset_add','asset_edit','asset_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -36,6 +36,7 @@
export-url="/dc/export" export-url="/dc/export"
import-url="/dc/import" import-url="/dc/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['dc_add','dc_edit']"
> >
</top-tool-more-options> </top-tool-more-options>
</template> </template>
@@ -101,6 +102,7 @@
export-url="/dc/export" export-url="/dc/export"
import-url="/dc/import" import-url="/dc/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['dc_add','dc_edit','dc_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -27,6 +27,7 @@
export-url="/ipam/subnet/export" export-url="/ipam/subnet/export"
import-url="/ipam/subnet/import" import-url="/ipam/subnet/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['ipam_add','ipam_edit','ipam_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -27,6 +27,7 @@
export-url="/asset/model/export" export-url="/asset/model/export"
import-url="/asset/model/import" import-url="/asset/model/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['model_add','model_edit','model_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>
@@ -104,7 +105,7 @@ export default {
id: '', id: '',
name: '', name: '',
// chartIds: '', // chartIds: '',
panelId:'', panelId: '',
sysObjectId: '', sysObjectId: '',
type: { id: '', name: '' }, type: { id: '', name: '' },
remark: '' remark: ''

View File

@@ -28,6 +28,7 @@
export-url="/record/rule/export" export-url="/record/rule/export"
import-url="/record/rule/import" import-url="/record/rule/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['record_rule_add','record_rule_edit','record_rule_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -26,6 +26,7 @@
:permissions="{import: 'dashboard_temp_add', export: 'dashboard_temp_edit'}" :permissions="{import: 'dashboard_temp_add', export: 'dashboard_temp_edit'}"
class="top-tool-export margin-r-10" class="top-tool-export margin-r-10"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['dashboard_temp_add','dashboard_temp_edit','dashboard_temp_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -24,6 +24,7 @@
:permissions="{import: 'expressionTemplate_add', export: 'expressionTemplate_edit'}" :permissions="{import: 'expressionTemplate_add', export: 'expressionTemplate_edit'}"
class="top-tool-export margin-l-10 margin-r-10" class="top-tool-export margin-l-10 margin-r-10"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['expressionTemplate_add','expressionTemplate_edit','expressionTemplate_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -87,7 +87,7 @@
@afterImport="afterImport" @afterImport="afterImport"
> >
<template v-slot:before> <template v-slot:before>
<el-dropdown-item> <el-dropdown-item v-has="'main_edit'">
<div id="panel-lock" @click="$store.dispatch('dispatchPanelLock',{flag:!panelLock})"><i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>{{!panelLock ? $t('overall.locked') : $t('overall.unlocked')}}</div> <div id="panel-lock" @click="$store.dispatch('dispatchPanelLock',{flag:!panelLock})"><i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>{{!panelLock ? $t('overall.locked') : $t('overall.unlocked')}}</div>
</el-dropdown-item> </el-dropdown-item>
</template> </template>
@@ -95,7 +95,7 @@
<!-- <el-dropdown-item v-has="'main_add'"> <!-- <el-dropdown-item v-has="'main_add'">
<div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{$t('overall.AddByTemplate')}}</div> <div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{$t('overall.AddByTemplate')}}</div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-has="'panel_view'"> <el-dropdown-item v-has="'main_edit'">
<div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div> <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
</el-dropdown-item> --> </el-dropdown-item> -->
<el-dropdown-item v-has="'panel_view'"> <el-dropdown-item v-has="'panel_view'">

View File

@@ -33,6 +33,7 @@
export-url="/monitor/endpoint/export" export-url="/monitor/endpoint/export"
import-url="/monitor/endpoint/import" import-url="/monitor/endpoint/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['monitor_endpoint_add','monitor_endpoint_edit']"
> >
</top-tool-more-options> </top-tool-more-options>
</template> </template>
@@ -101,6 +102,7 @@
export-url="/monitor/endpoint/export" export-url="/monitor/endpoint/export"
import-url="/monitor/endpoint/import" import-url="/monitor/endpoint/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['monitor_endpoint_add','monitor_endpoint_edit','monitor_endpoint_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>

View File

@@ -18,7 +18,7 @@
<!-- <detailViewTopSearch :selectValue.sync="selectValue" :detailSearchList="detailSearchList" @reload="reloadTable" />--> <!-- <detailViewTopSearch :selectValue.sync="selectValue" :detailSearchList="detailSearchList" @reload="reloadTable" />-->
</template> </template>
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="asset-create-asset" v-has="'asset_add'" :title="$t('asset.createAsset')" class="top-tool-btn" @click.stop="add"> <button id="asset-create-asset" v-has="'monitor_module_add'" :title="$t('asset.createAsset')" class="top-tool-btn" @click.stop="add">
<i class="nz-icon nz-icon-create-square"></i> <i class="nz-icon nz-icon-create-square"></i>
</button> </button>
<top-tool-more-options <top-tool-more-options
@@ -27,12 +27,13 @@
id="model" id="model"
:params="searchLabel" :params="searchLabel"
:params2="searchCheckBox" :params2="searchCheckBox"
:permissions="{import: 'monitor_endpoint_add', export: 'monitor_module_edit'}" :permissions="{import: 'monitor_module_add', export: 'monitor_module_edit'}"
class="top-tool-export margin-l-10 margin-r-10" class="top-tool-export margin-l-10 margin-r-10"
export-file-name="module" export-file-name="module"
export-url="/monitor/module/export" export-url="/monitor/module/export"
import-url="/monitor/module/import" import-url="/monitor/module/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['monitor_module_add','monitor_module_edit']"
> >
</top-tool-more-options> </top-tool-more-options>
</template> </template>
@@ -82,8 +83,7 @@
@getTableData="getTableData" @getTableData="getTableData"
> >
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="account-add" v-has="'monitor_module_add'" :title="$t('overall.createModule')" class="top-tool-btn" <button id="account-add" v-has="'monitor_module_add'" :title="$t('overall.createModule')" class="top-tool-btn" type="button" @click="add">
type="button" @click="add">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>
<top-tool-more-options <top-tool-more-options
@@ -92,12 +92,13 @@
id="endpoint-template-list" id="endpoint-template-list"
:params="searchLabel" :params="searchLabel"
:params2="searchCheckBox" :params2="searchCheckBox"
:permissions="{import: 'monitor_endpoint_add', export: 'monitor_module_edit'}" :permissions="{import: 'monitor_module_add', export: 'monitor_module_edit'}"
class="top-tool-export margin-l-10 margin-r-10" class="top-tool-export margin-l-10 margin-r-10"
export-file-name="module" export-file-name="module"
export-url="/monitor/module/export" export-url="/monitor/module/export"
import-url="/monitor/module/import" import-url="/monitor/module/import"
@afterImport="getTableData" @afterImport="getTableData"
v-has="['monitor_module_add','monitor_module_edit','monitor_module_delete']"
> >
<template v-slot:before> <template v-slot:before>
<div> <div>