This commit is contained in:
2020-02-20 18:20:10 +00:00
parent 0542f2c982
commit c7458a86de

View File

@@ -152,19 +152,24 @@
<div v-if="item.uiFieldDataType === 1"> <div v-if="item.uiFieldDataType === 1">
<v-btn text><v-icon>fa-plus</v-icon></v-btn> <v-btn text><v-icon>fa-plus</v-icon></v-btn>
<v-select <v-select
v-model="item.tempToken" v-model="item.tempFilterToken"
:items="pickLists.dateFilterTokens" :items="pickLists.dateFilterTokens"
item-text="name" item-text="name"
item-value="id" item-value="id"
:label="lt('Filter')" :label="lt('Filter')"
></v-select> ></v-select>
<v-select <div v-if="item.tempFilterToken == '*select*'">
v-if="item.tempToken == '*select*'" <v-select
v-model="item.tempOperator" v-model="item.tempFilterOperator"
:items="pickLists.dateFilterOperators" :items="pickLists.dateFilterOperators"
item-text="name" item-text="name"
item-value="id" item-value="id"
></v-select> ></v-select>
<gz-date-time-picker
v-model="item.tempFilterValue"
></gz-date-time-picker>
</div>
{{ item }}
</div> </div>
<!-- STRING(text-4, emailaddress-11, http-12) BUILDER --> <!-- STRING(text-4, emailaddress-11, http-12) BUILDER -->
@@ -822,8 +827,9 @@ function initDataObject(vm) {
isCustomField: fld.isCustomField, isCustomField: fld.isCustomField,
sort: lvItem.sort || null, sort: lvItem.sort || null,
filter: lvItem.filter || { any: false, items: [] }, filter: lvItem.filter || { any: false, items: [] },
tempOperator: null, tempFilterOperator: null,
tempToken: null tempFilterToken: null,
tempFilterValue: null
}; };
ret.push(o); ret.push(o);
} }
@@ -850,8 +856,9 @@ function initDataObject(vm) {
isCustomField: fld.isCustomField, isCustomField: fld.isCustomField,
sort: null, sort: null,
filter: { any: false, items: [] }, filter: { any: false, items: [] },
tempOperator: null, tempFilterOperator: null,
tempToken: null tempFilterToken: null,
tempFilterValue: null
}; };
ret.push(o); ret.push(o);
} }