Merge branch 'iteration-20240603-bug' into jenkins

public/version.json

@@ -1 +1 @@
-{"version":1717409993311}
+{"version":1717551606737}

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

@@ -183,6 +183,7 @@ export default defineComponent({
             });
           }
         });
+        await getLessonCoursewareDetail();
         // 判断教材里面是否有当前选择的声部，如果没有则默认选择第一个
         console.log(status, 'status');
         if (status) {
@@ -195,7 +196,6 @@ export default defineComponent({
         }
       }
 
-      getLessonCoursewareDetail();
       setLastUseCoursewareId(item.id);
     };
 

src/views/prepare-lessons/components/lesson-main/courseware-presets/index.tsx

@@ -115,6 +115,7 @@ export default defineComponent({
         if (!Array.isArray(data)) {
           return;
         }
+
         const tempList: any = [];
         data.forEach((item: any) => {
           // const firstItem: any =
@@ -143,14 +144,22 @@ export default defineComponent({
     };
 
     // 监听选择的key 左侧选择了其它的课
+    let timer: any = null;
     watch(
       () => [prepareStore.getSelectKey, prepareStore.getInstrumentId],
       async () => {
-        eventGlobal.emit('openCoursewareChanged');
-        await getCoursewareList();
-        // await getOpenCoursewareList();
-
-        subjectRef.value?.syncBarPosition();
+        clearTimeout(timer);
+        timer = setTimeout(async () => {
+          if (!prepareStore.getInstrumentId) {
+            // 获取教材分类列表
+            checkInstrumentIds();
+          } else {
+            getInitInstrumentId();
+          }
+          eventGlobal.emit('openCoursewareChanged');
+          await getCoursewareList();
+          subjectRef.value?.syncBarPosition();
+        }, 100);
       }
     );
 
@@ -446,7 +455,6 @@ export default defineComponent({
             paneWrapperClass={styles.paneWrapperContainer}
             value={tabInstrumentValue.value}
             onUpdate:value={(val: any) => {
-              console.log(val, 'item.id', prepareStore.getFormatInstrumentList);
               prepareStore.getFormatInstrumentList.forEach((item: any) => {
                 if (item.value.toString() === val.toString()) {
                   prepareStore.setInstrumentId(val);