diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index 5550ce42a..810277dbb 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -364,11 +364,14 @@ height: 100%; } .textarea-box { + overflow: hidden; + resize: vertical; // border: 1px solid $--border-color-light; background-color: $--background-color-empty; .textarea-small.el-textarea { height: 100% !important; border: 1px solid $--border-color-light; + box-sizing: border-box; } .textarea-big.el-textarea { height: calc(100% - 40px) !important; @@ -385,6 +388,7 @@ border: 1px solid $--border-color-light; display: flex; flex-direction: column; + box-sizing: border-box; .ql-toolbar.ql-snow { border-top: unset !important; border-left: unset !important; @@ -496,3 +500,11 @@ bottom: 5px; } } +.resize-rich-text-editor-table { + .el-table--border td:first-child .cell { + padding-right: 20px; + } + .el-table__body-wrapper { + overflow-x: hidden; + } +} diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index 39a200c6c..5fcc15987 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -343,12 +343,13 @@ export default { type: 'warning' }).then(() => { let url = '' - if (this.from === fromRoute.alertSilence) { - this.alertSilenceUrl = `/alert/silence/${this.obj.id}/rel` - url = this.alertSilenceUrl - } else { - url = this.url - } + // if (this.from === fromRoute.alertSilence) { + // this.alertSilenceUrl = `/alert/silence/${this.obj.id}/rel` + // url = this.alertSilenceUrl + // } else { + // url = this.url + // } + url = this.url this.$delete(url + '?ids=' + row.id + '&state=' + row.state).then(response => { if (response.code === 200) { self.delFlag = true diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue index a59f665ff..b4ea37c9d 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue @@ -14,7 +14,7 @@ >