Merge branch 'feature-tianyong' into online

src/components/card-preview/index.module.less

@@ -16,4 +16,10 @@
       text-overflow: ellipsis;
     }
   }
+}
+.maxCard {
+  width: 1200px;
+  .pptBox {
+    height: 700px;
+  }
 }

src/components/card-preview/index.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
           }}
           preset="card"
           showIcon={false}
-          class={['modalTitle background', styles.cardPreview]}
+          class={['modalTitle background', styles.cardPreview, item.value.type === 'PPT' && styles.maxCard]}
           title={item.value.title}
           blockScroll={false}>
           {item.value.type === 'VIDEO' && (
@@ -53,8 +53,8 @@ export default defineComponent({
           )}
           {item.value.type === 'MUSIC' && <MusicModal item={item.value} />}
           {item.value.type === 'SONG' && <SongModal item={item.value} />}
-
-          {!['VIDEO', 'MUSIC', 'SONG'].includes(item.value.type) && (
+          {item.value.type === 'PPT' && <iframe class={styles.pptBox} src={`https://view.officeapps.live.com/op/embed.aspx?src=${encodeURIComponent(item.value.content)}`} width='100%' height='100%' frameborder='1'></iframe>}  
+          {!['VIDEO', 'MUSIC', 'SONG', 'PPT'].includes(item.value.type) && (
             <TheEmpty />
           )}
         </NModal>

src/components/card-type/index.tsx

@@ -5,15 +5,17 @@ import iconImage from '@common/images/icon-image.png';
 import iconVideo from '@common/images/icon-video.png';
 import iconAudio from '@common/images/icon-audio.png';
 import iconMusic from '@common/images/icon-music.png';
+import iconPPT from '@common/images/icon-ppt.png';
 import iconCollectDefault from '@common/images/icon-collect-default.png';
 import iconCollectActive from '@common/images/icon-collect-active.png';
 import TheNoticeBar from '../TheNoticeBar';
 import AudioPlayer from './audio-player';
 import VideoPlayer from './video-player';
+import { PageEnum } from '/src/enums/pageEnum';
 
 type itemType = {
   id: string | number;
-  type: 'IMG' | 'VIDEO' | 'SONG' | 'MUSIC';
+  type: 'IMG' | 'VIDEO' | 'SONG' | 'MUSIC' | 'PPT';
   coverImg: string;
   content?: string;
   title: string;
@@ -99,6 +101,9 @@ export default defineComponent({
         case 'MUSIC':
           typeImg = iconMusic;
           break;
+        case 'PPT':
+          typeImg = iconPPT;
+          break;          
       }
       return typeImg;
     };
@@ -183,6 +188,16 @@ export default defineComponent({
                     previewDisabled={props.disabledMouseHover}
                   />
                 )}
+                {/* ppt */}
+                {props.item.type === 'PPT' && (
+                  <NImage
+                    class={[styles.cover, styles.image]}
+                    lazy
+                    previewDisabled={true}
+                    objectFit="cover"
+                    src={props.item.coverImg || PageEnum.PPT_DEFAULT_COVER}
+                  />
+                )}                
               </>
             ),
             footer: () => (

src/enums/pageEnum.ts

@@ -11,7 +11,9 @@ export enum PageEnum {
   // BASE_HOME_REDIRECT = '/dashboard/console',
   // // 错误
   // ERROR_PAGE_NAME = 'ErrorPage'
-  SONG_DEFAULT_COVER = 'https://oss.dayaedu.com/ktqy/1698420034679a22d3f7a.png'
+  SONG_DEFAULT_COVER = 'https://oss.dayaedu.com/ktqy/1698420034679a22d3f7a.png',
+  // ppt封面
+  PPT_DEFAULT_COVER = 'https://oss.dayaedu.com/ktqy/12/1701931810284.png'
 }
 
 export const NaturalType: { [_: string]: string } = {
@@ -25,5 +27,6 @@ export enum NaturalTypeEnum {
   IMG = 'IMG',
   VIDEO = 'VIDEO',
   MUSIC = 'MUSIC',
-  SONG = 'SONG'
+  SONG = 'SONG',
+  PPT = 'PPT'
 }

src/utils/contants.ts

@@ -26,7 +26,8 @@ export const resourceType = {
   MUSIC: '乐谱',
   IMG: '图片',
   SONG: '音频',
-  VIDEO: '视频'
+  VIDEO: '视频',
+  PPT: 'PPT'
 };
 
 /**

src/views/attend-class/index.module.less

@@ -607,4 +607,19 @@
       }
     }
   }
+}
+
+.iframePpt {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  .pptBox {
+    position: absolute;
+    width: 100%;
+    height: 80%;
+    left: 0;
+    top: 10%;
+    z-index: 9;
+    background: transparent;
+  }
 }

src/views/attend-class/index.tsx

@@ -279,6 +279,7 @@ export default defineComponent({
     };
 
     onMounted(() => {
+      // debugger
       // initMoveable();
       const query = route.query;
       console.log(query, props.preStudentNum, '学生人数');
@@ -470,6 +471,19 @@ export default defineComponent({
       }
     };
 
+    // ppt iframe 点击事件
+    // const iframeClick = () => {
+		// 	if(document.all) {
+		// 		document.getElementById("iframe-ppt")?.attachEvent("click", () => {
+    //       activeData.model = !activeData.model
+    //     });
+		// 	} else {
+		// 		document.getElementById("iframe-ppt")?.contentWindow?.postMessage({
+    //       api: 'onAttendToggleMenu'
+    //     }, '*');
+		// 	}
+		// }
+
     // 切换播放
     // const togglePlay = (m: any, isPlay: boolean) => {
     //   if (isPlay) {
@@ -555,6 +569,7 @@ export default defineComponent({
       acitveTimer.value = setTimeout(
         () => {
           const item = data.itemList[index];
+          
           if (item) {
             if (item.type == 'MUSIC') {
               activeData.model = true;
@@ -582,6 +597,9 @@ export default defineComponent({
                 data.animationState = 'end'
               });
             }
+            if (item.type === 'PPT') {
+              //
+            }
           }
         },
         activeData.isAnimation ? 800 : 0
@@ -1090,6 +1108,9 @@ export default defineComponent({
                 {data.itemList.map((m: any, mIndex: number) => {
                   const isRender = Math.abs(popupData.activeIndex - mIndex) < 2;
                   const isEmtry = Math.abs(popupData.activeIndex - mIndex) > 4;
+                  // if (isRender && m.type === 'PPT') {
+                  //   setTimeout(() => iframeClick() ,500)
+                  // }
                   // if (isRender) {
                   //   m.isRender = true;
                   // }
@@ -1203,7 +1224,12 @@ export default defineComponent({
                             }
                           }}
                         />
-                      ) : (
+                      ) 
+                      : m.type === 'PPT' ? <div class={styles.iframePpt}>
+                        <div class={styles.pptBox}></div>
+                        <iframe src={`https://view.officeapps.live.com/op/embed.aspx?src=${encodeURIComponent(m.content)}`} width='100%' height='100%' frameborder='1'></iframe>
+                      </div>
+                      : (
                         <MusicScore
                           activeModel={activeData.model}
                           activeStatus={popupData.activeIndex === mIndex}

src/views/natural-resources/components/my-resources/save-modal/index.tsx

@@ -97,6 +97,8 @@ export default defineComponent({
         ? NaturalTypeEnum.SONG
         : file.type.includes('video')
         ? NaturalTypeEnum.VIDEO
+        : file.type.includes('vnd.openxmlformats-officedocument.presentationml.presentation') || file.type.includes('vnd.ms-powerpoint')
+        ? NaturalTypeEnum.PPT
         : 'other';
 
       console.log(type, 'type');
@@ -188,6 +190,8 @@ export default defineComponent({
         coverImg = options.file.url;
       } else if (type === 'SONG') {
         coverImg = PageEnum.SONG_DEFAULT_COVER;
+      } else if (type === 'PPT') {
+        coverImg = PageEnum.PPT_DEFAULT_COVER;
       } else if (type === 'VIDEO') {
         // 获取视频封面图
         coverImg = await getVideoCoverImg(item.tempFiileBuffer);
@@ -323,7 +327,7 @@ export default defineComponent({
           // }}
           customRequest={onCustomRequest}
           v-model:fileList={fileListRef.value}
-          accept=".jpg,jpeg,.png,audio/mp3,video/mp4"
+          accept=".jpg,jpeg,.png,audio/mp3,video/mp4,application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation"
           multiple={true}
           max={10}
           // disabled={props.disabled}
@@ -339,7 +343,7 @@ export default defineComponent({
               <div class={styles.iconUploadAdd} />
               <h3>点击或者拖动文件到该区域来上传</h3>
               <p>
-                仅支持JPG、PNG、MP3、MP4格式文件，单次最多支持
+                仅支持JPG、PNG、MP3、MP4、PPT格式文件，单次最多支持
                 <br />
                 上传10个文件
               </p>

src/views/natural-resources/components/my-resources/upload-modal/index.tsx

@@ -25,6 +25,7 @@ import iconImage from '@common/images/icon-image.png';
 import iconVideo from '@common/images/icon-video.png';
 import iconAudio from '@common/images/icon-audio.png';
 import iconMusic from '@common/images/icon-music.png';
+import iconPPT from '@common/images/icon-ppt.png';
 import iconUploadDelete from '../../../images/btn-remove.png';
 import { materialSave, materialUpdateAll } from '../../../api';
 import { NaturalTypeEnum } from '@/enums/pageEnum';
@@ -37,6 +38,8 @@ export const formatUrlType = (url: string) => {
     return NaturalTypeEnum.SONG;
   } else if (url?.indexOf('.mp4') > -1) {
     return NaturalTypeEnum.VIDEO;
+  } else if (url?.indexOf('.ppt') > -1) {
+    return NaturalTypeEnum.PPT;
   } else {
     return NaturalTypeEnum.IMG;
   }
@@ -86,6 +89,9 @@ export default defineComponent({
         case 'MUSIC':
           typeImg = iconMusic;
           break;
+        case 'PPT':
+          typeImg = iconPPT;
+          break;          
       }
       return typeImg;
     };

src/views/prepare-lessons/components/resource-main/components/resource-item/resource-search-group/index.module.less

@@ -18,6 +18,9 @@
       font-size: 15px;
       --n-height: 40px !important;
     }
+    .n-space {
+      flex-wrap: nowrap !important;
+    }
   }
 }