Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

package.json

@@ -106,13 +106,13 @@
         "@wisdom-cesium/cesium": "^1.0.80",
         "@wisdom-components/basictable": "^1.5.16",
         "@wisdom-components/empty": "^1.4.1",
-        "@wisdom-map/amap": "^1.0.49--27.2",
-        "@wisdom-map/basemap": "^1.0.12-43",
-        "@wisdom-map/arcgismap": "^1.0.79-43",
+        "@wisdom-map/amap": "^1.0.49--27.3", 
+        "@wisdom-map/arcgismap": "^1.0.79-44",
+        "@wisdom-map/basemap": "^1.0.12-44",
         "@wisdom-map/util": "^1.0.27-0",
-        "@wisdom-utils/components": "0.1.83",
+        "@wisdom-utils/components": "0.1.84",
         "@wisdom-utils/runtime": "0.0.15",
-        "@wisdom-utils/utils": "0.1.123",
+        "@wisdom-utils/utils": "0.1.124",
         "animate.css": "^4.1.1",
         "antd": "^4.17.4",
         "compression": "1.7.4",

src/layouts/AppLayout/components/SlideMenu/index.js

@@ -117,6 +117,9 @@ const Menu = props => {
               logo={null}
               siderWidth={140}
               config={props.global}
+              defaultCollapsed={false}
+              collapsed={false}
+              breakpoint={'xs'}
               // onHeaderLogo={handlerIndustry}
               // onPageChange={handlerPageChange}
               // onMenuPanelItemClick={handleUpdateCurrentIndex}
@@ -181,22 +184,11 @@ export default props => {
   const { collapsed, onCollapse, route, style } = props;
   return (
     <>
-      <div
-        style={{
-          width: collapsed ? '48px' : `${siderWidth}px`,
-          overflow: 'hidden',
-          flex: `0 0 ${collapsed ? 48 : siderWidth}px`,
-          maxWidth: collapsed ? 48 : siderWidth,
-          minWidth: collapsed ? 48 : siderWidth,
-          transition:
-            'background-color 0.3s ease 0s, min-width 0.3s ease 0s, max-width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1) 0s',
-          ...style,
-        }}
-      />
       <aside
-        className={classNames(`${prefixCls}`, `${prefixCls}-fixed`, {
-          [`${prefixCls}-collapsed`]: collapsed,
-        })}
+        // className={classNames(`${prefixCls}`, `${prefixCls}-fixed`, {
+        //   [`${prefixCls}-collapsed`]: collapsed,
+        // })}
+        style={{paddingTop:'50px'}}
       >
         <div className={`${prefixCls}-children`}>
           <div className={`${prefixCls}-wrapper`} style={{ flex: '1 1 0%', overflow: 'hidden auto' }}>

src/layouts/HN.less

 @hn-greenColor: #00b278;
+:global{
+  .@{ant-prefix}-drawer-left.@{ant-prefix}-drawer-open{
+    display: none;
+  }
+  .ant-drawer-left.ant-drawer-open{
+    display: none;
+  }
+}
 .hnlayout {
   :global {
     .@{ant-prefix}-global-page-header-header {