fix: adjust some css style

This commit is contained in:
buqiyuan 2022-08-04 17:23:20 +08:00
parent efc43a6a50
commit db35cc4e29
4 changed files with 28 additions and 22 deletions

View File

@ -312,7 +312,9 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy {
const groupApiData: GroupApiDataModel = { group: [], api: [] };
if (children?.length) {
const targetIndex = children.findIndex((n) => n.key === dragNode.key);
// console.log('targetIndex', targetIndex);
// console.log('children', children);
// console.log('dragNode', dragNode);
if (targetIndex === dragNode.origin.weight) {
return;
}

View File

@ -1,29 +1,20 @@
<eo-navbar></eo-navbar>
<div [style.--remote-notification-height]="isShowNotification && electron.isElectron ? '50px' : '0px'">
<div class="page-body"
[style.--remote-notification-height]="isShowNotification && electron.isElectron ? '50px' : '0px'">
<div *ngIf="isShowNotification && electron.isElectron" class="remote-notification">
<i nz-icon [nzType]="isRemote ? 'cloud' : 'exclamation-circle'" nzTheme="outline" class="text-[13px] mr-[2px]"></i>
<span i18n>Current data storage exists{{ dataSourceText }},please switch if you want to collaborate</span>
<a class="eo-blod" (click)="switchDataSource()" i18n>{{ isRemote ? 'Remote Server' : 'Localhost' }} Data Storage</a>
<i
nz-icon
nzType="close"
nzTheme="outline"
class="absolute right-[20px] cursor-pointer"
(click)="closeNotification()"
></i>
<i nz-icon nzType="close" nzTheme="outline" class="absolute right-[20px] cursor-pointer"
(click)="closeNotification()"></i>
</div>
<div class="home_container f_row">
<eo-setting></eo-setting>
<eo-sidebar></eo-sidebar>
<div class="home fg1">
<router-outlet *ngIf="!loadedIframe"></router-outlet>
<iframe
*ngIf="!this.sidebar.currentModule.isOffical"
id="app_iframe"
frameborder="no"
border="0"
style="width: calc(100vw - 90px); height: calc(100vh - var(--NAVBAR_HEIGHT) - 4px)"
></iframe>
<iframe *ngIf="!this.sidebar.currentModule.isOffical" id="app_iframe" frameborder="no" border="0"
style="width: calc(100vw - 90px); height: calc(100vh - var(--NAVBAR_HEIGHT) - 4px)"></iframe>
</div>
</div>
</div>

View File

@ -1,5 +1,17 @@
:host {
--body-height: calc(100vh - var(--NAV_TOP) - var(--FOOTER_HEIGHT) - var(--remote-notification-height, 0px));
display: flex;
flex-direction: column;
height: 100vh;
overflow: hidden;
}
.page-body {
height: var(--body-height);
}
.home_container {
height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--remote-notification-height, 0px) - 1px);
// height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--remote-notification-height, 0px) - 1px);
}
.home {
background-color: var(--MAIN_BG);
@ -18,7 +30,7 @@
eo-api {
router-outlet + * {
display: block;
height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--FOOTER_HEIGHT) - var(--remote-notification-height) - 46px);
height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--FOOTER_HEIGHT) - var(--remote-notification-height) - 74px);
overflow: auto;
}
router-outlet + eo-api-test {
@ -35,7 +47,7 @@
router-outlet + * {
display: block;
height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--FOOTER_HEIGHT) - var(--remote-notification-height));
// overflow: auto;
overflow: auto;
}
}
}

View File

@ -1,6 +1,7 @@
:host {
z-index: 10;
}
.app_toolbar {
position: fixed;
bottom: 0;
height: var(--FOOTER_HEIGHT);
border-top-width: 1px;
border-top-style: solid;
@ -16,4 +17,4 @@
}
.iconfont{
line-height: 22px;
}
}