iobroker.webui 1.17.3 → 1.18.1

package/README.md

@@ -129,6 +129,12 @@ runtime.html?screenName=screen2
 	Placeholder for next versions:
 	### __WORK IN PROGRESS__
 -->
+### 1.18.1 (2024-11-01)
+- fix screen settings
+
+### 1.18.0 (2024-11-01)
+- screens are now ex- & imported as xml
+
 ### 1.17.3 (2024-11-01)
 - fix compilation
 

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "webui",
-    "version": "1.17.3",
+    "version": "1.18.1",
     "titleLang": {
       "en": "webui",
       "de": "webui",
@@ -29,6 +29,32 @@
       "zh-cn": "使用万维网传送器的高锰用户接口"
     },
     "news": {
+      "1.18.1": {
+        "en": "fix screen settings",
+        "de": "einstellungen für den bildschirm",
+        "ru": "настройки экрана",
+        "pt": "corrigir configurações de tela",
+        "nl": "scherminstellingen herstellen",
+        "fr": "correction des paramètres de l'écran",
+        "it": "impostazioni della schermata di correzione",
+        "es": "ajuste de la pantalla",
+        "pl": "ustaw ustawienia ekranu",
+        "uk": "фіксувати налаштування екрану",
+        "zh-cn": "固定屏幕设置"
+      },
+      "1.18.0": {
+        "en": "screens are now ex- & imported as xml",
+        "de": "bildschirme werden jetzt ex- & importiert als xml",
+        "ru": "экраны теперь экс-и импортированы как xml",
+        "pt": "telas são agora ex- & importadas como xml",
+        "nl": "schermen worden nu ex- & geïmporteerd als xml",
+        "fr": "les écrans sont maintenant ex- & importés comme xml",
+        "it": "schermi sono ora ex- & importati come xml",
+        "es": "pantallas ahora son ex- \" importadas como xml",
+        "pl": "ekrany są teraz ex- & importowane jako xml",
+        "uk": "екрани тепер екс- та імпортовані як xml",
+        "zh-cn": "屏幕现在以 xml 导入( i)"
+      },
       "1.17.3": {
         "en": "fix compilation",
         "de": "fix compilation",
@@ -93,32 +119,6 @@
         "pl": "podnoszenie błędów w niewdrożonych poleceniach\nbłędne uaktualnienie skryptu",
         "uk": "підняти помилки на непристойних команд\nнеправильне оновлення сценарію",
         "zh-cn": "在未执行的命令上提出错误\n错误的脚本升级"
-      },
-      "1.16.2": {
-        "en": "wrong default in script",
-        "de": "falscher standard in skript",
-        "ru": "неправильный по умолчанию",
-        "pt": "padrão errado no script",
-        "nl": "verkeerde standaard in script",
-        "fr": "mauvais par défaut dans le script",
-        "it": "default sbagliato nello script",
-        "es": "default en script",
-        "pl": "błędne domyślne w skrypcie",
-        "uk": "неправильний типовий скрипт",
-        "zh-cn": "脚本默认错误"
-      },
-      "1.16.1": {
-        "en": "fix base custom webcomp bindings",
-        "de": "fix base benutzerdefinierte webcomp bindungen",
-        "ru": "исправление базовых пользовательских веб-композиций",
-        "pt": "corrigir ligações de webcomp de base personalizada",
-        "nl": "fix basis aangepaste webcomp bindingen",
-        "fr": "fixer les fixations webcomp personnalisées de base",
-        "it": "fissaggio di base personalizzati webcomp binding",
-        "es": "fijar bases de unión personalizadas webcomp",
-        "pl": "fix bazowe niestandardowe wiązania webcomp",
-        "uk": "фіксувати базові користувацькі прив'язки вебкомп'ютера",
-        "zh-cn": "固定自定义网络comp 绑定"
       }
     },
     "icon": "logo.png",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.webui",
-  "version": "1.17.3",
+  "version": "1.18.1",
   "description": "ioBroker webui",
   "type": "module",
   "main": "dist/backend/main.js",

package/www/dist/frontend/config/IobrokerWebuiControlPropertiesEditor.js

