fix:terminal 样式不生效的问题
This commit is contained in:
666
nezha-fronted/package-lock.json
generated
666
nezha-fronted/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -359,7 +359,7 @@
|
|||||||
letter-spacing: 0;
|
letter-spacing: 0;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
/deep/ .el-radio-group{
|
.el-radio-group{
|
||||||
flex: 1;
|
flex: 1;
|
||||||
.el-radio-button--small {
|
.el-radio-button--small {
|
||||||
width: 142px;
|
width: 142px;
|
||||||
|
|||||||
@@ -96,7 +96,6 @@
|
|||||||
background: $--background-color-2;
|
background: $--background-color-2;
|
||||||
width: calc(100% - 22px);
|
width: calc(100% - 22px);
|
||||||
color: $--color-text-regular;
|
color: $--color-text-regular;
|
||||||
> div{text-transform:capitalize};
|
|
||||||
}
|
}
|
||||||
.file-name{
|
.file-name{
|
||||||
width: 44%;
|
width: 44%;
|
||||||
@@ -136,7 +135,7 @@
|
|||||||
display: flex;flex-direction: column;align-items: center;margin-left: 7px
|
display: flex;flex-direction: column;align-items: center;margin-left: 7px
|
||||||
}
|
}
|
||||||
.nz-arrow-up{
|
.nz-arrow-up{
|
||||||
margin-bottom: 5px;
|
margin-bottom: 2px;
|
||||||
}
|
}
|
||||||
.nz-arrow-up.is-select{
|
.nz-arrow-up.is-select{
|
||||||
border-bottom:5px solid $--color-primary; /* 定义底部颜色 */
|
border-bottom:5px solid $--color-primary; /* 定义底部颜色 */
|
||||||
|
|||||||
@@ -30,7 +30,6 @@
|
|||||||
line-height: 48px;
|
line-height: 48px;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
text-transform: capitalize;
|
|
||||||
> i {
|
> i {
|
||||||
color: $--color-text-primary;
|
color: $--color-text-primary;
|
||||||
}
|
}
|
||||||
@@ -39,7 +38,6 @@
|
|||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
letter-spacing: 0;
|
letter-spacing: 0;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
text-transform: capitalize;
|
|
||||||
color: $--color-text-primary;
|
color: $--color-text-primary;
|
||||||
}
|
}
|
||||||
.file-state-panel-content {
|
.file-state-panel-content {
|
||||||
|
|||||||
@@ -161,7 +161,7 @@
|
|||||||
border: 1px solid $--border-color-base;
|
border: 1px solid $--border-color-base;
|
||||||
border-right: none ;
|
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;
|
border-radius: 0 4px 4px 0;
|
||||||
}
|
}
|
||||||
.fontSet{
|
.fontSet{
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
background: $--background-color-base;
|
background: $--background-color-base;
|
||||||
/*border-top: 1px solid #BEBEBE;*/
|
/*border-top: 1px solid #BEBEBE;*/
|
||||||
box-shadow: 0 1px 0 0 $--border-color-light;
|
box-shadow: 0 1px 0 0 $--border-color-light;
|
||||||
/deep/ .el-tabs{
|
.el-tabs{
|
||||||
border: none;
|
border: none;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width:100%;
|
width:100%;
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
/deep/ .el-checkbox__label {
|
.el-checkbox__label {
|
||||||
max-width: 150px;
|
max-width: 150px;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|||||||
@@ -80,17 +80,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-input--mini {
|
.el-input--mini {
|
||||||
input {
|
input {
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-input-number--mini {
|
.el-input-number--mini {
|
||||||
width: 111px;
|
width: 111px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-input-number__decrease, /deep/ .el-input-number__increase {
|
.el-input-number__decrease, .el-input-number__increase {
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 100%;
|
border-radius: 100%;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@@ -99,11 +99,11 @@
|
|||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-input-number__decrease {
|
.el-input-number__decrease {
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-input-number__increase {
|
.el-input-number__increase {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -141,20 +141,20 @@
|
|||||||
.special-select .el-select.el-select--small {
|
.special-select .el-select.el-select--small {
|
||||||
width: 100%;
|
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;
|
border: 1px solid $--border-color-base;
|
||||||
height: 28px;
|
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;
|
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;
|
height: 28px;
|
||||||
line-height: 28px;
|
line-height: 28px;
|
||||||
color: #899FB7;
|
color: #899FB7;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
.special-select /deep/ .el-input__prefix > div {
|
.special-select .el-input__prefix > div {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -303,7 +303,7 @@
|
|||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
margin-top: 12px;
|
margin-top: 12px;
|
||||||
}
|
}
|
||||||
/deep/ .nz-dialog .el-dialog__body{
|
.nz-dialog .el-dialog__body{
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
}
|
}
|
||||||
.verify-link{
|
.verify-link{
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
padding: 20px 0;
|
padding: 20px 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-bottom: 1px dashed $--border-color-base;
|
border-bottom: 1px dashed $--border-color-base;
|
||||||
/deep/ .nz-icon-minus {
|
.nz-icon-minus {
|
||||||
padding: 0 4px;
|
padding: 0 4px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -91,10 +91,10 @@
|
|||||||
left: 0;
|
left: 0;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
}
|
}
|
||||||
/deep/ .el-color-picker{
|
.el-color-picker{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
.range /deep/ .el-color-picker{
|
.range .el-color-picker{
|
||||||
left: -17px;
|
left: -17px;
|
||||||
}
|
}
|
||||||
.color-content{
|
.color-content{
|
||||||
|
|||||||
@@ -99,7 +99,7 @@
|
|||||||
.el-cascader-node {
|
.el-cascader-node {
|
||||||
padding: 0;
|
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;
|
padding: 0;
|
||||||
}
|
}
|
||||||
.metric-selector-title{
|
.metric-selector-title{
|
||||||
|
|||||||
@@ -645,19 +645,19 @@ li {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
display: inline-block;
|
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;
|
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: "*";
|
content: "*";
|
||||||
color: #f56c6c;
|
color: #f56c6c;
|
||||||
margin-left: 4px;
|
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;
|
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: "*";
|
content: "*";
|
||||||
color: #f56c6c;
|
color: #f56c6c;
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
@@ -1471,7 +1471,7 @@ li {
|
|||||||
.tag-edit-box-body {
|
.tag-edit-box-body {
|
||||||
display: flex;
|
display: flex;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
/deep/ .el-autocomplete{
|
.el-autocomplete{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
.tag-edit {
|
.tag-edit {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
</el-input>
|
</el-input>
|
||||||
</span>
|
</span>
|
||||||
<div class="path-option">
|
<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"/>
|
<el-switch v-model="showHideFile"/>
|
||||||
<i class="nz-icon nz-icon-a-newfolder" @click="newFolderBoxShow = true"></i>
|
<i class="nz-icon nz-icon-a-newfolder" @click="newFolderBoxShow = true"></i>
|
||||||
<i class="nz-icon nz-icon-upload" @click="uploadFile"></i>
|
<i class="nz-icon nz-icon-upload" @click="uploadFile"></i>
|
||||||
@@ -408,13 +408,13 @@ export default {
|
|||||||
this.editPath = ''
|
this.editPath = ''
|
||||||
this.breadcrumb = res.data.path.split('/').filter(item => item)
|
this.breadcrumb = res.data.path.split('/').filter(item => item)
|
||||||
if (this.nameOrderType) {
|
if (this.nameOrderType) {
|
||||||
this.orderBy('nameOrderType',this.nameOrderType , 'name')
|
this.orderBy('nameOrderType', this.nameOrderType, 'name')
|
||||||
}
|
}
|
||||||
if (this.sizeOrderType) {
|
if (this.sizeOrderType) {
|
||||||
this.orderBy('sizeOrderType',this.sizeOrderType , 'size')
|
this.orderBy('sizeOrderType', this.sizeOrderType, 'size')
|
||||||
}
|
}
|
||||||
if (this.dateOrderType) {
|
if (this.dateOrderType) {
|
||||||
this.orderBy('dateOrderType',this.dateOrderType , 'cts')
|
this.orderBy('dateOrderType', this.dateOrderType, 'cts')
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.$message.error(res.msg)
|
this.$message.error(res.msg)
|
||||||
@@ -554,18 +554,32 @@ export default {
|
|||||||
}
|
}
|
||||||
return '-'
|
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) {
|
orderBy (key, type, order) {
|
||||||
|
console.log(key, type, order)
|
||||||
let orderType = type
|
let orderType = type
|
||||||
if (!orderType) {
|
if (!orderType) {
|
||||||
orderType = this[key] === 'asc' ? 'desc' : 'asc'
|
orderType = this[key] === 'asc' ? 'desc' : 'asc'
|
||||||
}
|
}
|
||||||
this.sizeOrderType = 0
|
this.resetState(orderType)
|
||||||
this.dateOrderType = 0
|
|
||||||
this.nameOrderType = 0
|
|
||||||
if (this[key] == orderType) {
|
if (this[key] == orderType) {
|
||||||
this[key] = 0
|
this[key] = 0
|
||||||
this.fileList = this.oldFileList
|
this.fileList = this.oldFileList
|
||||||
} else if (orderType == 'nameOrderType') {
|
} else if (orderType == 'nameOrderType') {
|
||||||
|
console.log(3)
|
||||||
this[key] = orderType
|
this[key] = orderType
|
||||||
let isDirArr = this.oldFileList.filter(item => item.isDir)
|
let isDirArr = this.oldFileList.filter(item => item.isDir)
|
||||||
let isRegArr = 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)
|
this.fileList = this.fileList.concat(isRegArr, isDirArr)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
console.log(4)
|
||||||
this[key] = orderType
|
this[key] = orderType
|
||||||
let isDirArr = this.oldFileList.filter(item => item.isDir)
|
let isDirArr = this.oldFileList.filter(item => item.isDir)
|
||||||
let isRegArr = this.oldFileList.filter(item => !item.isDir)
|
let isRegArr = this.oldFileList.filter(item => !item.isDir)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="webTerminal">
|
<div class="webTerminal">
|
||||||
<div class="web-terminal-header">
|
<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>
|
||||||
<div class="console-title-icon" style='right: 106px;display: inline;position: absolute' @click="showFileState" v-show="fileList.length">
|
<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>
|
<i class="nz-icon nz-icon-a-filetransfer" :title="$t('terminal.filetransfer')"></i>
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import webSSHNew from '@/components/cli/webSSHNew'
|
import webSSHNew from '@/components/cli/webSSHNew'
|
||||||
import fileListState from './fileListState'
|
import fileListState from './fileListState'
|
||||||
|
import imageUrl from '@/assets/img/logo1-2.png'
|
||||||
export default {
|
export default {
|
||||||
name: 'terminal',
|
name: 'terminal',
|
||||||
components: {
|
components: {
|
||||||
@@ -26,6 +27,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
imageUrl,
|
||||||
logo: '',
|
logo: '',
|
||||||
fileListStateType: '',
|
fileListStateType: '',
|
||||||
message: '',
|
message: '',
|
||||||
|
|||||||
Reference in New Issue
Block a user