Merge pull request #1668 from jumpserver/dev

v2.21.0-rc4

src/components/Dialog/index.vue

@@ -5,7 +5,8 @@
     :width="iWidth"
     class="dialog"
     v-bind="$attrs"
-    append-to-body
+    :append-to-body="false"
+    :modal-append-to-body="false"
     v-on="$listeners"
   >
     <slot />

src/components/ListTable/TableAction/ExportDialog.vue

@@ -92,11 +92,11 @@ export default {
       return this.selectedRows.length > 0
     },
     tableQuery() {
-      const listTableRef = this.$parent.$parent.$parent.$parent
+      const listTableRef = this.$parent?.$parent?.$parent?.$parent
       if (!listTableRef) {
         return {}
       }
-      const query = listTableRef.dataTable.getQuery()
+      const query = listTableRef?.dataTable?.getQuery() || {}
       delete query['limit']
       delete query['offset']
       delete query['date_from']
@@ -199,8 +199,11 @@ export default {
       this.mfaDialogShow = false
     },
     handleExportCancel() {
-      this.exportDialogShow = false
+      const vm = this
-      this.mfaDialogShow = false
+      setTimeout(() => {
+        vm.exportDialogShow = false
+        vm.mfaDialogShow = false
+      }, 100)
     }
   }
 }

src/layout/components/Page/index.vue

@@ -8,7 +8,7 @@
     </PageHeading>
     <PageContent>
       <el-alert v-if="helpMessage" type="success">
-        <span class="announcement-main">{{ helpMessage }}</span>
+        <span class="announcement-main" v-html="helpMessage" />
       </el-alert>
       <slot />
     </PageContent>

src/views/assets/Asset/AssetList.vue

@@ -92,14 +92,14 @@ export default {
         hasTree: true,
         columns: [
           'hostname', 'ip', 'public_ip', 'admin_user_display',
-          'protocols', 'category', 'type', 'platform', 'sn', 'is_active',
+          'protocols', 'platform', 'sn', 'is_active',
           'connectivity', 'labels_display',
           'created_by', 'date_created', 'comment', 'org_name', 'actions'
         ],
         columnsShow: {
           min: ['hostname', 'ip', 'actions'],
           default: [
-            'hostname', 'ip', 'platform', 'category', 'type',
+            'hostname', 'ip', 'platform',
             'connectivity', 'actions'
           ]
         },