diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 85ec00914..e46fafe65 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1174,7 +1174,8 @@ const cn = { editEndpoint: '编辑 Endpoint', createEndpoint: '新增Endpoint', batchEndpoint: '批量 Endpoint', - endpointName: 'Endpoint name' + endpointName: 'Endpoint name', + name: '名称' }, endpoint: { createEndpoint: '新增Endpoint', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 1a8fd3c3a..6da0f527c 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -109,6 +109,7 @@ const en = { parent: 'Parent', dc: 'Data center', labels: 'Labels', + moreOption: 'More option', silence: 'Silence' }, pageSize: '/page', @@ -1161,7 +1162,7 @@ const en = { endpointInfo: 'Endpoint information' }, project: { - project: 'Project', // "系统" + project: 'Name', // "系统" projectName: 'Project name', // "系统名称" editProject: 'Edit project', // "编辑系统" description: 'Description', // "描述" @@ -1169,7 +1170,7 @@ const en = { }, module: { module: 'Module', // "组件" - moduleName: 'Module name', // "组件名称" + moduleName: 'Name', // "组件名称" editModule: 'Edit module', // "编辑组件" description: 'Description', // "描述" createModule: 'New module', // "新增组件" @@ -1191,6 +1192,7 @@ const en = { createEndpoint: 'New endpoint', batchEndpoint: 'Batch Endpoint', endpointName: 'Endpoint name', + name: 'Name', tip: { defaultEndpointSet: 'Default endpoint settings', // "默认的Endpoint设置" relation: 'Module associated Endpoint will configure the following ports/paths/parameters by default'// "组件关联的Endpoint将默认配置以下端口/路径/参数" diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index 39e761c72..c340b111d 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -185,11 +185,11 @@ - diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue index abe450ca1..1920627fb 100644 --- a/nezha-fronted/src/components/common/rightBox/agentBox.vue +++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue @@ -2,7 +2,7 @@
-
{{editPromServer.id ? ($t("config.agent.editProm") + " ID:" + editPromServer.id) : $t("config.agent.createProm")}}
+
{{editPromServer.id ? ($t("config.agent.editProm")) : $t("config.agent.createProm")}}
@@ -55,17 +55,17 @@
- +
-
+ diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 0ea21a780..d01cc19e4 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -108,11 +108,11 @@ -
- -
diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index bc942a08a..0c42174e9 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -97,13 +97,13 @@ - -
{{editAsset.id ? ($t("asset.editAsset") + " ID:" + editAsset.id) : $t("asset.createAsset")}}
+
{{editAsset.id ? ($t("asset.editAsset")) : $t("asset.createAsset")}}
@@ -149,11 +149,11 @@
-
- -
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue index 4d0766e79..f2a7e179c 100644 --- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue @@ -3,8 +3,7 @@
-
{{editAssetMeta.id ? $t("config.assetLabel.editMeta") + " ID:" + editAssetMeta.id : - $t("config.assetLabel.addMeta")}} +
{{editAssetMeta.id ? $t("config.assetLabel.editMeta"): $t("config.assetLabel.addMeta")}}
@@ -127,11 +126,11 @@ -
- -
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue b/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue index 5561a96ec..9ab3ebeff 100644 --- a/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue +++ b/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue @@ -12,7 +12,7 @@ -
{{editMetaGroup.id ? $t("config.assetMeta.editGroup") + " ID:" + editMetaGroup.id : +
{{editMetaGroup.id ? $t("config.assetMeta.editGroup") : $t("config.assetMeta.addGroup")}}
@@ -31,11 +31,11 @@ -
- -
diff --git a/nezha-fronted/src/components/common/rightBox/assetStateBox.vue b/nezha-fronted/src/components/common/rightBox/assetStateBox.vue index b468ba929..9f8d8d14b 100644 --- a/nezha-fronted/src/components/common/rightBox/assetStateBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetStateBox.vue @@ -12,7 +12,7 @@ -
{{editAssetState.id ? ($t("config.assetState.editAssetState") + " ID:" + editAssetState.id) : $t("config.assetState.createAssetState")}}
+
{{editAssetState.id ? ($t("config.assetState.editAssetState")) : $t("config.assetState.createAssetState")}}
@@ -48,12 +48,12 @@
-
- -
-
- -
diff --git a/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue index cb9880b1a..37b84d9df 100644 --- a/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue +++ b/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue @@ -98,11 +98,11 @@
- diff --git a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue index 6de7491d4..f9f3e4ce0 100644 --- a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue @@ -10,7 +10,7 @@ -
{{editCabinet.id ? $t("config.dc.editCabinet") + " ID: " + editCabinet.id : $t("overall.createCabinet")}}
+
{{editCabinet.id ? $t("config.dc.editCabinet") : $t("overall.createCabinet")}}
@@ -32,11 +32,11 @@
-
- -
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 8c5d4a0f5..115f3533b 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -2,7 +2,7 @@
-
{{editDc.id ? ($t("config.dc.editDc") + " ID:" + editDc.id) : $t("config.dc.createDc")}}
+
{{editDc.id ? ($t("config.dc.editDc")) : $t("config.dc.createDc")}}
@@ -52,11 +52,11 @@
-
- -
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue index 121f2ef52..08aa50c8b 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue @@ -124,11 +124,11 @@ -
- -
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index 80c5bd42e..09d961bc0 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -4,7 +4,7 @@
- {{ $t("project.module.editEndpoint")}} {{editEndpoint.id}} + {{ $t("project.module.editEndpoint")}} {{ $t("project.module.batchEndpoint")}} @@ -23,7 +23,7 @@
- + @@ -244,11 +244,11 @@
- @@ -462,7 +462,7 @@ export default { this.$nextTick(() => { this.$refs.moduleForm.validate((valid) => { if (valid) { - if (this.type === 'add') { + if (this.optionType === 'add') { this.prevent_opt.save = true if (this.editEndpoint.assetId) { this.$emit('close', true, this.editEndpoint, false) @@ -471,7 +471,7 @@ export default { this.$emit('close', true, this.editEndpoint, true) this.prevent_opt.save = false } - } else if (this.type === 'edit') { + } else if (this.optionType === 'edit') { if (this.editEndpoint.id) { this.$put('monitor/endpoint', [params]).then(response => { if (response.code === 200) { diff --git a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue index c9da7a0dc..9c3d8b114 100644 --- a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue +++ b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue @@ -2,7 +2,7 @@
-
{{editExprTemp.id ? $t("config.exprTemp.edit") + " ID:" + editExprTemp.id : +
{{editExprTemp.id ? $t("config.exprTemp.edit"): $t("config.exprTemp.create")}}
@@ -56,13 +56,13 @@
-
+ diff --git a/nezha-fronted/src/components/common/rightBox/menuBox.vue b/nezha-fronted/src/components/common/rightBox/menuBox.vue index 1b3f94528..943533523 100644 --- a/nezha-fronted/src/components/common/rightBox/menuBox.vue +++ b/nezha-fronted/src/components/common/rightBox/menuBox.vue @@ -12,7 +12,7 @@ -
{{editMenu.id ? ($t("config.menus.editMenu") + " ID:" + editMenu.id) : $t("config.menus.createMenu")}}
+
{{editMenu.id ? ($t("config.menus.editMenu")) : $t("config.menus.createMenu")}}
@@ -68,12 +68,12 @@
-
- - diff --git a/nezha-fronted/src/components/common/rightBox/mibBox.vue b/nezha-fronted/src/components/common/rightBox/mibBox.vue index c7abb2ce4..b2c16de3e 100644 --- a/nezha-fronted/src/components/common/rightBox/mibBox.vue +++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue @@ -2,7 +2,7 @@
-
{{editMib.id ? ($t("config.mib.editMib") + " ID:" + editMib.id) : $t("config.mib.createMib")}}
+
{{editMib.id ? ($t("config.mib.editMib")) : $t("config.mib.createMib")}}
@@ -23,7 +23,7 @@ collapse-tags :placeholder="$t('config.mib.modelTip')" size="small" - class="right-box__select" + class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" clearable> @@ -45,11 +45,11 @@
-
- -
diff --git a/nezha-fronted/src/components/common/rightBox/modelBox.vue b/nezha-fronted/src/components/common/rightBox/modelBox.vue index 45e5a19bc..1f2154303 100644 --- a/nezha-fronted/src/components/common/rightBox/modelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/modelBox.vue @@ -10,7 +10,7 @@ -
{{editModel.id ? ($t("config.model.editModel") + " ID:" + editModel.id) : $t("config.model.createModel")}}
+
{{editModel.id ? ($t("config.model.editModel")) : $t("config.model.createModel")}}
@@ -74,11 +74,11 @@
-
- -
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index d1b679a89..2254eb0a6 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -17,7 +17,7 @@ - + @@ -237,11 +237,11 @@
- diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue index 54c346353..330686181 100644 --- a/nezha-fronted/src/components/common/rightBox/panelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue @@ -1,21 +1,12 @@