Merge pull request 'lyc-dev' (#175) from lyc-dev into main

src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue

@@ -21,6 +21,7 @@ import { sessionStore } from '@/utils/store'
 import { getSmarttalkPage } from '@/api/file'
 import * as commUtils from '@/utils/comm.js'
 import { getFileSuffix } from '@/utils/ruoyi.js'
+import { PPTApi } from '../../../api'
 
 const emit = defineEmits(['insertMaterial', 'close'])
 
@@ -60,73 +61,31 @@ 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)
 
-  if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
+  try {
-    emit('insertMaterial',{ type: 'video', file })
+    const data = await PPTApi.toRousrceUrl(file)
-  }
+    if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
-  else{
+      emit('insertMaterial',{ type: 'video', data })
-    emit('insertMaterial',{ type: 'img',  file })
-  }
-}
-
-
-
-const GetUrlParameters = (parameters) => {
-  let resData = "";
-
-  let url = document.location.toString();
-  let arrUrl = url.split("?");
-  // 判断是否有参数
-  if (arrUrl.length > 1) {
-    // 拆分参数字符串
-    let parametersArr = arrUrl[1].split("&");
-    // 循环查找参数
-    for (let i = 0; i <= parametersArr.length; i++) {
-      if (parametersArr[i]) {
-        // 拆分参数的键和值
-        let parameterStr = parametersArr[i].split("=");
-        if (parameters == parameterStr[0]) {
-            resData = parameterStr[1];
-            break;
-        }
-      }
     }
+    else{
+      emit('insertMaterial',{ type: 'img',  data })
+    }
+  } finally {
+    loading.value = false
   }
-  return resData;
 }
 
-const proxyToBase64 = (url)=> {
-  const dourl = GetUrlParameters(url)
-  console.log(dourl,'dourl')
-  return
-  axios({
-    url: "/api/logo.png",
-    method: "get",
-    responseType: "blob",
-  }).then((res) => {
-    const reader = new FileReader();
-    reader.readAsDataURL(res.data);
-    reader.onload = () => {
-      console.log(reader.result);
-    };
-  });
-}
-
-
-
-
 // 关闭
 const onClose = () =>{
   emit('close')
 }
 
-
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);

src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue

@@ -281,20 +281,17 @@ const toggleNotesPanel = () => {
 // 插入素材
 interface MaterialParams {
   type: string,
-  file: any
+  data: string
 }
-const insertMaterial = (item: MaterialParams) =>{
+const insertMaterial = async (item: MaterialParams) =>{
-  const { type, file } = item
+  const { type, data } = item
-  PPTApi.toRousrceUrl(file).then(data=>{
+  if(type == 'video'){
-    if(type == 'video'){
+    createVideoElement(data)
-      createVideoElement(data)
+  }
-    }
+  else{
-    else{
+    createImageElement(data)
-      createImageElement(data)
+  }
-    }
+  materiaVisible.value = false
-    materiaVisible.value = false
-  })
-  
 }
 
 // 文生图