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

fix：修改国际化panel为dashboard

Browse Source
This commit is contained in:
zyh
2023-03-17 12:55:51 +08:00
parent f49284dc50 e6270e066b
commit 0a4423e29a
68 changed files with 409 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/chart/ChartScreenHeader.vue
View File

@@ -20,7 +20,7 @@
:close-delay=10 :close-delay=10
trigger="hover" trigger="hover"
popper-class="chart-warring-popper"> popper-class="chart-warring-popper">
<div class="moreTitle" @click="loadMore">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}</div> <div class="moreTitle" @click="loadMore">{{$t('dashboard.dashboard.moreTitle')}}{{$t('dashboard.dashboard.showAll')}}{{allDataLength}}</div>
<span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadMore"> <span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadMore">
<i class="nz-icon nz-icon-warning fa"></i> <i class="nz-icon nz-icon-warning fa"></i>
<span class="panel-info-corner-inner"></span> <span class="panel-info-corner-inner"></span>

4
nezha-fronted/src/components/chart/chart/chart-table.vue
View File

@@ -60,7 +60,7 @@
<el-table-column :label="$t('overall.time')" min-width="100" prop="time" <el-table-column :label="$t('overall.time')" min-width="100" prop="time"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column> :sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="element" <el-table-column :show-overflow-tooltip="true" prop="element"
:label="$t('dashboard.panel.chartForm.element')" min-width="260" :label="$t('dashboard.dashboard.chartForm.element')" min-width="260"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"> :sort-orders="['ascending', 'descending']" :sortable="'custom'">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}} {{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}}
@@ -93,7 +93,7 @@
<el-table-column :label="$t('overall.time')" min-width="100" prop="time" <el-table-column :label="$t('overall.time')" min-width="100" prop="time"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column> :sort-orders="['ascending', 'descending']" :sortable="'custom'"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="element" <el-table-column :show-overflow-tooltip="true" prop="element"
:label="$t('dashboard.panel.chartForm.element')" min-width="420" :label="$t('dashboard.dashboard.chartForm.element')" min-width="420"
:sort-orders="['ascending', 'descending']" :sortable="'custom'"> :sort-orders="['ascending', 'descending']" :sortable="'custom'">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}} {{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}}

4
nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
View File

@@ -464,8 +464,8 @@ export default {
str += ` str += `
<div class="tooltip__row"> <div class="tooltip__row">
<div class="row__label"> <div class="row__label">
<span class="${className}" style="background-color: ${color};color: ${color}"></span> <span class="row__color-block" style="background-color: ${self.stackTotalColor}"></span>
<span>${self.$t('dashboard.panel.chartTotal')}</span> <span>${self.$t('dashboard.dashboard.chartTotal')}</span>
</div> </div>
<div class="row__value"> <div class="row__value">
<span>${chartDataFormat.getUnit(unit).compute(sum, null, decimals)}</span> <span>${chartDataFormat.getUnit(unit).compute(sum, null, decimals)}</span>

14
nezha-fronted/src/components/chart/chart/line-chart-block.vue
View File

@@ -24,7 +24,7 @@
:close-delay=10 :close-delay=10
trigger="hover" trigger="hover"
popper-class="chart-warring-popper"> popper-class="chart-warring-popper">
<div class="moreTitle">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{seriesItem.length}}</div> <div class="moreTitle">{{$t('dashboard.dashboard.moreTitle')}}{{$t('dashboard.dashboard.showAll')}}{{seriesItem.length}}</div>
<span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadMore"> <span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadMore">
<i class="nz-icon nz-icon-warning fa"></i> <i class="nz-icon nz-icon-warning fa"></i>
<span class="panel-info-corner-inner"></span> <span class="panel-info-corner-inner"></span>
@@ -138,7 +138,7 @@
:close-delay=10 :close-delay=10
trigger="hover" trigger="hover"
popper-class="chart-warring-popper"> popper-class="chart-warring-popper">
<div class="moreTitle">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{seriesItemScreen.length}}</div> <div class="moreTitle">{{$t('dashboard.dashboard.moreTitle')}}{{$t('dashboard.dashboard.showAll')}}{{seriesItemScreen.length}}</div>
<span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadScreenMore"> <span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadScreenMore">
<i class="nz-icon nz-icon-warning fa-model"></i> <i class="nz-icon nz-icon-warning fa-model"></i>
<span class="panel-info-corner-inner"></span> <span class="panel-info-corner-inner"></span>
@@ -879,7 +879,7 @@ export default {
str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">' str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
str += '<div style="line-height: 18px; font-size: 12px;padding-left:0px;">' str += '<div style="line-height: 18px; font-size: 12px;padding-left:0px;">'
str += `<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${self.stackTotalColor};}'></span>` str += `<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${self.stackTotalColor};}'></span>`
str += self.$t('dashboard.panel.chartTotal') str += self.$t('dashboard.dashboard.chartTotal')
str += '</div>' str += '</div>'
str += '<div style="padding-left: 10px;">' str += '<div style="padding-left: 10px;">'
str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, self.chartDot) str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, self.chartDot)
@@ -1164,7 +1164,7 @@ export default {
sum = parseFloat(Number(sum).toFixed(6)) sum = parseFloat(Number(sum).toFixed(6))
str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">' str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
str += '<div style="line-height: 18px; font-size: 12px;padding-left:20px;">' str += '<div style="line-height: 18px; font-size: 12px;padding-left:20px;">'
str += self.$t('dashboard.panel.chartTotal') str += self.$t('dashboard.dashboard.chartTotal')
str += '</div>' str += '</div>'
str += '<div style="padding-left: 10px;">' str += '<div style="padding-left: 10px;">'
str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, self.chartDot) str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, self.chartDot)
@@ -1382,7 +1382,7 @@ export default {
sum = parseFloat(Number(sum).toFixed(6)) sum = parseFloat(Number(sum).toFixed(6))
str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">' str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
str += '<div style="line-height: 18px; font-size: 12px;padding-left:20px;">' str += '<div style="line-height: 18px; font-size: 12px;padding-left:20px;">'
str += self.$t('dashboard.panel.chartTotal') str += self.$t('dashboard.dashboard.chartTotal')
str += '</div>' str += '</div>'
str += '<div style="padding-left: 10px;">' str += '<div style="padding-left: 10px;">'
str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, self.chartDot) str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, self.chartDot)
@@ -1571,7 +1571,7 @@ export default {
this.$refs.pickTime.$refs.multipleTime.searchTime = [] this.$refs.pickTime.$refs.multipleTime.searchTime = []
this.$refs.pickTime.$refs.multipleTime.showTime = { this.$refs.pickTime.$refs.multipleTime.showTime = {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate') text: this.$t('dashboard.dashboard.noDate')
} }
this.$refs.pickTime.$refs.multipleTime.showDropdown = false this.$refs.pickTime.$refs.multipleTime.showDropdown = false
}, },
@@ -1595,7 +1595,7 @@ export default {
this.$refs.pickTime.$refs.multipleTime.searchTime = [] this.$refs.pickTime.$refs.multipleTime.searchTime = []
this.$refs.pickTime.$refs.multipleTime.showTime = { this.$refs.pickTime.$refs.multipleTime.showTime = {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate') text: this.$t('dashboard.dashboard.noDate')
} }
this.$refs.pickTime.$refs.multipleTime.showDropdown = false this.$refs.pickTime.$refs.multipleTime.showDropdown = false
this.$refs.pickTime.$refs.timePicker.setCustomTime(this.stableFilter) this.$refs.pickTime.$refs.timePicker.setCustomTime(this.stableFilter)

2
nezha-fronted/src/components/chart/chartHeader.vue
View File

@@ -33,7 +33,7 @@
:close-delay=10 :close-delay=10
trigger="hover" trigger="hover"
popper-class="chart-warring-popper"> popper-class="chart-warring-popper">
<div class="moreTitle" @click="loadMore">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}</div> <div class="moreTitle" @click="loadMore">{{$t('dashboard.dashboard.moreTitle')}}{{$t('dashboard.dashboard.showAll')}}{{allDataLength}}</div>
<span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadMore"> <span slot="reference" class="panel-info-corner panel-info-corner--error" @click="loadMore">
<i class="nz-icon nz-icon-warning fa"></i> <i class="nz-icon nz-icon-warning fa"></i>
<span class="panel-info-corner-inner"></span> <span class="panel-info-corner-inner"></span>

4
nezha-fronted/src/components/cli/fileDirectory.vue
View File

@@ -300,7 +300,7 @@ export default {
{ name: 'backup.size', key: 'size' }, { name: 'backup.size', key: 'size' },
{ name: 'terminal.modifyTime', key: 'uts' }, { name: 'terminal.modifyTime', key: 'uts' },
{ name: 'Owner', key: 'Owner' }, { name: 'Owner', key: 'Owner' },
{ name: 'dashboard.panel.chartForm.group', key: 'group' }, { name: 'dashboard.dashboard.chartForm.group', key: 'group' },
{ name: 'config.menus.perms', key: 'permissionsString' } { name: 'config.menus.perms', key: 'permissionsString' }
], ],
@@ -558,7 +558,7 @@ export default {
// { name: 'backup.size', key: 'size' }, // { name: 'backup.size', key: 'size' },
// { name: 'terminal.modifyTime', key: 'uts' }, // { name: 'terminal.modifyTime', key: 'uts' },
// { name: 'Owner', key: 'Owner' }, // { name: 'Owner', key: 'Owner' },
// { name: 'dashboard.panel.chartForm.group', key: 'group' }, // { name: 'dashboard.dashboard.chartForm.group', key: 'group' },
// { name: 'config.menus.perms', key: 'permissionsString' } // { name: 'config.menus.perms', key: 'permissionsString' }
// //
// ] // ]

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

@@ -193,7 +193,7 @@
v-model="assetContent.assetId" v-model="assetContent.assetId"
size="small" size="small"
:language="language" :language="language"
:placeholder="$t('dashboard.panel.chartForm.selectAsset')" :placeholder="$t('dashboard.dashboard.chartForm.selectAsset')"
id="box-input-asset-id" id="box-input-asset-id"
:result-format="resultFormat"></v-selectpage> :result-format="resultFormat"></v-selectpage>
<button :disabled="prevent_opt.save" class="nz-btn nz-btn-size-normal nz-btn-style-normal" type="button" @click.prevent="connect">Connect</button> <button :disabled="prevent_opt.save" class="nz-btn nz-btn-size-normal nz-btn-style-normal" type="button" @click.prevent="connect">Connect</button>

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

@@ -197,7 +197,7 @@ export default {
{ prop: 'dashboardTab', name: this.$t('overall.dashboard') }, { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
{ prop: 'alertMessageTab', name: this.$t('overall.alert') }, { prop: 'alertMessageTab', name: this.$t('overall.alert') },
{ prop: 'endpointTab', name: this.$t('asset.endpoint') }, { prop: 'endpointTab', name: this.$t('asset.endpoint') },
{ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') } { prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') }
] ]
}, },
module: { module: {
@@ -211,7 +211,7 @@ export default {
{ prop: 'dashboardTab', name: this.$t('overall.dashboard') }, { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
{ prop: 'endpointAlertMessage', name: this.$t('overall.alert') }, { prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
{ prop: 'Metrics', name: this.$t('overall.metric') }, { prop: 'Metrics', name: this.$t('overall.metric') },
{ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') } { prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') }
] ]
}, },
chartTemp: { chartTemp: {
@@ -316,7 +316,7 @@ export default {
{ prop: 'dashboardTab', name: this.$t('overall.dashboard') }, { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
{ prop: 'alertMessageTab', name: this.$t('overall.alert') }, { prop: 'alertMessageTab', name: this.$t('overall.alert') },
{ prop: 'endpointTab', name: this.$t('asset.endpoint') }, { prop: 'endpointTab', name: this.$t('asset.endpoint') },
{ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') } { prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') }
] ]
if (hasSub) { if (hasSub) {
tabs.push({ prop: 'assetSubTab', name: this.$t('overall.assetSubTab') }) tabs.push({ prop: 'assetSubTab', name: this.$t('overall.assetSubTab') })
@@ -339,7 +339,7 @@ export default {
{ prop: 'Metrics', name: this.$t('overall.metric') } { prop: 'Metrics', name: this.$t('overall.metric') }
] ]
if (hasLog) { if (hasLog) {
tabs.push({ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') }) tabs.push({ prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') })
} }
return tabs return tabs
} }

2
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
View File

