diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 523d08856..c123b22e8 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -100,6 +100,10 @@ line-height: 20px; font-weight: 400; margin-top: 3px; + max-width: 30%; + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; } .timezone-offset{ display: inline-block; diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index bc039ad69..458b106df 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -290,7 +290,7 @@ const cn = { tooltip: 'Tooltip', displayChart: '图表', aggregation: 'Aggregation', - varType: 'Vartype', + varType: 'Variable type', pid: 'Chart 模板', selectAsset: '请选择Asset', selectEndpoint: '请选择Endpoint' @@ -1040,12 +1040,12 @@ const cn = { create: '创建表达式模板', expressionError: '请填写表达式', type: 'Type', - varType: 'varType' + varType: 'Variable type' }, chartTemp: { chartTemp: 'Chart 模板', type: 'Type', - varType: 'varType' + varType: 'Variable type' } }, alert: { @@ -1107,6 +1107,7 @@ const cn = { } }, silence: { + name:'名称', silence: '告警静默', create: '创建告警静默', edit: '修改告警静默', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 5df9b553f..aeafd02b8 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -299,7 +299,7 @@ const en = { tooltip: 'Tooltip', displayChart: 'Display chart', aggregation: 'Aggregation', - varType: 'Vartype', + varType: 'Variable type', pid: 'Chart template', selectAsset: 'Please select the Asset', selectEndpoint: 'Please select the Endpoint' @@ -1060,12 +1060,12 @@ const en = { create: 'New expression template', expressionError: 'Please fill in the "expression" value', type: 'Type', - varType: 'varType' + varType: 'Variable type' }, chartTemp: { chartTemp: 'Chart template', type: 'Type', - varType: 'varType' + varType: 'Variable type' } }, alert: { @@ -1127,6 +1127,7 @@ const en = { }, }, silence: { + name:'Name', silence: 'Alert silence', create: 'New alert silence', edit: 'Edit alert silence', diff --git a/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue b/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue index 7a72e17a8..2e4873afc 100644 --- a/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue +++ b/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue @@ -169,8 +169,8 @@
diff --git a/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue b/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue index 8208a781a..0261c2484 100644 --- a/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue +++ b/nezha-fronted/src/components/common/myDatePicker/src/panel/time-range.vue @@ -41,8 +41,8 @@