This commit is contained in:
2020-02-22 00:16:23 +00:00
parent c717d80057
commit d511dd5295
2 changed files with 19 additions and 11 deletions

View File

@@ -430,8 +430,11 @@ export default {
},
getDataFromApi() {
//console.log("getDataFromAPI::TOP");
var vm = this;
if (vm.loading) {
return;
}
console.log("getDataFromAPI::TOP");
//start with defaults
var listOptions = {
@@ -446,11 +449,11 @@ export default {
listOptions.Limit = itemsPerPage;
}
//effective ListView
if (vm.listViewId != 0) {
//we have a listview id so there will be a temp cached listview
listOptions["DataFilterID"] = vm.dataFilterId;
}
// //effective ListView
// if (vm.listViewId != 0) {
// //we have a listview id so there will be a temp cached listview
// listOptions["DataFilterID"] = vm.dataFilterId;
// }
vm.loading = true;
@@ -460,7 +463,8 @@ export default {
// "dataListKey": "string",
// "listView": "string"
// }
console.log("GetDataFromAPI::ListView is:");
console.log(vm.listView);
window.$gz.api
.upsert(vm.apiBaseUrl, {
offset: listOptions.Offset,
@@ -497,6 +501,8 @@ export default {
initForm(vm).then(() => {
//rehydrate last form settings
loadFormSettings(vm);
vm.loading = false;
vm.getDataFromApi();
});
}
};

View File

@@ -437,10 +437,10 @@ export default {
var vm = this;
if (this.formState.dirty) {
//Put in unsaved listview
//debugger;
debugger;
var formSettings = window.$gz.form.getFormSettings(vm.formKey);
formSettings.saved.dataTable.unsavedListView = generateListViewFromEdited(
vm
formSettings.saved.dataTable.unsavedListView = JSON.stringify(
generateListViewFromEdited(vm)
);
formSettings.saved.dataTable.listViewId = -1;
window.$gz.form.setFormSettings(vm.formKey, formSettings);
@@ -1128,7 +1128,9 @@ function setEffectiveListView(vm) {
if (vm.listViewId == -1) {
if (formSettings.saved.dataTable.unsavedListView != null) {
vm.effectiveListView = formSettings.saved.dataTable.unsavedListView;
vm.effectiveListView = JSON.parse(
formSettings.saved.dataTable.unsavedListView
);
vm.obj.name = vm.lt("FilterUnsaved");
return Promise.resolve();
}