mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-07 14:56:06 +02:00
remove datatable throttling
This commit is contained in:
@@ -24,7 +24,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, onBeforeUnmount, ref, toRaw, toRefs, watch } from 'vue';
|
import { computed, ref, toRaw, toRefs, watch } from 'vue';
|
||||||
|
|
||||||
import { useAppearanceSettingsStore, useVrcxStore } from '../stores';
|
import { useAppearanceSettingsStore, useVrcxStore } from '../stores';
|
||||||
|
|
||||||
@@ -88,33 +88,6 @@
|
|||||||
return props.pageSizeLinked ? appearanceSettingsStore.tablePageSize : internalPageSize.value;
|
return props.pageSizeLinked ? appearanceSettingsStore.tablePageSize : internalPageSize.value;
|
||||||
});
|
});
|
||||||
|
|
||||||
const throttledData = ref(asRawArray(data.value));
|
|
||||||
const throttledFilters = ref(filters.value);
|
|
||||||
|
|
||||||
let throttleTimerId = null;
|
|
||||||
const syncThrottledInputs = () => {
|
|
||||||
throttleTimerId = null;
|
|
||||||
throttledData.value = asRawArray(data.value);
|
|
||||||
throttledFilters.value = Array.isArray(filters.value) ? filters.value.slice() : filters.value;
|
|
||||||
};
|
|
||||||
|
|
||||||
const scheduleThrottledSync = () => {
|
|
||||||
if (throttleTimerId !== null) return;
|
|
||||||
throttleTimerId = setTimeout(syncThrottledInputs, 500);
|
|
||||||
};
|
|
||||||
|
|
||||||
watch(data, scheduleThrottledSync);
|
|
||||||
watch(() => (Array.isArray(data.value) ? data.value.length : 0), scheduleThrottledSync);
|
|
||||||
watch(filters, scheduleThrottledSync, { deep: true });
|
|
||||||
watch(effectivePageSize, scheduleThrottledSync);
|
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
|
||||||
if (throttleTimerId !== null) {
|
|
||||||
clearTimeout(throttleTimerId);
|
|
||||||
throttleTimerId = null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const resolvedDefaultSort = computed(() => {
|
const resolvedDefaultSort = computed(() => {
|
||||||
if (props.tableProps?.defaultSort === null) {
|
if (props.tableProps?.defaultSort === null) {
|
||||||
return undefined;
|
return undefined;
|
||||||
@@ -161,23 +134,24 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
const filteredData = computed(() => {
|
const filteredData = computed(() => {
|
||||||
let result = throttledData.value.slice();
|
const rawData = asRawArray(data.value);
|
||||||
const activeFilters = throttledFilters.value;
|
const rawFilters = Array.isArray(filters.value) ? filters.value : [];
|
||||||
|
const activeFilters = rawFilters.filter((filter) => !isEmptyFilterValue(filter?.value));
|
||||||
|
|
||||||
if (activeFilters && Array.isArray(activeFilters) && activeFilters.length > 0) {
|
if (activeFilters.length === 0) {
|
||||||
activeFilters.forEach((filter) => {
|
return rawData;
|
||||||
if (isEmptyFilterValue(filter?.value)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (filter.filterFn) {
|
|
||||||
result = result.filter((row) => filter.filterFn(row, filter));
|
|
||||||
} else if (!Array.isArray(filter.value) || filter.value.length > 0) {
|
|
||||||
result = result.filter((row) => applyFilter(row, filter));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return rawData.filter((row) => {
|
||||||
|
for (const filter of activeFilters) {
|
||||||
|
if (filter.filterFn) {
|
||||||
|
if (!filter.filterFn(row, filter)) return false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!applyFilter(row, filter)) return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const paginatedData = computed(() => {
|
const paginatedData = computed(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user