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

fix：修改 黑暗主题下 ping trace样式的问题 以及chart-line 最大值为负数的问题

Browse Source
This commit is contained in:
zhangyu
2022-05-31 17:31:32 +08:00
parent 3959695a7c
commit 62adfbdc58
18 changed files with 113 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/assets/css/common.scss
View File

@@ -415,3 +415,9 @@ td .nz-icon-gear:before{
input, textarea {
font-family: Inter-Regular !important;
}
.message-next{
vertical-align: bottom;
float: unset;
font-size: 10px;
margin-left: 190px;
}

4
nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss
View File

@@ -217,3 +217,7 @@
.fz12{
font-size: 12px;
}
.el-skeleton__item{
//background-color: $--background-color-disabled !important;
//background-image: unset !important;
}

2
nezha-fronted/src/assets/css/components/page/config/profile.scss
View File

@@ -225,7 +225,7 @@
}
.list-page.profile-right {
width: calc(100% - 370px);
padding: 0px 0px 7px 0px;
padding: 0;
pxbox-shadow: 0 1px 2px 0 rgba(0,0,0,0.06);
border-radius: 2px;
.nz-table2 {

9
nezha-fronted/src/assets/css/components/page/tool/ping.scss
View File

@@ -251,6 +251,7 @@
}
.right-content-box{
width: 380px;
color: $--color-text-primary;
}
.tools-header-right-content{
margin-left: 30px;
@@ -410,3 +411,11 @@
}
}
td.el-table__expanded-cell {
padding: 0 0 0 60px;
background-color: $--popover-background-color !important;
}
td.el-table__expanded-cell:hover {
padding: 0 0 0 60px;
background-color: $--background-color-base !important;
}

2
nezha-fronted/src/assets/css/themes/theme-dark.scss
View File

@@ -253,7 +253,7 @@ $--right-box-sub-title-border-color: $--border-color-light;
$--tooltip-background-color: #222329;
$--tooltip-border-color: rgba(112,116,122,0.6);
/* 17.label*/
$--label-background-color: #18171D;
$--label-background-color: $--background-color-empty;
/*** themes/common.scss是与主题切换无关的变量 ***/
@import './src/common/var.scss';

8
nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
View File

@@ -158,11 +158,19 @@ export default {
minValue = valueSorted.length ? valueSorted[0][1] : 0
maxValue = valueSorted.length ? valueSorted[valueSorted.length - 1][1] : 0
const unit = chartDataFormat.getUnit(chartUnit)
minValue = minValue > 0 ? 0 : minValue
if (!isNaN(maxValue)) {
maxValue = Number(maxValue)
} else {
maxValue = 0
}
if (maxValue < 0) {
maxValue = Math.abs(maxValue)
}
if (Math.abs(minValue) > Math.abs(maxValue)) {
maxValue = Math.abs(minValue)
}
maxValue = maxValue - minValue
maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii) // 取最大值后 需要对其进行取整
let oldValue = maxValue
let dot = 0

12
nezha-fronted/src/components/chart/chart/legend.vue
View File

