fix: antdp-base 菜单为topleft时，组件页和列表页跳转异常

antdpro · Jun 10, 2023 · 720edd5 · 720edd5
1 parent b1f9a2f
commit 720edd5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 41 deletions.
diff --git a/examples/antdp-base/config/router.json b/examples/antdp-base/config/router.json
@@ -38,6 +38,7 @@
         "side": true,
         "routes": [
           {
+            "index": true,
             "path": "/components/proform",
             "name": "高级表单",
             "locale": "proform",
@@ -65,6 +66,7 @@
         "side": true,
         "routes": [
           {
+            "index": true,
             "path": "/list/tablelist",
             "name": "高级表格",
             "locale": "tablelist",

diff --git a/examples/antdp-base/src/pages/Person/PersonalCenter/Lists.jsx b/examples/antdp-base/src/pages/Person/PersonalCenter/Lists.jsx
@@ -55,7 +55,6 @@ const App = () => {
                         border: '1px solid #D9D9D9',
                         padding: '1px 2px',
                         fontSize: 12,
-                        background: '#FAFAFA',
                       }}
                     >
                       {a}

diff --git a/examples/antdp-base/src/pages/Person/PersonalCenter/User.js b/examples/antdp-base/src/pages/Person/PersonalCenter/User.js
@@ -98,18 +98,16 @@ export default function User() {
     url: serviceProject,
   });
   return (
-    <div>
-      <Card bordered={false}>
-        <PageHeaderContent
-          currentUser={{
-            avatar: 'https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png',
-            name: 'xxx',
-            userid: '00000001',
-            email: '[email protected]',
-            signature: '海纳百川，有容乃大',
-          }}
-        />
-      </Card>
-    </div>
+    <Card bordered={false}>
+      <PageHeaderContent
+        currentUser={{
+          avatar: 'https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png',
+          name: 'xxx',
+          userid: '00000001',
+          email: '[email protected]',
+          signature: '海纳百川，有容乃大',
+        }}
+      />
+    </Card>
   );
 }
diff --git a/examples/antdp-base/src/pages/Person/PersonalCenter/index.jsx b/examples/antdp-base/src/pages/Person/PersonalCenter/index.jsx
@@ -1,34 +1,23 @@
-import { Layout, Space } from 'antd';
+import { ProCard } from '@ant-design/pro-components';
 import Contents from './Contents';
 import User from './User';
-const { Sider } = Layout;
 
 const contentStyle = {
   textAlign: 'center',
-  backgroundColor: '#fff',
 };
 const siderStyle = {
   textAlign: 'center',
   color: '#fff',
-  backgroundColor: '#fff',
 };
 
 const App = () => (
-  <Space
-    direction="vertical"
-    style={{
-      width: '100%',
-    }}
-    size={[0, 48]}
-  >
-    <Layout>
-      <Sider width={400} style={siderStyle}>
-        <User />
-      </Sider>
-      <Layout style={contentStyle}>
-        <Contents />
-      </Layout>
-    </Layout>
-  </Space>
+  <ProCard>
+    <ProCard width={400} style={siderStyle}>
+      <User />
+    </ProCard>
+    <ProCard style={contentStyle}>
+      <Contents />
+    </ProCard>
+  </ProCard>
 );
 export default App;
diff --git a/examples/antdp-base/src/pages/Person/PersonalCenter/style.less b/examples/antdp-base/src/pages/Person/PersonalCenter/style.less
@@ -41,15 +41,15 @@
   }
 
   .describe {
-    margin: 20px;
     display: flex;
     flex-direction: column;
     align-items: self-start;
     justify-content: flex-start;
+    margin: 20px;
 
     .title {
-      font-weight: bold;
       margin-bottom: 10px;
+      font-weight: bold;
     }
 
     .labels {
@@ -61,10 +61,9 @@
 
     .labelsItem {
       margin: 6px;
-      border: 1px solid #d9d9d9;
       padding: 1px 2px;
       font-size: 12px;
-      background: #fafafa;
+      border: 1px solid #d9d9d9;
     }
 
     .teamsItem {
@@ -75,6 +74,8 @@
 }
 
 .extraContent {
+  float: right;
+  white-space: nowrap;
   zoom: 1;
 
   &::before,
@@ -90,9 +91,6 @@
     visibility: hidden;
   }
 
-  float: right;
-  white-space: nowrap;
-
   .statItem {
     position: relative;
     display: inline-block;