Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online

.env.development

@@ -1,5 +1,5 @@
 
-VITE_APP_URL = "http://192.168.3.122:9527/pptApi"
+VITE_APP_URL = "http://localhost:9527/pptApi"
 
 ## 云教练地址
 VITE_YJL_URL = "https://test.kt.colexiu.com/instrument"

src/api/pptOperate.ts

@@ -13,7 +13,7 @@ export const getTeacherChapterKnowledgeMaterial = (id: string, fromType: queryPa
   })
 }
 
-// 保存信息
+// 老师端 保存信息
 export const putTeacherChapterKnowledgeMaterial = (data: { id: string; dataJson: string }) => {
   return httpAxios.axioseRquest({
     method: "post",
@@ -22,9 +22,19 @@ export const putTeacherChapterKnowledgeMaterial = (data: { id: string; dataJson:
   })
 }
 
+// 平台端 保存信息
+export const putChapterKnowledgeMaterialUpdate = (data: { id: string; dataJson: string }) => {
+  return httpAxios.axioseRquest({
+    method: "post",
+    url: "/edu-app/chapterKnowledgeMaterial/update",
+    data
+  })
+}
+
 // 获取曲目信息
-export const getMaterialQueryPage = (data: Record<string, any>) => {
+export const getMaterialQueryPage = (data: Record<string, any>, abortController: AbortController) => {
   return httpAxios.axioseRquest({
+    signal: abortController.signal,
     method: "post",
     url: "/edu-app/material/queryPage",
     data

src/hooks/useCreateElement.ts

@@ -322,7 +322,7 @@ export default () => {
    * 创建云教练元素
    * @param url 云教练地址
    */
-  const createCloudCoachElement = (sid: string) => {
+  const createCloudCoachElement = (sid: string, title: string) => {
     createElement({
       type: "elf",
       subtype: "elf-sing-play",
@@ -332,7 +332,8 @@ export default () => {
       rotate: 0,
       left: 0,
       top: 0,
-      sid
+      sid,
+      title
     })
   }
 

src/store/pptWork.ts

@@ -1,6 +1,6 @@
 import { defineStore } from "pinia"
 import { store } from "./index"
-import { getTeacherChapterKnowledgeMaterial, putTeacherChapterKnowledgeMaterial } from "@/api/pptOperate"
+import { getTeacherChapterKnowledgeMaterial, putTeacherChapterKnowledgeMaterial, putChapterKnowledgeMaterialUpdate } from "@/api/pptOperate"
 import { httpAjaxErrMsg } from "@/plugins/httpAjax"
 import { useRoute } from "vue-router"
 import LoadingBar from "@/plugins/loadingBar"
@@ -57,7 +57,7 @@ const useStore = defineStore("pptWork", {
       fileUpload(`${this.id}ppt`, blob, `${this.id}/`, false, { isLoading: false })
         .then(url => {
           const _time = Date.now()
-          httpAjaxErrMsg(putTeacherChapterKnowledgeMaterial, {
+          httpAjaxErrMsg(queryParams.fromType === "PLATFORM" ? putChapterKnowledgeMaterialUpdate : putTeacherChapterKnowledgeMaterial, {
             id: this.id,
             dataJson: JSON.stringify({
               coverImg: this.coverImg + `?v=_${_time}`, // 加上时间戳，防止资源更新之后的缓存

src/types/slides.ts

@@ -625,11 +625,14 @@ export interface PPTAudioElement extends PPTBaseElement {
  * subtype: elf-sing-play
  *
  * sid: 曲子id
+ *
+ * title：曲目名称
  */
 export interface PPTCloudCoachElement extends PPTBaseElement {
   type: "elf"
   subtype: "elf-sing-play"
   sid: string
+  title: string
 }
 
 export type PPTElement =

src/views/Editor/CanvasTool/index.vue

@@ -341,8 +341,8 @@ function handleUpload(fileData: UploadRequestOptions) {
 }
 
 // 处理云教练创建
-function handleCloudCoach(id: string) {
-  createCloudCoachElement(id)
+function handleCloudCoach(id: string, name: string) {
+  createCloudCoachElement(id, name)
   cloudCoachVisible.value = false
 }
 

src/views/Editor/Thumbnails/index.vue

@@ -86,7 +86,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, nextTick, ref, watch } from "vue"
+import { computed, nextTick, onMounted, ref, watch } from "vue"
 import { storeToRefs } from "pinia"
 import { useMainStore, useSlidesStore, useKeyboardStore } from "@/store"
 import { fillDigit } from "@/utils/common"
@@ -146,6 +146,16 @@ watch(
   }
 )
 
+// 从预览切换回来的时候 滚动到对应的位置
+onMounted(() => {
+  const activeThumbnailRef: HTMLElement = thumbnailsRef.value?.$el?.querySelector(".thumbnail-item.active")
+  if (thumbnailsRef.value && activeThumbnailRef && !isElementInViewport(activeThumbnailRef, thumbnailsRef.value.$el)) {
+    setTimeout(() => {
+      activeThumbnailRef.scrollIntoView()
+    }, 100)
+  }
+})
+
 // 切换页面
 const changeSlideIndex = (index: number) => {
   mainStore.setActiveElementIdList([])

src/views/components/element/cloudCoachElement/BaseCloudCoachElement.vue

@@ -9,17 +9,23 @@
     }"
   >
     <div class="rotate-wrapper" :style="{ transform: `rotate(${elementInfo.rotate}deg)` }">
-      <div class="element-content"></div>
+      <div class="element-content">
+        <div class="title" :style="{ fontSize: 14 / scale + 'px' }">{{ elementInfo.title || "乐谱" }}</div>
+      </div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import type { PPTCloudCoachElement } from "@/types/slides"
+import { ref, inject } from "vue"
+import { injectKeySlideScale } from "@/types/injectKey"
 
 defineProps<{
   elementInfo: PPTCloudCoachElement
 }>()
+
+const scale = inject(injectKeySlideScale) || ref(1)
 </script>
 
 <style lang="scss" scoped>
@@ -36,7 +42,14 @@ defineProps<{
   display: flex;
   justify-content: center;
   align-items: center;
-  background: url("./cloudCoachList//imgs/musicBg.png") no-repeat;
+  background: url("./cloudCoachList/imgs/musicBg.png") no-repeat;
   background-size: 100% 100%;
+  .title {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding: 0 40px;
+    color: #fff;
+  }
 }
 </style>

src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue

@@ -23,7 +23,7 @@
           </div>
         </div>
         <div class="query">
-          <Input :placeholder="'请输入搜索关键词'" v-model:value="queryData.name">
+          <Input :placeholder="'请输入搜索关键词'" v-model:value="queryData.name" @enter="handleQuery">
             <template #prefix>
               <img class="img" src="./imgs/query.png" alt="" />
             </template>
@@ -34,7 +34,7 @@
         </div>
       </div>
       <div class="musicListCon">
-        <div class="queryFrom">
+        <div class="queryFrom" :class="{ isExpandAct: !isExpand }">
           <div v-show="queryData.sourceType === 2" class="queryFromList">
             <div class="tit">教程：</div>
             <div class="queryFromCon">
@@ -97,6 +97,10 @@
             </div>
           </div>
         </div>
+        <div v-show="queryData.sourceType === 2" @click="isExpand = !isExpand" class="isExpand" :class="{ active: isExpand }">
+          <div>{{ isExpand ? "收起" : "展开" }}</div>
+          <img src="./imgs/jiao.png" alt="" />
+        </div>
         <div class="musicListConBox" v-loading="loading">
           <div class="musicList" :class="{ empty: !musicList.length && !loading }">
             <div class="musicListBox" v-if="musicList.length && !loading">
@@ -122,8 +126,14 @@
                   </div>
                 </div>
                 <div class="musicRight">
-                  <img class="sc" @click="handleFavorite(item)" :src="item.favoriteFlag ? scActImg : scImg" alt="" />
-                  <div class="addBtn" @click="handleAddMusic(item.id)">添加</div>
+                  <img
+                    v-if="queryParams.fromType !== 'PLATFORM'"
+                    class="sc"
+                    @click="handleFavorite(item)"
+                    :src="item.favoriteFlag ? scActImg : scImg"
+                    alt=""
+                  />
+                  <div class="addBtn" @click="handleAddMusic(item.id, item.name)">添加</div>
                 </div>
               </div>
             </div>
@@ -151,35 +161,44 @@ import { httpAjax } from "@/plugins/httpAjax"
 import queryParams from "@/queryParams"
 import scActImg from "./imgs/scAct.png"
 import scImg from "./imgs/sc.png"
+import { CODE_ERR_CANCELED } from "@/libs/auth"
 
 const emits = defineEmits<{
-  (event: "update", id: string): void
+  (event: "update", id: string, name: string): void
   (event: "close"): void
 }>()
 
-function handleAddMusic(id: string) {
-  emits("update", id)
+function handleAddMusic(id: string, name: string) {
+  emits("update", id, name)
   emits("close")
 }
 
-const tabData = [
-  {
-    label: "相关资源",
-    value: 5
-  },
-  {
-    label: "共享资源",
-    value: 2
-  },
-  {
-    label: "我的资源",
-    value: 3
-  },
-  {
-    label: "我的收藏",
-    value: 4
-  }
-]
+const tabData =
+  queryParams.fromType === "PLATFORM"
+    ? [
+        {
+          label: "共享资源",
+          value: 2
+        }
+      ]
+    : [
+        {
+          label: "相关资源",
+          value: 5
+        },
+        {
+          label: "共享资源",
+          value: 2
+        },
+        {
+          label: "我的资源",
+          value: 3
+        },
+        {
+          label: "我的收藏",
+          value: 4
+        }
+      ]
 // 场景
 const audioPlayTypesOption = [
   { text: "全部", value: "" },
@@ -196,7 +215,7 @@ const queryData = reactive({
   page: 1,
   rows: 21,
   total: 0,
-  sourceType: 5,
+  sourceType: tabData[0].value,
   name: "",
   bookVersionId: "",
   audioPlayTypes: "",
@@ -209,6 +228,7 @@ const queryData = reactive({
 const musicList = ref<any[]>([])
 const loading = ref(true)
 const vLoading = ElLoading.directive
+const isExpand = ref(true)
 
 getQueryList()
 function getQueryList() {
@@ -270,6 +290,7 @@ function clearQueryData() {
 }
 function handleTabChange(sourceType: number) {
   clearQueryData()
+  isExpand.value = true
   queryData.sourceType = sourceType
   handleQuery()
 }
@@ -301,6 +322,8 @@ function handleQuery() {
   queryData.rows = 21
   handleGetQuery()
 }
+
+let controller: AbortController
 function handleGetQuery() {
   loading.value = true
   let { sourceType, subject, audioPlayTypes, name, page, rows, bookVersionId } = queryData
@@ -367,7 +390,15 @@ function handleGetQuery() {
       audioPlayTypes: audioPlayTypesParams
     }
   }
-  httpAjax(getMaterialQueryPage, params).then(res => {
+  if (controller) {
+    controller.abort()
+  }
+  controller = new AbortController()
+  httpAjax(getMaterialQueryPage, params, controller).then(res => {
+    // 自己关闭的时候不取消加载
+    if (res.code === CODE_ERR_CANCELED) {
+      return
+    }
     if (res.code === 200) {
       musicList.value = res.data.rows.map((item: any) => {
         item.name = highlightedText(item.name, queryData.name)
@@ -537,6 +568,11 @@ const highlightedText = (text: string, query: string) => {
       display: flex;
       flex-direction: column;
       .queryFrom {
+        &.isExpandAct {
+          height: 42px;
+          overflow: hidden;
+        }
+        flex-shrink: 0;
         padding: 0 30px;
         .queryFromList {
           display: flex;
@@ -585,6 +621,30 @@ const highlightedText = (text: string, query: string) => {
           }
         }
       }
+      .isExpand {
+        flex-shrink: 0;
+        margin-bottom: 12px;
+        cursor: pointer;
+        display: flex;
+        justify-content: center;
+        font-weight: 400;
+        font-size: 14px;
+        color: #198cfe;
+        line-height: 20px;
+        align-items: center;
+        &:hover {
+          opacity: 0.8;
+        }
+        &.active > img {
+          transform: rotate(0deg);
+        }
+        & > img {
+          transform: rotate(180deg);
+          margin-left: 4px;
+          width: 10px;
+          height: 10px;
+        }
+      }
       .musicListConBox {
         flex-grow: 1;
         overflow: hidden;
@@ -613,6 +673,7 @@ const highlightedText = (text: string, query: string) => {
               display: flex;
               justify-content: space-between;
               align-items: center;
+              height: 102px;
               &:nth-last-child(-n + 3) {
                 margin-bottom: 0;
               }

src/views/components/element/cloudCoachElement/cloudCoachPlayer/cloudCoachPlayer.vue

@@ -8,8 +8,12 @@
     }"
   >
     <div v-if="loading" class="loading-overlay">
-      <div class="spinner"></div>
-      <div class="text">云教练加载中...</div>
+      <div class="loadingBox">
+        <div class="loadingItem"></div>
+        <div class="loadingItem"></div>
+        <div class="loadingItem"></div>
+        <div class="loadingItem"></div>
+      </div>
     </div>
     <iframe class="musicIframe" frameborder="0" :src="url" @load="handleIframeLoad"></iframe>
   </div>
@@ -37,7 +41,7 @@ const url = computed(() => {
 })
 
 // 先关闭这个功能
-const loading = ref(false)
+const loading = ref(true)
 function handleIframeLoad() {
   loading.value = false
 }
@@ -69,23 +73,33 @@ function handleIframeLoad() {
     flex-direction: column;
     z-index: 10;
     color: #fff;
-    background-color: #213793;
-    .spinner {
-      border: 4px solid #f3f3f3;
-      border-top: 4px solid #213793;
-      border-radius: 50%;
-      width: 40px;
-      height: 40px;
-      animation: spin 1s linear infinite;
-    }
-    .text {
-      margin-top: 10px;
+    background: url("../cloudCoachList/imgs/musicBg.png");
+    background-size: cover;
+    .loadingBox {
+      width: 36px;
+      height: 36px;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      align-content: space-between;
+      margin-bottom: 28px;
+      animation: rotate 1.5s linear infinite;
+      .loadingItem {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background: #569cfe;
+        opacity: 0.5;
+        &:nth-child(2) {
+          opacity: 1;
+        }
+      }
     }
-    @keyframes spin {
-      0% {
+    @keyframes rotate {
+      from {
         transform: rotate(0deg);
       }
-      100% {
+      to {
         transform: rotate(360deg);
       }
     }