From 850f8d0f8101f24a2a1112a8f4a4c684fd02ed50 Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 21 Jun 2023 13:41:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?NEZ-2899=20fix=EF=BC=9ARecord=20rules?= =?UTF-8?q?=E5=A4=8D=E5=88=B6Name=E8=BF=87=E9=95=BF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=85=85=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/mixin/dataList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index e1397491d..88ec1d1e6 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -237,7 +237,7 @@ export default { this.object = { ...u, name: u.name + copyName, id: '' } if (this.object.name.length > 64) { const length = this.object.name.length - 64 - this.object.name = u.name.substring(0, u.name.length - length) + '-copy' + this.object.name = u.name.substring(0, u.name.length - length) + copyName } this.rightBox.show = true }, From 85b3c020e1d0d648b3bf4e72890a2dd6bf0141d5 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 21 Jun 2023 13:56:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?NEZ-2886=20fix=EF=BC=9AAgents=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=EF=BC=8C=E9=A6=96=E6=AC=A1=E9=80=89=E6=8B=A9?= =?UTF-8?q?Data=20center=E4=B8=8B=E6=8B=89=E6=A1=86=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E9=97=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/project/meta2d/js/meta2dMainCalc.js | 3 +-- nezha-fronted/src/components/common/rightBox/agentBox.vue | 2 +- nezha-fronted/src/components/common/rightBox/dcBox.vue | 2 +- nezha-fronted/src/components/common/rightBox/panelBox.vue | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index ecf6e908c..b0db2552b 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -346,7 +346,6 @@ export default { if (!positionShow) { return } - console.log(pen) this.chartParams = { ...pen.data.tooltip, unit: this.params.unit, @@ -366,7 +365,7 @@ export default { } else { this.position.left = ePosition.layerX - 20 - 400 } - if (boxHeight > (ePosition.layerY + 300)) { + if (boxHeight / 2 > ePosition.layerY) { this.position.top = ePosition.layerY + 50 } else { this.position.top = ePosition.layerY - 300 diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue index 61c221fb1..b9ce5a1a5 100644 --- a/nezha-fronted/src/components/common/rightBox/agentBox.vue +++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue @@ -19,7 +19,7 @@
- + {{item.name}} diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 8aea862ca..72ce7aba8 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -21,7 +21,7 @@ - + {{item.name}}@{{item.username}} diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue index f22c81c4d..5f501c4d8 100644 --- a/nezha-fronted/src/components/common/rightBox/panelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue @@ -43,7 +43,7 @@ - + @@ -53,7 +53,7 @@ - + - + + v-model="editPanel.param.report.receivers" clearable multiple placeholder="" popper-class="right-box-select-top prevent-clickoutside right-box-select-width" size="small" value-key="chartType"> Date: Wed, 21 Jun 2023 14:04:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Del-message?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 6fdf27dfc..8ca66f298 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -673,9 +673,6 @@ textarea { .el-dialog__header{ position: relative; } -.el-message__content{ - white-space:pre-line -} .response__popper { max-height: 500px; overflow: hidden; From c115dcdffe9343357a2b2a29e88db033ec3089bc Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 21 Jun 2023 14:06:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?NEZ-2904=20style=EF=BC=9AAsset=20list-Dashb?= =?UTF-8?q?oard=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E5=9C=A8Apply=20time=20range=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=B8=8A=EF=BC=8C=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/css/components/common/bottomBox/dashboardTab.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss index 4255bd244..ebcfdc662 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss @@ -175,7 +175,7 @@ } .el-button--primary:hover{ color: $--color-text-label2; - background-color: $--color-primary; + background-color: $--color-primary !important; border-color: $--color-primary; } }