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

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

Browse Source
This commit is contained in:
zhangyu
2023-06-14 17:17:28 +08:00
parent 7adada6348 a9c59468f9
commit 34e5274cd3
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nezha-fronted/src/components/chart/chart/chartTable.vue
View File

@@ -352,8 +352,12 @@ export default {
// 本地正序 // 本地正序
asce (prop) { asce (prop) {
return function (obj1, obj2) { return function (obj1, obj2) {
const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '') let val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '') let val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
if (!isNaN(val1) && !isNaN(val2)) {
val1 = Number(val1)
val2 = Number(val2)
}
if (val1 < val2) { if (val1 < val2) {
return -1 return -1
} else if (val1 > val2) { } else if (val1 > val2) {
@@ -366,8 +370,12 @@ export default {
// 本地倒序 // 本地倒序
desc (prop) { desc (prop) {
return function (obj1, obj2) { return function (obj1, obj2) {
const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '') let val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '') let val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
if (!isNaN(val1) && !isNaN(val2)) {
val1 = Number(val1)
val2 = Number(val2)
}
if (val1 < val2) { if (val1 < val2) {
return -1 return -1
} else if (val1 > val2) { } else if (val1 > val2) {

4
nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
View File

@@ -580,9 +580,9 @@ export default {
if (!obj.param.visibility) { if (!obj.param.visibility) {
obj.param.visibility = { obj.param.visibility = {
varName: '', varName: '',
operator: '', operator: 'equal',
varValue: '', varValue: '',
result: '' result: 'show'
} }
} }
if (obj.type === 'group' && !obj.param.repeat) { if (obj.type === 'group' && !obj.param.repeat) {