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

Merge branch 'dev-3.8' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.9

Browse Source
This commit is contained in:
zhangyu
2023-09-08 18:13:52 +08:00
parent 411c53f8b2 ac5376f470
commit f3bcf4e2e0
8 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/package-lock.json generated
View File

@@ -14218,7 +14218,7 @@
},
"node-sass": {
"version": "4.14.1",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
"resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
"integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
"dev": true,
"requires": {
@@ -20614,7 +20614,7 @@
},
"webpack-bundle-analyzer": {
"version": "2.13.1",
"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
"resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
"integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
"dev": true,
"requires": {

1
nezha-fronted/src/assets/css/components/page/config/agent.scss
View File

@@ -4,6 +4,7 @@
.agent-box >.right-box-form>.el-form-item.half-form-item{
width: 220px;
}
.agent-box >.right-box-form>.el-form-item.half-form-item:nth-child(odd){
width: 220px;

1
nezha-fronted/src/components/common/configSync.vue
View File

@@ -94,6 +94,7 @@ export default {
if (res.code === 200) {
this.dialogVisible = false
this.$message.success(this.$t('tip.syncSuccess'))
this.$emit('getTableData')
} else {
this.$message.error(res.msg)
}

2
nezha-fronted/src/components/common/detailView/nzDetailView.vue
View File

@@ -94,7 +94,7 @@
ref="diagnosisTab"
:diagnosisTabData ="diagnosisTabData"
></diagnosis-tab>
<config-sync ref="configSync" type="single" :from="triggerFrom" :batch-objs="syncObj"></config-sync>
<config-sync ref="configSync" type="single" :from="triggerFrom" :batch-objs="syncObj" @getTableData="getTableData"></config-sync>
</div>
</template>

2
nezha-fronted/src/components/common/table/nzDataList.vue
View File

@@ -116,7 +116,7 @@
ref="diagnosisTab"
:diagnosisTabData ="diagnosisTabData"
></diagnosis-tab>
<config-sync ref="configSync" type="single" :from="triggerFrom" :batch-objs="syncObj"></config-sync>
<config-sync ref="configSync" type="single" :from="triggerFrom" :batch-objs="syncObj" @getTableData="getTableData"></config-sync>
</div>
</template>

2
nezha-fronted/src/components/page/config/agent.vue
View File

@@ -68,7 +68,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="half-form-item">
<el-form-item class="half-form-item" style="width: 300px">
<button :class="{'nz-btn-disabled':downloadAgentFlag}" :disabled="downloadAgentFlag" class="nz-btn nz-btn-size-normal nz-btn-style-normal" type="button" @click="downloadAgent">{{$t('overall.download')}}</button>
<span class="downloading" v-if="downloadAgentFlag">{{$t('overall.downloading')}}</span>
</el-form-item>

22
nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
View File

@@ -4405,7 +4405,27 @@ export default {
nullType: 'null',
legend: { placement: 'bottom', values: [], show: true },
thresholdShow: true,
thresholds: [{ value: undefined, color: '#eeeeeeff' }]
thresholds: [{ value: undefined, color: '#eeeeeeff' }],
showHeader: 1,
visibility: {
varName: '',
operator: 'equal',
varValue: '',
result: 'show'
},
rightYAxis: {
elementNames: [],
style: 'line',
unit: 2,
label: '',
min: undefined,
max: undefined
},
dataLink: [],
option: {
lineWidth: 1,
pointSize: 6
}
},
elements: [],
panel: '',

18
nezha-fronted/src/components/page/dashboard/overview/chart.vue
View File

@@ -533,7 +533,7 @@ export default {
params.forEach((item, i) => {
const alias = this.queryAlias(item.seriesIndex)
if (i === 0 && alias.indexOf('Previous ') === -1) {
const value = item.data[0]
const value = item.value[0]
str += '<div class="tooltip-title" style="margin-bottom: 5px">'
str += bus.timeFormate(bus.computeTimezone(value))
str += '</div>'
@@ -542,13 +542,13 @@ export default {
if (i !== 0) {
str += '<div style="border:1px dashed #333;width:100%;margin-top: 5px"></div>'
}
const value = item.data[0] - this.minusTime
const value = item.value[0] - this.minusTime
str += bus.timeFormate(bus.computeTimezone(value))
minusFlag = false
}
showFlag = showFlag || item.data[1]
if (!isNaN(item.data[1] + '')) {
const val = Number(item.data[1])
showFlag = showFlag || item.value[1]
if (!isNaN(item.value[1] + '')) {
const val = Number(item.value[1])
str += `<div class="${(this.tooltip.activeIndex == item.seriesIndex) ? 'tooltip__row highlight' : 'tooltip__row'}">`
str += `<div class="row__label">
<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span>
@@ -565,7 +565,7 @@ export default {
const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName)
if (previousItem) {
str += '<span style="padding-left: 10px; display: inline-block;width: 65px;text-align: right;box-sizing: border-box;padding-right: 10px">'
const previousval = formatScientificNotation(previousItem.data[1], dot)
const previousval = formatScientificNotation(previousItem.value[1], dot)
let minusVal = 0
if (previousval <= val) {
minusVal = val - previousval
@@ -759,16 +759,16 @@ export default {
}
const seriesName = nameArr.join('-')
// title
const value = bus.computeTimezone(params.data[0])
const value = bus.computeTimezone(params.value[0])
const tData = new Date(value)
// value
let paramsDot = bus.countDecimals(params.data[1])
let paramsDot = bus.countDecimals(params.value[1])
if (paramsDot < this.chartDot) {
paramsDot = this.chartDot
} else if (paramsDot > 6) {
paramsDot = 6
}
const val = formatScientificNotation(params.data[1], paramsDot)
const val = formatScientificNotation(params.value[1], paramsDot)
const color = this.colors[params.seriesIndex]
this.tooltip.tooltipHtml = `
<div class="nz-chart__tooltip">