master

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>;
+};

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":
+        // case "user":
-          layout = <UserLayout {...props} />;
+        //   layout = <UserLayout {...props} />;
-          break;
+        //   break;
         case "blank":
           layout = <BlankLayout {...props} />;
           break;
         default:
-          layout = <BaseLayout {...props} />;
+          layout = <PageEmptyLayout {...props} />;
           break;
       }
     } else {
-      layout = <BaseLayout {...props} />;
+      layout = <PageEmptyLayout {...props} />;
     }
   }
 

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>
         )