From 4262410038d57eea41bfc190fc09bba681043188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 18 Apr 2022 15:20:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=86=85=E9=83=A8=E7=9A=84message?=
=?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BD=BF=E7=94=A8v-html=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/components/Page/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/layout/components/Page/index.vue b/src/layout/components/Page/index.vue
index b69380fa3..0a52bfef6 100644
--- a/src/layout/components/Page/index.vue
+++ b/src/layout/components/Page/index.vue
@@ -8,7 +8,7 @@
- {{ helpMessage }}
+
From a4abe63ec995dc78f4ab0c7393d2d925a00283c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 18 Apr 2022 14:55:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/assets/Asset/AssetList.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index 144ea924c..1efd773e7 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/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'
]
},
From 1d594fc59443a5327635d072ec3ebb6e4443a237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 18 Apr 2022 14:23:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddialog=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=83=BD=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Dialog/index.vue | 3 ++-
src/components/ListTable/TableAction/ExportDialog.vue | 11 +++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue
index f35bdfc78..cf4dcf47a 100644
--- a/src/components/Dialog/index.vue
+++ b/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"
>
diff --git a/src/components/ListTable/TableAction/ExportDialog.vue b/src/components/ListTable/TableAction/ExportDialog.vue
index 5babaa8ba..982ef7b66 100644
--- a/src/components/ListTable/TableAction/ExportDialog.vue
+++ b/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
- this.mfaDialogShow = false
+ const vm = this
+ setTimeout(() => {
+ vm.exportDialogShow = false
+ vm.mfaDialogShow = false
+ }, 100)
}
}
}