Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8

This commit is contained in:
zyh
2023-07-10 11:16:44 +08:00
2 changed files with 3 additions and 4 deletions

View File

@@ -362,6 +362,8 @@
#commentBottomTab {
.sub-container .nz-table-list {
height: 100%;
overflow-y: auto;
padding-bottom: 0 !important;
}
.textarea-box {
overflow: hidden;
@@ -373,9 +375,6 @@
border: 1px solid $--border-color-light;
box-sizing: border-box;
}
.textarea-big.el-textarea {
height: calc(100% - 40px) !important;
}
textarea.el-textarea__inner {
height: 100%;
border-color: transparent;

View File

@@ -29,7 +29,7 @@
</div>
</rich-text-editor>
</div>
<div :style="{height: rowBox ?'calc(100% - 184px)':'calc(100% - 35px)'}">
<div style="height:calc(100% - 45px)">
<assetCommentTable
ref="dataTable"
:orderByFa="'id'"