refactor(status): remove null fields
This commit is contained in:
parent
b0d6f310a8
commit
9677f742c8
6 changed files with 38 additions and 46 deletions
|
@ -3,7 +3,7 @@ import ISO6391 from 'iso-639-1'
|
|||
import Fuse from 'fuse.js'
|
||||
|
||||
let { modelValue } = $defineModel<{
|
||||
modelValue: string | null | undefined
|
||||
modelValue: string
|
||||
}>()
|
||||
|
||||
const { t } = useI18n()
|
||||
|
@ -11,17 +11,14 @@ const { t } = useI18n()
|
|||
const languageKeyword = $ref('')
|
||||
|
||||
const languageList: {
|
||||
code: string | null
|
||||
code: string
|
||||
nativeName: string
|
||||
name?: string
|
||||
}[] = [{
|
||||
code: null,
|
||||
nativeName: t('language.none'),
|
||||
}, ...ISO6391.getAllCodes().map(code => ({
|
||||
name: string
|
||||
}[] = ISO6391.getAllCodes().map(code => ({
|
||||
code,
|
||||
nativeName: ISO6391.getNativeName(code),
|
||||
name: ISO6391.getName(code),
|
||||
}))]
|
||||
}))
|
||||
|
||||
const fuse = new Fuse(languageList, {
|
||||
keys: ['code', 'nativeName', 'name'],
|
||||
|
@ -32,15 +29,11 @@ const languages = $computed(() =>
|
|||
languageKeyword.trim()
|
||||
? fuse.search(languageKeyword).map(r => r.item)
|
||||
: [...languageList].sort(({ code: a }, { code: b }) => {
|
||||
return a === modelValue
|
||||
? -1
|
||||
: b === modelValue
|
||||
? 1
|
||||
: (a === null ? -1 : b === null ? 1 : a.localeCompare(b))
|
||||
return a === modelValue ? -1 : b === modelValue ? 1 : a.localeCompare(b)
|
||||
}),
|
||||
)
|
||||
|
||||
function chooseLanguage(language: string | null) {
|
||||
function chooseLanguage(language: string) {
|
||||
modelValue = language
|
||||
}
|
||||
</script>
|
||||
|
@ -57,16 +50,11 @@ function chooseLanguage(language: string | null) {
|
|||
<CommonDropdownItem
|
||||
v-for="{ code, nativeName, name } in languages"
|
||||
:key="code"
|
||||
:checked="code === (modelValue || null)"
|
||||
:text="nativeName"
|
||||
:description="name"
|
||||
:checked="code === modelValue"
|
||||
@click="chooseLanguage(code)"
|
||||
>
|
||||
{{ nativeName }}
|
||||
<template #description>
|
||||
<template v-if="name">
|
||||
{{ name }}
|
||||
</template>
|
||||
</template>
|
||||
</CommonDropdownItem>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue