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

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

Browse Source
This commit is contained in:
zhangyu
2022-06-30 17:37:53 +08:00
parent c0e877b66e 9472bb6ed1
commit 27cd886f15
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,7 @@
caret-color:$--color-text-regular; caret-color:$--color-text-regular;
} }
.ͼ1.cm-editor.cm-focused{ .ͼ1.cm-editor.cm-focused{
outline: 1px solid $--border-color-light; outline: 0px;
padding-left: 5px; padding-left: 5px;
} }
} }

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

@@ -100,6 +100,7 @@
<!-- Query expression --> <!-- Query expression -->
<el-form-item v-if="item.type==='query'" :prop="'param.variables.' + index + '.expression'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" key="expression" style="width: 100%;" > <el-form-item v-if="item.type==='query'" :prop="'param.variables.' + index + '.expression'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" key="expression" style="width: 100%;" >
<div slot="label"> <div slot="label">
<span>{{$t('dashboard.panel.queryExpression')}}</span>
<el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside"> <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside">
<table class="query-variable-table" width="640" cellspacing="5"> <table class="query-variable-table" width="640" cellspacing="5">
<thead> <thead>
@@ -114,7 +115,6 @@
</tbody> </tbody>
</table> </table>
<span slot="reference"> <span slot="reference">
{{$t('dashboard.panel.queryExpression')}}
<i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</span> </span>
</el-popover> </el-popover>
@@ -132,10 +132,10 @@
<!-- Multi-value --> <!-- Multi-value -->
<el-form-item class="form-item--half-width" :prop="'param.variables.' + index + '.multi'" style="margin-bottom: 0px"> <el-form-item class="form-item--half-width" :prop="'param.variables.' + index + '.multi'" style="margin-bottom: 0px">
<div slot="label"> <div slot="label">
<span>{{$t('dashboard.panel.multi')}}</span>
<el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside multiTip"> <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside multiTip">
<span>{{$t('dashboard.panel.multiTip')}}</span> <span>{{$t('dashboard.panel.multiTip')}}</span>
<span slot="reference"> <span slot="reference">
{{$t('dashboard.panel.multi')}}
<i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</span> </span>
</el-popover> </el-popover>
@@ -151,10 +151,10 @@
<!-- All option --> <!-- All option -->
<el-form-item class="form-item--half-width" :prop="'param.variables.' + index + '.allOption'" style="margin-bottom: 0px"> <el-form-item class="form-item--half-width" :prop="'param.variables.' + index + '.allOption'" style="margin-bottom: 0px">
<div slot="label"> <div slot="label">
<span>{{$t('dashboard.panel.allOption')}}</span>
<el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside allOptionTip"> <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside allOptionTip">
<span>{{$t('dashboard.panel.allOptionTip')}}</span> <span>{{$t('dashboard.panel.allOptionTip')}}</span>
<span slot="reference"> <span slot="reference">
{{$t('dashboard.panel.allOption')}}
<i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</span> </span>
</el-popover> </el-popover>

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

@@ -37,7 +37,7 @@
<el-option v-for="item in langList" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in langList" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="Theme" prop="theme"> <el-form-item :label="$t('config.user.Theme')" prop="theme">
<el-select id="account-input-language" <el-select id="account-input-language"
class="right-box__select" class="right-box__select"
v-model="editProfile.theme" v-model="editProfile.theme"