Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
This commit is contained in:
zhangyu
@@ -13,10 +13,9 @@
|
||||
</div>
|
||||
<template v-else>
|
||||
<div class="top-tool-left" style="cursor: pointer;">
|
||||
<select-panel
|
||||
ref="selectPanel"
|
||||
<select-dashboard
|
||||
ref="selectDashboard"
|
||||
@refreshStarred="refreshStarred"
|
||||
:filter-panel="filterPanel"
|
||||
:panel-data="panelData"
|
||||
:panel-lock="panelLock"
|
||||
:placement="'bottom-start'"
|
||||
@@ -24,26 +23,23 @@
|
||||
style="display: inline-block;padding: 0"
|
||||
@deletePanel="del"
|
||||
@editPanel="edit"
|
||||
@selectPanel="panelChange">
|
||||
<template v-slot:header>
|
||||
<div class="panel-select-header">
|
||||
<el-input id="panel-list-search" v-model="filterPanel" :placeholder="$t('overall.search')" clearable size="mini" style="width: 286px;"></el-input>
|
||||
<!-- <span id="panel-list-toadd" v-has="'main_add'" :title='$t("dashboard.panel.createPanelTitleSec")' class="panel-select-add" @click="toAdd"><i class="nz-icon nz-icon-plus"></i></span> -->
|
||||
</div>
|
||||
</template>
|
||||
@selectDashboard="panelChange">
|
||||
<template v-slot:trigger>
|
||||
<i style="color: #BEBEBE" class="el-icon-menu"></i>
|
||||
<span :title="showPanel.name + ' (' + showPanel.chartNum +' charts）' " class="show-panel-name">{{showPanel.name}}</span>
|
||||
<i @click.stop="delStarred(showPanel)" v-if="showPanel.starred" class="el-rate__icon el-icon-star-on"></i>
|
||||
<i @click.stop="addStarred(showPanel)" v-else class="el-rate__icon el-icon-star-off"></i>
|
||||
<i @click.stop="delStarred(showPanel)" v-if="showPanel.starred" class="nz-icon nz-icon-a-xingzhuang2"></i>
|
||||
<i @click.stop="addStarred(showPanel)" v-else class="nz-icon nz-icon-xingzhuang"></i>
|
||||
</template>
|
||||
<template v-slot:tail>
|
||||
<div class="panel-select-tail">
|
||||
<span id="panel-list-toadd" v-has="'main_add'" :title='$t("dashboard.panel.createPanelTitleSec")' class="panel-select-add" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i> {{ $t('overall.addProject') }}</span>
|
||||
<div class="dashboard-select-tail">
|
||||
<span class="dashboard-select-add" v-has="'main_add'" :title='$t("dashboard.panel.createPanelTitleSec")' @click="toAdd">
|
||||
<i class="nz-icon nz-icon-create-square"></i> {{$t('overall.addDashboard')}}
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
</select-panel>
|
||||
</select-dashboard>
|
||||
</div>
|
||||
|
||||
<div class="top-tool-right">
|
||||
<!-- <div class="top-tool-search margin-r-20">-->
|
||||
<!-- <el-input id="queryPanel" ref="queryPanel" v-model="filter.searchName" class="query-input-inactive" clearable size="small" @blur="blurInput" @clear="clearInput" @focus="focusInput">-->
|
||||
@@ -51,15 +47,14 @@
|
||||
<!-- </el-input>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- 切换查看模式 -->
|
||||
<button slot="reference" class="top-tool-btn view-mode" :title="$t('overall.viewMode')" @click="cycle">
|
||||
<i class="el-icon-monitor"></i>
|
||||
</button>
|
||||
|
||||
<pick-time id="panel" ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false" class="margin-r-10" :sign="showPanel.id"></pick-time>
|
||||
|
||||
<button id="panel-add-chart" v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10"
|
||||
type="button" @click="addChartBefore">
|
||||
<!-- 切换查看模式 -->
|
||||
<button slot="reference" class="top-tool-btn view-mode" :title="$t('overall.viewMode')" @click="cycle">
|
||||
<i class="nz-icon nz-icon-moshiqiehuan"></i>
|
||||
</button>
|
||||
|
||||
<button id="panel-add-chart" v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" type="button" @click="addChartBefore">
|
||||
<i class="nz-icon-create-square nz-icon"></i>
|
||||
</button>
|
||||
|
||||
@@ -159,7 +154,7 @@
|
||||
import chartRightBox from '@/components/common/rightBox/chart/chartRightBox'
|
||||
import bus from '../../../libs/bus'
|
||||
import pickTime from '../../common/pickTime'
|
||||
import selectPanel from '../../common/popBox/selectPanel'
|
||||
import selectDashboard from '../../common/popBox/selectDashboard'
|
||||
import panelBox from '@/components/common/rightBox/panelBox'
|
||||
import chartTempBox from '@/components/common/rightBox/chartTempBox'
|
||||
import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions'
|
||||
@@ -284,7 +279,6 @@ export default {
|
||||
id: 4
|
||||
},
|
||||
panelId: 0,
|
||||
filterPanel: '',
|
||||
// ---图表相关参数--end
|
||||
scrollbarWrap: null,
|
||||
batchDeleteObjs: [],
|
||||
@@ -300,7 +294,7 @@ export default {
|
||||
'pick-time': pickTime,
|
||||
'panel-box': panelBox,
|
||||
topToolMoreOptions,
|
||||
selectPanel,
|
||||
selectDashboard,
|
||||
chartTempBox,
|
||||
chartRightBox
|
||||
},
|
||||
@@ -318,25 +312,24 @@ export default {
|
||||
methods: {
|
||||
// 刷新树形菜单视图
|
||||
refreshStarred ({ data, type }) {
|
||||
if (type === 'tree') {
|
||||
this.panelData = JSON.parse(JSON.stringify(data))
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
this.$refs.selectPanel.$refs.starredTree.filter(this.filterPanel)
|
||||
this.$refs.selectPanel.$refs.panelTree.filter(this.filterPanel)
|
||||
this.$refs.selectPanel.$refs.panelTree.setCurrentKey(this.showPanel)
|
||||
})
|
||||
// 判断当前页面收藏状态
|
||||
const starredArr = this.$refs.selectPanel.tempArr
|
||||
this.showPanel.starred = starredArr.some(item => item.id === this.showPanel.id)
|
||||
// if (type === 'tree') {
|
||||
// this.panelData = JSON.parse(JSON.stringify(data))
|
||||
// }
|
||||
// this.$nextTick(() => {
|
||||
// // this.$refs.selectDashboard.$refs.panelTree.filter(this.filterPanel)
|
||||
// this.$refs.selectDashboard.$refs.panelTree.setCurrentKey(this.showPanel)
|
||||
// })
|
||||
// // 判断当前页面收藏状态
|
||||
// const starredArr = this.$refs.selectDashboard.tempArr
|
||||
// this.showPanel.starred = starredArr.some(item => item.id === this.showPanel.id)
|
||||
},
|
||||
// 新增收藏
|
||||
addStarred (data) {
|
||||
this.$refs.selectPanel.addStarred(data)
|
||||
this.$refs.selectDashboard.addStarred(data)
|
||||
},
|
||||
// 删除收藏
|
||||
delStarred (data) {
|
||||
this.$refs.selectPanel.delStarred(data)
|
||||
this.$refs.selectDashboard.delStarred(data)
|
||||
},
|
||||
// 刷新
|
||||
refreshPanel () {
|
||||
@@ -692,7 +685,7 @@ export default {
|
||||
let isInitData = false
|
||||
this.panelData = JSON.parse(JSON.stringify(response.data.list))
|
||||
this.$nextTick(() => {
|
||||
this.$refs.selectPanel.getStarred('tree')
|
||||
this.$refs.selectDashboard.getStarred('tree')
|
||||
})
|
||||
if (response.data.list.length > 0) {
|
||||
if (this.$store.state.showPanel.id > 0 && this.$store.state.showPanel.name) {
|
||||
@@ -712,7 +705,7 @@ export default {
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
try {
|
||||
this.$refs.selectPanel.$refs.panelTree.setCurrentKey(this.showPanel)
|
||||
this.$refs.selectDashboard.$refs.panelTree.setCurrentKey(this.showPanel)
|
||||
} catch (e) {}
|
||||
})
|
||||
this.isLoading = false
|
||||
@@ -1011,8 +1004,11 @@ export default {
|
||||
this.$store.commit('setMode', this.mode)
|
||||
this.$nextTick(() => {
|
||||
setTimeout(() => {
|
||||
this.$refs.chartList.resize()
|
||||
}, 200)
|
||||
try {
|
||||
this.$refs.chartList.resize()
|
||||
} catch (error) {
|
||||
}
|
||||
}, 300)
|
||||
})
|
||||
if (this.nowTimeType.type) {
|
||||
this.setSearchTime(this.nowTimeType.type, this.nowTimeType.value, this.nowTimeType)
|
||||
@@ -1117,16 +1113,6 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
.el-rate__icon{
|
||||
color: #C0C4CC !important;
|
||||
cursor: pointer;
|
||||
margin-right: 0px;
|
||||
transform: translateY(1px);
|
||||
}
|
||||
.el-icon-star-on{
|
||||
color:#FF9219 !important;
|
||||
transform: translateY(1px) scale(1.2);
|
||||
}
|
||||
.view-mode{
|
||||
margin-right: 10px;
|
||||
display: flex;
|
||||
|
||||
Reference in New Issue
Block a user