arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-20 23:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(Table): rename columns sortFn to sort

Browse Source
This commit is contained in:
Benjamin Canac
2024-01-09 12:05:32 +01:00
parent 6154ae94a9
commit 8508e84958
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/runtime/components/data/Table.vue
View File

@@ -87,6 +87,18 @@ function defaultComparator<T> (a: T, z: T): boolean {
return a === z
}
function defaultSort (a: any, b: any, direction: 'asc' | 'desc') {
if (a === b) {
return 0
}
if (direction === 'asc') {
return a < b ? -1 : 1
} else {
return a > b ? -1 : 1
}
}
export default defineComponent({
components: {
UButton,
@@ -108,7 +120,7 @@ export default defineComponent({
default: () => []
},
columns: {
type: Array as PropType<{ key: string, sortable?: boolean, sortFn?: (a: any, b: any, direction: 'asc' | 'desc') => number, direction?: 'asc' | 'desc', class?: string, [key: string]: any }[]>,
type: Array as PropType<{ key: string, sortable?: boolean, sort?: (a: any, b: any, direction: 'asc' | 'desc') => number, direction?: 'asc' | 'desc', class?: string, [key: string]: any }[]>,
default: null
},
columnAttribute: {
@@ -156,23 +168,11 @@ export default defineComponent({
setup (props, { emit, attrs: $attrs }) {
const { ui, attrs } = useUI('table', toRef(props, 'ui'), config, toRef(props, 'class'))
const columns = computed(() => props.columns ?? Object.keys(props.rows[0] ?? {}).map((key) => ({ key, label: upperFirst(key), sortable: false, class: undefined, sortFn: defaultSortFn })))
const columns = computed(() => props.columns ?? Object.keys(props.rows[0] ?? {}).map((key) => ({ key, label: upperFirst(key), sortable: false, class: undefined, sort: defaultSort })))
const sort = ref(defu({}, props.sort, { column: null, direction: 'asc' }))
const defaultSort = { column: sort.value.column, direction: null }
function defaultSortFn (a: any, b: any, direction: 'asc' | 'desc') {
if (a === b) {
return 0
}
if (direction === 'asc') {
return a < b ? -1 : 1
} else {
return a > b ? -1 : 1
}
}
const savedSort = { column: sort.value.column, direction: null }
const rows = computed(() => {
if (!sort.value?.column) {
@@ -185,8 +185,9 @@ export default defineComponent({
const aValue = get(a, column)
const bValue = get(b, column)
const sortFn = columns.value.find((col) => col.key === column)?.sortFn ?? defaultSortFn
return sortFn(aValue, bValue, direction)
const sort = columns.value.find((col) => col.key === column)?.sort ?? defaultSort
return sort(aValue, bValue, direction)
})
})
@@ -232,7 +233,7 @@ export default defineComponent({
const direction = !column.direction || column.direction === 'asc' ? 'desc' : 'asc'
if (sort.value.direction === direction) {
sort.value = defu({}, defaultSort, { column: null, direction: 'asc' })
sort.value = defu({}, savedSort, { column: null, direction: 'asc' })
} else {
sort.value.direction = sort.value.direction === 'asc' ? 'desc' : 'asc'
}