diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue index d6dc457c4..da33cafe5 100644 --- a/nezha-fronted/src/components/chart/chart/chartTable.vue +++ b/nezha-fronted/src/components/chart/chart/chartTable.vue @@ -352,8 +352,12 @@ export default { // 本地正序 asce (prop) { return function (obj1, obj2) { - const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '') - const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '') + let val1 = obj1.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) { return -1 } else if (val1 > val2) { @@ -366,8 +370,12 @@ export default { // 本地倒序 desc (prop) { return function (obj1, obj2) { - const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '') - const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '') + let val1 = obj1.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) { return -1 } else if (val1 > val2) { diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue index ee36a8c42..6881ef4fb 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue @@ -580,9 +580,9 @@ export default { if (!obj.param.visibility) { obj.param.visibility = { varName: '', - operator: '', + operator: 'equal', varValue: '', - result: '' + result: 'show' } } if (obj.type === 'group' && !obj.param.repeat) {