Merge branch 'master' into dev-hn

.gitlab-ci.yml

@@ -21,8 +21,8 @@ install:
   - npm run init
   #cache:
    # key: ${CI_COMMIT_REF_SLUG}
-  #  paths:
-  #  - node_modules/
+#    paths:
+#    - node_modules/
   only:
     refs:
         - master

config/micor.js

@@ -9,7 +9,6 @@
 export function genActiveRule(routerPrefix) {
 
   return location => {
-    debugger
     return location.pathname.startsWith(routerPrefix)
   };
 }

package.json

@@ -106,13 +106,13 @@
         "@wisdom-cesium/cesium": "^1.0.75",
         "@wisdom-components/basictable": "^1.5.16",
         "@wisdom-components/empty": "^1.4.1",
-        "@wisdom-map/Amap": "^1.0.49-13",
-        "@wisdom-map/Map": "^1.0.12-26",
-        "@wisdom-map/arcgismap": "^1.0.79-26",
+        "@wisdom-map/Amap": "^1.0.49-18",
+        "@wisdom-map/Map": "^1.0.12-32",
+        "@wisdom-map/arcgismap": "^1.0.79-32",
         "@wisdom-map/util": "^1.0.27-0",
-        "@wisdom-utils/components": "0.1.65",
+        "@wisdom-utils/components": "0.1.71",
         "@wisdom-utils/runtime": "0.0.15",
-        "@wisdom-utils/utils": "0.1.105",
+        "@wisdom-utils/utils": "0.1.111",
         "animate.css": "^4.1.1",
         "antd": "^4.17.4",
         "compression": "1.7.4",
@@ -302,6 +302,7 @@
         "webpack-theme-color-replacer": "^1.3.15",
         "webpackbar": "5.0.0-3",
         "whatwg-fetch": "^3.0.0",
+        "xss": "^1.0.11",
         "yorkie": "^2.0.0"
     }
 }

src/.nginx.conf

@@ -14,7 +14,7 @@ server {
 
 # Type your domain name below
   server_name example.com;
-
+  gzip on;
   return 301 https://$server_name$request_uri;
 
 }

src/api/index.js

