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

Sitemap treeview: Fix arrows/chevrons shown if not expandable (#3007) 

Regression from #2904.
Reported in https://github.com/openhab/openhab-webui/pull/2970#issuecomment-2585663931.

Signed-off-by: Florian Hotze <dev@florianhotze.com>
pull/3014/head
Florian Hotze 2025-01-13 13:13:22 +01:00 committed by GitHub
parent 54a34981b0
commit 7ef5b6fe1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/treeview-item.vue
View File

@ -4,10 +4,11 @@
:textColor="iconColor" :color="'blue'"
:selected="selected && selected === widget"
:opened="!widget.closed"
:toggle="canHaveChildren"
@treeview:open="setWidgetClosed(false)"
@treeview:close="setWidgetClosed(true)"
@click="select">
<draggable v-if="canHaveChildren" :list="children" group="sitemap-treeview" animation="150" fallbackOnBody="true" swapThreshold="0.6"
<draggable :list="children" group="sitemap-treeview" animation="150" fallbackOnBody="true" swapThreshold="0.6"
@start="onStart" @change="onChange" @end="onEnd">
<sitemap-treeview-item class="sitemap-treeview-item" v-for="(childwidget, idx) in children"
:key="idx"
@ -66,6 +67,7 @@ export default {
},
onStart (event) {
console.debug('Drag start event:', event)
this.$set(this.localMoveState, 'moving', true)
this.$set(this.localMoveState, 'widget', this.widget.slots.widgets[event.oldIndex])
this.$set(this.localMoveState, 'oldList', this.widget.slots.widgets)
this.$set(this.localMoveState, 'oldIndex', event.oldIndex)
@ -73,11 +75,13 @@ export default {
onChange (event) {
console.debug('Drag change event:', event)
if (event.added) {
this.$set(this.localMoveState, 'moving', false)
this.validateMove(event.added.newIndex)
}
},
onEnd (event) {
console.debug('Drag end event:', event)
this.$set(this.localMoveState, 'moving', false)
this.validateMove(event.newIndex)
},
validateMove (newIndex) {
@ -123,7 +127,7 @@ export default {
return this.widget.slots?.widgets || []
},
canHaveChildren () {
return this.LINKABLE_WIDGET_TYPES.includes(this.widget.component)
return (this.LINKABLE_WIDGET_TYPES.includes(this.widget.component) && (this.children.length > 0 || this.localMoveState.moving)) === true
}
}
}