* (bluefox) Added new option for view: "Limit only for instances"

ioBroker · Nov 22, 2024 · 8cc6ec5 · 8cc6ec5
1 parent 2fa0609
commit 8cc6ec5
Show file tree

Hide file tree

Showing 15 changed files with 8,336 additions and 8,288 deletions.
diff --git a/README.md b/README.md
@@ -294,6 +294,9 @@ npm run start
     ### **WORK IN PROGRESS**
 -->
 ## Changelog
+### **WORK IN PROGRESS**
+* (bluefox) Added new option for view: "Limit only for instances"
+
 ### 2.10.7 (2024-07-23)
 * (bluefox) Optimization of the module federation
 

diff --git a/packages/iobroker.vis-2/src/src/Attributes/View/Items.tsx b/packages/iobroker.vis-2/src/src/Attributes/View/Items.tsx
@@ -402,6 +402,14 @@ export function getFields(
                 hidden: 'data.sizex === undefined && data.sizey === undefined',
                 notStyle: true,
             },
+            {
+                type: 'text',
+                label: 'Limit only for instances',
+                attr: 'limitForInstances',
+                hidden: '!data.limitScreen',
+                title: 'Enter the browser instances divided by comma',
+                notStyle: true,
+            },
             {
                 type: 'checkbox',
                 label: 'Only for desktop',

diff --git a/packages/iobroker.vis-2/src/src/Vis/visView.tsx b/packages/iobroker.vis-2/src/src/Vis/visView.tsx
@@ -1887,32 +1887,46 @@ class VisView extends React.Component<VisViewProps, VisViewState> {
 
         let limitScreenStyle: React.CSSProperties | null = null;
         // limit screen size of desired
-        if (settings && settings.limitScreen && ((window.screen.width >= 800 && window.screen.height >= 800) || !settings.limitScreenDesktop)) {
-            const ww = isVarFinite(settings.sizex) ? parseFloat(settings.sizex as unknown as string) : 0;
-            const hh = isVarFinite(settings.sizey) ? parseFloat(settings.sizey as unknown as string) : 0;
-            if (ww && hh) {
-                const borderWidth = parseFloat(settings.limitScreenBorderWidth as unknown as string) || 0;
-                const borderColor = settings.limitScreenBorderColor || '#333';
-                const borderStyle = settings.limitScreenBorderStyle || 'dotted';
-                const bgColor = settings.limitScreenBackgroundColor || null;
-
-                limitScreenStyle = {
-                    ...backgroundStyle,
-                    width: ww + borderWidth * 2,
-                    height: hh + borderWidth * 2,
-                    minWidth: ww + borderWidth * 2,
-                    minHeight: hh + borderWidth * 2,
-                    overflow: 'auto',
-                    position: 'relative',
-                    boxSizing: 'border-box',
-                    borderWidth,
-                    borderColor,
-                    borderStyle,
-                };
-                style.display = 'flex';
-                style.justifyContent = 'center';
-                style.alignItems = 'center';
-                style.backgroundColor = bgColor as Property.BackgroundColor;
+        if (settings?.limitScreen && ((window.screen.width >= 800 && window.screen.height >= 800) || !settings.limitScreenDesktop)) {
+            let ignore = false;
+            if (settings.limitForInstances) {
+                const visInstance = window.localStorage.getItem('visInstance');
+                if (visInstance) {
+                    const instances = settings.limitForInstances.split(',').map(i => i.trim()).filter(i => i);
+                    if (instances.length && !instances.includes(visInstance)) {
+                        ignore = true;
+                    }
+                } else {
+                    ignore = true;
+                }
+            }
+            if (!ignore) {
+                const ww = isVarFinite(settings.sizex) ? parseFloat(settings.sizex as unknown as string) : 0;
+                const hh = isVarFinite(settings.sizey) ? parseFloat(settings.sizey as unknown as string) : 0;
+                if (ww && hh) {
+                    const borderWidth = parseFloat(settings.limitScreenBorderWidth as unknown as string) || 0;
+                    const borderColor = settings.limitScreenBorderColor || '#333';
+                    const borderStyle = settings.limitScreenBorderStyle || 'dotted';
+                    const bgColor = settings.limitScreenBackgroundColor || null;
+
+                    limitScreenStyle = {
+                        ...backgroundStyle,
+                        width: ww + borderWidth * 2,
+                        height: hh + borderWidth * 2,
+                        minWidth: ww + borderWidth * 2,
+                        minHeight: hh + borderWidth * 2,
+                        overflow: 'auto',
+                        position: 'relative',
+                        boxSizing: 'border-box',
+                        borderWidth,
+                        borderColor,
+                        borderStyle,
+                    };
+                    style.display = 'flex';
+                    style.justifyContent = 'center';
+                    style.alignItems = 'center';
+                    style.backgroundColor = bgColor as Property.BackgroundColor;
+                }
             }
         }