From a5be937eb36cb98a08526be903cf68db409efb8e Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Fri, 10 Jan 2025 14:16:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/Editor/CanvasTool/MaterialDialog.vue   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
index 7402fe8..29ab75a 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
@@ -48,6 +48,7 @@ const init = () => {
     if(res.rows && res.rows.length){
       // 过滤出图片和视频
       list.value = res.rows.filter( item => suffixAry.indexOf(getFileSuffix(item.fileShowName)) != -1)
+      console.log(list.value)
     }
   })
 }
@@ -64,12 +65,13 @@ const fileUrl = computed(() => (item) =>{
 // 插入
 const onInsert = async (item) =>{
   loading.value = true
-  const res = await fetch(item.fileFullPath)
-  const bolb = await res.blob()
-  const file = commUtils.blobToFile(bolb, item.fileShowName)
-
+  console.log('item', item)
+  // const res = await fetch(item.fileFullPath)
+  // const bolb = await res.blob()
+  // const file = commUtils.blobToFile(bolb, item.fileShowName)
+  const data=item.fileFullPath
   try {
-    const data = await PPTApi.toRousrceUrl(file)
+    // const data = await PPTApi.toRousrceUrl(file)
     if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
       emit('insertMaterial',{ type: 'video', data })
     }
-- 
2.44.0.windows.1


From 07ab1b6a848b3e9835fb30fe6fca6263f3387606 Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Fri, 10 Jan 2025 15:06:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=B4=A0=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/CanvasTool/MaterialDialog.vue      | 35 +++++++++++++------
 .../src/views/Editor/CanvasTool/index.vue     |  2 ++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
index 154965f..9bded7c 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
@@ -5,14 +5,21 @@
   </header>
   <div class="flex material-list" v-loading="loading">
     <div class="flex material-item" v-for="item in list" :key="item.id" >
-      <div class="flex">
-        <el-image :src="fileUrl(item)" class="img" />
-        <el-text truncated>{{ item.fileShowName }}</el-text>
+      <div class="flex material-item">
+        <el-image  v-if="item.fileType.indexOf('image')!=-1" :src="fileUrl(item)" class="img" />
+        <svg v-if="item.fileType.indexOf('video')!=-1" class="icon file-icon" aria-hidden="true" :style="{ 'font-size': 100 + 'px' }">
+          <use :xlink:href="'#icon-video'"></use>
+        </svg>
+        <svg class="icon file-icon" v-if="item.fileType.indexOf('audio')!=-1" aria-hidden="true" :style="{ 'font-size': 100 + 'px' }">
+          <use :xlink:href="'#icon-mp'"></use>
+        </svg>
+        <div class="texts">{{ item.fileShowName }}</div>
+        <!-- <el-text  truncated>{{ item.fileShowName }}</el-text> -->
       </div>
-      <el-button type="primary" @click="onInsert(item)">插入</el-button>
+      <el-button style="margin-left: 10px;" type="primary" @click="onInsert(item)">插入</el-button>
     </div>
     <el-empty description="暂无素材" v-if="!list.length" />
-  </div>
+</div>
 </template>
 
 <script setup>
@@ -65,17 +72,19 @@ const fileUrl = computed(() => (item) =>{
 // 插入
 const onInsert = async (item) =>{
   loading.value = true
-  console.log('item', item)
+  
   // const res = await fetch(item.fileFullPath)
   // const bolb = await res.blob()
   // const file = commUtils.blobToFile(bolb, item.fileShowName)
   const data=item.fileFullPath
   try {
+    console.log('item', item)
     // const data = await PPTApi.toRousrceUrl(file)
     if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
-      emit('insertMaterial',{ type: 'video', data })
-    }
-    else{
+      emit('insertMaterial',{ type: 'video',  data })
+    }else if(item.fileType.indexOf('audio') != -1){
+      emit('insertMaterial',{ type: 'audio',  data })
+    }else{
       emit('insertMaterial',{ type: 'img',  data })
     }
   } finally {
@@ -127,11 +136,17 @@ onMounted(() => {
   align-items: center;
   margin-bottom: 10px;
   font-size: 14px;
-  justify-content: space-between;
+
   .img{
     width: 100px;
     height: 100px;
     margin-right: 20px;
   }
 }
+.texts{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 600px;
+}
 </style>
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
index 64da59a..3d461a1 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -287,6 +287,8 @@ const insertMaterial = async (item: MaterialParams) =>{
   const { type, data } = item
   if(type == 'video'){
     createVideoElement(data)
+  }else if(type == 'audio'){
+    createAudioElement(data)
   }
   else{
     createImageElement(data)
-- 
2.44.0.windows.1