Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

src/app.jsx

@@ -37,7 +37,6 @@ export async function getInitialState() {
     }
     return undefined;
   }; // 如果是登录页面，不执行
-
   const getmenuData = async () => {
     try {
       const res = await getMenu();
@@ -87,11 +86,17 @@ export const layout = ({ initialState, setInitialState }) => {
       setInitialState((s) => ({ ...s, collapsed: cols }));
     },
     footerRender: () => <Footer />,
-    onPageChange: () => {
+    onPageChange: async () => {
       const { location } = history;
       // 如果没有登录，重定向到 login
       if (!initialState?.currentUser && location.pathname !== loginPath) {
-        // history.push(loginPath);
+        let userInfo = await initialState.fetchUserInfo();
+        let menuData = await initialState.getmenuData();
+        setInitialState((s) => ({
+          ...s,
+          currentUser: userInfo?.data,
+          newMenu: menuData,
+        }));
       }
     },
     links: isDev

src/global.less

@@ -58,14 +58,13 @@ ol {
     width: 100%;
     overflow-x: auto;
 
-    &-thead>tr,
-    &-tbody>tr {
-
-      >th,
-      >td {
+    &-thead > tr,
+    &-tbody > tr {
+      > th,
+      > td {
         white-space: pre;
 
-        >span {
+        > span {
           display: block;
         }
       }
@@ -275,6 +274,7 @@ ol {
 
 .table-cell {
   display: -webkit-box;
+  max-width: 230px;
   //width: 100%;
   overflow: hidden;
   font-size: 12px !important;
@@ -313,7 +313,7 @@ ol {
 }
 
 .lightblue {
-  >td:first-child {
+  > td:first-child {
     position: relative;
 
     &::before {
@@ -335,14 +335,14 @@ ol {
   width: 100%;
   padding-left: 0 !important;
 
-  >span:first-child {
+  > span:first-child {
     flex: 1;
 
-    >span:first-child {
+    > span:first-child {
       display: none !important;
     }
 
-    >.ant-spin-nested-loading {
+    > .ant-spin-nested-loading {
       width: 100%;
     }
   }
@@ -396,7 +396,7 @@ ol {
 }
 
 .runtime-keep-alive-layout {
-  >div {
+  > div {
     height: 100% !important;
   }
 }
@@ -444,11 +444,11 @@ ol {
   min-height: 100% !important;
   overflow: hidden !important;
 
-  >div {
+  > div {
     height: 100%;
     min-height: calc(100vh - 96px);
 
-    >div {
+    > div {
       height: 100%;
     }
   }
@@ -460,12 +460,12 @@ ol {
 
 // 横向滚动条
 .scrollHoriz {
-  >div {
+  > div {
     display: flex !important;
     flex-wrap: nowrap !important;
     align-items: center !important;
 
-    >div {
+    > div {
       flex-shrink: 0 !important;
     }
   }
@@ -473,7 +473,7 @@ ol {
 
 .runtime-keep-alive-layout {
   .ant-layout-sider-children {
-    padding-left: 16px;
     padding-right: 16px;
+    padding-left: 16px;
   }
-}
\ No newline at end of file
+}