iobroker.mywebui 1.37.37 → 1.37.39

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "mywebui",
-    "version": "1.37.37",
+    "version": "1.37.39",
     "titleLang": {
       "en": "mywebui",
       "de": "mywebui",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.mywebui",
-  "version": "1.37.37",
+  "version": "1.37.39",
   "description": "ioBroker mywebui - Custom edited mywebui by gokturk413",
   "type": "module",
   "main": "dist/backend/main.js",

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

@@ -404,9 +404,31 @@ export class IobrokerWebuiAppShell extends BaseCustomWebComponentConstructorAppe
         const designItem = selectedItems[0];
         const element = designItem.element;
 
-        // Read existing signal from data-visibility-signal (NOT bind-prop:hidden)
-        const existingSignal = element.getAttribute('data-visibility-signal') || null;
-        const existingBinding = existingSignal ? { signal: existingSignal, target: 'property' } : null;
+        // Read existing signal from data-visibility-signal (may be plain signal string or JSON with signal+expression+historic+converter)
+        const existingSignalAttr = element.getAttribute('data-visibility-signal') || null;
+        let existingSignal = existingSignalAttr;
+        let existingBinding = null;
+        if (existingSignalAttr) {
+            if (existingSignalAttr.startsWith('{')) {
+                try {
+                    const parsed = JSON.parse(existingSignalAttr);
+                    existingSignal = parsed.signal || existingSignalAttr;
+                    // BindingsEditor expects bindableObjectNames array, not signal string
+                    existingBinding = {
+                        bindableObjectNames: parsed.signal ? [parsed.signal] : [],
+                        expression: parsed.expression || '',
+                        historic: parsed.historic || null,
+                        converter: parsed.converter || null,
+                        invert: parsed.invert || false,
+                        target: 'property'
+                    };
+                } catch (e) {
+                    existingBinding = { bindableObjectNames: [existingSignalAttr], target: 'property' };
+                }
+            } else {
+                existingBinding = { bindableObjectNames: [existingSignalAttr], target: 'property' };
+            }
+        }
 
         // Read group access control config from data attributes
         const dataConfig = {
@@ -436,11 +458,23 @@ export class IobrokerWebuiAppShell extends BaseCustomWebComponentConstructorAppe
                 dlg.close();
                 const signal = dynEdt.objectNames;
                 if (signal) {
-                    designItem.setAttribute('data-visibility-signal', signal);
+                    const bnd = { signal };
+                    if (dynEdt.expression) bnd.expression = dynEdt.expression;
+                    if (dynEdt.historic) bnd.historic = dynEdt.historic;
+                    if (dynEdt.invert) bnd.invert = true;
+                    // converters: array of {key,value} objects → plain object, or named converter string
+                    if (dynEdt.converters && dynEdt.converters.length > 0) {
+                        bnd.converter = {};
+                        for (const c of dynEdt.converters) bnd.converter[c.key] = c.value;
+                    } else if (dynEdt.convertersString) {
+                        bnd.converter = dynEdt.convertersString;
+                    }
+                    const needsJson = bnd.expression || bnd.historic || bnd.converter || bnd.invert;
+                    designItem.setAttribute('data-visibility-signal', needsJson ? JSON.stringify(bnd) : signal);
                 } else {
                     designItem.removeAttribute('data-visibility-signal');
                 }
-                designItem.removeAttribute('bind-prop:hidden'); // clean up old approach
+                designItem.removeAttribute('bind-prop:hidden');
                 this._updateVisibilityPanel();
             });
         };
@@ -449,13 +483,11 @@ export class IobrokerWebuiAppShell extends BaseCustomWebComponentConstructorAppe
         const bindRow = document.createElement('div');
         bindRow.style.cssText = 'display:flex;align-items:center;gap:6px;padding:4px 0;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #ddd;';
 
-        // □ button on the LEFT (like Properties panel style)
-        const bindBtn = document.createElement('button');
-        bindBtn.textContent = '□';
-        bindBtn.title = 'Right-click for binding options';
-        bindBtn.style.cssText = existingSignal
-            ? 'width:16px;height:16px;padding:0;font-size:11px;line-height:1;border:1px solid #888;background:#ffd700;cursor:pointer;flex-shrink:0;'
-            : 'width:16px;height:16px;padding:0;font-size:11px;line-height:1;border:1px solid #888;background:#f0f0f0;cursor:pointer;flex-shrink:0;';
+        // Bind indicator — styled exactly like PropertyGridPropertyList's isSetElement
+        const bindBtn = document.createElement('div');
+        bindBtn.title = existingSignal ? 'Visibility: ' + existingSignal + ' (click / right-click)' : 'Click to bind visibility signal';
+        bindBtn.style.cssText = 'width:11px;height:11px;border:1px solid #596c7a;cursor:pointer;flex-shrink:0;box-sizing:border-box;'
+            + (existingSignal ? 'background:orange;' : 'background:transparent;');
 
         bindBtn.onclick = openVisibilityBindingEditor;
 

package/www/dist/frontend/runtime/VisibilityService.js

@@ -44,11 +44,36 @@ class VisibilityService {
 
             // Step 2: Signal/state check (if objectId configured)
             if (visibilityConfig.objectId) {
+                // objectId may be a plain signal string or JSON like {"signal":"...","expression":"...","converter":{...},"historic":{...}}
+                let signalId = visibilityConfig.objectId;
+                let expression = null;
+                let converter = null;
+                if (typeof signalId === 'string' && signalId.startsWith('{')) {
+                    try {
+                        const parsed = JSON.parse(signalId);
+                        signalId = parsed.signal || signalId;
+                        expression = parsed.expression || null;
+                        converter = parsed.converter || null;
+                    } catch (e) { /* keep raw */ }
+                }
+
                 let stateVal = currentStateVal;
                 if (stateVal === undefined) {
-                    const state = await iobrokerHandler.connection.getState(visibilityConfig.objectId);
+                    const state = await iobrokerHandler.connection.getState(signalId);
                     stateVal = state?.val;
                 }
+
+                // Evaluate expression if present
+                if (expression) {
+                    try { stateVal = new Function('__0', expression)(stateVal); } catch (e) { console.warn('[Visibility] Expression error:', e); }
+                }
+
+                // Apply converter if present (object map like {"true":"1","false":"0"} or inverse)
+                if (converter && typeof converter === 'object') {
+                    const key = String(stateVal);
+                    if (key in converter) stateVal = converter[key];
+                }
+
                 // Truthy state value → apply action
                 const isActive = stateVal !== null && stateVal !== undefined && stateVal !== false && stateVal !== 0 && stateVal !== '';
                 this.#applyResult(element, isActive
@@ -75,7 +100,11 @@ class VisibilityService {
         await this.#checkAndApply(element, visibilityConfig, undefined);
 
         if (visibilityConfig.objectId) {
-            await iobrokerHandler.subscribeState(visibilityConfig.objectId, (_id, state) => {
+            let signalId = visibilityConfig.objectId;
+            if (typeof signalId === 'string' && signalId.startsWith('{')) {
+                try { signalId = JSON.parse(signalId).signal || signalId; } catch (e) { /* keep raw */ }
+            }
+            await iobrokerHandler.subscribeState(signalId, (_id, state) => {
                 this.#checkAndApply(element, visibilityConfig, state?.val);
             });
         }