Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7

This commit is contained in:
zhangyu
2023-03-20 14:51:57 +08:00
6 changed files with 30 additions and 6 deletions

View File

@@ -1,5 +1,5 @@
<template>
<div v-clickoutside:[isStable]="{obj: editChart, func:clickOutside}" :class="boxClass" class="right-box right-box-chart">
<div v-clickoutside:[isStable]="{obj: editChart,oldData: oldData, func:clickOutside}" :class="boxClass" class="right-box right-box-chart">
<transition v-if="from !== 'chartTemp'" name="right-box">
<!-- <panel-box v-if="!showPanel.type" ref="panelBox2" :panel="panel" @reload="panelReload"></panel-box>-->
</transition>
@@ -597,6 +597,7 @@ export default {
}
}
this.editChart = obj
this.oldData = this.$loadsh.cloneDeep(obj)
if (this.stableTime) {
clearTimeout(this.stableTime)
this.stableTime = null