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

Item & Thing code tabs: Minor fixes (#1900) 

- Item code tab: Fix lock icon always displayed.
- Thing code tab: Fix missing warning when leaving page but there are
unsaved changes.

--
Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
pull/1908/head
Florian Hotze 2023-05-22 20:48:35 +02:00 committed by GitHub
parent 63c122d5f5
commit a75cd04565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.ui/web/src/pages/settings/items/item-edit.vue
View File

@ -43,9 +43,10 @@
</f7-col>
</f7-block>
</f7-tab>
<f7-tab id="code" @tab:show="() => { this.currentTab = 'code'; toYaml() }" :tab-active="currentTab === 'code'">
<f7-icon v-if="ready && !isEditable" f7="lock" class="float-right margin" style="opacity:0.5; z-index: 4000; user-select: none;" size="50" color="gray" :tooltip="notEditableMgs" />
<editor v-if="currentTab === 'code'" class="rule-code-editor" mode="application/vnd.openhab.item+yaml" :value="itemYaml" @input="onEditorInput" :read-only="item.editable === false" />
<f7-icon v-if="item.editable === false" f7="lock" class="float-right margin" style="opacity:0.5; z-index: 4000; user-select: none;" size="50" color="gray" :tooltip="notEditableMgs" />
<editor class="item-code-editor" mode="application/vnd.openhab.item+yaml" :value="itemYaml" @input="onEditorInput" :read-only="item.editable === false" />
</f7-tab>
</f7-tabs>
@ -60,7 +61,7 @@
</template>
<style lang="stylus">
.rule-code-editor.vue-codemirror
.item-code-editor.vue-codemirror
display block
top calc(var(--f7-navbar-height) + var(--f7-tabbar-height))
height calc(100% - 2*var(--f7-navbar-height))

8
bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue
View File

@ -150,8 +150,8 @@
</f7-tab>
<f7-tab id="code" :tab-active="currentTab === 'code'">
<f7-icon v-if="thing && !thing.editable" f7="lock" class="float-right margin" style="opacity:0.5; z-index: 4000; user-select: none;" size="50" color="gray" :tooltip="notEditableMsg" />
<editor v-if="currentTab === 'code'" class="thing-code-editor" mode="application/vnd.openhab.thing+yaml" :value="thingYaml" :hint-context="{ thingType: thingType, channelTypes: channelTypes }" @input="(value) => thingYaml = value" :read-only="thing && !thing.editable" />
<f7-icon v-if="thing.editable === false" f7="lock" class="float-right margin" style="opacity:0.5; z-index: 4000; user-select: none;" size="50" color="gray" :tooltip="notEditableMsg" />
<editor class="thing-code-editor" mode="application/vnd.openhab.thing+yaml" :value="thingYaml" :hint-context="{ thingType: thingType, channelTypes: channelTypes }" @input="onEditorInput" :read-only="thing.editable === false" />
<!-- <pre class="yaml-message padding-horizontal" :class="[yamlError === 'OK' ? 'text-color-green' : 'text-color-red']">{{yamlError}}</pre> -->
</f7-tab>
</f7-tabs>
@ -350,6 +350,10 @@ export default {
window.removeEventListener('keydown', this.keyDown)
}
},
onEditorInput (value) {
this.thingYaml = value
this.dirty = true
},
switchTab (tab) {
if (this.currentTab === tab) return
if (this.currentTab === 'code') {