This commit is contained in:
2020-02-18 22:19:33 +00:00
parent 948dbe37c8
commit d809b915b8
2 changed files with 46 additions and 12 deletions

View File

@@ -781,7 +781,7 @@ function loadFormSettings(vm) {
//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 //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 ( if (
formSettings.temp.dataTable && formSettings.temp.dataTable &&
formSettings.temp.dataTable.cachedListView != undefined formSettings.temp.dataTable.cachedListView != null
) { ) {
vm.listView = formSettings.temp.dataTable.cachedListView; vm.listView = formSettings.temp.dataTable.cachedListView;
} else { } else {

View File

@@ -12,17 +12,26 @@
READONLY: {{ formState.readOnly }} READONLY: {{ formState.readOnly }}
<br /> <br />
</div> --> </div> -->
<!-- <div>
FAF
{{ obj }}
</div>
<v-divider></v-divider>
<div> <div>
CUSTOM TEMPLATE ListViewId: {{ listViewId }}
{{ tempTemplate }} <v-divider></v-divider>
<br />
DataListKey: {{ dataListKey }}
<v-divider></v-divider>
<br />
FormKey: {{ formKey }}
<v-divider></v-divider>
<br />
<!-- fieldDefinitions: {{ fieldDefinitions }}
<v-divider></v-divider>
<br /> -->
effectiveListView: {{ effectiveListView }}
<v-divider></v-divider>
<br />
obj: {{ obj }}
<v-divider></v-divider>
</div> </div>
<v-divider></v-divider> -->
key:{{ dataListKey }}, id: {{ listViewId }}
<v-row v-if="this.formState.ready"> <v-row v-if="this.formState.ready">
<v-col> <v-col>
<v-form ref="form"> <v-form ref="form">
@@ -307,7 +316,9 @@ function generateMenu(vm) {
// //
function initForm(vm) { function initForm(vm) {
//return Promise.resolve(); //return Promise.resolve();
return populateFieldDefinitions(vm).then(fetchLocalizedFieldNames(vm)); return populateFieldDefinitions(vm)
.then(fetchLocalizedFieldNames(vm))
.then(setEffectiveListView(vm));
} }
//////////////////// ////////////////////
@@ -367,9 +378,32 @@ function setEffectiveListView(vm) {
} }
} else if (vm.listViewId == 0) { } else if (vm.listViewId == 0) {
//get default list view //get default list view
//http://localhost:7575/api/v8/DataListView/default/TestWidgetDataList
window.$gz.api.get("DataListView/default/" + vm.dataListKey).then(res => {
if (res.error != undefined) {
throw res.error;
} else {
vm.effectiveListView = res.data;
}
});
} else { } else {
//listview has an id value
//check if cached, if not then fetch, cache and set //check if cached, if not then fetch, cache and set
if (
formSettings.temp.dataTable &&
formSettings.temp.dataTable.cachedListView != null
) {
vm.effectiveListView = formSettings.temp.dataTable.cachedListView;
} else {
//fetch it and cache it
window.$gz.api.get("DataListView/" + vm.listViewId).then(res => {
if (res.error != undefined) {
throw res.error;
} else {
vm.effectiveListView = res.data.listView;
}
});
}
} }
} }