diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 3aac0c05b..6f70617e2 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -6,6 +6,9 @@ height: 100%; width: auto; } +.pdfDom{ + padding-bottom: 20px; +} .panel-chart { border: 1px solid $--chart-box-border-color; height: 100%; diff --git a/nezha-fronted/src/components/common/language/newcn.js b/nezha-fronted/src/components/common/language/newcn.js index 87fcd996d..89e973d93 100644 --- a/nezha-fronted/src/components/common/language/newcn.js +++ b/nezha-fronted/src/components/common/language/newcn.js @@ -85,7 +85,9 @@ const newcn = { }, overall: { system: '系统', - back: '返回' + back: '返回', + enabled: '启用', + disabled: '已禁用' }, ...zhLocale } diff --git a/nezha-fronted/src/components/common/language/newen.js b/nezha-fronted/src/components/common/language/newen.js index fd30a31f0..1c41c844b 100644 --- a/nezha-fronted/src/components/common/language/newen.js +++ b/nezha-fronted/src/components/common/language/newen.js @@ -93,7 +93,9 @@ const newen = { }, overall: { system: 'System', - back: 'Back' + back: 'Back', + enabled: 'Enabled', + disabled: 'Disabled' }, ...enLocale } diff --git a/nezha-fronted/src/components/common/mixin/promqlInput.js b/nezha-fronted/src/components/common/mixin/promqlInput.js index df005758f..16c136758 100644 --- a/nezha-fronted/src/components/common/mixin/promqlInput.js +++ b/nezha-fronted/src/components/common/mixin/promqlInput.js @@ -15,7 +15,7 @@ export default { const metricMap = new Map() metrics.forEach((item) => { let key = '' - if (/^[a-zA-Z]+?_[a-zA-Z]*/.test(item)) { + if (/^[a-zA-Z0-9]+?_[a-zA-Z0-9]*/.test(item)) { key = item.split('_')[0] } else if (/^_\w*/.test(item)) { key = ' ' diff --git a/nezha-fronted/src/entrance/exportHtml/exportHtml.html b/nezha-fronted/src/entrance/exportHtml/exportHtml.html index 842b70bb4..d914ecceb 100644 --- a/nezha-fronted/src/entrance/exportHtml/exportHtml.html +++ b/nezha-fronted/src/entrance/exportHtml/exportHtml.html @@ -1,8 +1,7 @@ - + +