From 2113c435a4c12fc561bdf98493e3b3f7e565409d Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 19 Aug 2021 15:54:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?NEZ-916=20feat=EF=BC=9A=20module=20endpoint?= =?UTF-8?q?=20=E6=94=AF=E6=8C=81relabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/js/constants.js | 20 +-- .../src/components/common/js/validate.js | 8 + .../src/components/common/language/cn.js | 4 +- .../src/components/common/language/en.js | 4 +- .../components/common/rightBox/agentBox.vue | 17 ++- .../common/rightBox/batchAddEndpoint.vue | 7 + .../common/rightBox/editEndpointBoxNew.vue | 141 +++++++++++++++++- .../components/common/rightBox/moduleBox.vue | 136 ++++++++++++++++- .../page/monitor/endpoint/endpointList.vue | 8 + .../page/monitor/module/moduleList.vue | 17 +++ 10 files changed, 326 insertions(+), 36 deletions(-) diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index dad15dcc9..8bdca6e8e 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -18,11 +18,11 @@ export const agent = { value: 2, text: 'Per-datacenter' }, - { - label: 'Loki', - value: 11, - text: 'Loki' - } + // { + // label: 'Loki', + // value: 11, + // text: 'Loki' + // } ] }, { @@ -70,12 +70,12 @@ export const agent2 = { label: 'Per-datacenter', value: 2, text: 'Per-datacenter' - }, - { - label: 'Loki', - value: 11, - text: 'Loki' } + // { + // label: 'Loki', + // value: 11, + // text: 'Loki' + // } ], theDataGroup: [ { diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index bcf9a0f99..612c0b972 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -170,6 +170,14 @@ export function checkExprTempAge (rule, value, callback) { }, 100) } +export function arrLength (rule, value, callback) { // 校验经纬度 + if (value.length > 0) { + callback() + } else { + callback(new Error(vm.$t('validate.required'))) + } +} + export function longAndLat (rule, value, callback) { // 校验经纬度 } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index e29bcdcf8..d6cdf4307 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -150,7 +150,9 @@ const cn = { generate: '生产', personalCenter: '个人中心', operationRecord: '操作记录', - changePassword: '修改密码' + changePassword: '修改密码', + relabelConfigRegex: '默认是 (.*) ', + relabelConfigReplacement: '默认是 $1' }, setup: { step0: '欢迎', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 3b7791e47..3300aac3c 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -155,7 +155,9 @@ const en = { generate: 'Generate', personalCenter: 'Personal center', operationRecord: 'Operation record', - changePassword: 'Change password' + changePassword: 'Change password', + relabelConfigRegex: 'Default is (.*) ', + relabelConfigReplacement: 'Default is $1' }, pageSize: '/page', setup: { diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue index 31db5bab4..777867f26 100644 --- a/nezha-fronted/src/components/common/rightBox/agentBox.vue +++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue @@ -43,14 +43,15 @@ - - - {{item.label}} - - + + + + + + + + {{item.label}} + diff --git a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue index 7bb5cad36..1ebb4a10d 100644 --- a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue +++ b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue @@ -404,6 +404,13 @@ export default { // this.object.port = this.object.configs.port ? JSON.parse(JSON.stringify(this.object.configs.port)) : '' this.object.paramObj = [] this.object.labelModule = [] + if (!this.object.configs[0].config.relabel_config) { + this.object.configs[0].config.relabel_config = [] + } + this.object.configs[0].config.relabel_config && this.object.configs[0].config.relabel_config.forEach(item => { + item.showAllRelabelOption = false + item.tags = '' + }) this.object.configs[1].config.forEach(item => { item.labelModule = [] if (JSON.stringify(item.labels) !== '{}' && item.labels) { diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index da6a29816..c9207f465 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -116,7 +116,7 @@ @@ -137,7 +137,7 @@
{{$t('project.module.walk')}}
- +