diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index f5bebb5fb..1b972fc96 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -17518,7 +17518,7 @@ }, "showdown": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz", + "resolved": "https://registry.npmmirror.com/showdown/-/showdown-2.1.0.tgz", "integrity": "sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==", "requires": { "commander": "^9.0.0" @@ -17526,7 +17526,7 @@ "dependencies": { "commander": { "version": "9.5.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", + "resolved": "https://registry.npmmirror.com/commander/-/commander-9.5.0.tgz", "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==" } } diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss index af35b8d15..a17e72a4a 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss @@ -80,6 +80,15 @@ .ͼ2 .cm-content{ caret-color:$--color-text-regular; } + .alert-box-threshold { + .hide-icon { + .el-input__inner{ + text-align: center; + padding: 0; + border:1px solid $--border-color-light; + } + } + } } .severity-item{ color: $--color-text-secondary; diff --git a/nezha-fronted/src/assets/css/components/page/integration/integration.scss b/nezha-fronted/src/assets/css/components/page/integration/integration.scss index a9c1eab1b..cc3485a26 100644 --- a/nezha-fronted/src/assets/css/components/page/integration/integration.scss +++ b/nezha-fronted/src/assets/css/components/page/integration/integration.scss @@ -143,6 +143,7 @@ letter-spacing: 0; line-height: 16px; font-weight: 400; + word-break: keep-all; } } } @@ -258,6 +259,15 @@ word-break: break-word; white-space: pre-wrap; } + blockquote{ + font-size: 13px; + font-weight: 600; + padding: 3px 15px; + margin-bottom: -1px; + color: $--color-text-regular; + border: 1px solid $--border-color-light; + background: $--alert-rule-background-color; + } } .integration-dashboard{ @@ -316,6 +326,9 @@ .nz-table-list{ padding: 0; height: 100%; + .metric-remark{ + word-break: keep-all; + } .gutter{ position: unset; } diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue index ef9e3acb0..437d9593b 100644 --- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue +++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue @@ -20,7 +20,7 @@ :close-delay=10 trigger="hover" popper-class="chart-warring-popper"> -
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}
+
{{$t('dashboard.dashboard.moreTitle')}}{{$t('dashboard.dashboard.showAll')}}{{allDataLength}}
diff --git a/nezha-fronted/src/components/chart/chart/chart-table.vue b/nezha-fronted/src/components/chart/chart/chart-table.vue index c0b01298b..24be1e71b 100644 --- a/nezha-fronted/src/components/chart/chart/chart-table.vue +++ b/nezha-fronted/src/components/chart/chart/chart-table.vue @@ -60,7 +60,7 @@