This commit is contained in:
@@ -539,7 +539,7 @@ export default {
|
||||
dataTablePagingOptions: {},
|
||||
lastDataTablePagingOptions: {},
|
||||
activeFilterId: 0, //<--0 signifies to select default as it's uninitialized
|
||||
lastFetchFilterId: 0, //used to track change of filter and reset paging in getdata
|
||||
lastFetchFilterId: -1, //used to track change of filter and reset paging in getdata
|
||||
selectLists: {
|
||||
savedFilters: []
|
||||
},
|
||||
@@ -875,10 +875,16 @@ export default {
|
||||
};
|
||||
|
||||
//has filter changed?
|
||||
if (vm.lastFetchFilterId != vm.activeFilterId) {
|
||||
//-1 is the new form default
|
||||
if (
|
||||
vm.lastFetchFilterId != -1 &&
|
||||
vm.lastFetchFilterId != vm.activeFilterId
|
||||
) {
|
||||
//yes, go back to page one
|
||||
vm.dataTablePagingOptions.page = 1;
|
||||
vm.lastFetchFilterId = vm.activeFilterId;
|
||||
} else {
|
||||
vm.lastFetchFilterId = vm.activeFilterId;
|
||||
}
|
||||
|
||||
//calculate paging based on settings
|
||||
@@ -962,8 +968,6 @@ export default {
|
||||
//get pick lists
|
||||
let vm = this;
|
||||
await initForm(vm);
|
||||
//rehydrate last form settings
|
||||
//loadFormSettings(vm);
|
||||
vm.loading = false;
|
||||
vm.getDataFromApi();
|
||||
}
|
||||
@@ -1039,7 +1043,6 @@ async function buildRecords(listData, columndefinitions, ridColumnOpenable) {
|
||||
if (column.rid) {
|
||||
o.id = column.i;
|
||||
}
|
||||
//console.log("build records column: ", column);
|
||||
|
||||
let dataType = columndefinitions[iColumn].dt;
|
||||
let display = column.v;
|
||||
|
||||
Reference in New Issue
Block a user