Merge branch 'iteration-classroom' into dev

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

@@ -425,7 +425,7 @@ export default defineComponent({
               ]}
               labelField="name"
               valueField="id"
-              value={forms.subjectId}
+              v-model:value={forms.subjectId}
               onUpdate:value={(val: any) => {
                 prepareStore.setSubjectId(val);
                 // 保存

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

@@ -104,7 +104,8 @@ export default defineComponent({
         type: '',
         subjectId: '',
         detailId: ''
-      } as any
+      } as any,
+      addOtherSource: false
     });
 
     // 获取列表
@@ -827,6 +828,28 @@ export default defineComponent({
             }}
           />
         </NModal>
+
+        {/* 添加其它类型的资源 */}
+        <NModal
+          v-model:show={forms.addOtherSource}
+          preset="card"
+          class={['modalTitle background', styles.addOtherSource]}
+          title={'同步声部'}>
+          <SubjectSync
+            subjectId={prepareStore.getSubjectId as any}
+            onClose={() => (forms.addOtherSource = false)}
+            onConfirm={async (subjectIds: any) => {
+              //
+              try {
+                forms.editSubjectIds = subjectIds.join(',');
+                await onOverEdit();
+                forms.addOtherSource = false;
+              } catch {
+                //
+              }
+            }}
+          />
+        </NModal>
       </div>
     );
   }

src/views/prepare-lessons/components/resource-main/components/resource-item/index.tsx

@@ -63,7 +63,11 @@ export default defineComponent({
         }
         const { data } = await materialQueryPage({
           ...state.searchGroup,
-          ...state.pagination
+          ...state.pagination,
+          lessonCoursewareKnowledgeId:
+            props.type === 'relateResources' || props.type === 'shareResources'
+              ? prepareStore.getSelectKey
+              : null
           // subjectId: prepareStore.getSubjectId
         });
         state.loading = false;

src/views/prepare-lessons/model/add-item-model/index.tsx

@@ -40,7 +40,6 @@ export default defineComponent({
             round
             type="primary"
             onClick={() => {
-              console.log(selects.value, '1221');
               emit('confirm', selects.value);
             }}>
             确定

src/views/prepare-lessons/model/select-resources/select-item/index.tsx

@@ -75,7 +75,11 @@ export default defineComponent({
         }
         const { data } = await materialQueryPage({
           ...state.searchGroup,
-          ...state.pagination
+          ...state.pagination,
+          lessonCoursewareKnowledgeId:
+            props.type === 'relateResources' || props.type === 'shareResources'
+              ? prepareStore.getSelectKey
+              : null
         });
         state.loading = false;
         const tempRows = data.rows || [];