From 79f6bea4230d55f726f954da2d4a9e933aa7fee2 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 16 Jun 2022 16:21:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E5=8A=A0=E5=85=A5=E8=AE=B0=E5=BD=95=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sessions/SessionDetail/SessionJoinRecords.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/sessions/SessionDetail/SessionJoinRecords.vue b/src/views/sessions/SessionDetail/SessionJoinRecords.vue index a3e4df3c4..40d1cd822 100644 --- a/src/views/sessions/SessionDetail/SessionJoinRecords.vue +++ b/src/views/sessions/SessionDetail/SessionJoinRecords.vue @@ -31,6 +31,12 @@ export default { ] }, columnsMeta: { + is_finished: { + width: '150px', + formatterArgs: { + showFalse: false + } + } } }, headerActions: { From a076a277c913741fbafe94d279f63f0e4634e1ac Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Thu, 16 Jun 2022 18:07:19 +0800 Subject: [PATCH 2/4] fix: confirm bug --- src/components/UserConfirmDialog/index.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/UserConfirmDialog/index.vue b/src/components/UserConfirmDialog/index.vue index 68605faa1..31a59f2be 100644 --- a/src/components/UserConfirmDialog/index.vue +++ b/src/components/UserConfirmDialog/index.vue @@ -67,16 +67,19 @@ export default { backends.sort((a, b) => b.level - a.level) this.ConfirmType = backends[0].name if (this.ConfirmType === 'relogin') { - this.visible = true + this.visible = false return this.$message.error(this.$t('auth.ReLogin')) - } else if (this.ConfirmType === 'mfa') { + } + + if (this.ConfirmType === 'mfa') { this.Label = 'MFA' this.HelpText = this.$t('common.MFARequireForSecurity') + this.visible = true } else if (this.ConfirmType === 'password') { this.Label = this.$t('setting.password') this.HelpText = this.$t('common.PasswordRequireForSecurity') + this.visible = true } - this.visible = true }) }, methods: { From ea3e26b92c39e27d0366a4aae74617b305c9824c Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 16 Jun 2022 18:04:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ListTable/TableAction/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/ListTable/TableAction/index.vue b/src/components/ListTable/TableAction/index.vue index 0ac57e581..31e221868 100644 --- a/src/components/ListTable/TableAction/index.vue +++ b/src/components/ListTable/TableAction/index.vue @@ -171,7 +171,10 @@ export default { float: right; } .mobile .search.right { - float: left; + float: none; + } + .mobile .search.right .action-search { + width: 100%; } .mobile .right-side { padding-top: 5px; From 81d8cd971ca4819669d3abf0c9c74261ced5e19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Thu, 16 Jun 2022 18:03:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E5=88=A4=E6=96=AD=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/NavHeader/ViewSwitcher.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/layout/components/NavHeader/ViewSwitcher.vue b/src/layout/components/NavHeader/ViewSwitcher.vue index ff834e446..e1c03b27b 100644 --- a/src/layout/components/NavHeader/ViewSwitcher.vue +++ b/src/layout/components/NavHeader/ViewSwitcher.vue @@ -109,6 +109,11 @@ export default { } } }, + created() { + if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile/i.test(navigator.userAgent)) { + this.showTip = false + } + }, methods: { async handleSelectView(key, keyPath) { const routeName = this.viewsMapper[key] || '/'