jvs-ppt-ui 0.0.11 → 0.0.14

package/src/components/Header.vue

@@ -13,10 +13,11 @@ import { parseColorString, extractTextAlignFromHtml, updateTextAlignInHtml, norm
 
 import { shapeFormulas, shapeList as getPptxShapeList, ensurePptxShapes } from '../utils/pptxShapesLazy'
 import { inferElementTextType, type SlideTextType } from '../utils/textTypes'
+import { applyGroupGeometryFlip } from '../utils/groupFlip'
 // 快捷键弹层异步化；mock DSL 模板(~77KB)改为触发时动态加载
 const ShortcutsDialog = defineAsyncComponent(() => import('./ShortcutsDialog.vue'))
 
-const { presentationTitle, exportSlides, importSlides, currentZipMeta, startPresentation, activeIndex, slides, notify, renderLatexToSvg, globalFontFamily, globalFontColor, globalThemeColor, themeSchemeFillMap, themeClrScheme, logicalWidth, logicalHeight, dslInputDialogVisible, aiPptDialogVisible, shortcutsDialogVisible, registerPPTParser, isMasterEditingView, enterMasterView, exitMasterView, zoomRatio, resetZoom, normalizeSlideBackground, getEffectiveMasterElementsForSlide, getEffectiveSlideBackground, uploadMediaResourcesInSlides, getCustomUploadHandler } = useSlides()
+const { presentationTitle, exportSlides, importSlides, currentZipMeta, startPresentation, activeIndex, slides, notify, renderLatexToSvg, globalFontFamily, globalFontColor, globalThemeColor, themeSchemeFillMap, themeClrScheme, logicalWidth, logicalHeight, dslInputDialogVisible, aiPptDialogVisible, shortcutsDialogVisible, registerPPTParser, isMasterEditingView, enterMasterView, exitMasterView, zoomRatio, resetZoom, normalizeSlideBackground, getEffectiveMasterElementsForSlide, getEffectiveSlideBackground, uploadMediaResourcesInSlides, getCustomUploadHandler, isReadonly } = useSlides()
 import { sanitizeNbspInHtml, checkIsVertical } from '../composables/useSlides'
 
 // 快捷键弹层挂载闩锁：首次打开后保持挂载，异步 chunk 只加载一次
@@ -42,6 +43,7 @@ const fileInputRef = ref<HTMLInputElement | null>(null)
 const isEditingTitle = ref(false)
 const titleInputRef = ref<HTMLInputElement | null>(null)
 const startEditingTitle = () => {
+  if (isReadonly.value) return
   isEditingTitle.value = true
   nextTick(() => {
     titleInputRef.value?.focus()
@@ -957,7 +959,7 @@ function parseHTMLTable(htmlStr: string, totalWidth?: number): { tableData: any[
   const colgroupCols = tableEl.querySelectorAll('colgroup col')
   const firstRowCells = tableEl.querySelectorAll('tr:first-child > td, tr:first-child > th')
   const targetEls = colgroupCols.length >= totalCols ? colgroupCols : (firstRowCells.length > 0 ? firstRowCells : colgroupCols)
-  
+
   let colCounter = 0
   targetEls.forEach((cEl) => {
     if (colCounter >= totalCols) return
@@ -1785,960 +1787,960 @@ const generatePptxBlob = async (): Promise<Blob | null> => {
 
       // 2. Elements
       const processElement = async (el: any, parentPixels: { left: number; top: number; width: number; height: number; rotate: number; flipH: boolean; flipV: boolean } | null = null) => {
-          if (el.visible === false) return
+        if (el.visible === false) return
 
-          let pixelWidth = 0
-          let pixelHeight = 0
+        let pixelWidth = 0
+        let pixelHeight = 0
 
-          const rawWidth = el.style?.width !== undefined ? el.style.width : el.width
-          const rawHeight = el.style?.height !== undefined ? el.style.height : el.height
-          const rawLeft = el.style?.left !== undefined ? el.style.left : el.left
-          const rawTop = el.style?.top !== undefined ? el.style.top : el.top
+        const rawWidth = el.style?.width !== undefined ? el.style.width : el.width
+        const rawHeight = el.style?.height !== undefined ? el.style.height : el.height
+        const rawLeft = el.style?.left !== undefined ? el.style.left : el.left
+        const rawTop = el.style?.top !== undefined ? el.style.top : el.top
 
-          if (parentPixels) {
-            pixelWidth = parseValToPx(rawWidth, parentPixels.width, 100)
-            pixelHeight = parseValToPx(rawHeight, parentPixels.height, 40)
-          } else {
-            pixelWidth = parseCoordinate(rawWidth, logicalWidth.value)
-            pixelHeight = parseCoordinate(rawHeight, logicalHeight.value)
-          }
+        if (parentPixels) {
+          pixelWidth = parseValToPx(rawWidth, parentPixels.width, 100)
+          pixelHeight = parseValToPx(rawHeight, parentPixels.height, 40)
+        } else {
+          pixelWidth = parseCoordinate(rawWidth, logicalWidth.value)
+          pixelHeight = parseCoordinate(rawHeight, logicalHeight.value)
+        }
 
-          if (el.type === 'text') {
-            const domEl = document.getElementById(`canvas-el-${el.id}`)
-            if (domEl && domEl.offsetHeight > 0) {
-              if (!pixelHeight || el.style?.height === 'auto') {
-                pixelHeight = domEl.offsetHeight
-              }
-              if (!pixelWidth || el.style?.width === 'auto') {
-                pixelWidth = domEl.offsetWidth
-              }
-            } else {
-              const defaultFontSize = parseInt(el.style?.fontSize || '') || 18
-              if (!pixelWidth || el.style?.width === 'auto') {
-                pixelWidth = 400
-              }
-              if (!pixelHeight || el.style?.height === 'auto') {
-                let topPadding = 4.8
-                let bottomPadding = 4.8
-                if (el.style?.padding) {
-                  const paddingParts = el.style.padding.trim().split(/\s+/)
-                  let parsedPadding = [4.8, 9.6, 4.8, 9.6]
-                  if (paddingParts.length === 4) {
-                    parsedPadding = paddingParts.map((p: string) => parseFloat(p) || 0)
-                  } else if (paddingParts.length === 1) {
-                    const val = parseFloat(paddingParts[0]) || 0
-                    parsedPadding = [val, val, val, val]
-                  }
-                  topPadding = parsedPadding[0]
-                  bottomPadding = parsedPadding[2]
-                }
-                pixelHeight = estimateTextHeight(el.content || '', pixelWidth, defaultFontSize) + topPadding + bottomPadding
-              }
+        if (el.type === 'text') {
+          const domEl = document.getElementById(`canvas-el-${el.id}`)
+          if (domEl && domEl.offsetHeight > 0) {
+            if (!pixelHeight || el.style?.height === 'auto') {
+              pixelHeight = domEl.offsetHeight
             }
-          }
-
-          const elRotate = typeof el.style?.rotate === 'number'
-            ? el.style.rotate
-            : (parseFloat(el.style?.rotate || el.rotate || '0') || 0)
-          const elFlipH = Boolean(el.style?.flipH || el.flipH || el.isFlipH)
-          const elFlipV = Boolean(el.style?.flipV || el.flipV || el.isFlipV)
-
-          let pixelLeft = 0
-          let pixelTop = 0
-          let rotate = 0
-          let flipH = elFlipH
-          let flipV = elFlipV
-
-          if (parentPixels) {
-            const rawChildLeft = parseValToPx(rawLeft, parentPixels.width, 0)
-            const rawChildTop = parseValToPx(rawTop, parentPixels.height, 0)
-
-            const pW = parentPixels.width
-            const pH = parentPixels.height
-            const cCenterRelX = (rawChildLeft + pixelWidth / 2) - pW / 2
-            const cCenterRelY = (rawChildTop + pixelHeight / 2) - pH / 2
-
-            let flippedRelX = parentPixels.flipH ? -cCenterRelX : cCenterRelX
-            let flippedRelY = parentPixels.flipV ? -cCenterRelY : cCenterRelY
-
-            let rotRelX = flippedRelX
-            let rotRelY = flippedRelY
-            if (parentPixels.rotate) {
-              const rad = (parentPixels.rotate * Math.PI) / 180
-              rotRelX = flippedRelX * Math.cos(rad) - flippedRelY * Math.sin(rad)
-              rotRelY = flippedRelX * Math.sin(rad) + flippedRelY * Math.cos(rad)
+            if (!pixelWidth || el.style?.width === 'auto') {
+              pixelWidth = domEl.offsetWidth
             }
-
-            const newCenterX = pW / 2 + rotRelX
-            const newCenterY = pH / 2 + rotRelY
-
-            pixelLeft = parentPixels.left + (newCenterX - pixelWidth / 2)
-            pixelTop = parentPixels.top + (newCenterY - pixelHeight / 2)
-
-            const parentOddFlips = (parentPixels.flipH !== parentPixels.flipV)
-            const childEffectiveRot = parentOddFlips ? -elRotate : elRotate
-            rotate = ((parentPixels.rotate + childEffectiveRot) % 360 + 360) % 360
-
-            flipH = parentPixels.flipH ? !elFlipH : elFlipH
-            flipV = parentPixels.flipV ? !elFlipV : elFlipV
           } else {
-            pixelLeft = parseCoordinate(rawLeft, logicalWidth.value)
-            pixelTop = parseCoordinate(rawTop, logicalHeight.value)
-            rotate = (elRotate % 360 + 360) % 360
-          }
-
-          if (el.type === 'group' && Array.isArray(el.elements)) {
-            const curGroupPixels = {
-              left: pixelLeft,
-              top: pixelTop,
-              width: pixelWidth,
-              height: pixelHeight,
-              rotate,
-              flipH,
-              flipV
-            }
-            for (const child of el.elements) {
-              await processElement(child, curGroupPixels)
-            }
-            return
-          }
-
-          const x = (pixelLeft / logicalWidth.value) * baseWidth
-          const y = (pixelTop / logicalHeight.value) * baseHeight
-          const w = (pixelWidth / logicalWidth.value) * baseWidth
-          const h = (pixelHeight / logicalHeight.value) * baseHeight
-
-          if (el.type === 'text') {
-            if (el.latex) {
-              const svgString = renderLatexToSvg(el.latex)
-              const base64SVG = 'data:image/svg+xml;base64,' + window.btoa(unescape(encodeURIComponent(svgString)))
-              pptxSlide.addImage({
-                data: base64SVG,
-                x, y, w, h,
-                rotate,
-                objectName: el.id
-              })
-            }
-            else if ((el.content && (el.content.includes('<table') || el.content.includes('&lt;table'))) || (el.data && Array.isArray(el.data) && el.data.length > 0)) {
-              const res = (el.content && (el.content.includes('<table') || el.content.includes('&lt;table')))
-                ? parseHTMLTable(el.content, w)
-                : parseTableElementData(el, w)
-              if (res.tableData && res.tableData.length > 0) {
-                const tableOpts: any = { x, y, w, h, objectName: el.id }
-                if (res.colW && res.colW.length > 0) {
-                  tableOpts.colW = res.colW
-                }
-                pptxSlide.addTable(res.tableData, tableOpts)
-              }
+            const defaultFontSize = parseInt(el.style?.fontSize || '') || 18
+            if (!pixelWidth || el.style?.width === 'auto') {
+              pixelWidth = 400
             }
-            else {
-              const defaultFontSize = Math.max(1, Math.round((parseInt(el.style?.fontSize || '') || 18) * fontSizeFactor))
-              const defaultColor = el.style?.color || globalFontColor.value || '#475569'
-              const defaultFontFamily = (el.style?.fontFamily && el.style.fontFamily !== 'inherit' && el.style.fontFamily !== '默认字体')
-                ? el.style.fontFamily
-                : (globalFontFamily.value && globalFontFamily.value !== '默认字体' ? globalFontFamily.value : 'SourceHanSansCN')
-
-              const isBold = el.style?.fontWeight === 'bold' || el.style?.fontWeight === '700' || (parseInt(el.style?.fontWeight as string) || 0) > 500
-              const isItalic = (el.style as any)?.fontStyle === 'italic'
-              const isUnderline = !!(el.style?.textDecoration && el.style.textDecoration.includes('underline'))
-              const isStrike = !!(el.style?.textDecoration && el.style.textDecoration.includes('line-through'))
-
-              const hasFillOrBorder = (el.style?.textBackground && el.style.textBackground !== 'transparent' && el.style.textBackground !== 'none') || (parseFloat(el.style?.borderWidth || '') || 0) > 0
-
-              const textShadowObj = (el as any).textShadow || (el.style && (el.style as any).textShadow) || (!hasFillOrBorder ? (el.shadow || (el.style && (el.style as any).shadow)) : undefined)
-              let parsedTextShadow: any = undefined
-              if (textShadowObj) {
-                parsedTextShadow = convertElShadowToPptx(textShadowObj, ratioPx2Pt)
-              }
-              if (!parsedTextShadow) {
-                let textShadowStr = el.style?.boxShadow
-                if (!textShadowStr && el.content) {
-                  const match = el.content.match(/(?:text-shadow)\s*:\s*([^;"]+)/i)
-                  if (match) {
-                    textShadowStr = match[1].trim()
-                  }
-                }
-                if (textShadowStr) {
-                  parsedTextShadow = parseCssShadow(textShadowStr, ratioPx2Pt)
-                }
-              }
-
-              const shapeShadowObj = hasFillOrBorder ? (el.shadow || (el.style && (el.style as any).shadow)) : undefined
-              let parsedShapeShadow: any = undefined
-              if (shapeShadowObj) {
-                parsedShapeShadow = convertElShadowToPptx(shapeShadowObj, ratioPx2Pt)
-              }
-
-              const textRefl = (el as any).textReflection || (el.style as any)?.textReflection || (!hasFillOrBorder ? (el.reflection || (el.style && el.style.reflection)) : undefined)
-              let parsedTextReflection: any = undefined
-              if (textRefl) {
-                parsedTextReflection = convertElReflectionToPptx(textRefl, ratioPx2Pt)
-              }
-
-              const shapeRefl = hasFillOrBorder ? (el.reflection || (el.style && el.style.reflection)) : undefined
-              let parsedShapeReflection: any = undefined
-              if (shapeRefl) {
-                parsedShapeReflection = convertElReflectionToPptx(shapeRefl, ratioPx2Pt)
-              }
-
-              const textProps = formatHTMLToPPTX(el.content || '', {
-                fontSize: defaultFontSize,
-                color: defaultColor,
-                fontFamily: defaultFontFamily,
-                bold: isBold,
-                italic: isItalic,
-                underline: isUnderline,
-                strike: isStrike,
-                align: el.style?.textAlign || 'left',
-                shadow: parsedTextShadow,
-                reflection: parsedTextReflection
-              })
-
-              let finalLineHeight: number | undefined = undefined
-              if (el.style?.lineHeight !== undefined) {
-                const val = typeof el.style.lineHeight === 'number'
-                  ? el.style.lineHeight
-                  : parseFloat(el.style.lineHeight as string || '')
-                if (!isNaN(val)) {
-                  finalLineHeight = val <= 1.2 ? 1.0 : val
-                }
-              }
-              let textValign = 'top'
-              const currentValign = el.style?.verticalAlign || (el as any).vAlign
-              if (currentValign === 'middle' || currentValign === 'mid') {
-                textValign = 'middle'
-              } else if (currentValign === 'bottom' || currentValign === 'down') {
-                textValign = 'bottom'
-              }
-
-              let textMargin: [number, number, number, number] = [7.2, 7.2, 3.6, 3.6]
+            if (!pixelHeight || el.style?.height === 'auto') {
+              let topPadding = 4.8
+              let bottomPadding = 4.8
               if (el.style?.padding) {
                 const paddingParts = el.style.padding.trim().split(/\s+/)
-                let parsedPadding = [0, 0, 0, 0]
+                let parsedPadding = [4.8, 9.6, 4.8, 9.6]
                 if (paddingParts.length === 4) {
                   parsedPadding = paddingParts.map((p: string) => parseFloat(p) || 0)
                 } else if (paddingParts.length === 1) {
                   const val = parseFloat(paddingParts[0]) || 0
                   parsedPadding = [val, val, val, val]
                 }
-                textMargin = [
-                  parsedPadding[3] / ratioPx2Pt, // left
-                  parsedPadding[1] / ratioPx2Pt, // right
-                  parsedPadding[2] / ratioPx2Pt, // bottom
-                  parsedPadding[0] / ratioPx2Pt  // top
-                ]
-              }
-
-              const textOpts: any = {
-                x, y, w, h,
-                valign: textValign as any,
-                align: (el.style?.textAlign || 'left') as any,
-                margin: textMargin,
-                rotate, flipH, flipV,
-                objectName: el.id
-              }
-              if (finalLineHeight !== undefined) {
-                textOpts.lineSpacingMultiple = finalLineHeight
+                topPadding = parsedPadding[0]
+                bottomPadding = parsedPadding[2]
               }
+              pixelHeight = estimateTextHeight(el.content || '', pixelWidth, defaultFontSize) + topPadding + bottomPadding
+            }
+          }
+        }
 
-              if (parsedShapeShadow) {
-                textOpts.shadow = parsedShapeShadow
-              }
-              if (parsedShapeReflection) {
-                textOpts.reflection = parsedShapeReflection
-              }
+        const elRotate = typeof el.style?.rotate === 'number'
+          ? el.style.rotate
+          : (parseFloat(el.style?.rotate || el.rotate || '0') || 0)
+        const elFlipH = Boolean(el.style?.flipH || el.flipH || el.isFlipH)
+        const elFlipV = Boolean(el.style?.flipV || el.flipV || el.isFlipV)
+
+        let pixelLeft = 0
+        let pixelTop = 0
+        let rotate = 0
+        let flipH = elFlipH
+        let flipV = elFlipV
+
+        if (parentPixels) {
+          const rawChildLeft = parseValToPx(rawLeft, parentPixels.width, 0)
+          const rawChildTop = parseValToPx(rawTop, parentPixels.height, 0)
+
+          const pW = parentPixels.width
+          const pH = parentPixels.height
+          const cCenterRelX = (rawChildLeft + pixelWidth / 2) - pW / 2
+          const cCenterRelY = (rawChildTop + pixelHeight / 2) - pH / 2
+
+          let flippedRelX = parentPixels.flipH ? -cCenterRelX : cCenterRelX
+          let flippedRelY = parentPixels.flipV ? -cCenterRelY : cCenterRelY
+
+          let rotRelX = flippedRelX
+          let rotRelY = flippedRelY
+          if (parentPixels.rotate) {
+            const rad = (parentPixels.rotate * Math.PI) / 180
+            rotRelX = flippedRelX * Math.cos(rad) - flippedRelY * Math.sin(rad)
+            rotRelY = flippedRelX * Math.sin(rad) + flippedRelY * Math.cos(rad)
+          }
 
-              // Apply background color to text element
-              if (el.style?.textBackground && el.style.textBackground !== 'transparent' && el.style.textBackground !== 'none') {
-                const fillParsed = parseColor(el.style.textBackground)
-                textOpts.fill = { color: fillParsed.color, transparency: fillParsed.transparency }
-              }
+          const newCenterX = pW / 2 + rotRelX
+          const newCenterY = pH / 2 + rotRelY
 
-              // Apply border line style to text element
-              const textBorderWidth = parseFloat(el.style?.borderWidth || '') || 0
-              const textBorderColorStr = el.style?.borderColor
-              if (textBorderWidth > 0 && textBorderColorStr && textBorderColorStr !== 'transparent' && textBorderColorStr !== 'none') {
-                const borderParsed = parseColor(textBorderColorStr)
-                textOpts.line = {
-                  color: borderParsed.color,
-                  width: textBorderWidth / ratioPx2Pt,
-                  dashType: el.style?.borderStyle === 'dashed' ? 'dash' : 'solid'
-                }
-              }
+          pixelLeft = parentPixels.left + (newCenterX - pixelWidth / 2)
+          pixelTop = parentPixels.top + (newCenterY - pixelHeight / 2)
 
-              if ((el.style as any)?.whiteSpace === 'nowrap') {
-                textOpts.wrap = false
-              }
+          const parentOddFlips = (parentPixels.flipH !== parentPixels.flipV)
+          const childEffectiveRot = parentOddFlips ? -elRotate : elRotate
+          rotate = ((parentPixels.rotate + childEffectiveRot) % 360 + 360) % 360
 
-              const elAny = el as any
-              if (elAny.autoFit) {
-                if (elAny.autoFit.type === 'shape') {
-                  textOpts.fit = 'resize'
-                } else if (elAny.autoFit.type === 'text') {
-                  textOpts.fit = 'shrink'
-                }
-              }
+          flipH = parentPixels.flipH ? !elFlipH : elFlipH
+          flipV = parentPixels.flipV ? !elFlipV : elFlipV
+        } else {
+          pixelLeft = parseCoordinate(rawLeft, logicalWidth.value)
+          pixelTop = parseCoordinate(rawTop, logicalHeight.value)
+          rotate = (elRotate % 360 + 360) % 360
+        }
 
-              pptxSlide.addText(textProps, textOpts)
-            }
+        if (el.type === 'group' && Array.isArray(el.elements)) {
+          const curGroupPixels = {
+            left: pixelLeft,
+            top: pixelTop,
+            width: pixelWidth,
+            height: pixelHeight,
+            rotate,
+            flipH,
+            flipV
           }
-          else if (el.type === 'image') {
-            let imgPath = await resolveMediaSrc(el.content || (el as any).src || '', 'image')
-            if (!imgPath) {
-              imgPath = createFallbackImageBase64('图片缺失')
-            }
+          for (const child of el.elements) {
+            await processElement(child, curGroupPixels)
+          }
+          return
+        }
+
+        const x = (pixelLeft / logicalWidth.value) * baseWidth
+        const y = (pixelTop / logicalHeight.value) * baseHeight
+        const w = (pixelWidth / logicalWidth.value) * baseWidth
+        const h = (pixelHeight / logicalHeight.value) * baseHeight
 
-            const imgOpts: pptxgen.ImageProps = {
+        if (el.type === 'text') {
+          if (el.latex) {
+            const svgString = renderLatexToSvg(el.latex)
+            const base64SVG = 'data:image/svg+xml;base64,' + window.btoa(unescape(encodeURIComponent(svgString)))
+            pptxSlide.addImage({
+              data: base64SVG,
               x, y, w, h,
-              rotate, flipH, flipV,
+              rotate,
               objectName: el.id
-            }
-            if (imgPath.startsWith('data:')) {
-              imgOpts.data = imgPath
-            } else {
-              imgOpts.path = imgPath
-            }
-
-            const imgShadow = el.shadow || (el.style && (el.style as any).shadow)
-            let parsedImgShadow = convertElShadowToPptx(imgShadow, ratioPx2Pt)
-            if (!parsedImgShadow && el.style?.boxShadow) {
-              parsedImgShadow = parseCssShadow(el.style.boxShadow, ratioPx2Pt)
-            }
-            if (parsedImgShadow) {
-              imgOpts.shadow = parsedImgShadow
-            }
-            const imgRefl = el.reflection || (el.style && el.style.reflection)
-            if (imgRefl) {
-              const parsedReflection = convertElReflectionToPptx(imgRefl, ratioPx2Pt)
-              if (parsedReflection) {
-                imgOpts.reflection = parsedReflection
+            })
+          }
+          else if ((el.content && (el.content.includes('<table') || el.content.includes('&lt;table'))) || (el.data && Array.isArray(el.data) && el.data.length > 0)) {
+            const res = (el.content && (el.content.includes('<table') || el.content.includes('&lt;table')))
+              ? parseHTMLTable(el.content, w)
+              : parseTableElementData(el, w)
+            if (res.tableData && res.tableData.length > 0) {
+              const tableOpts: any = { x, y, w, h, objectName: el.id }
+              if (res.colW && res.colW.length > 0) {
+                tableOpts.colW = res.colW
               }
+              pptxSlide.addTable(res.tableData, tableOpts)
             }
-
-            if (el.clip && Array.isArray(el.clip.range) && el.clip.range.length >= 2) {
-              const [start, end] = el.clip.range
-              if (Array.isArray(start) && start.length >= 2 && Array.isArray(end) && end.length >= 2) {
-                const [startX, startY] = start
-                const [endX, endY] = end
-
-                const fractionX = (endX - startX) / 100
-                const fractionY = (endY - startY) / 100
-                if (fractionX > 0 && fractionY > 0) {
-                  const originW = w / fractionX
-                  const originH = h / fractionY
-
-                  imgOpts.w = originW
-                  imgOpts.h = originH
-                  imgOpts.sizing = {
-                    type: 'crop',
-                    x: (startX / 100) * originW,
-                    y: (startY / 100) * originH,
-                    w: w,
-                    h: h,
-                  }
+          }
+          else {
+            const defaultFontSize = Math.max(1, Math.round((parseInt(el.style?.fontSize || '') || 18) * fontSizeFactor))
+            const defaultColor = el.style?.color || globalFontColor.value || '#475569'
+            const defaultFontFamily = (el.style?.fontFamily && el.style.fontFamily !== 'inherit' && el.style.fontFamily !== '默认字体')
+              ? el.style.fontFamily
+              : (globalFontFamily.value && globalFontFamily.value !== '默认字体' ? globalFontFamily.value : 'SourceHanSansCN')
+
+            const isBold = el.style?.fontWeight === 'bold' || el.style?.fontWeight === '700' || (parseInt(el.style?.fontWeight as string) || 0) > 500
+            const isItalic = (el.style as any)?.fontStyle === 'italic'
+            const isUnderline = !!(el.style?.textDecoration && el.style.textDecoration.includes('underline'))
+            const isStrike = !!(el.style?.textDecoration && el.style.textDecoration.includes('line-through'))
+
+            const hasFillOrBorder = (el.style?.textBackground && el.style.textBackground !== 'transparent' && el.style.textBackground !== 'none') || (parseFloat(el.style?.borderWidth || '') || 0) > 0
+
+            const textShadowObj = (el as any).textShadow || (el.style && (el.style as any).textShadow) || (!hasFillOrBorder ? (el.shadow || (el.style && (el.style as any).shadow)) : undefined)
+            let parsedTextShadow: any = undefined
+            if (textShadowObj) {
+              parsedTextShadow = convertElShadowToPptx(textShadowObj, ratioPx2Pt)
+            }
+            if (!parsedTextShadow) {
+              let textShadowStr = el.style?.boxShadow
+              if (!textShadowStr && el.content) {
+                const match = el.content.match(/(?:text-shadow)\s*:\s*([^;"]+)/i)
+                if (match) {
+                  textShadowStr = match[1].trim()
                 }
               }
+              if (textShadowStr) {
+                parsedTextShadow = parseCssShadow(textShadowStr, ratioPx2Pt)
+              }
             }
 
-            pptxSlide.addImage(imgOpts)
-          }
-          else if (el.type === 'shape') {
-            const shapeType = getPredefinedShapeType(el.content, el.pathFormula, (el as any).pptxShapeType)
-
-            // Set defaults based on shape types to match CanvasArea.vue styles
-            let defaultFill = '#3b82f6'
-            let defaultBorderColor = '#2563eb'
-            let defaultBorderWidth = '2px'
-
-            if (el.content === 'triangle') {
-              defaultFill = '#f59e0b'
-              defaultBorderColor = '#d97706'
-              defaultBorderWidth = '3px'
-            } else if (el.content === 'circle') {
-              defaultFill = '#3b82f6'
-              defaultBorderColor = '#2563eb'
-              defaultBorderWidth = '2px'
-            } else if (typeof el.content === 'string' && (el.content.startsWith('M') || el.content.startsWith('m'))) {
-              defaultFill = '#3b82f6'
-              defaultBorderColor = '#2563eb'
-              defaultBorderWidth = '2px'
-            } else { // rect or default
-              defaultFill = '#10b981'
-              defaultBorderColor = '#059669'
-              defaultBorderWidth = '2px'
-            }
-
-            const style: any = el.style || {}
-            let shapeFillOpt: any = undefined
-
-            // Helper function to extract element gradient configuration for PPTX export
-            const getElementGradientConfig = (item: any): any => {
-              if (!item) return undefined
-              let gradient = item.gradient || item.style?.gradient
-              if (!gradient) {
-                const rawFill = (item.style && item.style.fill !== undefined) ? item.style.fill : item.fill
-                if (rawFill && typeof rawFill === 'object' && rawFill.type === 'gradient') {
-                  const val = rawFill.value || {}
-                  gradient = {
-                    path: val.path || 'line',
-                    type: val.path === 'line' || !val.path ? 'linear' : 'radial',
-                    rotate: val.rot !== undefined ? val.rot : (val.rotate !== undefined ? val.rotate : 90),
-                    colors: (val.colors || []).map((c: any) => ({
-                      color: c.color || c.value || '#3b82f6',
-                      pos: c.pos !== undefined ? (typeof c.pos === 'string' ? parseInt(c.pos) : c.pos) : 0
-                    }))
-                  }
-                }
-              }
-              return gradient
+            const shapeShadowObj = hasFillOrBorder ? (el.shadow || (el.style && (el.style as any).shadow)) : undefined
+            let parsedShapeShadow: any = undefined
+            if (shapeShadowObj) {
+              parsedShapeShadow = convertElShadowToPptx(shapeShadowObj, ratioPx2Pt)
             }
 
-            const getElementPatternUrl = (item: any): string | undefined => {
-              if (!item) return undefined
-              if (item.pattern || item.style?.pattern) return item.pattern || item.style?.pattern
-              const rawFill = (item.style && item.style.fill !== undefined) ? item.style.fill : item.fill
-              if (rawFill && typeof rawFill === 'object' && (rawFill.type === 'image' || rawFill.type === 'pattern')) {
-                return rawFill.value?.src || rawFill.value?.url || rawFill.value
-              }
-              return undefined
-            }
-
-            const patternUrl = getElementPatternUrl(el)
-            const g = getElementGradientConfig(el)
-
-            // SVG 图片填充 PowerPoint 无法可靠渲染 a:blipFill，先按形状显示尺寸栅格化为 PNG
-            // （画布上图案填充本身是 preserveAspectRatio="none" 拉伸铺满，与 a:stretch 语义一致）
-            const rasterizeSvgFill = (svgUrl: string, widthPx: number, heightPx: number): Promise<string | undefined> => {
-              return new Promise((resolve) => {
-                const img = new Image()
-                img.onload = () => {
-                  try {
-                    const canvas = document.createElement('canvas')
-                    canvas.width = Math.max(1, Math.min(4096, Math.round(widthPx)))
-                    canvas.height = Math.max(1, Math.min(4096, Math.round(heightPx)))
-                    const ctx = canvas.getContext('2d')
-                    if (!ctx) return resolve(undefined)
-                    ctx.drawImage(img, 0, 0, canvas.width, canvas.height)
-                    resolve(canvas.toDataURL('image/png'))
-                  } catch {
-                    resolve(undefined)
-                  }
-                }
-                img.onerror = () => resolve(undefined)
-                img.src = svgUrl
-              })
+            const textRefl = (el as any).textReflection || (el.style as any)?.textReflection || (!hasFillOrBorder ? (el.reflection || (el.style && el.style.reflection)) : undefined)
+            let parsedTextReflection: any = undefined
+            if (textRefl) {
+              parsedTextReflection = convertElReflectionToPptx(textRefl, ratioPx2Pt)
             }
 
-            const buildNativeShapeFill = async (): Promise<any> => {
-              // 图片填充 → 原生 a:blipFill
-              if (patternUrl) {
-                const pUrl = await resolveMediaSrc(patternUrl, 'image')
-                if (pUrl && /^data:image\/svg\+xml/i.test(pUrl)) {
-                  const pngUrl = await rasterizeSvgFill(pUrl, pixelWidth, pixelHeight)
-                  return pngUrl ? { type: 'image', data: pngUrl } : undefined
-                }
-                if (pUrl && pUrl.startsWith('data:')) {
-                  return { type: 'image', data: pUrl }
-                }
-                if (pUrl && /^https?:\/\//.test(pUrl)) {
-                  return { type: 'image', path: pUrl }
-                }
-                return undefined // 图片解析失败，回落纯色
-              }
-              // 渐变填充 → 原生 a:gradFill
-              if (g && Array.isArray(g.colors) && g.colors.length >= 2) {
-                return {
-                  type: 'gradient',
-                  stops: g.colors.map((c: any) => ({
-                    color: String(c.color || '#3b82f6').replace('#', ''),
-                    pos: typeof c.pos === 'number' && !isNaN(c.pos) ? c.pos : 0
-                  })),
-                  angle: g.rotate !== undefined ? g.rotate : (g.rot !== undefined ? g.rot : 90),
-                  radial: g.type === 'radial' || g.path === 'circle'
-                }
+            const shapeRefl = hasFillOrBorder ? (el.reflection || (el.style && el.style.reflection)) : undefined
+            let parsedShapeReflection: any = undefined
+            if (shapeRefl) {
+              parsedShapeReflection = convertElReflectionToPptx(shapeRefl, ratioPx2Pt)
+            }
+
+            const textProps = formatHTMLToPPTX(el.content || '', {
+              fontSize: defaultFontSize,
+              color: defaultColor,
+              fontFamily: defaultFontFamily,
+              bold: isBold,
+              italic: isItalic,
+              underline: isUnderline,
+              strike: isStrike,
+              align: el.style?.textAlign || 'left',
+              shadow: parsedTextShadow,
+              reflection: parsedTextReflection
+            })
+
+            let finalLineHeight: number | undefined = undefined
+            if (el.style?.lineHeight !== undefined) {
+              const val = typeof el.style.lineHeight === 'number'
+                ? el.style.lineHeight
+                : parseFloat(el.style.lineHeight as string || '')
+              if (!isNaN(val)) {
+                finalLineHeight = val <= 1.2 ? 1.0 : val
               }
-              return undefined
             }
-            const nativeFillOpt = await buildNativeShapeFill()
-
-            const rawFill = style.fill !== undefined ? style.fill : (el.fill !== undefined ? el.fill : defaultFill)
-            if (rawFill === 'transparent' || rawFill === 'none') {
-              shapeFillOpt = { type: 'none' }
-            } else {
-              const fillParsed = parseColor(rawFill)
-              shapeFillOpt = { color: fillParsed.color, transparency: fillParsed.transparency }
+            let textValign = 'top'
+            const currentValign = el.style?.verticalAlign || (el as any).vAlign
+            if (currentValign === 'middle' || currentValign === 'mid') {
+              textValign = 'middle'
+            } else if (currentValign === 'bottom' || currentValign === 'down') {
+              textValign = 'bottom'
+            }
+
+            let textMargin: [number, number, number, number] = [7.2, 7.2, 3.6, 3.6]
+            if (el.style?.padding) {
+              const paddingParts = el.style.padding.trim().split(/\s+/)
+              let parsedPadding = [0, 0, 0, 0]
+              if (paddingParts.length === 4) {
+                parsedPadding = paddingParts.map((p: string) => parseFloat(p) || 0)
+              } else if (paddingParts.length === 1) {
+                const val = parseFloat(paddingParts[0]) || 0
+                parsedPadding = [val, val, val, val]
+              }
+              textMargin = [
+                parsedPadding[3] / ratioPx2Pt, // left
+                parsedPadding[1] / ratioPx2Pt, // right
+                parsedPadding[2] / ratioPx2Pt, // bottom
+                parsedPadding[0] / ratioPx2Pt  // top
+              ]
             }
 
-            const shapeOpts: pptxgen.ShapeProps = {
+            const textOpts: any = {
               x, y, w, h,
-              fill: nativeFillOpt || shapeFillOpt,
+              valign: textValign as any,
+              align: (el.style?.textAlign || 'left') as any,
+              margin: textMargin,
               rotate, flipH, flipV,
               objectName: el.id
             }
-
-            const borderWidth = style.borderWidth ? (parseFloat(style.borderWidth) || 0) : 0
-            const borderColorStr = style.borderColor
-            if (borderWidth > 0 && borderColorStr && borderColorStr !== 'transparent' && borderColorStr !== 'none') {
-              const borderParsed = parseColor(borderColorStr)
-              shapeOpts.line = {
-                color: borderParsed.color,
-                width: borderWidth / ratioPx2Pt,
-                dashType: style.borderStyle === 'dashed' ? 'dash' : 'solid'
-              }
+            if (finalLineHeight !== undefined) {
+              textOpts.lineSpacingMultiple = finalLineHeight
             }
 
-            const shapeShadow = el.shadow || style.shadow
-            let parsedShadow: any = convertElShadowToPptx(shapeShadow, ratioPx2Pt)
-            if (!parsedShadow && style.boxShadow) {
-              parsedShadow = parseCssShadow(style.boxShadow, ratioPx2Pt)
+            if (parsedShapeShadow) {
+              textOpts.shadow = parsedShapeShadow
             }
-            if (parsedShadow) {
-              shapeOpts.shadow = parsedShadow
+            if (parsedShapeReflection) {
+              textOpts.reflection = parsedShapeReflection
             }
 
-            const shapeRefl = el.reflection || style.reflection
-            if (shapeRefl) {
-              const parsedReflection = convertElReflectionToPptx(shapeRefl, ratioPx2Pt)
-              if (parsedReflection) {
-                shapeOpts.reflection = parsedReflection
+            // Apply background color to text element
+            if (el.style?.textBackground && el.style.textBackground !== 'transparent' && el.style.textBackground !== 'none') {
+              const fillParsed = parseColor(el.style.textBackground)
+              textOpts.fill = { color: fillParsed.color, transparency: fillParsed.transparency }
+            }
+
+            // Apply border line style to text element
+            const textBorderWidth = parseFloat(el.style?.borderWidth || '') || 0
+            const textBorderColorStr = el.style?.borderColor
+            if (textBorderWidth > 0 && textBorderColorStr && textBorderColorStr !== 'transparent' && textBorderColorStr !== 'none') {
+              const borderParsed = parseColor(textBorderColorStr)
+              textOpts.line = {
+                color: borderParsed.color,
+                width: textBorderWidth / ratioPx2Pt,
+                dashType: el.style?.borderStyle === 'dashed' ? 'dash' : 'solid'
               }
             }
 
-            if (shapeType === 'custGeom') {
-              const rawPoints = toPoints(el.content || '')
-              const viewBoxWidth = (Array.isArray(el.viewBox) && el.viewBox.length >= 2) ? el.viewBox[0] : pixelWidth
-              const viewBoxHeight = (Array.isArray(el.viewBox) && el.viewBox.length >= 2) ? el.viewBox[1] : pixelHeight
-              const scale = {
-                x: pixelWidth / viewBoxWidth,
-                y: viewBoxHeight > 0 ? pixelHeight / viewBoxHeight : 1
+            if ((el.style as any)?.whiteSpace === 'nowrap') {
+              textOpts.wrap = false
+            }
+
+            const elAny = el as any
+            if (elAny.autoFit) {
+              if (elAny.autoFit.type === 'shape') {
+                textOpts.fit = 'resize'
+              } else if (elAny.autoFit.type === 'text') {
+                textOpts.fit = 'shrink'
               }
-              shapeOpts.points = formatPoints(rawPoints, scale, pixelToInch) as any
             }
 
-            const shapeText = typeof el.text === 'string' ? el.text : ((el as any).text?.content || (typeof el.content === 'string' && !el.content.startsWith('M') && !el.content.startsWith('m') && el.content !== 'circle' && el.content !== 'triangle' && el.content.replace(/<[^>]+>/g, '').trim().length > 0 ? el.content : ''))
+            pptxSlide.addText(textProps, textOpts)
+          }
+        }
+        else if (el.type === 'image') {
+          let imgPath = await resolveMediaSrc(el.content || (el as any).src || '', 'image')
+          if (!imgPath) {
+            imgPath = createFallbackImageBase64('图片缺失')
+          }
 
-            if (shapeText) {
-              const shapeTextDefaultColor = style.textColor || style.color || (style.fill === '#ffffff' || style.fill === '#FFFFFF' ? '#475569' : '#ffffff')
-              const shapeTextDefaultFont = style.fontFamily || (globalFontFamily && globalFontFamily.value) || 'Arial'
-              const resolvedShapeFont = (shapeTextDefaultFont !== 'inherit' && shapeTextDefaultFont !== '默认字体') ? shapeTextDefaultFont : 'Microsoft YaHei'
-              const shapeTextDefaultSize = Math.max(1, Math.round((parseFloat(style.fontSize || '') || 16) * fontSizeFactor))
+          const imgOpts: pptxgen.ImageProps = {
+            x, y, w, h,
+            rotate, flipH, flipV,
+            objectName: el.id
+          }
+          if (imgPath.startsWith('data:')) {
+            imgOpts.data = imgPath
+          } else {
+            imgOpts.path = imgPath
+          }
 
-              const isShapeTextBold = style.fontWeight === 'bold' || style.fontWeight === '700' || (parseInt(style.fontWeight as string) || 0) > 500
-              const isShapeTextItalic = style.fontStyle === 'italic'
-              const isShapeTextUnderline = !!(style.textDecoration && style.textDecoration.includes('underline'))
-              const isShapeTextStrike = !!(style.textDecoration && style.textDecoration.includes('line-through'))
+          const imgShadow = el.shadow || (el.style && (el.style as any).shadow)
+          let parsedImgShadow = convertElShadowToPptx(imgShadow, ratioPx2Pt)
+          if (!parsedImgShadow && el.style?.boxShadow) {
+            parsedImgShadow = parseCssShadow(el.style.boxShadow, ratioPx2Pt)
+          }
+          if (parsedImgShadow) {
+            imgOpts.shadow = parsedImgShadow
+          }
+          const imgRefl = el.reflection || (el.style && el.style.reflection)
+          if (imgRefl) {
+            const parsedReflection = convertElReflectionToPptx(imgRefl, ratioPx2Pt)
+            if (parsedReflection) {
+              imgOpts.reflection = parsedReflection
+            }
+          }
 
-              let shapeMargin: [number, number, number, number] = [7.2, 7.2, 3.6, 3.6]
-              if (style.padding) {
-                const paddingParts = style.padding.trim().split(/\s+/)
-                let parsedPadding = [0, 0, 0, 0]
-                if (paddingParts.length === 4) {
-                  parsedPadding = paddingParts.map((p: string) => parseFloat(p) || 0)
-                } else if (paddingParts.length === 1) {
-                  const val = parseFloat(paddingParts[0]) || 0
-                  parsedPadding = [val, val, val, val]
+          if (el.clip && Array.isArray(el.clip.range) && el.clip.range.length >= 2) {
+            const [start, end] = el.clip.range
+            if (Array.isArray(start) && start.length >= 2 && Array.isArray(end) && end.length >= 2) {
+              const [startX, startY] = start
+              const [endX, endY] = end
+
+              const fractionX = (endX - startX) / 100
+              const fractionY = (endY - startY) / 100
+              if (fractionX > 0 && fractionY > 0) {
+                const originW = w / fractionX
+                const originH = h / fractionY
+
+                imgOpts.w = originW
+                imgOpts.h = originH
+                imgOpts.sizing = {
+                  type: 'crop',
+                  x: (startX / 100) * originW,
+                  y: (startY / 100) * originH,
+                  w: w,
+                  h: h,
                 }
-                shapeMargin = [
-                  parsedPadding[3] / ratioPx2Pt, // left
-                  parsedPadding[1] / ratioPx2Pt, // right
-                  parsedPadding[2] / ratioPx2Pt, // bottom
-                  parsedPadding[0] / ratioPx2Pt  // top
-                ]
               }
+            }
+          }
+
+          pptxSlide.addImage(imgOpts)
+        }
+        else if (el.type === 'shape') {
+          const shapeType = getPredefinedShapeType(el.content, el.pathFormula, (el as any).pptxShapeType)
+
+          // Set defaults based on shape types to match CanvasArea.vue styles
+          let defaultFill = '#3b82f6'
+          let defaultBorderColor = '#2563eb'
+          let defaultBorderWidth = '2px'
+
+          if (el.content === 'triangle') {
+            defaultFill = '#f59e0b'
+            defaultBorderColor = '#d97706'
+            defaultBorderWidth = '3px'
+          } else if (el.content === 'circle') {
+            defaultFill = '#3b82f6'
+            defaultBorderColor = '#2563eb'
+            defaultBorderWidth = '2px'
+          } else if (typeof el.content === 'string' && (el.content.startsWith('M') || el.content.startsWith('m'))) {
+            defaultFill = '#3b82f6'
+            defaultBorderColor = '#2563eb'
+            defaultBorderWidth = '2px'
+          } else { // rect or default
+            defaultFill = '#10b981'
+            defaultBorderColor = '#059669'
+            defaultBorderWidth = '2px'
+          }
 
-              let shapeValign = 'middle'
-              const currentShapeValign = el.style?.verticalAlign || (el as any).vAlign
-              if (currentShapeValign === 'top' || currentShapeValign === 'up') shapeValign = 'top'
-              else if (currentShapeValign === 'bottom' || currentShapeValign === 'down') shapeValign = 'bottom'
-              else if (currentShapeValign === 'middle' || currentShapeValign === 'mid') shapeValign = 'middle'
-
-              let shapeAlign = style.textAlign || 'center'
-
-              let finalLineHeight: number | undefined = undefined
-              if (style.lineHeight !== undefined) {
-                const val = typeof style.lineHeight === 'number'
-                  ? style.lineHeight
-                  : parseFloat(style.lineHeight as string || '')
-                if (!isNaN(val)) {
-                  finalLineHeight = val <= 1.2 ? 1.0 : val
+          const style: any = el.style || {}
+          let shapeFillOpt: any = undefined
+
+          // Helper function to extract element gradient configuration for PPTX export
+          const getElementGradientConfig = (item: any): any => {
+            if (!item) return undefined
+            let gradient = item.gradient || item.style?.gradient
+            if (!gradient) {
+              const rawFill = (item.style && item.style.fill !== undefined) ? item.style.fill : item.fill
+              if (rawFill && typeof rawFill === 'object' && rawFill.type === 'gradient') {
+                const val = rawFill.value || {}
+                gradient = {
+                  path: val.path || 'line',
+                  type: val.path === 'line' || !val.path ? 'linear' : 'radial',
+                  rotate: val.rot !== undefined ? val.rot : (val.rotate !== undefined ? val.rotate : 90),
+                  colors: (val.colors || []).map((c: any) => ({
+                    color: c.color || c.value || '#3b82f6',
+                    pos: c.pos !== undefined ? (typeof c.pos === 'string' ? parseInt(c.pos) : c.pos) : 0
+                  }))
                 }
               }
+            }
+            return gradient
+          }
 
-              let shapeTextShadowObj = (el as any).textShadow || (el.style && (el.style as any).textShadow)
-              let parsedShapeTextShadow: any = undefined
-              if (shapeTextShadowObj) {
-                parsedShapeTextShadow = convertElShadowToPptx(shapeTextShadowObj, ratioPx2Pt)
-              }
+          const getElementPatternUrl = (item: any): string | undefined => {
+            if (!item) return undefined
+            if (item.pattern || item.style?.pattern) return item.pattern || item.style?.pattern
+            const rawFill = (item.style && item.style.fill !== undefined) ? item.style.fill : item.fill
+            if (rawFill && typeof rawFill === 'object' && (rawFill.type === 'image' || rawFill.type === 'pattern')) {
+              return rawFill.value?.src || rawFill.value?.url || rawFill.value
+            }
+            return undefined
+          }
 
-              let shapeTextReflObj = (el as any).textReflection || (el.style as any)?.textReflection
-              let parsedShapeTextReflection: any = undefined
-              if (shapeTextReflObj && shapeTextReflObj.enabled !== false) {
-                parsedShapeTextReflection = convertElReflectionToPptx(shapeTextReflObj, ratioPx2Pt)
+          const patternUrl = getElementPatternUrl(el)
+          const g = getElementGradientConfig(el)
+
+          // SVG 图片填充 PowerPoint 无法可靠渲染 a:blipFill，先按形状显示尺寸栅格化为 PNG
+          // （画布上图案填充本身是 preserveAspectRatio="none" 拉伸铺满，与 a:stretch 语义一致）
+          const rasterizeSvgFill = (svgUrl: string, widthPx: number, heightPx: number): Promise<string | undefined> => {
+            return new Promise((resolve) => {
+              const img = new Image()
+              img.onload = () => {
+                try {
+                  const canvas = document.createElement('canvas')
+                  canvas.width = Math.max(1, Math.min(4096, Math.round(widthPx)))
+                  canvas.height = Math.max(1, Math.min(4096, Math.round(heightPx)))
+                  const ctx = canvas.getContext('2d')
+                  if (!ctx) return resolve(undefined)
+                  ctx.drawImage(img, 0, 0, canvas.width, canvas.height)
+                  resolve(canvas.toDataURL('image/png'))
+                } catch {
+                  resolve(undefined)
+                }
               }
+              img.onerror = () => resolve(undefined)
+              img.src = svgUrl
+            })
+          }
 
-              const textProps = formatHTMLToPPTX(shapeText, {
-                fontSize: shapeTextDefaultSize,
-                color: shapeTextDefaultColor,
-                fontFamily: resolvedShapeFont,
-                bold: isShapeTextBold,
-                italic: isShapeTextItalic,
-                underline: isShapeTextUnderline,
-                strike: isShapeTextStrike,
-                align: shapeAlign,
-                shadow: parsedShapeTextShadow,
-                reflection: parsedShapeTextReflection
-              })
-              const shapeTextOpts: any = {
-                x, y, w, h,
-                shape: shapeType,
-                valign: shapeValign as any,
-                align: shapeAlign as any,
-                margin: shapeMargin,
-                rotate, flipH, flipV,
-                objectName: el.id,
-                fill: nativeFillOpt || shapeFillOpt
-              }
-              if (shapeOpts.points) {
-                shapeTextOpts.points = shapeOpts.points
-              }
-              if (shapeOpts.line) {
-                shapeTextOpts.line = shapeOpts.line
-              }
-              if (shapeOpts.shadow) {
-                shapeTextOpts.shadow = shapeOpts.shadow
-              }
-              if (shapeOpts.reflection) {
-                shapeTextOpts.reflection = shapeOpts.reflection
-              }
-              if (finalLineHeight !== undefined) {
-                shapeTextOpts.lineSpacingMultiple = finalLineHeight
+          const buildNativeShapeFill = async (): Promise<any> => {
+            // 图片填充 → 原生 a:blipFill
+            if (patternUrl) {
+              const pUrl = await resolveMediaSrc(patternUrl, 'image')
+              if (pUrl && /^data:image\/svg\+xml/i.test(pUrl)) {
+                const pngUrl = await rasterizeSvgFill(pUrl, pixelWidth, pixelHeight)
+                return pngUrl ? { type: 'image', data: pngUrl } : undefined
               }
-              if (style.whiteSpace === 'nowrap') {
-                shapeTextOpts.wrap = false
+              if (pUrl && pUrl.startsWith('data:')) {
+                return { type: 'image', data: pUrl }
               }
-
-              const elAny = el as any
-              if (elAny.autoFit) {
-                if (elAny.autoFit.type === 'shape') {
-                  shapeTextOpts.fit = 'resize'
-                } else if (elAny.autoFit.type === 'text') {
-                  shapeTextOpts.fit = 'shrink'
-                }
+              if (pUrl && /^https?:\/\//.test(pUrl)) {
+                return { type: 'image', path: pUrl }
               }
-
-              pptxSlide.addText(textProps, shapeTextOpts)
-            } else {
-              pptxSlide.addShape(shapeType as any, shapeOpts)
+              return undefined // 图片解析失败，回落纯色
             }
-          }
-          else if (el.type === 'chart') {
-            const chartData = el.data?.datasets.map((ds: any, idx: number) => ({
-              name: ds.label || `Series ${idx + 1}`,
-              labels: el.data?.labels || [],
-              values: ds.data || []
-            })) || []
-
-            let rawType = (el.chartType as string) || 'bar'
-            if (rawType === 'doughnutChart' || rawType === 'ring') rawType = 'donut'
-            if (rawType === 'pieChart' || rawType === 'pie3DChart') rawType = 'pie'
-            if (rawType === 'barChart' || rawType === 'bar3DChart') rawType = 'bar'
-            if (rawType === 'lineChart' || rawType === 'line3DChart') rawType = 'line'
-            if (rawType === 'areaChart' || rawType === 'area3DChart') rawType = 'area'
-
-            let chartType = pptx.ChartType.bar
-            if (rawType === 'line') {
-              chartType = pptx.ChartType.line
-            } else if (rawType === 'area') {
-              chartType = pptx.ChartType.area
-            } else if (rawType === 'scatter') {
-              chartType = pptx.ChartType.scatter
-            } else if (rawType === 'pie') {
-              chartType = pptx.ChartType.pie
-            } else if (rawType === 'donut') {
-              chartType = pptx.ChartType.doughnut
-            } else if (rawType === 'radar') {
-              chartType = pptx.ChartType.radar
-            }
-
-            // 1. Resolve colors
-            let colorsList: string[] = []
-            if (Array.isArray(el.style?.chartColors) && el.style.chartColors.length > 0) {
-              colorsList = el.style.chartColors
-            } else if (Array.isArray((el as any).themeColors) && (el as any).themeColors.length > 0) {
-              colorsList = (el as any).themeColors
-            } else if (Array.isArray((el as any).colors) && (el as any).colors.length > 0) {
-              colorsList = (el as any).colors
-            } else if (Array.isArray(el.data?.datasets?.[0]?.backgroundColor) && el.data.datasets[0].backgroundColor.length > 0) {
-              colorsList = el.data.datasets[0].backgroundColor
-            } else if (Array.isArray(el.data?.datasets?.[0]?.colors) && el.data.datasets[0].colors.length > 0) {
-              colorsList = el.data.datasets[0].colors
-            } else {
-              const dsColors = (el.data?.datasets || []).map((ds: any) => ds.color || ds.backgroundColor).filter((c: any) => c && typeof c === 'string')
-              if (dsColors.length > 0) {
-                colorsList = dsColors
-              } else {
-                colorsList = (globalThemeColor && globalThemeColor.value && globalThemeColor.value.length > 0)
-                  ? globalThemeColor.value
-                  : ['#4f46e5', '#06b6d4', '#f59e0b', '#10b981', '#ec4899', '#8b5cf6', '#ef4444', '#14b8a6']
+            // 渐变填充 → 原生 a:gradFill
+            if (g && Array.isArray(g.colors) && g.colors.length >= 2) {
+              return {
+                type: 'gradient',
+                stops: g.colors.map((c: any) => ({
+                  color: String(c.color || '#3b82f6').replace('#', ''),
+                  pos: typeof c.pos === 'number' && !isNaN(c.pos) ? c.pos : 0
+                })),
+                angle: g.rotate !== undefined ? g.rotate : (g.rot !== undefined ? g.rot : 90),
+                radial: g.type === 'radial' || g.path === 'circle'
               }
             }
-            const cleanHexColors = colorsList
-              .filter((c: any) => c && typeof c === 'string')
-              .map((c: string) => parseColor(c).color)
-
-            // 2. Legend visibility and position
-            const isPieOrDonut = chartType === pptx.ChartType.doughnut || chartType === pptx.ChartType.pie
-            let showLegend = false
-            if (el.showLegend !== undefined) {
-              showLegend = Boolean(el.showLegend)
-            } else if ((el as any).options?.showLegend !== undefined) {
-              showLegend = Boolean((el as any).options.showLegend)
-            } else {
-              showLegend = !isPieOrDonut
-            }
+            return undefined
+          }
+          const nativeFillOpt = await buildNativeShapeFill()
 
-            const chartFont = el.style?.fontFamily || el.fontFamily || (globalFontFamily && globalFontFamily.value) || 'Microsoft YaHei'
-            const textColorHex = parseColor(el.style?.color || el.style?.textColor || el.textColor || '#64748b').color
+          const rawFill = style.fill !== undefined ? style.fill : (el.fill !== undefined ? el.fill : defaultFill)
+          if (rawFill === 'transparent' || rawFill === 'none') {
+            shapeFillOpt = { type: 'none' }
+          } else {
+            const fillParsed = parseColor(rawFill)
+            shapeFillOpt = { color: fillParsed.color, transparency: fillParsed.transparency }
+          }
 
-            const chartOpts: pptxgen.IChartOpts = {
-              x, y, w, h,
-              showLegend,
-              chartColors: cleanHexColors.length > 0 ? cleanHexColors : undefined,
-              objectName: el.id
-            }
+          const shapeOpts: pptxgen.ShapeProps = {
+            x, y, w, h,
+            fill: nativeFillOpt || shapeFillOpt,
+            rotate, flipH, flipV,
+            objectName: el.id
+          }
 
-            if (showLegend) {
-              let legendPos: 'b' | 'l' | 'r' | 't' = 'b'
-              const rawPos = (el.legendPosition || (el as any).options?.legendPosition || 'bottom').toLowerCase()
-              if (rawPos.startsWith('top')) legendPos = 't'
-              else if (rawPos.startsWith('left')) legendPos = 'l'
-              else if (rawPos.startsWith('right')) legendPos = 'r'
-              else if (rawPos.startsWith('bottom')) legendPos = 'b'
-              chartOpts.legendPos = legendPos
-              chartOpts.legendColor = textColorHex
-              chartOpts.legendFontSize = 10
-              chartOpts.legendFontFace = chartFont
+          const borderWidth = style.borderWidth ? (parseFloat(style.borderWidth) || 0) : 0
+          const borderColorStr = style.borderColor
+          if (borderWidth > 0 && borderColorStr && borderColorStr !== 'transparent' && borderColorStr !== 'none') {
+            const borderParsed = parseColor(borderColorStr)
+            shapeOpts.line = {
+              color: borderParsed.color,
+              width: borderWidth / ratioPx2Pt,
+              dashType: style.borderStyle === 'dashed' ? 'dash' : 'solid'
             }
+          }
 
-            // 3. Bar direction
-            if (rawType === 'horizontal-bar') {
-              chartOpts.barDir = 'bar'
-            } else if (rawType === 'bar') {
-              chartOpts.barDir = 'col'
-            }
+          const shapeShadow = el.shadow || style.shadow
+          let parsedShadow: any = convertElShadowToPptx(shapeShadow, ratioPx2Pt)
+          if (!parsedShadow && style.boxShadow) {
+            parsedShadow = parseCssShadow(style.boxShadow, ratioPx2Pt)
+          }
+          if (parsedShadow) {
+            shapeOpts.shadow = parsedShadow
+          }
 
-            // 4. Donut specific options (hole size)
-            if (chartType === pptx.ChartType.doughnut) {
-              const rawHole = parseFloat((el as any).holeSize || (el as any).options?.holeSize)
-              const holeSize = (!isNaN(rawHole) && rawHole > 0 && rawHole < 100) ? Math.round(rawHole) : 72
-              chartOpts.holeSize = holeSize
+          const shapeRefl = el.reflection || style.reflection
+          if (shapeRefl) {
+            const parsedReflection = convertElReflectionToPptx(shapeRefl, ratioPx2Pt)
+            if (parsedReflection) {
+              shapeOpts.reflection = parsedReflection
             }
+          }
 
-            // 5. Slices border
-            if (isPieOrDonut) {
-              chartOpts.dataBorder = {
-                pt: 1.5,
-                color: 'FFFFFF'
-              }
+          if (shapeType === 'custGeom') {
+            const rawPoints = toPoints(el.content || '')
+            const viewBoxWidth = (Array.isArray(el.viewBox) && el.viewBox.length >= 2) ? el.viewBox[0] : pixelWidth
+            const viewBoxHeight = (Array.isArray(el.viewBox) && el.viewBox.length >= 2) ? el.viewBox[1] : pixelHeight
+            const scale = {
+              x: pixelWidth / viewBoxWidth,
+              y: viewBoxHeight > 0 ? pixelHeight / viewBoxHeight : 1
             }
+            shapeOpts.points = formatPoints(rawPoints, scale, pixelToInch) as any
+          }
 
-            // 6. Data labels & Percent
-            const hasPercentOpt = (el as any).showPercent !== undefined
-              ? Boolean((el as any).showPercent)
-              : (el as any).options?.showPercent !== undefined
-                ? Boolean((el as any).options.showPercent)
-                : isPieOrDonut
-
-            const showDataLabels = el.showDataLabels !== undefined
-              ? Boolean(el.showDataLabels)
-              : (el as any).options?.showDataLabels !== undefined
-                ? Boolean((el as any).options.showDataLabels)
-                : isPieOrDonut
-
-            if (isPieOrDonut) {
-              if (hasPercentOpt || showDataLabels) {
-                chartOpts.showPercent = true
-                chartOpts.showValue = false
-                chartOpts.dataLabelColor = 'FFFFFF'
-                chartOpts.dataLabelFontSize = 11
-                chartOpts.dataLabelFontBold = true
-                chartOpts.dataLabelFormatCode = '0%'
-                chartOpts.dataLabelFontFace = chartFont
-              } else {
-                chartOpts.showPercent = false
-                chartOpts.showValue = false
-              }
-            } else {
-              if (showDataLabels || (el as any).showValue) {
-                chartOpts.showValue = true
-                chartOpts.dataLabelColor = textColorHex
-                chartOpts.dataLabelFontSize = 10
-                chartOpts.dataLabelFontFace = chartFont
+          const shapeText = typeof el.text === 'string' ? el.text : ((el as any).text?.content || (typeof el.content === 'string' && !el.content.startsWith('M') && !el.content.startsWith('m') && el.content !== 'circle' && el.content !== 'triangle' && el.content.replace(/<[^>]+>/g, '').trim().length > 0 ? el.content : ''))
+
+          if (shapeText) {
+            const shapeTextDefaultColor = style.textColor || style.color || (style.fill === '#ffffff' || style.fill === '#FFFFFF' ? '#475569' : '#ffffff')
+            const shapeTextDefaultFont = style.fontFamily || (globalFontFamily && globalFontFamily.value) || 'Arial'
+            const resolvedShapeFont = (shapeTextDefaultFont !== 'inherit' && shapeTextDefaultFont !== '默认字体') ? shapeTextDefaultFont : 'Microsoft YaHei'
+            const shapeTextDefaultSize = Math.max(1, Math.round((parseFloat(style.fontSize || '') || 16) * fontSizeFactor))
+
+            const isShapeTextBold = style.fontWeight === 'bold' || style.fontWeight === '700' || (parseInt(style.fontWeight as string) || 0) > 500
+            const isShapeTextItalic = style.fontStyle === 'italic'
+            const isShapeTextUnderline = !!(style.textDecoration && style.textDecoration.includes('underline'))
+            const isShapeTextStrike = !!(style.textDecoration && style.textDecoration.includes('line-through'))
+
+            let shapeMargin: [number, number, number, number] = [7.2, 7.2, 3.6, 3.6]
+            if (style.padding) {
+              const paddingParts = style.padding.trim().split(/\s+/)
+              let parsedPadding = [0, 0, 0, 0]
+              if (paddingParts.length === 4) {
+                parsedPadding = paddingParts.map((p: string) => parseFloat(p) || 0)
+              } else if (paddingParts.length === 1) {
+                const val = parseFloat(paddingParts[0]) || 0
+                parsedPadding = [val, val, val, val]
               }
+              shapeMargin = [
+                parsedPadding[3] / ratioPx2Pt, // left
+                parsedPadding[1] / ratioPx2Pt, // right
+                parsedPadding[2] / ratioPx2Pt, // bottom
+                parsedPadding[0] / ratioPx2Pt  // top
+              ]
             }
 
-            // 7. Cartesian axes & grid lines
-            if (!isPieOrDonut && chartType !== pptx.ChartType.radar) {
-              const gridHex = parseColor(el.style?.gridColor || el.gridColor || '#e2e8f0').color
-              const showGrid = el.showGridlines !== false
-              const showAxes = el.showAxes !== false
+            let shapeValign = 'middle'
+            const currentShapeValign = el.style?.verticalAlign || (el as any).vAlign
+            if (currentShapeValign === 'top' || currentShapeValign === 'up') shapeValign = 'top'
+            else if (currentShapeValign === 'bottom' || currentShapeValign === 'down') shapeValign = 'bottom'
+            else if (currentShapeValign === 'middle' || currentShapeValign === 'mid') shapeValign = 'middle'
 
-              chartOpts.valGridLine = showGrid ? { color: gridHex, size: 0.75, style: 'dash' } : { style: 'none' }
-              chartOpts.catGridLine = { style: 'none' }
+            let shapeAlign = style.textAlign || 'center'
 
-              chartOpts.catAxisLabelColor = textColorHex
-              chartOpts.valAxisLabelColor = textColorHex
-              chartOpts.catAxisHidden = !showAxes
-              chartOpts.valAxisHidden = !showAxes
+            let finalLineHeight: number | undefined = undefined
+            if (style.lineHeight !== undefined) {
+              const val = typeof style.lineHeight === 'number'
+                ? style.lineHeight
+                : parseFloat(style.lineHeight as string || '')
+              if (!isNaN(val)) {
+                finalLineHeight = val <= 1.2 ? 1.0 : val
+              }
             }
 
-            // 8. Line chart specific
-            if (chartType === pptx.ChartType.line) {
-              chartOpts.lineSize = 2.5
-              chartOpts.lineSmooth = true
+            let shapeTextShadowObj = (el as any).textShadow || (el.style && (el.style as any).textShadow)
+            let parsedShapeTextShadow: any = undefined
+            if (shapeTextShadowObj) {
+              parsedShapeTextShadow = convertElShadowToPptx(shapeTextShadowObj, ratioPx2Pt)
             }
 
-            pptxSlide.addChart(chartType, chartData, chartOpts)
-          }
-          else if (el.type === 'line') {
-            const mapArrowToPPTX = (uiType: string | undefined) => {
-              if (!uiType) return 'none'
-              const t = uiType.toLowerCase()
-              if (t === 'arrow') return 'triangle'
-              if (t === 'open-arrow') return 'arrow'
-              if (t === 'stealth-arrow') return 'stealth'
-              if (t === 'dot') return 'oval'
-              if (t === 'diamond') return 'diamond'
-              return 'none'
-            }
-            const beginArrow = mapArrowToPPTX(el.points?.[0])
-            const endArrow = mapArrowToPPTX(el.points?.[1])
-
-            const path = getLineElementPath(el)
-            const rawPoints = toPoints(path)
-            const points = formatPoints(rawPoints, { x: 1, y: 1 }, pixelToInch) as any
-
-            const lineOpts: any = {
+            let shapeTextReflObj = (el as any).textReflection || (el.style as any)?.textReflection
+            let parsedShapeTextReflection: any = undefined
+            if (shapeTextReflObj && shapeTextReflObj.enabled !== false) {
+              parsedShapeTextReflection = convertElReflectionToPptx(shapeTextReflObj, ratioPx2Pt)
+            }
+
+            const textProps = formatHTMLToPPTX(shapeText, {
+              fontSize: shapeTextDefaultSize,
+              color: shapeTextDefaultColor,
+              fontFamily: resolvedShapeFont,
+              bold: isShapeTextBold,
+              italic: isShapeTextItalic,
+              underline: isShapeTextUnderline,
+              strike: isShapeTextStrike,
+              align: shapeAlign,
+              shadow: parsedShapeTextShadow,
+              reflection: parsedShapeTextReflection
+            })
+            const shapeTextOpts: any = {
               x, y, w, h,
-              line: {
-                color: parseColor(el.style?.color || '#475569').color,
-                width: ((el.style?.strokeWidth || 1) as number) / ratioPx2Pt,
-                dashType: el.lineStyle === 'dashed' ? 'dash' : 'solid',
-                beginArrowType: beginArrow as any,
-                endArrowType: endArrow as any
-              },
-              points,
+              shape: shapeType,
+              valign: shapeValign as any,
+              align: shapeAlign as any,
+              margin: shapeMargin,
               rotate, flipH, flipV,
-              objectName: el.id
+              objectName: el.id,
+              fill: nativeFillOpt || shapeFillOpt
             }
-            const lineShadow = el.shadow || (el.style as any)?.shadow
-            let parsedLineShadow = convertElShadowToPptx(lineShadow, ratioPx2Pt)
-            if (!parsedLineShadow && el.style?.boxShadow) {
-              parsedLineShadow = parseCssShadow(el.style.boxShadow, ratioPx2Pt)
+            if (shapeOpts.points) {
+              shapeTextOpts.points = shapeOpts.points
             }
-            if (parsedLineShadow) lineOpts.shadow = parsedLineShadow
-            const lineRefl = el.reflection || el.style?.reflection
-            if (lineRefl) {
-              const parsedReflection = convertElReflectionToPptx(lineRefl, ratioPx2Pt)
-              if (parsedReflection) lineOpts.reflection = parsedReflection
+            if (shapeOpts.line) {
+              shapeTextOpts.line = shapeOpts.line
             }
-            pptxSlide.addShape('custGeom' as any, lineOpts)
-          }
-          else if (el.type === 'audio' || el.type === 'video') {
-            const mediaInput = (el as any).blob || (el as any).src || el.content || (el as any).value || ''
-            let mediaPath = ''
-            if (typeof Blob !== 'undefined' && mediaInput instanceof Blob) {
-              try {
-                mediaPath = await blobToDataUrl(mediaInput)
-              } catch (e) {
-                console.warn('Converting media Blob to DataURL failed:', e)
-              }
+            if (shapeOpts.shadow) {
+              shapeTextOpts.shadow = shapeOpts.shadow
+            }
+            if (shapeOpts.reflection) {
+              shapeTextOpts.reflection = shapeOpts.reflection
+            }
+            if (finalLineHeight !== undefined) {
+              shapeTextOpts.lineSpacingMultiple = finalLineHeight
+            }
+            if (style.whiteSpace === 'nowrap') {
+              shapeTextOpts.wrap = false
             }
-            if (!mediaPath) {
-              mediaPath = await resolveMediaSrc(mediaInput, el.type as 'video' | 'audio')
-            }
-            if (mediaPath && mediaPath.startsWith('data:')) {
-              let extn = el.type === 'audio' ? 'mp3' : 'mp4'
-              if (mediaPath.startsWith('data:audio/')) {
-                if (mediaPath.includes('audio/wav')) extn = 'wav'
-                else if (mediaPath.includes('audio/m4a') || mediaPath.includes('audio/x-m4a') || mediaPath.includes('audio/mp4')) extn = 'm4a'
-                else if (mediaPath.includes('audio/ogg')) extn = 'ogg'
-                else extn = 'mp3'
-              } else if (mediaPath.startsWith('data:video/')) {
-                if (mediaPath.includes('video/webm')) extn = 'webm'
-                else if (mediaPath.includes('video/ogg')) extn = 'ogg'
-                else extn = 'mp4'
+
+            const elAny = el as any
+            if (elAny.autoFit) {
+              if (elAny.autoFit.type === 'shape') {
+                shapeTextOpts.fit = 'resize'
+              } else if (elAny.autoFit.type === 'text') {
+                shapeTextOpts.fit = 'shrink'
               }
+            }
 
-              pptxSlide.addMedia({
-                type: el.type,
-                data: mediaPath,
-                extn,
-                x, y, w, h,
-                objectName: el.id
-              })
+            pptxSlide.addText(textProps, shapeTextOpts)
+          } else {
+            pptxSlide.addShape(shapeType as any, shapeOpts)
+          }
+        }
+        else if (el.type === 'chart') {
+          const chartData = el.data?.datasets.map((ds: any, idx: number) => ({
+            name: ds.label || `Series ${idx + 1}`,
+            labels: el.data?.labels || [],
+            values: ds.data || []
+          })) || []
+
+          let rawType = (el.chartType as string) || 'bar'
+          if (rawType === 'doughnutChart' || rawType === 'ring') rawType = 'donut'
+          if (rawType === 'pieChart' || rawType === 'pie3DChart') rawType = 'pie'
+          if (rawType === 'barChart' || rawType === 'bar3DChart') rawType = 'bar'
+          if (rawType === 'lineChart' || rawType === 'line3DChart') rawType = 'line'
+          if (rawType === 'areaChart' || rawType === 'area3DChart') rawType = 'area'
+
+          let chartType = pptx.ChartType.bar
+          if (rawType === 'line') {
+            chartType = pptx.ChartType.line
+          } else if (rawType === 'area') {
+            chartType = pptx.ChartType.area
+          } else if (rawType === 'scatter') {
+            chartType = pptx.ChartType.scatter
+          } else if (rawType === 'pie') {
+            chartType = pptx.ChartType.pie
+          } else if (rawType === 'donut') {
+            chartType = pptx.ChartType.doughnut
+          } else if (rawType === 'radar') {
+            chartType = pptx.ChartType.radar
+          }
+
+          // 1. Resolve colors
+          let colorsList: string[] = []
+          if (Array.isArray(el.style?.chartColors) && el.style.chartColors.length > 0) {
+            colorsList = el.style.chartColors
+          } else if (Array.isArray((el as any).themeColors) && (el as any).themeColors.length > 0) {
+            colorsList = (el as any).themeColors
+          } else if (Array.isArray((el as any).colors) && (el as any).colors.length > 0) {
+            colorsList = (el as any).colors
+          } else if (Array.isArray(el.data?.datasets?.[0]?.backgroundColor) && el.data.datasets[0].backgroundColor.length > 0) {
+            colorsList = el.data.datasets[0].backgroundColor
+          } else if (Array.isArray(el.data?.datasets?.[0]?.colors) && el.data.datasets[0].colors.length > 0) {
+            colorsList = el.data.datasets[0].colors
+          } else {
+            const dsColors = (el.data?.datasets || []).map((ds: any) => ds.color || ds.backgroundColor).filter((c: any) => c && typeof c === 'string')
+            if (dsColors.length > 0) {
+              colorsList = dsColors
             } else {
-              // 无法获取或跨域拦截二进制数据时的防护兜底：
-              // 严禁调用带 path 的 addMedia，否则 pptxgenjs 会因为 XHR 失败向媒体文件写入损坏的图片数据，导致导出的 PPTX 无法打开！
-              // 生成规范的优雅多媒体占位卡片并挂载在线超链接，确保 PPT 100% 正常打开且可点击跳转播放
-              const isVideo = el.type === 'video'
-              const mediaTitle = isVideo ? '视频' : '音频'
-              const displayUrl = typeof mediaInput === 'string' ? mediaInput : ''
-
-              pptxSlide.addShape('rect' as any, {
-                x, y, w, h,
-                fill: { color: isVideo ? '1E293B' : '0F172A' },
-                line: { color: '3B82F6', width: 1.5, dashType: 'dash' },
-                rectRadius: 0.08,
-                hyperlink: displayUrl ? { url: displayUrl, tooltip: `点击在线打开${mediaTitle}` } : undefined,
-                objectName: el.id
-              })
+              colorsList = (globalThemeColor && globalThemeColor.value && globalThemeColor.value.length > 0)
+                ? globalThemeColor.value
+                : ['#4f46e5', '#06b6d4', '#f59e0b', '#10b981', '#ec4899', '#8b5cf6', '#ef4444', '#14b8a6']
+            }
+          }
+          const cleanHexColors = colorsList
+            .filter((c: any) => c && typeof c === 'string')
+            .map((c: string) => parseColor(c).color)
+
+          // 2. Legend visibility and position
+          const isPieOrDonut = chartType === pptx.ChartType.doughnut || chartType === pptx.ChartType.pie
+          let showLegend = false
+          if (el.showLegend !== undefined) {
+            showLegend = Boolean(el.showLegend)
+          } else if ((el as any).options?.showLegend !== undefined) {
+            showLegend = Boolean((el as any).options.showLegend)
+          } else {
+            showLegend = !isPieOrDonut
+          }
 
-              pptxSlide.addText([
-                { text: isVideo ? '▶ 视频多媒体' : '🎵 音频多媒体', options: { bold: true, fontSize: 13, color: 'FFFFFF' } },
-                { text: displayUrl ? `\n(在线链接: ${displayUrl.length > 36 ? displayUrl.slice(0, 36) + '...' : displayUrl})` : '', options: { fontSize: 9, color: '94A3B8' } },
-                { text: '\n[点击卡片在浏览器中播放]', options: { fontSize: 9, color: '60A5FA' } }
-              ], {
-                x, y, w, h,
-                align: 'center',
-                valign: 'middle',
-                hyperlink: displayUrl ? { url: displayUrl, tooltip: `点击在线打开${mediaTitle}` } : undefined
-              })
+          const chartFont = el.style?.fontFamily || el.fontFamily || (globalFontFamily && globalFontFamily.value) || 'Microsoft YaHei'
+          const textColorHex = parseColor(el.style?.color || el.style?.textColor || el.textColor || '#64748b').color
+
+          const chartOpts: pptxgen.IChartOpts = {
+            x, y, w, h,
+            showLegend,
+            chartColors: cleanHexColors.length > 0 ? cleanHexColors : undefined,
+            objectName: el.id
+          }
+
+          if (showLegend) {
+            let legendPos: 'b' | 'l' | 'r' | 't' = 'b'
+            const rawPos = (el.legendPosition || (el as any).options?.legendPosition || 'bottom').toLowerCase()
+            if (rawPos.startsWith('top')) legendPos = 't'
+            else if (rawPos.startsWith('left')) legendPos = 'l'
+            else if (rawPos.startsWith('right')) legendPos = 'r'
+            else if (rawPos.startsWith('bottom')) legendPos = 'b'
+            chartOpts.legendPos = legendPos
+            chartOpts.legendColor = textColorHex
+            chartOpts.legendFontSize = 10
+            chartOpts.legendFontFace = chartFont
+          }
+
+          // 3. Bar direction
+          if (rawType === 'horizontal-bar') {
+            chartOpts.barDir = 'bar'
+          } else if (rawType === 'bar') {
+            chartOpts.barDir = 'col'
+          }
+
+          // 4. Donut specific options (hole size)
+          if (chartType === pptx.ChartType.doughnut) {
+            const rawHole = parseFloat((el as any).holeSize || (el as any).options?.holeSize)
+            const holeSize = (!isNaN(rawHole) && rawHole > 0 && rawHole < 100) ? Math.round(rawHole) : 72
+            chartOpts.holeSize = holeSize
+          }
+
+          // 5. Slices border
+          if (isPieOrDonut) {
+            chartOpts.dataBorder = {
+              pt: 1.5,
+              color: 'FFFFFF'
             }
           }
-          else if (el.type === 'table') {
-            const res = (el.content && (el.content.includes('<table') || el.content.includes('&lt;table')))
-              ? parseHTMLTable(el.content, w)
-              : parseTableElementData(el, w)
-            if (res.tableData && res.tableData.length > 0) {
-              const tableOpts: any = { x, y, w, h, objectName: el.id }
-              if (res.colW && res.colW.length > 0) {
-                tableOpts.colW = res.colW
-              }
-              pptxSlide.addTable(res.tableData, tableOpts)
+
+          // 6. Data labels & Percent
+          const hasPercentOpt = (el as any).showPercent !== undefined
+            ? Boolean((el as any).showPercent)
+            : (el as any).options?.showPercent !== undefined
+              ? Boolean((el as any).options.showPercent)
+              : isPieOrDonut
+
+          const showDataLabels = el.showDataLabels !== undefined
+            ? Boolean(el.showDataLabels)
+            : (el as any).options?.showDataLabels !== undefined
+              ? Boolean((el as any).options.showDataLabels)
+              : isPieOrDonut
+
+          if (isPieOrDonut) {
+            if (hasPercentOpt || showDataLabels) {
+              chartOpts.showPercent = true
+              chartOpts.showValue = false
+              chartOpts.dataLabelColor = 'FFFFFF'
+              chartOpts.dataLabelFontSize = 11
+              chartOpts.dataLabelFontBold = true
+              chartOpts.dataLabelFormatCode = '0%'
+              chartOpts.dataLabelFontFace = chartFont
+            } else {
+              chartOpts.showPercent = false
+              chartOpts.showValue = false
+            }
+          } else {
+            if (showDataLabels || (el as any).showValue) {
+              chartOpts.showValue = true
+              chartOpts.dataLabelColor = textColorHex
+              chartOpts.dataLabelFontSize = 10
+              chartOpts.dataLabelFontFace = chartFont
             }
           }
+
+          // 7. Cartesian axes & grid lines
+          if (!isPieOrDonut && chartType !== pptx.ChartType.radar) {
+            const gridHex = parseColor(el.style?.gridColor || el.gridColor || '#e2e8f0').color
+            const showGrid = el.showGridlines !== false
+            const showAxes = el.showAxes !== false
+
+            chartOpts.valGridLine = showGrid ? { color: gridHex, size: 0.75, style: 'dash' } : { style: 'none' }
+            chartOpts.catGridLine = { style: 'none' }
+
+            chartOpts.catAxisLabelColor = textColorHex
+            chartOpts.valAxisLabelColor = textColorHex
+            chartOpts.catAxisHidden = !showAxes
+            chartOpts.valAxisHidden = !showAxes
+          }
+
+          // 8. Line chart specific
+          if (chartType === pptx.ChartType.line) {
+            chartOpts.lineSize = 2.5
+            chartOpts.lineSmooth = true
+          }
+
+          pptxSlide.addChart(chartType, chartData, chartOpts)
+        }
+        else if (el.type === 'line') {
+          const mapArrowToPPTX = (uiType: string | undefined) => {
+            if (!uiType) return 'none'
+            const t = uiType.toLowerCase()
+            if (t === 'arrow') return 'triangle'
+            if (t === 'open-arrow') return 'arrow'
+            if (t === 'stealth-arrow') return 'stealth'
+            if (t === 'dot') return 'oval'
+            if (t === 'diamond') return 'diamond'
+            return 'none'
+          }
+          const beginArrow = mapArrowToPPTX(el.points?.[0])
+          const endArrow = mapArrowToPPTX(el.points?.[1])
+
+          const path = getLineElementPath(el)
+          const rawPoints = toPoints(path)
+          const points = formatPoints(rawPoints, { x: 1, y: 1 }, pixelToInch) as any
+
+          const lineOpts: any = {
+            x, y, w, h,
+            line: {
+              color: parseColor(el.style?.color || '#475569').color,
+              width: ((el.style?.strokeWidth || 1) as number) / ratioPx2Pt,
+              dashType: el.lineStyle === 'dashed' ? 'dash' : 'solid',
+              beginArrowType: beginArrow as any,
+              endArrowType: endArrow as any
+            },
+            points,
+            rotate, flipH, flipV,
+            objectName: el.id
+          }
+          const lineShadow = el.shadow || (el.style as any)?.shadow
+          let parsedLineShadow = convertElShadowToPptx(lineShadow, ratioPx2Pt)
+          if (!parsedLineShadow && el.style?.boxShadow) {
+            parsedLineShadow = parseCssShadow(el.style.boxShadow, ratioPx2Pt)
+          }
+          if (parsedLineShadow) lineOpts.shadow = parsedLineShadow
+          const lineRefl = el.reflection || el.style?.reflection
+          if (lineRefl) {
+            const parsedReflection = convertElReflectionToPptx(lineRefl, ratioPx2Pt)
+            if (parsedReflection) lineOpts.reflection = parsedReflection
+          }
+          pptxSlide.addShape('custGeom' as any, lineOpts)
         }
+        else if (el.type === 'audio' || el.type === 'video') {
+          const mediaInput = (el as any).blob || (el as any).src || el.content || (el as any).value || ''
+          let mediaPath = ''
+          if (typeof Blob !== 'undefined' && mediaInput instanceof Blob) {
+            try {
+              mediaPath = await blobToDataUrl(mediaInput)
+            } catch (e) {
+              console.warn('Converting media Blob to DataURL failed:', e)
+            }
+          }
+          if (!mediaPath) {
+            mediaPath = await resolveMediaSrc(mediaInput, el.type as 'video' | 'audio')
+          }
+          if (mediaPath && mediaPath.startsWith('data:')) {
+            let extn = el.type === 'audio' ? 'mp3' : 'mp4'
+            if (mediaPath.startsWith('data:audio/')) {
+              if (mediaPath.includes('audio/wav')) extn = 'wav'
+              else if (mediaPath.includes('audio/m4a') || mediaPath.includes('audio/x-m4a') || mediaPath.includes('audio/mp4')) extn = 'm4a'
+              else if (mediaPath.includes('audio/ogg')) extn = 'ogg'
+              else extn = 'mp3'
+            } else if (mediaPath.startsWith('data:video/')) {
+              if (mediaPath.includes('video/webm')) extn = 'webm'
+              else if (mediaPath.includes('video/ogg')) extn = 'ogg'
+              else extn = 'mp4'
+            }
+
+            pptxSlide.addMedia({
+              type: el.type,
+              data: mediaPath,
+              extn,
+              x, y, w, h,
+              objectName: el.id
+            })
+          } else {
+            // 无法获取或跨域拦截二进制数据时的防护兜底：
+            // 严禁调用带 path 的 addMedia，否则 pptxgenjs 会因为 XHR 失败向媒体文件写入损坏的图片数据，导致导出的 PPTX 无法打开！
+            // 生成规范的优雅多媒体占位卡片并挂载在线超链接，确保 PPT 100% 正常打开且可点击跳转播放
+            const isVideo = el.type === 'video'
+            const mediaTitle = isVideo ? '视频' : '音频'
+            const displayUrl = typeof mediaInput === 'string' ? mediaInput : ''
+
+            pptxSlide.addShape('rect' as any, {
+              x, y, w, h,
+              fill: { color: isVideo ? '1E293B' : '0F172A' },
+              line: { color: '3B82F6', width: 1.5, dashType: 'dash' },
+              rectRadius: 0.08,
+              hyperlink: displayUrl ? { url: displayUrl, tooltip: `点击在线打开${mediaTitle}` } : undefined,
+              objectName: el.id
+            })
 
-        const hasNativeMaster = !!(currentZipMeta?.value?.masterFilesMap && Object.keys(currentZipMeta.value.masterFilesMap).length > 0)
-        const masterElements = getEffectiveMasterElementsForSlide(slide, true)
-        if (!hasNativeMaster && masterElements && masterElements.length > 0) {
-          for (const mEl of masterElements) {
-            await processElement(mEl, null)
+            pptxSlide.addText([
+              { text: isVideo ? '▶ 视频多媒体' : '🎵 音频多媒体', options: { bold: true, fontSize: 13, color: 'FFFFFF' } },
+              { text: displayUrl ? `\n(在线链接: ${displayUrl.length > 36 ? displayUrl.slice(0, 36) + '...' : displayUrl})` : '', options: { fontSize: 9, color: '94A3B8' } },
+              { text: '\n[点击卡片在浏览器中播放]', options: { fontSize: 9, color: '60A5FA' } }
+            ], {
+              x, y, w, h,
+              align: 'center',
+              valign: 'middle',
+              hyperlink: displayUrl ? { url: displayUrl, tooltip: `点击在线打开${mediaTitle}` } : undefined
+            })
           }
         }
+        else if (el.type === 'table') {
+          const res = (el.content && (el.content.includes('<table') || el.content.includes('&lt;table')))
+            ? parseHTMLTable(el.content, w)
+            : parseTableElementData(el, w)
+          if (res.tableData && res.tableData.length > 0) {
+            const tableOpts: any = { x, y, w, h, objectName: el.id }
+            if (res.colW && res.colW.length > 0) {
+              tableOpts.colW = res.colW
+            }
+            pptxSlide.addTable(res.tableData, tableOpts)
+          }
+        }
+      }
 
-        const userElements = (slide.elements || []).filter((e: any) => {
-          if (e.isMaster && !e.isPlaceholder && !e.placeholder && !e.id?.startsWith('ph-') && !e.id?.startsWith('ph_') && !e.name?.includes('占位符')) {
-            if (masterElements && masterElements.some((m: any) => m.id === e.id)) {
-              return false
-            }
+      const hasNativeMaster = !!(currentZipMeta?.value?.masterFilesMap && Object.keys(currentZipMeta.value.masterFilesMap).length > 0)
+      const masterElements = getEffectiveMasterElementsForSlide(slide, true)
+      if (!hasNativeMaster && masterElements && masterElements.length > 0) {
+        for (const mEl of masterElements) {
+          await processElement(mEl, null)
+        }
+      }
+
+      const userElements = (slide.elements || []).filter((e: any) => {
+        if (e.isMaster && !e.isPlaceholder && !e.placeholder && !e.id?.startsWith('ph-') && !e.id?.startsWith('ph_') && !e.name?.includes('占位符')) {
+          if (masterElements && masterElements.some((m: any) => m.id === e.id)) {
+            return false
           }
-          return true
-        })
-        for (const el of userElements) {
-          await processElement(el, null)
         }
+        return true
+      })
+      for (const el of userElements) {
+        await processElement(el, null)
+      }
     }
     const rawBlob = (await pptx.write({ outputType: 'blob' })) as Blob
     const animatedBlob = await injectAnimationToPptxBlob(
@@ -2791,6 +2793,14 @@ const handleExportCommand = (command: string) => {
   }
 }
 
+const handleImportCommand = (command: string) => {
+  if (command === 'pptx') {
+    triggerPPTXImport()
+  } else if (command === 'json') {
+    triggerJSONImport()
+  }
+}
+
 function parseColorToRgb(c: string) {
   c = c.trim().toLowerCase();
   if (c.startsWith('#')) {
@@ -5767,12 +5777,12 @@ const parsePPTXJSONData = (json: any, zipMeta?: any) => {
               points: connectorPoints,
               elements: isNestedGroup
                 ? (() => {
-                    const nestedChildIdMap = new Map<string, any>(siblings)
-                    for (const ch of _el.elements || []) {
-                      if (ch && ch.id !== undefined) nestedChildIdMap.set(String(ch.id), ch)
-                    }
-                    return [...(_el.elements || [])].sort((a: any, b: any) => (a.order || 0) - (b.order || 0)).map((gChild: any) => convertChildElement(gChild, curW, curH, nestedChildIdMap))
-                  })()
+                  const nestedChildIdMap = new Map<string, any>(siblings)
+                  for (const ch of _el.elements || []) {
+                    if (ch && ch.id !== undefined) nestedChildIdMap.set(String(ch.id), ch)
+                  }
+                  return [...(_el.elements || [])].sort((a: any, b: any) => (a.order || 0) - (b.order || 0)).map((gChild: any) => convertChildElement(gChild, curW, curH, nestedChildIdMap))
+                })()
                 : undefined
             }
           }
@@ -5820,6 +5830,10 @@ const parsePPTXJSONData = (json: any, zipMeta?: any) => {
             elements: sortedTopGroupChildren.map((child: any) => convertChildElement(child, topW, topH, childIdMap))
           }
 
+          if (grpFlipH || grpFlipV) {
+            applyGroupGeometryFlip(groupElement, grpFlipH, grpFlipV)
+          }
+
           slide.elements.push(groupElement)
         }
         else if (el.type === 'diagram') {
@@ -6761,186 +6775,268 @@ const importPptxArrayBuffer = async (buffer: ArrayBuffer, fileName?: string): Pr
     })
     console.log(json)
 
-      let zipMeta: any = null
-      let loadedZip: JSZip | null = null
+    let zipMeta: any = null
+    let loadedZip: JSZip | null = null
+    try {
+      const zip = await JSZipLib.loadAsync(buffer)
+      loadedZip = zip
+      const layoutFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slideLayouts/slideLayout') && !k.includes('_rels') && !zip.files[k].dir)
+      const sortSlideXml = (p1: string, p2: string) => {
+        const m1 = /(\d+)\.xml/.exec(p1)
+        const m2 = /(\d+)\.xml/.exec(p2)
+        const n1 = m1 ? +m1[1] : 0
+        const n2 = m2 ? +m2[1] : 0
+        return n1 - n2
+      }
+      // 1. 提前解析主题配色 clrScheme（dk1/lt1/dk2/lt2/accent1-6），供母版、版式背景与装饰形状还原真实颜色
+      const themeColors: Record<string, string> = {}
       try {
-        const zip = await JSZipLib.loadAsync(buffer)
-        loadedZip = zip
-        const layoutFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slideLayouts/slideLayout') && !k.includes('_rels') && !zip.files[k].dir)
-        const sortSlideXml = (p1: string, p2: string) => {
-          const m1 = /(\d+)\.xml/.exec(p1)
-          const m2 = /(\d+)\.xml/.exec(p2)
-          const n1 = m1 ? +m1[1] : 0
-          const n2 = m2 ? +m2[1] : 0
-          return n1 - n2
-        }
-        // 1. 提前解析主题配色 clrScheme（dk1/lt1/dk2/lt2/accent1-6），供母版、版式背景与装饰形状还原真实颜色
-        const themeColors: Record<string, string> = {}
-        try {
-          const themeFiles = Object.keys(zip.files).filter(k => /^ppt\/theme\/theme\d+\.xml$/.test(k))
-          if (themeFiles.length > 0) {
-            const tTxt = await zip.file(themeFiles[0])?.async('text') || ''
-            const schemeM = tTxt.match(/<a:clrScheme[\s\S]*?<\/a:clrScheme>/)
-            if (schemeM) {
-              const slotRe = /<a:(dk1|lt1|dk2|lt2|accent1|accent2|accent3|accent4|accent5|accent6|hlink|folHlink)>([\s\S]*?)<\/a:\1>/g
-              let slotMatch: RegExpExecArray | null
-              while ((slotMatch = slotRe.exec(schemeM[0]))) {
-                const hexM = slotMatch[2].match(/<a:srgbClr val="([0-9A-Fa-f]{6})"/) || slotMatch[2].match(/<a:sysClr[^>]*lastClr="([0-9A-Fa-f]{6})"/)
-                if (hexM) themeColors[slotMatch[1]] = '#' + hexM[1].toUpperCase()
-              }
+        const themeFiles = Object.keys(zip.files).filter(k => /^ppt\/theme\/theme\d+\.xml$/.test(k))
+        if (themeFiles.length > 0) {
+          const tTxt = await zip.file(themeFiles[0])?.async('text') || ''
+          const schemeM = tTxt.match(/<a:clrScheme[\s\S]*?<\/a:clrScheme>/)
+          if (schemeM) {
+            const slotRe = /<a:(dk1|lt1|dk2|lt2|accent1|accent2|accent3|accent4|accent5|accent6|hlink|folHlink)>([\s\S]*?)<\/a:\1>/g
+            let slotMatch: RegExpExecArray | null
+            while ((slotMatch = slotRe.exec(schemeM[0]))) {
+              const hexM = slotMatch[2].match(/<a:srgbClr val="([0-9A-Fa-f]{6})"/) || slotMatch[2].match(/<a:sysClr[^>]*lastClr="([0-9A-Fa-f]{6})"/)
+              if (hexM) themeColors[slotMatch[1]] = '#' + hexM[1].toUpperCase()
             }
           }
-        } catch (e) {}
-
-        // 通用背景 XML (<p:bg>) 解析器：全面支持 <a:blip> 图片、<a:gradFill> 渐变（含 circle/radial 径向渐变）、<a:srgbClr> 与 <a:schemeClr> 单色
-        const parsePptxBgFromXml = async (bgTxt: string, xmlPath: string): Promise<string | null> => {
-          if (!bgTxt) return null
-          const mimeByExt: Record<string, string> = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp', bmp: 'image/bmp', svg: 'image/svg+xml', tif: 'image/tiff', tiff: 'image/tiff' }
-
-          // 1. 图片填充 <a:blip>
-          const blipMatch = bgTxt.match(/<a:blip\b[^>]*r:embed="([^"]+)"/)
-          if (blipMatch) {
-            const rId = blipMatch[1]
-            const relsPath = xmlPath.replace(/(slideMasters|slideLayouts)\/([^/]+)\.xml$/, '$1/_rels/$2.xml.rels')
-            const relsTxt = await zip.file(relsPath)?.async('text') || ''
-            const relM = relsTxt.match(new RegExp(`Id="${rId}"[^>]*Target="([^"]+)"`)) || relsTxt.match(new RegExp(`Target="([^"]+)"[^>]*Id="${rId}"`))
-            if (relM) {
-              const stack = xmlPath.split('/').slice(0, -1)
-              for (const part of relM[1].split('/')) {
-                if (part === '..') stack.pop()
-                else if (part && part !== '.') stack.push(part)
-              }
-              const mediaPath = stack.join('/')
-              const ext = ((mediaPath.match(/\.(\w+)$/) || [])[1] || '').toLowerCase()
-              const blob = await zip.file(mediaPath)?.async('blob')
-              if (blob) {
-                const blobUrl = URL.createObjectURL(blob)
-                return `#ffffff url("${blobUrl}") center center / 100% 100% no-repeat`
-              }
+        }
+      } catch (e) { }
+
+      // 通用背景 XML (<p:bg>) 解析器：全面支持 <a:blip> 图片、<a:gradFill> 渐变（含 circle/radial 径向渐变）、<a:srgbClr> 与 <a:schemeClr> 单色
+      const parsePptxBgFromXml = async (bgTxt: string, xmlPath: string): Promise<string | null> => {
+        if (!bgTxt) return null
+        const mimeByExt: Record<string, string> = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp', bmp: 'image/bmp', svg: 'image/svg+xml', tif: 'image/tiff', tiff: 'image/tiff' }
+
+        // 1. 图片填充 <a:blip>
+        const blipMatch = bgTxt.match(/<a:blip\b[^>]*r:embed="([^"]+)"/)
+        if (blipMatch) {
+          const rId = blipMatch[1]
+          const relsPath = xmlPath.replace(/(slideMasters|slideLayouts)\/([^/]+)\.xml$/, '$1/_rels/$2.xml.rels')
+          const relsTxt = await zip.file(relsPath)?.async('text') || ''
+          const relM = relsTxt.match(new RegExp(`Id="${rId}"[^>]*Target="([^"]+)"`)) || relsTxt.match(new RegExp(`Target="([^"]+)"[^>]*Id="${rId}"`))
+          if (relM) {
+            const stack = xmlPath.split('/').slice(0, -1)
+            for (const part of relM[1].split('/')) {
+              if (part === '..') stack.pop()
+              else if (part && part !== '.') stack.push(part)
+            }
+            const mediaPath = stack.join('/')
+            const ext = ((mediaPath.match(/\.(\w+)$/) || [])[1] || '').toLowerCase()
+            const blob = await zip.file(mediaPath)?.async('blob')
+            if (blob) {
+              const blobUrl = URL.createObjectURL(blob)
+              return `#ffffff url("${blobUrl}") center center / 100% 100% no-repeat`
             }
           }
+        }
 
-          // 2. 渐变填充 <a:gradFill>
-          const gradMatch = bgTxt.match(/<a:gradFill\b[\s\S]*?<\/a:gradFill>/)
-          if (gradMatch) {
-            const gradTxt = gradMatch[0]
-            const gsList = gradTxt.match(/<a:gs\b[\s\S]*?<\/a:gs>/g) || []
-            if (gsList.length > 0) {
-              const stops: string[] = []
-              for (const gs of gsList) {
-                const posM = gs.match(/pos="(\d+)"/)
-                const posVal = posM ? Math.round(parseInt(posM[1], 10) / 1000) : 0
-                let col = '#FFFFFF'
-                const srgbM = gs.match(/<a:srgbClr\s+val="([0-9A-Fa-f]{6})"/)
-                if (srgbM) {
-                  col = '#' + srgbM[1].toUpperCase()
-                } else {
-                  const schemeM = gs.match(/<a:schemeClr\s+val="([^"]+)"([\s\S]*?)<\/a:schemeClr>/) || gs.match(/<a:schemeClr\s+val="([^"]+)"\s*\/>/)
-                  if (schemeM) {
-                    const val = schemeM[1]
-                    const inner = schemeM[2] || ''
-                    const lumModM = inner.match(/<a:lumMod val="(\d+)"/)
-                    const lumOffM = inner.match(/<a:lumOff val="(\d+)"/)
-                    const lumMod = lumModM ? parseInt(lumModM[1], 10) / 100000 : 1
-                    const lumOff = lumOffM ? parseInt(lumOffM[1], 10) / 100000 : 0
-                    const slot = val === 'tx1' ? 'dk1' : val === 'bg1' ? 'lt1' : val === 'tx2' ? 'dk2' : val === 'bg2' ? 'lt2' : val
-                    const baseHex = themeColors[slot] || themeColors[val] || (slot === 'dk1' || slot === 'tx1' ? '#000000' : '#FFFFFF')
-                    col = (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
-                  }
+        // 2. 渐变填充 <a:gradFill>
+        const gradMatch = bgTxt.match(/<a:gradFill\b[\s\S]*?<\/a:gradFill>/)
+        if (gradMatch) {
+          const gradTxt = gradMatch[0]
+          const gsList = gradTxt.match(/<a:gs\b[\s\S]*?<\/a:gs>/g) || []
+          if (gsList.length > 0) {
+            const stops: string[] = []
+            for (const gs of gsList) {
+              const posM = gs.match(/pos="(\d+)"/)
+              const posVal = posM ? Math.round(parseInt(posM[1], 10) / 1000) : 0
+              let col = '#FFFFFF'
+              const srgbM = gs.match(/<a:srgbClr\s+val="([0-9A-Fa-f]{6})"/)
+              if (srgbM) {
+                col = '#' + srgbM[1].toUpperCase()
+              } else {
+                const schemeM = gs.match(/<a:schemeClr\s+val="([^"]+)"([\s\S]*?)<\/a:schemeClr>/) || gs.match(/<a:schemeClr\s+val="([^"]+)"\s*\/>/)
+                if (schemeM) {
+                  const val = schemeM[1]
+                  const inner = schemeM[2] || ''
+                  const lumModM = inner.match(/<a:lumMod val="(\d+)"/)
+                  const lumOffM = inner.match(/<a:lumOff val="(\d+)"/)
+                  const lumMod = lumModM ? parseInt(lumModM[1], 10) / 100000 : 1
+                  const lumOff = lumOffM ? parseInt(lumOffM[1], 10) / 100000 : 0
+                  const slot = val === 'tx1' ? 'dk1' : val === 'bg1' ? 'lt1' : val === 'tx2' ? 'dk2' : val === 'bg2' ? 'lt2' : val
+                  const baseHex = themeColors[slot] || themeColors[val] || (slot === 'dk1' || slot === 'tx1' ? '#000000' : '#FFFFFF')
+                  col = (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
                 }
-                stops.push(`${col} ${posVal}%`)
               }
-              const pathMatch = gradTxt.match(/<a:path\b[^>]*path="([^"]+)"/i)
-              const pathKind = pathMatch ? pathMatch[1].toLowerCase() : ''
-              const isPath = pathKind === 'shape'
-              const isCircle = pathKind === 'circle' || pathKind === 'radial'
-              const isRect = pathKind === 'rect'
-              const isRadialOrRect = isCircle || isRect || /<a:fillToRect/i.test(gradTxt)
-
-              if (isRadialOrRect) {
-                const fillToRectM = gradTxt.match(/<a:fillToRect\b([^>]*)\/?>/)
-                let cx = 50
-                let cy = 50
-                if (fillToRectM) {
-                  const attrs = fillToRectM[1]
-                  const lM = attrs.match(/l="(-?\d+)"/)
-                  const tM = attrs.match(/t="(-?\d+)"/)
-                  const rM = attrs.match(/r="(-?\d+)"/)
-                  const bM = attrs.match(/b="(-?\d+)"/)
-                  const l = lM ? parseInt(lM[1], 10) / 100000 : 0.5
-                  const t = tM ? parseInt(tM[1], 10) / 100000 : 0.5
-                  const r = rM ? parseInt(rM[1], 10) / 100000 : 0.5
-                  const b = bM ? parseInt(bM[1], 10) / 100000 : 0.5
-                  cx = Math.round(((l + (1 - r)) / 2) * 100)
-                  cy = Math.round(((t + (1 - b)) / 2) * 100)
-                }
-                if (isRect) {
-                  return `radial-gradient(closest-side at ${cx}% ${cy}%, ${stops.join(', ')})`
-                }
-                return `radial-gradient(circle farthest-corner at ${cx}% ${cy}%, ${stops.join(', ')})`
+              stops.push(`${col} ${posVal}%`)
+            }
+            const pathMatch = gradTxt.match(/<a:path\b[^>]*path="([^"]+)"/i)
+            const pathKind = pathMatch ? pathMatch[1].toLowerCase() : ''
+            const isPath = pathKind === 'shape'
+            const isCircle = pathKind === 'circle' || pathKind === 'radial'
+            const isRect = pathKind === 'rect'
+            const isRadialOrRect = isCircle || isRect || /<a:fillToRect/i.test(gradTxt)
+
+            if (isRadialOrRect) {
+              const fillToRectM = gradTxt.match(/<a:fillToRect\b([^>]*)\/?>/)
+              let cx = 50
+              let cy = 50
+              if (fillToRectM) {
+                const attrs = fillToRectM[1]
+                const lM = attrs.match(/l="(-?\d+)"/)
+                const tM = attrs.match(/t="(-?\d+)"/)
+                const rM = attrs.match(/r="(-?\d+)"/)
+                const bM = attrs.match(/b="(-?\d+)"/)
+                const l = lM ? parseInt(lM[1], 10) / 100000 : 0.5
+                const t = tM ? parseInt(tM[1], 10) / 100000 : 0.5
+                const r = rM ? parseInt(rM[1], 10) / 100000 : 0.5
+                const b = bM ? parseInt(bM[1], 10) / 100000 : 0.5
+                cx = Math.round(((l + (1 - r)) / 2) * 100)
+                cy = Math.round(((t + (1 - b)) / 2) * 100)
               }
-              if (isPath) {
-                return `radial-gradient(ellipse farthest-corner at 50% 50%, ${stops.join(', ')})`
+              if (isRect) {
+                return `radial-gradient(closest-side at ${cx}% ${cy}%, ${stops.join(', ')})`
               }
-              const linM = gradTxt.match(/<a:lin\b[^>]*ang="(-?\d+)"/)
-              const angVal = linM ? parseInt(linM[1], 10) / 60000 : 0
-              const cssAng = (Math.round(angVal) + 90) % 360
-              return `linear-gradient(${cssAng}deg, ${stops.join(', ')})`
+              return `radial-gradient(circle farthest-corner at ${cx}% ${cy}%, ${stops.join(', ')})`
             }
+            if (isPath) {
+              return `radial-gradient(ellipse farthest-corner at 50% 50%, ${stops.join(', ')})`
+            }
+            const linM = gradTxt.match(/<a:lin\b[^>]*ang="(-?\d+)"/)
+            const angVal = linM ? parseInt(linM[1], 10) / 60000 : 0
+            const cssAng = (Math.round(angVal) + 90) % 360
+            return `linear-gradient(${cssAng}deg, ${stops.join(', ')})`
           }
+        }
 
-          // 3. 纯色填充 <a:srgbClr> 或 <a:schemeClr>
-          const srgbMatch = bgTxt.match(/<a:srgbClr\s+val="([0-9A-Fa-f]{6})"/)
-          if (srgbMatch) {
-            return '#' + srgbMatch[1].toUpperCase()
-          }
-          const schemeMatch = bgTxt.match(/<a:schemeClr\s+val="([^"]+)"([\s\S]*?)<\/a:schemeClr>/) || bgTxt.match(/<a:schemeClr\s+val="([^"]+)"\s*\/>/)
-          if (schemeMatch) {
-            const val = schemeMatch[1]
-            const inner = schemeMatch[2] || ''
-            const lumModM = inner.match(/<a:lumMod val="(\d+)"/)
-            const lumOffM = inner.match(/<a:lumOff val="(\d+)"/)
-            const lumMod = lumModM ? parseInt(lumModM[1], 10) / 100000 : 1
-            const lumOff = lumOffM ? parseInt(lumOffM[1], 10) / 100000 : 0
-            const slot = val === 'tx1' ? 'dk1' : val === 'bg1' ? 'lt1' : val === 'tx2' ? 'dk2' : val === 'bg2' ? 'lt2' : val
-            const baseHex = themeColors[slot] || themeColors[val] || (slot === 'dk1' || slot === 'tx1' ? '#000000' : '#FFFFFF')
-            return (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
-          }
-
-          return null
+        // 3. 纯色填充 <a:srgbClr> 或 <a:schemeClr>
+        const srgbMatch = bgTxt.match(/<a:srgbClr\s+val="([0-9A-Fa-f]{6})"/)
+        if (srgbMatch) {
+          return '#' + srgbMatch[1].toUpperCase()
         }
+        const schemeMatch = bgTxt.match(/<a:schemeClr\s+val="([^"]+)"([\s\S]*?)<\/a:schemeClr>/) || bgTxt.match(/<a:schemeClr\s+val="([^"]+)"\s*\/>/)
+        if (schemeMatch) {
+          const val = schemeMatch[1]
+          const inner = schemeMatch[2] || ''
+          const lumModM = inner.match(/<a:lumMod val="(\d+)"/)
+          const lumOffM = inner.match(/<a:lumOff val="(\d+)"/)
+          const lumMod = lumModM ? parseInt(lumModM[1], 10) / 100000 : 1
+          const lumOff = lumOffM ? parseInt(lumOffM[1], 10) / 100000 : 0
+          const slot = val === 'tx1' ? 'dk1' : val === 'bg1' ? 'lt1' : val === 'tx2' ? 'dk2' : val === 'bg2' ? 'lt2' : val
+          const baseHex = themeColors[slot] || themeColors[val] || (slot === 'dk1' || slot === 'tx1' ? '#000000' : '#FFFFFF')
+          return (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
+        }
+
+        return null
+      }
+
+      layoutFiles.sort(sortSlideXml)
+
+      const allLayouts: any[] = []
+      const layoutByFile = new Map<string, any>()
+
+      for (let i = 0; i < layoutFiles.length; i++) {
+        const lf = layoutFiles[i]
+        const txt = await zip.file(lf)?.async('text') || ''
+        const mimeByExt: Record<string, string> = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp', bmp: 'image/bmp', svg: 'image/svg+xml', tif: 'image/tiff', tiff: 'image/tiff' }
 
-        layoutFiles.sort(sortSlideXml)
+        // 解析版式背景 (<p:bg>) 图片、渐变或颜色填充
+        let layoutBg: string | null = null
+        const bgMatch = txt.match(/<p:bg\b[\s\S]*?<\/p:bg>/)
+        if (bgMatch) {
+          layoutBg = await parsePptxBgFromXml(bgMatch[0], lf)
+        }
 
-        const allLayouts: any[] = []
-        const layoutByFile = new Map<string, any>()
+        // 版式装饰图片（userDrawn <p:pic>，如整幅世界地图）：未被任何页使用的版式走
+        // XML 解析分支（parseLayoutShapesFromXml），sp 解析管不到 pic，需经 rels 把
+        // media 转 base64 一并传入，否则该版式在母版编辑视图/缩略图整片空白
+        const picSrcMap: Record<string, string> = {}
+        const layoutPicMatches = txt.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
+        if (layoutPicMatches.length > 0) {
+          const relsTxt = await zip.file(lf.replace(/(slideLayouts\/)(slideLayout\d+\.xml)$/, '$1_rels/$2.rels'))?.async('text') || ''
+          for (const pic of layoutPicMatches) {
+            const rId = (pic.match(/r:embed="([^"]+)"/) || [])[1]
+            if (!rId || picSrcMap[rId]) continue
+            const relM = relsTxt.match(new RegExp(`Id="${rId}"[^>]*Target="([^"]+)"`)) || relsTxt.match(new RegExp(`Target="([^"]+)"[^>]*Id="${rId}"`))
+            if (!relM) continue
+            // target 相对 slideLayouts 目录（如 ../media/image2.jpeg）→ zip 内绝对路径
+            const stack = lf.split('/').slice(0, -1)
+            for (const part of relM[1].split('/')) {
+              if (part === '..') stack.pop()
+              else if (part && part !== '.') stack.push(part)
+            }
+            const mediaPath = stack.join('/')
+            const ext = ((mediaPath.match(/\.(\w+)$/) || [])[1] || '').toLowerCase()
+            const b64 = await zip.file(mediaPath)?.async('base64')
+            if (b64) picSrcMap[rId] = `data:${mimeByExt[ext] || 'application/octet-stream'};base64,${b64}`
+          }
+        }
+        const nameM = txt.match(/<p:cSld[^>]*name="([^"]+)"/)
+        const typeM = txt.match(/<p:sldLayout[^>]*type="([^"]+)"/)
+        const isTitle = (typeM && typeM[1] === 'title') || txt.includes('type="ctrTitle"') || (nameM && (nameM[1].includes('Title') || nameM[1].includes('标题')))
+        const isBlank = (typeM && typeM[1] === 'blank') || (nameM && (nameM[1].includes('Blank') || nameM[1].includes('空白')))
+        const picPhCount = (txt.match(/type="pic"/g) || []).length
+
+        const lObj = {
+          file: lf,
+          id: `layout-${i + 1}`,
+          name: nameM ? nameM[1] : `版式 ${i + 1}`,
+          type: typeM ? typeM[1] : (isTitle ? 'title' : (isBlank ? 'blank' : 'content')),
+          background: layoutBg || undefined,
+          picPhCount,
+          picSrcMap,
+          xml: txt
+        }
+        allLayouts.push(lObj)
+        layoutByFile.set(lf, lObj)
+        const shortName = lf.replace('ppt/slideLayouts/', '')
+        layoutByFile.set(shortName, lObj)
+        layoutByFile.set(`../slideLayouts/${shortName}`, lObj)
+      }
 
-        for (let i = 0; i < layoutFiles.length; i++) {
-          const lf = layoutFiles[i]
-          const txt = await zip.file(lf)?.async('text') || ''
-          const mimeByExt: Record<string, string> = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp', bmp: 'image/bmp', svg: 'image/svg+xml', tif: 'image/tiff', tiff: 'image/tiff' }
+      const slideRelsFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slides/_rels/slide') && k.endsWith('.rels'))
+      slideRelsFiles.sort(sortSlideXml)
+
+      const slideLayoutMap: any[] = []
+      const slideLayoutTargetList: string[] = []
+      for (let i = 0; i < slideRelsFiles.length; i++) {
+        const srf = slideRelsFiles[i]
+        const txt = await zip.file(srf)?.async('text') || ''
+        const layoutMatch = txt.match(/Type="[^"]*\/slideLayout"[^>]*Target="([^"]+)"/) || txt.match(/Target="([^"]+)"[^>]*Type="[^"]*\/slideLayout"/)
+        const target = layoutMatch ? layoutMatch[1] : ''
+        slideLayoutTargetList.push(target)
+        const lObj = layoutByFile.get(target)
+        slideLayoutMap.push(lObj || null)
+      }
 
-          // 解析版式背景 (<p:bg>) 图片、渐变或颜色填充
-          let layoutBg: string | null = null
-          const bgMatch = txt.match(/<p:bg\b[\s\S]*?<\/p:bg>/)
-          if (bgMatch) {
-            layoutBg = await parsePptxBgFromXml(bgMatch[0], lf)
+      let masterName = nameWithoutExt
+      const masterShapesInfo: Array<{ name: string; text?: string; isPic?: boolean }> = []
+      // 母版占位符 xfrm 位置表（idx/type → px 盒子）：版式占位符常省略自身 xfrm（继承母版），
+      // 解析版式提示框时按此回退，否则这类版式解析不出占位符、缩略图整片空白
+      const masterPhXfrm: Record<string, { left: number; top: number; width: number; height: number }> = {}
+      let primaryMasterXml = ''
+      let masterXmlBg: string | null = null
+      const masterPicSrcMap: Record<string, string> = {}
+      try {
+        const masterFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slideMasters/slideMaster') && !k.includes('_rels') && !zip.files[k].dir)
+        masterFiles.sort(sortSlideXml)
+        for (const mf of masterFiles) {
+          const mTxt = await zip.file(mf)?.async('text') || ''
+          if (!primaryMasterXml) primaryMasterXml = mTxt
+
+          // 提取母版背景 (<p:bg>)
+          if (!masterXmlBg) {
+            const mBgMatch = mTxt.match(/<p:bg\b[\s\S]*?<\/p:bg>/)
+            if (mBgMatch) {
+              masterXmlBg = await parsePptxBgFromXml(mBgMatch[0], mf)
+            }
           }
 
-          // 版式装饰图片（userDrawn <p:pic>，如整幅世界地图）：未被任何页使用的版式走
-          // XML 解析分支（parseLayoutShapesFromXml），sp 解析管不到 pic，需经 rels 把
-          // media 转 base64 一并传入，否则该版式在母版编辑视图/缩略图整片空白
-          const picSrcMap: Record<string, string> = {}
-          const layoutPicMatches = txt.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
-          if (layoutPicMatches.length > 0) {
-            const relsTxt = await zip.file(lf.replace(/(slideLayouts\/)(slideLayout\d+\.xml)$/, '$1_rels/$2.rels'))?.async('text') || ''
-            for (const pic of layoutPicMatches) {
+          // 防御策略 3：从 slideMasters/_rels/slideMaster*.xml.rels 提取母版图片引用，解析为 Base64 供 Logo/背景图显影
+          const masterPicMatches = mTxt.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
+          if (masterPicMatches.length > 0) {
+            const relsTxt = await zip.file(mf.replace(/(slideMasters\/)(slideMaster\d+\.xml)$/, '$1_rels/$2.rels'))?.async('text') || ''
+            const mimeByExt: Record<string, string> = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp', bmp: 'image/bmp', svg: 'image/svg+xml', tif: 'image/tiff', tiff: 'image/tiff' }
+            for (const pic of masterPicMatches) {
               const rId = (pic.match(/r:embed="([^"]+)"/) || [])[1]
-              if (!rId || picSrcMap[rId]) continue
+              if (!rId || masterPicSrcMap[rId]) continue
               const relM = relsTxt.match(new RegExp(`Id="${rId}"[^>]*Target="([^"]+)"`)) || relsTxt.match(new RegExp(`Target="([^"]+)"[^>]*Id="${rId}"`))
               if (!relM) continue
-              // target 相对 slideLayouts 目录（如 ../media/image2.jpeg）→ zip 内绝对路径
-              const stack = lf.split('/').slice(0, -1)
+              const stack = mf.split('/').slice(0, -1)
               for (const part of relM[1].split('/')) {
                 if (part === '..') stack.pop()
                 else if (part && part !== '.') stack.push(part)
@@ -6948,481 +7044,399 @@ const importPptxArrayBuffer = async (buffer: ArrayBuffer, fileName?: string): Pr
               const mediaPath = stack.join('/')
               const ext = ((mediaPath.match(/\.(\w+)$/) || [])[1] || '').toLowerCase()
               const b64 = await zip.file(mediaPath)?.async('base64')
-              if (b64) picSrcMap[rId] = `data:${mimeByExt[ext] || 'application/octet-stream'};base64,${b64}`
+              if (b64) masterPicSrcMap[rId] = `data:${mimeByExt[ext] || 'application/octet-stream'};base64,${b64}`
             }
           }
-          const nameM = txt.match(/<p:cSld[^>]*name="([^"]+)"/)
-          const typeM = txt.match(/<p:sldLayout[^>]*type="([^"]+)"/)
-          const isTitle = (typeM && typeM[1] === 'title') || txt.includes('type="ctrTitle"') || (nameM && (nameM[1].includes('Title') || nameM[1].includes('标题')))
-          const isBlank = (typeM && typeM[1] === 'blank') || (nameM && (nameM[1].includes('Blank') || nameM[1].includes('空白')))
-          const picPhCount = (txt.match(/type="pic"/g) || []).length
-
-          const lObj = {
-            file: lf,
-            id: `layout-${i + 1}`,
-            name: nameM ? nameM[1] : `版式 ${i + 1}`,
-            type: typeM ? typeM[1] : (isTitle ? 'title' : (isBlank ? 'blank' : 'content')),
-            background: layoutBg || undefined,
-            picPhCount,
-            picSrcMap,
-            xml: txt
-          }
-          allLayouts.push(lObj)
-          layoutByFile.set(lf, lObj)
-          const shortName = lf.replace('ppt/slideLayouts/', '')
-          layoutByFile.set(shortName, lObj)
-          layoutByFile.set(`../slideLayouts/${shortName}`, lObj)
-        }
 
-        const slideRelsFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slides/_rels/slide') && k.endsWith('.rels'))
-        slideRelsFiles.sort(sortSlideXml)
-
-        const slideLayoutMap: any[] = []
-        const slideLayoutTargetList: string[] = []
-        for (let i = 0; i < slideRelsFiles.length; i++) {
-          const srf = slideRelsFiles[i]
-          const txt = await zip.file(srf)?.async('text') || ''
-          const layoutMatch = txt.match(/Type="[^"]*\/slideLayout"[^>]*Target="([^"]+)"/) || txt.match(/Target="([^"]+)"[^>]*Type="[^"]*\/slideLayout"/)
-          const target = layoutMatch ? layoutMatch[1] : ''
-          slideLayoutTargetList.push(target)
-          const lObj = layoutByFile.get(target)
-          slideLayoutMap.push(lObj || null)
-        }
-
-        let masterName = nameWithoutExt
-        const masterShapesInfo: Array<{ name: string; text?: string; isPic?: boolean }> = []
-        // 母版占位符 xfrm 位置表（idx/type → px 盒子）：版式占位符常省略自身 xfrm（继承母版），
-        // 解析版式提示框时按此回退，否则这类版式解析不出占位符、缩略图整片空白
-        const masterPhXfrm: Record<string, { left: number; top: number; width: number; height: number }> = {}
-        let primaryMasterXml = ''
-        let masterXmlBg: string | null = null
-        const masterPicSrcMap: Record<string, string> = {}
-        try {
-          const masterFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slideMasters/slideMaster') && !k.includes('_rels') && !zip.files[k].dir)
-          masterFiles.sort(sortSlideXml)
-          for (const mf of masterFiles) {
-            const mTxt = await zip.file(mf)?.async('text') || ''
-            if (!primaryMasterXml) primaryMasterXml = mTxt
-
-            // 提取母版背景 (<p:bg>)
-            if (!masterXmlBg) {
-              const mBgMatch = mTxt.match(/<p:bg\b[\s\S]*?<\/p:bg>/)
-              if (mBgMatch) {
-                masterXmlBg = await parsePptxBgFromXml(mBgMatch[0], mf)
-              }
-            }
-
-            // 防御策略 3：从 slideMasters/_rels/slideMaster*.xml.rels 提取母版图片引用，解析为 Base64 供 Logo/背景图显影
-            const masterPicMatches = mTxt.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
-            if (masterPicMatches.length > 0) {
-              const relsTxt = await zip.file(mf.replace(/(slideMasters\/)(slideMaster\d+\.xml)$/, '$1_rels/$2.rels'))?.async('text') || ''
-              const mimeByExt: Record<string, string> = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp', bmp: 'image/bmp', svg: 'image/svg+xml', tif: 'image/tiff', tiff: 'image/tiff' }
-              for (const pic of masterPicMatches) {
-                const rId = (pic.match(/r:embed="([^"]+)"/) || [])[1]
-                if (!rId || masterPicSrcMap[rId]) continue
-                const relM = relsTxt.match(new RegExp(`Id="${rId}"[^>]*Target="([^"]+)"`)) || relsTxt.match(new RegExp(`Target="([^"]+)"[^>]*Id="${rId}"`))
-                if (!relM) continue
-                const stack = mf.split('/').slice(0, -1)
-                for (const part of relM[1].split('/')) {
-                  if (part === '..') stack.pop()
-                  else if (part && part !== '.') stack.push(part)
-                }
-                const mediaPath = stack.join('/')
-                const ext = ((mediaPath.match(/\.(\w+)$/) || [])[1] || '').toLowerCase()
-                const b64 = await zip.file(mediaPath)?.async('base64')
-                if (b64) masterPicSrcMap[rId] = `data:${mimeByExt[ext] || 'application/octet-stream'};base64,${b64}`
-              }
-            }
-
-            const spMatches = mTxt.match(/<p:sp\b[\s\S]*?<\/p:sp>/g) || []
-            for (const sp of spMatches) {
-              const name = sp.match(/<p:cNvPr[^>]*name="([^"]+)"/)?.[1] || sp.match(/name="([^"]+)"/)?.[1] || ''
-              const text = (sp.match(/<a:t>([^<]+)<\/a:t>/g) || []).map(t => t.replace(/<\/?a:t>/g, '')).join('').trim()
-              masterShapesInfo.push({ name, text })
-              const phAttrsM = sp.match(/<p:ph\b([^>]*)\/?>/)
-              if (phAttrsM) {
-                const phAttrs = phAttrsM[1]
-                const idxAttr = (phAttrs.match(/idx="(\d+)"/) || [])[1]
-                const typeAttr = (phAttrs.match(/type="(\w+)"/) || [])[1]
-                const off = sp.match(/<a:off\s+x="(-?\d+)"\s+y="(-?\d+)"/)
-                const ext = sp.match(/<a:ext\s+cx="(\d+)"\s+cy="(\d+)"/)
-                if (off && ext) {
-                  const box = { left: Math.round(parseInt(off[1]) / 9525), top: Math.round(parseInt(off[2]) / 9525), width: Math.round(parseInt(ext[1]) / 9525), height: Math.round(parseInt(ext[2]) / 9525) }
-                  if (idxAttr !== undefined && !masterPhXfrm['idx_' + idxAttr]) masterPhXfrm['idx_' + idxAttr] = box
-                  if (typeAttr && !masterPhXfrm['type_' + typeAttr]) masterPhXfrm['type_' + typeAttr] = box
-                }
+          const spMatches = mTxt.match(/<p:sp\b[\s\S]*?<\/p:sp>/g) || []
+          for (const sp of spMatches) {
+            const name = sp.match(/<p:cNvPr[^>]*name="([^"]+)"/)?.[1] || sp.match(/name="([^"]+)"/)?.[1] || ''
+            const text = (sp.match(/<a:t>([^<]+)<\/a:t>/g) || []).map(t => t.replace(/<\/?a:t>/g, '')).join('').trim()
+            masterShapesInfo.push({ name, text })
+            const phAttrsM = sp.match(/<p:ph\b([^>]*)\/?>/)
+            if (phAttrsM) {
+              const phAttrs = phAttrsM[1]
+              const idxAttr = (phAttrs.match(/idx="(\d+)"/) || [])[1]
+              const typeAttr = (phAttrs.match(/type="(\w+)"/) || [])[1]
+              const off = sp.match(/<a:off\s+x="(-?\d+)"\s+y="(-?\d+)"/)
+              const ext = sp.match(/<a:ext\s+cx="(\d+)"\s+cy="(\d+)"/)
+              if (off && ext) {
+                const box = { left: Math.round(parseInt(off[1]) / 9525), top: Math.round(parseInt(off[2]) / 9525), width: Math.round(parseInt(ext[1]) / 9525), height: Math.round(parseInt(ext[2]) / 9525) }
+                if (idxAttr !== undefined && !masterPhXfrm['idx_' + idxAttr]) masterPhXfrm['idx_' + idxAttr] = box
+                if (typeAttr && !masterPhXfrm['type_' + typeAttr]) masterPhXfrm['type_' + typeAttr] = box
               }
             }
-            const picMatches = mTxt.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
-            for (const pic of picMatches) {
-              const name = pic.match(/<p:cNvPr[^>]*name="([^"]+)"/)?.[1] || pic.match(/name="([^"]+)"/)?.[1] || ''
-              masterShapesInfo.push({ name, isPic: true })
-            }
           }
-          if (masterFiles.length > 0) {
-            const mTxt = await zip.file(masterFiles[0])?.async('text') || ''
-            const mNameM = mTxt.match(/<p:cSld[^>]*name="([^"]+)"/)
-            if (mNameM && mNameM[1]) masterName = mNameM[1]
+          const picMatches = mTxt.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
+          for (const pic of picMatches) {
+            const name = pic.match(/<p:cNvPr[^>]*name="([^"]+)"/)?.[1] || pic.match(/name="([^"]+)"/)?.[1] || ''
+            masterShapesInfo.push({ name, isPic: true })
           }
-          if (!masterName || masterName === nameWithoutExt) {
-            const themeFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/theme/theme') && !k.includes('_rels') && !zip.files[k].dir)
-            if (themeFiles.length > 0) {
-              const tTxt = await zip.file(themeFiles[0])?.async('text') || ''
-              const tNameM = tTxt.match(/<a:theme[^>]*name="([^"]+)"/)
-              if (tNameM && tNameM[1] && tNameM[1] !== 'Office 主题' && tNameM[1] !== 'Office Theme') {
-                masterName = tNameM[1]
-              }
+        }
+        if (masterFiles.length > 0) {
+          const mTxt = await zip.file(masterFiles[0])?.async('text') || ''
+          const mNameM = mTxt.match(/<p:cSld[^>]*name="([^"]+)"/)
+          if (mNameM && mNameM[1]) masterName = mNameM[1]
+        }
+        if (!masterName || masterName === nameWithoutExt) {
+          const themeFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/theme/theme') && !k.includes('_rels') && !zip.files[k].dir)
+          if (themeFiles.length > 0) {
+            const tTxt = await zip.file(themeFiles[0])?.async('text') || ''
+            const tNameM = tTxt.match(/<a:theme[^>]*name="([^"]+)"/)
+            if (tNameM && tNameM[1] && tNameM[1] !== 'Office 主题' && tNameM[1] !== 'Office Theme') {
+              masterName = tNameM[1]
             }
           }
-        } catch (e) {}
-
-
-        // 从母版 primaryMasterXml 解析标准文本色（txStyles: titleStyle/bodyStyle），支持 lumMod/lumOff 调制
-        let masterTextColor = ''
-        try {
-          if (primaryMasterXml) {
-            const titleMatch = primaryMasterXml.match(/<p:titleStyle>[\s\S]*?<a:schemeClr val="([^"]+)">([\s\S]*?)<\/a:schemeClr>/)
-            const bodyMatch = primaryMasterXml.match(/<p:bodyStyle>[\s\S]*?<a:schemeClr val="([^"]+)">([\s\S]*?)<\/a:schemeClr>/)
-            const m = bodyMatch || titleMatch
-            if (m) {
-              const val = m[1]
-              const lumModM = m[2].match(/<a:lumMod val="(\d+)"/)
-              const lumOffM = m[2].match(/<a:lumOff val="(\d+)"/)
+        }
+      } catch (e) { }
+
+
+      // 从母版 primaryMasterXml 解析标准文本色（txStyles: titleStyle/bodyStyle），支持 lumMod/lumOff 调制
+      let masterTextColor = ''
+      try {
+        if (primaryMasterXml) {
+          const titleMatch = primaryMasterXml.match(/<p:titleStyle>[\s\S]*?<a:schemeClr val="([^"]+)">([\s\S]*?)<\/a:schemeClr>/)
+          const bodyMatch = primaryMasterXml.match(/<p:bodyStyle>[\s\S]*?<a:schemeClr val="([^"]+)">([\s\S]*?)<\/a:schemeClr>/)
+          const m = bodyMatch || titleMatch
+          if (m) {
+            const val = m[1]
+            const lumModM = m[2].match(/<a:lumMod val="(\d+)"/)
+            const lumOffM = m[2].match(/<a:lumOff val="(\d+)"/)
+            const lumMod = lumModM ? parseInt(lumModM[1], 10) / 100000 : 1
+            const lumOff = lumOffM ? parseInt(lumOffM[1], 10) / 100000 : 0
+            const slot = val === 'tx1' ? 'dk1' : val === 'bg1' ? 'lt1' : val === 'tx2' ? 'dk2' : val === 'bg2' ? 'lt2' : val
+            const baseHex = themeColors[slot] || themeColors[val] || (slot === 'dk1' || slot === 'tx1' ? '#000000' : '#FFFFFF')
+            masterTextColor = (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
+          }
+        }
+      } catch (mErr) { }
+
+      // 提取并扫描全局 schemeClr 表达片段与计算颜色映射（仅针对幻灯片、母版、版式与主题核心XML）
+      const schemeFillMap: Record<string, string> = {}
+      try {
+        for (const [name, file] of Object.entries(zip.files)) {
+          if (name.endsWith('.xml') && !name.includes('_rels') && (name.startsWith('ppt/slides/') || name.startsWith('ppt/slideMasters/') || name.startsWith('ppt/slideLayouts/') || name.startsWith('ppt/theme/'))) {
+            const txt = await file.async('text')
+            const regex = /<a:schemeClr\b[^>]*\/>|<a:schemeClr\b[^>]*>(?:(?!<\/a:schemeClr>)[\s\S])*<\/a:schemeClr>/g
+            const matches = txt.match(regex) || []
+            for (const m of matches) {
+              const clean = m.replace(/\s+/g, ' ').trim()
+              const valM = clean.match(/val="([^"]+)"/)
+              if (!valM) continue
+              const val = valM[1]
+              if (val === 'phClr') continue
+              const lumModM = clean.match(/<a:lumMod val="(\d+)"/)
+              const lumOffM = clean.match(/<a:lumOff val="(\d+)"/)
               const lumMod = lumModM ? parseInt(lumModM[1], 10) / 100000 : 1
               const lumOff = lumOffM ? parseInt(lumOffM[1], 10) / 100000 : 0
               const slot = val === 'tx1' ? 'dk1' : val === 'bg1' ? 'lt1' : val === 'tx2' ? 'dk2' : val === 'bg2' ? 'lt2' : val
-              const baseHex = themeColors[slot] || themeColors[val] || (slot === 'dk1' || slot === 'tx1' ? '#000000' : '#FFFFFF')
-              masterTextColor = (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
-            }
-          }
-        } catch (mErr) {}
-
-        // 提取并扫描全局 schemeClr 表达片段与计算颜色映射（仅针对幻灯片、母版、版式与主题核心XML）
-        const schemeFillMap: Record<string, string> = {}
-        try {
-          for (const [name, file] of Object.entries(zip.files)) {
-            if (name.endsWith('.xml') && !name.includes('_rels') && (name.startsWith('ppt/slides/') || name.startsWith('ppt/slideMasters/') || name.startsWith('ppt/slideLayouts/') || name.startsWith('ppt/theme/'))) {
-              const txt = await file.async('text')
-              const regex = /<a:schemeClr\b[^>]*\/>|<a:schemeClr\b[^>]*>(?:(?!<\/a:schemeClr>)[\s\S])*<\/a:schemeClr>/g
-              const matches = txt.match(regex) || []
-              for (const m of matches) {
-                const clean = m.replace(/\s+/g, ' ').trim()
-                const valM = clean.match(/val="([^"]+)"/)
-                if (!valM) continue
-                const val = valM[1]
-                if (val === 'phClr') continue
-                const lumModM = clean.match(/<a:lumMod val="(\d+)"/)
-                const lumOffM = clean.match(/<a:lumOff val="(\d+)"/)
-                const lumMod = lumModM ? parseInt(lumModM[1], 10) / 100000 : 1
-                const lumOff = lumOffM ? parseInt(lumOffM[1], 10) / 100000 : 0
-                const slot = val === 'tx1' ? 'dk1' : val === 'bg1' ? 'lt1' : val === 'tx2' ? 'dk2' : val === 'bg2' ? 'lt2' : val
-                const baseHex = themeColors[slot] || themeColors[val] || ''
-                if (baseHex) {
-                  const calcHex = (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
-                  const cleanHex = calcHex.replace('#', '').toUpperCase()
-                  schemeFillMap[cleanHex] = clean
-
-                  // 处理 RGB 整数四舍五入 ±1 的容差 (如 8496B0 vs 8497B0)
-                  const r = parseInt(cleanHex.slice(0, 2), 16)
-                  const g = parseInt(cleanHex.slice(2, 4), 16)
-                  const b = parseInt(cleanHex.slice(4, 6), 16)
-                  const toHex = (num: number) => num.toString(16).padStart(2, '0').toUpperCase()
-                  for (let dg = -1; dg <= 1; dg++) {
-                    for (let db = -1; db <= 1; db++) {
-                      if (dg === 0 && db === 0) continue
-                      const nearHex = `${toHex(r)}${toHex(Math.min(255, Math.max(0, g + dg)))}${toHex(Math.min(255, Math.max(0, b + db)))}`
-                      if (!schemeFillMap[nearHex]) {
-                        schemeFillMap[nearHex] = clean
-                      }
+              const baseHex = themeColors[slot] || themeColors[val] || ''
+              if (baseHex) {
+                const calcHex = (lumMod !== 1 || lumOff !== 0) ? applyLumAdjust(baseHex, lumMod, lumOff) : baseHex
+                const cleanHex = calcHex.replace('#', '').toUpperCase()
+                schemeFillMap[cleanHex] = clean
+
+                // 处理 RGB 整数四舍五入 ±1 的容差 (如 8496B0 vs 8497B0)
+                const r = parseInt(cleanHex.slice(0, 2), 16)
+                const g = parseInt(cleanHex.slice(2, 4), 16)
+                const b = parseInt(cleanHex.slice(4, 6), 16)
+                const toHex = (num: number) => num.toString(16).padStart(2, '0').toUpperCase()
+                for (let dg = -1; dg <= 1; dg++) {
+                  for (let db = -1; db <= 1; db++) {
+                    if (dg === 0 && db === 0) continue
+                    const nearHex = `${toHex(r)}${toHex(Math.min(255, Math.max(0, g + dg)))}${toHex(Math.min(255, Math.max(0, b + db)))}`
+                    if (!schemeFillMap[nearHex]) {
+                      schemeFillMap[nearHex] = clean
                     }
                   }
                 }
               }
             }
           }
-        } catch (e) {}
-
-        // 提取版式占位符几何字典与每页占位符图片的几何形状映射
-        const slidePicGeomMap: Array<Record<string, { geom?: string; polygonPoints?: string }>> = []
-        const slideSpLstStyleAlignMap: Array<Record<string, string>> = []
-        try {
-          const layoutGeomMap = new Map<string, Map<string, { geom?: string; polygonPoints?: string; type?: string }>>()
-          for (const layout of allLayouts) {
-            const phMap = new Map<string, { geom?: string; polygonPoints?: string; type?: string }>()
-            const spMatches = (layout.xml || '').match(/<p:(?:sp|pic)\b[\s\S]*?<\/p:(?:sp|pic)>/g) || []
-            for (const sp of spMatches) {
-              const phMatch = sp.match(/<p:ph\b[^>]*\/?>/)
-              if (!phMatch) continue
-              const phAttrs = phMatch[0]
-              const idxM = phAttrs.match(/idx="(\d+)"/)
-              const typeM = phAttrs.match(/type="(\w+)"/)
-              const prstM = sp.match(/<a:prstGeom\b[^>]*prst="([^"]+)"/)
-              const custM = sp.match(/<a:custGeom\b[\s\S]*?<\/a:custGeom>/)
-              let geom = prstM ? prstM[1] : undefined
-              let polygonPoints: string | undefined = undefined
-              if (custM) {
-                const poly = parseCustGeomToPolygon(custM[0])
-                if (poly) {
-                  polygonPoints = poly
-                  geom = 'custom'
-                }
-              }
-              const geomInfo = { geom, polygonPoints, type: typeM ? typeM[1] : undefined }
-              if (idxM) phMap.set('idx_' + idxM[1], geomInfo)
-              if (typeM) phMap.set('type_' + typeM[1], geomInfo)
-            }
-            layoutGeomMap.set(layout.file, phMap)
-            const shortName = layout.file.replace('ppt/slideLayouts/', '')
-            layoutGeomMap.set(shortName, phMap)
-            layoutGeomMap.set(`../slideLayouts/${shortName}`, phMap)
-          }
+        }
+      } catch (e) { }
 
-          const slideFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slides/slide') && !k.includes('_rels') && !zip.files[k].dir)
-          slideFiles.sort(sortSlideXml)
-
-          for (let i = 0; i < slideFiles.length; i++) {
-            const sXml = await zip.file(slideFiles[i])?.async('text') || ''
-            const lObj = slideLayoutMap[i]
-            const phMap = lObj ? (layoutGeomMap.get(lObj.file) || layoutGeomMap.get(lObj.id)) : null
-            const picGeomById: Record<string, { geom?: string; polygonPoints?: string }> = {}
-
-            // 提取各文本框在 a:lstStyle 中定义的继承对齐方式（当段落自身无显式 a:pPr algn 时兜底生效）
-            const spLstStyleAlignById: Record<string, string> = {}
-            const spMatches = sXml.match(/<p:sp\b[\s\S]*?<\/p:sp>/g) || []
-            for (const sp of spMatches) {
-              const idM = sp.match(/<p:cNvPr\b[^>]*id="(\d+)"/)
-              if (!idM) continue
-              const id = idM[1]
-              const hasDirectPAlign = /<a:pPr\b[^>]*\balgn="/.test(sp)
-              const lstStyleM = sp.match(/<a:lstStyle\b[\s\S]*?<\/a:lstStyle>/)
-              if (!hasDirectPAlign && lstStyleM) {
-                const algnM = lstStyleM[0].match(/algn="(ctr|center|r|right|l|left|just|dist)"/)
-                if (algnM) {
-                  const a = algnM[1]
-                  const standardAlign = (a === 'ctr' || a === 'center') ? 'center' : (a === 'r' || a === 'right') ? 'right' : (a === 'dist') ? 'distribute' : (a === 'just') ? 'justify' : 'left'
-                  spLstStyleAlignById[id] = standardAlign
-                }
-              }
-            }
-            slideSpLstStyleAlignMap.push(spLstStyleAlignById)
-
-            const picMatches = sXml.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
-            for (const pic of picMatches) {
-              const idM = pic.match(/<p:cNvPr\b[^>]*id="(\d+)"/)
-              if (!idM) continue
-              const id = idM[1]
-              const phMatch = pic.match(/<p:ph\b[^>]*\/?>/)
-              if (phMatch && phMap) {
-                const phAttrs = phMatch[0]
-                const idxM = phAttrs.match(/idx="(\d+)"/)
-                const typeM = phAttrs.match(/type="(\w+)"/)
-                let geomInfo: { geom?: string; polygonPoints?: string } | undefined
-                if (idxM && phMap.has('idx_' + idxM[1])) {
-                  geomInfo = phMap.get('idx_' + idxM[1])
-                } else if (typeM && phMap.has('type_' + typeM[1])) {
-                  geomInfo = phMap.get('type_' + typeM[1])
-                }
-                if (geomInfo) {
-                  picGeomById[id] = geomInfo
-                }
+      // 提取版式占位符几何字典与每页占位符图片的几何形状映射
+      const slidePicGeomMap: Array<Record<string, { geom?: string; polygonPoints?: string }>> = []
+      const slideSpLstStyleAlignMap: Array<Record<string, string>> = []
+      try {
+        const layoutGeomMap = new Map<string, Map<string, { geom?: string; polygonPoints?: string; type?: string }>>()
+        for (const layout of allLayouts) {
+          const phMap = new Map<string, { geom?: string; polygonPoints?: string; type?: string }>()
+          const spMatches = (layout.xml || '').match(/<p:(?:sp|pic)\b[\s\S]*?<\/p:(?:sp|pic)>/g) || []
+          for (const sp of spMatches) {
+            const phMatch = sp.match(/<p:ph\b[^>]*\/?>/)
+            if (!phMatch) continue
+            const phAttrs = phMatch[0]
+            const idxM = phAttrs.match(/idx="(\d+)"/)
+            const typeM = phAttrs.match(/type="(\w+)"/)
+            const prstM = sp.match(/<a:prstGeom\b[^>]*prst="([^"]+)"/)
+            const custM = sp.match(/<a:custGeom\b[\s\S]*?<\/a:custGeom>/)
+            let geom = prstM ? prstM[1] : undefined
+            let polygonPoints: string | undefined = undefined
+            if (custM) {
+              const poly = parseCustGeomToPolygon(custM[0])
+              if (poly) {
+                polygonPoints = poly
+                geom = 'custom'
               }
             }
-            slidePicGeomMap.push(picGeomById)
-          }
-        } catch (geomErr) {
-          console.warn('提取占位符几何失败:', geomErr)
-        }
-
-        // 捕获完整原生母版与版式文件及底层依赖媒体，供导出时无损注入原生 PPT 母版架构体系
-        const masterFilesMap: Record<string, string> = {}
-        for (const k of Object.keys(zip.files)) {
-          if (k.startsWith('ppt/slideMasters/') && (k.endsWith('.xml') || k.endsWith('.rels')) && !zip.files[k].dir) {
-            masterFilesMap[k] = await zip.file(k)?.async('text') || ''
+            const geomInfo = { geom, polygonPoints, type: typeM ? typeM[1] : undefined }
+            if (idxM) phMap.set('idx_' + idxM[1], geomInfo)
+            if (typeM) phMap.set('type_' + typeM[1], geomInfo)
           }
+          layoutGeomMap.set(layout.file, phMap)
+          const shortName = layout.file.replace('ppt/slideLayouts/', '')
+          layoutGeomMap.set(shortName, phMap)
+          layoutGeomMap.set(`../slideLayouts/${shortName}`, phMap)
         }
 
-        const layoutFilesMap: Record<string, string> = {}
-        for (const k of Object.keys(zip.files)) {
-          if (k.startsWith('ppt/slideLayouts/') && (k.endsWith('.xml') || k.endsWith('.rels')) && !zip.files[k].dir) {
-            layoutFilesMap[k] = await zip.file(k)?.async('text') || ''
+        const slideFiles = Object.keys(zip.files).filter(k => k.startsWith('ppt/slides/slide') && !k.includes('_rels') && !zip.files[k].dir)
+        slideFiles.sort(sortSlideXml)
+
+        for (let i = 0; i < slideFiles.length; i++) {
+          const sXml = await zip.file(slideFiles[i])?.async('text') || ''
+          const lObj = slideLayoutMap[i]
+          const phMap = lObj ? (layoutGeomMap.get(lObj.file) || layoutGeomMap.get(lObj.id)) : null
+          const picGeomById: Record<string, { geom?: string; polygonPoints?: string }> = {}
+
+          // 提取各文本框在 a:lstStyle 中定义的继承对齐方式（当段落自身无显式 a:pPr algn 时兜底生效）
+          const spLstStyleAlignById: Record<string, string> = {}
+          const spMatches = sXml.match(/<p:sp\b[\s\S]*?<\/p:sp>/g) || []
+          for (const sp of spMatches) {
+            const idM = sp.match(/<p:cNvPr\b[^>]*id="(\d+)"/)
+            if (!idM) continue
+            const id = idM[1]
+            const hasDirectPAlign = /<a:pPr\b[^>]*\balgn="/.test(sp)
+            const lstStyleM = sp.match(/<a:lstStyle\b[\s\S]*?<\/a:lstStyle>/)
+            if (!hasDirectPAlign && lstStyleM) {
+              const algnM = lstStyleM[0].match(/algn="(ctr|center|r|right|l|left|just|dist)"/)
+              if (algnM) {
+                const a = algnM[1]
+                const standardAlign = (a === 'ctr' || a === 'center') ? 'center' : (a === 'r' || a === 'right') ? 'right' : (a === 'dist') ? 'distribute' : (a === 'just') ? 'justify' : 'left'
+                spLstStyleAlignById[id] = standardAlign
+              }
+            }
           }
-        }
-
-        const masterMediaMap: Record<string, string> = {}
-        const relsFiles = [...Object.keys(masterFilesMap), ...Object.keys(layoutFilesMap)].filter(k => k.includes('_rels/'))
-        for (const rf of relsFiles) {
-          const rTxt = masterFilesMap[rf] || layoutFilesMap[rf] || ''
-          const targetMatches = rTxt.match(/Target="([^"]+)"/g) || []
-          for (const tm of targetMatches) {
-            const rawTarget = tm.replace(/^Target="/, '').replace(/"$/, '')
-            if (rawTarget.includes('media/') || rawTarget.includes('../media/')) {
-              const sourcePart = rf.replace('/_rels/', '/').replace(/\.rels$/, '')
-              const stack = sourcePart.split('/').slice(0, -1)
-              for (const part of rawTarget.split('/')) {
-                if (part === '..') stack.pop()
-                else if (part && part !== '.') stack.push(part)
+          slideSpLstStyleAlignMap.push(spLstStyleAlignById)
+
+          const picMatches = sXml.match(/<p:pic\b[\s\S]*?<\/p:pic>/g) || []
+          for (const pic of picMatches) {
+            const idM = pic.match(/<p:cNvPr\b[^>]*id="(\d+)"/)
+            if (!idM) continue
+            const id = idM[1]
+            const phMatch = pic.match(/<p:ph\b[^>]*\/?>/)
+            if (phMatch && phMap) {
+              const phAttrs = phMatch[0]
+              const idxM = phAttrs.match(/idx="(\d+)"/)
+              const typeM = phAttrs.match(/type="(\w+)"/)
+              let geomInfo: { geom?: string; polygonPoints?: string } | undefined
+              if (idxM && phMap.has('idx_' + idxM[1])) {
+                geomInfo = phMap.get('idx_' + idxM[1])
+              } else if (typeM && phMap.has('type_' + typeM[1])) {
+                geomInfo = phMap.get('type_' + typeM[1])
               }
-              const mediaPath = stack.join('/')
-              if (!masterMediaMap[mediaPath] && zip.files[mediaPath]) {
-                const b64 = await zip.file(mediaPath)?.async('base64')
-                if (b64) masterMediaMap[mediaPath] = b64
+              if (geomInfo) {
+                picGeomById[id] = geomInfo
               }
             }
           }
+          slidePicGeomMap.push(picGeomById)
         }
+      } catch (geomErr) {
+        console.warn('提取占位符几何失败:', geomErr)
+      }
 
-        const tagFilesMap: Record<string, string> = {}
-        for (const k of Object.keys(zip.files)) {
-          if (k.startsWith('ppt/tags/') && k.endsWith('.xml') && !zip.files[k].dir) {
-            tagFilesMap[k] = await zip.file(k)?.async('text') || ''
-          }
+      // 捕获完整原生母版与版式文件及底层依赖媒体，供导出时无损注入原生 PPT 母版架构体系
+      const masterFilesMap: Record<string, string> = {}
+      for (const k of Object.keys(zip.files)) {
+        if (k.startsWith('ppt/slideMasters/') && (k.endsWith('.xml') || k.endsWith('.rels')) && !zip.files[k].dir) {
+          masterFilesMap[k] = await zip.file(k)?.async('text') || ''
         }
+      }
 
-        zipMeta = {
-          allLayouts,
-          slideLayoutMap,
-          masterName: masterName || nameWithoutExt,
-          masterShapesInfo,
-          themeColors,
-          schemeFillMap,
-          masterPhXfrm,
-          primaryMasterXml,
-          masterPicSrcMap,
-          masterXmlBg,
-          slidePicGeomMap,
-          slideSpLstStyleAlignMap,
-          masterTextColor,
-          masterFilesMap,
-          layoutFilesMap,
-          masterMediaMap,
-          tagFilesMap,
-          slideLayoutTargetList
+      const layoutFilesMap: Record<string, string> = {}
+      for (const k of Object.keys(zip.files)) {
+        if (k.startsWith('ppt/slideLayouts/') && (k.endsWith('.xml') || k.endsWith('.rels')) && !zip.files[k].dir) {
+          layoutFilesMap[k] = await zip.file(k)?.async('text') || ''
         }
-      } catch (e) {
-        console.warn('Failed to extract zipMeta:', e)
       }
 
-      const parsedData = parsePPTXJSONData(json, zipMeta)
-      let animsPerSlide: any[] = []
-      try {
-        animsPerSlide = await extractAnimationsFromPptxArrayBuffer(loadedZip || buffer, parsedData?.slides || [])
-      } catch (animErr) {
-        console.warn('提取 PPTX 动画失败:', animErr)
-      }
-      for (let i = 0; i < (parsedData?.slides?.length || 0); i++) {
-        if (!parsedData.slides[i].animations || !parsedData.slides[i].animations.length) {
-          if (animsPerSlide && animsPerSlide[i] && animsPerSlide[i].length) {
-            parsedData.slides[i].animations = animsPerSlide[i]
+      const masterMediaMap: Record<string, string> = {}
+      const relsFiles = [...Object.keys(masterFilesMap), ...Object.keys(layoutFilesMap)].filter(k => k.includes('_rels/'))
+      for (const rf of relsFiles) {
+        const rTxt = masterFilesMap[rf] || layoutFilesMap[rf] || ''
+        const targetMatches = rTxt.match(/Target="([^"]+)"/g) || []
+        for (const tm of targetMatches) {
+          const rawTarget = tm.replace(/^Target="/, '').replace(/"$/, '')
+          if (rawTarget.includes('media/') || rawTarget.includes('../media/')) {
+            const sourcePart = rf.replace('/_rels/', '/').replace(/\.rels$/, '')
+            const stack = sourcePart.split('/').slice(0, -1)
+            for (const part of rawTarget.split('/')) {
+              if (part === '..') stack.pop()
+              else if (part && part !== '.') stack.push(part)
+            }
+            const mediaPath = stack.join('/')
+            if (!masterMediaMap[mediaPath] && zip.files[mediaPath]) {
+              const b64 = await zip.file(mediaPath)?.async('base64')
+              if (b64) masterMediaMap[mediaPath] = b64
+            }
           }
         }
       }
 
-      if (parsedData.slides.length > 0) {
-        if (typeof getCustomUploadHandler === 'function' && getCustomUploadHandler()) {
-          loadingText.value = '正在上传媒体资源并导入...'
-          await uploadMediaResourcesInSlides(parsedData)
+      const tagFilesMap: Record<string, string> = {}
+      for (const k of Object.keys(zip.files)) {
+        if (k.startsWith('ppt/tags/') && k.endsWith('.xml') && !zip.files[k].dir) {
+          tagFilesMap[k] = await zip.file(k)?.async('text') || ''
         }
-        presentationTitle.value = nameWithoutExt
-        importSlides(parsedData)
-        return true
-      } else {
-        notify('导入失败：文件中未发现有效幻灯片页')
-        return false
       }
-    } catch (err: any) {
-      console.error(err)
-      notify('导入 PPTX 失败: ' + err.message)
-      return false
-    } finally {
-      isExporting.value = false
+
+      zipMeta = {
+        allLayouts,
+        slideLayoutMap,
+        masterName: masterName || nameWithoutExt,
+        masterShapesInfo,
+        themeColors,
+        schemeFillMap,
+        masterPhXfrm,
+        primaryMasterXml,
+        masterPicSrcMap,
+        masterXmlBg,
+        slidePicGeomMap,
+        slideSpLstStyleAlignMap,
+        masterTextColor,
+        masterFilesMap,
+        layoutFilesMap,
+        masterMediaMap,
+        tagFilesMap,
+        slideLayoutTargetList
+      }
+    } catch (e) {
+      console.warn('Failed to extract zipMeta:', e)
     }
-  }
 
-  const onFileChange = async (e: Event) => {
-    const target = e.target as HTMLInputElement
-    const files = target.files
-    if (!files || files.length === 0) return
+    const parsedData = parsePPTXJSONData(json, zipMeta)
+    let animsPerSlide: any[] = []
+    try {
+      animsPerSlide = await extractAnimationsFromPptxArrayBuffer(loadedZip || buffer, parsedData?.slides || [])
+    } catch (animErr) {
+      console.warn('提取 PPTX 动画失败:', animErr)
+    }
+    for (let i = 0; i < (parsedData?.slides?.length || 0); i++) {
+      if (!parsedData.slides[i].animations || !parsedData.slides[i].animations.length) {
+        if (animsPerSlide && animsPerSlide[i] && animsPerSlide[i].length) {
+          parsedData.slides[i].animations = animsPerSlide[i]
+        }
+      }
+    }
 
-    const file = files[0]
-    const reader = new FileReader()
-    reader.onload = async (event) => {
-      try {
-        const buffer = event.target?.result as ArrayBuffer
-        await importPptxArrayBuffer(buffer, file.name)
-      } finally {
-        target.value = ''
+    if (parsedData.slides.length > 0) {
+      if (typeof getCustomUploadHandler === 'function' && getCustomUploadHandler()) {
+        loadingText.value = '正在上传媒体资源并导入...'
+        await uploadMediaResourcesInSlides(parsedData)
       }
+      presentationTitle.value = nameWithoutExt
+      importSlides(parsedData)
+      return true
+    } else {
+      notify('导入失败：文件中未发现有效幻灯片页')
+      return false
     }
-    reader.readAsArrayBuffer(file)
+  } catch (err: any) {
+    console.error(err)
+    notify('导入 PPTX 失败: ' + err.message)
+    return false
+  } finally {
+    isExporting.value = false
   }
+}
 
-  const props = withDefaults(defineProps<{
-    slotProps?: any
-    showMenu?: boolean
-    toolbarMode?: 'auto' | 'more' | 'full'
-    visible?: boolean
-  }>(), {
-    showMenu: true,
-    toolbarMode: 'auto',
-    visible: true
-  })
+const onFileChange = async (e: Event) => {
+  const target = e.target as HTMLInputElement
+  const files = target.files
+  if (!files || files.length === 0) return
 
-  // 不能整体展开 slotProps：其 deck 是惰性 getter，展开会立刻执行 getDeck() 整册深拷贝
-  // （110 页实测 ~500ms/次），且展开发生在本 computed 内会把本 computed 订阅到全册，
-  // 拖拽/打字每步都失效重算。改为逐键拷贝（跳过 deck），deck 仍以 getter 形式透传，
-  // 只在消费者真正读取时才现算
-  const headerContext = computed(() => {
-    const sp: any = props.slotProps || {}
-    const merged: any = {
-      showMenu: props.showMenu,
-      presentationTitle: presentationTitle.value,
-      isEditingTitle: isEditingTitle.value,
-      startEditingTitle,
-      stopEditingTitle,
-      zoomRatio: zoomRatio.value,
-      setZoomRatio: (val: number) => { zoomRatio.value = val },
-      resetZoom,
-      isMasterEditingView: isMasterEditingView.value,
-      enterMasterView,
-      exitMasterView,
-      startPresentation,
-      startFromBeginning,
-      triggerPPTXImport,
-      triggerJSONImport
-    }
-    for (const k of Object.keys(sp)) {
-      if (k === 'deck' || k in merged) continue
-      merged[k] = sp[k]
-    }
-    if ('deck' in sp) {
-      Object.defineProperty(merged, 'deck', {
-        get: () => sp.deck,
-        enumerable: true,
-        configurable: true
-      })
+  const file = files[0]
+  const reader = new FileReader()
+  reader.onload = async (event) => {
+    try {
+      const buffer = event.target?.result as ArrayBuffer
+      await importPptxArrayBuffer(buffer, file.name)
+    } finally {
+      target.value = ''
     }
-    return merged
-  })
+  }
+  reader.readAsArrayBuffer(file)
+}
 
-  function handleToolbarWheel(e: WheelEvent) {
-    const el = e.currentTarget as HTMLElement
-    if (el && el.scrollWidth > el.clientWidth) {
-      if (Math.abs(e.deltaY) > Math.abs(e.deltaX)) {
-        el.scrollLeft += e.deltaY
-      }
+const props = withDefaults(defineProps<{
+  slotProps?: any
+  showMenu?: boolean
+  toolbarMode?: 'auto' | 'more' | 'full'
+  visible?: boolean
+}>(), {
+  showMenu: true,
+  toolbarMode: 'auto',
+  visible: true
+})
+
+// 不能整体展开 slotProps：其 deck 是惰性 getter，展开会立刻执行 getDeck() 整册深拷贝
+// （110 页实测 ~500ms/次），且展开发生在本 computed 内会把本 computed 订阅到全册，
+// 拖拽/打字每步都失效重算。改为逐键拷贝（跳过 deck），deck 仍以 getter 形式透传，
+// 只在消费者真正读取时才现算
+const headerContext = computed(() => {
+  const sp: any = props.slotProps || {}
+  const merged: any = {
+    showMenu: props.showMenu,
+    presentationTitle: presentationTitle.value,
+    isEditingTitle: isEditingTitle.value,
+    startEditingTitle,
+    stopEditingTitle,
+    zoomRatio: zoomRatio.value,
+    setZoomRatio: (val: number) => { zoomRatio.value = val },
+    resetZoom,
+    isMasterEditingView: isMasterEditingView.value,
+    enterMasterView,
+    exitMasterView,
+    startPresentation,
+    startFromBeginning,
+    triggerPPTXImport,
+    triggerJSONImport
+  }
+  for (const k of Object.keys(sp)) {
+    if (k === 'deck' || k in merged) continue
+    merged[k] = sp[k]
+  }
+  if ('deck' in sp) {
+    Object.defineProperty(merged, 'deck', {
+      get: () => sp.deck,
+      enumerable: true,
+      configurable: true
+    })
+  }
+  return merged
+})
+
+function handleToolbarWheel(e: WheelEvent) {
+  const el = e.currentTarget as HTMLElement
+  if (el && el.scrollWidth > el.clientWidth) {
+    if (Math.abs(e.deltaY) > Math.abs(e.deltaX)) {
+      el.scrollLeft += e.deltaY
     }
   }
+}
 
-  defineExpose({
-    generatePptxBlob,
-    generateImagesZipBlob,
-    downloadAsPptx,
-    downloadAllSlidesAsZip,
-    downloadCurrentSlide,
-    triggerPPTXImport,
-    triggerJSONImport,
-    importPptxArrayBuffer
-  })
+defineExpose({
+  generatePptxBlob,
+  generateImagesZipBlob,
+  downloadAsPptx,
+  downloadAllSlidesAsZip,
+  downloadCurrentSlide,
+  triggerPPTXImport,
+  triggerJSONImport,
+  importPptxArrayBuffer
+})
 </script>
 
 <template>
@@ -7438,167 +7452,178 @@ const importPptxArrayBuffer = async (buffer: ArrayBuffer, fileName?: string): Pr
       <!-- 外部左侧主体插槽 (默认呈现内置菜单和标题) -->
       <slot name="left" v-bind="headerContext">
         <el-popover v-if="showMenu" ref="menuPopoverRef" placement="bottom-start" :width="320" trigger="click"
-        popper-style="padding: 0; border-radius: 12px; box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1), 0 8px 10px -6px rgba(0, 0, 0, 0.1); border: 1px solid #e2e8f0; background: #fff; overflow: hidden;">
-        <template #reference>
-          <button class="btn-icon" style="padding: 4px; color: var(--text-primary); flex-shrink: 0;" data-tooltip="菜单">
-            <svg class="icon" style="width: 18px; height: 18px" viewBox="0 0 24 24">
-              <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
-            </svg>
-          </button>
-        </template>
-
-        <div class="main-menu-popover">
-          <!-- AIPPT Banner -->
-          <div class="aippt-banner" @click="handleMenuAction(handleAIPPT)" v-if="false">
-            <div class="aippt-icon-container">
-              <svg class="aippt-arrow-icon" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path d="M4.5 3L4 16.5L8.5 12.5L13.5 20L16.5 18L11.5 10.5L17 10L4.5 3Z" fill="#ffb800" stroke="#fff"
-                  stroke-width="1.5" stroke-linejoin="round" />
-                <path d="M19 4L19.5 2.5L21 2L19.5 1.5L19 0L18.5 1.5L17 2L18.5 2.5L19 4Z" fill="#ffb800" />
-                <path d="M21 14L21.5 12.5L23 12L21.5 11.5L21 10L20.5 11.5L19 12L20.5 12.5L21 14Z" fill="#ff9900" />
-                <path d="M3 21L3.5 19.5L5 19L3.5 18.5L3 17L2.5 18.5L1 19L2.5 19.5L3 21Z" fill="#ffcc00" />
+          popper-style="padding: 0; border-radius: 12px; box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1), 0 8px 10px -6px rgba(0, 0, 0, 0.1); border: 1px solid #e2e8f0; background: #fff; overflow: hidden;">
+          <template #reference>
+            <button class="btn-icon" style="padding: 4px; color: var(--text-primary); flex-shrink: 0;"
+              data-tooltip="菜单">
+              <svg class="icon" style="width: 18px; height: 18px" viewBox="0 0 24 24">
+                <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
               </svg>
-            </div>
-            <div class="aippt-text-container">
-              <div class="aippt-title">
-                <span style="color: #3b82f6">AIPP</span><span style="color: #d946ef">T</span>
+            </button>
+          </template>
+
+          <div class="main-menu-popover">
+            <!-- AIPPT Banner -->
+            <div class="aippt-banner" @click="handleMenuAction(handleAIPPT)" v-if="false">
+              <div class="aippt-icon-container">
+                <svg class="aippt-arrow-icon" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  <path d="M4.5 3L4 16.5L8.5 12.5L13.5 20L16.5 18L11.5 10.5L17 10L4.5 3Z" fill="#ffb800" stroke="#fff"
+                    stroke-width="1.5" stroke-linejoin="round" />
+                  <path d="M19 4L19.5 2.5L21 2L19.5 1.5L19 0L18.5 1.5L17 2L18.5 2.5L19 4Z" fill="#ffb800" />
+                  <path d="M21 14L21.5 12.5L23 12L21.5 11.5L21 10L20.5 11.5L19 12L20.5 12.5L21 14Z" fill="#ff9900" />
+                  <path d="M3 21L3.5 19.5L5 19L3.5 18.5L3 17L2.5 18.5L1 19L2.5 19.5L3 21Z" fill="#ffcc00" />
+                </svg>
+              </div>
+              <div class="aippt-text-container">
+                <div class="aippt-title">
+                  <span style="color: #3b82f6">AIPP</span><span style="color: #d946ef">T</span>
+                </div>
+                <div class="aippt-desc">输入一句话，智能生成演示文稿</div>
               </div>
-              <div class="aippt-desc">输入一句话，智能生成演示文稿</div>
             </div>
-          </div>
 
-          <div class="menu-body">
-            <!-- Import File Section -->
-            <div class="menu-section-title">导入文件</div>
-            <div class="import-grid">
-              <!-- PPTX Import -->
-              <div class="import-card" @click="handleMenuAction(triggerPPTXImport)">
-                <div class="import-icon-box pptx-icon">
-                  <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path
-                      d="M4 4C4 2.89543 4.89543 2 6 2H14L20 8V20C20 21.1046 19.1046 22 18 22H6C4.89543 22 4 21.1046 4 20V4Z"
-                      fill="#ea4335" />
-                    <path d="M14 2V8H20L14 2Z" fill="#c5221f" />
-                    <text x="7" y="17" fill="#fff" font-size="9" font-weight="900" font-family="Arial">P</text>
-                  </svg>
+            <div class="menu-body">
+              <!-- Import File Section -->
+              <div class="menu-section-title">导入文件</div>
+              <div class="import-grid">
+                <!-- PPTX Import -->
+                <div class="import-card" @click="handleMenuAction(triggerPPTXImport)">
+                  <div class="import-icon-box pptx-icon">
+                    <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path
+                        d="M4 4C4 2.89543 4.89543 2 6 2H14L20 8V20C20 21.1046 19.1046 22 18 22H6C4.89543 22 4 21.1046 4 20V4Z"
+                        fill="#ea4335" />
+                      <path d="M14 2V8H20L14 2Z" fill="#c5221f" />
+                      <text x="7" y="17" fill="#fff" font-size="9" font-weight="900" font-family="Arial">P</text>
+                    </svg>
+                  </div>
+                  <div class="import-label">PPTX</div>
+                  <div class="import-subtext">(仅供测试)</div>
                 </div>
-                <div class="import-label">PPTX</div>
-                <div class="import-subtext">(仅供测试)</div>
-              </div>
 
-              <!-- JSON Import -->
-              <div class="import-card" @click="handleMenuAction(triggerJSONImport)">
-                <div class="import-icon-box json-icon">
-                  <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path
-                      d="M4 4C4 2.89543 4.89543 2 6 2H14L20 8V20C20 21.1046 19.1046 22 18 22H6C4.89543 22 4 21.1046 4 20V4Z"
-                      fill="#f2994a" />
-                    <path d="M14 2V8H20L14 2Z" fill="#e07c24" />
-                    <text x="7" y="17" fill="#fff" font-size="9" font-weight="900" font-family="Arial">J</text>
-                  </svg>
+                <!-- JSON Import -->
+                <div class="import-card" @click="handleMenuAction(triggerJSONImport)">
+                  <div class="import-icon-box json-icon">
+                    <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path
+                        d="M4 4C4 2.89543 4.89543 2 6 2H14L20 8V20C20 21.1046 19.1046 22 18 22H6C4.89543 22 4 21.1046 4 20V4Z"
+                        fill="#f2994a" />
+                      <path d="M14 2V8H20L14 2Z" fill="#e07c24" />
+                      <text x="7" y="17" fill="#fff" font-size="9" font-weight="900" font-family="Arial">J</text>
+                    </svg>
+                  </div>
+                  <div class="import-label">JSON</div>
+                  <div class="import-subtext">(仅供测试)</div>
+                </div>
+
+                <!-- JVS-PPT Import -->
+                <div class="import-card" @click="handleMenuAction(handleJVSPPTImport)">
+                  <div class="import-icon-box pptist-icon">
+                    <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path
+                        d="M4 4C4 2.89543 4.89543 2 6 2H14L20 8V20C20 21.1046 19.1046 22 18 22H6C4.89543 22 4 21.1046 4 20V4Z"
+                        fill="#eb5757" />
+                      <path d="M14 2V8H20L14 2Z" fill="#c03930" />
+                      <rect x="7" y="12" width="10" height="2" rx="1" fill="#fff" />
+                      <rect x="7" y="16" width="10" height="2" rx="1" fill="#fff" />
+                    </svg>
+                  </div>
+                  <div class="import-label">JVS-PPT</div>
+                  <div class="import-subtext">(专属格式)</div>
                 </div>
-                <div class="import-label">JSON</div>
-                <div class="import-subtext">(仅供测试)</div>
               </div>
 
-              <!-- JVS-PPT Import -->
-              <div class="import-card" @click="handleMenuAction(handleJVSPPTImport)">
-                <div class="import-icon-box pptist-icon">
-                  <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <!-- Divider -->
+              <div class="menu-divider"></div>
+
+              <!-- Link Items List -->
+              <div class="menu-links">
+                <!-- Export -->
+                <el-dropdown trigger="click" @command="handleExportCommand" :disabled="isExporting"
+                  style="width: 100%; display: block; text-align: left;">
+                  <div class="menu-link-item">
+                    <svg class="link-icon" viewBox="0 0 24 24">
+                      <path
+                        d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z"
+                        fill="currentColor" />
+                    </svg>
+                    <span class="link-text">{{ isExporting ? '正在导出...' : '导出文件' }}</span>
+                  </div>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item command="png">下载当前页 (PNG)</el-dropdown-item>
+                      <el-dropdown-item command="jpeg">下载当前页 (JPEG)</el-dropdown-item>
+                      <el-dropdown-item command="zip">下载全部 (ZIP)</el-dropdown-item>
+                      <el-dropdown-item command="pptx">下载为 PPTX</el-dropdown-item>
+                      <el-dropdown-item command="json" divided>导出完整 JSON 配置</el-dropdown-item>
+                      <el-dropdown-item command="json-template">导出纯版式 JSON (排除图片/清空文本)</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+
+                <!-- Reset -->
+                <div v-if="!isReadonly" class="menu-link-item" @click="handleMenuAction(handleResetSlides)">
+                  <svg class="link-icon" viewBox="0 0 24 24">
                     <path
-                      d="M4 4C4 2.89543 4.89543 2 6 2H14L20 8V20C20 21.1046 19.1046 22 18 22H6C4.89543 22 4 21.1046 4 20V4Z"
-                      fill="#eb5757" />
-                    <path d="M14 2V8H20L14 2Z" fill="#c03930" />
-                    <rect x="7" y="12" width="10" height="2" rx="1" fill="#fff" />
-                    <rect x="7" y="16" width="10" height="2" rx="1" fill="#fff" />
+                      d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"
+                      fill="currentColor" />
                   </svg>
+                  <span class="link-text">重置幻灯片</span>
                 </div>
-                <div class="import-label">JVS-PPT</div>
-                <div class="import-subtext">(专属格式)</div>
-              </div>
-            </div>
 
-            <!-- Divider -->
-            <div class="menu-divider"></div>
+                <!-- Label -->
+                <div class="menu-link-item" @click="handleMenuAction(handleLabelSlides)">
+                  <svg class="link-icon" viewBox="0 0 24 24">
+                    <path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6h-5.6z" fill="currentColor" />
+                  </svg>
+                  <span class="link-text">幻灯片类型标注</span>
+                </div>
 
-            <!-- Link Items List -->
-            <div class="menu-links">
-              <!-- Export -->
-              <el-dropdown trigger="click" @command="handleExportCommand" :disabled="isExporting"
-                style="width: 100%; display: block; text-align: left;">
-                <div class="menu-link-item">
+                <!-- Shortcuts -->
+                <div class="menu-link-item" @click="handleMenuAction(handleShortcuts)">
                   <svg class="link-icon" viewBox="0 0 24 24">
                     <path
-                      d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z"
+                      d="M4 15h2v3H4v-3zm0-4h2v3H4v-3zm0-4h2v3H4V7zm4 8h8v3H8v-3zm0-4h8v3H8v-3zm0-4h8v3H8V7zm12 8h2v3h-2v-3zm0-4h2v3h-2v-3zm0-4h2v3h-2V7z"
                       fill="currentColor" />
                   </svg>
-                  <span class="link-text">{{ isExporting ? '正在导出...' : '导出文件' }}</span>
+                  <span class="link-text">快捷操作</span>
                 </div>
-                <template #dropdown>
-                  <el-dropdown-menu>
-                    <el-dropdown-item command="png">下载当前页 (PNG)</el-dropdown-item>
-                    <el-dropdown-item command="jpeg">下载当前页 (JPEG)</el-dropdown-item>
-                    <el-dropdown-item command="zip">下载全部 (ZIP)</el-dropdown-item>
-                    <el-dropdown-item command="pptx">下载为 PPTX</el-dropdown-item>
-                    <el-dropdown-item command="json" divided>导出完整 JSON 配置</el-dropdown-item>
-                    <el-dropdown-item command="json-template">导出纯版式 JSON (排除图片/清空文本)</el-dropdown-item>
-                  </el-dropdown-menu>
-                </template>
-              </el-dropdown>
-
-              <!-- Reset -->
-              <div class="menu-link-item" @click="handleMenuAction(handleResetSlides)">
-                <svg class="link-icon" viewBox="0 0 24 24">
-                  <path
-                    d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"
-                    fill="currentColor" />
-                </svg>
-                <span class="link-text">重置幻灯片</span>
-              </div>
 
-              <!-- Label -->
-              <div class="menu-link-item" @click="handleMenuAction(handleLabelSlides)">
-                <svg class="link-icon" viewBox="0 0 24 24">
-                  <path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6h-5.6z" fill="currentColor" />
-                </svg>
-                <span class="link-text">幻灯片类型标注</span>
               </div>
 
-              <!-- Shortcuts -->
-              <div class="menu-link-item" @click="handleMenuAction(handleShortcuts)">
-                <svg class="link-icon" viewBox="0 0 24 24">
-                  <path
-                    d="M4 15h2v3H4v-3zm0-4h2v3H4v-3zm0-4h2v3H4V7zm4 8h8v3H8v-3zm0-4h8v3H8v-3zm0-4h8v3H8V7zm12 8h2v3h-2v-3zm0-4h2v3h-2v-3zm0-4h2v3h-2V7z"
-                    fill="currentColor" />
-                </svg>
-                <span class="link-text">快捷操作</span>
+              <!-- Note Disclaimer -->
+              <div class="menu-disclaimer">
+                注：本站仅作测试/演示，不提供任何形式的服务
               </div>
-
-            </div>
-
-            <!-- Note Disclaimer -->
-            <div class="menu-disclaimer">
-              注：本站仅作测试/演示，不提供任何形式的服务
             </div>
           </div>
+        </el-popover>
+        <div class="presentation-title-container"
+          style="display: flex; align-items: center; gap: 6px; margin-left: 8px; flex-shrink: 0; min-width: 0; max-width: 280px;">
+          <span v-if="!isEditingTitle || isReadonly" @click="startEditingTitle" class="presentation-title-text" :style="{
+            fontSize: '15px',
+            fontWeight: 600,
+            color: '#0f172a',
+            cursor: isReadonly ? 'default' : 'pointer',
+            transition: 'color 0.15s ease',
+            whiteSpace: 'nowrap',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            display: 'inline-block',
+            maxWidth: '240px'
+          }" :title="presentationTitle || '未命名演示文稿'">
+            {{ presentationTitle || '未命名演示文稿' }}
+          </span>
+          <input v-else ref="titleInputRef" class="presentation-title-input-edit" v-model="presentationTitle"
+            @blur="stopEditingTitle" @keyup.enter="stopEditingTitle"
+            style="font-size: 15px; font-weight: 600; color: #0f172a; border: 1px solid #3b82f6; border-radius: 6px; padding: 4px 8px; outline: none; background: #fff; box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.15); width: 200px;" />
+          <svg v-if="!isEditingTitle && !isReadonly" @click="startEditingTitle" viewBox="0 0 24 24" fill="none"
+            stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+            style="width: 14px; height: 14px; color: #3b82f6; cursor: pointer; margin-left: 2px; flex-shrink: 0;">
+            <path d="M12 20h9" />
+            <path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z" />
+          </svg>
         </div>
-      </el-popover>
-      <div class="presentation-title-container" style="display: flex; align-items: center; gap: 6px; margin-left: 8px; flex-shrink: 0; min-width: 0; max-width: 280px;">
-        <span v-if="!isEditingTitle" @click="startEditingTitle" class="presentation-title-text"
-          style="font-size: 15px; font-weight: 600; color: #0f172a; cursor: pointer; transition: color 0.15s ease; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: inline-block; max-width: 240px;"
-          :title="presentationTitle || '未命名演示文稿'">
-          {{ presentationTitle || '未命名演示文稿' }}
-        </span>
-        <input v-else ref="titleInputRef" class="presentation-title-input-edit" v-model="presentationTitle"
-          @blur="stopEditingTitle" @keyup.enter="stopEditingTitle"
-          style="font-size: 15px; font-weight: 600; color: #0f172a; border: 1px solid #3b82f6; border-radius: 6px; padding: 4px 8px; outline: none; background: #fff; box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.15); width: 200px;" />
-        <svg v-if="!isEditingTitle" @click="startEditingTitle" viewBox="0 0 24 24" fill="none" stroke="currentColor"
-          stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
-          style="width: 14px; height: 14px; color: #3b82f6; cursor: pointer; margin-left: 2px; flex-shrink: 0;">
-          <path d="M12 20h9" />
-          <path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z" />
-        </svg>
-      </div>
       </slot>
 
       <!-- 外部左侧后置插槽 (例如文档状态标签、副标题) -->
@@ -7606,11 +7631,13 @@ const importPptxArrayBuffer = async (buffer: ArrayBuffer, fileName?: string): Pr
     </div>
 
     <!-- Center Section: Integrated Top Toolbar -->
-    <div class="header-center-tools" @wheel.passive="handleToolbarWheel" style="flex: 1; display: flex; align-items: center; justify-content: flex-start; overflow-x: auto; overflow-y: hidden; min-width: 0; position: relative; z-index: 10; margin: 0 8px; scrollbar-width: none; -ms-overflow-style: none;">
+    <div v-if="!isReadonly" class="header-center-tools" @wheel.passive="handleToolbarWheel"
+      style="flex: 1; display: flex; align-items: center; justify-content: flex-start; overflow-x: auto; overflow-y: hidden; min-width: 0; position: relative; z-index: 10; margin: 0 8px; scrollbar-width: none; -ms-overflow-style: none;">
       <!-- 外部中间工具栏插槽 (默认呈现内置 Toolbar，支持前置/后置插槽扩展或整栏替换) -->
       <slot name="center" v-bind="headerContext">
         <slot name="toolbar" v-bind="headerContext">
-          <div :style="{ margin: isMasterEditingView ? '0' : '0 auto' }" style="display: flex; align-items: center; flex-shrink: 0;">
+          <div :style="{ margin: isMasterEditingView ? '0' : '0 auto' }"
+            style="display: flex; align-items: center; flex-shrink: 0;">
             <Toolbar :toolbar-mode="toolbarMode">
               <template v-if="$slots['toolbar-prefix']" #prefix>
                 <slot name="toolbar-prefix" v-bind="headerContext"></slot>
@@ -7668,7 +7695,7 @@ const importPptxArrayBuffer = async (buffer: ArrayBuffer, fileName?: string): Pr
       </button>
 
       <!-- Slide Master Mode Toggle Button -->
-      <button v-if="!isMasterEditingView" class="btn-master-toggle" @click="enterMasterView()"
+      <button v-if="!isMasterEditingView && !isReadonly" class="btn-master-toggle" @click="enterMasterView()"
         style="height: 32px; padding: 0 12px; border: none; border-radius: 6px; background: #f1f5f9; color: #334155; font-size: 13px; font-weight: 500; display: flex; align-items: center; gap: 6px; cursor: pointer; white-space: nowrap; flex-shrink: 0;">
         <svg viewBox="0 0 1024 1024" width="16" height="16" fill="currentColor" style="flex-shrink: 0;">
           <use xlink:href="#icon-muban"></use>
@@ -7696,7 +7723,8 @@ const importPptxArrayBuffer = async (buffer: ArrayBuffer, fileName?: string): Pr
                 <div class="presentation-menu-item-content">
                   <div class="presentation-menu-item-left">
                     <svg viewBox="0 0 1024 1024" width="14" height="14" fill="currentColor">
-                      <path d="M213.333 170.667h85.334v682.666h-85.334V170.667zm170.667 0l426.667 341.333-426.667 341.333V170.667z" />
+                      <path
+                        d="M213.333 170.667h85.334v682.666h-85.334V170.667zm170.667 0l426.667 341.333-426.667 341.333V170.667z" />
                     </svg>
                     <span>从头开始</span>
                   </div>