Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
This commit is contained in:
@@ -425,10 +425,10 @@
|
||||
}
|
||||
.chart-stat{
|
||||
width: 100%;
|
||||
height: calc(100% - 20px);
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
padding: 5px;
|
||||
padding: 2px;
|
||||
box-sizing: border-box;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
@@ -441,7 +441,7 @@
|
||||
word-break: break-all;
|
||||
border-radius: 2px;
|
||||
box-sizing: border-box;
|
||||
padding: 2px;
|
||||
//padding: 2px;
|
||||
overflow: hidden;
|
||||
color: $--color-text-regular;
|
||||
flex-grow: 1
|
||||
|
||||
@@ -63,7 +63,7 @@ export default {
|
||||
statData: [],
|
||||
boxWidth: 0,
|
||||
boxHeight: 0,
|
||||
boxPadding: 5,
|
||||
boxPadding: 2,
|
||||
statTimer: null,
|
||||
tooltip: {
|
||||
x: 0,
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
<i class="el-icon-copy-document" style="font-size: 16px;"></i>
|
||||
<span>{{$t('dashboard.duplicate')}}</span>
|
||||
</li>
|
||||
<li v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.pid" v-has="'main_edit'" class="el-dropdown-menu__item" @click="$emit('sync')">
|
||||
<li v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.pid" v-has="'main_edit'" class="el-dropdown-menu__item" @click="sync">
|
||||
<i class="nz-icon nz-icon-sync" style="font-size: 16px;"></i>
|
||||
<span>{{$t('overall.syncChart')}}</span>
|
||||
</li>
|
||||
|
||||
@@ -43,18 +43,25 @@ export default {
|
||||
chart: this.chartInfo,
|
||||
type: 'edit'
|
||||
})
|
||||
this.dropdownMenuShow = false
|
||||
},
|
||||
removeChart () {
|
||||
this.$store.dispatch('dispatchDelChart', {
|
||||
chart: this.chartInfo,
|
||||
type: 'delete'
|
||||
})
|
||||
this.dropdownMenuShow = false
|
||||
},
|
||||
duplicate () {
|
||||
this.$store.dispatch('dispatchEditChart', {
|
||||
chart: this.chartInfo,
|
||||
type: 'duplicate'
|
||||
})
|
||||
this.dropdownMenuShow = false
|
||||
},
|
||||
sync () {
|
||||
this.$emit('sync')
|
||||
this.dropdownMenuShow = false
|
||||
},
|
||||
clickos () {
|
||||
this.dropdownMenuShow = false
|
||||
|
||||
Reference in New Issue
Block a user