feat: add PageContainer component

config/micor.js

@@ -9,12 +9,12 @@ export default {
     //   container: '#micro-container',
     //   activeRule: '/civbase/dosing-web',
     // },
-    // {
-    //   name: 'civ_water',
-    //   entry: `//${window.location.hostname}:8080/civ_water`,
-    //   container: '#micro-container',
-    //   activeRule: '/civbase/civ_water',
-    // },
+    {
+      name: 'civ_water',
+      entry: `//${window.location.hostname}:8081/civ_water`,
+      container: '#micro-container',
+      activeRule: '/civbase/civ_water',
+    },
     // {
     //   name: 'civ_configuration',
     //   entry: `//${window.location.hostname}:8080/civ_configuration`,

package.json

@@ -110,9 +110,9 @@
         "@wisdom-map/Map": "^1.0.12-17",
         "@wisdom-map/arcgismap": "^1.0.79-17",
         "@wisdom-map/util": "^1.0.27-0",
-        "@wisdom-utils/components": "0.0.100",
+        "@wisdom-utils/components": "0.1.8",
         "@wisdom-utils/runtime": "0.0.15",
-        "@wisdom-utils/utils": "0.1.38",
+        "@wisdom-utils/utils": "0.1.48",
         "animate.css": "^4.1.1",
         "antd": "^4.17.4",
         "compression": "1.7.4",

src/layouts/BlankLayout.js

-import React from 'react';
-
-const Layout = ({ children }) => <>{children}</>;
-
-export default Layout;

src/layouts/UserLayout.js

-import React from 'react';
-
-import { Helmet, HelmetProvider } from 'react-helmet-async';
-import { connect } from 'react-redux';
-import { getMenuData, getPageTitle } from '@ant-design/pro-layout';
-// import { renderRoutes } from '../utils/routes';
-import { helpers } from '@wisdom-utils/utils';
-import styles from './UserLayout.less';
-const { renderRoutes } = helpers;
-const UserLayout = props => {
-  const {
-    route = {
-      routes: [],
-    },
-  } = props;
-
-  const { breadcrumb } = getMenuData(route.routes);
-  const title = getPageTitle({
-    breadcrumb,
-    title: (props.global && props.global.title) || '',
-    ...props,
-  });
-
-  return (
-    <HelmetProvider>
-      <Helmet>
-        <title>{title}</title>
-        <link
-          rel="shortcut icon"
-          href={`https://panda-water.cn/web4/${props.global &&
-            props.global.shortcutIcon}`}
-        />
-        <meta name="description" content={title} />
-      </Helmet>
-
-      <div className={styles.container}>
-        <div className={styles.content}>
-          {renderRoutes('panda-console-base', route.routes, props)}
-          {props.children}
-        </div>
-        {/* <DefaultFooter links={[]} copyright="Copyright © 熊猫智慧水务 2020 All Rights Reserved 沪ICP备11036640-1"/> */}
-      </div>
-    </HelmetProvider>
-  );
-};
-const mapStateToProps = state => ({
-  global: state.getIn(['global', 'globalConfig']),
-});
-export default connect(mapStateToProps)(UserLayout);

src/routes/config.js

@@ -2,7 +2,7 @@ import LoadingComponent from '@ant-design/pro-layout/es/PageLoading';
 import { dynamic } from '@wisdom-utils/runtime';
 
 import BasicLayout from '../layouts/BasicLayout';
-import UserLayout from '../layouts/UserLayout';
+import { UserLayout } from '@wisdom-utils/components/lib/AppLayout';
 import BootPage from '../pages/bootpage';
 import Iframe from '../pages/iframe';
 import Login from '../pages/user/login';