Skip to content

Commit 4076024

Browse files
committed
fix(FieldSelect): selected names not showing
1 parent 37fabdd commit 4076024

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/fields/core/FieldSelect.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ const { hint } = useFieldAttributes(model.value, field.value)
8888
const selectedNames: ComputedRef<string[]> = computed(() => {
8989
if (!currentModelValue.value) return []
9090
91-
const findOptionName = (option: FieldOption) => field.value.options.find(o => o.value === option.value)?.name ?? ''
91+
const findOptionName = (value: string) => field.value.options.find(o => o.value === value)?.name ?? false
9292
9393
if (Array.isArray(currentModelValue.value) && field.value.multiple) {
94-
return currentModelValue.value.map(o => findOptionName(o))
94+
return currentModelValue.value.map(findOptionName).filter(o => o !== false)
9595
} else {
96-
return [ field.value.options.find(o => o.value === currentModelValue.value)?.name ?? '' ]
96+
const optionName = findOptionName(currentModelValue.value)
97+
return optionName ? [ optionName ] : []
9798
}
9899
})
99100

tests/components/fields/FieldSelect.spec.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,13 @@ describe('FieldSelect', () => {
8282
await fieldSelect.vm.$nextTick()
8383
await fieldSelect.find('.vfg-select-option').trigger('click')
8484
expect(formWrapper.vm.model.selectModel.length).toBe(1)
85+
expect(fieldSelect.find('.vfg-select-label').find('span').element.innerHTML).toContain('Test 1')
8586

8687
await fieldSelect.find('.vfg-select-label').trigger('click')
8788
await fieldSelect.vm.$nextTick()
8889
await fieldSelect.findAll('.vfg-select-option')[2].trigger('click')
90+
await fieldSelect.vm.$nextTick()
91+
expect(fieldSelect.find('.vfg-select-label').find('span').element.innerHTML).toContain('Test 3')
8992
expect(formWrapper.vm.model.selectModel.length).toBe(2)
9093
})
9194

0 commit comments

Comments
 (0)