This commit is contained in:
2020-02-20 22:51:16 +00:00
parent a8a5c801dc
commit aa6923af96

View File

@@ -89,40 +89,42 @@
v-model="item.include" v-model="item.include"
:label="lt('Include')" :label="lt('Include')"
:ref="item.key" :ref="item.key"
:disabled="item.sort != null || item.filter != null" :disabled="
item.sort != null || item.filter.items.length > 0
"
@change="includeChanged(item)" @change="includeChanged(item)"
></v-switch> ></v-switch>
<div class="d-flex justify-space-between"> <div class="d-flex justify-space-between">
<v-btn text large @click="move('start', index)" <v-btn outlined large @click="move('start', index)"
><v-icon light Large>fa-step-backward</v-icon></v-btn ><v-icon light Large>fa-step-backward</v-icon></v-btn
> >
<v-btn text Large @click="move('left', index)" <v-btn outlined Large @click="move('left', index)"
><v-icon Large>fa-backward</v-icon></v-btn ><v-icon Large>fa-backward</v-icon></v-btn
> >
<v-btn text Large @click="move('right', index)" <v-btn outlined Large @click="move('right', index)"
><v-icon Large>fa-forward</v-icon></v-btn ><v-icon Large>fa-forward</v-icon></v-btn
> >
<v-btn text Large @click="move('end', index)" <v-btn outlined Large @click="move('end', index)"
><v-icon Large>fa-step-forward</v-icon></v-btn ><v-icon Large>fa-step-forward</v-icon></v-btn
> >
</div> </div>
<template v-if="item.isSortable"> <template v-if="item.isSortable">
<div @click="toggleSort(item)" class="pl-2 pt-2"> <div @click="toggleSort(item)" class="pl-2 pt-2">
<v-btn v-if="item.sort == null" text Large> <v-btn v-if="item.sort == null" outlined Large>
<v-icon large>fa-sort</v-icon>{{ lt("Sort") }}</v-btn <v-icon large>fa-sort</v-icon>{{ lt("Sort") }}</v-btn
> >
<v-btn <v-btn
v-if="item.sort != null && item.sort == '-'" v-if="item.sort != null && item.sort == '-'"
text outlined
Large Large
><v-icon large>fa-sort-amount-down</v-icon ><v-icon large>fa-sort-amount-down</v-icon
>{{ lt("Sort") }}</v-btn >{{ lt("Sort") }}</v-btn
> >
<v-btn <v-btn
v-if="item.sort != null && item.sort == '+'" v-if="item.sort != null && item.sort == '+'"
text outlined
Large Large
><v-icon large>fa-sort-amount-up</v-icon ><v-icon large>fa-sort-amount-up</v-icon
>{{ lt("Sort") }}</v-btn >{{ lt("Sort") }}</v-btn
@@ -178,7 +180,6 @@
@click="addFilterCondition(item)" @click="addFilterCondition(item)"
><v-icon>fa-plus</v-icon></v-btn ><v-icon>fa-plus</v-icon></v-btn
> >
{{ item }}
</div> </div>
<!-- STRING(text-4, emailaddress-11, http-12) BUILDER --> <!-- STRING(text-4, emailaddress-11, http-12) BUILDER -->
@@ -221,6 +222,8 @@
<div> <div>
TODO: STATIC list of items with delete button on each TODO: STATIC list of items with delete button on each
one one
<v-divider></v-divider>
{{ item }}
</div> </div>
</div> </div>
</template> </template>
@@ -352,6 +355,10 @@ export default {
} else { } else {
item.sort = null; item.sort = null;
} }
//make sure sorted fields are INCLUDED
if (item.sort) {
item.include = true;
}
}, },
move: function(direction, index) { move: function(direction, index) {
var totalItems = this.obj.length; var totalItems = this.obj.length;