From 5cfd9289cfbb43153959db9738c0c4a4bab91450 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 22 Nov 2024 14:39:04 +0800
Subject: [PATCH] master

---
 src/layouts/PageEmptyLayout/index.tsx |  9 +++++++++
 src/layouts/index.tsx                 | 15 ++++++++-------
 src/pages/unitTable/index.tsx         |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 src/layouts/PageEmptyLayout/index.tsx

diff --git a/src/layouts/PageEmptyLayout/index.tsx b/src/layouts/PageEmptyLayout/index.tsx
new file mode 100644
index 0000000..5028345
--- /dev/null
+++ b/src/layouts/PageEmptyLayout/index.tsx
@@ -0,0 +1,9 @@
+import * as React from "react";
+import { useEffect } from "react";
+
+export default ({ children }: any) => {
+  useEffect(() => {
+    return () => {};
+  }, []);
+  return <div>{children}</div>;
+};
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 8b5dc47..1285af1 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -7,9 +7,10 @@ import { Provider } from "mobx-react";
 import zhCN from "antd/lib/locale/zh_CN";
 import { HTML5Backend } from "react-dnd-html5-backend";
 import { connect, IRouteComponentProps, useModel } from "umi";
-import BaseLayout from "./BaseLayout";
+// import BaseLayout from "./BaseLayout";
 import BlankLayout from "./BlankLayout";
-import UserLayout from "./UserLayout";
+// import UserLayout from "./UserLayout";
+import PageEmptyLayout from "./PageEmptyLayout";
 import { IRouterProps, RouterContext } from "./RouterContext";
 import { layoutConfig } from "@/layouts/config";
 import stores from "@/store";
@@ -64,18 +65,18 @@ const Layout = ({ children, location, route, history, match }: IRouteComponentPr
 
     if (type) {
       switch (type) {
-        case "user":
-          layout = <UserLayout {...props} />;
-          break;
+        // case "user":
+        //   layout = <UserLayout {...props} />;
+        //   break;
         case "blank":
           layout = <BlankLayout {...props} />;
           break;
         default:
-          layout = <BaseLayout {...props} />;
+          layout = <PageEmptyLayout {...props} />;
           break;
       }
     } else {
-      layout = <BaseLayout {...props} />;
+      layout = <PageEmptyLayout {...props} />;
     }
   }
 
diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx
index 9074aa3..63419e6 100644
--- a/src/pages/unitTable/index.tsx
+++ b/src/pages/unitTable/index.tsx
@@ -113,7 +113,7 @@ const UnitTable: FC = (props) => {
               <Table.Summary.Cell index={0} align="center">
                 <Text type="danger">{i18n["总计"]}</Text>
               </Table.Summary.Cell>
-              <CaclFixedTotal columns={!_.isNil(extraParams?.selectedRowKeys) ? columns : columns.slice(1)} dataSourceUrl="" payload={{}} sumRow={sumRow} />
+              <CaclFixedTotal columns={extraParams?.showRowSelection ? columns : columns.slice(1)} dataSourceUrl="" payload={{}} sumRow={sumRow} />
             </Table.Summary.Row>
           </Table.Summary>
         )