@@ -13,10 +13,11 @@ instanceRequest.transformRequestURL = function(url) {
     '/PandaCore/GCK/Basis/GateWayConfig',
     '/CityInterface/rest/services.svc/GetConfig',
     '/PandaOMS/OMS/HostManager/GetGateWay',
-    '/PandaCore/Identity/AuthorizationToken'
+    '/PandaCore/Identity/AuthorizationToken',
+    '/PandaOMS/OMS/WebSite/GetConfig',
   ];
   if (excludeURL.includes(url)) {
-    return url;
+    return url.replace(/PandaCore\/GateWay\//, '');
   }
 
   // if (

src/api/service/base.js

@@ -19,6 +19,7 @@ export const API = {
   GENERATE_QRCODE: 'cityinterface/rest/services.svc/generatetokenByqrcode',
   GENERATE_TOKEN_CHANGE: '/cityinterface/rest/services.svc/generatetokenquick',
   GET_WEB_SITE_CONFIG: '/PandaOMS/OMS/WebSite/GetWebSiteConfig',
+  // GET_WEB_SITE_CONFIG: '/CityInterface/rest/services.svc/GetWebSiteConfig',
   GET_USER_INFO: '/CityInterface/rest/services.svc/getUserInfo',
   GET_GATEWAY_USER_INFO: '/PandaCore/GCK/Basis/GetUserInfo',
   GET_OA: '/CityInterface/rest/services/OA.svc/getLoginInfo',

src/app.js

-// import 'whatwg-fetch';
+import 'whatwg-fetch';
 import './public-path';
 import '!file-loader?name=[name].[ext]!./images/favicon.ico';
 import './global.less';

src/components/GlobalHeader/NoticeIconView.js

@@ -37,7 +37,6 @@ class NoticeIconView extends Component {
       window.share && window.share.event && window.share.event.removeAllListeners('reloadNotice');
     } catch (error) {
     }
-    debugger
     this.notifier = new Notifier(
       this.props.global.userInfo,
       this.renderVideo,

src/containers/App/index.js

@@ -20,13 +20,17 @@ function App(props) {
         <title>{`${(props.global && props.global.title) || defaultSetting.title}`}</title>
         <link rel="shortcut icon" href={`https://panda-water.cn/web4/${props.global && props.global.shortcutIcon}`} />
         {metaSecurity}
-        <meta name="description" content={`${props.global && props.global.title}`} />
+        <meta name="description" content={`${(props.global && props.global.title) || defaultSetting.title}`} />
       </Helmet>
       <Router basename={config.base || pkg.name.toLocaleLowerCase() || ''}>
         <Switch>
           {renderRoutes(
             'panda-console-base',
-            dyRoutes(props.menu || [], props.global && props.global.layout, props.global && props.global.theme || 'dark').routes,
+            dyRoutes(
+              props.menu || [],
+              props.global && props.global.layout,
+              (props.global && props.global.theme) || 'dark',
+            ).routes,
           )}
         </Switch>
       </Router>

src/layouts/BasicLayout.js

@@ -10,8 +10,8 @@ import { useHistory } from '@wisdom-utils/runtime';
 import KeepAlive from 'react-activation';
 import AMapLoader from '@amap/amap-jsapi-loader';
 import { BasicLayout } from '@wisdom-utils/components/lib/AppLayout';
-import RightContent from '@/components/GlobalHeader/ExtendRightContent';
 import defaultSetting from '@wisdom-utils/components/lib/AppLayout/layouts/defaultSettings';
+import RightContent from '@/components/GlobalHeader/ExtendRightContent';
 import { actionCreators } from '@/containers/App/store';
 import { WEB_GIS_TYPE } from '../constants';
 import SecurityLayout from './SecurityLayout';

src/micro.js

@@ -14,6 +14,7 @@ import { actionCreators } from './containers/App/store';
 import loader from './render';
 import store from './stores';
 import actions from './actions';
+const xss = require('xss');
 // eslint-disable-next-line import/named
 const { processComponentName } = string;
 // eslint-disable-next-line no-undef
@@ -134,12 +135,27 @@ export const initMicroApps = () => {
         singular: false,
         scopedCSS: true,
         prefetch: 'all',
+        getTemplate(tpl) {
+            return tpl.replace('<script language="javascript">setURL("18.10.10.253");supFlash(getVersion("td_cookie"));</script>', '');
+        },
+        async fetch(url, ...args) {
+            if (url.indexOf('cookie/flash.js') > -1) {
+              return {
+                async text() {
+                  return '';
+                },
+              };
+            }
+            return window.fetch(url, ...args);
+        },
         // eslint-disable-next-line no-underscore-dangle
         // getPublicPath: window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__,
         excludeAssetFilter: url =>
             url.indexOf('framework/highcharts') !== -1 ||
             // url.indexOf('framework/amap/AMap.UI') !== -1 ||
-            // url.indexOf('framework/amap/init.js') !== -1 ||
+            // url.indexOf('framework/4.9/init.js') !== -1 ||
+            url.indexOf('DataPresentation.js') !== -1 ||
+            url.indexOf('jquery-mousewheel-easyui-qrcode-cookie-resize-filesaver-fisheye-dateFormat-gridify.js') !== -1 ||
             url.indexOf('jquery') !== -1 ||
             url.indexOf('components/filetools/xlsx.core.min') !== -1 ||
             url.indexOf('managers/MapManager.js') !== -1 ||

src/pages/bootpage/index.js

@@ -83,7 +83,7 @@ const BootPage = props => {
       // props.instance && props.instance.getUserInfoAndConfig('', true, type);
       loginAction && loginAction.getUserInfoAndConfig('', true, type);
     },
-    [loginAction, props.global, props.instance],
+    [loginAction, props.global.token, props.instance],
   );
   useEffect(() => {
     // eslint-disable-next-line no-use-before-define
@@ -114,7 +114,7 @@ const BootPage = props => {
   }, [loginAction.events, props]);
   const renderIndustr = useMemo(
     () => renderIndustries(props.global, handlePage),
-    [handlePage, props.global],
+    [handlePage, props.global.token],
     );
   const intl = useIntl();
 
@@ -164,6 +164,9 @@ const BootPage = props => {
               'animate__animated',
               'duration-500ms',
             )}
+            style={{
+              width: `${ scale < 1 ? 1280 : Math.ceil(1280 * scale)}px`,
+            }}
           >
             <ul
               className={classNames(styles.bootPageUl, 'animate__animated')}

src/pages/bootpage/index.less

@@ -156,6 +156,12 @@
     }
   }
 
+  :global {
+    .@{ant-prefix}-spin-nested-loading,
+    .@{ant-prefix}-spin-container {
+      height: 100%;
+    }  
+  }
 }
 
 @media screen and (max-width: 1440px) {

src/pages/user/login/login.js

@@ -309,8 +309,12 @@ class Login {
             : '';
           
           // 在云平台上，切换前后如果url一致会出问题
-          if(self.globalConfig.userInfo && self.globalConfig.userInfo.site) {
-            homepage += `${homepage.indexOf('|') > -1 ? '&' : '|' }_timestate=${Date.now().toString(16)}_${self.globalConfig.userInfo.site}`;
+          if (self.globalConfig.userInfo && self.globalConfig.userInfo.site) {
+            homepage = homepage
+              ? `${homepage}${homepage.indexOf('|') > -1 ? '&' : '|'}_timestate=${Date.now().toString(16)}_${
+                  self.globalConfig.userInfo.site
+                }`
+              : `civweb4/?_timestate=${Date.now().toString(16)}_${self.globalConfig.userInfo.site}`;
           }
 
           self.globalConfig = Object.assign(self.globalConfig, config, {

src/pages/user/login/template/baseLogin.js

@@ -69,7 +69,6 @@ const Login = forwardRef((props, _ref) => {
         props.history.push(`/?client=${props.global.client}`);
         // window.share.event.emit('triggerMicro', props.global);
         // initMicroApps();
-        debugger
         defaultApp();
       });
       action &&