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

fix：terminal 样式不生效的问题

Browse Source
This commit is contained in:
zhangyu
2022-12-22 11:37:01 +08:00
parent e185c8dcae
commit b0a1aa7b1a
14 changed files with 382 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

666
nezha-fronted/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
nezha-fronted/src/assets/css/common/rightBoxCommon.scss
View File

@@ -359,7 +359,7 @@
letter-spacing: 0;
font-weight: 600;
}
/deep/ .el-radio-group{
.el-radio-group{
flex: 1;
.el-radio-button--small {
width: 142px;

3
nezha-fronted/src/assets/css/components/cli/fileDirectory.scss
View File

@@ -96,7 +96,6 @@
background: $--background-color-2;
width: calc(100% - 22px);
color: $--color-text-regular;
> div{text-transform:capitalize};
}
.file-name{
width: 44%;
@@ -136,7 +135,7 @@
display: flex;flex-direction: column;align-items: center;margin-left: 7px
}
.nz-arrow-up{
margin-bottom: 5px;
margin-bottom: 2px;
}
.nz-arrow-up.is-select{
border-bottom:5px solid $--color-primary; /* 定义底部颜色 */

2
nezha-fronted/src/assets/css/components/cli/fileListState.scss
View File

@@ -30,7 +30,6 @@
line-height: 48px;
display: flex;
justify-content: space-between;
text-transform: capitalize;
> i {
color: $--color-text-primary;
}
@@ -39,7 +38,6 @@
font-size: 14px;
letter-spacing: 0;
font-weight: 500;
text-transform: capitalize;
color: $--color-text-primary;
}
.file-state-panel-content {

2
nezha-fronted/src/assets/css/components/cli/webSSH.scss
View File

@@ -161,7 +161,7 @@
border: 1px solid $--border-color-base;
border-right: none ;
}
/deep/ div.v-selectpage div.sp-input-container div.sp-base {
div.v-selectpage div.sp-input-container div.sp-base {
border-radius: 0 4px 4px 0;
}
.fontSet{

2
nezha-fronted/src/assets/css/components/cli/webSSHNew.scss
View File

@@ -3,7 +3,7 @@
background: $--background-color-base;
/*border-top: 1px solid #BEBEBE;*/
box-shadow: 0 1px 0 0 $--border-color-light;
/deep/ .el-tabs{
.el-tabs{
border: none;
height: 100%;
width:100%;

2
nezha-fronted/src/assets/css/components/common/labelFilter/clickSearch.scss
View File

@@ -50,7 +50,7 @@
padding: 0;
box-sizing: border-box;
/deep/ .el-checkbox__label {
.el-checkbox__label {
max-width: 150px;
text-overflow: ellipsis;
white-space: nowrap;

18
nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
View File

@@ -80,17 +80,17 @@
}
}
/deep/ .el-input--mini {
.el-input--mini {
input {
border: none;
}
}
/deep/ .el-input-number--mini {
.el-input-number--mini {
width: 111px;
}
/deep/ .el-input-number__decrease, /deep/ .el-input-number__increase {
.el-input-number__decrease, .el-input-number__increase {
border: none;
border-radius: 100%;
width: 16px;
@@ -99,11 +99,11 @@
margin-top: 6px;
}
/deep/ .el-input-number__decrease {
.el-input-number__decrease {
margin-left: 5px;
}
/deep/ .el-input-number__increase {
.el-input-number__increase {
margin-right: 5px;
}
}
@@ -141,20 +141,20 @@
.special-select .el-select.el-select--small {
width: 100%;
}
.special-select /deep/ .el-input.el-input--prefix.el-input--suffix, .line-width /deep/ .el-input.el-input--prefix.el-input--suffix {
.special-select .el-input.el-input--prefix.el-input--suffix, .line-width .el-input.el-input--prefix.el-input--suffix {
border: 1px solid $--border-color-base;
height: 28px;
}
.special-select /deep/ .el-input__inner, .line-width /deep/ .el-input__inner {
.special-select .el-input__inner, .line-width .el-input__inner {
display: none;
}
.special-select /deep/ .el-input__prefix, .line-width /deep/ .el-input__prefix {
.special-select .el-input__prefix, .line-width .el-input__prefix {
height: 28px;
line-height: 28px;
color: #899FB7;
width: 100%;
}
.special-select /deep/ .el-input__prefix > div {
.special-select .el-input__prefix > div {
width: 100%;
height: 100%;
}

2
nezha-fronted/src/assets/css/components/page/config/profile.scss
View File

@@ -303,7 +303,7 @@
font-weight: 400;
margin-top: 12px;
}
/deep/ .nz-dialog .el-dialog__body{
.nz-dialog .el-dialog__body{
padding-bottom: 0;
}
.verify-link{

6
nezha-fronted/src/assets/css/components/page/dashboard/chartBox.scss
View File

@@ -43,7 +43,7 @@
padding: 20px 0;
width: 100%;
border-bottom: 1px dashed $--border-color-base;
/deep/ .nz-icon-minus {
.nz-icon-minus {
padding: 0 4px;
}
}
@@ -91,10 +91,10 @@
left: 0;
z-index: 100;
}
/deep/ .el-color-picker{
.el-color-picker{
position: absolute;
}
.range /deep/ .el-color-picker{
.range .el-color-picker{
left: -17px;
}
.color-content{

2
nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
View File

@@ -99,7 +99,7 @@
.el-cascader-node {
padding: 0;
}
.el-cascader-menu:last-child .el-cascader-node, /deep/ .el-cascader-node__label {
.el-cascader-menu:last-child .el-cascader-node, .el-cascader-node__label {
padding: 0;
}
.metric-selector-title{

10
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -645,19 +645,19 @@ li {
position: absolute;
display: inline-block;
}
.right-box-form-left.right-box-form /deep/ .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:before{
.right-box-form-left.right-box-form .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:before{
display: none;
}
.right-box-form-left.right-box-form /deep/ .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:after{
.right-box-form-left.right-box-form .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:after{
content: "*";
color: #f56c6c;
margin-left: 4px;
}
.right-box-form-left.right-box-form /deep/ .el-form-item.required-marker:not(.is-no-asterisk) .el-form-item__label:before{
.right-box-form-left.right-box-form .el-form-item.required-marker:not(.is-no-asterisk) .el-form-item__label:before{
display: none;
}
.right-box-form-left.right-box-form /deep/ .el-form-item.required-marker:not(.is-no-asterisk) .el-form-item__label:after{
.right-box-form-left.right-box-form .el-form-item.required-marker:not(.is-no-asterisk) .el-form-item__label:after{
content: "*";
color: #f56c6c;
margin-left: 4px;
@@ -1471,7 +1471,7 @@ li {
.tag-edit-box-body {
display: flex;
box-sizing: border-box;
/deep/ .el-autocomplete{
.el-autocomplete{
width: 100%;
}
.tag-edit {

29
nezha-fronted/src/components/cli/fileDirectory.vue
View File

@@ -23,7 +23,7 @@
</el-input>
</span>
<div class="path-option">
<span style="margin-right: 5px">Show hide File: </span>
<span style="margin-right: 5px">{{$t('terminal.showFile')}}: </span>
<el-switch v-model="showHideFile"/>
<i class="nz-icon nz-icon-a-newfolder" @click="newFolderBoxShow = true"></i>
<i class="nz-icon nz-icon-upload" @click="uploadFile"></i>
@@ -408,13 +408,13 @@ export default {
this.editPath = ''
this.breadcrumb = res.data.path.split('/').filter(item => item)
if (this.nameOrderType) {
this.orderBy('nameOrderType',this.nameOrderType , 'name')
this.orderBy('nameOrderType', this.nameOrderType, 'name')
}
if (this.sizeOrderType) {
this.orderBy('sizeOrderType',this.sizeOrderType , 'size')
this.orderBy('sizeOrderType', this.sizeOrderType, 'size')
}
if (this.dateOrderType) {
this.orderBy('dateOrderType',this.dateOrderType , 'cts')
this.orderBy('dateOrderType', this.dateOrderType, 'cts')
}
} else {
this.$message.error(res.msg)
@@ -554,18 +554,32 @@ export default {
}
return '-'
},
resetState (type) {
if (type == 'sizeOrderType') {
this.dateOrderType = 0
this.nameOrderType = 0
}
if (type == 'dateOrderType') {
this.sizeOrderType = 0
this.nameOrderType = 0
}
if (type == 'nameOrderType') {
this.sizeOrderType = 0
this.dateOrderType = 0
}
},
orderBy (key, type, order) {
console.log(key, type, order)
let orderType = type
if (!orderType) {
orderType = this[key] === 'asc' ? 'desc' : 'asc'
}
this.sizeOrderType = 0
this.dateOrderType = 0
this.nameOrderType = 0
this.resetState(orderType)
if (this[key] == orderType) {
this[key] = 0
this.fileList = this.oldFileList
} else if (orderType == 'nameOrderType') {
console.log(3)
this[key] = orderType
let isDirArr = this.oldFileList.filter(item => item.isDir)
let isRegArr = this.oldFileList.filter(item => !item.isDir)
@@ -578,6 +592,7 @@ export default {
this.fileList = this.fileList.concat(isRegArr, isDirArr)
}
} else {
console.log(4)
this[key] = orderType
let isDirArr = this.oldFileList.filter(item => item.isDir)
let isRegArr = this.oldFileList.filter(item => !item.isDir)

4
nezha-fronted/src/components/cli/terminal.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="webTerminal">
<div class="web-terminal-header">
<div> <img alt="loading..." height="26" :src="logo?logo:require('../../assets/img/logo1-2.png')"/>Web terminal</div>
<div> <img alt="loading..." height="26" :src="logo?logo:imageUrl"/>{{$t('terminal.title')}}</div>
<div>
<div class="console-title-icon" style='right: 106px;display: inline;position: absolute' @click="showFileState" v-show="fileList.length">
<i class="nz-icon nz-icon-a-filetransfer" :title="$t('terminal.filetransfer')"></i>
@@ -18,6 +18,7 @@
<script>
import webSSHNew from '@/components/cli/webSSHNew'
import fileListState from './fileListState'
import imageUrl from '@/assets/img/logo1-2.png'
export default {
name: 'terminal',
components: {
@@ -26,6 +27,7 @@ export default {
},
data () {
return {
imageUrl,
logo: '',
fileListStateType: '',
message: '',