Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 5 additions & 10 deletions src/DraggableAttribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ export default {
const valueFilter = values.reduce((r, v) => {
r[v] = true
return r
}, {
...this.valueFilter
})
}, Object.assign({},this.valueFilter))
this.$emit('update:filter', { attribute, valueFilter })
},
removeValuesFromFilter (attribute, values) {
Expand All @@ -89,9 +87,7 @@ export default {
delete r[v]
}
return r
}, {
...this.valueFilter
})
}, Object.assign({},this.valueFilter))
this.$emit('update:filter', { attribute, valueFilter })
},
moveFilterBoxToTop (attribute) {
Expand Down Expand Up @@ -183,8 +179,7 @@ export default {
showMenu && h('div', {
staticClass: ['pvtCheckContainer']
},
[
...shown.map(x => {
shown.map(x => {
const checked = !(x in this.valueFilter)
return h('p', {
class: {
Expand Down Expand Up @@ -218,8 +213,8 @@ export default {
})
])
})
])
])
)
]);
},
toggleFilterBox (event) {
event.stopPropagation()
Expand Down
26 changes: 13 additions & 13 deletions src/Pivottable.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import TableRenderer from './TableRenderer'
import defaultProps from './helper/common'
import TableRenderer from './TableRenderer';
import defaultProps from './helper/common';
export default {
name: 'vue-pivottable',
mixins: [
defaultProps
],
computed: {
rendererItems () {
return this.renderers || Object.assign({}, TableRenderer)
return this.renderers || Object.assign({}, TableRenderer);
}
},
methods: {
createPivottable (h) {
const props = this.$props
const props = this.$props;
return h(this.rendererItems[this.rendererName], {
props: {
...props,
localeStrings: props.locales[props.locale].localeStrings
}
})
props: Object.assign(
props,
{localeStrings: props.locales[props.locale].localeStrings}
)
});
},
createWrapperContainer (h) {
return h('div', {
Expand All @@ -30,13 +30,13 @@ export default {
}
}, [
this.createPivottable(h)
])
]);
}
},
render (h) {
return this.createWrapperContainer(h)
return this.createWrapperContainer(h);
},
renderError (h, error) {
return this.renderError(h)
return this.renderError(h);
}
}
};
Loading