From 160ba61fe8abed17115e63582e5f7ba408f00fa5 Mon Sep 17 00:00:00 2001 From: jemu75 Date: Sun, 14 Jan 2024 17:48:22 +0100 Subject: [PATCH] v4.0.11-beta --- public/CHANGELOG.md | 50 +++--- src/components/PanelCard.vue | 49 ++---- src/components/PanelMain.vue | 2 +- src/components/PanelMainBtn.vue | 3 +- src/components/PanelMainChart copy 3.vue | 152 ++++++++++++++++ src/components/PanelMainChart.vue | 163 +++++++++--------- src/components/PanelMainImage.vue | 3 +- src/components/PanelMainInfo.vue | 3 +- src/components/PanelMainMenu.vue | 3 +- src/components/PanelMainSlider.vue | 3 +- src/components/SettingsPropsMain.vue | 6 +- src/main.js | 2 +- www/fhemapp4/CHANGELOG.md | 50 +++--- ...ew-c16f9d33.js => DevicesView-e8d4cad0.js} | 2 +- ...-9d7cdb32.js => InternalsView-769efc5a.js} | 2 +- www/fhemapp4/assets/PanelCard-4c61ac8d.js | 17 ++ www/fhemapp4/assets/PanelCard-59ed8bde.js | 17 -- www/fhemapp4/assets/PanelCard-99790807.css | 1 - ...w-a9de91b7.js => SettingsView-ed0cef7c.js} | 4 +- .../{index-aeae9a78.js => index-348d70a1.js} | 4 +- ...{styles-ea84c8f5.js => styles-9eaf22d8.js} | 6 +- www/fhemapp4/index.html | 2 +- 22 files changed, 350 insertions(+), 194 deletions(-) create mode 100644 src/components/PanelMainChart copy 3.vue rename www/fhemapp4/assets/{DevicesView-c16f9d33.js => DevicesView-e8d4cad0.js} (86%) rename www/fhemapp4/assets/{InternalsView-9d7cdb32.js => InternalsView-769efc5a.js} (98%) create mode 100644 www/fhemapp4/assets/PanelCard-4c61ac8d.js delete mode 100644 www/fhemapp4/assets/PanelCard-59ed8bde.js delete mode 100644 www/fhemapp4/assets/PanelCard-99790807.css rename www/fhemapp4/assets/{SettingsView-a9de91b7.js => SettingsView-ed0cef7c.js} (69%) rename www/fhemapp4/assets/{index-aeae9a78.js => index-348d70a1.js} (99%) rename www/fhemapp4/assets/{styles-ea84c8f5.js => styles-9eaf22d8.js} (87%) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 5ab37887..84429387 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -1,35 +1,43 @@ +# v4.0.11-beta (13.01.2024) +## Panel +- Bugfix switching Levels # v4.0.10-beta (06.01.2024) ## Component Chart - +- Initial Development # v4.0.9-beta (02.01.2024) -## Component Slider - vertical - +## Component Slider +- option Vertical # v4.0.8-beta (01.01.2024) -## coreFunction - distributed Templates - +## coreFunction +- distributed Templates # v4.0.7-beta (31.12.2023) -## Panel - bugfixing - +## Panel +- bugfixing # v4.0.6-beta (29.12.2023) -## Panel - adding Property maximizable - +## Panel +- adding Property maximizable # v4.0.5-beta (29.12.2023) -## Component Slider - bugfixing -## Component Image - adding Property height - +## Component Slider +- bugfixing +## Component Image +- adding Property height # v4.0.4-beta (28.12.2023) -## coreFunction - bugfixing - +## coreFunction +- bugfixing # v4.0.3-beta (27.12.2023) -## coreFunction - bugfixing - +## coreFunction +- bugfixing # v4.0.2-beta (26.12.2023) -## sort Option for Navigation Settings -## 1st reconnect without warning -## Template Setting show JSON-Data - +## Navigation Setting +- sort Option +## core +-1st reconnect without warning +## Template Setting +- show JSON-Data # v4.0.1-beta (18.12.2023) ## initial development - +- fhem Core +- UI # v4.0.0-beta (17.12.2023) ## initial development +- fhem Core \ No newline at end of file diff --git a/src/components/PanelCard.vue b/src/components/PanelCard.vue index 216a9860..a5fe76a1 100644 --- a/src/components/PanelCard.vue +++ b/src/components/PanelCard.vue @@ -56,46 +56,23 @@ return res }) - const levelClick = ref(false) + function levelSwitch(init) { + let idx = -1 - function clickReset() { - levelClick.value = false - } + if(expand.value.expandable || (!expand.value.expandable && expand.value.expanded)) { + if(!init) { + if(expand.value.maximizable) fhem.app.panelMaximized = expanded.value ? false : item.panel + expanded.value = !expanded.value + } - function levelSwitch() { - if(expand.value.expandable) { - if(expand.value.maximizable) { - if(!expanded.value) { - fhem.app.panelMaximized = item.panel - } else { - fhem.app.panelMaximized = false - } - } - - expanded.value = !expanded.value + levels.value = expanded.value ? levelsActive.value : [levelsActive.value[0]] } else { - levelClick.value = true + idx = levelsActive.value.indexOf(levels.value ? levels.value[0] : null) + levels.value = (idx === -1 || idx === levelsActive.value.length - 1) ? [levelsActive.value[0]] : [levelsActive.value[idx + 1]] } } - const levels = computed(() => { - let res = [], - idx = -1 - - if(expand.value.expandable || (!expand.value.expandable && expand.value.expanded)) { - res = expanded.value ? levelsActive.value : [levelsActive.value[0]] - } else { - if(levelClick.value) { - idx = levelsActive.value.indexOf(levels.value ? levels.value[0] : null) - res = (idx === -1 || idx === levelsActive.value.length - 1) ? [levelsActive.value[0]] : [levelsActive.value[idx + 1]] - clickReset() - } else { - res = [levelsActive.value[0]] - } - } - - return res - }) + const levels = ref([]) function getInfo(pos) { let res = fhem.handleDefs(item.panel.info[pos], ['text', 'icon', 'color'],['', '', '']) @@ -119,6 +96,8 @@ const infoMid2 = computed(() => getInfo('mid2')) const infoRight1 = computed(() => getInfo('right1')) const infoRight2 = computed(() => getInfo('right2')) + + levelSwitch(true)