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 https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

Browse Source
This commit is contained in:
zhangyu
2023-06-20 10:37:36 +08:00
parent 7209d0c5bb 8cdb9c7beb
commit 0f130f61f3
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/chart/chart/chartDiagram.vue
View File

@@ -9,7 +9,7 @@
<!-- :isPanel="true"--> <!-- :isPanel="true"-->
<!-- ref="diagram"--> <!-- ref="diagram"-->
<!-- :chartInfo="chartInfo" />--> <!-- :chartInfo="chartInfo" />-->
<meta2dMain v-if="iconArrayLoad" :showHeader="false" :meta2dId="chartInfo.id + '-' + isFullscreen" :topoData="chartInfo.param.topo" :querysArray="querysArray" :params="{ timeType: 5}" :iconArray="iconArray" :isChart="true"/> <meta2dMain ref="diagram" v-if="iconArrayLoad" :showHeader="false" :meta2dId="chartInfo.id + '-' + isFullscreen" :topoData="chartInfo.param.topo" :querysArray="querysArray" :params="{ timeType: 5}" :iconArray="iconArray" :isChart="true"/>
</div> </div>
</template> </template>
@@ -52,7 +52,7 @@ export default {
}, },
methods: { methods: {
resize () { resize () {
this.$refs.diagram.winResize() this.$refs.diagram.resize()
} }
}, },
destroyed () { destroyed () {

2
nezha-fronted/src/components/common/js/tools.js
View File

@@ -5,7 +5,7 @@ import bus from '@/libs/bus'
import moment from 'moment-timezone' import moment from 'moment-timezone'
import lodash from 'lodash' import lodash from 'lodash'
/* 弹窗点击外部后关闭 */ /* 弹窗点击外部后关闭 */
const exceptClassName = ['prevent-clickoutside', 'config-dropdown', 'nz-pop', 'el-picker', 'chart-box-dropdown', 'metric-dropdown', 'el-cascader__dropdown', 'no-style-class', 'el-message-box', 'nz-dashboard-dropdown', 'el-autocomplete-suggestion', 'nz-temp-box', 'el-time-panel', 'el-dropdown-menu', 'el-select-dropdown', 'no-close'] // clickoutside排除的class(白名单) no-style-class：没有任何样式的class const exceptClassName = ['prevent-clickoutside', 'config-dropdown', 'nz-pop', 'el-picker', 'chart-box-dropdown', 'metric-dropdown', 'el-cascader__dropdown', 'no-style-class', 'el-message-box', 'nz-dashboard-dropdown', 'el-autocomplete-suggestion', 'nz-temp-box', 'el-time-panel', 'el-dropdown-menu', 'el-select-dropdown', 'no-close', 'nz-select-img-dialog'] // clickoutside排除的class(白名单) no-style-class：没有任何样式的class
export const clickoutside = { export const clickoutside = {
// 初始化指令 // 初始化指令
bind (el, binding, vnode) { bind (el, binding, vnode) {

4
nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue
View File

@@ -200,6 +200,10 @@ export default {
}, },
zoomMap (num) { zoomMap (num) {
getTopology(this.meta2dId).scale(getTopology(this.meta2dId).store.data.scale + num) getTopology(this.meta2dId).scale(getTopology(this.meta2dId).store.data.scale + num)
},
resize () {
getTopology(this.meta2dId).resize()
getTopology(this.meta2dId).centerView()
} }
}, },
beforeDestroy () { beforeDestroy () {