Merge pull request 'baigl' (#100) from baigl into main

Reviewed-on: #100

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

@@ -162,6 +162,7 @@ import PopoverMenuItem from '../../../components/PopoverMenuItem.vue'
 import QuestToPPTist from '@/views/classTask/newClassTaskAssign/questToPPTist/index.vue'
 import MaterialDialog from './MaterialDialog.vue'
 import TextCreateImg from '@/components/ai-kolors/index.vue'
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
 
 const mainStore = useMainStore()
 const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
@@ -199,8 +200,10 @@ const insertImageElement = (files: FileList) => {
   getImageDataURL(imageFile).then(dataURL => createImageElement(dataURL))
 }
 
-const onhtml2canvas = (imgbs64: string) => {
-  createImageElement(imgbs64)
+const onhtml2canvas = async (html: HTMLElement) => {
+  //createImageElement(imgbs64);
+  const ele = await toPng(html)
+  createImageElement(ele);
 }
 
 const shapePoolVisible = ref(false)

src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue

@@ -118,7 +118,7 @@
 import { Search } from '@element-plus/icons-vue'
 import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import html2canvas from 'html2canvas';
+// import html2canvas from 'html2canvas';
 
 import { listEntpcoursework, listEntpcourseworkLocal } from '@/api/education/entpCourseWork'
 import { listEvaluationclue } from '@/api/classTask'
@@ -453,13 +453,16 @@ const handleDelete = async(item, index) => {
  */
  const  captureScreenshot = (id) => {
   const targetElement = document.getElementById('screenshot-target-' + id);
-  html2canvas(targetElement).then(canvas => {
-    // 将canvas转换为图像URL
-    const screenshotUrl = canvas.toDataURL('image/png');
-    // 在这里可以将截图保存到本地或上传到服务器
-    // console.log(screenshotUrl);
-    emit('addQuizImgBs64', screenshotUrl);
-  });
+  if (targetElement) {
+    emit('addQuizImgBs64', targetElement);
+  }
+  // html2canvas(targetElement).then(canvas => {
+  //   // 将canvas转换为图像URL
+  //   const screenshotUrl = canvas.toDataURL('image/png');
+  //   // 在这里可以将截图保存到本地或上传到服务器
+  //   // console.log(screenshotUrl);
+  //   emit('addQuizImgBs64', screenshotUrl);
+  // });
 }
 
 // 防抖

src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue

@@ -105,7 +105,7 @@
 </template>
 <script setup>
 import { Search } from '@element-plus/icons-vue'
-import html2canvas from 'html2canvas';
+//import html2canvas from 'html2canvas';
 import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
 
 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
@@ -439,13 +439,16 @@ const getPaginationList = ( page, limit ) => {
  */
 const  captureScreenshot = (id) => {
   const targetElement = document.getElementById('screenshot-target-' + id);
-  html2canvas(targetElement).then(canvas => {
-    // 将canvas转换为图像URL
-    const screenshotUrl = canvas.toDataURL('image/png');
-    // 在这里可以将截图保存到本地或上传到服务器
-    // console.log(screenshotUrl);
-    emit('addQuizImgBs64', screenshotUrl);
-  });
+  if (targetElement) {
+    emit('addQuizImgBs64', targetElement);
+  }
+  // html2canvas(targetElement).then(canvas => {
+  //   // 将canvas转换为图像URL
+  //   const screenshotUrl = canvas.toDataURL('image/png');
+  //   // 在这里可以将截图保存到本地或上传到服务器
+  //   // console.log(screenshotUrl);
+  //   emit('addQuizImgBs64', screenshotUrl);
+  // });
 }