From 60671e1d3bc0caac829b28765ad11ec24a3b6e42 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 15 Jul 2022 17:05:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/panelChart.vue | 2 +- .../src/components/common/@topology/core/src/core.js | 1 - .../src/components/common/@topology/core/src/models/point.js | 1 - .../src/components/common/@topology/core/src/socket.js | 2 +- .../src/components/common/honeycomb/hexagonFigureSvg.vue | 2 +- nezha-fronted/src/components/common/js/common.js | 3 +++ nezha-fronted/src/components/common/pickTime.vue | 4 ++-- nezha-fronted/src/components/common/project/topologyL5.vue | 3 --- .../src/components/common/rightBox/chart/chartRightBox.vue | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index aaef3cee1..93efaef74 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -265,7 +265,7 @@ export default { this.logChartDataFormat() } }).catch(res => { - console.info(res) + // console.info(res) }).finally(() => { this.loading = false }) diff --git a/nezha-fronted/src/components/common/@topology/core/src/core.js b/nezha-fronted/src/components/common/@topology/core/src/core.js index 317fc41c1..ee4997280 100644 --- a/nezha-fronted/src/components/common/@topology/core/src/core.js +++ b/nezha-fronted/src/components/common/@topology/core/src/core.js @@ -2986,7 +2986,6 @@ const Topology = /** @class */ (function () { } this.cache = null this.data = null - console.log(this.options) this.options.on = null window.topology = null this.activeLayer = null diff --git a/nezha-fronted/src/components/common/@topology/core/src/models/point.js b/nezha-fronted/src/components/common/@topology/core/src/models/point.js index a7bcfe7fb..e76deaf25 100644 --- a/nezha-fronted/src/components/common/@topology/core/src/models/point.js +++ b/nezha-fronted/src/components/common/@topology/core/src/models/point.js @@ -47,7 +47,6 @@ const Point = /** @class */ (function () { return Point }()) export { Point } -console.log(132123132123) window.topologyPoint = Point window.Le5leTopologyPoint = Point // # sourceMappingURL=point.js.map diff --git a/nezha-fronted/src/components/common/@topology/core/src/socket.js b/nezha-fronted/src/components/common/@topology/core/src/socket.js index 19f2b8c44..99d9e76e9 100644 --- a/nezha-fronted/src/components/common/@topology/core/src/socket.js +++ b/nezha-fronted/src/components/common/@topology/core/src/socket.js @@ -10,7 +10,7 @@ const Socket = /** @class */ (function () { this.socket = new WebSocket(this.url) this.socket.onmessage = this.cb this.socket.onclose = function () { - console.info('Canvas websocket closed and reconneting...') + // console.info('Canvas websocket closed and reconneting...') _this.init() } } diff --git a/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue b/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue index f4af05331..f305c2483 100644 --- a/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue +++ b/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue @@ -292,7 +292,7 @@ export default { }, 500) }) }).catch((res) => { - console.info(res) + // console.info(res) }) }, getLayout () { diff --git a/nezha-fronted/src/components/common/js/common.js b/nezha-fronted/src/components/common/js/common.js index 6bf26d6e4..2fc6a0787 100644 --- a/nezha-fronted/src/components/common/js/common.js +++ b/nezha-fronted/src/components/common/js/common.js @@ -40,6 +40,9 @@ export function getTopology (key) { export function setTopology (key, value) { topologyCache[`topology${key}`] = value + if (!value) { + delete topologyCache[`topology${key}`] + } } export function clearTopologyCache () { diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue index 8cfe0d54d..ba4d3982c 100644 --- a/nezha-fronted/src/components/common/pickTime.vue +++ b/nezha-fronted/src/components/common/pickTime.vue @@ -97,7 +97,7 @@ export default { this.intervalTimer = setInterval(() => { this.$emit('change', this.searchTime) this.refreshDataFunc() - }, val.value * 1000) + }, val.value * 200) return } if (val && val.value != -1) { @@ -109,7 +109,7 @@ export default { } this.intervalTimer = setInterval(() => { this.getIntervalData(this.interval.value) - }, val.value * 1000) + }, val.value * 200) } }, dropdownHandler (show) { diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 0777ec4ad..f2b3b3f51 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -641,7 +641,6 @@ export default { canvasRegister() }, mounted () { - console.log('mounted') if (!this.fromOverView) { // 从overview来的 加载相应图片 优化首页加载速度 this.addNodeInit() } @@ -2285,7 +2284,6 @@ export default { this.timer4 = null } if (getTopology(this.topologyIndex)) { - console.log(getTopology(this.topologyIndex)) // getTopology(this.topologyIndex).open({ pens: [] }) // getTopology(this.topologyIndex).off('contextmenu', this.onContextMenu) // getTopology(this.topologyIndex).data.pens.forEach(item => { @@ -2362,7 +2360,6 @@ export default { delete StoreData[key] } }) - console.log(le5leStore.get()) // Object.keys(getTopology(this.topologyIndex)).forEach(key => { // getTopology(this.topologyIndex)[key] = null // }) diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue index d7fd8e637..ef3d0759b 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue @@ -299,7 +299,7 @@ export default { } }).catch(res => { this.$refs['childrenFrom' + this.editChart.datasource].showError() - console.info(res) + // console.info(res) }) }, selectPanel (panel) { From 80e52ead2781870e5a9eaca7233c88519ac42348 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 15 Jul 2022 17:06:39 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/pickTime.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue index ba4d3982c..8cfe0d54d 100644 --- a/nezha-fronted/src/components/common/pickTime.vue +++ b/nezha-fronted/src/components/common/pickTime.vue @@ -97,7 +97,7 @@ export default { this.intervalTimer = setInterval(() => { this.$emit('change', this.searchTime) this.refreshDataFunc() - }, val.value * 200) + }, val.value * 1000) return } if (val && val.value != -1) { @@ -109,7 +109,7 @@ export default { } this.intervalTimer = setInterval(() => { this.getIntervalData(this.interval.value) - }, val.value * 200) + }, val.value * 1000) } }, dropdownHandler (show) { From 8c6b1cb62153300fec4a7ff8c92fce297ec170ae Mon Sep 17 00:00:00 2001 From: likexuan Date: Fri, 15 Jul 2022 17:12:41 +0800 Subject: [PATCH 3/9] =?UTF-8?q?NEZ-2038=20fix=20:=20=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E7=B4=A0=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/globalSearch/searchItemInfo.scss | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss index b95a032ed..c80dd3845 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss @@ -46,8 +46,8 @@ width: 100%; border-bottom: 1px solid $--border-color-light; display: flex; - min-height: 47px; - max-height: 200px; + // min-height: 47px; + // max-height: 200px; align-items: center; .search-item-key{ width: 120px; @@ -58,11 +58,24 @@ font-weight: 400; } .search-item-value-box{ - line-height: 47px; - height: 100%; width: calc(100% - 120px); display: flex; align-items: center; + >div{ + width: 100%; + } + .document-copy-block{ + position: relative; + .document-copy-text{ + margin-right: 0px !important; + } + .nz-icon.nz-icon-override{ + position: absolute; + top: 50%; + transform: translateY(-50%); + right: -10px; + } + } .nz-icon{ display: inline-block; line-height: 47px; @@ -72,14 +85,13 @@ color: $--color-primary; } .search-item-value{ - width: calc(100% - 30px); + display: inline-block; + padding: 5px 0; + width: 94%; font-size: 14px; - height: 100%; - overflow-y: auto; color: $--color-text-primary; - white-space: nowrap; - text-overflow: ellipsis; - line-height: 47px; + word-break: break-all; + white-space: normal; .ql-container.ql-snow{ border: none; .ql-editor{ From 54c836f842901454f9d29bb08d765428d73227ae Mon Sep 17 00:00:00 2001 From: 18317449825 <18317449825@163.com> Date: Fri, 15 Jul 2022 23:58:18 +0800 Subject: [PATCH 4/9] =?UTF-8?q?perf=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=9B=BE=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chartList.vue | 4 ++-- nezha-fronted/src/components/chart/panelChart.vue | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 66852efd6..96d521038 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -44,7 +44,7 @@ @container-resized="containerResizedEvent" > Date: Sat, 16 Jul 2022 00:09:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?perf=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=9B=BE=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chartList.vue | 1 - nezha-fronted/src/components/chart/panelChart.vue | 8 -------- 2 files changed, 9 deletions(-) diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 96d521038..7cf54b364 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -56,7 +56,6 @@ :chart-detail-info="chartDetailInfo" @refreshPanel="refreshPanel" @showFullscreen="showFullscreen" - :showHidden="showHidden" > diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index 911cec643..c3eafd1ac 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -101,10 +101,6 @@ export default { variablesInit: { type: Boolean, default: true - }, - // 变量比较结果 图表是否显示/隐藏 - showHidden: { - type: Object } }, data () { @@ -156,10 +152,6 @@ export default { }, // 参数 isRefresh 标识是否是刷新操作 getChartData (isRefresh, params) { // 获取chart的数据前的准备 主要用于处理时间参数 - // 如果图表被隐藏了 则不请求数据 - if (this.showHidden && this.showHidden[this.chartInfo.id] === 'hidden') { - return - } if (!this.variablesInit) { // 变量未加载完成 不请求数据 return } From d13dc551ad4e652ba33b682b9393f8b835c2e472 Mon Sep 17 00:00:00 2001 From: likexuan Date: Mon, 18 Jul 2022 09:59:33 +0800 Subject: [PATCH 6/9] =?UTF-8?q?NEZ-2038=20fix=20:=20=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E7=B4=A0=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/globalSearch/searchItemInfo.scss | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss index c80dd3845..295089e2f 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss @@ -7,7 +7,7 @@ flex-direction: column; align-items: center; box-sizing: border-box; - padding: 60px 75px 0 75px; + padding: 60px 45px 0 75px; overflow-y: auto; .el-skeleton{ height: 100%; @@ -43,11 +43,12 @@ margin-bottom: 30px; } .search-item-info{ + position: relative; width: 100%; - border-bottom: 1px solid $--border-color-light; - display: flex; + // border-bottom: 1px solid $--border-color-light; // min-height: 47px; // max-height: 200px; + display: flex; align-items: center; .search-item-key{ width: 120px; @@ -62,18 +63,13 @@ display: flex; align-items: center; >div{ - width: 100%; + width: calc(100% - 30px); } .document-copy-block{ - position: relative; - .document-copy-text{ - margin-right: 0px !important; - } + width: 100% !important; .nz-icon.nz-icon-override{ - position: absolute; - top: 50%; - transform: translateY(-50%); - right: -10px; + display: flex; + align-items: center; } } .nz-icon{ @@ -85,9 +81,9 @@ color: $--color-primary; } .search-item-value{ - display: inline-block; + // display: inline-block; padding: 5px 0; - width: 94%; + width: 100%; font-size: 14px; color: $--color-text-primary; word-break: break-all; @@ -102,6 +98,15 @@ } } } + .search-item-info::before{ + content: ""; + position: absolute; + left: 0; + bottom: 0px; + width: calc(100% - 30px); + height: 1px; + background-color: $--border-color-light; + } .search-item-info:last-child{ border-bottom: none; } From b18042e0027829e337596f1b70f1dfb39db482dc Mon Sep 17 00:00:00 2001 From: likexuan Date: Mon, 18 Jul 2022 10:15:15 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix=20:=20=E6=9F=A5=E6=89=BE=E7=B4=A0?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/globalSearch/searchItemInfo.scss | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss index 295089e2f..aa7b87c24 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss @@ -45,9 +45,6 @@ .search-item-info{ position: relative; width: 100%; - // border-bottom: 1px solid $--border-color-light; - // min-height: 47px; - // max-height: 200px; display: flex; align-items: center; .search-item-key{ @@ -81,9 +78,9 @@ color: $--color-primary; } .search-item-value{ - // display: inline-block; padding: 5px 0; - width: 100%; + display: flex; + align-items: center; font-size: 14px; color: $--color-text-primary; word-break: break-all; From 22cad8e696ade2086256908efe61f550f64bcd04 Mon Sep 17 00:00:00 2001 From: likexuan Date: Mon, 18 Jul 2022 10:32:51 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix=20:=20agents=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E5=A2=9E=E5=8A=A0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/css/components/common/alert/alertStateInfo.scss | 3 +++ nezha-fronted/src/components/common/alert/alertStateInfo.vue | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss index 32148b942..3f9fcd801 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss @@ -21,6 +21,9 @@ .green-bg{ background-color: green; } + .gray-bg{ + background-color: gray; + } .alert-label-box{ display: flex; flex-direction: row; diff --git a/nezha-fronted/src/components/common/alert/alertStateInfo.vue b/nezha-fronted/src/components/common/alert/alertStateInfo.vue index f567bcc80..b2ac04935 100644 --- a/nezha-fronted/src/components/common/alert/alertStateInfo.vue +++ b/nezha-fronted/src/components/common/alert/alertStateInfo.vue @@ -26,11 +26,11 @@ {{$t('dashboard.overview.mapTooltip.prometheus')}}
- + {{$t('overall.cortex')}}
- + {{$t('overall.loki')}}
From f238e46e6f31fe4f4b0ed4a514660432fcf7e26d Mon Sep 17 00:00:00 2001 From: likexuan Date: Mon, 18 Jul 2022 10:38:50 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix=20=EF=BC=9A=E8=A7=A3=E5=86=B3searchItem?= =?UTF-8?q?Info=E9=A1=B5=E9=9D=A2=E8=BE=B9=E6=A1=86=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/globalSearch/searchItemInfo.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss index aa7b87c24..69bdd4ef9 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss @@ -101,8 +101,7 @@ left: 0; bottom: 0px; width: calc(100% - 30px); - height: 1px; - background-color: $--border-color-light; + border-bottom: 1px solid $--border-color-light; } .search-item-info:last-child{ border-bottom: none;