allow to use widget oid in bindings

- closes #345
ioBroker · Mar 1, 2024 · f9c1e61 · f9c1e61
1 parent 3bef8c1
commit f9c1e61
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -263,6 +263,9 @@ E.g., if it was used in a menu and the menu is red, the circle would be red.
     ### **WORK IN PROGRESS**
 -->
 ## Changelog
+### **WORK IN PROGRESS**
+* (foxriver76) allow to use `widgetOid` in bindings
+
 ### 2.9.37 (2024-02-28)
 * (foxriver76) TimePicker widget now saves the time instead of date by default, if you want old behavior use checkbox `asDate`
 

diff --git a/src/src/Attributes/Widget/WidgetBindingField.jsx b/src/src/Attributes/Widget/WidgetBindingField.jsx
@@ -134,9 +134,24 @@ class WidgetBindingField extends Component {
         if (!oids) {
             return value;
         }
+
         // read all states
         const stateOids = [];
         oids.forEach(oid => {
+            if (oid.visOid.startsWith('widgetOid.')) {
+                const newOid = this.props.widget.data.oid;
+                oid.visOid = oid.visOid.replace(/^widgetOid\./g, `${newOid}.`);
+                oid.systemOid = newOid;
+                oid.token = oid.token.replace(/:widgetOid;/g, `:${newOid};`);
+                oid.format = oid.format.replace(/:widgetOid;/g, `:${newOid};`);
+                for (const operation of oid.operations) {
+                    for (const arg of operation.arg) {
+                        arg.visOid = arg.visOid.replace(/^widgetOid\./g, `${newOid}.`);
+                        arg.systemOid = newOid;
+                    }
+                }
+            }
+
             const parts = oid.visOid.split('.');
             if (parts[parts.length - 1] === 'val' || parts[parts.length - 1] === 'ts' || parts[parts.length - 1] === 'lc' || parts[parts.length - 1] === 'ack') {
                 parts.pop();

diff --git a/src/src/Vis/visFormatUtils.jsx b/src/src/Vis/visFormatUtils.jsx
@@ -317,8 +317,9 @@ class VisFormatUtils {
                                     continue;
                                 }
                                 value = this.getSpecialValues(operation.arg[a].visOid, view, wid, widgetData);
+
                                 if (value === undefined || value === null) {
-                                    value = values[operation.arg[a].visOid];
+                                    value = operation.arg[a].visOid.startsWith('widgetOid.') ? values[operation.arg[a].visOid.replace(/^widgetOid\./g, `${widget.data.oid}.`)] : values[operation.arg[a].visOid];
                                 }
                                 if (value === null) {
                                     string += `const ${operation.arg[a].name} = null;`;