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

package.json

@@ -118,8 +118,8 @@
         "@wisdom-map/arcgismap":"^2.0.101",
         "@wisdom-map/basemap":"^2.0.8",
         "@wisdom-map/util":"1.2.9",
-        "@wisdom-map/gis-utils": "^1.0.40",
-        "@wisdom-map/pd-map": "^1.0.139",
+        "@wisdom-map/gis-utils": "^1.0.41",
+        "@wisdom-map/pd-map": "^1.0.141",
         "@wisdom-utils/components": "0.1.376",
         "@wisdom-utils/runtime": "0.0.51",
         "@wisdom-utils/utils": "0.1.412",

src/layouts/BasicLayout.js

@@ -492,7 +492,7 @@ const Layout = props => {
         // localStorage.removeItem('integrationData');
       }
       // window.qiankunIsCache = false;
-      history.push('/Industry');
+      history.push('/industry');
     }
     // 非云平台不做响应
     if (!props.global.get('userInfo.site')) {
@@ -512,7 +512,7 @@ const Layout = props => {
     const Industries = props.global.get('userInfo.Industries');
     if (Industries && Industries.length > 1) {
       window.qiankunIsCache = false;
-      history.push('/Industry');
+      history.push('/industry');
     }
   };
   // useEffect(async () => {

src/micro.js

@@ -392,7 +392,7 @@ export const defaultApp = (setUrl) => {
     const config = window.globalConfig;
     if (config && config.token) {
         let url = !config.home ?
-        ((config.homepage === '' || _.isNull(config.homepage)) ? `/civbase/civweb4`: (`/civbase/${config.homepage.replace(/^\//, '')}`)) :  `/civbase/${config.homepage.replace(/^\//, '')}`;
+        ((!config.homepage || _.isNull(config.homepage)) ? `/civbase/civweb4`: (`/civbase/${config.homepage.replace(/^\//, '')}`)) :  `/civbase/${config.homepage.replace(/^\//, '')}`;
         if(/civweb4/.test(setUrl || url)) {
           window.qiankunIsCache = false;
           console.log("请升级首页功能");

src/pages/bootpage/template/integrationNew/index.js

@@ -227,6 +227,10 @@ const IntegrationNew = props => {
     jumpProgressStart();
     startTiming(loadingTime);
     window.jumpLoadingProgress = 99;
+
+    // if (loginA.globalConfig?.size === 0 && window.globalConfig) {
+    //   loginA.updateConfig(window.globalConfig);
+    // }
     loginA && loginA.getUserInfoAndConfig('', true, item.type);
   };
   const onLink = (item, loginA) => {
@@ -381,6 +385,7 @@ const IntegrationNew = props => {
     const handleError = () => {
       setJumpLoading(false);
       jumpProgressEnd();
+      window.jumpLoadingProgress = 0;
     };
     loginAction.events.on('toggleIndustry', handleToggleIndustry);
     loginAction.events.on('loginError', handleError);

src/pages/bootpage/template/project/wuliangye/index.js

@@ -22,14 +22,14 @@ import { store } from '@wisdom-utils/utils';
 import LoginAction from '@/pages/user/login/login';
 import { defaultApp } from '@/micro';
 
-import useFullScreen from '../../demonstration/components/useFullScreen';
-import styles from './index.less';
 import titleIcon from "@/assets/images/integration/wuliangye/标题.png";
 import Icon10 from "@/assets/images/integration/wuliangye/酒瓶.png";
 import tipIcon from "@/assets/images/integration/wuliangye/tip框.png";
 import BGIcon from "@/assets/images/integration/wuliangye/五粮液背景.png";
 import dxIcon from "@/assets/images/integration/wuliangye/动效1.gif";
 import dxIcon2 from "@/assets/images/integration/wuliangye/动效2.gif";
+import styles from './index.less';
+import useFullScreen from '../../demonstration/components/useFullScreen';
 import pageConfig from "./config";
 
 const { modalConfig, BIConfig } = pageConfig
@@ -71,8 +71,8 @@ const IntegrationQinzhou = props => {
     boxHeight: 930,
   });
   const [linkUrl, setLinkUrl] = useState('');
-  const [jumpLoading, setJumpLoading] = useState(false);
-  const [progressValue2, setProgressValue2] = useState(0);
+  const [jumpLoading, setJumpLoading] = useState(!!window.jumpLoadingProgress);
+  const [progressValue2, setProgressValue2] = useState(window.jumpLoadingProgress || 0);
   const [showBackBtn, setShowBackBtn] = useState(false); // 是否显示iframe 返回按钮，三维平台用
   const [loginAction, setAction] = useState(() => new LoginAction(props));
 
@@ -175,6 +175,7 @@ const IntegrationQinzhou = props => {
     setJumpLoading(true);
     jumpProgressStart();
     startTiming(6);
+    window.jumpLoadingProgress = 99;
     try {
       const res = await appService.getTicketByToken({ token: window.globalConfig?.token });
       if (res.code === 0) {
@@ -319,6 +320,7 @@ const IntegrationQinzhou = props => {
       setJumpLoading(false);
       jumpProgressEnd();
       window.jumpLoadingProgress = 0;
+      window.jumpLoadingProgress = 0;
       let url = '';
       if (window.clientInfo?.url && window.clientInfo.subType === '内链') {
         url = searchUrl(window.clientInfo.url);
@@ -329,6 +331,7 @@ const IntegrationQinzhou = props => {
       defaultApp(url);
     };
     const handleError = () => {
+      window.jumpLoadingProgress = 0;
       setJumpLoading(false);
       jumpProgressEnd();
     };
@@ -410,8 +413,7 @@ const IntegrationQinzhou = props => {
         </div>
         <div ref={cardRef} className={styles.integrationTips}>
           {
-            BIConfig.map(item => {
-              return <div
+            BIConfig.map(item => <div
                 title={`点击${item.name}跳转`}
                 className={classNames(styles.integration_card,
                   item.name ? integrationData[item.name] ? styles.integration_row_col_link : styles.integration_row_col_no : '',
@@ -421,8 +423,7 @@ const IntegrationQinzhou = props => {
               >
                 <div className={styles.integration_TitBG} style={{ background: `url(${tipIcon}) center/100% 100% no-repeat` }} >{item.name}</div>
                 <img src={item.icon} />
-              </div>
-            })
+              </div>)
           }
         </div>
       </div>

src/pages/user/login/login.js

@@ -9,6 +9,8 @@ import { appService, noticeService } from '@/api';
 import { getUserInfo, getWebSiteConfig } from '@/api/service/base';
 import { SERVICE_APP_LOGIN_MODE, SERVICE_INTERFACE_SUCCESS_CODE, WX_REDIRECT_URI } from '@/constants';
 import store from '@/stores';
+import { defaultApp } from '@/micro';
+
 import {
   DEFAULT_MQTT_PATH,
   DEFAULT_TCP_IP,
@@ -308,7 +310,7 @@ class Login {
           self.globalConfig.userInfo = window?.globalConfig?.transformUserInfo?.(response.data) ?? {};
           self.updateConfig && self.updateConfig(self.globalConfig);
 
-          let flag = true;
+          let flag = false;
           const loginMode = Cookies.get('loginMode');
           if (loginMode === 'qywx') {
             flag = false;
@@ -393,7 +395,9 @@ class Login {
       if (this.globalConfig.isIntegration >= 1 && this.integratedNum >= 2) {
         this.createContext(this);
         this.updateConfig && this.updateConfig(this.globalConfig);
-        this.events && this.events.emit('loginIndustry');
+        // this.events && this.events.emit('loginIndustry');
+        // 修改刷新时，this.events.emit('loginIndustry') 无法跳转到过渡页
+        defaultApp(`/civbase/industry`);
         return false;
       }
     }