From 99c26145d8de8832d9c9b2e5750a6587cbc24448 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 12 Dec 2024 17:14:39 +0800
Subject: [PATCH 1/2] edit

---
 .../Editor/CanvasTool/MaterialDialog.vue      | 13 +++++++--
 .../src/views/Editor/CanvasTool/index.vue     | 28 +++++++++++++------
 src/renderer/src/layout/components/Header.vue |  1 -
 .../views/teachingDesign/container/right.vue  |  3 --
 4 files changed, 29 insertions(+), 16 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 9ad6322..a680871 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
@@ -20,6 +20,7 @@ import { ref, reactive, onMounted, computed } from 'vue';
 import { sessionStore } from '@/utils/store'
 import { getSmarttalkPage } from '@/api/file'
 import { getFileSuffix, urlToBase64 } from '@/utils/ruoyi.js'
+import * as commUtils from '@/utils/comm.js'
 
 const emit = defineEmits(['insertMaterial', 'close'])
 
@@ -62,12 +63,18 @@ const fileUrl = computed(() => (item) =>{
 
 // 插入
 const onInsert = async (item) =>{
+  
+  const bolb = commUtils.base64ToBlob(item.fileFullPath)
+
+  const file = commutils.blobToFile(bolb, item.fileShowName)
+
+
+
   if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
-    emit('insertMaterial',{ type: 'video', data: item.fileFullPath })
+    emit('insertMaterial',{ type: 'video', file })
   }
   else{
-    const base64 = await urlToBase64(item.fileFullPath)
-    emit('insertMaterial',{ type: 'img', data: base64 })
+    emit('insertMaterial',{ type: 'img',  file })
   }
 }
 
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 879865f..7780a65 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -132,7 +132,7 @@
     <Modal
     v-model:visible="imgVisible" 
     :width="1300">
-      <TextCreateImg hasPPt @insertImg="(url: string) => { createImageElement(url); imgVisible = false }" />
+      <TextCreateImg hasPPt @insertImg="insertImg" />
     </Modal>
   </div>
 </template>
@@ -165,6 +165,7 @@ import { PPTApi } from '../../../api'
 import TextCreateImg from '@/components/ai-kolors/index.vue'
 import { toPng } from 'html-to-image' // 引入html-to-image库
 
+
 const mainStore = useMainStore()
 const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
 const { canUndo, canRedo } = storeToRefs(useSnapshotStore())
@@ -274,21 +275,30 @@ const toggleNotesPanel = () => {
 // 插入素材
 interface MaterialParams {
   type: string,
-  data: string
+  file: any
 }
 const insertMaterial = (item: MaterialParams) =>{
-  const { type, data } = item
-  if(type == 'video'){
-    createVideoElement(data)
-  }
-  else{
-    createImageElement(data)
-  }
+  const { type, file } = item
+  PPTApi.toRousrceUrl(file).then(data=>{
+    if(type == 'video'){
+      createVideoElement(data)
+    }
+    else{
+      createImageElement(data)
+    }
+  })
   materiaVisible.value = false
 }
 
 // 文生图
 const imgVisible = ref(false)
+const insertImg = async (file: any) =>{
+  PPTApi.toRousrceUrl(file).then(data=>{
+    createImageElement(data)
+    imgVisible.value = false
+  })
+}
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index d993102..f2cd554 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -44,7 +44,6 @@ const breadList = ref([])
 watch(
   () => router.currentRoute.value,
   (newValue) => {
-    console.log(newValue)
     const { showBread }  = newValue.meta
     if (showBread) {
       isShowBack.value = true
diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue
index 24af068..ce7157e 100644
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@@ -96,7 +96,6 @@ const pgDialog = reactive({ // 弹窗-进度条
   }
 })
 emitter.on('changeMode', (item) => {
-  console.log(item, 'item')
   resultList.value = item.child
   // conversation()
   getTempResult(item.id)
@@ -106,7 +105,6 @@ emitter.on('changeMode', (item) => {
 // 查询模板结果
 const getTempResult = (id) => {
   tempResult({ mainModelId: id }).then(res => {
-    console.log(res, 2000)
     let rows = res.rows
     if (rows.length > 0) {
       resultList.value.forEach(item => {
@@ -357,7 +355,6 @@ const toRousrceUrl = async(o) => {
 const curNode = reactive({})
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
-  console.log('data', sessionStore)
   Object.assign(curNode, data);
   courseObj.node = data
 
-- 
2.44.0.windows.1


From a379176496ae557438d2685308cddffe26b1f1cb Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 13 Dec 2024 09:47:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?edti=20=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

---
 .../src/views/Editor/CanvasTool/MaterialDialog.vue    | 11 ++++-------
 .../AixPPTist/src/views/Editor/CanvasTool/index.vue   |  3 ++-
 src/renderer/src/components/ai-kolors/index.vue       | 11 ++++++-----
 3 files changed, 12 insertions(+), 13 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 a680871..26c852e 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
@@ -19,8 +19,8 @@
 import { ref, reactive, onMounted, computed } from 'vue';
 import { sessionStore } from '@/utils/store'
 import { getSmarttalkPage } from '@/api/file'
-import { getFileSuffix, urlToBase64 } from '@/utils/ruoyi.js'
 import * as commUtils from '@/utils/comm.js'
+import { getFileSuffix } from '@/utils/ruoyi.js'
 
 const emit = defineEmits(['insertMaterial', 'close'])
 
@@ -63,12 +63,9 @@ const fileUrl = computed(() => (item) =>{
 
 // 插入
 const onInsert = async (item) =>{
-  
-  const bolb = commUtils.base64ToBlob(item.fileFullPath)
-
-  const file = commutils.blobToFile(bolb, item.fileShowName)
-
-
+  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){
     emit('insertMaterial',{ type: 'video', file })
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 2ccd34a..ad51dd9 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -292,8 +292,9 @@ const insertMaterial = (item: MaterialParams) =>{
     else{
       createImageElement(data)
     }
+    materiaVisible.value = false
   })
-  materiaVisible.value = false
+  
 }
 
 // 文生图
diff --git a/src/renderer/src/components/ai-kolors/index.vue b/src/renderer/src/components/ai-kolors/index.vue
index 2276d95..d9d78c0 100644
--- a/src/renderer/src/components/ai-kolors/index.vue
+++ b/src/renderer/src/components/ai-kolors/index.vue
@@ -482,10 +482,7 @@ export default {
 
     //保存图片到素材库
     async saveImage(resultIndex, index, url, resultItem) {
-      if(this.hasPPt){
-        this.$emit('insertImg', url)
-        return
-      }
+
       this.buttonStates[resultIndex][index].disabled = true;
       this.buttonStates[resultIndex][index].text = "正在保存...";
       const numberIndex = url.indexOf('filename=');
@@ -494,6 +491,7 @@ export default {
       const finalPath = path.substring(0, pngIndex + 4);
       try {
         const blob = await this.getImageBlob(`https://ai.ysaix.com:7853/view?filename=${finalPath}&type=temp`);
+          
 
         const hash = CryptoJS.MD5(blob).toString();
 
@@ -502,7 +500,10 @@ export default {
         let file = new File([blob], `${resultItem}.png`, {
           type: 'image/png'
         })
-
+        if(this.hasPPt){
+          this.$emit('insertImg', file)
+          return
+        }
         // 添加参数
         formData.append('md5', hash);
         formData.append('file', file);
-- 
2.44.0.windows.1