Merge pull request #139 from jemu75/dev-v4

v4.6.1
jemu75 · Dec 27, 2024 · 69c0fac · 69c0fac
2 parents 7df422f + 38e3254
commit 69c0fac
Show file tree

Hide file tree

Showing 13 changed files with 265 additions and 253 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md
@@ -1,4 +1,7 @@
-# v.4.6.0 (21.12.2024)
+# v4.6.1 (27.12.2024)
+## Slider
+- Bugfix for setting Height of vertical slider
+# v4.6.0 (21.12.2024)
 ## Panel
 - new panel element popout
 - bugfix position of vertical divider

diff --git a/src/components/PanelMainSlider.vue b/src/components/PanelMainSlider.vue
@@ -1,6 +1,7 @@
 <script setup>
     import { computed, ref } from 'vue'
     import { useFhemStore } from '@/stores/fhem'
+import { number } from 'echarts'
 
     const props = defineProps({
         el: Object,
@@ -11,12 +12,18 @@
 
     const fhem = useFhemStore()
 
-    const sliderHeight = ref(props.height + (/px/.test(props.height) ? '' : 'px'))
-
-    console.log(props.height)
+    const sliderHeight = ref(getSliderHeight(props.height))
 
     const sliderVal = ref()
 
+    function getSliderHeight(val) {
+        let res = val
+
+        res = (parseInt(val) - 40) + 'px'
+
+        return res
+    }
+
     function setSliderVal(val) {
         sliderVal.value = val
     }
@@ -73,8 +80,8 @@
     </v-slider>
 </template>
 
-<style>    
+<style>
     .v-slider.v-input--vertical > .v-input__control {
-        min-height: v-bind(sliderHeight)
+        min-height: v-bind(sliderHeight) !important;
     }
 </style>
diff --git a/www/fhemapp4/CHANGELOG.md b/www/fhemapp4/CHANGELOG.md
@@ -1,4 +1,6 @@
-# v.4.6.0 (21.12.2024)
+# v4.6.1 (27.12.2024)
+- Bugfix for setting Height of vertical slider
+# v4.6.0 (21.12.2024)
 ## Panel
 - new panel element popout
 - bugfix position of vertical divider

diff --git a/www/fhemapp4/assets/DevicesView-CzwCxc1m.js → www/fhemapp4/assets/DevicesView-CVBEpMUF.js b/www/fhemapp4/assets/DevicesView-CzwCxc1m.js → www/fhemapp4/assets/DevicesView-CVBEpMUF.js
diff --git a/...fhemapp4/assets/InternalsView-BwIacbs6.js → ...fhemapp4/assets/InternalsView-CVLUAm0x.js b/...fhemapp4/assets/InternalsView-BwIacbs6.js → ...fhemapp4/assets/InternalsView-CVLUAm0x.js
diff --git a/www/fhemapp4/assets/SettingsView-mA7BRuwd.js → www/fhemapp4/assets/SettingsView-DcMXBUYk.js b/www/fhemapp4/assets/SettingsView-mA7BRuwd.js → www/fhemapp4/assets/SettingsView-DcMXBUYk.js
diff --git a/www/fhemapp4/assets/index-6UYztuQP.css b/www/fhemapp4/assets/index-6UYztuQP.css
diff --git a/www/fhemapp4/assets/index-BxJ7WhdU.js b/www/fhemapp4/assets/index-BxJ7WhdU.js
diff --git a/www/fhemapp4/assets/index-EXc9iyGR.css b/www/fhemapp4/assets/index-EXc9iyGR.css
diff --git a/www/fhemapp4/assets/index-YieHNHpx.js b/www/fhemapp4/assets/index-YieHNHpx.js