Merge branch 'hqyDev' of http://git.dayaedu.com/lex/classroom-instruments into jenkins

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

@@ -642,8 +642,9 @@ export default defineComponent({
       item: Record<string, any>,
       instrumentId: string
     ) {
+      const teacherSaveFlag = item.teacherSaveFlag;
       // 当teacherSaveFlag为false时候，需要把平台数据转为老师自己的课件
-      if (!item.teacherSaveFlag) {
+      if (!teacherSaveFlag) {
         const dataRes = await api_coursewareToTeacherCourseware(item.id);
         item.teacherSaveFlag = true;
         // 这里需要拿最新的id
@@ -658,7 +659,8 @@ export default defineComponent({
         prepareStore.getSelectKey
       }&fromType=TEACHER`;
       window.open(href);
-      getCoursewareList();
+      // 刷新一下列表
+      !teacherSaveFlag && getCoursewareList();
     }
     onMounted(async () => {
       await useCatchStore().getSubjects();

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

@@ -71,7 +71,8 @@ export default defineComponent({
             name: item.name,
             coverImg: firstItem?.bizInfo.coverImg,
             type: firstItem?.bizInfo.type,
-            isAdd: item.addFlag
+            isAdd: item.addFlag,
+            coursewareType: item.coursewareType
           });
         });