Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 18601 【功能问题】全域异常场景-部分需求未实现

@@ -53,28 +53,36 @@ export class HttpRequest {
 
   static get<T = ResponseDTO<string>>(url: string, headers?: HashMap<string, string>): Promise<T> {
     let config: AxiosRequestConfig = {
-      headers: HttpRequest.buildHeaderWithGlobalHeader(headers)
+      headers: HttpRequest.buildHeaderWithGlobalHeader(headers),
+      timeout:10000,
+      timeoutErrorMessage:"当前无网络，请重试"
     }
     return service.get(url, config)
   }
 
   static post<T = ResponseDTO<string>>(url: string, data?: object, headers?: HashMap<string, string>): Promise<T> {
     let config: AxiosRequestConfig = {
-      headers: HttpRequest.buildHeaderWithGlobalHeader(headers)
+      headers: HttpRequest.buildHeaderWithGlobalHeader(headers),
+      timeout:10000,
+      timeoutErrorMessage:"当前无网络，请重试"
     }
     return service.post(url, data, config)
   }
 
   static put<T = ResponseDTO<string>>(url: string, data?: object, headers?: HashMap<string, string>): Promise<T> {
     let config: AxiosRequestConfig = {
-      headers: HttpRequest.buildHeaderWithGlobalHeader(headers)
+      headers: HttpRequest.buildHeaderWithGlobalHeader(headers),
+      timeout:10000,
+      timeoutErrorMessage:"当前无网络，请重试"
     }
     return service.put(url, data, config)
   }
 
   static delete<T = ResponseDTO<string>>(url: string, headers?: HashMap<string, string>): Promise<T> {
     let config: AxiosRequestConfig = {
-      headers: HttpRequest.buildHeaderWithGlobalHeader(headers)
+      headers: HttpRequest.buildHeaderWithGlobalHeader(headers),
+      timeout:10000,
+      timeoutErrorMessage:"当前无网络，请重试"
     }
     return service.delete(url, config)
   }

@@ -154,7 +154,7 @@ export class PageHelper {
         }
        // Logger.debug(TAG, 'getPageInfo go on')
         this.parseGroup(pageModel, cacheIsSame)
-      }).catch(() => {
+      }).catch((err:Error) => {
         this.refreshUIEnd(pageModel, false)
         if (this.isPageLoaded(pageModel)) {
           return

@@ -15,7 +15,7 @@ import {
 } from 'wdBean';
 import { CompStyle } from 'wdConstant/Index';
 
-import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
+import { CollectionUtils, Logger, ResourcesUtils, StringUtils, ToastUtils } from 'wdKit';
 import { CacheData, ResponseDTO, } from 'wdNetwork';
 import { PageUIReqBean } from '../components/page/bean/PageUIReqBean';
 import { PageRepository } from '../repository/PageRepository';
@@ -240,6 +240,9 @@ export class PageViewModel extends BaseViewModel {
       }).catch((err: Error) => {
         Logger.error(TAG, `getPageInfo then,error.name : ${err.name},  error.message:${err.message}`);
         error(err);
+        if(err.message == "网络出小差了，请检查网络后重试"){
+          ToastUtils.shortToast(err.message)
+        }
       });
     });
   }