Merge branch 'pingcode-20240615' into zcwy-zsx0223

src/components/drawers/AddOnline.vue

@@ -17,7 +17,7 @@
       </div>
       <div>
         <div class="contentMain" style="padding:20px">
-          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType">
+          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType" :courseIds="props.taskList" :projectId="props.id">
             <a-button type="primary" style="border-radius: 4px">{{
                 taskIndex === -1 ? "选择/新建课程" : "重新选择"
               }}
@@ -53,6 +53,7 @@ const props = defineProps({
   taskList: [],
   chapterList: []
 });
+
 const visible = ref(false);
 const onlineRef = ref(false);
 const taskIndex = ref(-1);
@@ -137,7 +138,6 @@ function confirm() {
 }
 
 function selectCourse(row) {
-  console.log(row);
   if (!props.courseSyncFlag && row.refId != props.id) {
     message.warning("请新建本项目在线课！");
     return;

src/components/drawers/CreateOnline.vue

@@ -14,7 +14,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 600px"
-      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}`"
+      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}&courseIds=${couresIdArray}&projectId=${props.projectId}`"
       name="myframe"
       security="restricted"
       sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
@@ -26,12 +26,23 @@ import {defineProps, ref} from "vue";
 import {iframeUrl} from "@/api/method";
 
 const visible = ref(false);
-
+const couresIdArray = ref();
 const props = defineProps({
   type: Number,
   id: Number,
+  courseIds: Array,
+  projectId: String
 });
-
+// 把任务列表里类型为在线课的课程ID放到数组里
+if(props.courseIds && props.courseIds.length){
+  var arr = []
+  for(var i = 0;i<props.courseIds.length;i++){
+    if(props.courseIds[i].type === 1){
+      arr.push(props.courseIds[i].courseId)
+    }
+  }
+  couresIdArray.value = arr
+}
 function openModal() {
   visible.value = true;
 }