feat:conflict

src/services/common.ts

@@ -1355,12 +1355,17 @@ export function dealDataBeforeOpen(data){
         delIdx.forEach((idx,index)=>{
           realTime.triggers.splice((idx-index),1);
         });
-        pen.triggers.push({
-          name:`状态场景${index+1}`,
-          status:deepClone(realTime.triggers)
-        });
+        if(realTime.triggers?.length){
+          pen.triggers.push({
+            name:`状态情况${index+1}`,
+            status:deepClone(realTime.triggers)
+          });
+        }
         delete realTime.triggers;
       });
     }
+    if(pen.triggers?.length){
+      pen.triggers = pen.triggers.filter((item)=>item.status?.length);
+    }
   })
 }