Merge pull request #1817 from jumpserver/dev

v2.23.0 rc6

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;

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
+      }
     })
   },
   methods: {

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] || '/'

src/views/sessions/SessionDetail/SessionJoinRecords.vue

@@ -31,6 +31,12 @@ export default {
           ]
         },
         columnsMeta: {
+          is_finished: {
+            width: '150px',
+            formatterArgs: {
+              showFalse: false
+            }
+          }
         }
       },
       headerActions: {