@@ -468,7 +468,7 @@ export default {
time: this.searchTime, time: this.searchTime,
nowTimeType: { nowTimeType: {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour'), text: this.$t('dashboard.dashboard.lastOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
} }

4
nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
View File

@@ -633,7 +633,7 @@ export default {
if (this.panelData.length > 0) { if (this.panelData.length > 0) {
this.filter.dashboardId = this.panelData[0].id this.filter.dashboardId = this.panelData[0].id
this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) this.showPanel = this.$loadsh.cloneDeep(this.panelData[0])
this.variables = this.$loadsh.get(this.panelData, '[0].param.variables') this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || [])
this.getData(this.filter) this.getData(this.filter)
} }
} }
@@ -651,7 +651,7 @@ export default {
// this.showPanel.id = this.filter.dashboardId = this.panelData[0].id // this.showPanel.id = this.filter.dashboardId = this.panelData[0].id
this.filter.dashboardId = this.panelData[0].id this.filter.dashboardId = this.panelData[0].id
this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) this.showPanel = this.$loadsh.cloneDeep(this.panelData[0])
this.variables = this.$loadsh.get(this.panelData, '[0].param.variables') this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || [])
this.getData(this.filter) this.getData(this.filter)
} else { } else {
this.chartListLoading = false this.chartListLoading = false

6
nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
View File

@@ -80,7 +80,7 @@
:min-width="1000" :min-width="1000"
column-key="element" column-key="element"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:label="$t('dashboard.panel.chartForm.element')"> :label="$t('dashboard.dashboard.chartForm.element')">
<template v-slot="scope"> <template v-slot="scope">
<el-popover trigger="hover" placement="right" v-if="typeof scope.row.metricTip != 'undefined' && scope.row.metricTip != null"> <el-popover trigger="hover" placement="right" v-if="typeof scope.row.metricTip != 'undefined' && scope.row.metricTip != null">
<div> <div>
@@ -407,7 +407,7 @@ export default {
this.$refs.pickTime.$refs.multipleTime.searchTime = [] this.$refs.pickTime.$refs.multipleTime.searchTime = []
this.$refs.pickTime.$refs.multipleTime.showTime = { this.$refs.pickTime.$refs.multipleTime.showTime = {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate') text: this.$t('dashboard.dashboard.noDate')
} }
this.$refs.pickTime.$refs.multipleTime.showDropdown = false this.$refs.pickTime.$refs.multipleTime.showDropdown = false
this.$nextTick(() => { this.$nextTick(() => {
@@ -419,7 +419,7 @@ export default {
this.$refs.pickTime.$refs.multipleTime.searchTime = [] this.$refs.pickTime.$refs.multipleTime.searchTime = []
this.$refs.pickTime.$refs.multipleTime.showTime = { this.$refs.pickTime.$refs.multipleTime.showTime = {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate') text: this.$t('dashboard.dashboard.noDate')
} }
this.$refs.pickTime.$refs.multipleTime.showDropdown = false this.$refs.pickTime.$refs.multipleTime.showDropdown = false
this.graphShow = false this.graphShow = false

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

@@ -5,7 +5,7 @@
class="top-tool-btn top-tool-btn--text" class="top-tool-btn top-tool-btn--text"
style="border-radius: 2px 0 0 2px; border-right: none;" style="border-radius: 2px 0 0 2px; border-right: none;"
@click="openSeletor" @click="openSeletor"
>{{$t('dashboard.panel.chartForm.unit')}}</button> >{{$t('dashboard.dashboard.chartForm.unit')}}</button>
<el-cascader :id="id+'-unit-input'" ref="unitSelector" v-model="unit" <el-cascader :id="id+'-unit-input'" ref="unitSelector" v-model="unit"
:options="chartUnits" :options="chartUnits"
:props="{ expandTrigger: 'click' ,emitPath:false}" :props="{ expandTrigger: 'click' ,emitPath:false}"

10
nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
View File

@@ -158,7 +158,7 @@ export default {
{ prop: 'dashboardTab', name: this.$t('overall.dashboard') }, { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
{ prop: 'alertMessageTab', name: this.$t('overall.alert') }, { prop: 'alertMessageTab', name: this.$t('overall.alert') },
{ prop: 'endpointTab', name: this.$t('asset.endpoint') }, { prop: 'endpointTab', name: this.$t('asset.endpoint') },
{ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') } { prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') }
] ]
}, },
module: { module: {
@@ -169,10 +169,10 @@ export default {
}, },
endpoint: { endpoint: {
endpointTabTitle: [ endpointTabTitle: [
{ prop: 'dashboardTab', name: this.$t('overall.detail') }, { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
{ prop: 'endpointAlertMessage', name: this.$t('overall.alert') }, { prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
{ prop: 'endpointQuery', name: this.$t('overall.metric') }, { prop: 'endpointQuery', name: this.$t('overall.metric') },
{ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') } { prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') }
] ]
}, },
chartTemp: { chartTemp: {
@@ -234,7 +234,7 @@ export default {
{ prop: 'dashboardTab', name: this.$t('overall.dashboard') }, { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
{ prop: 'alertMessageTab', name: this.$t('overall.alert') }, { prop: 'alertMessageTab', name: this.$t('overall.alert') },
{ prop: 'endpointTab', name: this.$t('asset.endpoint') }, { prop: 'endpointTab', name: this.$t('asset.endpoint') },
{ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') } { prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') }
] ]
if (hasSub) { if (hasSub) {
tabs.push({ prop: 'assetSubTab', name: this.$t('overall.assetSubTab') }) tabs.push({ prop: 'assetSubTab', name: this.$t('overall.assetSubTab') })
@@ -258,7 +258,7 @@ export default {
{ prop: 'endpointQuery', name: this.$t('overall.metrics') } { prop: 'endpointQuery', name: this.$t('overall.metrics') }
] ]
if (hasLog) { if (hasLog) {
tabs.push({ prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') }) tabs.push({ prop: 'log', name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label') })
} }
return tabs return tabs
} }

82
nezha-fronted/src/components/common/js/constants.js
View File

@@ -216,27 +216,27 @@ export const alertMessage = {
} }
export const statisticsList = [ export const statisticsList = [
{ value: 'min', label: i18n.t('dashboard.panel.chartForm.min') }, { value: 'min', label: i18n.t('dashboard.dashboard.chartForm.min') },
{ value: 'max', label: i18n.t('dashboard.panel.chartForm.max') }, { value: 'max', label: i18n.t('dashboard.dashboard.chartForm.max') },
{ value: 'avg', label: i18n.t('dashboard.panel.chartForm.statisticsVal.average') }, { value: 'avg', label: i18n.t('dashboard.dashboard.chartForm.statisticsVal.average') },
{ value: 'total', label: i18n.t('dashboard.panel.chartTotal') }, { value: 'total', label: i18n.t('dashboard.dashboard.chartTotal') },
{ value: 'first*', label: i18n.t('dashboard.panel.chartForm.statisticsVal.first*') }, { value: 'first*', label: i18n.t('dashboard.dashboard.chartForm.statisticsVal.first*') },
{ value: 'first', label: i18n.t('dashboard.panel.chartForm.statisticsVal.first') }, { value: 'first', label: i18n.t('dashboard.dashboard.chartForm.statisticsVal.first') },
{ value: 'last*', label: i18n.t('dashboard.panel.chartForm.statisticsVal.last*') }, { value: 'last*', label: i18n.t('dashboard.dashboard.chartForm.statisticsVal.last*') },
{ value: 'last', label: i18n.t('dashboard.panel.chartForm.statisticsVal.last') }, { value: 'last', label: i18n.t('dashboard.dashboard.chartForm.statisticsVal.last') },
{ value: 'range', label: i18n.t('dashboard.panel.chartForm.valMapping.range') }, { value: 'range', label: i18n.t('dashboard.dashboard.chartForm.valMapping.range') },
{ value: 'different', label: i18n.t('dashboard.panel.chartForm.statisticsVal.different') } { value: 'different', label: i18n.t('dashboard.dashboard.chartForm.statisticsVal.different') }
] ]
export const alignList = [ export const alignList = [
{ value: 'left', label: i18n.t('project.topology.left') }, { value: 'left', label: i18n.t('project.topology.left') },
{ value: 'center', label: i18n.t('project.topology.center') }, { value: 'center', label: i18n.t('project.topology.center') },
{ value: 'right', label: i18n.t('dashboard.panel.chartForm.alignList.right') } { value: 'right', label: i18n.t('dashboard.dashboard.chartForm.alignList.right') }
] ]
export const lockList = [ export const lockList = [
{ value: 1, label: i18n.t('dashboard.panel.chartForm.lockList.on') }, { value: 1, label: i18n.t('dashboard.dashboard.chartForm.lockList.on') },
{ value: 0, label: i18n.t('dashboard.panel.chartForm.lockList.off') } { value: 0, label: i18n.t('dashboard.dashboard.chartForm.lockList.off') }
] ]
export const chart = { export const chart = {
@@ -247,63 +247,63 @@ export const chart = {
type: [ type: [
{ {
value: 'line', value: 'line',
label: i18n.t('dashboard.panel.chartForm.typeVal.line.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
value: 'stackArea', value: 'stackArea',
label: i18n.t('dashboard.panel.chartForm.typeVal.stackArea.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
value: 'area', value: 'area',
label: i18n.t('dashboard.panel.chartForm.typeVal.stackArea.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
value: 'point', value: 'point',
label: i18n.t('dashboard.panel.chartForm.typeVal.point.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.point.label')
}, },
{ {
value: 'gauge', value: 'gauge',
label: i18n.t('dashboard.panel.chartForm.typeVal.gauge.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.gauge.label')
}, },
{ {
value: 'hexagon', value: 'hexagon',
label: i18n.t('dashboard.panel.chartForm.typeVal.hexagonFigure.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.hexagonFigure.label')
}, },
{ {
value: 'stat', value: 'stat',
label: i18n.t('dashboard.panel.chartForm.typeVal.singleStat.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.singleStat.label')
}, },
{ {
value: 'bar', value: 'bar',
label: i18n.t('dashboard.panel.chartForm.typeVal.bar.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.bar.label')
}, },
{ {
value: 'singleStat', value: 'singleStat',
label: i18n.t('dashboard.panel.chartForm.typeVal.singleStat.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.singleStat.label')
}, },
{ {
value: 'pie', value: 'pie',
label: i18n.t('dashboard.panel.chartForm.typeVal.pie.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.pie.label')
}, },
{ {
value: 'table', value: 'table',
label: i18n.t('dashboard.panel.chartForm.typeVal.table.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.table.label')
}, },
{ {
value: 'alertList', value: 'alertList',
label: i18n.t('dashboard.panel.chartForm.typeVal.alertList.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.alertList.label')
}, },
{ {
value: 'text', value: 'text',
label: i18n.t('dashboard.panel.chartForm.typeVal.text.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.text.label')
}, },
{ {
value: 'url', value: 'url',
label: i18n.t('dashboard.panel.chartForm.url') label: i18n.t('dashboard.dashboard.chartForm.url')
}, },
{ {
value: 'group', value: 'group',
label: i18n.t('dashboard.panel.chartForm.group') label: i18n.t('dashboard.dashboard.chartForm.group')
}, },
{ {
value: 'logs', value: 'logs',
@@ -311,57 +311,57 @@ export const chart = {
}, },
{ {
value: 'diagram', value: 'diagram',
label: i18n.t('dashboard.panel.chartForm.typeVal.diagram.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.diagram.label')
}, },
{ {
value: 'treemap', value: 'treemap',
label: i18n.t('dashboard.panel.chartForm.typeVal.treemap.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.treemap.label')
}, },
{ {
value: 'pie', value: 'pie',
label: i18n.t('dashboard.panel.chartForm.typeVal.pie.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.pie.label')
}, },
{ {
value: 'log', value: 'log',
label: i18n.t('dashboard.panel.chartForm.typeVal.log.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.log.label')
}, },
{ {
value: 'table', value: 'table',
label: i18n.t('dashboard.panel.chartForm.typeVal.table.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.table.label')
}, },
{ {
value: 'map', value: 'map',
label: i18n.t('dashboard.panel.chartForm.typeVal.map.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.map.label')
}, },
{ {
value: 'topology', value: 'topology',
label: i18n.t('dashboard.panel.chartForm.typeVal.topology.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.topology.label')
}, },
{ {
value: 'clock', value: 'clock',
label: i18n.t('dashboard.panel.chartForm.typeVal.clock.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.clock.label')
}, },
{ {
value: 'bubble', value: 'bubble',
label: i18n.t('dashboard.panel.chartForm.typeVal.bubble.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.bubble.label')
}, },
{ {
value: 'rank', value: 'rank',
label: i18n.t('dashboard.panel.chartForm.typeVal.rank.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.rank.label')
}, },
{ {
value: 'sankey', value: 'sankey',
label: i18n.t('dashboard.panel.chartForm.typeVal.sankey.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.sankey.label')
}, },
{ {
value: 'funnel', value: 'funnel',
label: i18n.t('dashboard.panel.chartForm.typeVal.funnel.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.funnel.label')
} }
] ]
} }
export const intervalList = [ export const intervalList = [
{ value: -1, label: i18n.t('dashboard.panel.chartForm.lockList.off') }, { value: -1, label: i18n.t('dashboard.dashboard.chartForm.lockList.off') },
{ value: 30, label: '30s' }, { value: 30, label: '30s' },
{ value: 60, label: '1m' }, { value: 60, label: '1m' },
{ value: 300, label: '5m' }, { value: 300, label: '5m' },

2
nezha-fronted/src/components/common/language/cn.js
View File

@@ -282,7 +282,7 @@ const cn = {
createPanelTitleSec: '新增面板', createPanelTitleSec: '新增面板',
editPanelTitle: '面板', editPanelTitle: '面板',
singleStatErrorTip: '仅支持返回单个系列/表的查询', singleStatErrorTip: '仅支持返回单个系列/表的查询',
panelForm: { dashboardForm: {
panelName: '面板名称', panelName: '面板名称',
dashboardId: 'ID' dashboardId: 'ID'
}, },

2
nezha-fronted/src/components/common/language/en.js
View File

@@ -291,7 +291,7 @@ const en = {
createPanelTitleSec: 'New panel', // "新增面板" createPanelTitleSec: 'New panel', // "新增面板"
editPanelTitle: 'Edit panel', // "面板" editPanelTitle: 'Edit panel', // "面板"
singleStatErrorTip: 'Only queries that return single series/table is supported', singleStatErrorTip: 'Only queries that return single series/table is supported',
panelForm: { dashboardForm: {
panelName: 'Panel name', // "面板名称" panelName: 'Panel name', // "面板名称"
dashboardId: 'ID' // ID dashboardId: 'ID' // ID
}, },

46
nezha-fronted/src/components/common/multipleTime.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="multiple-time-box"> <div class="multiple-time-box">
<div :class="showDropdown?'compare-box':''" :title="$t('dashboard.panel.customTimeRange')"><i class="nz-icon nz-icon-compare" @click="changeShowDropdown" /></div> <div :class="showDropdown?'compare-box':''" :title="$t('dashboard.dashboard.customTimeRange')"><i class="nz-icon nz-icon-compare" @click="changeShowDropdown" /></div>
<transition> <transition>
<div v-show="showDropdown" id="panel-calender" class="calendar" style="position: relative"> <div v-show="showDropdown" id="panel-calender" class="calendar" style="position: relative">
<my-date-picker prefix-icon=" " size="mini" ref="calendar" <my-date-picker prefix-icon=" " size="mini" ref="calendar"
@@ -23,14 +23,14 @@
<el-col :span="24" class="calendar-popover-text">{{searchTime[0]}}</el-col> <el-col :span="24" class="calendar-popover-text">{{searchTime[0]}}</el-col>
</el-row> </el-row>
<el-row :gutter="10" class="calendar-popover"> <el-row :gutter="10" class="calendar-popover">
<el-col :span="24" class="calendar-popover-text">{{$t('dashboard.panel.to')}}</el-col> <el-col :span="24" class="calendar-popover-text">{{$t('dashboard.dashboard.to')}}</el-col>
</el-row> </el-row>
<el-row :gutter="10" class="calendar-popover"> <el-row :gutter="10" class="calendar-popover">
<el-col :span="24" class="calendar-popover-text">{{searchTime[1]}}</el-col> <el-col :span="24" class="calendar-popover-text">{{searchTime[1]}}</el-col>
</el-row> </el-row>
</template> </template>
<template v-else> <template v-else>
<div class="time-no-data">{{$t("dashboard.panel.noDate")}}</div> <div class="time-no-data">{{$t("dashboard.dashboard.noDate")}}</div>
</template> </template>
<div class="el-dropdown-link" slot="reference"> <div class="el-dropdown-link" slot="reference">
<i class="nz-icon nz-icon-time" style="width:20px;"></i> <i class="nz-icon nz-icon-time" style="width:20px;"></i>
@@ -73,88 +73,88 @@ export default {
step: '', step: '',
showTime: { showTime: {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate') text: this.$t('dashboard.dashboard.noDate')
}, },
timeData: [ timeData: [
{ {
id: 0, id: 0,
text: this.$t('dashboard.panel.customTimeRange') text: this.$t('dashboard.dashboard.customTimeRange')
}, },
{ {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate') text: this.$t('dashboard.dashboard.noDate')
}, },
{ {
id: 1, id: 1,
text: this.$t('dashboard.panel.beforeFiveMin'), text: this.$t('dashboard.dashboard.beforeFiveMin'),
type: 'minute', type: 'minute',
value: 5 value: 5
}, },
{ {
id: 2, id: 2,
text: this.$t('dashboard.panel.beforeFifteenMin'), text: this.$t('dashboard.dashboard.beforeFifteenMin'),
type: 'minute', type: 'minute',
value: 15 value: 15
}, },
{ {
id: 3, id: 3,
text: this.$t('dashboard.panel.beforeThirtyMin'), text: this.$t('dashboard.dashboard.beforeThirtyMin'),
type: 'minute', type: 'minute',
value: 30 value: 30
}, },
{ {
id: 4, id: 4,
text: this.$t('dashboard.panel.beforeOneHour'), text: this.$t('dashboard.dashboard.beforeOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
}, },
{ {
id: 5, id: 5,
text: this.$t('dashboard.panel.beforeThreeHour'), text: this.$t('dashboard.dashboard.beforeThreeHour'),
type: 'hour', type: 'hour',
value: 3 value: 3
}, },
{ {
id: 6, id: 6,
text: this.$t('dashboard.panel.beforeSixHour'), text: this.$t('dashboard.dashboard.beforeSixHour'),
type: 'hour', type: 'hour',
value: 6 value: 6
}, },
{ {
id: 7, id: 7,
text: this.$t('dashboard.panel.beforeTwelveHour'), text: this.$t('dashboard.dashboard.beforeTwelveHour'),
type: 'hour', type: 'hour',
value: 12 value: 12
}, },
{ {
id: 8, id: 8,
text: this.$t('dashboard.panel.beforeTwentyFourHour'), text: this.$t('dashboard.dashboard.beforeTwentyFourHour'),
type: 'hour', type: 'hour',
value: 24 value: 24
}, },
{ {
id: 9, id: 9,
text: this.$t('dashboard.panel.beforeTwoDay'), text: this.$t('dashboard.dashboard.beforeTwoDay'),
type: 'date', type: 'date',
value: 2 value: 2
}, },
{ {
id: 10, id: 10,
text: this.$t('dashboard.panel.beforeSevenDay'), text: this.$t('dashboard.dashboard.beforeSevenDay'),
type: 'date', type: 'date',
value: 7 value: 7
}, },
{ {
id: 11, id: 11,
text: this.$t('dashboard.panel.beforeThirtyDay'), text: this.$t('dashboard.dashboard.beforeThirtyDay'),
type: 'date', type: 'date',
value: 30 value: 30
} }
], ],
nowTimeType: { nowTimeType: {
id: 4, id: 4,
text: this.$t('dashboard.panel.beforeOneHour'), text: this.$t('dashboard.dashboard.beforeOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
}, },
@@ -205,9 +205,9 @@ export default {
this.$set(this.searchTime, 1, endTime) this.$set(this.searchTime, 1, endTime)
// let timerPicker = document.querySelector('#timePickerContent'); // let timerPicker = document.querySelector('#timePickerContent');
// timerPicker.innerText = this.searchTime[0]+" "+this.$t("dashboard.panel.to")+" "+this.searchTime[1]; // timerPicker.innerText = this.searchTime[0]+" "+this.$t("dashboard.dashboard.to")+" "+this.searchTime[1];
this.$set(this.showTime, 'id', 0) this.$set(this.showTime, 'id', 0)
this.$set(this.showTime, 'text', this.searchTime[0] + ' ' + this.$t('dashboard.panel.to') + ' ' + this.searchTime[1]) this.$set(this.showTime, 'text', this.searchTime[0] + ' ' + this.$t('dashboard.dashboard.to') + ' ' + this.searchTime[1])
this.$set(this.showTime, 'type', '') this.$set(this.showTime, 'type', '')
this.$set(this.showTime, 'value', '') this.$set(this.showTime, 'value', '')
/* /*
@@ -215,7 +215,7 @@ export default {
if(tipElementList && tipElementList.length===3){ if(tipElementList && tipElementList.length===3){
console.log('-0-0-0',tipElementList); console.log('-0-0-0',tipElementList);
tipElementList[0].innerHTML = this.searchTime[0]; tipElementList[0].innerHTML = this.searchTime[0];
tipElementList[1].innerHTML = this.$t("dashboard.panel.to"); tipElementList[1].innerHTML = this.$t("dashboard.dashboard.to");
tipElementList[2].innerHTML = this.searchTime[1]; tipElementList[2].innerHTML = this.searchTime[1];
console.log('-0-0-2',tipElementList); console.log('-0-0-2',tipElementList);
} */ } */
@@ -311,7 +311,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.showTime = this.nowTimeType = { this.showTime = this.nowTimeType = {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate') text: this.$t('dashboard.dashboard.noDate')
} }
}, 500) }, 500)
this.$emit('change', this.searchTime) this.$emit('change', this.searchTime)
@@ -319,7 +319,7 @@ export default {
this.searchTime = [] this.searchTime = []
this.showTime = this.nowTimeType = { this.showTime = this.nowTimeType = {
id: 4, id: 4,
text: this.$t('dashboard.panel.beforeOneHour'), text: this.$t('dashboard.dashboard.beforeOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
} }

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

@@ -50,7 +50,7 @@
<template v-if="activeIndex === 4"> <template v-if="activeIndex === 4">
<div class="desc-text">{{$t('guide.visualizationTip')}}</div> <div class="desc-text">{{$t('guide.visualizationTip')}}</div>
<div class="guide__btn-group"> <div class="guide__btn-group">
<button :class="{'guide__btn--disabled': !hasButton('main_add')}" class="guide__btn" type="button" @click="jumpAndOpen('dashboard')">{{$t('dashboard.panel.createPanelTitleSec')}}</button> <button :class="{'guide__btn--disabled': !hasButton('main_add')}" class="guide__btn" type="button" @click="jumpAndOpen('dashboard')">{{$t('dashboard.dashboard.createDashboardTitleSec')}}</button>
<button :class="{'guide__btn--disabled': !hasButton('main_add')}" class="guide__btn" type="button" @click="jumpAndOpen('chart')">{{$t('overall.createChart')}}</button> <button :class="{'guide__btn--disabled': !hasButton('main_add')}" class="guide__btn" type="button" @click="jumpAndOpen('chart')">{{$t('overall.createChart')}}</button>
</div> </div>
</template> </template>

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

@@ -6,7 +6,7 @@
</button> </button>
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top nz-el-dropdown-menu"> <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top nz-el-dropdown-menu">
<el-dropdown-item v-if="showLock" v-has="'main_edit'"> <el-dropdown-item v-if="showLock" v-has="'main_edit'">
<div @click="editPanel" id="edit-bottom-dashboard"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.panel.editPanelTitle')}}</div> <div @click="editPanel" id="edit-bottom-dashboard"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.dashboard.editPanelTitle')}}</div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="showLock" v-has="'main_edit'"> <el-dropdown-item v-if="showLock" v-has="'main_edit'">
<div @click="panelLock=!panelLock" id="panel-lock"><i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>{{!panelLock ? $t("overall.locked") : $t("overall.unlocked")}}</div> <div @click="panelLock=!panelLock" id="panel-lock"><i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>{{!panelLock ? $t("overall.locked") : $t("overall.unlocked")}}</div>

28
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -21,7 +21,7 @@
<!--value mapping--> <!--value mapping-->
<el-row class="form-row-title"> <el-row class="form-row-title">
{{ $t('dashboard.panel.chartForm.thresholds') }} {{ $t('dashboard.dashboard.chartForm.thresholds') }}
<span v-if="selection.pen.data.valueMappingSort !=='desc'" class="title__label" <span v-if="selection.pen.data.valueMappingSort !=='desc'" class="title__label"
>（0:Ok > … >{{ >（0:Ok > … >{{
selection.pen.data.valueMapping.length selection.pen.data.valueMapping.length
@@ -63,7 +63,7 @@
<template> <template>
<!--chart aggregation--> <!--chart aggregation-->
<el-col class="legend-title"> <el-col class="legend-title">
{{ $t('dashboard.panel.chartForm.aggregation') }}&nbsp; {{ $t('dashboard.dashboard.chartForm.aggregation') }}&nbsp;
</el-col> </el-col>
<el-col style="width: calc(100% - 120px)"> <el-col style="width: calc(100% - 120px)">
<el-select v-model="selection.pen.data.aggregation" :placeholder="$t('el.select.placeholder')" <el-select v-model="selection.pen.data.aggregation" :placeholder="$t('el.select.placeholder')"
@@ -172,7 +172,7 @@
</transition> </transition>
<!--tooltip--> <!--tooltip-->
<el-row class="form-row-title" :style="{'margin-top': '10px'}"> <el-row class="form-row-title" :style="{'margin-top': '10px'}">
{{ $t('dashboard.panel.chartForm.tooltip') }} {{ $t('dashboard.dashboard.chartForm.tooltip') }}
<el-form-item class="float-right" prop="type" style="height: 100%;"> <el-form-item class="float-right" prop="type" style="height: 100%;">
<el-switch <el-switch
v-model="selection.pen.data.tooltipShow" v-model="selection.pen.data.tooltipShow"
@@ -194,7 +194,7 @@
show-word-limit type="textarea" size="small" :rows="2"/> show-word-limit type="textarea" size="small" :rows="2"/>
</el-form-item> </el-form-item>
<!--chart unit--> <!--chart unit-->
<el-form-item v-show="selection.pen.data.type !='text'" :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item" <el-form-item v-show="selection.pen.data.type !='text'" :label="$t('dashboard.dashboard.chartForm.unit')" class="half-form-item"
prop="unit"> prop="unit">
<el-cascader v-model="selection.pen.data.unit" <el-cascader v-model="selection.pen.data.unit"
:options="unitOptions" :options="unitOptions"
@@ -242,9 +242,9 @@
<el-row style="margin-top: 10px"> <el-row style="margin-top: 10px">
<template> <template>
<el-col class="legend-title"> <el-col class="legend-title">
{{ $t('dashboard.panel.chartForm.legend') }}&nbsp; {{ $t('dashboard.dashboard.chartForm.legend') }}&nbsp;
<el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside"> <el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside">
<div :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{ $t('dashboard.panel.chartForm.legendTip') }}</div> <div :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{ $t('dashboard.dashboard.chartForm.legendTip') }}</div>
<i slot="reference" class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;" <i slot="reference" class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"
@mouseover="rz"></i> @mouseover="rz"></i>
</el-popover> </el-popover>
@@ -324,7 +324,7 @@
</div> </div>
<div class="props-pen-item" v-if="selection.pen&&!selection.pen.type"> <div class="props-pen-item" v-if="selection.pen&&!selection.pen.type">
<div>{{ $t('dashboard.panel.chartForm.width') }}</div> <div>{{ $t('dashboard.dashboard.chartForm.width') }}</div>
<div class="p10 pl0"> <div class="p10 pl0">
<el-input-number <el-input-number
@focus="inputFocus" @focus="inputFocus"
@@ -345,7 +345,7 @@
</div> </div>
<div class="props-pen-item" v-if="selection.pen&&!selection.pen.type"> <div class="props-pen-item" v-if="selection.pen&&!selection.pen.type">
<div>{{ $t('dashboard.panel.chartForm.high') }}</div> <div>{{ $t('dashboard.dashboard.chartForm.high') }}</div>
<div class="p10 pl0"> <div class="p10 pl0">
<el-input-number <el-input-number
@focus="inputFocus" @focus="inputFocus"
@@ -1122,19 +1122,19 @@ export default {
chartTypeList: [ chartTypeList: [
{ {
id: 'line', id: 'line',
name: this.$t('dashboard.panel.chartForm.typeVal.line.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
id: 'stackArea', id: 'stackArea',
name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
} }
// { // {
// id: 'bar', // id: 'bar',
// name: this.$t('dashboard.panel.chartForm.typeVal.bar.label') // name: this.$t('dashboard.dashboard.chartForm.typeVal.bar.label')
// }, // },
// { // {
// id: 'table', // id: 'table',
// name: this.$t('dashboard.panel.chartForm.typeVal.table.label') // name: this.$t('dashboard.dashboard.chartForm.typeVal.table.label')
// } // }
], ],
aggregationList: [ aggregationList: [
@@ -1207,7 +1207,7 @@ export default {
desc: this.$t('overall.left') desc: this.$t('overall.left')
}, { }, {
value: 'right', value: 'right',
desc: this.$t('dashboard.panel.chartForm.alignList.right') desc: this.$t('dashboard.dashboard.chartForm.alignList.right')
}, { }, {
value: 'top', value: 'top',
desc: this.$t('project.topology.topOffsetY') desc: this.$t('project.topology.topOffsetY')
@@ -1381,7 +1381,7 @@ export default {
}, },
{ {
id: 'right', id: 'right',
name: this.$t('dashboard.panel.chartForm.alignList.right') name: this.$t('dashboard.dashboard.chartForm.alignList.right')
} }
], ],
textBaselineOptions: [ textBaselineOptions: [

2
nezha-fronted/src/components/common/project/L5/topoTooltip.vue
View File

@@ -222,7 +222,7 @@ export default {
singleStatRlt = bus.getSingleStatRlt(statistics, response.data.result[0].values) singleStatRlt = bus.getSingleStatRlt(statistics, response.data.result[0].values)
} }
} else if (response.data.result.length > 1) { } else if (response.data.result.length > 1) {
singleStatRlt = this.$t('dashboard.panel.singleStatErrorTip') singleStatRlt = this.$t('dashboard.dashboard.singleStatErrorTip')
} }
} else { } else {
response.data.result.forEach((queryItem, resIndex) => { response.data.result.forEach((queryItem, resIndex) => {

2
nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
View File

@@ -134,7 +134,7 @@ export default {
icon: 'nz-icon-zuoduiqi' icon: 'nz-icon-zuoduiqi'
}, { }, {
value: 'right', value: 'right',
desc: this.$t('dashboard.panel.chartForm.alignList.right'), desc: this.$t('dashboard.dashboard.chartForm.alignList.right'),
icon: 'nz-icon-youduiqi' icon: 'nz-icon-youduiqi'
}, { }, {
value: 'top', value: 'top',

34
nezha-fronted/src/components/common/project/meta2d/meta2dData.vue
View File

@@ -101,7 +101,7 @@
<span @click="removeExpression(index - 1)" class="nz-icon-minus-medium" style="margin-right: 5px" :title="$t('overall.delete')"> <span @click="removeExpression(index - 1)" class="nz-icon-minus-medium" style="margin-right: 5px" :title="$t('overall.delete')">
<i class="nz-icon nz-icon-minus"></i> <i class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -128,10 +128,10 @@
</div> </div>
<el-row style="margin-top: 18px;display: flex"> <el-row style="margin-top: 18px;display: flex">
<el-col class="legend-title"> <el-col class="legend-title">
<span class="legend-title__span">{{$t('dashboard.panel.chartForm.legend')}}&nbsp;</span> <span class="legend-title__span">{{$t('dashboard.dashboard.chartForm.legend')}}&nbsp;</span>
<el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside"> <el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside">
<div style="white-space: normal" :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div> <div style="white-space: normal" :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{$t('dashboard.dashboard.chartForm.legendTip')}}</div>
<!-- <div :style="{'word-break':language!=='cn'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div> --> <!-- <div :style="{'word-break':language!=='cn'?'keep-all':'break-all'}">{{$t('dashboard.dashboard.chartForm.legendTip')}}</div> -->
<i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover> </el-popover>
</el-col> </el-col>
@@ -142,7 +142,7 @@
<el-row style="margin-top: 18px;display: flex"> <el-row style="margin-top: 18px;display: flex">
<div class="form-row-item"> <div class="form-row-item">
<div class="form-row-key"> <div class="form-row-key">
{{$t('dashboard.panel.chartForm.statistics')}} {{$t('dashboard.dashboard.chartForm.statistics')}}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-select v-model="expressionsShow[index-1].statistic" size="small"> <el-select v-model="expressionsShow[index-1].statistic" size="small">
@@ -152,7 +152,7 @@
</div> </div>
<div class="form-row-item"> <div class="form-row-item">
<div class="form-row-key"> <div class="form-row-key">
{{$t('dashboard.panel.chartForm.unit')}} {{$t('dashboard.dashboard.chartForm.unit')}}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-cascader :id="'columns-unit'" v-model="expressionsShow[index-1].unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable <el-cascader :id="'columns-unit'" v-model="expressionsShow[index-1].unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable
@@ -197,7 +197,7 @@ export default {
mixins: [promqlInputMixin, rz], mixins: [promqlInputMixin, rz],
props: { props: {
querysArray: {}, querysArray: {},
params: {}, params: {}
}, },
components: { components: {
draggable, draggable,
@@ -225,61 +225,61 @@ export default {
timeData: [ timeData: [
{ {
id: 1, id: 1,
text: this.$t('dashboard.panel.lastFiveMin'), text: this.$t('dashboard.dashboard.lastFiveMin'),
type: 'minute', type: 'minute',
value: 5 value: 5
}, },
{ {
id: 2, id: 2,
text: this.$t('dashboard.panel.lastFifteenMin'), text: this.$t('dashboard.dashboard.lastFifteenMin'),
type: 'minute', type: 'minute',
value: 15 value: 15
}, },
{ {
id: 3, id: 3,
text: this.$t('dashboard.panel.lastThirtyMin'), text: this.$t('dashboard.dashboard.lastThirtyMin'),
type: 'minute', type: 'minute',
value: 30 value: 30
}, },
{ {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour'), text: this.$t('dashboard.dashboard.lastOneHour'),
type: 'hour', type: 'hour',
value: 60 value: 60
}, },
{ {
id: 5, id: 5,
text: this.$t('dashboard.panel.lastThreeHour'), text: this.$t('dashboard.dashboard.lastThreeHour'),
type: 'hour', type: 'hour',
value: 3 * 60 value: 3 * 60
}, },
{ {
id: 6, id: 6,
text: this.$t('dashboard.panel.lastSixHour'), text: this.$t('dashboard.dashboard.lastSixHour'),
type: 'hour', type: 'hour',
value: 6 * 60 value: 6 * 60
}, },
{ {
id: 7, id: 7,
text: this.$t('dashboard.panel.lastTwelveHour'), text: this.$t('dashboard.dashboard.lastTwelveHour'),
type: 'hour', type: 'hour',
value: 12 * 60 value: 12 * 60
}, },
{ {
id: 8, id: 8,
text: this.$t('dashboard.panel.lastTwentyFourHour'), text: this.$t('dashboard.dashboard.lastTwentyFourHour'),
type: 'hour', type: 'hour',
value: 24 * 60 value: 24 * 60
}, },
{ {
id: 9, id: 9,
text: this.$t('dashboard.panel.lastTwoDay'), text: this.$t('dashboard.dashboard.lastTwoDay'),
type: 'date', type: 'date',
value: 2 * 24 * 60 value: 2 * 24 * 60
}, },
{ {
id: 10, id: 10,
text: this.$t('dashboard.panel.lastSevenDay'), text: this.$t('dashboard.dashboard.lastSevenDay'),
type: 'date', type: 'date',
value: 7 * 24 * 60 value: 7 * 24 * 60
} }

28
nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
View File

@@ -87,7 +87,7 @@
</div> </div>
<div class="form-row-item"> <div class="form-row-item">
<div class="form-row-key"> <div class="form-row-key">
<div>{{ $t('dashboard.panel.chartForm.width') }}</div> <div>{{ $t('dashboard.dashboard.chartForm.width') }}</div>
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-input-number <el-input-number
@@ -106,7 +106,7 @@
</div> </div>
<div class="form-row-item"> <div class="form-row-item">
<div class="form-row-key"> <div class="form-row-key">
<div>{{ $t('dashboard.panel.chartForm.high') }}</div> <div>{{ $t('dashboard.dashboard.chartForm.high') }}</div>
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-input-number <el-input-number
@@ -198,7 +198,7 @@
</div> </div>
<div class="form-row-item"> <div class="form-row-item">
<div class="form-row-key"> <div class="form-row-key">
{{ $t('dashboard.panel.chartForm.width') }} {{ $t('dashboard.dashboard.chartForm.width') }}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-input-number <el-input-number
@@ -394,14 +394,14 @@
<span class="panel-dropdown-label-txt">{{ $t('project.topology.text') }}</span> <span class="panel-dropdown-label-txt">{{ $t('project.topology.text') }}</span>
</el-option> </el-option>
<el-option :label="'Legend'" :value="'legend'"> <el-option :label="'Legend'" :value="'legend'">
<span class="panel-dropdown-label-txt">{{ $t('dashboard.panel.chartForm.legend') }}</span> <span class="panel-dropdown-label-txt">{{ $t('dashboard.dashboard.chartForm.legend') }}</span>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<div class="form-row-item form-row-item-full" v-if="pen.data.source !== 'legend'"> <div class="form-row-item form-row-item-full" v-if="pen.data.source !== 'legend'">
<div class="form-row-key"> <div class="form-row-key">
{{$t('dashboard.panel.chartForm.content')}} {{$t('dashboard.dashboard.chartForm.content')}}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-input maxlength="256" show-word-limit v-model="pen.text" size="small" :rows="4" type="textarea" @change="change('text')"/> <el-input maxlength="256" show-word-limit v-model="pen.text" size="small" :rows="4" type="textarea" @change="change('text')"/>
@@ -411,7 +411,7 @@
<div class="form-row-value"> <div class="form-row-value">
<div class="form-row-item form-row-item-full"> <div class="form-row-item form-row-item-full">
<div class="form-row-key"> <div class="form-row-key">
{{ $t('dashboard.panel.chartForm.legend') }} {{ $t('dashboard.dashboard.chartForm.legend') }}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<div style="display: inline-block;width: calc(20% - 3px)"> <div style="display: inline-block;width: calc(20% - 3px)">
@@ -616,7 +616,7 @@
</div> </div>
<div class="form-row-item"> <div class="form-row-item">
<div class="form-row-key"> <div class="form-row-key">
{{ $t('dashboard.panel.chartForm.width') }} {{ $t('dashboard.dashboard.chartForm.width') }}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-input-number <el-input-number
@@ -746,7 +746,7 @@
<!-- valueMapping --> <!-- valueMapping -->
<div class="form-row-title"> <div class="form-row-title">
{{$t('dashboard.panel.chartForm.valueMapping')}} {{$t('dashboard.dashboard.chartForm.valueMapping')}}
<span> <span>
<el-switch <el-switch
v-model="pen.data.enable.valueMapping" v-model="pen.data.enable.valueMapping"
@@ -762,7 +762,7 @@
<div class="form-row-content"> <div class="form-row-content">
<div class="form-row-item form-row-item-full"> <div class="form-row-item form-row-item-full">
<div class="form-row-key"> <div class="form-row-key">
{{$t('dashboard.panel.chartForm.legend')}} {{$t('dashboard.dashboard.chartForm.legend')}}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<div style="display: inline-block;width: calc(20% - 3px)"> <div style="display: inline-block;width: calc(20% - 3px)">
@@ -833,7 +833,7 @@
<span @click="removeMapping(index)" style="margin-right: 5px" :title="$t('overall.delete')"> <span @click="removeMapping(index)" style="margin-right: 5px" :title="$t('overall.delete')">
<i class="nz-icon nz-icon-minus"></i> <i class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -1003,7 +1003,7 @@
</div> </div>
<div class="form-row-item form-row-item-full"> <div class="form-row-item form-row-item-full">
<div class="form-row-key"> <div class="form-row-key">
{{$t('dashboard.panel.chartForm.content')}} {{$t('dashboard.dashboard.chartForm.content')}}
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<el-input maxlength="256" show-word-limit v-model="pen.data.tooltip.content" size="small" :rows="4" type="textarea"/> <el-input maxlength="256" show-word-limit v-model="pen.data.tooltip.content" size="small" :rows="4" type="textarea"/>
@@ -1111,7 +1111,7 @@ export default {
}, },
{ {
id: 'right', id: 'right',
name: this.$t('dashboard.panel.chartForm.alignList.right') name: this.$t('dashboard.dashboard.chartForm.alignList.right')
} }
], ],
textBaselineOptions: [ textBaselineOptions: [
@@ -1185,10 +1185,10 @@ export default {
label: this.$t('overall.value'), label: this.$t('overall.value'),
value: 'value' value: 'value'
}, { }, {
label: this.$t('dashboard.panel.chartForm.valMapping.range'), label: this.$t('dashboard.dashboard.chartForm.valMapping.range'),
value: 'range' value: 'range'
}, { }, {
label: this.$t('dashboard.panel.chartForm.valMapping.regx'), label: this.$t('dashboard.dashboard.chartForm.valMapping.regx'),
value: 'regx' value: 'regx'
} }
] ]

4
nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
View File

@@ -102,7 +102,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<!--unit--> <!--unit-->
<el-form-item v-if="showSnmpTrap" :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item" prop="unit" :rules="[{ required: this.editAlertRule.type !== 3, message: this.$t('validate.required'), trigger: 'blur' }]"> <el-form-item v-if="showSnmpTrap" :label="$t('dashboard.dashboard.chartForm.unit')" class="half-form-item" prop="unit" :rules="[{ required: this.editAlertRule.type !== 3, message: this.$t('validate.required'), trigger: 'blur' }]">
<el-cascader id="alert-box-input-unit" v-model="editAlertRule.unit" :options="unitOptions" :props="{ expandTrigger: 'click',emitPath:false }" :show-all-levels="false" filterable <el-cascader id="alert-box-input-unit" v-model="editAlertRule.unit" :options="unitOptions" :props="{ expandTrigger: 'click',emitPath:false }" :show-all-levels="false" filterable
placeholder="" placeholder=""
popper-class="no-style-class dc-dropdown unit-popper-class" popper-class="no-style-class dc-dropdown unit-popper-class"
@@ -292,7 +292,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--receiver--> <!--receiver-->
<el-form-item :label="$t('dashboard.panel.receivers')" prop="receiver" :rules="[{ required: editAlertRule.notifyExpired || editAlertRule.notifyActive, message: this.$t('validate.required'), trigger: 'blur' }]"> <el-form-item :label="$t('dashboard.dashboard.receivers')" prop="receiver" :rules="[{ required: editAlertRule.notifyExpired || editAlertRule.notifyActive, message: this.$t('validate.required'), trigger: 'blur' }]">
<el-select <el-select
id="alert-box-input-receiver" id="alert-box-input-receiver"
v-model="editAlertRule.receiverShow" v-model="editAlertRule.receiverShow"

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

@@ -19,7 +19,7 @@
<el-form-item :label='$t("overall.key")' prop="metaKey"> <el-form-item :label='$t("overall.key")' prop="metaKey">
<el-input placeholder="" maxlength="128" show-word-limit v-model="editAssetMeta.metaKey" size="small" id="editAssetMeta-box-input-key"></el-input> <el-input placeholder="" maxlength="128" show-word-limit v-model="editAssetMeta.metaKey" size="small" id="editAssetMeta-box-input-key"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("dashboard.panel.chartForm.group")' prop="groupId"> <el-form-item :label='$t("dashboard.dashboard.chartForm.group")' prop="groupId">
<el-select v-model="editAssetMeta.groupId" size="small" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" :popper-append-to-body="false"> <el-select v-model="editAssetMeta.groupId" size="small" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" :popper-append-to-body="false">
<el-option v-for="(item, index) in groupData" :key="index" :value="item.id" :label="item.name"></el-option> <el-option v-for="(item, index) in groupData" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select> </el-select>

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

@@ -70,7 +70,7 @@
<span @click="removeExpression(index - 1)" class="nz-icon-minus-medium" style="margin-right: 5px" :title="$t('overall.delete')"> <span @click="removeExpression(index - 1)" class="nz-icon-minus-medium" style="margin-right: 5px" :title="$t('overall.delete')">
<i class="nz-icon nz-icon-minus"></i> <i class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -97,10 +97,10 @@
</el-form-item> </el-form-item>
<el-row style="margin-top: 18px;display: flex"> <el-row style="margin-top: 18px;display: flex">
<el-col class="legend-title"> <el-col class="legend-title">
<span class="legend-title__span">{{$t('dashboard.panel.chartForm.legend')}}&nbsp;</span> <span class="legend-title__span">{{$t('dashboard.dashboard.chartForm.legend')}}&nbsp;</span>
<el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside"> <el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside">
<div style="white-space: normal" :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div> <div style="white-space: normal" :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{$t('dashboard.dashboard.chartForm.legendTip')}}</div>
<!-- <div :style="{'word-break':language!=='cn'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div> --> <!-- <div :style="{'word-break':language!=='cn'?'keep-all':'break-all'}">{{$t('dashboard.dashboard.chartForm.legendTip')}}</div> -->
<i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover> </el-popover>
</el-col> </el-col>
@@ -116,7 +116,7 @@
<!--title--> <!--title-->
<div class="form__sub-title" > <div class="form__sub-title" >
<span>{{$t('dashboard.panel.chartForm.displayConfig')}}</span> <span>{{$t('dashboard.dashboard.chartForm.displayConfig')}}</span>
</div> </div>
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!-- type --> <!-- type -->
@@ -148,7 +148,7 @@
<!-- unit --> <!-- unit -->
<el-form-item <el-form-item
v-show="!isTable(chartConfig.type)&&!isLog(chartConfig.type)" v-show="!isTable(chartConfig.type)&&!isLog(chartConfig.type)"
:label="$t('dashboard.panel.chartForm.unit')" :label="$t('dashboard.dashboard.chartForm.unit')"
class="form-item--half-width" class="form-item--half-width"
prop="unit" prop="unit"
> >
@@ -169,7 +169,7 @@
<!-- index --> <!-- index -->
<el-form-item <el-form-item
v-show="isTable(chartConfig.type)" v-show="isTable(chartConfig.type)"
:label="$t('dashboard.panel.chartForm.tableIndex')" :label="$t('dashboard.dashboard.chartForm.tableIndex')"
class="form-item--half-width" class="form-item--half-width"
prop="param.index" prop="param.index"
> >
@@ -198,7 +198,7 @@
<!--width--> <!--width-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.width')" :label="$t('dashboard.dashboard.chartForm.width')"
class="form-item--half-width" class="form-item--half-width"
prop="span"> prop="span">
<el-select <el-select
@@ -223,7 +223,7 @@
<!--height--> <!--height-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.high')" :label="$t('dashboard.dashboard.chartForm.high')"
class="form-item--half-width" class="form-item--half-width"
prop="height"> prop="height">
<!-- 由px改为span --> <!-- 由px改为span -->
@@ -250,7 +250,7 @@
<!--stack--> <!--stack-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.stack')" :label="$t('dashboard.dashboard.chartForm.stack')"
class="form-item--half-width" class="form-item--half-width"
prop="param.stack" prop="param.stack"
v-if="isStackShow(chartConfig.type)" v-if="isStackShow(chartConfig.type)"
@@ -274,7 +274,7 @@
<!--statistics--> <!--statistics-->
<el-form-item <el-form-item
v-if="isStatisticsShow(chartConfig.type)" v-if="isStatisticsShow(chartConfig.type)"
:label="$t('dashboard.panel.chartForm.statistics')" :label="$t('dashboard.dashboard.chartForm.statistics')"
class="form-item--half-width" class="form-item--half-width"
prop="param.statistics" prop="param.statistics"
> >
@@ -294,7 +294,7 @@
<!-- nullType --> <!-- nullType -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.nullType')" :label="$t('dashboard.dashboard.chartForm.nullType')"
class="form-item--half-width" class="form-item--half-width"
prop="param.nullType" prop="param.nullType"
v-if="isShowNullType(chartConfig.type)" v-if="isShowNullType(chartConfig.type)"
@@ -342,7 +342,7 @@
<div class="form-items--half-width-group" v-if="isShowMinMax(chartConfig.type)"> <div class="form-items--half-width-group" v-if="isShowMinMax(chartConfig.type)">
<!--min--> <!--min-->
<el-form-item :label="$t('dashboard.panel.chartForm.min')" class="form-item--half-width"> <el-form-item :label="$t('dashboard.dashboard.chartForm.min')" class="form-item--half-width">
<el-input-number <el-input-number
size="small" size="small"
style="margin-top: 2px" style="margin-top: 2px"
@@ -353,7 +353,7 @@
v-model="chartConfig.param.min"/> v-model="chartConfig.param.min"/>
</el-form-item> </el-form-item>
<!--max--> <!--max-->
<el-form-item :label="$t('dashboard.panel.chartForm.max')" class="form-item--half-width"> <el-form-item :label="$t('dashboard.dashboard.chartForm.max')" class="form-item--half-width">
<el-input-number <el-input-number
size="small" size="small"
style="margin-top: 2px" style="margin-top: 2px"
@@ -367,10 +367,10 @@
<div class="form-items--half-width-group" v-if="isSankey(chartConfig.type)" key="sankey"> <div class="form-items--half-width-group" v-if="isSankey(chartConfig.type)" key="sankey">
<!--Source label--> <!--Source label-->
<el-form-item class="form-item--half-width" :label="$t('dashboard.panel.chartForm.sourceLabel')" prop="param.sourceLabel" <el-form-item class="form-item--half-width" :label="$t('dashboard.dashboard.chartForm.sourceLabel')" prop="param.sourceLabel"
:rules="[ :rules="[
{ required: true, message: $t('validate.required'), trigger: 'blur'}, { required: true, message: $t('validate.required'), trigger: 'blur'},
{ pattern: /^[a-zA-Z_][a-zA-Z0-9_]*$/, message: $t('dashboard.panel.matchRegex'), trigger: 'blur'}, { pattern: /^[a-zA-Z_][a-zA-Z0-9_]*$/, message: $t('dashboard.dashboard.matchRegex'), trigger: 'blur'},
{ validator: labelValidator,trigger: 'blur'}, { validator: labelValidator,trigger: 'blur'},
]" ]"
> >
@@ -382,10 +382,10 @@
v-model="chartConfig.param.sourceLabel"/> v-model="chartConfig.param.sourceLabel"/>
</el-form-item> </el-form-item>
<!--Target label--> <!--Target label-->
<el-form-item class="form-item--half-width" :label="$t('dashboard.panel.chartForm.targetLabel')" prop="param.targetLabel" <el-form-item class="form-item--half-width" :label="$t('dashboard.dashboard.chartForm.targetLabel')" prop="param.targetLabel"
:rules="[ :rules="[
{ required: true, message: $t('validate.required'), trigger: 'blur'}, { required: true, message: $t('validate.required'), trigger: 'blur'},
{ pattern: /^[a-zA-Z_][a-zA-Z0-9_]*$/, message: $t('dashboard.panel.matchRegex'), trigger: 'blur'}, { pattern: /^[a-zA-Z_][a-zA-Z0-9_]*$/, message: $t('dashboard.dashboard.matchRegex'), trigger: 'blur'},
{ validator: labelValidator,trigger: 'blur'}, { validator: labelValidator,trigger: 'blur'},
]" ]"
> >
@@ -410,7 +410,7 @@
show-word-limit v-model="chartConfig.param.decimals"/> show-word-limit v-model="chartConfig.param.decimals"/>
</el-form-item> </el-form-item>
<!-- Sparkline mode --> <!-- Sparkline mode -->
<el-form-item :label="$t('dashboard.panel.chartForm.sparklineMode')" class="form-item--half-width" v-if="isShowSparkline(chartConfig.type)"> <el-form-item :label="$t('dashboard.dashboard.chartForm.sparklineMode')" class="form-item--half-width" v-if="isShowSparkline(chartConfig.type)">
<el-select <el-select
v-model="chartConfig.param.sparklineMode" v-model="chartConfig.param.sparklineMode"
placeholder="" placeholder=""
@@ -431,7 +431,7 @@
<!-- Right Y Axis --> <!-- Right Y Axis -->
<div v-if="isShowRightYAxis(chartConfig.type)"> <div v-if="isShowRightYAxis(chartConfig.type)">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.rightYAxis')}}</span> <span>{{$t('dashboard.dashboard.chartForm.rightYAxis')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.rightYAxis" v-model="chartConfig.param.enable.rightYAxis"
size="small" size="small"
@@ -445,7 +445,7 @@
> >
<!-- Data Source --> <!-- Data Source -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.datasource')" :label="$t('dashboard.dashboard.chartForm.datasource')"
class="form-item--half-width" class="form-item--half-width"
prop="param.rightYAxis.elementNames" prop="param.rightYAxis.elementNames"
:rules="{ required: true, message: $t('validate.required'), trigger: 'change'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'change'}"
@@ -491,7 +491,7 @@
</el-form-item> </el-form-item>
<!-- unit --> <!-- unit -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.unit')" :label="$t('dashboard.dashboard.chartForm.unit')"
class="form-item--half-width" class="form-item--half-width"
prop="param.rightYAxis.unit" prop="param.rightYAxis.unit"
> >
@@ -523,7 +523,7 @@
</el-form-item> </el-form-item>
<!--min--> <!--min-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.min')" :label="$t('dashboard.dashboard.chartForm.min')"
class="form-item--half-width" class="form-item--half-width"
prop="param.rightYAxis.min" prop="param.rightYAxis.min"
> >
@@ -538,7 +538,7 @@
</el-form-item> </el-form-item>
<!--max--> <!--max-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.max')" :label="$t('dashboard.dashboard.chartForm.max')"
class="form-item--half-width" class="form-item--half-width"
prop="param.rightYAxis.max" prop="param.rightYAxis.max"
> >
@@ -558,7 +558,7 @@
<div v-if="isShowLegend(chartConfig.type)"> <div v-if="isShowLegend(chartConfig.type)">
<!--legendConfig--> <!--legendConfig-->
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.legend')}}</span> <span>{{$t('dashboard.dashboard.chartForm.legend')}}</span>
<el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch> <el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
@@ -567,7 +567,7 @@
class="form-items--half-width-group" class="form-items--half-width-group"
> >
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.legendPosition')" :label="$t('dashboard.dashboard.chartForm.legendPosition')"
class="form-item--half-width" class="form-item--half-width"
prop="param.legend.placement" prop="param.legend.placement"
> >
@@ -588,7 +588,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.legendValues')" :label="$t('dashboard.dashboard.chartForm.legendValues')"
class="form-item--half-width" class="form-item--half-width"
prop="param.legend.values" prop="param.legend.values"
v-if="isShowLegendVlaues(chartConfig.type)" v-if="isShowLegendVlaues(chartConfig.type)"
@@ -617,7 +617,7 @@
<!--thresholdConfig--> <!--thresholdConfig-->
<div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)"> <div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)">
<span>{{$t('dashboard.panel.chartForm.thresholds')}}</span> <span>{{$t('dashboard.dashboard.chartForm.thresholds')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.thresholds" v-model="chartConfig.param.enable.thresholds"
size="small" size="small"
@@ -666,7 +666,7 @@
<!-- table column--> <!-- table column-->
<div v-if="isTable(chartConfig.type)"> <div v-if="isTable(chartConfig.type)">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.columns')}}</span> <span>{{$t('dashboard.dashboard.chartForm.columns')}}</span>
</div> </div>
<draggable <draggable
v-model="chartConfig.param.columns" v-model="chartConfig.param.columns"
@@ -703,7 +703,7 @@
<span style="margin-right: 5px" class="nz-icon-minus-medium" :title="$t('overall.delete')"> <span style="margin-right: 5px" class="nz-icon-minus-medium" :title="$t('overall.delete')">
<i @click="removeColumns(index)" class="nz-icon nz-icon-minus"></i> <i @click="removeColumns(index)" class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -717,7 +717,7 @@
<el-input size="small" v-model="item.title" @change="change('columns',index)"></el-input> <el-input size="small" v-model="item.title" @change="change('columns',index)"></el-input>
</el-form-item> </el-form-item>
<div> <div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.unit')}}</div> <div class='mapping-display'>{{$t('dashboard.dashboard.chartForm.unit')}}</div>
</div> </div>
<el-cascader :id="'columns-unit' + index" v-model="item.unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable <el-cascader :id="'columns-unit' + index" v-model="item.unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable
placeholder="" placeholder=""
@@ -760,7 +760,7 @@
<!-- valueMapping --> <!-- valueMapping -->
<div v-if="isShowValueMapping(chartConfig.type) || isTable(chartConfig.type)"> <div v-if="isShowValueMapping(chartConfig.type) || isTable(chartConfig.type)">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.valueMapping')}}</span> <span>{{$t('dashboard.dashboard.chartForm.valueMapping')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.valueMapping" v-model="chartConfig.param.enable.valueMapping"
size="small" size="small"
@@ -823,7 +823,7 @@
<span @click="removeMapping(index)" style="margin-right: 5px" :title="$t('overall.delete')"> <span @click="removeMapping(index)" style="margin-right: 5px" :title="$t('overall.delete')">
<i class="nz-icon nz-icon-minus"></i> <i class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -972,7 +972,7 @@
<!-- visibility --> <!-- visibility -->
<div v-if="params.type === 'group'"> <div v-if="params.type === 'group'">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.showHidden')}}</span> <span>{{$t('dashboard.dashboard.showHidden')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.visibility" v-model="chartConfig.param.enable.visibility"
size="small" size="small"
@@ -986,7 +986,7 @@
> >
<!-- Variable name --> <!-- Variable name -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.variableName')" :label="$t('dashboard.dashboard.variableName')"
class="form-item--half-width" class="form-item--half-width"
prop="param.visibility.varName" prop="param.visibility.varName"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
@@ -1047,7 +1047,7 @@
</el-form-item> </el-form-item>
<!-- Result --> <!-- Result -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.result')" :label="$t('dashboard.dashboard.chartForm.result')"
class="form-item--half-width" class="form-item--half-width"
prop="param.visibility.result" prop="param.visibility.result"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"

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

@@ -5,8 +5,8 @@
</transition> </transition>
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title" v-if="from !== 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTitle") : $t("overall.createChart")}}</div> <div class="header__title" v-if="from !== 'chartTemp'">{{editChart.id ? $t("dashboard.dashboard.editChartTitle") : $t("overall.createChart")}}</div>
<div class="header__title" v-if="from === 'chartTemp'">{{editChart.id ? $t("dashboard.panel.editChartTempTitle") : $t("dashboard.panel.createChartTempTitle")}}</div> <div class="header__title" v-if="from === 'chartTemp'">{{editChart.id ? $t("dashboard.dashboard.editChartTempTitle") : $t("dashboard.dashboard.createChartTempTitle")}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel:[isStable]="{obj: editChart, func: clickOutside}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span> <span v-cancel:[isStable]="{obj: editChart, func: clickOutside}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span>
</div> </div>
@@ -49,7 +49,7 @@
</select-panel> </select-panel>
</el-form-item> </el-form-item>
<!--group--> <!--group-->
<el-form-item :label="$t('dashboard.panel.chartForm.group')" class="form-item--half-width" prop="group"> <el-form-item :label="$t('dashboard.dashboard.chartForm.group')" class="form-item--half-width" prop="group">
<el-select id="chart-box-group" v-model="editChart.groupId" :disabled="editChart.type==='group'" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside el-option-width303" size="small" value-key="chartType"> <el-select id="chart-box-group" v-model="editChart.groupId" :disabled="editChart.type==='group'" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside el-option-width303" size="small" value-key="chartType">
<el-option v-for="item in groupArr" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in groupArr" :key="item.id" :label="item.name" :value="item.id">
<span class="panel-dropdown-label-txt" >{{item.name}}</span> <span class="panel-dropdown-label-txt" >{{item.name}}</span>
@@ -68,7 +68,7 @@
<!--title--> <!--title-->
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.dataConfig')}}</span> <span>{{$t('dashboard.dashboard.chartForm.dataConfig')}}</span>
</div> </div>
<el-tabs v-model="editChart.datasource" @tab-click="datasourceChange" type="card"> <el-tabs v-model="editChart.datasource" @tab-click="datasourceChange" type="card">
<el-tab-pane :label="$t('overall.metrics')" name="metrics"> <el-tab-pane :label="$t('overall.metrics')" name="metrics">

36
nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
View File

@@ -9,7 +9,7 @@
> >
<!--title--> <!--title-->
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.displayConfig')}}</span> <span>{{$t('dashboard.dashboard.chartForm.displayConfig')}}</span>
</div> </div>
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!-- type --> <!-- type -->
@@ -39,7 +39,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--Default collapse--> <!--Default collapse-->
<el-form-item class="form-item--half-width" v-if="isGroup(chartConfig.type)" :label='$t("dashboard.panel.chartForm.collapse")' prop="param.collapse"> <el-form-item class="form-item--half-width" v-if="isGroup(chartConfig.type)" :label='$t("dashboard.dashboard.chartForm.collapse")' prop="param.collapse">
<el-switch <el-switch
id="chart-box-collapse" id="chart-box-collapse"
v-model="chartConfig.param.collapse" v-model="chartConfig.param.collapse"
@@ -52,7 +52,7 @@
<div class="form-items--half-width-group" v-if="!isGroup(chartConfig.type)"> <div class="form-items--half-width-group" v-if="!isGroup(chartConfig.type)">
<!--width--> <!--width-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.width')" :label="$t('dashboard.dashboard.chartForm.width')"
class="form-item--half-width" class="form-item--half-width"
prop="span"> prop="span">
<el-select <el-select
@@ -77,7 +77,7 @@
<!--height--> <!--height-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.high')" :label="$t('dashboard.dashboard.chartForm.high')"
class="form-item--half-width" class="form-item--half-width"
prop="height"> prop="height">
<!-- 由px改为span --> <!-- 由px改为span -->
@@ -104,7 +104,7 @@
<!-- timeType --> <!-- timeType -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.timeType')" :label="$t('dashboard.dashboard.chartForm.timeType')"
class="form-item--half-width" class="form-item--half-width"
v-if="chartConfig.type === 'clock'" v-if="chartConfig.type === 'clock'"
prop="type" prop="type"
@@ -130,11 +130,11 @@
</div> </div>
<!--content--> <!--content-->
<div v-if="contentShow(chartConfig.type)" class="form__sub-title"> <div v-if="contentShow(chartConfig.type)" class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.content')}}</span> <span>{{$t('dashboard.dashboard.chartForm.content')}}</span>
<span style="cursor: pointer" v-if="isDiagram(chartConfig.type)"><i class="nz-icon nz-icon-edit" @click="topologyDialogChange(true)"></i></span> <span style="cursor: pointer" v-if="isDiagram(chartConfig.type)"><i class="nz-icon nz-icon-edit" @click="topologyDialogChange(true)"></i></span>
</div> </div>
<!--url--> <!--url-->
<el-form-item v-if="isUrl(chartConfig.type)" :label='$t("dashboard.panel.chartForm.url")' :rules="{ required: true, message: $t('validate.required'), trigger: 'blur' }" prop="param.url"> <el-form-item v-if="isUrl(chartConfig.type)" :label='$t("dashboard.dashboard.chartForm.url")' :rules="{ required: true, message: $t('validate.required'), trigger: 'blur' }" prop="param.url">
<el-input id="chart-box-url" v-model="chartConfig.param.url" maxlength="1024" show-word-limit size="small" :rows="2" type="textarea" @change="change"></el-input> <el-input id="chart-box-url" v-model="chartConfig.param.url" maxlength="1024" show-word-limit size="small" :rows="2" type="textarea" @change="change"></el-input>
</el-form-item> </el-form-item>
<!--topoData--> <!--topoData-->
@@ -154,7 +154,7 @@
<!-- visibility --> <!-- visibility -->
<div v-if="params.type === 'group'"> <div v-if="params.type === 'group'">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.showHidden')}}</span> <span>{{$t('dashboard.dashboard.showHidden')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.visibility" v-model="chartConfig.param.enable.visibility"
size="small" size="small"
@@ -168,7 +168,7 @@
> >
<!-- Variable name --> <!-- Variable name -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.variableName')" :label="$t('dashboard.dashboard.variableName')"
class="form-item--half-width" class="form-item--half-width"
prop="param.visibility.varName" prop="param.visibility.varName"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
@@ -229,7 +229,7 @@
</el-form-item> </el-form-item>
<!-- Result --> <!-- Result -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.result')" :label="$t('dashboard.dashboard.chartForm.result')"
class="form-item--half-width" class="form-item--half-width"
prop="param.visibility.result" prop="param.visibility.result"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
@@ -265,7 +265,7 @@
> >
<!-- variable --> <!-- variable -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.variableName')" :label="$t('dashboard.dashboard.variableName')"
class="form-item--half-width" class="form-item--half-width"
prop="param.repeat.variable" prop="param.repeat.variable"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
@@ -320,31 +320,31 @@ export default {
chartTypeList: [ chartTypeList: [
{ {
id: 'url', id: 'url',
name: this.$t('dashboard.panel.chartForm.url') name: this.$t('dashboard.dashboard.chartForm.url')
}, },
{ {
id: 'text', id: 'text',
name: this.$t('dashboard.panel.chartForm.typeVal.text.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.text.label')
}, },
{ {
id: 'diagram', id: 'diagram',
name: this.$t('dashboard.panel.chartForm.typeVal.diagram.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.diagram.label')
}, },
{ {
id: 'group', id: 'group',
name: this.$t('dashboard.panel.chartForm.group') name: this.$t('dashboard.dashboard.chartForm.group')
}, },
{ {
id: 'map', id: 'map',
name: this.$t('dashboard.panel.chartForm.typeVal.map.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.map.label')
}, },
{ {
id: 'topology', id: 'topology',
name: this.$t('dashboard.panel.chartForm.typeVal.topology.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.topology.label')
}, },
{ {
id: 'clock', id: 'clock',
name: this.$t('dashboard.panel.chartForm.typeVal.clock.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.clock.label')
} }
] ]
} }

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

@@ -72,10 +72,10 @@ export default {
label: this.$t('overall.value'), label: this.$t('overall.value'),
value: 'value' value: 'value'
}, { }, {
label: this.$t('dashboard.panel.chartForm.valMapping.range'), label: this.$t('dashboard.dashboard.chartForm.valMapping.range'),
value: 'range' value: 'range'
}, { }, {
label: this.$t('dashboard.panel.chartForm.valMapping.regx'), label: this.$t('dashboard.dashboard.chartForm.valMapping.regx'),
value: 'regx' value: 'regx'
} }
], ],
@@ -221,122 +221,122 @@ export default {
metricsChartTypeList: [ metricsChartTypeList: [
{ {
id: 'line', id: 'line',
name: this.$t('dashboard.panel.chartForm.typeVal.line.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
id: 'area', id: 'area',
name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
id: 'point', id: 'point',
name: this.$t('dashboard.panel.chartForm.typeVal.point.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.point.label')
}, },
{ {
id: 'stat', id: 'stat',
name: this.$t('dashboard.panel.chartForm.typeVal.singleStat.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.singleStat.label')
}, },
{ {
id: 'hexagon', id: 'hexagon',
name: this.$t('dashboard.panel.chartForm.typeVal.hexagonFigure.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.hexagonFigure.label')
}, },
{ {
id: 'bar', id: 'bar',
name: this.$t('dashboard.panel.chartForm.typeVal.bar.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.bar.label')
}, },
{ {
id: 'pie', id: 'pie',
name: this.$t('dashboard.panel.chartForm.typeVal.pie.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.pie.label')
}, },
{ {
id: 'bubble', id: 'bubble',
name: this.$t('dashboard.panel.chartForm.typeVal.bubble.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.bubble.label')
}, },
{ {
id: 'funnel', id: 'funnel',
name: this.$t('dashboard.panel.chartForm.typeVal.funnel.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.funnel.label')
}, },
{ {
id: 'rank', id: 'rank',
name: this.$t('dashboard.panel.chartForm.typeVal.rank.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.rank.label')
}, },
{ {
id: 'sankey', id: 'sankey',
name: this.$t('dashboard.panel.chartForm.typeVal.sankey.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.sankey.label')
}, },
{ {
id: 'gauge', id: 'gauge',
name: this.$t('dashboard.panel.chartForm.typeVal.gauge.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.gauge.label')
}, },
{ {
id: 'treemap', id: 'treemap',
name: this.$t('dashboard.panel.chartForm.typeVal.treemap.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.treemap.label')
}, },
{ {
id: 'table', id: 'table',
name: this.$t('dashboard.panel.chartForm.typeVal.table.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.table.label')
} }
], ],
logChartTypeList: [ logChartTypeList: [
{ {
id: 'line', id: 'line',
name: this.$t('dashboard.panel.chartForm.typeVal.line.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
id: 'area', id: 'area',
name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
id: 'point', id: 'point',
name: this.$t('dashboard.panel.chartForm.typeVal.point.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.point.label')
}, },
{ {
id: 'stat', id: 'stat',
name: this.$t('dashboard.panel.chartForm.typeVal.singleStat.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.singleStat.label')
}, },
{ {
id: 'hexagon', id: 'hexagon',
name: this.$t('dashboard.panel.chartForm.typeVal.hexagonFigure.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.hexagonFigure.label')
}, },
{ {
id: 'bar', id: 'bar',
name: this.$t('dashboard.panel.chartForm.typeVal.bar.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.bar.label')
}, },
{ {
id: 'pie', id: 'pie',
name: this.$t('dashboard.panel.chartForm.typeVal.pie.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.pie.label')
}, },
{ {
id: 'bubble', id: 'bubble',
name: this.$t('dashboard.panel.chartForm.typeVal.bubble.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.bubble.label')
}, },
{ {
id: 'funnel', id: 'funnel',
name: this.$t('dashboard.panel.chartForm.typeVal.funnel.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.funnel.label')
}, },
{ {
id: 'rank', id: 'rank',
name: this.$t('dashboard.panel.chartForm.typeVal.rank.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.rank.label')
}, },
{ {
id: 'sankey', id: 'sankey',
name: this.$t('dashboard.panel.chartForm.typeVal.sankey.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.sankey.label')
}, },
{ {
id: 'gauge', id: 'gauge',
name: this.$t('dashboard.panel.chartForm.typeVal.gauge.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.gauge.label')
}, },
{ {
id: 'treemap', id: 'treemap',
name: this.$t('dashboard.panel.chartForm.typeVal.treemap.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.treemap.label')
}, },
{ {
id: 'log', id: 'log',
name: this.$t('dashboard.panel.chartForm.typeVal.log.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.log.label')
}, },
{ {
id: 'table', id: 'table',
name: this.$t('dashboard.panel.chartForm.typeVal.table.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.table.label')
} }
], ],
textList: [ textList: [
@@ -347,7 +347,7 @@ export default {
label: this.$t('overall.value'), label: this.$t('overall.value'),
value: 'value' value: 'value'
}, { }, {
label: this.$t('dashboard.panel.chartForm.legend'), label: this.$t('dashboard.dashboard.chartForm.legend'),
value: 'legend' value: 'legend'
}, { }, {
label: this.$t('project.topology.none'), label: this.$t('project.topology.none'),
@@ -357,35 +357,35 @@ export default {
timeType: [ timeType: [
{ {
value: 'local', value: 'local',
label: this.$t('dashboard.panel.chartForm.typeVal.local') label: this.$t('dashboard.dashboard.chartForm.typeVal.local')
}, },
{ {
value: 'server', value: 'server',
label: this.$t('dashboard.panel.chartForm.typeVal.server') label: this.$t('dashboard.dashboard.chartForm.typeVal.server')
} }
], ],
timeSeriesTypeList: [ timeSeriesTypeList: [
{ {
id: 'line', id: 'line',
name: this.$t('dashboard.panel.chartForm.typeVal.line.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
id: 'area', id: 'area',
name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
id: 'point', id: 'point',
name: this.$t('dashboard.panel.chartForm.typeVal.point.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.point.label')
} }
], ],
sparklineTypeList: [ sparklineTypeList: [
{ {
id: 'line', id: 'line',
name: this.$t('dashboard.panel.chartForm.typeVal.line.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
id: 'area', id: 'area',
name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
id: 'none', id: 'none',

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

@@ -44,7 +44,7 @@
<div class="system-chart-config-right"> <div class="system-chart-config-right">
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.dimension')" :label="$t('dashboard.dashboard.chartForm.dimension')"
class="form-item--half-width" class="form-item--half-width"
prop="param.systemGroup" prop="param.systemGroup"
> >
@@ -54,7 +54,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="selectList.length" v-if="selectList.length"
:label="$t('dashboard.panel.chartForm.select')" :label="$t('dashboard.dashboard.chartForm.select')"
class="form-item--half-width" class="form-item--half-width"
prop="param.systemSelect" prop="param.systemSelect"
> >
@@ -65,7 +65,7 @@
</div> </div>
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.sort')" :label="$t('dashboard.dashboard.chartForm.sort')"
class="form-item--half-width" class="form-item--half-width"
prop="param.sort" prop="param.sort"
> >
@@ -94,7 +94,7 @@
</div> </div>
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.filter')" :label="$t('dashboard.dashboard.chartForm.filter')"
class="form-item" class="form-item"
style="width: 100%" style="width: 100%"
prop="param.filter" prop="param.filter"
@@ -111,9 +111,9 @@
</div> </div>
<el-row style="display: flex"> <el-row style="display: flex">
<el-col class="legend-title"> <el-col class="legend-title">
<span class="legend-title__span">{{$t('dashboard.panel.chartForm.legend')}}&nbsp;</span> <span class="legend-title__span">{{$t('dashboard.dashboard.chartForm.legend')}}&nbsp;</span>
<el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside"> <el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside">
<div :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div> <div :style="{'word-break':language!=='zh'?'keep-all':'break-all'}">{{$t('dashboard.dashboard.chartForm.legendTip')}}</div>
<i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i> <i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover> </el-popover>
</el-col> </el-col>
@@ -128,7 +128,7 @@
</div> </div>
<!--title--> <!--title-->
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.displayConfig')}}</span> <span>{{$t('dashboard.dashboard.chartForm.displayConfig')}}</span>
</div> </div>
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!-- type --> <!-- type -->
@@ -158,7 +158,7 @@
</el-form-item> </el-form-item>
<!--refer--> <!--refer-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.refer')" :label="$t('dashboard.dashboard.chartForm.refer')"
class="form-item--half-width" class="form-item--half-width"
prop="param.stack" prop="param.stack"
style="display: none" style="display: none"
@@ -181,7 +181,7 @@
<!-- index --> <!-- index -->
<el-form-item <el-form-item
v-show="isTable(chartConfig.type)" v-show="isTable(chartConfig.type)"
:label="$t('dashboard.panel.chartForm.tableIndex')" :label="$t('dashboard.dashboard.chartForm.tableIndex')"
class="form-item--half-width" class="form-item--half-width"
prop="param.index" prop="param.index"
> >
@@ -196,7 +196,7 @@
<!-- unit --> <!-- unit -->
<el-form-item <el-form-item
v-show="!isTable(chartConfig.type)&&!isLog(chartConfig.type)" v-show="!isTable(chartConfig.type)&&!isLog(chartConfig.type)"
:label="$t('dashboard.panel.chartForm.unit')" :label="$t('dashboard.dashboard.chartForm.unit')"
class="form-item--half-width" class="form-item--half-width"
prop="unit" prop="unit"
> >
@@ -217,7 +217,7 @@
<div class="form-items--half-width-group"> <div class="form-items--half-width-group">
<!--width--> <!--width-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.width')" :label="$t('dashboard.dashboard.chartForm.width')"
class="form-item--half-width" class="form-item--half-width"
prop="span"> prop="span">
<el-select <el-select
@@ -242,7 +242,7 @@
<!--height--> <!--height-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.high')" :label="$t('dashboard.dashboard.chartForm.high')"
class="form-item--half-width" class="form-item--half-width"
prop="height"> prop="height">
<!-- 由px改为span --> <!-- 由px改为span -->
@@ -269,7 +269,7 @@
</div> </div>
<div class="form-items--half-width-group" v-if="isGauge(chartConfig.type)"> <div class="form-items--half-width-group" v-if="isGauge(chartConfig.type)">
<!--min--> <!--min-->
<el-form-item :label="$t('dashboard.panel.chartForm.min')" class="form-item--half-width"> <el-form-item :label="$t('dashboard.dashboard.chartForm.min')" class="form-item--half-width">
<el-input-number <el-input-number
size="small" size="small"
style="margin-top: 2px" style="margin-top: 2px"
@@ -279,7 +279,7 @@
v-model="chartConfig.param.min"/> v-model="chartConfig.param.min"/>
</el-form-item> </el-form-item>
<!--max--> <!--max-->
<el-form-item :label="$t('dashboard.panel.chartForm.max')" class="form-item--half-width"> <el-form-item :label="$t('dashboard.dashboard.chartForm.max')" class="form-item--half-width">
<el-input-number <el-input-number
size="small" size="small"
style="margin-top: 2px" style="margin-top: 2px"
@@ -328,7 +328,7 @@
<div v-if="isShowLegend(chartConfig.type)"> <div v-if="isShowLegend(chartConfig.type)">
<!--legendConfig--> <!--legendConfig-->
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.legend')}}</span> <span>{{$t('dashboard.dashboard.chartForm.legend')}}</span>
<el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch> <el-switch v-model="chartConfig.param.enable.legend" size="small" @change="change"></el-switch>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
@@ -337,7 +337,7 @@
class="form-items--half-width-group" class="form-items--half-width-group"
> >
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.legendPosition')" :label="$t('dashboard.dashboard.chartForm.legendPosition')"
class="form-item--half-width" class="form-item--half-width"
prop="param.legend.placement" prop="param.legend.placement"
> >
@@ -358,7 +358,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.legendValues')" :label="$t('dashboard.dashboard.chartForm.legendValues')"
class="form-item--half-width" class="form-item--half-width"
prop="param.legend.values" prop="param.legend.values"
v-if="isShowLegendVlaues(chartConfig.type)" v-if="isShowLegendVlaues(chartConfig.type)"
@@ -435,7 +435,7 @@
<!-- table column--> <!-- table column-->
<div v-if="isTable(chartConfig.type)"> <div v-if="isTable(chartConfig.type)">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.columns')}}</span> <span>{{$t('dashboard.dashboard.chartForm.columns')}}</span>
</div> </div>
<draggable <draggable
v-model="chartConfig.param.columns" v-model="chartConfig.param.columns"
@@ -472,7 +472,7 @@
<span style="margin-right: 5px" class="nz-icon-minus-medium" :title="$t('overall.delete')"> <span style="margin-right: 5px" class="nz-icon-minus-medium" :title="$t('overall.delete')">
<i @click="removeColumns(index)" class="nz-icon nz-icon-minus"></i> <i @click="removeColumns(index)" class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -486,7 +486,7 @@
<el-input size="small" v-model="item.title" @change="change('columns',index)"></el-input> <el-input size="small" v-model="item.title" @change="change('columns',index)"></el-input>
</el-form-item> </el-form-item>
<div> <div>
<div class='mapping-display'>{{$t('dashboard.panel.chartForm.unit')}}</div> <div class='mapping-display'>{{$t('dashboard.dashboard.chartForm.unit')}}</div>
</div> </div>
<el-cascader :id="'columns-unit' + index" v-model="item.unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable <el-cascader :id="'columns-unit' + index" v-model="item.unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable
placeholder="" placeholder=""
@@ -529,7 +529,7 @@
<!-- valueMapping --> <!-- valueMapping -->
<div v-if="isShowValueMapping(chartConfig.type) || isTable(chartConfig.type)"> <div v-if="isShowValueMapping(chartConfig.type) || isTable(chartConfig.type)">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.chartForm.valueMapping')}}</span> <span>{{$t('dashboard.dashboard.chartForm.valueMapping')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.valueMapping" v-model="chartConfig.param.enable.valueMapping"
size="small" size="small"
@@ -592,7 +592,7 @@
<span @click="removeMapping(index)" style="margin-right: 5px" :title="$t('overall.delete')"> <span @click="removeMapping(index)" style="margin-right: 5px" :title="$t('overall.delete')">
<i class="nz-icon nz-icon-minus"></i> <i class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -742,7 +742,7 @@
<!-- visibility --> <!-- visibility -->
<div v-if="params.type === 'group'"> <div v-if="params.type === 'group'">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.showHidden')}}</span> <span>{{$t('dashboard.dashboard.showHidden')}}</span>
<el-switch <el-switch
v-model="chartConfig.param.enable.visibility" v-model="chartConfig.param.enable.visibility"
size="small" size="small"
@@ -756,7 +756,7 @@
> >
<!-- Variable name --> <!-- Variable name -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.variableName')" :label="$t('dashboard.dashboard.variableName')"
class="form-item--half-width" class="form-item--half-width"
prop="param.visibility.varName" prop="param.visibility.varName"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
@@ -817,7 +817,7 @@
</el-form-item> </el-form-item>
<!-- Result --> <!-- Result -->
<el-form-item <el-form-item
:label="$t('dashboard.panel.chartForm.result')" :label="$t('dashboard.dashboard.chartForm.result')"
class="form-item--half-width" class="form-item--half-width"
prop="param.visibility.result" prop="param.visibility.result"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
@@ -876,43 +876,43 @@ export default {
chartTypeList: [ chartTypeList: [
{ {
id: 'stat', id: 'stat',
name: this.$t('dashboard.panel.chartForm.typeVal.singleStat.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.singleStat.label')
}, },
{ {
id: 'hexagon', id: 'hexagon',
name: this.$t('dashboard.panel.chartForm.typeVal.hexagonFigure.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.hexagonFigure.label')
}, },
{ {
id: 'bar', id: 'bar',
name: this.$t('dashboard.panel.chartForm.typeVal.bar.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.bar.label')
}, },
{ {
id: 'pie', id: 'pie',
name: this.$t('dashboard.panel.chartForm.typeVal.pie.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.pie.label')
}, },
{ {
id: 'bubble', id: 'bubble',
name: this.$t('dashboard.panel.chartForm.typeVal.bubble.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.bubble.label')
}, },
{ {
id: 'funnel', id: 'funnel',
name: this.$t('dashboard.panel.chartForm.typeVal.funnel.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.funnel.label')
}, },
{ {
id: 'rank', id: 'rank',
name: this.$t('dashboard.panel.chartForm.typeVal.rank.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.rank.label')
}, },
{ {
id: 'gauge', id: 'gauge',
name: this.$t('dashboard.panel.chartForm.typeVal.gauge.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.gauge.label')
}, },
{ {
id: 'treemap', id: 'treemap',
name: this.$t('dashboard.panel.chartForm.typeVal.treemap.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.treemap.label')
}, },
{ {
id: 'table', id: 'table',
name: this.$t('dashboard.panel.chartForm.typeVal.table.label') name: this.$t('dashboard.dashboard.chartForm.typeVal.table.label')
} }
], ],
keyList: [], keyList: [],

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

@@ -1,7 +1,7 @@
<template> <template>
<div v-clickoutside="{obj: editChartTemp, func: esc}" class="right-box right-box-chart-temp"> <div v-clickoutside="{obj: editChartTemp, func: esc}" class="right-box right-box-chart-temp">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editChartTemp.id ? $t('dashboard.panel.createChartByTemp') :$t('dashboard.panel.createChartByTemp')}}</div> <div class="header__title">{{editChartTemp.id ? $t('dashboard.dashboard.createChartByTemp') :$t('dashboard.dashboard.createChartByTemp')}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editChartTemp, func: esc}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span> <span v-cancel="{obj: editChartTemp, func: esc}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span>
</div> </div>
@@ -10,7 +10,7 @@
<div class="container__form"> <div class="container__form">
<el-form ref="userForm" :model="editChartTemp" :rules="rules" label-position="top" label-width="120px"> <el-form ref="userForm" :model="editChartTemp" :rules="rules" label-position="top" label-width="120px">
<!--type--> <!--type-->
<el-form-item v-if="from !== fromRoute.endpoint" :label="$t('dashboard.panel.chartForm.varType')" prop="varType"> <el-form-item v-if="from !== fromRoute.endpoint" :label="$t('dashboard.dashboard.chartForm.varType')" prop="varType">
<el-select id="chart-box-group" <el-select id="chart-box-group"
v-model="editChartTemp.varType" v-model="editChartTemp.varType"
class="right-box__select" class="right-box__select"
@@ -263,11 +263,11 @@ export default {
if (this.from !== fromRoute.endpoint) { // 来自endpoint时不校验 if (this.from !== fromRoute.endpoint) { // 来自endpoint时不校验
if (this.editChartTemp.varType === 1) { if (this.editChartTemp.varType === 1) {
if (this.from !== fromRoute.asset) { // 来自asset且type=1时不校验 if (this.from !== fromRoute.asset) { // 来自asset且type=1时不校验
this.$message.error(this.$t('dashboard.panel.chartForm.selectAsset')) this.$message.error(this.$t('dashboard.dashboard.chartForm.selectAsset'))
return return
} }
} else { } else {
this.$message.error(this.$t('dashboard.panel.chartForm.selectEndpoint')) this.$message.error(this.$t('dashboard.dashboard.chartForm.selectEndpoint'))
return return
} }
} }

4
nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div v-clickoutside="{obj: editDashboard, func: esc}" class="right-box right-box-dashboard-temp"> <div v-clickoutside="{obj: editDashboard, func: esc}" class="right-box right-box-dashboard-temp">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{$t("dashboard.panel.createPanelTitle")}}</div> <div class="header__title">{{$t("dashboard.dashboard.createPanelTitle")}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editDashboard, func: esc}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span> <span v-cancel="{obj: editDashboard, func: esc}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span>
</div> </div>
@@ -105,7 +105,7 @@ export default {
} }
}, },
{ {
title: this.$t('dashboard.panel.chartForm.varType'), title: this.$t('dashboard.dashboard.chartForm.varType'),
data: function (row) { data: function (row) {
let str let str
switch (row.varType) { switch (row.varType) {

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

@@ -292,7 +292,7 @@
<div v-show="item.showAllRelabelOption" > <div v-show="item.showAllRelabelOption" >
<!--Regex--> <!--Regex-->
<el-form-item <el-form-item
:label="$t('dashboard.panel.regex')" :label="$t('dashboard.dashboard.regex')"
class="half-form-item" class="half-form-item"
:prop="'configs.0.config.relabel_config.' + index + '.regex'" :prop="'configs.0.config.relabel_config.' + index + '.regex'"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'change' }]"> :rules="[{ required: true, message: $t('validate.required'), trigger: 'change' }]">
@@ -372,7 +372,7 @@
<!-- fileName --> <!-- fileName -->
<el-form-item <el-form-item
v-if='item.type === "file"' v-if='item.type === "file"'
:label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.dashboard.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.fileName'" :prop="'configs.1.config.'+ index +'.fileName'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -381,7 +381,7 @@
<!-- unit --> <!-- unit -->
<el-form-item <el-form-item
v-if='item.type === "journal"' v-if='item.type === "journal"'
:label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.dashboard.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.unit'" :prop="'configs.1.config.'+ index +'.unit'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >
@@ -390,7 +390,7 @@
<!-- listenAddress --> <!-- listenAddress -->
<el-form-item <el-form-item
v-if='item.type === "syslog"' v-if='item.type === "syslog"'
:label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.dashboard.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.listenAddress'" :prop="'configs.1.config.'+ index +'.listenAddress'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
> >

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

@@ -16,7 +16,7 @@
<el-form-item :label="$t('overall.name')" prop="name"> <el-form-item :label="$t('overall.name')" prop="name">
<el-input :maxlength="64" show-word-limit v-model="editExprTemp.name" :placeholder="$t('overall.placeHolder')" size="small"></el-input> <el-input :maxlength="64" show-word-limit v-model="editExprTemp.name" :placeholder="$t('overall.placeHolder')" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('dashboard.panel.chartForm.group')" prop="gname"> <el-form-item :label="$t('dashboard.dashboard.chartForm.group')" prop="gname">
<!--<el-input v-model="editExprTemp.gname" size="small" :placeholder="$t('overall.placeHolder')"></el-input>--> <!--<el-input v-model="editExprTemp.gname" size="small" :placeholder="$t('overall.placeHolder')"></el-input>-->
<el-autocomplete <el-autocomplete
v-model="editExprTemp.gname" v-model="editExprTemp.gname"

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

@@ -259,7 +259,7 @@ export default {
priorityData: [ priorityData: [
{ {
id: 1, id: 1,
value: this.$t('dashboard.panel.chartForm.high') value: this.$t('dashboard.dashboard.chartForm.high')
}, { }, {
id: 2, id: 2,
value: this.$t('issue.middle') value: this.$t('issue.middle')

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

@@ -349,7 +349,7 @@
<!-- fileName --> <!-- fileName -->
<el-form-item <el-form-item
v-if='item.type === "file"' v-if='item.type === "file"'
:label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.dashboard.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.fileName'" :prop="'configs.1.config.'+ index +'.fileName'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
key="fileName" key="fileName"
@@ -359,7 +359,7 @@
<!-- unit --> <!-- unit -->
<el-form-item <el-form-item
v-if='item.type === "journal"' v-if='item.type === "journal"'
:label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.dashboard.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.unit'" :prop="'configs.1.config.'+ index +'.unit'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
key="unit" key="unit"
@@ -369,7 +369,7 @@
<!-- listenAddress --> <!-- listenAddress -->
<el-form-item <el-form-item
v-if='item.type === "syslog"' v-if='item.type === "syslog"'
:label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.panel.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item" :label='item.type === "file" ? $t("config.terminallog.path"):( item.type === "journal" ? $t("dashboard.dashboard.chartForm.unit") : $t("project.endpoint.basicTypeSyslog"))' class="half-form-item"
:prop="'configs.1.config.'+ index +'.listenAddress'" :prop="'configs.1.config.'+ index +'.listenAddress'"
:rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[ { required: true, message: $t('validate.required'), trigger: 'blur' }]"
key="listenAddress" key="listenAddress"

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

@@ -3,8 +3,8 @@
<!-- begin--标题--> <!-- begin--标题-->
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title" v-if="from !== 'dashboardTemp'">{{editPanel.id ? $t("dashboard.panel.editPanelTitle") : $t("dashboard.panel.createPanelTitle")}}</div> <div class="header__title" v-if="from !== 'dashboardTemp'">{{editPanel.id ? $t("dashboard.dashboard.editPanelTitle") : $t("dashboard.dashboard.createPanelTitle")}}</div>
<div class="header__title" v-if="from === 'dashboardTemp'">{{editPanel.id ? $t("dashboard.panel.editPanelTempTitle") : $t("dashboard.panel.createPanelTempTitle")}}</div> <div class="header__title" v-if="from === 'dashboardTemp'">{{editPanel.id ? $t("dashboard.dashboard.editPanelTempTitle") : $t("dashboard.dashboard.createPanelTempTitle")}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editPanel, func: esc}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span> <span v-cancel="{obj: editPanel, func: esc}"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span>
@@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<!--varType--> <!--varType-->
<el-form-item v-if="from==='dashboardTemp'" :label="$t('dashboard.panel.chartForm.varType')" class="item-receivers" prop="varType"> <el-form-item v-if="from==='dashboardTemp'" :label="$t('dashboard.dashboard.chartForm.varType')" class="item-receivers" prop="varType">
<el-select v-model="editPanel.varType" clearable :disabled="!!editPanel.id" popper-class="right-box-select-top prevent-clickoutside" placeholder="" size="small"> <el-select v-model="editPanel.varType" clearable :disabled="!!editPanel.id" popper-class="right-box-select-top prevent-clickoutside" placeholder="" size="small">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in varTypeArr"> <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in varTypeArr">
<span class="panel-dropdown-label-txt" >{{item.name}}</span> <span class="panel-dropdown-label-txt" >{{item.name}}</span>
@@ -41,19 +41,19 @@
</el-form-item> </el-form-item>
<!-- chartShare --> <!-- chartShare -->
<el-form-item :label="$t('dashboard.panel.chartTooltip')" class="item-receivers" prop="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" value-key="chartType"> <el-select v-model="editPanel.param.chartShare" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="chartType">
<el-option value="none" label="Default"> <el-option value="none" label="Default">
<span class="panel-dropdown-label-txt" >{{$t('config.assetLabel.default')}}</span> <span class="panel-dropdown-label-txt" >{{$t('config.assetLabel.default')}}</span>
</el-option> </el-option>
<el-option value="crosshair" label="Share crosshair"> <el-option value="crosshair" label="Share crosshair">
<span class="panel-dropdown-label-txt" >{{$t('dashboard.panel.crosshair')}}</span> <span class="panel-dropdown-label-txt" >{{$t('dashboard.dashboard.crosshair')}}</span>
</el-option> </el-option>
<el-option value="tooltip" label="Share tooltip"> <el-option value="tooltip" label="Share tooltip">
<span class="panel-dropdown-label-txt" >{{$t('dashboard.panel.shareTooltip')}}</span> <span class="panel-dropdown-label-txt" >{{$t('dashboard.dashboard.shareTooltip')}}</span>
</el-option> </el-option>
</el-select> </el-select>
<div class="item-receivers-text">{{$t('dashboard.panel.chartTooltipText')}}</div> <div class="item-receivers-text">{{$t('dashboard.dashboard.chartTooltipText')}}</div>
</el-form-item> </el-form-item>
<!-- variable --> <!-- variable -->
@@ -61,7 +61,7 @@
class="variable-box" class="variable-box"
> >
<div class="form__sub-title" style="margin-bottom:0px"> <div class="form__sub-title" style="margin-bottom:0px">
<span>{{$t('dashboard.panel.variables')}}</span> <span>{{$t('dashboard.dashboard.variables')}}</span>
</div> </div>
<draggable <draggable
v-model="editPanel.param.variables" v-model="editPanel.param.variables"
@@ -101,7 +101,7 @@
<span @click="removeVariable(index)" class="nz-icon-minus-medium" style="margin-right: 6px" :title="$t('overall.delete')"> <span @click="removeVariable(index)" class="nz-icon-minus-medium" style="margin-right: 6px" :title="$t('overall.delete')">
<i class="nz-icon nz-icon-minus"></i> <i class="nz-icon nz-icon-minus"></i>
</span> </span>
<span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.panel.chartForm.sort')"> <span style="margin-right: 5px;fontSize:17px;cursor: grab;" class="drag-sort" :title="$t('dashboard.dashboard.chartForm.sort')">
<i class="nz-icon nz-icon-sort" style="cursor: grab;"></i> <i class="nz-icon nz-icon-sort" style="cursor: grab;"></i>
</span> </span>
</span> </span>
@@ -112,7 +112,7 @@
<el-form-item class="form-item--half-width" :label='$t("overall.name")' :prop="'param.variables.' + index + '.name'" <el-form-item class="form-item--half-width" :label='$t("overall.name")' :prop="'param.variables.' + index + '.name'"
:rules="[ :rules="[
{ required: true, message: $t('validate.required'), trigger: 'blur'}, { required: true, message: $t('validate.required'), trigger: 'blur'},
{ pattern: /^[a-zA-Z_][a-zA-Z0-9_]*$/, message: $t('dashboard.panel.matchRegex'), trigger: 'blur'}, { pattern: /^[a-zA-Z_][a-zA-Z0-9_]*$/, message: $t('dashboard.dashboard.matchRegex'), trigger: 'blur'},
{ validator: variableValidator,trigger: 'blur'}, { validator: variableValidator,trigger: 'blur'},
]" ]"
> >
@@ -133,7 +133,7 @@
<!-- Query expression --> <!-- Query expression -->
<el-form-item class="query-expression" 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 class="query-expression" 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> <span>{{$t('dashboard.dashboard.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>
@@ -155,19 +155,19 @@
<el-input v-model="item.expression" placeholder="labels_names()" size="small"/> <el-input v-model="item.expression" placeholder="labels_names()" size="small"/>
</el-form-item> </el-form-item>
<!-- Regex --> <!-- Regex -->
<el-form-item v-if="item.type==='query'" :label="$t('dashboard.panel.regex')" :prop="'param.variables.' + index + '.regex'" key="regex" style="width: 100%;" > <el-form-item v-if="item.type==='query'" :label="$t('dashboard.dashboard.regex')" :prop="'param.variables.' + index + '.regex'" key="regex" style="width: 100%;" >
<el-input v-model="item.regex" placeholder="/.*-(?<text>.*)-(?<value>.*)-.*/" size="small"/> <el-input v-model="item.regex" placeholder="/.*-(?<text>.*)-(?<value>.*)-.*/" size="small"/>
</el-form-item> </el-form-item>
<!-- Custom values --> <!-- Custom values -->
<el-form-item v-if="item.type==='custom'" :label="$t('dashboard.panel.customValues')" :prop="'param.variables.' + index + '.customOptions'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" key="customOptions" style="width: 100%;" > <el-form-item v-if="item.type==='custom'" :label="$t('dashboard.dashboard.customValues')" :prop="'param.variables.' + index + '.customOptions'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" key="customOptions" style="width: 100%;" >
<el-input v-model="item.customOptions" placeholder="1,10,myKey:myValue" size="small"/> <el-input v-model="item.customOptions" placeholder="1,10,myKey:myValue" size="small"/>
</el-form-item> </el-form-item>
<!-- 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> <span>{{$t('dashboard.dashboard.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.dashboard.multiTip')}}</span>
<span slot="reference"> <span slot="reference">
<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>
@@ -184,9 +184,9 @@
<!-- 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> <span>{{$t('dashboard.dashboard.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.dashboard.allOptionTip')}}</span>
<span slot="reference"> <span slot="reference">
<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>
@@ -204,14 +204,14 @@
</transition> </transition>
</el-row> </el-row>
</draggable> </draggable>
<div @click="addVariable()" class="add-variable">{{$t('dashboard.panel.addVariable')}}</div> <div @click="addVariable()" class="add-variable">{{$t('dashboard.dashboard.addVariable')}}</div>
</div> </div>
<!-- Report --> <!-- Report -->
<div> <div>
<el-form-item class="item-report"> <el-form-item class="item-report">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.report')}}</span> <span>{{$t('dashboard.dashboard.report')}}</span>
<el-switch v-model="editPanel.param.report.enable" size="small"></el-switch> <el-switch v-model="editPanel.param.report.enable" size="small"></el-switch>
</div> </div>
</el-form-item> </el-form-item>
@@ -248,11 +248,11 @@
type="datetime"> type="datetime">
</my-date-picker> </my-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label='$t("dashboard.panel.period")' class="range-time" prop="param.report.range.unit"> <el-form-item :label='$t("dashboard.dashboard.period")' class="range-time" prop="param.report.range.unit">
<el-radio-group v-model="editPanel.param.report.range.unit" size="small"> <el-radio-group v-model="editPanel.param.report.range.unit" size="small">
<el-radio-button label="day">{{ $t("dashboard.panel.prevDay") }}</el-radio-button> <el-radio-button label="day">{{ $t("dashboard.dashboard.prevDay") }}</el-radio-button>
<el-radio-button label="week">{{ $t("dashboard.panel.prevWeek") }}</el-radio-button> <el-radio-button label="week">{{ $t("dashboard.dashboard.prevWeek") }}</el-radio-button>
<el-radio-button label="month">{{ $t("dashboard.panel.prevMonth") }}</el-radio-button> <el-radio-button label="month">{{ $t("dashboard.dashboard.prevMonth") }}</el-radio-button>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@@ -320,7 +320,7 @@
>{{ item }}</el-checkbox-button> >{{ item }}</el-checkbox-button>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item :label="$t('dashboard.panel.receivers')" class="item-receivers" prop="param.report.receivers"> <el-form-item :label="$t('dashboard.dashboard.receivers')" class="item-receivers" prop="param.report.receivers">
<el-select <el-select
class="right-box__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" size="small" value-key="chartType">
@@ -461,11 +461,11 @@ export default {
? localStorage.getItem('nz-default-dateFormat') ? localStorage.getItem('nz-default-dateFormat')
: 'YYYY-MM-DD HH:ss:mm', : 'YYYY-MM-DD HH:ss:mm',
queryVariableList: [ queryVariableList: [
{ name: 'label_names()', description: this.$t('dashboard.panel.label_names()') }, { name: 'label_names()', description: this.$t('dashboard.dashboard.label_names()') },
{ name: 'label_values(label)', description: this.$t('dashboard.panel.label_values(label)') }, { name: 'label_values(label)', description: this.$t('dashboard.dashboard.label_values(label)') },
{ name: 'label_values(metric, label)', description: this.$t('dashboard.panel.label_values(metric, label)') }, { name: 'label_values(metric, label)', description: this.$t('dashboard.dashboard.label_values(metric, label)') },
{ name: 'metrics(metric)', description: this.$t('dashboard.panel.metrics(metric)') }, { name: 'metrics(metric)', description: this.$t('dashboard.dashboard.metrics(metric)') },
{ name: 'query_result(query)', description: this.$t('dashboard.panel.query_result(query)') } { name: 'query_result(query)', description: this.$t('dashboard.dashboard.query_result(query)') }
], ],
varTypeArr: [ varTypeArr: [
{ name: this.$t('project.topology.none'), id: 0 }, { name: this.$t('project.topology.none'), id: 0 },

22
nezha-fronted/src/components/common/searchBox/searchBoxInfo.js
View File

@@ -245,43 +245,43 @@ export default {
chartType: [ chartType: [
{ {
value: 'line', value: 'line',
label: i18n.t('dashboard.panel.chartForm.typeVal.line.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
value: 'stackArea', value: 'stackArea',
label: i18n.t('dashboard.panel.chartForm.typeVal.stackArea.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
value: 'bar', value: 'bar',
label: i18n.t('dashboard.panel.chartForm.typeVal.bar.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.bar.label')
}, },
{ {
value: 'singleStat', value: 'singleStat',
label: i18n.t('dashboard.panel.chartForm.typeVal.singleStat.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.singleStat.label')
}, },
{ {
value: 'pie', value: 'pie',
label: i18n.t('dashboard.panel.chartForm.typeVal.pie.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.pie.label')
}, },
{ {
value: 'table', value: 'table',
label: i18n.t('dashboard.panel.chartForm.typeVal.table.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.table.label')
}, },
{ {
value: 'alertList', value: 'alertList',
label: i18n.t('dashboard.panel.chartForm.typeVal.alertList.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.alertList.label')
}, },
{ {
value: 'text', value: 'text',
label: i18n.t('dashboard.panel.chartForm.typeVal.text.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.text.label')
}, },
{ {
value: 'url', value: 'url',
label: i18n.t('dashboard.panel.chartForm.url') label: i18n.t('dashboard.dashboard.chartForm.url')
}, },
{ {
value: 'group', value: 'group',
label: i18n.t('dashboard.panel.chartForm.group') label: i18n.t('dashboard.dashboard.chartForm.group')
} }
], ],
terminalStatus: [ terminalStatus: [
@@ -362,7 +362,7 @@ export default {
priority: [ priority: [
{ {
value: 1, value: 1,
label: i18n.t('dashboard.panel.chartForm.high') label: i18n.t('dashboard.dashboard.chartForm.high')
}, { }, {
value: 2, value: 2,
label: i18n.t('issue.middle') label: i18n.t('issue.middle')

22
nezha-fronted/src/components/common/searchSelectInfo.js
View File

@@ -250,43 +250,43 @@ export default {
chartType: [ chartType: [
{ {
value: 'line', value: 'line',
label: i18n.t('dashboard.panel.chartForm.typeVal.line.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.line.label')
}, },
{ {
value: 'stackArea', value: 'stackArea',
label: i18n.t('dashboard.panel.chartForm.typeVal.stackArea.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.stackArea.label')
}, },
{ {
value: 'bar', value: 'bar',
label: i18n.t('dashboard.panel.chartForm.typeVal.bar.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.bar.label')
}, },
{ {
value: 'singleStat', value: 'singleStat',
label: i18n.t('dashboard.panel.chartForm.typeVal.singleStat.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.singleStat.label')
}, },
{ {
value: 'pie', value: 'pie',
label: i18n.t('dashboard.panel.chartForm.typeVal.pie.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.pie.label')
}, },
{ {
value: 'table', value: 'table',
label: i18n.t('dashboard.panel.chartForm.typeVal.table.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.table.label')
}, },
{ {
value: 'alertList', value: 'alertList',
label: i18n.t('dashboard.panel.chartForm.typeVal.alertList.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.alertList.label')
}, },
{ {
value: 'text', value: 'text',
label: i18n.t('dashboard.panel.chartForm.typeVal.text.label') label: i18n.t('dashboard.dashboard.chartForm.typeVal.text.label')
}, },
{ {
value: 'url', value: 'url',
label: i18n.t('dashboard.panel.chartForm.url') label: i18n.t('dashboard.dashboard.chartForm.url')
}, },
{ {
value: 'group', value: 'group',
label: i18n.t('dashboard.panel.chartForm.group') label: i18n.t('dashboard.dashboard.chartForm.group')
} }
], ],
terminalStatus: [ terminalStatus: [
@@ -367,7 +367,7 @@ export default {
priority: [ priority: [
{ {
value: 1, value: 1,
label: i18n.t('dashboard.panel.chartForm.high') label: i18n.t('dashboard.dashboard.chartForm.high')
}, { }, {
value: 2, value: 2,
label: i18n.t('issue.middle') label: i18n.t('issue.middle')

2
nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
View File

@@ -248,7 +248,7 @@ export default {
width: 120, width: 120,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('dashboard.panel.receivers'), label: this.$t('dashboard.dashboard.receivers'),
prop: 'receivers', prop: 'receivers',
show: false, show: false,
minWidth: 100 minWidth: 100

2
nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
View File

@@ -145,7 +145,7 @@ export default {
width: 200, width: 200,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('dashboard.panel.chartForm.group'), label: this.$t('dashboard.dashboard.chartForm.group'),
prop: 'group', prop: 'group',
show: true, show: true,
width: 200, width: 200,

2
nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
View File

@@ -134,7 +134,7 @@ export default {
minWidth: 120, minWidth: 120,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('dashboard.panel.chartForm.group'), label: this.$t('dashboard.dashboard.chartForm.group'),
prop: 'group', prop: 'group',
show: false, show: false,
minWidth: 120, minWidth: 120,

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

@@ -181,7 +181,7 @@ export default {
minWidth: 150 minWidth: 150
}, },
{ {
label: this.$t('dashboard.panel.chartForm.typeVal.server'), label: this.$t('dashboard.dashboard.chartForm.typeVal.server'),
prop: 'ts', prop: 'ts',
show: false, show: false,
minWidth: 150 minWidth: 150

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

@@ -119,7 +119,7 @@ export default {
minWidth: 200, minWidth: 200,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('dashboard.panel.chartForm.varType'), label: this.$t('dashboard.dashboard.chartForm.varType'),
prop: 'varType', prop: 'varType',
show: true, show: true,
minWidth: 200, minWidth: 200,

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

@@ -110,7 +110,7 @@ export default {
minWidth: 200, minWidth: 200,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('dashboard.panel.chartForm.varType'), label: this.$t('dashboard.dashboard.chartForm.varType'),
prop: 'varType', prop: 'varType',
show: true, show: true,
minWidth: 200, minWidth: 200,

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

@@ -136,7 +136,7 @@
<span style="width: auto;display: inline-block;cursor: pointer" <span style="width: auto;display: inline-block;cursor: pointer"
@mouseenter="labelHoverConfigs(scope.row, 1, true, $event)" @mouseenter="labelHoverConfigs(scope.row, 1, true, $event)"
@mouseleave="labelHoverConfigs(scope.row, 1, false, $event)"> @mouseleave="labelHoverConfigs(scope.row, 1, false, $event)">
<span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs colorFA901C" /> {{$t('dashboard.panel.chartForm.typeVal.log.label')}} </span> <span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs colorFA901C" /> {{$t('dashboard.dashboard.chartForm.typeVal.log.label')}} </span>
<span v-if="scope.row.configs[1].state===0 || !scope.row.configs[1].state"> <span v-if="scope.row.configs[1].state===0 || !scope.row.configs[1].state">
<span class="active-icon red-bg inline-block"></span> <span class="active-icon red-bg inline-block"></span>
</span> </span>

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

@@ -108,7 +108,7 @@ export default {
show: true, show: true,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('dashboard.panel.chartForm.group'), label: this.$t('dashboard.dashboard.chartForm.group'),
prop: 'gname', prop: 'gname',
show: true, show: true,
sortable: 'custom' sortable: 'custom'

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

@@ -58,7 +58,7 @@
</template> </template>
<template v-else-if="item.prop === 'priority'"> <template v-else-if="item.prop === 'priority'">
<div v-if="scope.row[item.prop] == 1"> <div v-if="scope.row[item.prop] == 1">
{{ $t('dashboard.panel.chartForm.high') }} {{ $t('dashboard.dashboard.chartForm.high') }}
</div> </div>
<div v-else-if="scope.row[item.prop] == 2"> <div v-else-if="scope.row[item.prop] == 2">
{{ $t('issue.middle') }} {{ $t('issue.middle') }}

5
nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
View File

@@ -22,7 +22,7 @@
:min-width="1000" :min-width="1000"
column-key="element" column-key="element"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:label="$t('dashboard.panel.chartForm.element')"> :label="$t('dashboard.dashboard.chartForm.element')">
<template v-slot="scope"> <template v-slot="scope">
<el-popover trigger="hover" placement="right"> <el-popover trigger="hover" placement="right">
<meta-data :metaDataList="metaDataList" :metaName="scope.row.metricTip.metric" /> <meta-data :metaDataList="metaDataList" :metaName="scope.row.metricTip.metric" />
@@ -376,6 +376,9 @@ export default {
chart.panelName = '' chart.panelName = ''
this.chart = chart this.chart = chart
this.graphShow = false this.graphShow = false
if (!this.chart.groupId) {
this.chart.groupId = undefined
}
this.$store.dispatch('dispatchEditChart', { this.$store.dispatch('dispatchEditChart', {
chart: this.chart, chart: this.chart,
type: 'add' type: 'add'

2
nezha-fronted/src/components/common/table/special/recordRulesQueryTab.vue
View File

@@ -22,7 +22,7 @@
:min-width="1000" :min-width="1000"
column-key="element" column-key="element"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:label="$t('dashboard.panel.chartForm.element')"> :label="$t('dashboard.dashboard.chartForm.element')">
<template v-slot="scope"> <template v-slot="scope">
<el-popover trigger="hover" placement="right"> <el-popover trigger="hover" placement="right">
<meta-data :metaDataList="metaDataList" :metaName="scope.row.metricTip.metric" /> <meta-data :metaDataList="metaDataList" :metaName="scope.row.metricTip.metric" />

50
nezha-fronted/src/components/common/timePicker.vue
View File

@@ -14,14 +14,14 @@
<div class="calendar-popover-text"> <div class="calendar-popover-text">
{{ searchTime[0] }} {{ searchTime[0] }}
</div> </div>
<div class="calendar-popover-text">{{ $t("dashboard.panel.to") }}</div> <div class="calendar-popover-text">{{ $t("dashboard.dashboard.to") }}</div>
<div class="calendar-popover-text"> <div class="calendar-popover-text">
{{ searchTime[1] }} {{ searchTime[1] }}
</div> </div>
</div> </div>
<div class="calendar-popover-text" v-else> <div class="calendar-popover-text" v-else>
<el-tooltip class="item" effect="light" placement="bottom"> <el-tooltip class="item" effect="light" placement="bottom">
<div slot="content"> {{searchTime[0]}}<br/><p style="text-align:center">{{$t("dashboard.panel.to")}} </p>{{searchTime[1]}}</div> <div slot="content"> {{searchTime[0]}}<br/><p style="text-align:center">{{$t("dashboard.dashboard.to")}} </p>{{searchTime[1]}}</div>
<div class="time-no-data">{{ showTime.text }}</div> <div class="time-no-data">{{ showTime.text }}</div>
</el-tooltip> </el-tooltip>
<!-- <div class="time-no-data">{{ showTime.text }}</div> --> <!-- <div class="time-no-data">{{ showTime.text }}</div> -->
@@ -57,7 +57,7 @@
> >
</my-date-picker> </my-date-picker>
<!-- @change="dateChange(whoChoose)"--> <!-- @change="dateChange(whoChoose)"-->
<div class="content-title">{{$t('dashboard.panel.chartForm.valMapping.from')}}</div> <div class="content-title">{{$t('dashboard.dashboard.chartForm.valMapping.from')}}</div>
<div tabindex="1" class="content-input" :class="oldSearchTimeError[0] ? 'input-error' : ''"> <div tabindex="1" class="content-input" :class="oldSearchTimeError[0] ? 'input-error' : ''">
<el-input @focus="searchTimeValue = oldSearchTime[0]" v-model="oldSearchTime[0]" @change="dateInputChange('start',oldSearchTime[0])" size="mini"> </el-input> <el-input @focus="searchTimeValue = oldSearchTime[0]" v-model="oldSearchTime[0]" @change="dateInputChange('start',oldSearchTime[0])" size="mini"> </el-input>
<div @click="myDatePickerShow()" class="nz-icon-box"> <div @click="myDatePickerShow()" class="nz-icon-box">
@@ -65,7 +65,7 @@
</div> </div>
<div class="input-hint">{{inputError}}</div> <div class="input-hint">{{inputError}}</div>
</div> </div>
<div class="content-title">{{$t('dashboard.panel.to')}}</div> <div class="content-title">{{$t('dashboard.dashboard.to')}}</div>
<div tabindex="2" class="content-input" :class="oldSearchTimeError[1] ? 'input-error' : ''"> <div tabindex="2" class="content-input" :class="oldSearchTimeError[1] ? 'input-error' : ''">
<el-input @focus="searchTimeValue = oldSearchTime[1]" v-model="oldSearchTime[1]" @change="dateInputChange('end',oldSearchTime[1])" size="mini"> </el-input> <el-input @focus="searchTimeValue = oldSearchTime[1]" v-model="oldSearchTime[1]" @change="dateInputChange('end',oldSearchTime[1])" size="mini"> </el-input>
<div @click="myDatePickerShow()" class="nz-icon-box"> <div @click="myDatePickerShow()" class="nz-icon-box">
@@ -93,7 +93,7 @@
@click="historyChange(item)" @click="historyChange(item)"
> >
{{ momentTz(item.start) }} {{ momentTz(item.start) }}
{{ $t("dashboard.panel.to") }} {{ $t("dashboard.dashboard.to") }}
{{ momentTz(item.end) }} {{ momentTz(item.end) }}
</div> </div>
</div> </div>
@@ -179,82 +179,82 @@ export default {
inputError: this.$t('date.formatError'), inputError: this.$t('date.formatError'),
showTime: { showTime: {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour') text: this.$t('dashboard.dashboard.lastOneHour')
}, },
timeData: [ timeData: [
{ {
id: 0, id: 0,
text: this.$t('dashboard.panel.customTimeRange'), text: this.$t('dashboard.dashboard.customTimeRange'),
value: -1 value: -1
}, },
{ {
id: 12, id: 12,
text: this.$t('dashboard.panel.noDate'), text: this.$t('dashboard.dashboard.noDate'),
value: 0 value: 0
}, },
{ {
id: 1, id: 1,
text: this.$t('dashboard.panel.lastFiveMin'), text: this.$t('dashboard.dashboard.lastFiveMin'),
type: 'minute', type: 'minute',
value: 5 value: 5
}, },
{ {
id: 2, id: 2,
text: this.$t('dashboard.panel.lastFifteenMin'), text: this.$t('dashboard.dashboard.lastFifteenMin'),
type: 'minute', type: 'minute',
value: 15 value: 15
}, },
{ {
id: 3, id: 3,
text: this.$t('dashboard.panel.lastThirtyMin'), text: this.$t('dashboard.dashboard.lastThirtyMin'),
type: 'minute', type: 'minute',
value: 30 value: 30
}, },
{ {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour'), text: this.$t('dashboard.dashboard.lastOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
}, },
{ {
id: 5, id: 5,
text: this.$t('dashboard.panel.lastThreeHour'), text: this.$t('dashboard.dashboard.lastThreeHour'),
type: 'hour', type: 'hour',
value: 3 value: 3
}, },
{ {
id: 6, id: 6,
text: this.$t('dashboard.panel.lastSixHour'), text: this.$t('dashboard.dashboard.lastSixHour'),
type: 'hour', type: 'hour',
value: 6 value: 6
}, },
{ {
id: 7, id: 7,
text: this.$t('dashboard.panel.lastTwelveHour'), text: this.$t('dashboard.dashboard.lastTwelveHour'),
type: 'hour', type: 'hour',
value: 12 value: 12
}, },
{ {
id: 8, id: 8,
text: this.$t('dashboard.panel.lastTwentyFourHour'), text: this.$t('dashboard.dashboard.lastTwentyFourHour'),
type: 'hour', type: 'hour',
value: 24 value: 24
}, },
{ {
id: 9, id: 9,
text: this.$t('dashboard.panel.lastTwoDay'), text: this.$t('dashboard.dashboard.lastTwoDay'),
type: 'date', type: 'date',
value: 2 value: 2
}, },
{ {
id: 10, id: 10,
text: this.$t('dashboard.panel.lastSevenDay'), text: this.$t('dashboard.dashboard.lastSevenDay'),
type: 'date', type: 'date',
value: 7 value: 7
}, },
{ {
id: 11, id: 11,
text: this.$t('dashboard.panel.lastThirtyDay'), text: this.$t('dashboard.dashboard.lastThirtyDay'),
type: 'date', type: 'date',
value: 30 value: 30
} }
@@ -262,7 +262,7 @@ export default {
timeShowData: [], timeShowData: [],
nowTimeType: { nowTimeType: {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour'), text: this.$t('dashboard.dashboard.lastOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
} }
@@ -342,7 +342,7 @@ export default {
this.searchTime[1] = this.momentTz(item.end) this.searchTime[1] = this.momentTz(item.end)
this.showTime = this.nowTimeType = { this.showTime = this.nowTimeType = {
id: 0, id: 0,
text: this.searchTime[0] + ' ' + this.$t('dashboard.panel.to') + ' ' + this.searchTime[1], text: this.searchTime[0] + ' ' + this.$t('dashboard.dashboard.to') + ' ' + this.searchTime[1],
value: -1 value: -1
} }
this.showDropdown() this.showDropdown()
@@ -364,7 +364,7 @@ export default {
this.searchTime = this.$loadsh.cloneDeep(this.oldSearchTime) this.searchTime = this.$loadsh.cloneDeep(this.oldSearchTime)
this.showTime = this.nowTimeType = { this.showTime = this.nowTimeType = {
id: 0, id: 0,
text: this.searchTime[0] + ' ' + this.$t('dashboard.panel.to') + ' ' + this.searchTime[1], text: this.searchTime[0] + ' ' + this.$t('dashboard.dashboard.to') + ' ' + this.searchTime[1],
value: -1 value: -1
} }
this.isCustom = true this.isCustom = true
@@ -439,7 +439,7 @@ export default {
} else { } else {
// const time = this.searchTime.splice(' ') // const time = this.searchTime.splice(' ')
// this.showTime = this.nowTimeType = { // this.showTime = this.nowTimeType = {
// text: time[0] + ' ' + this.$t('dashboard.panel.to') + ' ' + time[1] // text: time[0] + ' ' + this.$t('dashboard.dashboard.to') + ' ' + time[1]
// } // }
// this.$set(this.searchTime, 0, bus.timeFormate(time[0])) // this.$set(this.searchTime, 0, bus.timeFormate(time[0]))
// this.$set(this.searchTime, 1, bus.timeFormate(time[1])) // this.$set(this.searchTime, 1, bus.timeFormate(time[1]))
@@ -447,7 +447,7 @@ export default {
this.$set(this.searchTime, 1, bus.timeFormate(timeGroup.end_time)) this.$set(this.searchTime, 1, bus.timeFormate(timeGroup.end_time))
this.showTime = this.nowTimeType = { this.showTime = this.nowTimeType = {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour'), text: this.$t('dashboard.dashboard.lastOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
} }
@@ -468,7 +468,7 @@ export default {
} else { } else {
this.showTime = this.nowTimeType = { this.showTime = this.nowTimeType = {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour'), text: this.$t('dashboard.dashboard.lastOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
} }

4
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -15,7 +15,7 @@
<el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px"> <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px">
<el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option> <el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
</el-select> </el-select>
<button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.panel.chartForm.filter')"> <button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.dashboard.chartForm.filter')">
<i class="nz-icon nz-icon-funnel"></i> <i class="nz-icon nz-icon-funnel"></i>
</button> </button>
<pick-time v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time> <pick-time v-model="searchTime" sign="message" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
@@ -681,7 +681,7 @@ export default {
time: this.searchTimeDialog, time: this.searchTimeDialog,
nowTimeType: { nowTimeType: {
id: 4, id: 4,
text: this.$t('dashboard.panel.lastOneHour'), text: this.$t('dashboard.dashboard.lastOneHour'),
type: 'hour', type: 'hour',
value: 1 value: 1
} }

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -88,7 +88,7 @@
@getTableData="getTableData" @getTableData="getTableData"
> >
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="asset-filter" :class="{ 'is-focus': dataListLayout.indexOf('clickSearch') > -1 }" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.panel.chartForm.filter')"> <button id="asset-filter" :class="{ 'is-focus': dataListLayout.indexOf('clickSearch') > -1 }" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.dashboard.chartForm.filter')">
<i class="nz-icon nz-icon-funnel"></i> <i class="nz-icon nz-icon-funnel"></i>
</button> </button>
<button id="asset-create-asset" v-has="'asset_add'" :title="$t('asset.createAsset')" class="top-tool-btn" @click.stop="add"> <button id="asset-create-asset" v-has="'asset_add'" :title="$t('asset.createAsset')" class="top-tool-btn" @click.stop="add">

6
nezha-fronted/src/components/page/asset/components/assetTagEx.vue
View File

@@ -49,7 +49,7 @@
<my-date-picker <my-date-picker
size="small" size="small"
:type="param.interval?'daterange':'date'" :type="param.interval?'daterange':'date'"
:range-separator="$t('dashboard.panel.to')" :range-separator="$t('dashboard.dashboard.to')"
:placeholder="$t('alert.silence.selectTime')" :placeholder="$t('alert.silence.selectTime')"
:start-placeholder="$t('overall.startTime')" :start-placeholder="$t('overall.startTime')"
:end-placeholder="$t('overall.endTime')" :end-placeholder="$t('overall.endTime')"
@@ -62,7 +62,7 @@
<el-time-picker <el-time-picker
size="small" size="small"
:is-range="param.interval" :is-range="param.interval"
:range-separator="$t('dashboard.panel.to')" :range-separator="$t('dashboard.dashboard.to')"
:placeholder="$t('alert.silence.selectTime')" :placeholder="$t('alert.silence.selectTime')"
:start-placeholder="$t('overall.startTime')" :start-placeholder="$t('overall.startTime')"
:end-placeholder="$t('overall.endTime')" :end-placeholder="$t('overall.endTime')"
@@ -73,7 +73,7 @@
<my-date-picker <my-date-picker
size="small" size="small"
:type="param.interval?'datetimerange':'datetime'" :type="param.interval?'datetimerange':'datetime'"
:range-separator="$t('dashboard.panel.to')" :range-separator="$t('dashboard.dashboard.to')"
:placeholder="$t('alert.silence.selectTime')" :placeholder="$t('alert.silence.selectTime')"
:start-placeholder="$t('overall.startTime')" :start-placeholder="$t('overall.startTime')"
:end-placeholder="$t('overall.endTime')" :end-placeholder="$t('overall.endTime')"

4
nezha-fronted/src/components/page/config/assetMeta.vue
View File

@@ -24,7 +24,7 @@
</template> </template>
<template v-slot:tail> <template v-slot:tail>
<div class="panel-select-tail"> <div class="panel-select-tail">
<span id="panel-list-toadd" v-has="'asset_label_add'" :title='$t("dashboard.panel.createPanelTitleSec")' class="panel-select-add" @click="addGroup"><i class="nz-icon nz-icon-create-square"></i>&nbsp;&nbsp;{{ $t('buttons.add') }}</span> <span id="panel-list-toadd" v-has="'asset_label_add'" :title='$t("dashboard.dashboard.createDashboardTitleSec")' class="panel-select-add" @click="addGroup"><i class="nz-icon nz-icon-create-square"></i>&nbsp;&nbsp;{{ $t('buttons.add') }}</span>
</div> </div>
</template> </template>
</select-group> </select-group>
@@ -143,7 +143,7 @@ export default {
disabled: false disabled: false
} }
// , { // , {
// name: this.$t('dashboard.panel.chartForm.group'), // name: this.$t('dashboard.dashboard.chartForm.group'),
// type: 'group', // type: 'group',
// label: 'group', // label: 'group',
// readonly: true, // readonly: true,

2
nezha-fronted/src/components/page/config/mibBrowser.vue
View File

@@ -47,7 +47,7 @@
<div class="mib-browser-tree-title"> <div class="mib-browser-tree-title">
<span>SNMP MIBs</span> <span>SNMP MIBs</span>
<el-dropdown ref="modelDropdown" :hide-on-click="false" trigger="click" @command="selectModel"> <el-dropdown ref="modelDropdown" :hide-on-click="false" trigger="click" @command="selectModel">
<span class="mib-browser-table-op">{{$t("config.model.model") + " "}}<i class="nz-icon nz-icon-funnel" :title="$t('dashboard.panel.chartForm.filter')"></i></span> <span class="mib-browser-table-op">{{$t("config.model.model") + " "}}<i class="nz-icon nz-icon-funnel" :title="$t('dashboard.dashboard.chartForm.filter')"></i></span>
<el-dropdown-menu slot="dropdown" class="mib-browser-model-dropdown el-dropdown-multi right-box-select-top"> <el-dropdown-menu slot="dropdown" class="mib-browser-model-dropdown el-dropdown-multi right-box-select-top">
<el-dropdown-item v-for="(item, index) in modelData" :key="index" :class="{'dropdown-item-active': walkParam.models.indexOf(item.id) > -1}" :command="item">{{item.name}}</el-dropdown-item> <el-dropdown-item v-for="(item, index) in modelData" :key="index" :class="{'dropdown-item-active': walkParam.models.indexOf(item.id) > -1}" :command="item">{{item.name}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>

2
nezha-fronted/src/components/page/config/template/chartTemp.vue
View File

@@ -156,7 +156,7 @@ export default {
disabled: false disabled: false
}, },
{ {
name: this.$t('dashboard.panel.chartForm.varType'), name: this.$t('dashboard.dashboard.chartForm.varType'),
type: 'select', type: 'select',
label: 'varType', label: 'varType',
readonly: true, readonly: true,

2
nezha-fronted/src/components/page/config/template/dashboardTemp.vue
View File

@@ -119,7 +119,7 @@ export default {
disabled: false disabled: false
}, },
{ {
name: this.$t('dashboard.panel.chartForm.varType'), name: this.$t('dashboard.dashboard.chartForm.varType'),
type: 'select', type: 'select',
label: 'dashboardVarType', label: 'dashboardVarType',
readonly: true, readonly: true,

2
nezha-fronted/src/components/page/config/template/exprTemp.vue
View File

@@ -128,7 +128,7 @@ export default {
label: 'name', label: 'name',
disabled: false disabled: false
}, { }, {
name: this.$t('dashboard.panel.chartForm.group'), name: this.$t('dashboard.dashboard.chartForm.group'),
type: 'input', type: 'input',
label: 'gname', label: 'gname',
disabled: false disabled: false

4
nezha-fronted/src/components/page/dashboard/dashboard.vue
View File

@@ -35,7 +35,7 @@
<i class="nz-icon nz-icon-create-square"></i>&nbsp;{{$t('overall.addDashboard')}} <i class="nz-icon nz-icon-create-square"></i>&nbsp;{{$t('overall.addDashboard')}}
</span> </span>
<!-- 通过dashboard模板创建 --> <!-- 通过dashboard模板创建 -->
<span v-has="'main_add'" @click="addByTemplate" :title='$t("dashboard.panel.addByTemplate")' class="dashboard-addBy-template"> <span v-has="'main_add'" @click="addByTemplate" :title='$t("dashboard.dashboard.addByTemplate")' class="dashboard-addBy-template">
<i class="nz-icon nz-icon-template1"></i> <i class="nz-icon nz-icon-template1"></i>
</span> </span>
</template> </template>
@@ -303,7 +303,7 @@ export default {
disabled: false disabled: false
}, },
{ {
name: this.$t('dashboard.panel.chartForm.varType'), name: this.$t('dashboard.dashboard.chartForm.varType'),
type: 'select', type: 'select',
label: 'varType', label: 'varType',
disabled: false disabled: false

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

@@ -122,7 +122,7 @@
</el-collapse-item> </el-collapse-item>
<el-collapse-item class="el-collapse-item__height" name="2" title="Table"> <el-collapse-item class="el-collapse-item__height" name="2" title="Table">
<div slot="title" class="explore-table-title"> <div slot="title" class="explore-table-title">
{{$t('dashboard.panel.chartForm.typeVal.table.label')}} {{$t('dashboard.dashboard.chartForm.typeVal.table.label')}}
<i <i
class="nz-icon-gear nz-icon" class="nz-icon-gear nz-icon"
style="position: absolute;right: 10px;top: 8px" style="position: absolute;right: 10px;top: 8px"
@@ -3499,7 +3499,7 @@ export default {
}, },
{ {
value: 'Logs', value: 'Logs',
label: this.$t('dashboard.panel.chartForm.typeVal.log.label'), label: this.$t('dashboard.dashboard.chartForm.typeVal.log.label'),
icon: 'nz-icon nz-icon-logs' icon: 'nz-icon nz-icon-logs'
} }
], ],

2
nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
View File

@@ -27,7 +27,7 @@
</el-collapse-item> </el-collapse-item>
<el-collapse-item class="el-collapse-item__height" name="2" title="Table"> <el-collapse-item class="el-collapse-item__height" name="2" title="Table">
<div slot="title" class="explore-table-title"> <div slot="title" class="explore-table-title">
{{$t('dashboard.panel.chartForm.typeVal.table.label')}} {{$t('dashboard.dashboard.chartForm.typeVal.table.label')}}
<i <i
class="nz-icon-gear nz-icon" class="nz-icon-gear nz-icon"
style="position: absolute;right: 10px;top: 8px" style="position: absolute;right: 10px;top: 8px"

2
nezha-fronted/src/components/page/dashboard/overview/chart.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="chart-room" @mouseenter="mouseEnterChart" @mouseleave="mouseLeaveChart" ref="chartRoom" :style="{overflow: chartType == 'map' ? 'hidden' : ''}" :id="chartType == 'map' ? 'map' : ''"> <div class="chart-room" @mouseenter="mouseEnterChart" @mouseleave="mouseLeaveChart" ref="chartRoom" :style="{overflow: chartType == 'map' ? 'hidden' : ''}" :id="chartType == 'map' ? 'map' : ''">
<loading ref="loading"></loading> <loading ref="loading"></loading>
<div class="showMore" v-if="legendAll.length !== legend.length"><i class="nz-icon nz-icon-jinggao"></i>{{$t("dashboard.panel.moreTitle")}} <span class="moreChart" @click="showMore">{{$t("dashboard.panel.showAll")+legendAll.length}}</span></div> <div class="showMore" v-if="legendAll.length !== legend.length"><i class="nz-icon nz-icon-jinggao"></i>{{$t("dashboard.dashboard.moreTitle")}} <span class="moreChart" @click="showMore">{{$t("dashboard.dashboard.showAll")+legendAll.length}}</span></div>
<div class="chart-header">{{chartTitle}}</div> <div class="chart-header">{{chartTitle}}</div>
<div class="chart-body" ref="chartBody" :id="chartId" ></div> <div class="chart-body" ref="chartBody" :id="chartId" ></div>

2
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -84,7 +84,7 @@
@getTableData="getTableData" @getTableData="getTableData"
> >
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="asset-filter" :class="{ 'is-focus': dataListLayout.indexOf('clickSearch') > -1 }" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.panel.chartForm.filter')"> <button id="asset-filter" :class="{ 'is-focus': dataListLayout.indexOf('clickSearch') > -1 }" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.dashboard.chartForm.filter')">
<i class="nz-icon nz-icon-funnel"></i> <i class="nz-icon nz-icon-funnel"></i>
</button> </button>
<button id="account-add" v-has="'monitor_endpoint_add'" :title="$t('overall.createEndpoint')" class="top-tool-btn" type="button" @click="add"> <button id="account-add" v-has="'monitor_endpoint_add'" :title="$t('overall.createEndpoint')" class="top-tool-btn" type="button" @click="add">

2
nezha-fronted/src/components/page/tool/ping.vue
View File

@@ -94,7 +94,7 @@
<div class="radar-line"></div> <div class="radar-line"></div>
</div> </div>
<div class="tools-header-right-content"> <div class="tools-header-right-content">
<div class="tools-header-right-title right-content-text">{{$t('dashboard.panel.chartForm.statistics')}}</div> <div class="tools-header-right-title right-content-text">{{$t('dashboard.dashboard.chartForm.statistics')}}</div>
<div class="right-content-text right-content-box"> <div class="right-content-text right-content-box">
<span class="margin-l-5">{{$t('asset.total')}}:<span class="margin-l-10 margin-r-30">{{total}}</span></span> <span class="margin-l-5">{{$t('asset.total')}}:<span class="margin-l-10 margin-r-30">{{total}}</span></span>
<span>{{$t('ping.done')}}:<span class="margin-l-10 margin-r-30">{{done}}</span></span> <span>{{$t('ping.done')}}:<span class="margin-l-10 margin-r-30">{{done}}</span></span>

2
nezha-fronted/src/components/page/tool/trace.vue
View File

@@ -91,7 +91,7 @@
<div class="radar-line"></div> <div class="radar-line"></div>
</div> </div>
<div class="tools-header-right-content"> <div class="tools-header-right-content">
<div class="tools-header-right-title right-content-text">{{$t('dashboard.panel.chartForm.statistics')}}</div> <div class="tools-header-right-title right-content-text">{{$t('dashboard.dashboard.chartForm.statistics')}}</div>
<div class="right-content-text right-content-box" > <div class="right-content-text right-content-box" >
<span class="margin-l-5">{{$t('asset.total')}}:<span class="margin-l-10 margin-r-30">{{total}}</span></span> <span class="margin-l-5">{{$t('asset.total')}}:<span class="margin-l-10 margin-r-30">{{total}}</span></span>
<span>{{$t('ping.done')}}:<span class="margin-l-10 margin-r-30">{{done}}</span></span> <span>{{$t('ping.done')}}:<span class="margin-l-10 margin-r-30">{{done}}</span></span>

2
nezha-fronted/src/entrance/exportHtml/i18nData.js
View File

File diff suppressed because one or more lines are too long