Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(VDataTable): use item.raw and columns in sorting transform #20077

Merged
merged 4 commits into from
Jul 16, 2024
Merged

fix(VDataTable): use item.raw and columns in sorting transform #20077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0e7f15
fix: using raw instead
tongxuanbao Jun 29, 2024
33e52e0
fix(VDataTable): revert un expected changes
tongxuanbao Jun 29, 2024
4aa5add
fix(VDataTable): fix deep sorting and use combined trasformation
tongxuanbao Jul 2, 2024
a1b3e3d
fix(VDataTable): clean up
tongxuanbao Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VDataTable/VDataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const VDataTable = genericComponent<new <T extends readonly any[], V>(
const { sortByWithGroups, opened, extractRows, isGroupOpen, toggleGroup } = provideGroupBy({ groupBy, sortBy })

const { sortedItems } = useSortedItems(props, filteredItems, sortByWithGroups, {
transform: item => item.columns,
transform: item => ({ ...item.raw, ...item.columns }),
sortFunctions,
sortRawFunctions,
})
Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VDataTable/VDataTableVirtual.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const VDataTableVirtual = genericComponent<new <T extends readonly any[],
const { sortByWithGroups, opened, extractRows, isGroupOpen, toggleGroup } = provideGroupBy({ groupBy, sortBy })

const { sortedItems } = useSortedItems(props, filteredItems, sortByWithGroups, {
transform: item => item.columns,
transform: item => ({ ...item.raw, ...item.columns }),
sortFunctions,
sortRawFunctions,
})
Expand Down
6 changes: 3 additions & 3 deletions packages/vuetify/src/components/VDataTable/composables/sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useProxiedModel } from '@/composables/proxiedModel'

// Utilities
import { computed, inject, provide, toRef } from 'vue'
import { isEmpty, propsFactory } from '@/util'
import { getObjectValueByPath, isEmpty, propsFactory } from '@/util'

// Types
import type { InjectionKey, PropType, Ref } from 'vue'
Expand Down Expand Up @@ -149,8 +149,8 @@ export function sortItems<T extends InternalItem> (

if (sortOrder === false) continue

let sortA = a[1][sortKey]
let sortB = b[1][sortKey]
let sortA = getObjectValueByPath(a[1], sortKey)
let sortB = getObjectValueByPath(b[1], sortKey)
let sortARaw = a[0].raw
let sortBRaw = b[0].raw

Expand Down
Loading