@@ -87,7 +87,10 @@ export class IobrokerWebuiControlPropertiesEditor extends BaseCustomWebComponent
         this._bindingsRefresh();
     }
     addEnumProp() {
-        this.properties.push({ name: '', type: 'enum', values: '["a", "b"]' });
+        let p = { name: '', type: 'enum', values: '["a", "b"]' };
+        if (this.defaultInternal)
+            p.internal = true;
+        this.properties.push(p);
         this._bindingsRefresh();
     }
     removeProp(index) {

package/www/dist/frontend/config/IobrokerWebuiSolutionExplorer.js

@@ -10,6 +10,7 @@ import wunderbaumStyle from 'wunderbaum/dist/wunderbaum.css' with { type: 'css'
 import { defaultNewStyle } from "./IobrokerWebuiScreenEditor.js";
 import { IobrokerWebuiIconsView } from "./IobrokerWebuiIconsView.js";
 import { IobrokerWebuiScreensView } from "./IobrokerWebuiScreensView.js";
+import { convertToXml, parseXml } from "../helper/XmlHelper.js";
 export class IobrokerWebuiSolutionExplorer extends BaseCustomWebComponentConstructorAppend {
     static template = html `
         <div id="treeDiv" class="" style="overflow: auto; width:100%; height: 100%;">
@@ -95,11 +96,21 @@ export class IobrokerWebuiSolutionExplorer extends BaseCustomWebComponentConstru
                     try {
                         let files = await openFileDialog('.' + type, true, 'text');
                         for (let f of files) {
-                            let data = JSON.parse(f.data);
+                            let data = null;
+                            if (f.data[0] === '<') {
+                                data = parseXml(f.data);
+                            }
+                            else {
+                                data = JSON.parse(f.data);
+                            }
                             let nm = f.name;
-                            if (nm.endsWith('.' + type))
+                            if (nm.endsWith('.' + type)) {
                                 nm = nm.substring(0, nm.length - type.length - 1);
-                            await iobrokerHandler.saveObject(type, (dir ?? '') + '/' + nm, data);
+                            }
+                            nm = prompt('Import as:', nm);
+                            if (nm) {
+                                await iobrokerHandler.saveObject(type, (dir ?? '') + '/' + nm, data);
+                            }
                         }
                     }
                     catch (err) {
@@ -175,15 +186,10 @@ export class IobrokerWebuiSolutionExplorer extends BaseCustomWebComponentConstru
             ContextMenu.show([{
                     title: 'Export ' + type, action: async () => {
                         let data = await iobrokerHandler.getWebuiObject(type, (dir ?? '') + '/' + name);
-                        await exportData(JSON.stringify(data), name + '.' + type);
-                    }
-                }, /*{
-                    title: 'Export Screen as XML', action: async () => {
-                        let data = await iobrokerHandler.getScreen(name);
-                        await exportData(screenToXml(data), name + '.screen')
+                        let xml = convertToXml(type, data);
+                        await exportData(xml, name + '.' + type);
                     }
-                },*/
-                {
+                }, {
                     title: 'Copy ' + type, action: async () => {
                         let newName = prompt("New Name", name);
                         if (newName && newName != name) {

package/www/dist/frontend/generated/Properties.json

@@ -49,7 +49,7 @@
                     "type": "string"
                 },
                 "properties": {
-                    "$ref": "#/definitions/propertiesRecord"
+                    "$ref": "#/definitions/Record<string,{type:string;values?:string[]|undefined;default?:any;internal?:boolean|undefined;}>"
                 },
                 "script": {
                     "type": "string"
@@ -184,6 +184,65 @@
             ],
             "type": "object"
         },
+        "IScreen": {
+            "properties": {
+                "html": {
+                    "type": "string"
+                },
+                "properties": {
+                    "$ref": "#/definitions/Record<string,{type:string;values?:string[]|undefined;default?:any;internal?:boolean|undefined;}>_1"
+                },
+                "script": {
+                    "type": "string"
+                },
+                "settings": {
+                    "$ref": "#/definitions/IScreenSettings"
+                },
+                "style": {
+                    "type": "string"
+                }
+            },
+            "propertyOrder": [
+                "html",
+                "style",
+                "script",
+                "properties",
+                "settings"
+            ],
+            "type": "object"
+        },
+        "IScreenSettings": {
+            "properties": {
+                "addoptedStyles": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "height": {
+                    "type": "string"
+                },
+                "stretch": {
+                    "enum": [
+                        "fill",
+                        "none",
+                        "uniform",
+                        "uniformToFill"
+                    ],
+                    "type": "string"
+                },
+                "width": {
+                    "type": "string"
+                }
+            },
+            "propertyOrder": [
+                "width",
+                "height",
+                "addoptedStyles",
+                "stretch"
+            ],
+            "type": "object"
+        },
         "IScriptMultiplexValue": {
             "properties": {
                 "name": {
@@ -239,7 +298,11 @@
             "propertyOrder": [],
             "type": "object"
         },
-        "propertiesRecord": {
+        "Record<string,{type:string;values?:string[]|undefined;default?:any;internal?:boolean|undefined;}>": {
+            "propertyOrder": [],
+            "type": "object"
+        },
+        "Record<string,{type:string;values?:string[]|undefined;default?:any;internal?:boolean|undefined;}>_1": {
             "propertyOrder": [],
             "type": "object"
         }

package/www/dist/frontend/helper/XmlHelper.js

@@ -5,20 +5,46 @@ export function parseXml(xml) {
     let doc = new DOMParser().parseFromString(xml, "text/xml");
     let obj = {};
     for (let childNode of doc.children[0].children) {
-        let tx = childNode.textContent;
-        if (tx[0] === '\n' && tx.endsWith('\n'))
-            tx = tx.substring(1, tx.length - 2);
-        else if (tx[0] === '\n')
-            tx = tx.substring(1);
-        else if (tx.endsWith('\n'))
-            tx = tx.substring(0, tx.length - 1);
-        obj[childNode.nodeName] = tx;
+        if (childNode.nodeName == 'properties') {
+            obj.properties = {};
+            for (let p of childNode.children) {
+                let prp = {
+                    type: p.getAttribute('type')
+                };
+                let def = p.getAttribute('default');
+                if (def)
+                    prp.default = def;
+                let values = p.getAttribute('values');
+                if (values)
+                    prp.values = values.split('|');
+                let internal = p.getAttribute('internal');
+                if (internal)
+                    prp.internal = internal;
+                obj.properties[p.getAttribute('name')] = prp;
+            }
+        }
+        else if (childNode.nodeName == 'settings') {
+            obj.settings = {};
+            for (let p of childNode.children) {
+                obj.settings[p.nodeName] = p.textContent;
+            }
+        }
+        else {
+            let tx = childNode.textContent;
+            if (tx[0] === '\n' && tx.endsWith('\n'))
+                tx = tx.substring(1, tx.length - 2);
+            else if (tx[0] === '\n')
+                tx = tx.substring(1);
+            else if (tx.endsWith('\n'))
+                tx = tx.substring(0, tx.length - 1);
+            obj[childNode.nodeName] = tx;
+        }
     }
     return obj;
 }
-export function screenToXml(screen) {
+export function convertToXml(type, screen) {
     let xml = '<?xml version="1.0" encoding="UTF-8"?>\n';
-    xml += "<screen>\n";
+    xml += type == 'screen' ? "<screen>\n" : "<control>\n";
     if (screen.html) {
         xml += "    <html><![CDATA[\n";
         xml += escapeCData(screen.html);
@@ -29,43 +55,34 @@ export function screenToXml(screen) {
         xml += escapeCData(screen.style);
         xml += "\n]]></style>\n";
     }
-    if (screen.settings && Object.getOwnPropertyNames(screen.settings).length) {
-        xml += "    <settings>\n";
-        for (let p in screen.settings) {
-            xml += "        <" + p + ">" + screen.settings[p] + "</" + p + ">\n";
-        }
-        xml += "</settings>\n";
-    }
-    xml += "</screen>\n";
-    return xml;
-}
-export function controlToXml(control) {
-    let xml = '<?xml version="1.0" encoding="UTF-8"?>\n';
-    xml += "<control>\n";
-    if (control.html) {
-        xml += "    <html><![CDATA[\n";
-        xml += escapeCData(control.html);
-        xml += "\n]]></html>\n";
-    }
-    if (control.style) {
-        xml += "    <style><![CDATA[\n";
-        xml += escapeCData(control.style);
-        xml += "\n]]></style>\n";
+    if (screen.script) {
+        xml += "    <script><![CDATA[\n";
+        xml += escapeCData(screen.script);
+        xml += "\n]]></script>\n";
     }
-    if (control.properties && Object.getOwnPropertyNames(control.properties).length) {
+    if (screen.properties && Object.getOwnPropertyNames(screen.properties).length) {
         xml += "    <properties>\n";
-        for (let p in control.properties) {
-            xml += `        <property name="${p}" default="${control.properties[p].default}" values="${control.properties[p].values.join('|')}">\n`;
+        for (let p in screen.properties) {
+            xml += `        <property name="${p}"`;
+            if (screen.properties[p].type)
+                xml += ` type="${screen.properties[p].type}"`;
+            if (screen.properties[p].default)
+                xml += ` default="${screen.properties[p].default}"`;
+            if (screen.properties[p].values)
+                xml += ` values="${screen.properties[p].values.join('|')}"`;
+            if (screen.properties[p].internal)
+                xml += ` internal="${screen.properties[p].internal}"`;
+            xml += " />\n";
         }
-        xml += "\n</properties>\n";
+        xml += "    </properties>\n";
     }
-    if (control.settings && Object.getOwnPropertyNames(control.settings).length) {
+    if (screen.settings) {
         xml += "    <settings>\n";
-        for (let p in control.settings) {
-            xml += "        <" + p + ">" + control.settings[p] + "</" + p + ">\n";
+        for (let p in screen.settings) {
+            xml += "        <" + p + ">" + screen.settings[p] + "</" + p + ">\n";
         }
-        xml += "</settings>\n";
+        xml += "    </settings>\n";
     }
-    xml += "</control>\n";
+    xml += type == 'screen' ? "</screen>\n" : "</control>\n";
     return xml;
 }

package/www/index.html

@@ -213,7 +213,7 @@
     </button>
     <button data-command="save" title="save" disabled><img src="./node_modules/@node-projects/web-component-designer/assets/icons/save.svg"></button>
     <div style="margin-left: 30px;">
-      webui - 1.17.3 - cbb2ba5
+      webui - 1.18.1 - 56feb62
     </div>
     <button style="margin-left: 30px;" data-command="paste" title="paste" disabled><img
         src="./node_modules/@node-projects/web-component-designer/assets/icons/paste.svg"></button>