Merge branch 'iteration-20240517' into jenkins-dev

src/views/prepare-lessons/components/directory-main/index.tsx

@@ -184,10 +184,14 @@ export default defineComponent({
           }
         });
         // 判断教材里面是否有当前选择的声部，如果没有则默认选择第一个
+        console.log(status, 'status');
         if (status) {
           const instrumentId = tempInstrumentId;
           sessionStorage.removeItem('prepareLessonCourseWareSubjectIsNull');
           prepareStore.setInstrumentId(instrumentId);
+        } else {
+          sessionStorage.removeItem('prepareLessonCourseWareSubjectIsNull');
+          prepareStore.setInstrumentId('');
         }
       }
 

vite.config.ts

@@ -67,8 +67,8 @@ export default defineConfig(() => {
         registerType: 'autoUpdate',
         includeAssets: ['./logo.png'],
         workbox: {
-          skipWaiting: true
-          // clientsClaim: true
+          skipWaiting: true,
+          clientsClaim: true
           // runtimeCaching: [
           //   {
           //     urlPattern: /(.*?)\.(js|css|ts|tsx|html)/, // js /css /ts静态资源缓存