gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复冲突

Browse Source
This commit is contained in:
zyh
2023-03-21 16:54:45 +08:00
parent bc49fc6ff8 29ef898c65
commit 847d852388
82 changed files with 719 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
View File

@@ -1,12 +1,12 @@
<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>
<div class="right-box__header">
<div class="header__title" v-if="from !== 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTitle") : $t("overall.createChart")}}</div>
<div class="header__title" v-if="from === 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTempTitle") : $t("dashboard.panel.createChartTempTitle")}}</div>
<div class="header__title" v-if="from !== 'chartTemp'">{{editChart.id ? $t("dashboard.dashboard.editChartTitle") : $t("overall.createChart")}}</div>
<div class="header__title" v-if="from === 'chartTemp'">{{editChart.id ? $t("dashboard.dashboard.editChartTempTitle") : $t("dashboard.dashboard.createChartTempTitle")}}</div>
<div class="header__operation">
<span v-cancel:[isStable]="{obj: editChart, func: clickOutside}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span>
</div>
@@ -49,7 +49,7 @@
</select-panel>
</el-form-item>
<!--group-->
<el-form-item :label="$t('dashboard.panel.chartForm.group')" class="form-item--half-width" prop="group">
<el-form-item :label="$t('dashboard.dashboard.chartForm.group')" class="form-item--half-width" prop="group">
<el-select id="chart-box-group" v-model="editChart.groupId" :disabled="editChart.type==='group'" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside el-option-width303" size="small" value-key="chartType">
<el-option v-for="item in groupArr" :key="item.id" :label="item.name" :value="item.id">
<span class="panel-dropdown-label-txt" >{{item.name}}</span>
@@ -68,7 +68,7 @@
<!--title-->
<div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.dataConfig')}}</span>
<span>{{$t('dashboard.dashboard.chartForm.dataConfig')}}</span>
</div>
<el-tabs v-model="editChart.datasource" @tab-click="datasourceChange" type="card">
<el-tab-pane :label="$t('overall.metrics')" name="metrics">
@@ -598,6 +598,7 @@ export default {
}
}
this.editChart = obj
this.oldData = this.$loadsh.cloneDeep(obj)
if (this.stableTime) {
clearTimeout(this.stableTime)
this.stableTime = null