Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 184

2023-04-27 10:47:31 +08:00
parent 19114cc35b 8aa475536b
commit 244892314b
1 changed files with 6 additions and 2 deletions
@@ -159,7 +159,7 @@ class screenModel extends model
            }
        }

-        foreach($scheme->componentList as $component)
+        foreach($scheme->componentList as $index => $component)
        {
            if(!empty($component->isGroup))
            {
@@ -168,10 +168,14 @@ class screenModel extends model
                    $groupComponent = $this->getLatestChart($groupComponent);
                }
            }
-            else
+            else if($component)
            {
                $component = $this->getLatestChart($component);
            }
+            else
+            {
+                unset($scheme->componentList[$index]);
+            }
        }

        return $scheme;