Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Model picker popup: Add "Show name" and "Show tags" options #2320

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Model picker popup: Add "Show name" and "Show tags" options #2320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions bundles/org.openhab.ui/web/src/components/model/model-picker-popup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,17 @@
<div class="padding-right text-align-right">
<f7-checkbox :checked="includeNonSemantic" @change="toggleNonSemantic" />
<label @click="toggleNonSemantic" class="advanced-label">Show non-semantic</label>
<f7-checkbox style="margin-left: 5px" :checked="includeItemName" @change="toggleItemName" />
<label @click="toggleItemName" class="advanced-label">Show name</label>
<f7-checkbox style="margin-left: 5px" :checked="includeItemTags" @change="toggleItemTags" />
<label @click="toggleItemTags" class="advanced-label">Show tags</label>
</div>
<span />
<!-- <f7-link class="right details-link padding-right" ref="detailsLink" @click="detailsOpened = true" icon-f7="chevron_up"></f7-link> -->
</f7-toolbar>
<f7-block strong class="no-padding" v-if="ready">
<model-treeview class="model-picker-treeview" :root-nodes="rootNodes"
:includeItemName="includeItemName" :includeItemTags="includeItemTags"
:selected-item="selectedItem" @selected="selectItem" @checked="checkItem" />
</f7-block>
<f7-block v-else-if="!ready" class="text-align-center">
Expand Down Expand Up @@ -79,6 +84,8 @@ export default {
loading: false,
initSearchbar: false,
includeNonSemantic: false,
includeItemName: false,
includeItemTags: false,
expanded: false,
items: [],
links: [],
Expand Down Expand Up @@ -283,6 +290,14 @@ export default {
this.includeNonSemantic = !this.includeNonSemantic
this.load()
},
toggleItemName () {
this.includeItemName = !this.includeItemName
this.load()
},
toggleItemTags () {
this.includeItemTags = !this.includeItemTags
this.load()
},
toggleExpanded () {
this.expanded = !this.expanded

Expand Down
3 changes: 2 additions & 1 deletion bundles/org.openhab.ui/web/src/components/model/model-treeview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<f7-treeview class="model-treeview">
<model-treeview-item v-for="node in rootNodes"
:key="node.item.name" :model="node"
:includeItemName="includeItemName" :includeItemTags="includeItemTags"
@selected="nodeSelected" :selected="selectedItem"
@checked="(item, check) => $emit('checked', item, check)" />
</f7-treeview>
Expand All @@ -21,7 +22,7 @@

<script>
export default {
props: ['rootNodes', 'selectedItem'],
props: ['rootNodes', 'selectedItem', 'includeItemName', 'includeItemTags'],
methods: {
nodeSelected (node) {
this.$emit('selected', node)
Expand Down