OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #410 - allow number with dimensions as group item type (#447) 

Signed-off-by: Yannick Schaus <github@schaus.net>
pull/452/head
Yannick Schaus 2020-10-26 11:22:38 +01:00 committed by GitHub
parent 4dc6d5f6c5
commit 9218f0fa4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.ui/web/src/components/item/group-form.vue
View File

@ -3,10 +3,15 @@
<f7-list inline-labels no-hairlines-md>
<f7-list-item v-if="item.type === 'Group'" title="Members Base Type" smart-select :smart-select-params="{openIn: 'popup', closeOnSelect: true}">
<select name="select-basetype" @change="setGroupType($event.target.value)">
<option v-for="type in types.GroupTypes" :key="type" :value="type" :selected="type === item.groupType">{{type}}</option>
<optgroup label="Basic Types">
<option v-for="type in types.GroupTypes" :key="type" :value="type" :selected="type === item.groupType">{{type}}</option>
</optgroup>
<optgroup label="Numbers with Dimensions">
<option v-for="dimension in types.Dimensions" :key="dimension" :value="'Number:' + dimension" :selected="item.groupType === 'Number:' + dimension">{{'Number:' + dimension}}</option>
</optgroup>
</select>
</f7-list-item>
<f7-list-item key="function-picker-arithmetic" v-if="item.type === 'Group' && ['Number', 'Dimmer', 'Rollershutter'].indexOf(item.groupType) >= 0" title="Aggregation Function" smart-select :smart-select-params="{openIn: 'popover', closeOnSelect: true}">
<f7-list-item key="function-picker-arithmetic" v-if="item.type === 'Group' && (['Dimmer', 'Rollershutter'].indexOf(item.groupType) >= 0 || item.groupType.indexOf('Number') === 0)" title="Aggregation Function" smart-select :smart-select-params="{openIn: 'popover', closeOnSelect: true}">
<select name="select-function" @change="setFunction($event.target.value)">
<option v-for="type in types.ArithmeticFunctions" :key="type.name" :value="type.name" :selected="type.name === item.functionKey">{{type.value}}</option>
</select>
@ -55,7 +60,7 @@ export default {
this.$set(this.item, 'groupType', '')
this.$set(this.item, 'functionKey', 'None')
this.$nextTick(() => {
this.$set(this.item, 'groupType', type)
if (type !== 'None') this.$set(this.item, 'groupType', type)
})
},
setFunction (key) {