Просмотр исходного кода

fix: 新增toolType为79的照片工具支持

1. 在学生页面的工具类型判断中添加79
2. 在折叠工具栏中添加photo工具对应调用79
3. 在多处框架元素查找逻辑中补充79类型匹配
lsc 1 день назад
Родитель
Сommit
936f218c93

+ 4 - 1
src/components/CollapsibleToolbar/index2.vue

@@ -860,6 +860,9 @@ const handleToolClick = _.debounce((tool: string) => {
   else if (tool === 'vote') {
     parentWindow?.addTool?.(78)
   }
+  else if (tool === 'photo') {
+    parentWindow?.addTool?.(79)
+  } 
   else if (tool === 'qa') {
     parentWindow?.addTool?.(15)
   }
@@ -914,7 +917,7 @@ const addContent = (data: ContentItem, type: number) => {
   // contentList.value.push(data)
   if (type === 2) {
     const elements = currentSlide.value?.elements || []
-    const frameElement = elements.find((el: any) => el.type === 'frame' && (el.toolType === 45 || el.toolType === 15 || el.toolType === 78))
+    const frameElement = elements.find((el: any) => el.type === 'frame' && (el.toolType === 45 || el.toolType === 15 || el.toolType === 78 || el.toolType === 79))
     if (frameElement) {
       slidesStore.updateElement({
         id: frameElement.id,

+ 2 - 2
src/views/Editor/CanvasTool/index2.vue

@@ -233,7 +233,7 @@ const viewMode = computed(() => getInitialViewMode())
 
 const hasInteractiveTool = computed(() => {
   const elements = currentSlide.value?.elements || []
-  return elements.some((el: any) => el.type === 'frame' && (el.toolType === 45 || el.toolType === 15 || el.toolType === 78))
+  return elements.some((el: any) => el.type === 'frame' && (el.toolType === 45 || el.toolType === 15 || el.toolType === 78 || el.toolType === 79))
 })
 
 const iframeLabel = computed(() => {
@@ -453,7 +453,7 @@ const editContent = (toolType: number) => {
     }
     const parentWindow = window.parent as ParentWindowWithToolList
     const elements = currentSlide.value?.elements || []
-    const frameElement = elements.find((el: any) => el.type === 'frame' && (el.toolType === 45 || el.toolType === 15 || el.toolType === 78))
+    const frameElement = elements.find((el: any) => el.type === 'frame' && (el.toolType === 45 || el.toolType === 15 || el.toolType === 78 || el.toolType === 79))
     parentWindow?.toolBtn2?.(0, frameElement?.url || '', toolType)
     toolVisible.value = false
   })

+ 1 - 1
src/views/Student/index.vue

@@ -1222,7 +1222,7 @@ const getWorkId = () => {
     typeof element === 'object' &&
     ('toolType' in element) &&
     (element as any).toolType !== undefined &&
-    ((element as any).toolType === 45 || (element as any).toolType === 15 || (element as any).toolType === 73 || (element as any).toolType === 72 || (element as any).toolType === 78)
+    ((element as any).toolType === 45 || (element as any).toolType === 15 || (element as any).toolType === 73 || (element as any).toolType === 72 || (element as any).toolType === 78 || (element as any).toolType === 79)
   ) {
     // 提取链接中的id参数
     const url = (element as any).url