diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue index 773656388..a95af21e2 100644 --- a/src/components/AssetSelect/index.vue +++ b/src/components/AssetSelect/index.vue @@ -61,7 +61,7 @@ export default { ajax: { url: '/api/v1/assets/assets/?fields_size=mini', transformOption: (item) => { - return { label: item.name + '(' + item.ip + ')', value: item.id } + return { label: item.name + '(' + item.address + ')', value: item.id } } } } diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue index a3556e63f..101b543c8 100644 --- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue @@ -4,6 +4,7 @@ :initial="initial" :fields-meta="fieldsMeta" :url="url" + v-bind="$data" /> @@ -83,6 +84,10 @@ export default { } } }, + accounts: { + type: 'input', + component: null + }, actions: { label: this.$t('perms.Actions'), component: PermissionFormActionField, @@ -100,6 +105,17 @@ export default { is_active: { type: 'checkbox' } + }, + afterGetFormValue(validValues) { + console.log('>>>', validValues, validValues.accounts) + validValues.accounts = validValues.accounts ? validValues.accounts.toString() : '' + return validValues + }, + cleanFormValue(value) { + if (!Array.isArray(value.accounts)) { + value.accounts = value.accounts ? value.accounts.split(',') : [] + } + return value } } }