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

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

Browse Source
This commit is contained in:
zhangyu
2022-03-25 09:22:18 +08:00
parent 3201c50026 b0c2dd6a83
commit 235411cbe8
15 changed files with 115 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss
View File

@@ -58,6 +58,7 @@
margin-left: 20px;
margin-right: 20px;
color: $--color-text-primary;
white-space: nowrap;
}
}
.global-search-input.search-after{

10
nezha-fronted/src/components/cli/webSSH.vue
View File

@@ -51,8 +51,8 @@
:popper-class="'popover-webshell'"
>
<div>
<div class="popover-webshell-item" @click="assetShowChange"><i class="nz-icon nz-icon-menu-assets" />Select asset</div>
<div class="popover-webshell-item" @click="customShow=true"><i class="nz-icon nz-icon-edit" />Custom connect</div>
<div class="popover-webshell-item" @click="assetShowChange"><i class="nz-icon nz-icon-menu-assets" />{{$t('webshell.selAsset')}}</div>
<div class="popover-webshell-item" @click="customShow=true"><i class="nz-icon nz-icon-edit" />{{$t('webshell.custom')}}</div>
</div>
<span slot="reference" style="padding:8px;font-size:20px;font-weight:bold;">+</span>
</el-popover>
@@ -153,7 +153,7 @@
</div>
</el-dialog>
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="assetShow" @close="closeAssetCustom" class="nz-dialog" width="620px">
<div slot="title">Connect</div>
<div slot="title">{{$t('webshell.connect')}}</div>
<div >
<el-form label-width="120px" size="small" :model="assetContent" label-position = "top" :rules="rules" ref="assetConnect" v-loading="assetLoading" >
<el-form-item :label='$t("overall.asset")' prop="assetId" class="flex">
@@ -190,7 +190,7 @@
</div>
</el-dialog>
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="customShow" @close="closeAssetCustom" class="nz-dialog" width="620px"destroy-on-close >
<div slot="title">Connect</div>
<div slot="title">{{$t('webshell.connect')}}</div>
<div >
<el-form label-width="120px" size="small" :model="customConnect" label-position = "top" :rules=" customConnect.authProtocol ===2 ? rulesCustom2: rulesCustom" ref="customConnect" v-loading="assetLoading" class="custom">
<el-form-item :label='$t("webshell.protocol")' prop="authProtocol">
@@ -243,7 +243,7 @@
<span>{{$t('overall.cancel')}}</span>
</button>
<button id="asset-edit-save" :disabled="prevent_opt.save" class="footer__btn" @click.prevent="connect" type="button">
<span>Connect</span>
<span>{{$t('webshell.connect')}}</span>
</button>
</div>
</el-form>

28
nezha-fronted/src/components/common/bottomBox/bottomBox.vue
View File

@@ -175,32 +175,32 @@ export default {
panel: [
{ prop: 'panelTab', name: this.$t('overall.detail'), active: true },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
{ prop: 'endpointTab', name: 'Endpoint', active: false },
{ prop: 'log', name: 'Log', active: false }
{ prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
{ prop: 'log', name: this.$t('overall.logs'), active: false }
],
alertMessage: [
{ prop: 'panelTab', name: this.$t('overall.detail'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true },
{ prop: 'endpointTab', name: 'Endpoint', active: false },
{ prop: 'log', name: 'Log', active: false }
{ prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
{ prop: 'log', name: this.$t('overall.logs'), active: false }
],
endpoint: [
{ prop: 'panelTab', name: this.$t('overall.detail'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
{ prop: 'endpointTab', name: 'Endpoint', active: true },
{ prop: 'log', name: 'Log', active: false }
{ prop: 'endpointTab', name: this.$t('asset.endpoint'), active: true },
{ prop: 'log', name: this.$t('overall.logs'), active: false }
],
log: [
{ prop: 'panelTab', name: this.$t('overall.detail'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
{ prop: 'endpointTab', name: 'Endpoint', active: false },
{ prop: 'log', name: 'Log', active: true }
{ prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
{ prop: 'log', name: this.$t('overall.logs'), active: true }
],
alertMessageSub: [
{ prop: 'panelTab', name: this.$t('overall.detail'), active: false },
{ prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
{ prop: 'endpointTab', name: 'Endpoint', active: false },
{ prop: 'log', name: 'Log', active: false },
{ prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
{ prop: 'log', name: this.$t('overall.logs'), active: false },
{ prop: 'assetSubTab', name: this.$t('overall.assetSubTab'), active: true }
]
},
@@ -215,8 +215,8 @@ export default {
endpointTabTitle: [
{ prop: 'panelTab', name: this.$t('overall.detail') },
{ prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
{ prop: 'Metrics', name: 'Metrics' },
{ prop: 'log', name: 'Log' }
{ prop: 'Metrics', name: this.$t('project.metrics.metrics') },
{ prop: 'log', name: this.$t('overall.logs') }
]
},
chartTemp: {
@@ -273,10 +273,10 @@ export default {
const tabs = [
{ prop: 'panelTab', name: this.$t('overall.detail') },
{ prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
{ prop: 'Metrics', name: 'Metrics' }
{ prop: 'Metrics', name: this.$t('project.metrics.metrics') }
]
if (hasLog) {
tabs.push({ prop: 'log', name: 'Log' })
tabs.push({ prop: 'log', name: this.$t('overall.logs') })
}
return tabs
}

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

@@ -5,7 +5,7 @@
<i class="nz-icon nz-icon-search" v-loading="loading"></i>
<el-input v-model="searchStr" @input="searchAll" ref="searchStr" :placeholder="$t('globalSearch.placeholder')" @keydown.native="inputKeydown" clearable></el-input>
<div @click="close" class="global-search-cancel">
Cancel
{{$t('overall.cancel')}}
</div>
</div>
<div class="global-search-content" v-if="!firstShow">

10
nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
View File

@@ -205,9 +205,9 @@
@search="search"
@leftToRight="addAsset"
@rightToLeft="removeAsset">
<template v-slot:title>Selected</template>
<template v-slot:title>{{$t('overall.selected')}}</template>
</nz-transfer>
<div v-if="showError" class="el-form-item__error">{{this.$t('validate.required')}}</div>
<div v-if="showError" class="el-form-item__error">{{$t('validate.required')}}</div>
</div>
</el-form>
</div>
@@ -292,13 +292,13 @@ export default {
disabled: false
}, {
id: 20,
name: 'SN',
name: this.$t('asset.sn'),
type: 'input',
label: 'sn',
disabled: false
}, {
id: 21,
name: 'Host',
name: this.$t('webshell.host'),
type: 'input',
label: 'manageIp',
disabled: false
@@ -310,7 +310,7 @@ export default {
disabled: false
}, {
id: 23,
name: 'pingStatus',
name: this.$t('asset.pingStatus'),
type: 'select',
label: 'pingStatus',
disabled: false

18
nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
View File

@@ -462,7 +462,7 @@
</span>
</el-form-item>
<div @click="addThresholds" class="thresholds-add">
Add thresholds
{{$t('overall.addThresholds')}}
</div>
</el-row>
</transition>
@@ -498,13 +498,13 @@
<transition-group appear tag="div" name="el-zoom-in-top">
<el-row class="thresholds-item" v-show="item.show" :key="1">
<div>
<div class='mapping-display'>Title</div>
<div class='mapping-display'>{{$t('project.topology.title')}}</div>
</div>
<el-form-item :prop="'param.columns.' + index + '.title'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item" style="flex: 1">
<el-input size="small" v-model="item.title" @change="change('columns',index)"></el-input>
</el-form-item>
<div>
<div class='mapping-display'>Unit</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.unit')}}</div>
</div>
<el-cascader :id="'columns-unit' + index" v-model="item.unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable
placeholder=""
@@ -517,7 +517,7 @@
</el-row>
<el-row class="thresholds-item" v-show="item.show" :key="2">
<div>
<div class='mapping-display'>Display</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div>
</div>
<el-form-item :prop="'param.columns.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" size="small" @change="change('columns',index)"/>
@@ -526,7 +526,7 @@
</transition-group>
</div>
<div @click="addColumns" class="thresholds-add">
Add Colums
{{$t('overall.addColumns')}}
</div>
</div>
@@ -595,7 +595,7 @@
<el-option
v-for="item in mappingTypeList"
:value="item.value"
:label="item.label"
:label="$t(item.label)"
:key="item.value"/>
</el-select>
</div>
@@ -657,13 +657,13 @@
</el-row>
<el-row v-show="item.show" :key="2" class="thresholds-item">
<div v-if="isTable(chartConfig.type)">
<div class='mapping-display'>Columns</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.columns')}}</div>
</div>
<el-form-item v-if="isTable(chartConfig.type)" :prop="'param.valueMapping.' + index + '.column'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.column" style="margin-right: 10px" :placeholder="$t('placeholder.chart.column')" size="small" @change="change('valueMapping', index)"/>
</el-form-item>
<div>
<div class='mapping-display'>Display</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div>
</div>
<el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)"/>
@@ -673,7 +673,7 @@
</transition-group>
</div>
<div @click="addMapping" class="thresholds-add">
Add valueMapping
{{$t('overall.addMapping')}}
</div>
</el-row>
</transition>

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

@@ -69,16 +69,16 @@
<span>{{$t('dashboard.panel.chartForm.dataConfig')}}</span>
</div>
<el-tabs v-model="editChart.datasource" @tab-click="datasourceChange" type="card">
<el-tab-pane label="Metrics" name="metrics">
<el-tab-pane :label="$t('project.metrics.metrics')" name="metrics">
<chart-config ref="childrenFrommetrics" :type="'metrics'" v-if="editChart.datasource == 'metrics'" :params.sync="editChart" @change="editChartChange"/>
</el-tab-pane>
<el-tab-pane label="Logs" name="logs">
<el-tab-pane :label="$t('overall.logs')" name="logs">
<chart-config ref="childrenFromlogs" :type="'log'" v-if="editChart.datasource == 'logs'" :params.sync="editChart" @change="editChartChange"/>
</el-tab-pane>
<el-tab-pane label="System" name="system">
<el-tab-pane :label="$t('overall.system')" name="system">
<system-chart-config ref="childrenFromsystem" v-if="editChart.datasource == 'system'" :params.sync="editChart" @change="editChartChange"/>
</el-tab-pane>
<el-tab-pane label="Misc" name="misc">
<el-tab-pane :label="$t('overall.misc')" name="misc">
<other-chart-config ref="childrenFrommisc" v-if="editChart.datasource == 'misc'" :params.sync="editChart" @change="editChartChange"/>
</el-tab-pane>
</el-tabs>

6
nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
View File

@@ -48,13 +48,13 @@ export default {
],
mappingTypeList: [
{
label: 'Value',
label: this.$t('overall.value'),
value: 'value'
}, {
label: 'Range',
label: this.$t('dashboard.panel.chartForm.valMapping.range'),
value: 'range'
}, {
label: 'Regx',
label: this.$t('dashboard.panel.chartForm.valMapping.regx'),
value: 'regx'
}
],

63
nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
View File

@@ -382,7 +382,54 @@
</el-form-item>
</div>
</transition>
<!--thresholdConfig-->
<div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.threshold')}}</span>
<el-switch
v-model="chartConfig.param.enable.thresholds"
size="small"
@change="thresholdShowChange"
></el-switch>
</div>
<transition name="el-zoom-in-top">
<el-row v-if="chartConfig.param.enable.thresholds">
<el-form-item
v-for="(item,index) in chartConfig.param.thresholds"
:key="index"
class="thresholds-item"
:prop="'param.thresholds.' + index + '.value'"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
>
<nezhaColor
:value-arr="[{name:'thresholds',value:item.color}]"
:show-text="false"
:color-val="item.color"
@colorChange="(color,key)=>{colorChange(color,key,index)}"
/>
<el-input-number
size="small"
style="margin-top: 2px"
:placeholder="$t('placeholder.chart.threshold')"
v-model.number="item.value"
:controls="false"
@blur="sortThresholds"
@change="change"
/>
<span
@click="delThresholds(index)"
class="del-thresholds-icon"
>
<i class="nz-icon nz-icon-delete" />
</span>
</el-form-item>
<div @click="addThresholds" class="thresholds-add">
{{$t('overall.addThresholds')}}
</div>
</el-row>
</transition>
</div>
<!-- table column-->
<div v-if="isTable(chartConfig.type)">
<div class="form__sub-title">
@@ -413,13 +460,13 @@
<transition-group appear tag="div" name="el-zoom-in-top">
<el-row class="thresholds-item" v-show="item.show" :key="1">
<div>
<div class='mapping-display'>Title</div>
<div class='mapping-display'>{{$t('project.topology.title')}}</div>
</div>
<el-form-item :prop="'param.columns.' + index + '.title'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item" style="flex: 1">
<el-input size="small" v-model="item.title" @change="change('columns',index)"></el-input>
</el-form-item>
<div>
<div class='mapping-display'>Unit</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.unit')}}</div>
</div>
<el-cascader :id="'columns-unit' + index" v-model="item.unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable
placeholder=""
@@ -432,7 +479,7 @@
</el-row>
<el-row class="thresholds-item" v-show="item.show" :key="2">
<div>
<div class='mapping-display'>Display</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div>
</div>
<el-form-item :prop="'param.columns.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" size="small" @change="change('columns',index)"/>
@@ -441,7 +488,7 @@
</transition-group>
</div>
<div @click="addColumns" class="thresholds-add">
Add Colums
{{$t('overall.addColumns')}}
</div>
</div>
@@ -510,7 +557,7 @@
<el-option
v-for="item in mappingTypeList"
:value="item.value"
:label="item.label"
:label="$t(item.label)"
:key="item.value"/>
</el-select>
</div>
@@ -572,13 +619,13 @@
</el-row>
<el-row v-show="item.show" :key="2" class="thresholds-item">
<div v-if="isTable(chartConfig.type)">
<div class='mapping-display'>Columns</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.columns')}}</div>
</div>
<el-form-item v-if="isTable(chartConfig.type)" :prop="'param.valueMapping.' + index + '.column'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.column" style="margin-right: 10px" :placeholder="$t('placeholder.chart.column')" size="small" @change="change('valueMapping', index)"/>
</el-form-item>
<div>
<div class='mapping-display'>Display</div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.display')}}</div>
</div>
<el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
<el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)"/>
@@ -588,7 +635,7 @@
</transition-group>
</div>
<div @click="addMapping" class="thresholds-add">
Add valueMapping
{{$t('overall.addMapping')}}
</div>
</el-row>
</transition>

18
nezha-fronted/src/components/common/searchSelectInfo.vue
View File

@@ -18,7 +18,7 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
promType: [ // promServer类型
{
value: 1,
label: 'Global'
label: i18n.t('overall.global')
},
{
value: 2,
@@ -54,22 +54,22 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
endpointState: [
{
value: 1,
label: 'UP'
label: i18n.t('config.agent.up')
}, {
value: 0,
label: 'DOWN'
label: i18n.t('config.agent.down')
}, {
value: 2,
label: 'SUSPENDED'
label: i18n.t('cconfig.dc.suspended')
}
],
promState: [
{
value: 1,
label: 'UP'
label: i18n.t('config.agent.up')
}, {
value: '0,-1',
label: 'DOWN'
label: i18n.t('config.agent.down')
}
],
pingStatus: [
@@ -240,17 +240,17 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
searchMetrics: [
{
id: 1,
name: 'Metrics',
name: i18n.t('project.metrics.metrics'),
searchType: 'alertTypes'
},
{
id: 2,
name: 'Logs',
name: i18n.t('overall.logs'),
searchType: 'alertTypes'
},
{
id: 3,
name: 'SNMP trap',
name: i18n.t('overall.SNMPTrap'),
searchType: 'alertTypes'
}
],

4
nezha-fronted/src/components/common/table/asset/assetTable.vue
View File

@@ -275,12 +275,12 @@ export default {
minWidth: 110,
sortable: 'custom'
}, {
label: 'SN',
label: this.$t('asset.sn'),
prop: 'sn',
show: true,
minWidth: 110
}, {
label: 'Talon',
label: this.$t('asset.talon'),
// prop: 'clientState',
prop: 'talon',
show: true,

1
nezha-fronted/src/components/common/table/settings/agentTable.vue
View File

@@ -128,6 +128,7 @@ export default {
label: this.$t('config.agent.type'),
prop: 'type',
show: true,
minWidth: 100,
sortable: 'custom'
}, {
label: this.$t('asset.state'),

2
nezha-fronted/src/components/common/table/settings/dcTable.vue
View File

@@ -163,7 +163,7 @@ export default {
label: this.$t('config.dc.cabinetNum'),
prop: 'cabinetNum',
show: true,
minWidth: 100,
minWidth: 110,
sortable: 'custom'
}, {
label: this.$t('config.dc.assets'),

6
nezha-fronted/src/components/layout/header.vue
View File

@@ -207,14 +207,14 @@ export default {
// for (let i = 97; i < 123; i++) {
// this.fontData.push(String.fromCharCode(i))
// }
this.name = localStorage.getItem('nz-username')
this.username = localStorage.getItem('nz-username')
this.language = localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en'
this.$i18n.locale = this.language
if (localStorage.getItem('nz-token')) {
this.initEvent()
this.getLinkData()
}
this.name = localStorage.getItem('nz-username')
this.username = localStorage.getItem('nz-username')
this.language = localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en'
window.addEventListener('visibilitychange', this.testUser)
},
computed: {

3
nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
View File

@@ -26,7 +26,8 @@
</el-col>
</el-row>
<div class="top-tool-right">
<button v-if="!closable" class="top-tool-btn top-tool-btn--text margin-r-10" style="cursor: pointer;" type="button" @click="split">Split</button>
<button v-if="!closable" class="top-tool-btn top-tool-btn--text margin-r-10" style="cursor: pointer;" type="button" @click="split">
{{$t('overall.split')}}</button>
<pick-time id="explore" ref="pickTime" v-model="filterTime" :class="{'margin-r-10': showMetrics}" :refresh-data-func="expressionChange" @unitChange="chartUnitChange">
<!-- <template slot="added-text">{{$t('dashboard.metricPreview.runQuery')}}</template>-->
<template slot="added-text">{{$t('overall.query')}}</template>