Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
<!-- :isPanel="true"-->
|
||||
<!-- ref="diagram"-->
|
||||
<!-- :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>
|
||||
</template>
|
||||
|
||||
@@ -52,7 +52,7 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
resize () {
|
||||
this.$refs.diagram.winResize()
|
||||
this.$refs.diagram.resize()
|
||||
}
|
||||
},
|
||||
destroyed () {
|
||||
|
||||
@@ -5,7 +5,7 @@ import bus from '@/libs/bus'
|
||||
import moment from 'moment-timezone'
|
||||
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 = {
|
||||
// 初始化指令
|
||||
bind (el, binding, vnode) {
|
||||
|
||||
@@ -200,6 +200,10 @@ export default {
|
||||
},
|
||||
zoomMap (num) {
|
||||
getTopology(this.meta2dId).scale(getTopology(this.meta2dId).store.data.scale + num)
|
||||
},
|
||||
resize () {
|
||||
getTopology(this.meta2dId).resize()
|
||||
getTopology(this.meta2dId).centerView()
|
||||
}
|
||||
},
|
||||
beforeDestroy () {
|
||||
|
||||
Reference in New Issue
Block a user