gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

Browse Source
This commit is contained in:
zhangyu
2022-07-25 13:59:05 +08:00
parent 108496231d 9a9dc50938
commit 36cc3487e0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/assets/css/common/tableCommon.scss
View File

@@ -340,12 +340,12 @@
} }
/* start--覆盖el-table边框、gutter等样式 */ /* start--覆盖el-table边框、gutter等样式 */
.el-table__body-wrapper { .el-table__body-wrapper {
overflow: auto; //overflow: auto;
background-color: $--table-body-background-color; background-color: $--table-body-background-color;
height: calc(100% - 42px) !important; //height: calc(100% - 42px) !important;
} }
.el-table__fixed-body-wrapper { .el-table__fixed-body-wrapper {
top: 42px !important; //top: 42px !important;
} }
.el-table__body-wrapper, .el-table__fixed-body-wrapper { .el-table__body-wrapper, .el-table__fixed-body-wrapper {
box-shadow: 1px 0 $--border-color-light; box-shadow: 1px 0 $--border-color-light;

1
nezha-fronted/src/components/common/table/asset/assetTable.vue
View File

@@ -142,7 +142,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
:resizable="false"
v-if="showOption" v-if="showOption"
:width="operationWidth" :width="operationWidth"
fixed="right"> fixed="right">