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

src/pages/map/amap/index.js

@@ -3,6 +3,7 @@ import { AMapScene } from '@wisdom-map/Amap';
 import { connect } from 'react-redux';
 import { store } from '@wisdom-utils/utils';
 import { actionCreators } from '../../../containers/App/store';
+
 const AMap = props => {
   const getMap = (obj, current) => {
     store.set('amapView', {
@@ -14,10 +15,15 @@ const AMap = props => {
       map: current,
     });
   };
+
   const mapOptions = {
-    config: props.global.mapsettings,
+    config: window.globalConfig.mapsettings,
     theme: 'amap://styles/74fae00a851749793870b658f9f22d55',
+    mapOptions: {
+      plugins: ['AMap.MarkerClusterer'],
+    },
   };
+
   return (
     <div
       style={{
@@ -32,9 +38,9 @@ const AMap = props => {
     </div>
   );
 };
-
 const mapStateToProps = state => ({
   global: state.getIn(['global', 'globalConfig']),
+  amapView: state.getIn(['global', 'amapView']),
 });
 
 const mapDispatchToProps = dispatch => ({

src/pages/user/login/index.js

@@ -21,11 +21,11 @@ const LoginTemplate = {
 };
 /* eslint-disable */
 export default (props) => {
-  const redirect = getParams('redirect');
-  useEffect(() => {
-    if(getParams('loginName') && getParams('password')) return
-    initGlobalConfig();
-  }, [redirect]);
+  // const redirect = getParams('redirect');
+  // useEffect(() => {
+  //   if(getParams('loginName') && getParams('password')) return
+  //   initGlobalConfig();
+  // }, [redirect]);
   const template = window.globalConfig && window.globalConfig.loginTemplate;
   const RenderComponent = LoginTemplate[template] ? LoginTemplate[template]: LoginTemplate['default'];
   return <RenderComponent {...props}/>