Skip to content

added watch on max-items for reactive data #283

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
Oct 7, 2018
Merged

added watch on max-items for reactive data #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1262b9e
added watch on max-items for reactive data
brunokunace Oct 5, 2018
31f468b
Merge branch 'master' into feature/reactive_max_prop_table
luisDanielRoviraContreras Oct 7, 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
4 changes: 3 additions & 1 deletion src/components/vsPagination/vsPagination.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ export default {
current() {
this.getPages()
this.$emit('input', this.current)
},
total() {
this.getPages()
}
},

Expand Down Expand Up @@ -137,7 +140,6 @@ export default {
let pages = this.setPages(1, this.total)
this.pages = pages
}
// console.log('this.total', this.total)
const even = this.max % 2 === 0 ? 1 : 0
if(this.total < 6) {
this.prevRange = Math.floor(this.max / (this.max/2))
Expand Down
26 changes: 12 additions & 14 deletions src/components/vsTable/vsTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,20 +157,15 @@ export default {
},
watch:{
currentx() {
let max = Math.ceil(this.currentx * this.maxItems)
let min = max - this.maxItems

this.datax = this.getItems(min, max)
this.loadData()
},
maxItems() {
this.loadData()
},
data() {
let max = Math.ceil(this.currentx * this.maxItems)
let min = max - this.maxItems

let datax = this.pagination ? this.getItems(min, max) : this.data

this.datax = datax || []
this.loadData()
this.$nextTick(() => {
if(datax.length > 0) {
if(this.datax.length > 0) {
this.changeTdsWidth()
}
})
Expand All @@ -182,10 +177,8 @@ export default {
mounted () {
window.addEventListener('resize', this.listenerChangeWidth)

let max = Math.ceil(this.currentx * this.maxItems)
let min = max - this.maxItems
this.loadData()

this.datax = this.pagination ? this.getItems(min, max) : this.data || []
this.$nextTick(() => {
if(this.datax.length > 0) {
this.changeTdsWidth()
Expand All @@ -196,6 +189,11 @@ export default {
window.removeEventListener('resize', this.listenerChangeWidth)
},
methods:{
loadData() {
let max = Math.ceil(this.currentx * this.maxItems)
let min = max - this.maxItems
this.datax = this.pagination ? this.getItems(min, max) : this.data || []
},
getItems(min, max) {
let items = []

Expand Down