This commit is contained in:
2020-03-18 19:56:58 +00:00
parent 91d5570223
commit ebfd2b9dee
6 changed files with 55 additions and 78 deletions

View File

@@ -14,7 +14,7 @@
<v-card-title>
<v-select
v-model="listViewId"
:items="pickLists.listViews"
:items="selectLists.listViews"
item-text="name"
item-value="id"
:label="lt('DataListView')"
@@ -330,7 +330,7 @@ export default {
lastDataTablePagingOptions: {},
listViewId: 0,
listView: undefined,
pickLists: {
selectLists: {
listViews: []
},
headers: [],
@@ -444,13 +444,13 @@ export default {
//this example does remove from the array and does update a plain mustache rendition of it on the page but doesn't update the select itself
//whereas using the native javascript array splice function *does* update the select because vue wraps splice and other native methods specifically
//so it can properly update the dom
// window.$gz._.remove(vm.pickLists.listViews, function(n) {
// window.$gz._.remove(vm.selectLists.listViews, function(n) {
// return n.id == -1;
// });
for (var i = vm.pickLists.listViews.length - 1; i >= 0; i--) {
if (vm.pickLists.listViews[i].id === -1) {
vm.pickLists.listViews.splice(i, 1);
for (var i = vm.selectLists.listViews.length - 1; i >= 0; i--) {
if (vm.selectLists.listViews[i].id === -1) {
vm.selectLists.listViews.splice(i, 1);
}
}
@@ -758,7 +758,7 @@ function initForm(vm) {
return new Promise(function(resolve, reject) {
(async function() {
try {
await populatePickLists(vm);
await populateSelectionLists(vm);
await loadFormSettings(vm);
} catch (err) {
reject(err);
@@ -770,7 +770,7 @@ function initForm(vm) {
////////////////////
//
function populatePickLists(vm) {
function populateSelectionLists(vm) {
//http://localhost:7575/api/v8/DataListView/ViewList?ListKey=TestWidgetDataList
return window.$gz.api
.get("DataListView/ViewList?ListKey=" + vm.dataListKey)
@@ -778,8 +778,8 @@ function populatePickLists(vm) {
if (res.error != undefined) {
window.$gz.errorHandler.handleFormError(res.error, vm);
} else {
vm.pickLists.listViews = res.data;
window.$gz.form.addNoSelectionItem(vm.pickLists.listViews);
vm.selectLists.listViews = res.data;
window.$gz.form.addNoSelectionItem(vm.selectLists.listViews);
}
});
}
@@ -855,7 +855,7 @@ function loadFormSettings(vm) {
if (formSettings.saved.dataTable.unsavedListView != null) {
//add UNSAVED FILTER if -1
vm.pickLists.listViews.unshift({
vm.selectLists.listViews.unshift({
name: vm.lt("FilterUnsaved"),
id: -1
});