Merge branch 'iteration-20250110-last' into dev

src/App.tsx

@@ -4,7 +4,7 @@ import { AppProvider } from './components/Application';
 import { RouterView } from 'vue-router';
 import setting from './settings/designSetting';
 import { lighten } from './utils';
-import RouterError from './components/RouterError';
+// import RouterError from './components/RouterError';
 import { useRegisterSW } from 'virtual:pwa-register/vue';
 import { useUserStore } from './store/modules/users';
 import UpdateTips from './update-tips';
@@ -222,7 +222,7 @@ export default defineComponent({
           dateLocale={dateZhCN}>
           <AppProvider>
             <RouterView />
-            <RouterError />
+            {/* <RouterError /> */}
           </AppProvider>
         </NConfigProvider>
         <NModal maskClosable={false} v-model:show={needRefresh.value}>

src/components/RouterError/index.tsx

@@ -62,25 +62,25 @@ export default defineComponent({
       }
     });
     router.beforeEach(async (to, from, next) => {
-      const flag = await versionCheck();
-      console.log('路由之前弹窗', `refreshing${refreshing},flag:${flag}`);
-      if (flag && !refreshing) {
-        refreshing = true;
-        // console.log('修改刷新',refreshing)
-        sessionStorage.setItem('isRouter', 'true');
-        // reloadPage();
-        //   showModalMask.value = true
-        // setTimeout(()=>{
-        //   const dom = document.getElementById('updateModel')
-        //   if(isError&&!dom){
-        //     reloadPage()
-        //   }
-        // },1000)
+      // const flag = await versionCheck();
+      // console.log('路由之前弹窗', `refreshing${refreshing},flag:${flag}`);
+      // if (flag && !refreshing) {
+      //   refreshing = true;
+      //   // console.log('修改刷新',refreshing)
+      //   sessionStorage.setItem('isRouter', 'true');
+      //   // reloadPage();
+      //   //   showModalMask.value = true
+      //   // setTimeout(()=>{
+      //   //   const dom = document.getElementById('updateModel')
+      //   //   if(isError&&!dom){
+      //   //     reloadPage()
+      //   //   }
+      //   // },1000)
 
-        //   setTimeout(()=>{
-        //    sessionStorage.removeItem('isRouter')
-        //  },60000)
-      }
+      //   //   setTimeout(()=>{
+      //   //    sessionStorage.removeItem('isRouter')
+      //   //  },60000)
+      // }
       next();
     });
     const checkNewVersion = async () => {
@@ -107,27 +107,27 @@ export default defineComponent({
 
         // 尝试监听install
 
-        navigator.serviceWorker.addEventListener(
-          'controllerchange',
-          async () => {
-            console.log('controllerchange刷新', route.path, 'path');
-            const flag = await versionCheck();
-            if (refreshing || route.path == '/attend-class' || !flag) {
-              return;
-            }
-            const isRouter = sessionStorage.getItem('isRouter');
-            if (!isRouter) {
-              // showModalMask.value = true
-              // reloadPage();
-            }
-            refreshing = true;
-          }
-        );
+        // navigator.serviceWorker.addEventListener(
+        //   'controllerchange',
+        //   async () => {
+        //     console.log('controllerchange刷新', route.path, 'path');
+        //     const flag = await versionCheck();
+        //     if (refreshing || route.path == '/attend-class' || !flag) {
+        //       return;
+        //     }
+        //     const isRouter = sessionStorage.getItem('isRouter');
+        //     if (!isRouter) {
+        //       // showModalMask.value = true
+        //       // reloadPage();
+        //     }
+        //     refreshing = true;
+        //   }
+        // );
       }
     };
 
     console.log(route.path, 'route.path');
-    checkNewVersion();
+    // checkNewVersion();
     onBeforeUnmount(() => {
       sessionStorage.removeItem('isRouter');
       window.removeEventListener('error', isChromeError);