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

NEZ-3041 fix：dashboard group 折叠展开状态修改

Browse Source
This commit is contained in:
zyh
2023-08-07 15:27:14 +08:00
parent caaa0e15bf
commit c6ea663555
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
View File

@@ -443,6 +443,9 @@ export default {
if (!this.chart.groupId || this.chart.groupId == -1) {
this.chart.groupId = ''
}
if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
this.chart.param.collapse = false
}
if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
this.chart.param.rightYAxis = {
elementNames: [],
@@ -474,6 +477,9 @@ export default {
if (!this.chart.groupId || this.chart.groupId == -1) {
this.chart.groupId = ''
}
if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
this.chart.param.collapse = false
}
if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
this.chart.param.rightYAxis = {
elementNames: [],

16
nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
View File

@@ -40,14 +40,18 @@
</el-select>
</el-form-item>
<!--Default collapse-->
<el-form-item class="form-item--half-width" v-if="isGroup(chartConfig.type)" :label='$t("dashboard.dashboard.chartForm.collapse")' prop="param.collapse">
<el-switch
<el-form-item class="form-item--half-width" v-if="isGroup(chartConfig.type)" :label='$t("dashboard.dashboard.chartForm.collapseState")' prop="param.collapse">
<el-select
id="chart-box-collapse"
v-model="chartConfig.param.collapse"
:active-value="true"
:inactive-value="false"
placeholder=""
popper-class="right-box-select-top prevent-clickoutside"
size="small"
@change="change"
size="small"/>
>
<el-option :label="$t('overall.expand')" :value="false"></el-option>
<el-option :label="$t('overall.collapse')" :value="true"></el-option>
</el-select>
</el-form-item>
</div>
<div class="form-items--half-width-group" v-if="!isGroup(chartConfig.type)">
@@ -417,7 +421,7 @@ export default {
this.chartConfig.span = 12
this.chartConfig.param = {
link: this.chartConfig.param.link,
collapse: true,
collapse: false,
enable: {
visibility: false,
repeat: false

6
nezha-fronted/src/components/page/dashboard/dashboard.vue
View File

@@ -614,6 +614,9 @@ export default {
if (!this.chart.groupId || this.chart.groupId == -1) {
this.chart.groupId = ''
}
if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
this.chart.param.collapse = false
}
if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
this.chart.param.rightYAxis = {
elementNames: [],
@@ -645,6 +648,9 @@ export default {
if (!this.chart.groupId || this.chart.groupId == -1) {
this.chart.groupId = ''
}
if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
this.chart.param.collapse = false
}
if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
this.chart.param.rightYAxis = {
elementNames: [],