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

fix: 修复terminal窗口resize的bug等

Browse Source
This commit is contained in:
陈劲松
2020-10-15 19:28:43 +08:00
committed by chenjinsong
parent e80994e9d4
commit 1d0c8646f1
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nezha-fronted/src/components/cli/webSSH.vue
View File

@@ -191,9 +191,9 @@
isFullScreen:false, isFullScreen:false,
closeConfirmShow:false, closeConfirmShow:false,
closeRemember:false, closeRemember:false,
initConsoleHeight:300,//只读,初始化高度 initConsoleHeight:250,//只读,初始化高度
consoleHeight:300,//console高度 consoleHeight:250,//console高度
resizeConsoleHeight: 300, //resize后的高度，用于记录最大化、最小化前的高度 resizeConsoleHeight: 250, //resize后的高度，用于记录最大化、最小化前的高度
currentTransform:0, currentTransform:0,
editableTabsValue: '-1',//当前显示的console editableTabsValue: '-1',//当前显示的console
currentIndex:'-1', currentIndex:'-1',
@@ -290,6 +290,7 @@
this.closeConfirmShow = true; this.closeConfirmShow = true;
} }
} }
document.querySelector(".sub-list").style.height = "";
}, },
cancleConfirm(){ cancleConfirm(){
this.closeConfirmShow = false; this.closeConfirmShow = false;

3
nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
View File

@@ -2,8 +2,7 @@
<span> <span>
<div class="sub-top-tools"> <div class="sub-top-tools">
<div class="sub-list-tabs"> <div class="sub-list-tabs">
<div class="sub-list-tab-title">{{$t("asset.dcName")}}：{{obj.name}}</div><div <div class="sub-list-tab-title">{{$t("config.dc.dcName")}}：{{obj.name}}</div><div
class="sub-list-tab" @click="changeTab('detail')">{{$t("overall.detail")}}</div><div
class="sub-list-tab sub-list-tab-active">{{$t("config.dc.cabinets")}}</div> class="sub-list-tab sub-list-tab-active">{{$t("config.dc.cabinets")}}</div>
</div> </div>
<div class="top-tool-right"> <div class="top-tool-right">

1
nezha-fronted/src/components/common/language/cn.js
View File

@@ -591,6 +591,7 @@ const cn = {
dc: { dc: {
dc: "数据中心", dc: "数据中心",
area: "地区", area: "地区",
dcName: 'DC名称',
selectArea: "选择地区", selectArea: "选择地区",
cabinetNum: "机柜数量", cabinetNum: "机柜数量",
assets: "资产", assets: "资产",

1
nezha-fronted/src/components/common/language/en.js
View File

@@ -567,6 +567,7 @@ const en = {
dc: { dc: {
dc: 'Data center', dc: 'Data center',
area: "Area", area: "Area",
dcName: 'DC name',
selectArea: 'Select area', selectArea: 'Select area',
cabinetNum: "Cabinet number", cabinetNum: "Cabinet number",
assets: "Assets", assets: "Assets",

2
nezha-fronted/src/components/page/config/dc.vue
View File

@@ -108,11 +108,11 @@
<div class="pagination-bottom" v-show="!bottomBox.showSubList"> <div class="pagination-bottom" v-show="!bottomBox.showSubList">
<Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination> <Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
</div> </div>
</div>
<transition name="el-zoom-in-bottom"> <transition name="el-zoom-in-bottom">
<bottom-box v-if="bottomBox.showSubList" :sub-resize-show="bottomBox.subResizeShow" :obj="bottomBox.dc" :is-full-screen="bottomBox.isFullScreen" :from="'dc'" :target-tab.sync="bottomBox.targetTab" :detail="bottomBox.dcDetail" <bottom-box v-if="bottomBox.showSubList" :sub-resize-show="bottomBox.subResizeShow" :obj="bottomBox.dc" :is-full-screen="bottomBox.isFullScreen" :from="'dc'" :target-tab.sync="bottomBox.targetTab" :detail="bottomBox.dcDetail"
@closeSubList="bottomBox.showSubList = false" @fullScreen="fullScreen" @exitFullScreen="exitFullScreen" @listResize="listResize" ></bottom-box> @closeSubList="bottomBox.showSubList = false" @fullScreen="fullScreen" @exitFullScreen="exitFullScreen" @listResize="listResize" ></bottom-box>
</transition> </transition>
</div>
<!--dc table end--> <!--dc table end-->
<transition name="right-box"> <transition name="right-box">
<dc-box @close="closeDcBox" :dc="dc" :user-data="userData" @reload="getTableData" v-if="rightBox.dc.show"></dc-box> <dc-box @close="closeDcBox" :dc="dc" :user-data="userData" @reload="getTableData" v-if="rightBox.dc.show"></dc-box>