Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

This commit is contained in:
liaofei 2023-04-24 17:23:42 +08:00
commit eec5bcafc2
2 changed files with 13 additions and 3 deletions

View File

@ -45,6 +45,11 @@
>
<vxe-table-column field="id" title="ID" tooltip min-width="70"></vxe-table-column>
<vxe-table-column field="menu_name" tree-node title="按钮名称" min-width="200"></vxe-table-column>
<vxe-table-column field="icon" title="图标" min-width="200" align="center">
<template v-slot="{ row }">
<Icon class="icon" :type="row.icon" />
</template>
</vxe-table-column>
<vxe-table-column field="api_url" title="接口路径" min-width="150">
<template v-slot="{ row }">
<span>{{ row.methods ? '[' + row.methods + '] ' + row.api_url : row.api_url }}</span>
@ -452,6 +457,9 @@ export default {
> .vxe-table--header-wrapper {
background: #fff !important;
}
.icon {
font-size: 20px;
}
}
.rule {

View File

@ -92,9 +92,9 @@
:icon="value.icon"
>
<div
:ref="'container_' + value.index"
ref="container"
:id="'container_' + value.index"
style="height: 100%; min-height: 560px"
style="height: 100%; min-height: calc(100vh - 110px)"
></div>
</TabPane>
</Tabs>
@ -571,7 +571,6 @@ export default {
.ivu-tabs-tabpane {
min-height: 560px;
height: 73vh;
margin-top: -1px;
}
}
@ -612,4 +611,7 @@ export default {
z-index: 99;
}
}
.file-box {
height: 100%;
}
</style>