Skip to content

feat(table): Split computedItems into multiple functions #1893

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

Merged
merged 2 commits into from
Jun 16, 2018
Merged

feat(table): Split computedItems into multiple functions #1893

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05c0915
feat(table): Split computedItems into multiple functions
gaaf Jun 15, 2018
2465b14
Update table.js
mosinve Jun 16, 2018
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
87 changes: 47 additions & 40 deletions src/components/table/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,16 +779,6 @@ export default {
})
},
computedItems () {
// Grab some props/data to ensure reactivity
const perPage = this.perPage
const currentPage = this.currentPage
const filter = this.filter
const sortBy = this.localSortBy
const sortDesc = this.localSortDesc
const sortCompare = this.sortCompare
const localFiltering = this.localFiltering
const localSorting = this.localSorting
const localPaging = this.localPaging
let items = this.hasProvider ? this.localItems : this.items
if (!items) {
this.$nextTick(this._providerUpdate)
Expand All @@ -797,30 +787,49 @@ export default {
// Array copy for sorting, filtering, etc.
items = items.slice()
// Apply local filter
if (filter && localFiltering) {
if (filter instanceof Function) {
items = items.filter(filter)
this.filteredItems = items = this.filterItems(items)
// Apply local sort
items = this.sortItems(items)
// Apply local pagination
items = this.paginateItems(items)
// Update the value model with the filtered/sorted/paginated data set
this.$emit('input', items)
return items
},
computedBusy () {
return this.busy || this.localBusy
}
},
methods: {
keys,
filterItems (items) {
if (this.localFiltering && this.filter) {
if (this.filter instanceof Function) {
return items.filter(this.filter)
}

let regex
if (this.filter instanceof RegExp) {
regex = this.filter
} else {
let regex
if (filter instanceof RegExp) {
regex = filter
} else {
regex = new RegExp('.*' + filter + '.*', 'ig')
}
items = items.filter(item => {
const test = regex.test(recToString(item))
regex.lastIndex = 0
return test
})
regex = new RegExp('.*' + this.filter + '.*', 'ig')
}

return items.filter(item => {
const test = regex.test(recToString(item))
regex.lastIndex = 0
return test
})
}
if (localFiltering) {
// Make a local copy of filtered items to trigger filtered event
this.filteredItems = items.slice()
}
// Apply local Sort
return items
},
sortItems (items) {
const sortBy = this.localSortBy
const sortDesc = this.localSortDesc
const sortCompare = this.sortCompare
const localSorting = this.localSorting
if (sortBy && localSorting) {
items = stableSort(items, (a, b) => {
return stableSort(items, (a, b) => {
let ret = null
if (typeof sortCompare === 'function') {
// Call user provided sortCompare routine
Expand All @@ -834,21 +843,19 @@ export default {
return (ret || 0) * (sortDesc ? -1 : 1)
})
}
return items
},
paginateItems (items) {
const currentPage = this.currentPage
const perPage = this.perPage
const localPaging = this.localPaging
// Apply local pagination
if (Boolean(perPage) && localPaging) {
if (!!perPage && localPaging) {
// Grab the current page of data (which may be past filtered items)
items = items.slice((currentPage - 1) * perPage, currentPage * perPage)
return items.slice((currentPage - 1) * perPage, currentPage * perPage)
}
// Update the value model with the filtered/sorted/paginated data set
this.$emit('input', items)
return items
},
computedBusy () {
return this.busy || this.localBusy
}
},
methods: {
keys,
fieldClasses (field) {
return [
field.sortable ? 'sorting' : '',
Expand Down