Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main.js

src/pages/Container/Layout/menuConfig.js

@@ -174,6 +174,18 @@ const menuItems = [
       },
     ],
   },
+  {
+    key: "/safetyEval/container/test",
+    label: "测试",
+    icon: <ExperimentOutlined />,
+    children: [
+      {
+        key: "/safetyEval/container/test/a1",
+        label: "A1 模块",
+        icon: <ExperimentOutlined />,
+      },
+    ],
+  },
 ];
 
 export default menuItems;

src/pages/Container/Test/index.js

@@ -3,9 +3,13 @@ import { Button, Card, Result, Space, Typography } from "antd";
 
 const { Title, Paragraph, Text } = Typography;
 
-function TestPage() {
+function TestPage(props) {
   const [count, setCount] = React.useState(0);
 
+  if (props.children) {
+    return props.children;
+  }
+
   return (
     <div style={{ padding: 24, maxWidth: 800, margin: "0 auto" }}>
       <Card>