From 5e8964932ff518c471be30b5a1e25424e03114b7 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 3 Mar 2022 17:35:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=8E=92=E5=BA=8F=20=E6=97=A0=E6=B3=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E9=80=89=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/bottomBox/tabs/alertMessageTabNew.vue | 2 ++ .../src/components/common/bottomBox/tabs/alertRuleEvalLog.vue | 2 ++ .../src/components/common/bottomBox/tabs/assetSubTab.vue | 2 ++ nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue | 2 ++ .../src/components/common/bottomBox/tabs/cabinetTab.vue | 2 ++ .../src/components/common/bottomBox/tabs/endpointTabNew.vue | 2 ++ .../src/components/common/bottomBox/tabs/operationLogTab.vue | 2 ++ .../src/components/common/bottomBox/tabs/terminalLogTab.vue | 2 ++ nezha-fronted/src/components/page/alert/alertMessage.vue | 2 ++ nezha-fronted/src/components/page/alert/alertRule.vue | 2 ++ nezha-fronted/src/components/page/alert/alertSilence.vue | 2 ++ nezha-fronted/src/components/page/config/assetMeta.vue | 2 ++ nezha-fronted/src/components/page/config/assetState.vue | 2 ++ nezha-fronted/src/components/page/config/operationRecord.vue | 2 ++ nezha-fronted/src/components/page/config/template/chartTemp.vue | 2 ++ nezha-fronted/src/components/page/config/terminalLog.vue | 2 ++ nezha-fronted/src/components/page/monitor/module/moduleList.vue | 2 ++ .../src/components/page/monitor/project/projectList.vue | 2 ++ 18 files changed, 36 insertions(+) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index 7ec3cc780..2f92405b1 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -293,6 +293,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue index 0e9c6fac7..1d62ec17c 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue @@ -92,6 +92,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', -1) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue index a984ca413..597061fbf 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue @@ -223,6 +223,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue index 0e62cb17b..e7068ba4c 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue @@ -226,6 +226,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue index bfe0a5a90..78276c433 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue @@ -135,6 +135,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue index 94127793a..1df5e606a 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue @@ -119,6 +119,8 @@ export default { getTableData () { if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } const params = { ...this.searchLabel, diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue index 24a3c8634..a509dc76f 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue @@ -125,6 +125,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue index 5425f4a13..f8102618a 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue @@ -129,6 +129,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index d4b523183..08722bf22 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -737,6 +737,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue index c6027a563..95b3a2b95 100644 --- a/nezha-fronted/src/components/page/alert/alertRule.vue +++ b/nezha-fronted/src/components/page/alert/alertRule.vue @@ -263,6 +263,8 @@ export default { getTableData () { if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue index 23a4ee30c..b27f88845 100644 --- a/nezha-fronted/src/components/page/alert/alertSilence.vue +++ b/nezha-fronted/src/components/page/alert/alertSilence.vue @@ -168,6 +168,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue index 30098f3b1..4edd0f974 100644 --- a/nezha-fronted/src/components/page/config/assetMeta.vue +++ b/nezha-fronted/src/components/page/config/assetMeta.vue @@ -185,6 +185,8 @@ export default { getTableData () { if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/config/assetState.vue b/nezha-fronted/src/components/page/config/assetState.vue index 73f9557d7..d843f3fba 100644 --- a/nezha-fronted/src/components/page/config/assetState.vue +++ b/nezha-fronted/src/components/page/config/assetState.vue @@ -197,6 +197,8 @@ export default { getTableData () { if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/config/operationRecord.vue b/nezha-fronted/src/components/page/config/operationRecord.vue index e7773b73a..a68c3874e 100644 --- a/nezha-fronted/src/components/page/config/operationRecord.vue +++ b/nezha-fronted/src/components/page/config/operationRecord.vue @@ -116,6 +116,8 @@ export default { getTableData () { if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue index 8f80ede8f..0317e4b58 100644 --- a/nezha-fronted/src/components/page/config/template/chartTemp.vue +++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue @@ -275,6 +275,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue index 4e06f3c4a..a5d734e4b 100644 --- a/nezha-fronted/src/components/page/config/terminalLog.vue +++ b/nezha-fronted/src/components/page/config/terminalLog.vue @@ -170,6 +170,8 @@ export default { getTableData () { if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } const params = { ...this.searchLabel, diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue index 0367dc179..e1082e84a 100644 --- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue +++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue @@ -385,6 +385,8 @@ export default { getTableData () { if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue index 0bb29ef11..e53c347de 100644 --- a/nezha-fronted/src/components/page/monitor/project/projectList.vue +++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue @@ -128,6 +128,8 @@ export default { } if (this.orderBy) { this.$set(this.searchLabel, 'orderBy', this.orderBy) + } else { + delete this.searchLabel.orderBy } this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)