v4.0.40-beta

public/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v4.0.40-beta (25.04.2024)
+## Core
+- loading of standard templates optimised
+## Panel
+- bug fix in case of maximize panels
 # v4.0.39-beta (24.04.2024)
 ## Panel Status
 - truncate long titles

src/components/PanelCard.vue

@@ -63,12 +63,14 @@
 
         if(init) {
             opts.activeLevels = levelsActive(item.panel.main)
+            if(/=maximized$/.test(fhem.app.currentView)) opts.expanded = true
         } else {
             if(opts.expandable) opts.expanded = !opts.expanded
             if(opts.maximizable) {
                 if(opts.expanded) {
                     router.push({ name: 'devices', params: { view: 'panel=' + item.panel.name + '=maximized' }, query: router.currentRoute.value.query })
                 } else {
+                    fhem.app.currentView = fhem.app.currentView.replace(/=maximized$/, '')
                     router.back()
                 }   
             }

src/components/SettingsPropsList.vue

@@ -118,7 +118,8 @@
                         :disabled="templates.length === 0"
                         density="compact"
                         variant="outlined"
-                        class="pt-3">
+                        class="pt-3"
+                        @update:model-value="fhem.loadTemplates()">
                     </v-autocomplete>
 
                     <SettingsPropsDevices v-if="def.type === 'devices'"

src/stores/fhem.js

@@ -49,7 +49,21 @@ export const useFhemStore = defineStore('fhem', () => {
         panelList: [],
         navigation: [],
         threads: [],
-        distTemplates: [],
+        distTemplates: [
+            'blind', 
+            'chart',
+            'contact', 
+            'dimmer', 
+            'light', 
+            'lightscene',
+            'motiondetector', 
+            'proplanta', 
+            'smokedetector', 
+            'sonosplayer', 
+            'switch', 
+            'temperatur', 
+            'thermostat'
+        ],
         noConfig: null,
         configLoaded: false,        
         isReady: false,
@@ -392,23 +406,28 @@ export const useFhemStore = defineStore('fhem', () => {
         return true
     }
 
-    //coreFunction load default all Templates
-    async function loadDefaultTemplates() {
-        let distTemplate
+    //coreFunction load default Templates if needed
+    async function loadTemplates() {
+        let templateList = [],
+            distTemplate,
+            threadId = thread()
 
-        app.distTemplates = await getJsonFile('./templates/templates.json')
-        app.distTemplates.sort((a, b) => (a > b) ? 1 : (b > a) ? -1 : 0)
-
-        for(const template of app.distTemplates) {
-            if(app.config.templates.map((e) => e.name).indexOf(template) === -1) {
-                distTemplate = await getJsonFile('./templates/' + template + '.json')
-                if(distTemplate) {
-                    distTemplate.dist = true
-                    app.config.templates.push(distTemplate)
-                }
+        for(const panel of app.config.panels) {
+            if(panel.template && app.config.templates.map((e) => e.name).indexOf(panel.template) === -1) {
+                if(app.distTemplates.indexOf(panel.template) !== -1 && templateList.indexOf(panel.template) === -1) templateList.push(panel.template)
             }
         }
 
+        for(const template of templateList) {
+            distTemplate = await getJsonFile('./templates/' + template + '.json')
+            if(distTemplate) {
+                distTemplate.dist = true
+                app.config.templates.push(distTemplate)
+            }
+        }
+
+        thread(threadId)
+
         return true
     }
 
@@ -974,7 +993,7 @@ export const useFhemStore = defineStore('fhem', () => {
         if(res && connect) res = await getToken()
         if(res && connect) res = openEventWatcher()
         if(res) res = await loadConfig()
-        if(res) res = await loadDefaultTemplates()
+        if(res) res = await loadTemplates()
         if(res) res = createPanelList()
         if(res) res = await initialLoad()
         if(res) res = createNavigation()
@@ -1015,5 +1034,5 @@ export const useFhemStore = defineStore('fhem', () => {
     //FHEMApp entryPoint
     router.isReady().then(init())
 
-    return { app, getEl, handleDefs, getIcon, replacer, createSession, request, thread, stringToJson, log, help, changeDarkMode, appUpdate }
+    return { app, getEl, handleDefs, getIcon, replacer, createSession, request, thread, stringToJson, log, help, changeDarkMode, appUpdate, loadTemplates }
 })

www/fhemapp4/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v4.0.40-beta (25.04.2024)
+## Core
+- loading of standard templates optimised
+## Panel
+- bug fix in case of maximize panels
 # v4.0.39-beta (24.04.2024)
 ## Panel Status
 - truncate long titles