Merge branch 'iteration-class'

src/views/attend-class/model/train-settings/index.tsx

@@ -304,6 +304,7 @@ export default defineComponent({
           preset="card"
           title={'选择曲目'}>
           <SelectMusic
+            type="homework"
             onAdd={(item: any) => {
               trainForms.selectMusicStatus = false;
               onAdd(item);

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

@@ -57,7 +57,7 @@ export default defineComponent({
             prepareStore.setBaseCourseware(result[0]);
             id = result[0]?.id;
 
-            prepareStore.setSubjectList(selectItem.subjectList || []);
+            prepareStore.setSubjectList(result[0].subjectList || []);
           }
           setLastUseCoursewareId(id);
         }

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

@@ -613,6 +613,7 @@ export default defineComponent({
                   lessonCoursewareKnowledgeDetailId: prepareStore.selectKey,
                   classGroupId: item.classGroupId
                 });
+                forms.showAttendClass = false;
                 if (window.matchMedia('(display-mode: standalone)').matches) {
                   state.application = window.matchMedia(
                     '(display-mode: standalone)'

src/views/prepare-lessons/model/select-music/index.tsx

@@ -11,8 +11,15 @@ import CardPreview from '/src/components/card-preview';
 
 export default defineComponent({
   name: 'select-music',
+  props: {
+    type: {
+      type: String,
+      default: ''
+    }
+  },
   emits: ['add'],
   setup(props, { emit }) {
+    console.log(props.type);
     const prepareStore = usePrepareStore();
     const state = reactive({
       loading: false,
@@ -30,7 +37,8 @@ export default defineComponent({
       },
       tableList: [] as any,
       show: false,
-      item: {} as any
+      item: {} as any,
+      isShowAddDisabled: !prepareStore.getIsEditTrain
     });
     const getList = async () => {
       try {
@@ -58,6 +66,7 @@ export default defineComponent({
           });
         });
         state.tableList.push(...temp);
+
         state.finshed = data.pages <= data.current ? true : false;
       } catch {
         state.loading = false;
@@ -83,6 +92,9 @@ export default defineComponent({
     }, 500);
 
     onMounted(() => {
+      if (props.type === 'homework') {
+        state.isShowAddDisabled = false;
+      }
       getList();
     });
     return () => (
@@ -125,7 +137,7 @@ export default defineComponent({
                           isShowAdd
                           isShowCollect={false}
                           item={item}
-                          isShowAddDisabled={!prepareStore.getIsEditTrain}
+                          isShowAddDisabled={state.isShowAddDisabled}
                           onAdd={() => emit('add', item)}
                           disabledMouseHover={false}
                           onClick={() => {