From 386afc9e0c6751c13800fe7e579b8d2f1502c72a Mon Sep 17 00:00:00 2001 From: jym503558564 <503558564@qq.com> Date: Fri, 3 Jul 2020 10:48:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B4=E7=90=86=E7=BB=9F=E4=B8=80=20L?= =?UTF-8?q?ina=20List?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AutoDataTable/index.vue | 1 + src/views/applications/DatabaseApp/DatabaseAppList.vue | 3 +++ src/views/applications/RemoteApp/RemoteAppList.vue | 1 + src/views/assets/AdminUser/AdminUserList.vue | 2 ++ src/views/assets/CommandFilter/CommandFilterList.vue | 1 + src/views/assets/Label/LabelList.vue | 2 ++ src/views/assets/Platform/PlatformList.vue | 1 + src/views/assets/SystemUser/SystemUserList.vue | 2 ++ src/views/sessions/CommandList.vue | 9 ++++++--- src/views/users/User/UserList.vue | 3 +++ 10 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue index d966ab903..b49c1721f 100644 --- a/src/components/AutoDataTable/index.vue +++ b/src/components/AutoDataTable/index.vue @@ -55,6 +55,7 @@ export default { case 'name': col.formatter = DetailFormatter col.sortable = 'custom' + col.showOverflowTooltip = true break case 'actions': col = { diff --git a/src/views/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue index 326c286af..a02b49b74 100644 --- a/src/views/applications/DatabaseApp/DatabaseAppList.vue +++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue @@ -19,6 +19,9 @@ export default { columnsMeta: { get_type_display: { label: this.$t('applications.type') + }, + database: { + showOverflowTooltip: true } } }, diff --git a/src/views/applications/RemoteApp/RemoteAppList.vue b/src/views/applications/RemoteApp/RemoteAppList.vue index 0f2386db4..1f01792f3 100644 --- a/src/views/applications/RemoteApp/RemoteAppList.vue +++ b/src/views/applications/RemoteApp/RemoteAppList.vue @@ -24,6 +24,7 @@ export default { displayKey: 'get_type_display' }, asset: { + showOverflowTooltip: true, formatter: function(row, column, cellValue, index) { const route = { to: { name: 'AssetDetail', params: { id: cellValue }}} return { row.asset_info.hostname } diff --git a/src/views/assets/AdminUser/AdminUserList.vue b/src/views/assets/AdminUser/AdminUserList.vue index 251ad4efa..6bd5e599f 100644 --- a/src/views/assets/AdminUser/AdminUserList.vue +++ b/src/views/assets/AdminUser/AdminUserList.vue @@ -19,6 +19,7 @@ export default { prop: 'name', label: this.$t('common.Name'), formatter: DetailFormatter, + showOverflowTooltip: true, sortable: true, formatterArgs: { route: 'AdminUserDetail' @@ -27,6 +28,7 @@ export default { { prop: 'username', label: this.$t('common.Username'), + showOverflowTooltip: true, sortable: 'custom' }, { diff --git a/src/views/assets/CommandFilter/CommandFilterList.vue b/src/views/assets/CommandFilter/CommandFilterList.vue index dbfff943d..71044193f 100644 --- a/src/views/assets/CommandFilter/CommandFilterList.vue +++ b/src/views/assets/CommandFilter/CommandFilterList.vue @@ -19,6 +19,7 @@ export default { prop: 'name', label: this.$t('assets.Name'), formatter: DetailFormatter, + showOverflowTooltip: true, sortable: true, formatterArgs: { route: 'CommandFilterDetail' diff --git a/src/views/assets/Label/LabelList.vue b/src/views/assets/Label/LabelList.vue index 68882a8ae..7d073e950 100644 --- a/src/views/assets/Label/LabelList.vue +++ b/src/views/assets/Label/LabelList.vue @@ -18,11 +18,13 @@ export default { { prop: 'name', label: this.$t('assets.Name'), + showOverflowTooltip: true, sortable: true }, { prop: 'value', label: this.$t('assets.Value'), + showOverflowTooltip: true, sortable: 'custom' }, { diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue index 65d3246c3..0bd849c52 100644 --- a/src/views/assets/Platform/PlatformList.vue +++ b/src/views/assets/Platform/PlatformList.vue @@ -19,6 +19,7 @@ export default { prop: 'name', label: this.$t('assets.Name'), formatter: DetailFormatter, + showOverflowTooltip: true, sortable: true, formatterArgs: { route: 'PlatformDetail' diff --git a/src/views/assets/SystemUser/SystemUserList.vue b/src/views/assets/SystemUser/SystemUserList.vue index 578027ad9..111d175c7 100644 --- a/src/views/assets/SystemUser/SystemUserList.vue +++ b/src/views/assets/SystemUser/SystemUserList.vue @@ -19,6 +19,7 @@ export default { prop: 'name', label: this.$t('common.Name'), formatter: DetailFormatter, + showOverflowTooltip: true, sortable: true, formatterArgs: { route: 'SystemUserDetail' @@ -27,6 +28,7 @@ export default { { prop: 'username', label: this.$t('common.Username'), + showOverflowTooltip: true, sortable: 'custom' }, { diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue index bed6ef2e8..35c85254b 100644 --- a/src/views/sessions/CommandList.vue +++ b/src/views/sessions/CommandList.vue @@ -47,13 +47,16 @@ export default { } }, user: { - width: '140px' + width: '140px', + showOverflowTooltip: true }, asset: { - width: '140px' + width: '140px', + showOverflowTooltip: true }, system_user: { - width: '140px' + width: '140px', + showOverflowTooltip: true }, session: { label: this.$t('sessions.session'), diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index 48d0863f9..67131420d 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -29,6 +29,9 @@ export default { 'name', 'username', 'groups_display', 'role', 'source', 'is_valid', 'actions' ], columnsMeta: { + username: { + showOverflowTooltip: true + }, source: { width: '120px' },