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

Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6

Browse Source
This commit is contained in:
18317449825
2022-12-23 11:34:16 +08:00
parent 7fa4323242 a5a73814e8
commit f548832b1c
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -630,3 +630,14 @@ textarea {
background-position: 100% 0%;
}
}
.no-transform-dialog{
display: flex;
align-items: center;
justify-content: center;
height: 100vh;
width: 100vw;
.el-dialog{
position: unset !important;
transform: unset !important;
}
}

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

@@ -298,6 +298,9 @@ div.sp-header{
.ani-webSHH-height {
transition: height .25s ease-in;
.el-dialog .el-dialog__body{
padding-bottom: 0;
}
.sub-list {
background: $--background-color-1;
}
@@ -309,7 +312,7 @@ div.sp-header{
margin-top: 2px;
}
.custom .el-form-item {
width: calc(50% - 30px);
width: calc(50% - 10px);
display: inline-block;
}
.custom .el-form-item:nth-child(even) {

12
nezha-fronted/src/components/page/config/agent.vue
View File

@@ -56,13 +56,13 @@
<transition name="right-box">
<agent-box v-if="rightBox.show" :agent="object" @close="closeRightBox"></agent-box>
</transition>
<el-dialog :title="$t('guide.downloadAgent')" :visible.sync="showAgentDownload" :append-to-body="false" class="nz-dialog agent-dialog" width="800px" @close="closeDialog">
<el-dialog :title="$t('guide.downloadAgent')" :visible.sync="showAgentDownload" :append-to-body="false" class="nz-dialog agent-dialog no-transform-dialog" width="800px" @close="closeDialog">
<div v-if="showAgentDownload" class="agent-box">
<el-form v-model="agentParam" class="right-box-form right-box-form-left" label-position = "top" label-width="120px" size="small" style="width: 100%">
<div class="right-box-sub-title">{{$t('overall.download')}}</div>
<div style="margin-bottom: 20px;width: 100%"></div>
<el-form-item :label="$t('config.agent.agent.osType')" class="half-form-item" prop="osType">
<el-select v-model="agentParam.osType" class="right-box-row-with-btn" popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="">
<el-select v-model="agentParam.osType" class="right-box-row-with-btn" popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="" :popper-append-to-body="false">
<el-option v-for="item in osTypes" :key="item.name" :label="item.label" :value="item.name">
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
</el-option>
@@ -75,14 +75,14 @@
<div style="margin-bottom: 20px;width: 100%"></div>
<el-form-item :label="$t('overall.dc')" class="half-form-item" prop="dc">
<el-select v-model="agentParam.dc" class="right-box-row-with-btn" popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="">
<el-select v-model="agentParam.dc" class="right-box-row-with-btn" popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="" :popper-append-to-body="false">
<el-option v-for="item in allDc" :key="item.id" :label="item.name" :value="item.id">
<span class="panel-dropdown-label-txt" >{{item.name}}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('config.agent.agent.type')" class="half-form-item" prop="type">
<el-select v-model="agentParam.type" class="right-box-row-with-btn" popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="">
<el-select v-model="agentParam.type" class="right-box-row-with-btn" popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="" :popper-append-to-body="false">
<el-option v-for="item in agent2.theData" :key="item.value" :label="$t(item.label)" :value="item.value" :disabled="federationEnabled && item.value == 2">
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
</el-option>
@@ -90,14 +90,14 @@
</el-form-item>
<el-form-item label="CURL" v-if="loadFinish" class="download-url">
<el-input id="download-url-curl" :disabled="true" v-model="curlUrl">
<el-popover :content="$t('overall.copySuccess')" disabled="false" placement="top" trigger="manual" v-model="curlVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('curl')" style="cursor: pointer">
<el-popover :content="$t('overall.copySuccess')" placement="top" trigger="manual" v-model="curlVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('curl')" style="cursor: pointer">
<i v-if="curlUrl" slot="reference" class="nz-icon nz-icon-override" @click="copyUrl(curlUrl)" :title="$t('overall.copyText')"></i>
</el-popover>
</el-input>
</el-form-item>
<el-form-item label="Wget" v-if="loadFinish" class="download-url">
<el-input id="download-url-wget" :disabled="true" v-model="wgetUrl" >
<el-popover :content="$t('overall.copySuccess')" disabled="false" placement="top" trigger="manual" v-model="wgetVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('wget')" style="cursor: pointer">
<el-popover :content="$t('overall.copySuccess')" placement="top" trigger="manual" v-model="wgetVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('wget')" style="cursor: pointer">
<i v-if="wgetUrl" slot="reference" class="nz-icon nz-icon-override" @click="copyUrl(wgetUrl)" :title="$t('overall.copyText')"></i>
</el-popover>
</el-input>