diff --git a/src/components/ActionsGroup/index.vue b/src/components/ActionsGroup/index.vue index 55466c489..4e42b30b0 100644 --- a/src/components/ActionsGroup/index.vue +++ b/src/components/ActionsGroup/index.vue @@ -46,7 +46,7 @@ export default { }, moreActionsType: { type: String, - default: '' + default: 'default' } }, computed: { diff --git a/src/components/GrantedAssets/index.vue b/src/components/GrantedAssets/index.vue index 362c31a7a..bcb98cb20 100644 --- a/src/components/GrantedAssets/index.vue +++ b/src/components/GrantedAssets/index.vue @@ -80,7 +80,9 @@ export default { ] }, headerActions: { - hasLeftActions: false + hasLeftActions: false, + hasExport: false, + hasImport: false } } }, diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index f6b073ca7..224bde337 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -35,7 +35,7 @@ "Gateway": "网关", "Hardware": "硬件", "Hostname": "主机名", - "IP": "", + "IP": "IP", "IsActive": "激活", "Label": "标签", "LoginModel": "登录模式", @@ -82,7 +82,7 @@ "date_joined": "创建日期", "date_password_last_updated": "最后更新密码", "detail": "", - "hostname": "", + "hostname": "hostname", "ip": "IP", "last_login": "最后登录日期", "sshkey": "" diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue index 1014286de..22efbd968 100644 --- a/src/layout/components/GenericDetailPage/index.vue +++ b/src/layout/components/GenericDetailPage/index.vue @@ -102,6 +102,8 @@ export default { { name: 'delete', title: this.$t('common.Delete'), + type: 'danger', + plain: true, can: this.validActions.canDelete, callback: this.validActions.deleteCallback.bind(this) } diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 187d2204b..d1a508e47 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -410,3 +410,23 @@ a { .el-table__empty-block { width: 100% !important; } + +.el-dialog__headerbtn .el-dialog__close { + font-size: 21px; + font-weight: 700; + color: #000; + text-shadow: 0 1px 0 #fff; +} + +.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close { + color: #000; + font-size: 22px; + font-weight: 800; + //color: red; +} + +.el-button--danger.is-plain { + color: $--color-danger; + background: white; + border-color: $--color-danger; +} diff --git a/src/views/users/users/UserDetail/UserAssetPermissionRules.vue b/src/views/users/users/UserDetail/UserAssetPermissionRules.vue index 80b57a034..1a7721737 100644 --- a/src/views/users/users/UserDetail/UserAssetPermissionRules.vue +++ b/src/views/users/users/UserDetail/UserAssetPermissionRules.vue @@ -65,7 +65,8 @@ export default { }, headerActions: { hasLeftActions: false, - hasExport: false + hasExport: false, + hasImport: false } } } diff --git a/src/views/users/users/UserDetail/UserDatabasePermissionRules.vue b/src/views/users/users/UserDetail/UserDatabasePermissionRules.vue index ffe65f4eb..9611870de 100644 --- a/src/views/users/users/UserDetail/UserDatabasePermissionRules.vue +++ b/src/views/users/users/UserDetail/UserDatabasePermissionRules.vue @@ -55,7 +55,9 @@ export default { } }, headerActions: { - hasLeftActions: false + hasLeftActions: false, + hasImport: false, + hasExport: false } } } diff --git a/src/views/users/users/UserDetail/UserGrantedDatabases.vue b/src/views/users/users/UserDetail/UserGrantedDatabases.vue index d257809f7..3ae51b97a 100644 --- a/src/views/users/users/UserDetail/UserGrantedDatabases.vue +++ b/src/views/users/users/UserDetail/UserGrantedDatabases.vue @@ -29,7 +29,8 @@ export default { }, headerActions: { hasLeftActions: false, - hasImport: false + hasImport: false, + hasExport: false } } } diff --git a/src/views/users/users/UserDetail/UserGrantedRemoteApps.vue b/src/views/users/users/UserDetail/UserGrantedRemoteApps.vue index 57769771d..fe63ab4aa 100644 --- a/src/views/users/users/UserDetail/UserGrantedRemoteApps.vue +++ b/src/views/users/users/UserDetail/UserGrantedRemoteApps.vue @@ -33,7 +33,9 @@ export default { } }, headerActions: { - hasLeftActions: false + hasLeftActions: false, + hasImport: false, + hasExport: false } } } diff --git a/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue b/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue index a416455b4..772651261 100644 --- a/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue +++ b/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue @@ -56,7 +56,9 @@ export default { } }, headerActions: { - hasLeftActions: false + hasLeftActions: false, + hasImport: false, + hasExport: false } } } diff --git a/src/views/users/users/UserDetail/index.vue b/src/views/users/users/UserDetail/index.vue index 14185f081..1d2989099 100644 --- a/src/views/users/users/UserDetail/index.vue +++ b/src/views/users/users/UserDetail/index.vue @@ -61,11 +61,7 @@ export default { title: this.$t('users.tabs.databasePermissionRules'), name: 'UserDatabasePermissionRules' } - ], - actions: { - canDelete: true, - canUpdate: true - } + ] } } },