vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Fixed #4913 - Datatable Slider filter: Filtering breaks after clearing filter when using slider in docs and elsewhere

pull/4992/head
mertsincan 2023-12-20 22:58:37 +00:00
parent c0869a9839
commit 0c37d48b37
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
components/lib/slider/Slider.vue
View File

@ -99,7 +99,7 @@ export default {
let newValue = (this.max - this.min) * (handleValue / 100) + this.min; let newValue = (this.max - this.min) * (handleValue / 100) + this.min;
if (this.step) { if (this.step) {
const oldValue = this.range ? this.modelValue[this.handleIndex] : this.modelValue; const oldValue = this.range ? this.value[this.handleIndex] : this.value;
const diff = newValue - oldValue; const diff = newValue - oldValue;
if (diff < 0) newValue = oldValue + Math.ceil(newValue / this.step - oldValue / this.step) * this.step; if (diff < 0) newValue = oldValue + Math.ceil(newValue / this.step - oldValue / this.step) * this.step;
@ -115,7 +115,7 @@ export default {
let modelValue; let modelValue;
if (this.range) { if (this.range) {
modelValue = this.modelValue ? [...this.modelValue] : []; modelValue = this.value ? [...this.value] : [];
if (this.handleIndex == 0) { if (this.handleIndex == 0) {
if (newValue < this.min) newValue = this.min; if (newValue < this.min) newValue = this.min;
@ -147,7 +147,7 @@ export default {
this.dragging = true; this.dragging = true;
this.updateDomData(); this.updateDomData();
if (this.range && this.modelValue[0] === this.max) { if (this.range && this.value[0] === this.max) {
this.handleIndex = 0; this.handleIndex = 0;
} else { } else {
this.handleIndex = index; this.handleIndex = index;
@ -166,7 +166,7 @@ export default {
if (this.dragging) { if (this.dragging) {
this.dragging = false; this.dragging = false;
this.$el.setAttribute('data-p-sliding', false); this.$el.setAttribute('data-p-sliding', false);
this.$emit('slideend', { originalEvent: event, value: this.modelValue }); this.$emit('slideend', { originalEvent: event, value: this.value });
} }
}, },
onBarClick(event) { onBarClick(event) {
@ -227,12 +227,12 @@ export default {
let newValue; let newValue;
if (this.range) { if (this.range) {
if (this.step) newValue = this.modelValue[index] - this.step; if (this.step) newValue = this.value[index] - this.step;
else newValue = this.modelValue[index] - 1; else newValue = this.value[index] - 1;
} else { } else {
if (this.step) newValue = this.modelValue - this.step; if (this.step) newValue = this.value - this.step;
else if (!this.step && pageKey) newValue = this.modelValue - 10; else if (!this.step && pageKey) newValue = this.value - 10;
else newValue = this.modelValue - 1; else newValue = this.value - 1;
} }
this.updateModel(event, newValue); this.updateModel(event, newValue);
@ -242,12 +242,12 @@ export default {
let newValue; let newValue;
if (this.range) { if (this.range) {
if (this.step) newValue = this.modelValue[index] + this.step; if (this.step) newValue = this.value[index] + this.step;
else newValue = this.modelValue[index] + 1; else newValue = this.value[index] + 1;
} else { } else {
if (this.step) newValue = this.modelValue + this.step; if (this.step) newValue = this.value + this.step;
else if (!this.step && pageKey) newValue = this.modelValue + 10; else if (!this.step && pageKey) newValue = this.value + 10;
else newValue = this.modelValue + 1; else newValue = this.value + 1;
} }
this.updateModel(event, newValue); this.updateModel(event, newValue);
@ -277,6 +277,13 @@ export default {
} }
}, },
computed: { computed: {
value() {
if (this.range) {
return [this.modelValue?.[0] ?? this.min, this.modelValue?.[1] ?? this.max];
}
return this.modelValue ?? this.min;
},
horizontal() { horizontal() {
return this.orientation === 'horizontal'; return this.orientation === 'horizontal';
}, },
@ -300,16 +307,16 @@ export default {
else return { bottom: this.handlePosition + '%' }; else return { bottom: this.handlePosition + '%' };
}, },
handlePosition() { handlePosition() {
if (this.modelValue < this.min) return 0; if (this.value < this.min) return 0;
else if (this.modelValue > this.max) return 100; else if (this.value > this.max) return 100;
else return ((this.modelValue - this.min) * 100) / (this.max - this.min); else return ((this.value - this.min) * 100) / (this.max - this.min);
}, },
rangeStartPosition() { rangeStartPosition() {
if (this.modelValue && this.modelValue[0]) return ((this.modelValue[0] < this.min ? 0 : this.modelValue[0] - this.min) * 100) / (this.max - this.min); if (this.value && this.value[0]) return ((this.value[0] < this.min ? 0 : this.value[0] - this.min) * 100) / (this.max - this.min);
else return 0; else return 0;
}, },
rangeEndPosition() { rangeEndPosition() {
if (this.modelValue && this.modelValue.length === 2) return ((this.modelValue[1] > this.max ? 100 : this.modelValue[1] - this.min) * 100) / (this.max - this.min); if (this.value && this.value.length === 2) return ((this.value[1] > this.max ? 100 : this.value[1] - this.min) * 100) / (this.max - this.min);
else return 100; else return 100;
}, },
rangeStartHandleStyle() { rangeStartHandleStyle() {