Răsfoiți Sursa

fix(l2): group switches by workshop+building letter (regex capture, case-insensitive contains) so 165 nodes form ~27 readable frames instead of 95 scattered ones

COBCO IT 3 zile în urmă
părinte
comite
c15575f582

+ 1 - 1
web-modules/WecomCenter/assets/l2topology/app.js

@@ -84,7 +84,7 @@
         var m = re.exec(name);
         if (m) return {label: expandLabel(r.label, m) || (CFG.other_label || 'Other'), big: !!r.big};
       } else {
-        if (name.indexOf(r.pattern) >= 0) return {label: r.label || (CFG.other_label || 'Other'), big: !!r.big};
+        if (name.toLowerCase().indexOf(String(r.pattern).toLowerCase()) >= 0) return {label: r.label || (CFG.other_label || 'Other'), big: !!r.big};
       }
     }
     return {label: CFG.other_label || 'Other', big: false};

+ 2 - 2
web-modules/WecomCenter/assets/l2topology/config.json

@@ -19,8 +19,8 @@
   "group_rules": [
     {"match": "contains", "pattern": "DataCenter", "label": "DataCenter", "big": true},
     {"match": "contains", "pattern": "Core", "label": "Core", "big": true},
-    {"match": "regex", "pattern": "COBCO-(\\d{4})-", "label": "$1", "big": false},
-    {"match": "regex", "pattern": "^(\\d{4})-", "label": "$1", "big": false}
+    {"match": "regex", "pattern": "COBCO-(\\d{4}[A-Za-z]?)", "label": "$1", "big": false},
+    {"match": "regex", "pattern": "^(\\d{4}[A-Za-z]?)", "label": "$1", "big": false}
   ],
   "other_label": "Other"
 }

+ 2 - 2
web-modules/WecomCenter/lib/L2Store.php

@@ -52,8 +52,8 @@ class L2Store {
 			'group_rules' => [
 				['match' => 'contains', 'pattern' => 'DataCenter', 'label' => 'DataCenter', 'big' => true],
 				['match' => 'contains', 'pattern' => 'Core',       'label' => 'Core',       'big' => true],
-				['match' => 'regex',    'pattern' => 'COBCO-(\\d{4})-', 'label' => '$1',     'big' => false],
-				['match' => 'regex',    'pattern' => '^(\\d{4})-',      'label' => '$1',     'big' => false]
+				['match' => 'regex',    'pattern' => 'COBCO-(\\d{4}[A-Za-z]?)', 'label' => '$1', 'big' => false],
+				['match' => 'regex',    'pattern' => '^(\\d{4}[A-Za-z]?)',      'label' => '$1', 'big' => false]
 			],
 			'other_label'       => 'Other'
 		];