From e1462fd4bcccf7a81b4c92534b2a61ee4ea29304 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 18 Jul 2023 15:57:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?NEZ-2999=20=20fix=EF=BC=9A=20Asset=20list?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E8=AF=A6=E6=83=85=E6=97=A0=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=EF=BC=8C=E7=82=B9=E5=87=BB=E6=97=A0?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/common/tableCommon.scss | 1 - .../css/components/common/timePicker.scss | 18 +++++++++++++++++- .../chart/chart/chartAutotopology.vue | 1 + .../components/common/bottomBox/bottomBox.vue | 3 ++- .../common/project/meta2d/js/meta2dMainCalc.js | 2 +- .../common/project/meta2d/meta2dMain.vue | 4 ++++ 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 163de63a5..16b8dacd8 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -157,7 +157,6 @@ } .top-tools--sub { flex-direction: row-reverse; - overflow: hidden; .top-tool-left { height: 100%; width: 0; // 避免计算错误 diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss index 6d6f82300..e26460726 100644 --- a/nezha-fronted/src/assets/css/components/common/timePicker.scss +++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss @@ -165,7 +165,6 @@ .calendar-popover-text:last-of-type { margin-right: 0; } - .date-range-panel { // height: 460px; width: 500px; @@ -310,9 +309,26 @@ } } } +@media (max-height: 900px) { + .date-range-panel { + .date-range-panel-content-right { + height: 180px; + overflow-y: auto; + } + .date-range-panel-content-left { + height: 180px; + overflow-y: auto; + } + } +} .date-range-panel--top { top: -460px; } +@media (max-height: 900px) { + .date-range-panel--top { + top: -215px; + } +} .el-date-range-picker.el-picker-panel__body__only,.el-picker-panel__body { width: 324px; .el-date-range-picker__header,.el-date-picker__header{ diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue index b2c32d20f..6c9a11b1f 100644 --- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue +++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue @@ -10,6 +10,7 @@ v-if="item.isLoad" :meta2dId="'autoTopology' + item.id + (isFullscreen ? 'screen' : '')" :topoData="item.topoData" + :minScale="0.01" :isPreview="true" :querysArray="item.querysArray" :project="item" diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index 86983547e..b0306d356 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -375,7 +375,8 @@ export default { }, 600) } const subListDom = document.querySelector('.sub-list') // 副列表 - if (subListDom.offsetHeight < 505) { + const height = window.innerHeight > 900 ? 505 : 250 + if (subListDom.offsetHeight < height) { this.$store.dispatch('dispatchTimeBoxClass', 'date-range-panel--top') } else { this.$store.dispatch('dispatchTimeBoxClass', '') diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index 9d0786c00..de4021f6f 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -80,7 +80,7 @@ export default { methods: { init: function () { const meta2dOptions = { - minScale: 0.25, + minScale: this.minScale, maxScale: 2, autoAnchor: false } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 5bc528053..c1653db06 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -149,6 +149,10 @@ export default { type: Boolean, default: false }, + minScale: { + type: Number, + default: 0.25 + }, querysArray: {}, params: {}, project: {}, From 6811f8994336e72345c9df8c45be89781eca55ec Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 18 Jul 2023 16:48:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?NEZ-3001=20fix=EF=BC=9A=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E6=8A=98=E5=8F=A0=E6=97=B6=20=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B0=8F=20?= =?UTF-8?q?=E8=92=99=E5=B1=82=E5=AE=BD=E5=BA=A6=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common/rightBoxCommon.scss | 2 +- .../assets/css/components/common/bottomBox/bottomBox.scss | 5 ++--- nezha-fronted/src/assets/css/components/layout/home.scss | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 57a1973d0..64f2ab188 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -9,7 +9,7 @@ width: 700px; box-shadow: $--right-box-shadow; background-color: $--background-color-empty; - z-index: 1001; + z-index: 1100; .el-date-editor { .el-input__inner { diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index c61e4c590..d32419182 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -76,7 +76,6 @@ height: 50%; position: relative; padding: 0; - z-index: 10; .top-tools.top-tools--sub { border-bottom: 1px solid $--border-color-light; .top-tool-right { @@ -151,7 +150,7 @@ height: calc(100% - 9px); position: absolute; width: 100%; - z-index: 1; + z-index: 10; top: 9px; .sub-list__tabs { @@ -217,7 +216,7 @@ position: fixed; cursor: ns-resize; display: none; - z-index: 20; + z-index: 200; vertical-align: bottom; bottom: 0; } diff --git a/nezha-fronted/src/assets/css/components/layout/home.scss b/nezha-fronted/src/assets/css/components/layout/home.scss index 2e0d4058c..e51c3ec60 100644 --- a/nezha-fronted/src/assets/css/components/layout/home.scss +++ b/nezha-fronted/src/assets/css/components/layout/home.scss @@ -31,6 +31,9 @@ .panel-loading{ left: 64px; } + .resize-modal { + width: calc(100% - 64px); + } } .home.tv,.home.se{