This commit is contained in:
@@ -380,6 +380,11 @@ export default {
|
||||
listViewChanged: function() {
|
||||
//console.log("listViewchanged: TOP");
|
||||
var vm = this;
|
||||
//find out if we need to trigger the get data or if it will happen automatically
|
||||
//when we set page to 0
|
||||
console.log(vm.dataTablePagingOptions.page);
|
||||
var ShouldGetData = vm.dataTablePagingOptions.page == 1;
|
||||
|
||||
if (vm.listViewId == 0) {
|
||||
//default view, no saved, no cached
|
||||
vm.listView = undefined;
|
||||
@@ -387,7 +392,12 @@ export default {
|
||||
// "listViewchanged: Default NO LIST VIEW selected - Calling saveformsettings"
|
||||
// );
|
||||
saveFormSettings(vm);
|
||||
vm.getDataFromApi();
|
||||
if (ShouldGetData) {
|
||||
vm.getDataFromApi();
|
||||
} else {
|
||||
vm.dataTablePagingOptions.page = 1;
|
||||
}
|
||||
//
|
||||
} else if (vm.listViewId > 0) {
|
||||
(async function() {
|
||||
// console.log("listViewchanged: awaiting fetchListView...");
|
||||
@@ -396,7 +406,11 @@ export default {
|
||||
// "listViewchanged: back from fetchListView calling save form settings"
|
||||
// );
|
||||
saveFormSettings(vm);
|
||||
vm.getDataFromApi();
|
||||
if (ShouldGetData) {
|
||||
vm.getDataFromApi();
|
||||
} else {
|
||||
vm.dataTablePagingOptions.page = 1;
|
||||
}
|
||||
})();
|
||||
}
|
||||
},
|
||||
@@ -764,7 +778,10 @@ function loadFormSettings(vm) {
|
||||
//check for cached local copy of saved list view in use
|
||||
if (vm.listViewId > 0) {
|
||||
//0=no list view, -1=unsaved list view so any number greater than zero means there sb a cached local copy of a saved list view
|
||||
if (formSettings.temp.dataTable.cachedListView != undefined) {
|
||||
if (
|
||||
formSettings.temp.dataTable &&
|
||||
formSettings.temp.dataTable.cachedListView != undefined
|
||||
) {
|
||||
vm.listView = formSettings.temp.dataTable.cachedListView;
|
||||
} else {
|
||||
//fetch it and cache it
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
:dataListKey="dataListKey"
|
||||
:dataListFilter="dataListFilter"
|
||||
:dataListSort="dataListSort"
|
||||
:showSelect="true"
|
||||
:showSelect="false"
|
||||
:singleSelect="false"
|
||||
v-on:update:selected="handleSelected"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user