NEZ-339 feat:新增修改黑窗口文字大小,style:修改黑窗口底部在有的分辨率下显示不了最后一行

This commit is contained in:
zhangyu
2020-06-28 10:09:48 +08:00
parent b9828c8b47
commit 82f78599bf
3 changed files with 61 additions and 19 deletions

View File

@@ -3,6 +3,7 @@
height:270px; height:270px;
padding:5px 5px; padding:5px 5px;
background-color: black; background-color: black;
position: relative;
} }
</style> </style>
<template> <template>
@@ -300,6 +301,29 @@ export default {
} }
this.conFinish = false; this.conFinish = false;
}, },
setFontSize(fontSize){
this.term.setOption('fontSize',fontSize);
const consoleBox = document.getElementById('ternimalContainer'+this.idIndex);
let width = document.body.clientWidth;//可视宽度
let height = parseInt(consoleBox.style.height);
if(height==null||!height){height=this.termimalHeight;}
const winStyle={
width:width,
height:height,
cols:this.term.cols,//cols和rows在resizeConsole方法已经设置
rows:this.term.rows,
};
alert(JSON.stringify(winStyle));
this.$post('terminal/resize',winStyle).then(response => {
if (response.code === 200) {
this.term.fit();
//this.term.scrollToBottom();
} else {
this.$message.error(response.msg);
}
});
// console.log(winStyle)
}
}, },
mounted () { mounted () {
this.create(); this.create();

View File

@@ -3,7 +3,7 @@
width: 100%; width: 100%;
left: 0; left: 0;
position: fixed; position: fixed;
bottom: 0; bottom: 20px;
background: #fff; background: #fff;
z-index: 2000; z-index: 2000;
height: 300px; height: 300px;
@@ -142,6 +142,18 @@
background: black !important; background: black !important;
} }
.fontSet{
margin-left: 5px;
}
.smallFont{
font-size: 12px;
}
.middleFont{
font-size: 15px;
}
.bigFont{
font-size: 20px;
}
/*-------*/ /*-------*/
.dailog-custom{ .dailog-custom{
width:100%; width:100%;

View File

@@ -6,24 +6,23 @@
<div id="shell-service-resize-mask"></div> <div id="shell-service-resize-mask"></div>
<div id="shell-split" class="shell-split shell-iconfont" @mousedown="dragEagle" v-show="!isFullScreen"></div> <div id="shell-split" class="shell-split shell-iconfont" @mousedown="dragEagle" v-show="!isFullScreen"></div>
<div style='position: relative;'> <div style='position: relative;'>
<el-menu mode="horizontal" @select="handleSelect" style='position: absolute;left:0px;top:0px;border-top: 1px solid #DCDFE6;'> <el-menu mode="horizontal" @select="handleSelect" style='position: absolute;left:0px;top:0px;border-top: 1px solid #DCDFE6;' default-active="1-2">
<!--
<el-submenu index="1" style="width:40px;"> <el-submenu index="1" style="width:40px;">
<template slot="title" ><i class="el-icon-setting " style="position: absolute;left: 10px;top: 4px;"></i></template> <template slot="title" ><i class="el-icon-setting " style="position: absolute;left: 10px;top: 4px;"></i></template>
<el-submenu index="1-1"> <!--<el-submenu index="1-1">-->
<template slot="title">文字大小</template> <!--<template slot="title">文字大小</template>-->
<el-menu-item index="1-1-1">最小</el-menu-item> <el-menu-item @click="changeFontSize(12)" class="fontSet smallFont" index="1-1">A</el-menu-item>
<el-menu-item index="1-1-2"></el-menu-item> <el-menu-item @click="changeFontSize(15)" class="fontSet middleFont" index="1-2">A</el-menu-item>
<el-menu-item index="1-1-3"></el-menu-item> <el-menu-item @click="changeFontSize(20)" class="fontSet bigFont" index="1-3">A</el-menu-item>
<el-menu-item index="1-1-4"></el-menu-item> <!--<el-menu-item class="fontSet" index="1-4"></el-menu-item>-->
<!--</el-submenu>-->
<!--<el-submenu index="1-2" >-->
<!--<template slot="title">字体</template>-->
<!--<el-menu-item index="1-2-1">Monosapace</el-menu-item>-->
<!--<el-menu-item index="1-2-2">Courier New</el-menu-item>-->
<!--</el-submenu>-->
</el-submenu> </el-submenu>
<el-submenu index="1-2" > <el-submenu index="2" style="width:50px;">
<template slot="title">字体</template>
<el-menu-item index="1-2-1">Monosapace</el-menu-item>
<el-menu-item index="1-2-2">Courier New</el-menu-item>
</el-submenu>
</el-submenu>-->
<el-submenu index="2" style="width:50px;margin-left:40px;">
<template slot="title" ><i class="el-icon-upload console-title-icon" style="position: absolute;left: 10px;top: 4px;"></i></template> <template slot="title" ><i class="el-icon-upload console-title-icon" style="position: absolute;left: 10px;top: 4px;"></i></template>
<el-menu-item index="2-1" @click="showUploadBox"> <el-menu-item index="2-1" @click="showUploadBox">
<div>{{$t('webshell.upload')}}</div> <div>{{$t('webshell.upload')}}</div>
@@ -518,7 +517,7 @@
targetDiv.style.height=height+'px'; targetDiv.style.height=height+'px';
} }
if(parseInt(targetDiv.style.height)<=10){ if(parseInt(targetDiv.style.height)<=10){
targetDiv.style.height=10+'px'; targetDiv.style.height=20+'px';
} }
_this.editableTabs.forEach((tab, index) => { _this.editableTabs.forEach((tab, index) => {
@@ -570,6 +569,13 @@
this.$refs['console'+index][0].resize(targetDivHeight,width); this.$refs['console'+index][0].resize(targetDivHeight,width);
}); });
} }
},
//改变黑窗口字体大小
changeFontSize(fontSize){
// this.$refs['console'+this.index].setFontSize(fontSize);
this.editableTabs.forEach((tab, index) => {
this.$refs['console'+index][0].setFontSize(fontSize);
});
} }
}, },
watch: { watch: {