Merge branch 'dev-zw' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev-zw

react-ui/src/overrides.less

@@ -220,35 +220,32 @@
     height: 100%;
     .ant-pro-grid-content-children {
       height: 100%;
-      .ant-pro-layout-watermark-wrapper {
+      .ant-pro-page-container-children-container {
         height: 100%;
-        .ant-pro-page-container-children-container {
+        padding: 0;
+        .ant-pro-table {
+          display: flex;
+          flex-direction: column;
           height: 100%;
-          padding: 0;
-          .ant-pro-table {
-            display: flex;
-            flex-direction: column;
-            height: 100%;
-            .ant-pro-card.ant-pro-table-search {
-              flex: none;
-              height: auto;
-            }
-            .ant-pro-card {
-              flex: 1;
-              min-height: 0;
-              .ant-pro-card-body {
-                height: 100%;
-                .ant-table-wrapper {
-                  height: calc(100% - 64px);
-                  .ant-spin-nested-loading {
+          .ant-pro-card.ant-pro-table-search {
+            flex: none;
+            height: auto;
+          }
+          .ant-pro-card {
+            flex: 1;
+            min-height: 0;
+            .ant-pro-card-body {
+              height: 100%;
+              .ant-table-wrapper {
+                height: calc(100% - 64px - 64px);
+                .ant-spin-nested-loading {
+                  height: 100%;
+                  .ant-spin-container {
                     height: 100%;
-                    .ant-spin-container {
+                    .ant-table-fixed-header {
                       height: 100%;
-                      .ant-table-fixed-header {
+                      .ant-table-container {
                         height: 100%;
-                        .ant-table-container {
-                          height: 100%;
-                        }
                       }
                     }
                   }

react-ui/src/pages/System/Menu/index.tsx

@@ -294,7 +294,7 @@ const MenuTableList: React.FC = () => {
               setMenuTree(treeData);
               return {
                 data: memuData,
-                total: res.data.length,
+                total: undefined,
                 success: true,
               };
             })