Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
This commit is contained in:
zhangyu
@@ -580,6 +580,11 @@ export default {
|
||||
result: ''
|
||||
}
|
||||
}
|
||||
if (obj.type === 'group' && !obj.param.repeat) {
|
||||
obj.param.repeat = {
|
||||
variable: ''
|
||||
}
|
||||
}
|
||||
// this.editChart.varType = 1
|
||||
if (obj.param.enable.legend && !obj.param.legend) {
|
||||
obj.param.legend = { placement: 'bottom', values: [], show: true }
|
||||
|
||||
@@ -247,6 +247,46 @@
|
||||
</div>
|
||||
</transition>
|
||||
</div>
|
||||
<!-- repeat -->
|
||||
<div v-if="params.type === 'group'">
|
||||
<div class="form__sub-title">
|
||||
<span>{{$t('dashboard.repeat')}}</span>
|
||||
<el-switch
|
||||
v-model="chartConfig.param.enable.repeat"
|
||||
size="small"
|
||||
@change="change"
|
||||
></el-switch>
|
||||
</div>
|
||||
<transition name="el-zoom-in-top">
|
||||
<div
|
||||
v-if="chartConfig.param.enable.repeat"
|
||||
class="form-items--half-width-group"
|
||||
>
|
||||
<!-- variable -->
|
||||
<el-form-item
|
||||
:label="$t('dashboard.panel.variableName')"
|
||||
class="form-item--half-width"
|
||||
prop="param.repeat.variable"
|
||||
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
|
||||
>
|
||||
<el-select
|
||||
v-model="chartConfig.param.repeat.variable"
|
||||
:placeholder="$t('el.select.placeholder')"
|
||||
popper-class="right-box-select-top prevent-clickoutside"
|
||||
size="small"
|
||||
@change="change"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in variables"
|
||||
:key="item.name"
|
||||
:label="$t(item.name)"
|
||||
:value="item.name"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</transition>
|
||||
</div>
|
||||
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -320,7 +360,8 @@ export default {
|
||||
link: this.chartConfig.param.link,
|
||||
collapse: true,
|
||||
enable: {
|
||||
visibility: false
|
||||
visibility: false,
|
||||
repeat: false
|
||||
},
|
||||
showHeader: this.chartConfig.param.showHeader,
|
||||
visibility: {
|
||||
@@ -328,6 +369,9 @@ export default {
|
||||
operator: 'equal',
|
||||
varValue: '',
|
||||
result: 'show'
|
||||
},
|
||||
repeat: {
|
||||
variable: ''
|
||||
}
|
||||
}
|
||||
break
|
||||
|
||||
@@ -309,6 +309,7 @@
|
||||
<el-select v-model="editPanel.param.report.receivers" clearable multiple placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="chartType">
|
||||
<el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id">
|
||||
<span class="panel-dropdown-label-txt" >{{item.name}}</span>
|
||||
<span class="user-username" :title="item.username">@{{item.username}}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@@ -50,26 +50,30 @@
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div slot-scope="scope" v-else class="table-operation-items">
|
||||
<button class="table-operation-button" @click="Restore(scope.row)" v-if="scope.row" :title="$t('backup.RestoreNow')">
|
||||
<i class="nz-icon-shujubeifenhuifu nz-icon"></i>
|
||||
</button>
|
||||
<div v-if="scope.row" @click="tableOperation(scope.row)">
|
||||
<delete-button
|
||||
ref="deleteButton"
|
||||
:forceDeleteShow="false"
|
||||
id="backup-delete"
|
||||
:from="'backup'"
|
||||
:type="'btn'"
|
||||
:api="'/sys/backup'"
|
||||
:single="true"
|
||||
:delete-objs="singleDelete"
|
||||
@before="delFlag=true"
|
||||
></delete-button>
|
||||
<div slot-scope="scope" class="table-operation-items" v-else>
|
||||
<button class="table-operation-item" :title="$t('overall.download')" v-has="'backup_download'" @click="downloadBackup(scope.row)"><i class="nz-icon nz-icon-download"></i></button>
|
||||
<el-dropdown size="medium" v-has="['backup_restore','backup_del']" trigger="click" @command="tableOperation">
|
||||
<div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
|
||||
<i class="nz-icon nz-icon-more3"></i>
|
||||
</div>
|
||||
<!-- <button class="table-operation-edit" @click="del(scope.row)" v-if="scope.row" :title="$t('overall.delete')">
|
||||
<i class="nz-icon nz-icon-delete" style="font-size='12px'"></i>
|
||||
</button> -->
|
||||
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
|
||||
<el-dropdown-item v-has="'backup_restore'" :command="['restore', scope.row]" disabled><i class="nz-icon-shujubeifenhuifu nz-icon"></i><span>{{$t('backup.RestoreNow')}}</span></el-dropdown-item>
|
||||
<el-dropdown-item v-has="'backup_del'" :command="['delete', scope.row]">
|
||||
<delete-button
|
||||
ref="deleteButton"
|
||||
:forceDeleteShow="false"
|
||||
id="backup-delete"
|
||||
:from="'backup'"
|
||||
:type="'link'"
|
||||
:title="$t('overall.delete')"
|
||||
:api="'/sys/backup'"
|
||||
:single="true"
|
||||
:delete-objs="singleDelete"
|
||||
@before="delFlag=true"
|
||||
></delete-button>
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
</el-table-column>
|
||||
<template slot="empty">
|
||||
@@ -87,7 +91,7 @@
|
||||
|
||||
<script>
|
||||
import { post, put } from '@/http'
|
||||
import lodash from 'lodash'
|
||||
import axios from 'axios'
|
||||
import bus from '@/libs/bus'
|
||||
import deleteButton from '@/components/common/deleteButton'
|
||||
|
||||
@@ -157,15 +161,6 @@ export default {
|
||||
}, 400)
|
||||
}
|
||||
},
|
||||
// del (row) {
|
||||
// this.$delete('/sys/backup?filename=' + row.fileName).then(res => {
|
||||
// if (res.code == 200) {
|
||||
// this.$emit('getTableData', 'recent')
|
||||
// } else {
|
||||
// this.$message.error(res.msg)
|
||||
// }
|
||||
// })
|
||||
// },
|
||||
changeDate (item) {
|
||||
const time = this.utcTimeToTimezoneStr(item)
|
||||
const time1 = this.timeFormate(time)
|
||||
@@ -187,14 +182,49 @@ export default {
|
||||
edit () {
|
||||
this.$emit('edit', this.tableData[0])
|
||||
},
|
||||
tableOperation (row) {
|
||||
this.$set(row, 'name', row.fileName)
|
||||
if (this.singleDelete.length === 0) {
|
||||
this.singleDelete.push(row)
|
||||
} else {
|
||||
this.singleDelete = []
|
||||
this.singleDelete.push(row)
|
||||
tableOperation ([command, row]) {
|
||||
switch (command) {
|
||||
case 'delete': {
|
||||
this.$set(row, 'name', row.fileName)
|
||||
if (this.singleDelete.length === 0) {
|
||||
this.singleDelete.push(row)
|
||||
} else {
|
||||
this.singleDelete = []
|
||||
this.singleDelete.push(row)
|
||||
}
|
||||
break
|
||||
}
|
||||
case 'restore': {
|
||||
this.Restore(row)
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
},
|
||||
downloadBackup (backup) {
|
||||
axios.get('/sys/backup/download?filename=' + backup.fileName, { responseType: 'blob' }).then(data => {
|
||||
let fileName = new Date().getTime() + '.txt'
|
||||
const disposition = data.headers['content-disposition']
|
||||
if (disposition) {
|
||||
fileName = disposition.split(';')[1].split('filename=')[1]
|
||||
}
|
||||
// 由于ie不支持download属性，故需要做兼容判断
|
||||
if (navigator.appVersion.toString().indexOf('.NET') > 0) {
|
||||
// ie独有的msSaveBlob属性，data.data为Blob文件流
|
||||
window.navigator.msSaveBlob(data.data, fileName)
|
||||
} else {
|
||||
// 以下流程即为文章开始的下载流程
|
||||
const url = window.URL.createObjectURL(data.data)
|
||||
const link = document.createElement('a')
|
||||
link.style.display = 'none'
|
||||
link.href = url
|
||||
link.download = fileName
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
window.URL.revokeObjectURL(link.href)
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
<pick-time id="panel" ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false" class="margin-r-10" :sign="showPanel.id"></pick-time>
|
||||
|
||||
<!-- 切换查看模式 -->
|
||||
<button slot="reference" class="top-tool-btn view-mode" :title="$t('overall.viewMode')" @click="cycle">
|
||||
<button class="top-tool-btn view-mode" :title="$t('overall.viewMode')" @click="cycle">
|
||||
<i class="nz-icon nz-icon-moshiqiehuan"></i>
|
||||
</button>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user