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

config/proxy.js

@@ -2,7 +2,7 @@
 // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
 // const proxyURL = 'https://work.panda-water.cn';
 // const proxyURL = 'http://192.168.12.3:8082';
-const proxyURL = 'http://192.168.10.156:8666/'
+const proxyURL = 'https://panda-water.cn/'
 
 module.exports = {
   assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',

internals/webpack/webpack.base.babel.js

@@ -487,10 +487,10 @@ module.exports = options => {
       .end();
   }
 
-  rule
-    .use('babel-loader')
-    .loader(require.resolve('@umijs/deps/compiled/babel-loader'))
-    .options(babelOpts);
+  // rule
+  //   .use('babel-loader')
+  //   .loader(require.resolve('@umijs/deps/compiled/babel-loader'))
+  //   .options(babelOpts);
 
   if ((isProd && defineConfig.analyze) || process.env.ANALYZE) {
     const mergeAnalyze = Object.assign(

package.json

@@ -110,9 +110,9 @@
         "@wisdom-map/arcgismap": "1.4.0-6",
         "@wisdom-map/basemap": "1.1.0-2",
         "@wisdom-map/util": "^1.0.27-0",
-        "@wisdom-utils/components": "0.1.226",
+        "@wisdom-utils/components": "0.1.228",
         "@wisdom-utils/runtime": "0.0.32",
-        "@wisdom-utils/utils": "0.1.266",
+        "@wisdom-utils/utils": "0.1.268",
         "animate.css": "^4.1.1",
         "antd": "^4.20.7",
         "compression": "1.7.4",

src/components/GlobalHeader/SimpleRiightContent.js

-import React, { useState, useRef } from 'react';
-import { message, Popover } from 'antd';
+import React, {
+  useRef,
+  useState,
+} from 'react';
+
+import {
+  message,
+  Popover,
+} from 'antd';
 import _ from 'lodash';
 import { connect } from 'react-redux';
+
 import Icon from '@ant-design/icons';
-import classNames from 'classnames';
+import {
+  AvatarDropdown as Avatar,
+  useIntl,
+} from '@wisdom-utils/components';
+import HeaderSearch from '@wisdom-utils/components/lib/layout/components/HeaderSearch';
 import { useHistory } from '@wisdom-utils/runtime';
-import { useIntl, AvatarDropdown as Avatar } from '@wisdom-utils/components';
-import HeaderSearch from '@wisdom-utils/components/lib/layout/components/HeaderSearch'
-import { actionCreators } from '../../containers/App/store';
-import search from '../../assets/basic/search.png';
+
 import order from '../../assets/basic/message.png';
 import notice from '../../assets/basic/notice.png';
+import search from '../../assets/basic/search.png';
+import { actionCreators } from '../../containers/App/store';
 import styles from './index.less';
 import NoticeIconView from './NoticeIconView';
+
 /* eslint-disable */
 
 const favitorSvg = () => (<svg t="1631171489722" className="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16457" width="24" height="24"><path d="M512 87.806c-234.721 0-424.194 189.474-424.194 424.194s189.474 424.194 424.194 424.194 424.194-189.474 424.194-424.194-189.474-424.194-424.194-424.194zM783.484 442.715l-137.155 100.393c-7.069 5.655-9.899 14.141-7.069 22.624l52.317 161.194c5.655 18.382-15.553 33.935-31.108 22.624l-137.155-100.393c-7.069-5.655-16.967-5.655-24.037 0l-137.155 100.393c-15.553 11.312-36.763-4.242-31.108-22.624l53.731-162.608c2.829-8.484 0-16.967-7.069-22.624l-137.155-100.393c-15.553-11.312-7.069-35.349 11.312-35.349h169.678c8.484 0 16.967-5.655 18.382-14.141l52.317-161.194c5.655-18.382 32.522-18.382 38.177 0l52.317 161.194c2.829 8.484 9.899 14.141 18.382 14.141h169.678c21.21 0 28.278 25.452 12.725 36.763z" p-id="16458" fill="hsla(221, 100%, 95%, 0.7)"></path></svg>);
@@ -205,7 +217,7 @@ const GlobalHeaderRight = props => {
   }
 
   return (
-    <div className={className} style={{ marginLeft: 'inherit' }}>
+    <div className={className} style={{ marginLeft: '14px' }}>
       {renderTopMenu()}
       <Avatar menu config={props.global} updateCurrentIndex={props.updateCurrentIndex} updateConfig={props.updateConfig} logout={props.logout} />
     </div>

src/layouts/BasicLayout.js

@@ -313,7 +313,7 @@ const Layout = (props) => {
   return (
     <SecurityLayout {...props}>
       <BasicLayout
-        title="智慧水务GCK平台"
+        title={props.global.title}
         route={props.route}
         location={location}
         navTheme="dark"

src/render.js

 import React, { useEffect } from 'react';
 import ReactDOM from 'react-dom';
-import { history } from '@wisdom-utils/runtime';
-import { Provider } from 'react-redux';
-import Cookies from 'js-cookie';
-import { getToken } from './utils/utils';
-import { ConfigProvider, message, Modal, notification } from 'antd';
+
+import {
+  ConfigProvider,
+  message,
+  Modal,
+  notification,
+} from 'antd';
 import { ConnectedRouter } from 'connected-react-router/immutable';
-import { ErrorBoundary, LocaleContainer } from '@wisdom-utils/components';
-import Login from './pages/user/login/login';
-import { params, Storeage } from '@wisdom-utils/utils/lib/helpers';
-import { updateCSS } from 'rc-util/lib/Dom/dynamicCSS';
+import Cookies from 'js-cookie';
 import canUseDom from 'rc-util/lib/Dom/canUseDom';
-import App from './containers/App';
-import Container from './components/Container';
-import store from './stores';
+import { updateCSS } from 'rc-util/lib/Dom/dynamicCSS';
+import { Provider } from 'react-redux';
+
+import { LocaleContainer } from '@wisdom-utils/components';
+import { history } from '@wisdom-utils/runtime';
+import {
+  params,
+  Storeage,
+} from '@wisdom-utils/utils/lib/helpers';
+
 import { appService } from './api';
-import { defaultApp, initMicroApps } from './micro';
+import Container from './components/Container';
+import App from './containers/App';
 import { actionCreators } from './containers/App/store';
+import {
+  defaultApp,
+  initMicroApps,
+} from './micro';
+import Login from './pages/user/login/login';
+import store from './stores';
+import { getToken } from './utils/utils';
+
 const { getThemeVariables } = require('antd/dist/theme');
 const defaultSetting = require('../config/defaultSetting');
 const MOUNT_NODE = document.getElementById('root');
@@ -174,8 +189,7 @@ export const AppInitState = () => {
       });
 
       registerTheme(customPrefixCls, {
-        'header-bg-color': themeConfig.headerPrimaryColor
-        //'linear-gradient(0deg, #0066d6, #39a9ff 100%)',
+        'header-bg-color': 'linear-gradient(0deg, #0066d6, #39a9ff 100%)'
       });
     })
     .catch(error => {