dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	frontend/src/views/chart/view/ChartStyle.vue
#	frontend/src/views/panel/list/PanelMain.vue
This commit is contained in:
wangjiahao 2022-05-20 13:08:51 +08:00
commit 9f01bc4ee0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -652,7 +652,7 @@
</el-tab-pane>
<el-tab-pane :label="$t('chart.chart_style')" class="padding-tab" style="width: 300px">
<chart-style
v-if="chartProperties || view.isPlugin"
v-if="chartProperties"
:param="param"
:view="view"
:chart="chart"