From d89df0decd298c514644bd4aa329b7176a2f0fe4 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 29 Oct 2021 18:31:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?NEZ-1138=20style:=20=E4=BF=AE=E5=A4=8DModul?= =?UTF-8?q?e=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common/rightBoxCommon.scss | 6 ++---- nezha-fronted/src/components/common/language/cn.js | 1 + nezha-fronted/src/components/common/language/en.js | 1 + nezha-fronted/src/components/page/dashboard/chartBox.vue | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 36a1ee3c2..addf6b12e 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -115,10 +115,8 @@ } .el-form-item { .el-input--small.not-fixed-height { - height: 32px; - .el-input__count { - line-height: 29px; - height: 25px; + .el-textarea__inner { + min-height: 32px !important; } } } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index ed1048869..33c8bed85 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -284,6 +284,7 @@ const cn = { chartName: '图表名称', type: '类型', url: 'URL', + name: '名称', statistics: '统计数据', sync: '同步到设备', last: '最后的', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index ac8a9d4c2..1c571b0b5 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -295,6 +295,7 @@ const en = { type: 'Type', unit: 'Unit', url: 'URL', + name: 'Name', legend: 'Legend', statistics: 'Statistics', legendTip: 'Controls the name of the time series, using name or pattern. For example {{hostname}} will be replaced with label value for the label hostname.', diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index aab8faf0e..284dbdd56 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -185,7 +185,7 @@
- + From d32811dc52f8bedcaf55a2bda78a0483a3f64ee3 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 29 Oct 2021 18:57:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DchartBox=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/common/rightBoxCommon.scss | 14 -------------- .../page/dashboard/explore/promqlInput.vue | 9 ++++----- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index addf6b12e..bab643ff1 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -93,20 +93,6 @@ } } } - .form-row-item { - .input-box { - .el-textarea { - .el-textarea__inner { - width: 466px; - height: 32px; - padding: 5px 70px 4px 10px; - } - .el-input__count { - right: 0; - } - } - } - } .el-form-item { .el-input__count { line-height: 29px; diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue index be38408f8..6b4ef9722 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue @@ -38,7 +38,7 @@
{{errorMsg}}
{{appendMsg}}
-
+
{{$t('overall.remark')}}
-
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
+
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
@@ -135,7 +135,7 @@
{{$t('overall.remark')}}
-
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
+
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
@@ -441,7 +441,7 @@ export default { position: fixed; background-color: white; z-index: 3000; - padding: 10px; + padding: 10px 23px 10px 10px; border-radius: 4px; box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77); } @@ -503,26 +503,25 @@ export default { /*border-bottom: 1px solid #ebeef5;*/ } .alert-label-title{ - font-family: Roboto-Regular; font-size: 14px; color: #666666; letter-spacing: 0; line-height: 23px; - font-weight: 400; - min-width: 100px; + min-width: 110px; padding: 0 3px 0 13px; - min-width: 100px; } .alert-label-value{ height: 26px; - ont-family: Roboto-Regular; font-size: 14px; color: #333333; letter-spacing: 0; line-height: 23px; - font-weight: 400; - padding: 0 3px 0 13px; - word-break: break-all; + } + .alert-label-remark { + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; + max-width: 210px; } .danger{ background-color: #d64f40; diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue index 6769ab585..3ddba11db 100644 --- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue +++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue @@ -161,7 +161,7 @@ export default { position: fixed; background-color: white; z-index: 3000; - padding: 10px; + padding: 10px 23px 10px 10px; border-radius: 4px; box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77); } @@ -230,7 +230,7 @@ export default { } .alert-rule-title{ text-align: left; - width: 110px; + min-width: 110px; color: #666; padding: 0 3px 0 13px; }