From 677745675fd2329ec2ad0596976fe765a997a644 Mon Sep 17 00:00:00 2001 From: likexuan Date: Mon, 21 Nov 2022 11:06:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?NEZ-2407=20fix=20:=20Users=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=80=89=E6=8B=A9Role=E5=90=8E=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=9C=AA=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/rightBox/administration/userBox.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue index 188fb2aab..6a1cec550 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue @@ -161,7 +161,7 @@ export default { { required: true, message: '', trigger: 'blur' } ], roleIds: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } + { required: true, message: this.$t('validate.required'), trigger: 'change' } ], email: [ { type: 'email', message: this.$t('validate.email') } @@ -175,7 +175,7 @@ export default { { validator: validatePin, trigger: 'blur' } ], roleIds: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } + { required: true, message: this.$t('validate.required'), trigger: 'change' } ], email: [ { type: 'email', message: this.$t('validate.email') } From 20a5947ef8eefbd107dc6d2d62c98e4c294740e0 Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 9 Dec 2022 15:51:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9AExplore=E9=80=89=E6=8B=A9Metric?= =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E5=90=8E=E4=BC=9A=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E4=BD=8D=E7=BD=AE=E7=8E=B0?= =?UTF-8?q?=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/stylus/main.scss | 4 +++ .../common/popBox/topToolMoreOptions.vue | 4 +-- .../page/dashboard/explore/promqlInput.vue | 32 +++++++++++++++---- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index be6a38981..a893dddde 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1270,6 +1270,10 @@ li { &>span{ margin-right: 12px; } + .exists-select{ + top: auto !important; + left: auto !important; + } } .import-select-list{ .import-select-item{ diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 84ccfe596..ff678afec 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -30,7 +30,7 @@ :title="importBox.title" :visible.sync="importBox.show" width="580px" - :modal-append-to-body="false" + :append-to-body="true" @close="closeDialog" :class="{'import-failContent-dialog':importBox.type==3&&resultNew}" class="nz-dialog"> @@ -71,7 +71,7 @@
{{$t('overall.existed')}} - + item.value === data.value).children = res.data.list + + // el-cascader-panel监听到options变化 会触发scrollIntoView函数 + const temp = this.$refs.metricSelector.scrollIntoView + this.$refs.metricSelector.scrollIntoView = function () {} + this.$nextTick(() => { + this.$refs.metricSelector.scrollIntoView = temp + }) } }) } else { @@ -926,11 +933,6 @@ export default { }) } } else if (data.children && (!data.children.length || data.children.length > 100) && this.type !== 'log') { - this.metricOptions.forEach(item => { - if (!item.temp && item.children && item.value != data.value) { - item.children = [] - } - }) setTimeout(() => { new Promise(resolve => { const children = this.$store.state.metricsList.find(item => item.value === data.value).children @@ -938,7 +940,6 @@ export default { }).then((children) => { const childrenCopy = JSON.parse(JSON.stringify(children)) const findChild = this.metricOptions.find(item => item.label === data.label) - if (childrenCopy.length > 100) { childrenCopy.splice(100, childrenCopy.length) childrenCopy.push({ @@ -951,6 +952,18 @@ export default { } else { findChild.children = childrenCopy } + this.metricOptions.forEach(item => { + if (!item.temp && item.children && item.value != data.value) { + item.children = [] + } + }) + + // el-cascader-panel监听到options变化 会触发scrollIntoView函数 + const temp = this.$refs.metricSelector.scrollIntoView + this.$refs.metricSelector.scrollIntoView = function () {} + this.$nextTick(() => { + this.$refs.metricSelector.scrollIntoView = temp + }) }) }) } else if (data.more) { @@ -978,6 +991,13 @@ export default { } else { findChild.children = childrenCopy } + + // el-cascader-panel监听到options变化 会触发scrollIntoView函数 + const temp = this.$refs.metricSelector.scrollIntoView + this.$refs.metricSelector.scrollIntoView = function () {} + this.$nextTick(() => { + this.$refs.metricSelector.scrollIntoView = temp + }) }) }) } From 3edf2cf774c80f6b13e47d5904839bfc1702f70a Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 20 Feb 2023 15:58:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?NEZ-2578=20fix=EF=BC=9A=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?Download=20c2v=20file=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/css/components/common/login.scss | 58 +++++ nezha-fronted/src/components/common/login.vue | 207 +++++++++++++++++- 2 files changed, 262 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/login.scss b/nezha-fronted/src/assets/css/components/common/login.scss index 0bd129072..a7c6d5b13 100644 --- a/nezha-fronted/src/assets/css/components/common/login.scss +++ b/nezha-fronted/src/assets/css/components/common/login.scss @@ -303,4 +303,62 @@ background: #CECECE; margin-right: 10px; } + .el-carousel__item{ + text-align: center; + } + .nz-license-footer{ + text-align: center; + margin-top: 30px; + margin-bottom: 15px; + .el-pagination{ + font-size: 14px; + .btn-prev, .btn-next{ + color: $--color-text-regular; + font-size: 14px; + margin: 0 5px; + border: none; + background-color: $--background-color-base !important; + border-radius: 50%; + height: 24px; + width: 24px; + } + .number { + font-size: 14px; + margin: 0px; + border: none; + background-color: transparent !important; + } + .number.active{ + color: #FA901C; + } + } + } + .el-carousel__indicators.el-carousel__indicators--horizontal{ + display: none; + } + .el-dialog__header { + border-bottom: 1px solid $--border-color-light; + height: 32px; + line-height: 32px; + .el-dialog__header-title { + font-weight: 600; + } + .top-tool-btn{ + height: 32px; + width: 36px; + padding: 0; + } + .el-dialog__headerbtn{ + line-height: 32px; + } + } + .el-dialog__body{ + + } + .el-button{ + //background-color: $--background-color-1 !important; + background: $--background-color-empty; + border: 1px solid $--border-color-light; + border-color: $--border-color-light; + } } diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 7cf48f8be..cc03c9a2a 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -55,9 +55,14 @@
{{license.warnInfo}}