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

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

Browse Source
This commit is contained in:
zyh
2023-06-21 14:10:55 +08:00
parent 3d667687be 8d4d63f508
commit 7ac443915a
7 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -699,9 +699,6 @@ i.nz-icon-override{
.el-dialog__header{
position: relative;
}
.el-message__content{
white-space:pre-line
}
.response__popper {
max-height: 500px;
overflow: hidden;

2
nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss
View File

@@ -175,7 +175,7 @@
}
.el-button--primary:hover{
color: $--color-text-label2;
background-color: $--color-primary;
background-color: $--color-primary !important;
border-color: $--color-primary;
}
}

2
nezha-fronted/src/components/common/mixin/dataList.js
View File

@@ -238,7 +238,7 @@ export default {
this.object = { ...u, name: u.name + copyName, id: '' }
if (this.object.name.length > 64) {
const length = this.object.name.length - 64
this.object.name = u.name.substring(0, u.name.length - length) + '-copy'
this.object.name = u.name.substring(0, u.name.length - length) + copyName
}
this.rightBox.show = true
},

2
nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
View File

@@ -370,7 +370,7 @@ export default {
} else {
this.position.left = ePosition.layerX - 20 - 400
}
if (boxHeight > (ePosition.layerY + 300)) {
if (boxHeight / 2 > ePosition.layerY) {
this.position.top = ePosition.layerY + 50
} else {
this.position.top = ePosition.layerY - 300

2
nezha-fronted/src/components/common/rightBox/agentBox.vue
View File

@@ -19,7 +19,7 @@
<!--DC-->
<el-form-item :label="$t('overall.dc')" prop="dc.name">
<div class="right-box-form-content">
<el-select id="prom-box-input-dc" v-model="editPromServer.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">
<el-select id="prom-box-input-dc" v-model="editPromServer.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside right-box-select-width" size="small" value-key="id">
<el-option v-for="item in dcData" :id="'prom-edit-dc-op-'+item.id" :key="item.id" :label="item.name" :value="item">
<span class="config-dropdown-label-txt">{{item.name}}</span>
</el-option>

2
nezha-fronted/src/components/common/rightBox/dcBox.vue
View File

@@ -21,7 +21,7 @@
<el-input placeholder="" maxlength="128" show-word-limit v-model="editDc.tel" size="small" id="dc-box-input-tel"></el-input>
</el-form-item>
<el-form-item :label='$t("config.dc.principal")' prop="principal">
<el-select value-key="id" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" v-model="editDc.principal" placeholder="" size="small" id="dc-box-input-principal">
<el-select value-key="id" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside right-box-select-width" v-model="editDc.principal" placeholder="" size="small" id="dc-box-input-principal">
<el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id" style="width: 620px">
<span class="user-name" :title="item.name">{{item.name}}</span><span class="user-username" :title="item.username">@{{item.username}}</span>
</el-option>

8
nezha-fronted/src/components/common/rightBox/panelBox.vue
View File

@@ -43,7 +43,7 @@
<!-- chartShare -->
<el-form-item :label="$t('dashboard.dashboard.chartTooltip')" class="item-receivers" prop="chartShare">
<el-select v-model="editPanel.param.chartShare" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-select v-model="editPanel.param.chartShare" placeholder="" popper-class="right-box-select-top prevent-clickoutside right-box-select-width" size="small">
<el-option value="none" :label="$t('config.assetLabel.default')"></el-option>
<el-option value="crosshair" :label="$t('dashboard.dashboard.crosshair')"></el-option>
<el-option value="tooltip" :label="$t('dashboard.dashboard.shareTooltip')"></el-option>
@@ -53,7 +53,7 @@
<!-- defaultTimeRange -->
<el-form-item :label="$t('dashboard.defaultTimeRange')" class="item-receivers" prop="defaultTimeRange">
<el-select v-model="editPanel.param.defaultTimeRange" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-select v-model="editPanel.param.defaultTimeRange" placeholder="" popper-class="right-box-select-top prevent-clickoutside right-box-select-width" size="small">
<el-option
v-for="item in timeData"
:value="item.id"
@@ -67,7 +67,7 @@
<!-- Auto refresh -->
<el-form-item :label="$t('dashboard.autoRefresh')" class="item-receivers" prop="refresh">
<el-select v-model="editPanel.param.refresh" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-select v-model="editPanel.param.refresh" placeholder="" popper-class="right-box-select-top prevent-clickoutside right-box-select-width" size="small">
<el-option
v-for="item in intervalList"
:value="item.value"
@@ -350,7 +350,7 @@
<el-form-item :label="$t('dashboard.dashboard.receivers')" class="item-receivers" prop="param.report.receivers">
<el-select
class="right-box__select"
v-model="editPanel.param.report.receivers" clearable multiple placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="chartType">
v-model="editPanel.param.report.receivers" clearable multiple placeholder="" popper-class="right-box-select-top prevent-clickoutside right-box-select-width" size="small" value-key="chartType">
<el-option
style="width: 620px"
v-for="item in userData" :key="item.id"