diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 1dc441afa..7274234d4 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -699,9 +699,6 @@ i.nz-icon-override{ .el-dialog__header{ position: relative; } -.el-message__content{ - white-space:pre-line -} .response__popper { max-height: 500px; overflow: hidden; 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; } } diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 9dec0b5cb..355800dee 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -238,7 +238,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 }, 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 8da8b4c93..338344053 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -370,7 +370,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 78058ead7..117a02f82 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">