From ae4e95d38bcf08278f4f52da6affea37a8977bbe Mon Sep 17 00:00:00 2001 From: jemu75 Date: Wed, 13 Mar 2024 21:13:17 +0100 Subject: [PATCH] v4.0.26-beta --- README.md | 1 - public/CHANGELOG.md | 6 ++++ src/components/OptionsMenu.vue | 12 +++---- src/components/PanelCard.vue | 32 ++++++++++--------- src/components/PanelMainBtn.vue | 6 ++-- src/components/SettingsPropsItem.vue | 2 +- src/stores/fhem.js | 19 ++++++++--- www/fhemapp4/CHANGELOG.md | 6 ++++ ...ew-f37b84af.js => DevicesView-7f506158.js} | 2 +- ...-d1915780.js => InternalsView-37d37c05.js} | 2 +- www/fhemapp4/assets/PanelCard-5966756d.js | 17 ---------- www/fhemapp4/assets/PanelCard-b66c089f.js | 17 ++++++++++ ...w-82eef78a.js => SettingsView-82e7e5a7.js} | 4 +-- .../{index-4e6c6f11.js => index-01b6e927.js} | 2 +- .../{index-46e75485.js => index-a0ee2194.js} | 24 +++++++------- www/fhemapp4/index.html | 2 +- 16 files changed, 87 insertions(+), 67 deletions(-) rename www/fhemapp4/assets/{DevicesView-f37b84af.js => DevicesView-7f506158.js} (86%) rename www/fhemapp4/assets/{InternalsView-d1915780.js => InternalsView-37d37c05.js} (90%) delete mode 100644 www/fhemapp4/assets/PanelCard-5966756d.js create mode 100644 www/fhemapp4/assets/PanelCard-b66c089f.js rename www/fhemapp4/assets/{SettingsView-82eef78a.js => SettingsView-82e7e5a7.js} (78%) rename www/fhemapp4/assets/{index-4e6c6f11.js => index-01b6e927.js} (99%) rename www/fhemapp4/assets/{index-46e75485.js => index-a0ee2194.js} (77%) diff --git a/README.md b/README.md index 963d84cc..65577040 100644 --- a/README.md +++ b/README.md @@ -330,7 +330,6 @@ Es stehen folgende Typen zur Verfügung |none|Spalte wird nicht angezeigt| |button|Es kann ein Button zur Steuerung von Aktoren konfiguriert werden| |info|Es können bis zu 3 Textelemente und ein Icon zur Anzeige von Statuswerten konfiguriert werden| -|status|Es kann eine runde Statusbar zur Anzeige von Statuswerten konfiguriert werden| |slider|Es kann ein Slider zu Steuerung von Aktoren konfiguriert werden| |image|Es kann ein Bild über eine URL angezeigt werden| |menu|Es kann ein DropDown-Menü zur Steuerung verschiedener Aktoren bzw. Aktorwerte konfiguriert werden| diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index bf3a332f..10897af5 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -1,3 +1,9 @@ +# v4.0.26-beta (13.03.2024) +## Core +- bugfix for spaces at readings +- local Loop to update reading directly without response from FHEM +## Panel +- optimization for section info # v4.0.25-beta (11.03.2024) ## Settings - add option for header in mobile view diff --git a/src/components/OptionsMenu.vue b/src/components/OptionsMenu.vue index d95fb5d3..e7613cfe 100644 --- a/src/components/OptionsMenu.vue +++ b/src/components/OptionsMenu.vue @@ -13,18 +13,18 @@ const options = computed(() => { let res = [], - options = fhem.app.header, + opts = fhem.app.header, presets = { darkMode: { name: 'darkMode', title: "%t(_app.options.darkMode)" ,icon: 'mdi-theme-light-dark' }, reloadPage: { name: 'reloadPage', title: "%t(_app.options.reload)", icon: 'mdi-reload' }, settings: { name:'settings', title: "%t(_app.options.settings)", icon: 'mdi-cogs' } } - if(options.showDarkMode) res.push(presets.darkMode) - if(options.showReloadPage) res.push(presets.reloadPage) - if(options.showSettings) res.push(presets.settings) + if(opts.showDarkMode) res.push(presets.darkMode) + if(opts.showReloadPage) res.push(presets.reloadPage) + if(opts.showSettings) res.push(presets.settings) - res.push(...options.commands) + res.push(...opts.commands) return res }) @@ -54,7 +54,7 @@ - + getInfo('left1')) @@ -149,19 +151,19 @@ - {{ infoLeft1.text }} - - {{ infoLeft2.text }} + {{ infoLeft1.text }} + + {{ infoLeft2.text }} - {{ infoMid1.text }} - - {{ infoMid2.text }} + {{ infoMid1.text }} + + {{ infoMid2.text }} - {{ infoRight1.text }} - - {{ infoRight2.text }} + {{ infoRight1.text }} + + {{ infoRight2.text }} diff --git a/src/components/PanelMainBtn.vue b/src/components/PanelMainBtn.vue index ec541472..e35cb127 100644 --- a/src/components/PanelMainBtn.vue +++ b/src/components/PanelMainBtn.vue @@ -55,14 +55,14 @@ longClick = fhem.handleDefs(props.el.longClick, ['cmd', 'type'], ['', 'cmd']), longRelease = fhem.handleDefs(props.el.longRelease, ['cmd', 'type'], ['', 'cmd']) - if(evt === 'touchStart' || evt === 'mouseStart') { + if(evt === 'mouseStart') { btnState.timer = setTimeout(() => { btnState.long = true if(longClick.cmd) doCmd(longClick) }, 1000) } - if(evt === 'touchEnd' || evt === 'mouseEnd') { + if(evt === 'mouseEnd') { if(btnState.long) { if(longRelease.cmd) doCmd(longRelease) } else { @@ -88,8 +88,6 @@ :variant="btn.variant" :disabled="btn.disabled" :color="btn.color" - @touchstart="btnClick('touchStart')" - @touchend="btnClick('touchEnd')" @mousedown="btnClick('mouseStart')" @mouseup="btnClick('mouseEnd')" class="my-2"> diff --git a/src/components/SettingsPropsItem.vue b/src/components/SettingsPropsItem.vue index 4bbd61f3..97997a43 100644 --- a/src/components/SettingsPropsItem.vue +++ b/src/components/SettingsPropsItem.vue @@ -73,7 +73,7 @@ item-key="id">