@@ -226,9 +226,21 @@ export default {
const chartUnit = chartInfo.unit ? chartInfo.unit : 2
const unit = chartDataFormat.getUnit(chartUnit)
minValue = minValue > 0 ? 0 : minValue
if (maxValue < 0) {
maxValue = Math.abs(maxValue)
}
if (Math.abs(minValue) > Math.abs(maxValue)) {
maxValue = Math.abs(minValue)
}
maxValue = maxValue - minValue
maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii)
let oldValue = maxValue
if (maxValue < 0) {
oldValue = Math.abs(maxValue)
}
if (minValue < 0) {
oldValue = Math.abs(maxValue - minValue)
}
let dot = 0
if (maxValue == 1) {
dot++

11
nezha-fronted/src/components/chart/chart/line-chart-block.vue
View File

@@ -2071,6 +2071,17 @@ export default {
const chartUnit = chartInfo.unit ? chartInfo.unit : 2
const unit = chartDataFormat.getUnit(chartUnit)
minValue = minValue > 0 ? 0 : minValue
if (!isNaN(maxValue)) {
maxValue = Number(maxValue)
} else {
maxValue = 0
}
if (maxValue < 0) {
maxValue = Math.abs(maxValue)
}
if (Math.abs(minValue) > Math.abs(maxValue)) {
maxValue = Math.abs(minValue)
}
maxValue = maxValue - minValue
maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii)
let oldValue = maxValue

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

@@ -11,7 +11,7 @@
<div class="global-search-content" v-if="!firstShow">
<div class="global-search-content-content" v-if="!isNoData">
<div class="global-search-content-left">
<el-skeleton :loading="loading" animated class="list">
<el-skeleton :loading="true" animated class="list">
<template slot="template">
<li
v-for="(item,index) in skeletonArr"

2
nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
View File

@@ -1,5 +1,5 @@
<template>
<el-skeleton style="height: 100%;width: 100%" :loading="loading || faLoading" animated>
<el-skeleton style="height: 100%;width: 100%" :loading="true" animated>
<template slot="template">
<div class="search-item-box">
<div class="search-item-title-icon">

31
nezha-fronted/src/components/common/mixin/editRigthBox.js
View File

@@ -1,7 +1,11 @@
export default {
data () {
return {
isEdit: false
isEdit: false,
messageParams: {
route: '',
params: {}
}
}
},
mounted () {
@@ -11,6 +15,31 @@ export default {
}
}
},
methods: {
messageShow (msg, route, params, showNext = false) {
this.messageParams.route = route
this.messageParams.params = params
this.$message({
duration: 2000,
dangerouslyUseHTMLString: true,
type: 'success',
message: `<div>${msg} <span id="assetAdd" class="message-next ${showNext ? '' : 'hidden'}">Next</span></div>`,
onClose: () => {
const assetAdd = document.getElementById('assetAdd')
assetAdd.removeEventListener('click', this.saveNext)
}
})
const assetAdd = document.getElementById('assetAdd')
assetAdd.addEventListener('click', this.saveNext)
},
saveNext () {
console.log(this.assetId)
this.$router.push({
path: this.messageParams.route,
query: this.messageParams.params
})
}
},
destroyed () {
window.onbeforeunload = null
}

10
nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
View File

@@ -433,7 +433,8 @@ export default {
})
}
}
}
},
assetId: ''
}
},
watch: {
@@ -686,6 +687,8 @@ export default {
})
},
save () {
const self = this
// console.log(123123132, self, 'params.id')
if (this.prevent_opt.save) { return }
this.prevent_opt.save = true
@@ -740,7 +743,7 @@ export default {
this.$put(this.url, params).then(res => {
this.prevent_opt.save = false
if (res.code === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, false)
this.esc(true)
} else {
this.$message.error(res.msg)
@@ -750,7 +753,7 @@ export default {
this.$post(this.url, params).then(res => {
this.prevent_opt.save = false
if (res.code === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, false)
this.esc(true)
} else {
this.$message.error(res.msg)
@@ -763,7 +766,6 @@ export default {
}
})
},
getStateData () {
return new Promise(resolve => {
this.$get('asset/stateConf?pageSize=-1').then(response => {

6
nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
View File

@@ -1107,7 +1107,7 @@ export default {
this.editEndpoint.moduleId = ''
this.editEndpoint.name = ''
this.editEndpoint.assetName = ''
this.editEndpoint.assetId = ''
// this.editEndpoint.assetId = ''
this.$refs.sp.remove()
this.$refs.moduleForm.clearValidate('moduleId')
}
@@ -1479,7 +1479,9 @@ export default {
}
},
mounted () {
setTimeout(() => {
this.editEndpoint.assetId = this.module.assetId + ''
}, 500)
},
created () {
this.getProjectList()

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

@@ -544,6 +544,17 @@ export default {
const chartUnit = chartInfo.unit ? chartInfo.unit : 2
const unit = chartDataFormat.getUnit(chartUnit)
minValue = minValue > 0 ? 0 : minValue
if (!isNaN(maxValue)) {
maxValue = Number(maxValue)
} else {
maxValue = 0
}
if (maxValue < 0) {
maxValue = Math.abs(maxValue)
}
if (Math.abs(minValue) > Math.abs(maxValue)) {
maxValue = Math.abs(minValue)
}
maxValue = maxValue - minValue
maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii)
let oldValue = maxValue

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

@@ -580,7 +580,6 @@ export default {
this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0' + '&pageSize=-1').then(response => {
if (response.code === 200) {
this.chartListLoading = false
// response = chartData
this.dataList = response.data.list.map(item => {
return {
...item,

7
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -875,6 +875,13 @@ export default {
this.initQueryFromPath(searchKeys)
},
mounted () {
if (this.$route.query && this.$route.query.assetId) {
this.object = {
...this.newObject(),
assetId: JSON.stringify(this.$route.query.assetId),
}
this.rightBox.show = true
}
if (localStorage.getItem('endpointProjectId')) {
this.selectValue.projectIds = [Number(localStorage.getItem('endpointProjectId'))]
// this.$refs.clickSearch.selectValueOut.projectIds = [localStorage.getItem('endpointProjectId')]

1
nezha-fronted/src/components/page/tool/ping.vue
View File

@@ -208,7 +208,6 @@ export default {
}
if (event.path[0].className === 'ti-input') {
const tiInputBox = document.getElementsByClassName('ti-new-tag-input')[0]
console.log(tiInputBox)
tiInputBox.focus()
}
})

1
nezha-fronted/src/components/page/tool/trace.vue
View File

@@ -209,7 +209,6 @@ export default {
}
if (event.path[0].className === 'ti-input') {
const tiInputBox = document.getElementsByClassName('ti-new-tag-input')[0]
console.log(tiInputBox)
tiInputBox.focus()
}
})