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

@@ -21,7 +21,6 @@ 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'])
 
@@ -61,31 +60,73 @@ 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)
 
-  try {
+  if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
-    const data = await PPTApi.toRousrceUrl(file)
+    emit('insertMaterial',{ type: 'video', file })
-    if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
+  }
-      emit('insertMaterial',{ type: 'video', data })
+  else{
-    }
+    emit('insertMaterial',{ type: 'img',  file })
-    else{
-      emit('insertMaterial',{ type: 'img',  data })
-    }
-  } finally {
-    loading.value = false
   }
 }
 
+
+
+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;
+        }
+      }
+    }
+  }
+  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,17 +281,20 @@ const toggleNotesPanel = () => {
 // 插入素材
 interface MaterialParams {
   type: string,
-  data: string
+  file: any
 }
-const insertMaterial = async (item: MaterialParams) =>{
+const insertMaterial = (item: MaterialParams) =>{
-  const { type, data } = item
+  const { type, file } = item
-  if(type == 'video'){
+  PPTApi.toRousrceUrl(file).then(data=>{
-    createVideoElement(data)
+    if(type == 'video'){
-  }
+      createVideoElement(data)
-  else{
+    }
-    createImageElement(data)
+    else{
-  }
+      createImageElement(data)
-  materiaVisible.value = false
+    }
+    materiaVisible.value = false
+  })
+  
 }
 
 // 文生图