github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-11 03:22:06 +00:00
Code Issues Projects Releases Wiki Activity

feat: 解决冲突

Browse Source
This commit is contained in:
jiangweidong 2023-01-29 15:26:46 +08:00
commit 5bf3f726e8
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/router/settings/index.js
View File

@ -238,7 +238,7 @@ export default {
hidden: true, hidden: true,
meta: { meta: {
title: i18n.t('route.AppletHostCreate'), title: i18n.t('route.AppletHostCreate'),
permissions: ['settings.change_terminal'], permissions: ['terminal.add_applethost'],
activeMenu: '/settings/applets' activeMenu: '/settings/applets'
} }
}, },
@ -249,7 +249,7 @@ export default {
hidden: true, hidden: true,
meta: { meta: {
title: i18n.t('route.AppletHostDetail'), title: i18n.t('route.AppletHostDetail'),
permissions: ['settings.change_terminal'], permissions: ['terminal.view_applethost'],
activeMenu: '/settings/applets' activeMenu: '/settings/applets'
} }
}, },
@ -260,7 +260,7 @@ export default {
hidden: true, hidden: true,
meta: { meta: {
title: i18n.t('route.AppletHostUpdate'), title: i18n.t('route.AppletHostUpdate'),
permissions: ['settings.change_terminal'], permissions: ['terminal.change_applethost'],
activeMenu: '/settings/applets' activeMenu: '/settings/applets'
} }
} }

4
src/views/assets/Platform/const.js
View File

@ -83,6 +83,10 @@ export const setAutomations = (vm) => {
initial['ansible_enabled'] = automation['ansible_enabled'] initial['ansible_enabled'] = automation['ansible_enabled']
initial['ansible_config'] = JSON.stringify(automation['ansible_config']) initial['ansible_config'] = JSON.stringify(automation['ansible_config'])
if (initial['ansible_enabled'] === false) {
_.set(autoFieldsMeta, `ansible_enabled.el.disabled`, true)
}
for (const item of autoFields) { for (const item of autoFields) {
const itemEnabledKey = item + '_enabled' const itemEnabledKey = item + '_enabled'
const itemMethodKey = item + '_method' const itemMethodKey = item + '_method'

9
src/views/settings/Applet/Applet/AppletList.vue
View File

@ -57,6 +57,11 @@ export default {
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
.dom {
white-space: initial;
.el-tag {
margin-right: 3px;
}
}
</style> </style>

4
src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue
View File

@ -96,10 +96,6 @@ export default {
value: this.object.protocols.map(i => i.name).join(',') value: this.object.protocols.map(i => i.name).join(',')
}, },
'public_ip', 'admin_user_display', 'public_ip', 'admin_user_display',
{
key: this.$t('assets.Domain'),
value: this.object.domain?.name || ''
},
'vendor', 'model', 'cpu_model', 'memory', 'disk_info', 'vendor', 'model', 'cpu_model', 'memory', 'disk_info',
{ {
key: this.$t('assets.Platform'), key: this.$t('assets.Platform'),

7
src/views/settings/Applet/AppletHost/AppletHostDetail/index.vue
View File

@ -54,11 +54,12 @@ export default {
], ],
hasRightSide: true, hasRightSide: true,
actions: { actions: {
canDelete: this.$hasPerm('terminal.delete_applethost'),
canUpdate: this.$hasPerm('terminal.change_applethost'),
deleteSuccessRoute: 'Applets',
updateCallback: () => { updateCallback: () => {
const category = this.host.category.value || 'host'
const routerName = _.capitalize(category) + 'Update'
this.$router.push({ this.$router.push({
name: routerName, name: 'Applets',
params: { id: this.$route.params.id }, params: { id: this.$route.params.id },
query: { platform: this.host.platform.id } query: { platform: this.host.platform.id }
}) })