@a3s-lab/office 0.38.1 → 0.40.0

package/dist/0~7828.js

@@ -3,7 +3,8 @@ import { directChildren, xmlNamespacePrefix, parseXml, firstDescendant, descenda
 import { normalizePresentationChartDataLabelPosition, normalizePresentationChartDataLabels, normalizePresentationChartSeriesStyle } from "./0~work-presentation-charts.js";
 import { parseXlsxChartSeriesStyle, xlsxChartSeriesMarkerXml, parseXlsxTrendline, isSupportedXlsxChartLegend, isSupportedXlsxChartPlotLayout, isSupportedXlsxChartSeriesFormatting, parseXlsxChartPlotLayout, parseXlsxChartLegend, xlsxChartSeriesShapePropertiesXml, parseXlsxErrorBars } from "./4166.js";
 import { workSpreadsheetChartSupportsErrorBars, workSpreadsheetChartSupportsGrouping, normalizeWorkSpreadsheetChartSmoothLines, workSpreadsheetChartSupportsSeriesAnalysis, normalizeWorkSpreadsheetChartSeriesStyle, normalizeWorkSpreadsheetErrorBars, normalizeWorkSpreadsheetChartOverlap, workSpreadsheetChartUsesNumericXAxis, workSpreadsheetChartSupportsBarSpacing, normalizeWorkSpreadsheetChartLegendOverlay, normalizeWorkSpreadsheetChartGapWidth, normalizeWorkSpreadsheetChartGrouping, workSpreadsheetChartSupportsTrendlines, workSpreadsheetChartSupportsSmoothLines, normalizeWorkSpreadsheetTrendline } from "./8715.js";
-import { normalizeWorkSlideAnimation, createWorkSlideTransition } from "./0~5809.js";
+import { normalizeWorkSlideAnimation, workSlideAnimationClass, workSlideAnimationSequenceIssue } from "./4560.js";
+import { createWorkSlideTransition } from "./0~work-presentation-transition.js";
 const PRESENTATION_NAMESPACE = 'http://schemas.openxmlformats.org/presentationml/2006/main';
 const DRAWING_NAMESPACE = 'http://schemas.openxmlformats.org/drawingml/2006/main';
 const OFFICE_RELATIONSHIPS_NAMESPACE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships';
@@ -922,7 +923,7 @@ function readPptxAnimations(document, elementIdByPptxShapeId) {
         ]
     };
     const animations = [];
-    const animatedElements = new Set();
+    const animatedClasses = new Set();
     const effectNodes = pptxDescendants(timing, 'cTn').filter((node)=>[
             'clickEffect',
             'withEffect',
@@ -933,18 +934,20 @@ function readPptxAnimations(document, elementIdByPptxShapeId) {
         message: "Only the first 256 object animation timing records on a slide are inspected and imported."
     });
     for (const node of effectNodes.slice(0, 256)){
-        if ('entr' !== attribute(node, 'presetClass')) {
+        const presetClass = attribute(node, 'presetClass');
+        if ('entr' !== presetClass && 'exit' !== presetClass) {
             diagnostics.push({
                 code: 'pptx.animation.class',
-                message: 'An emphasis, exit, motion-path, or malformed animation remains in the source PPTX only.'
+                message: 'An emphasis, motion-path, or malformed animation remains in the source PPTX only.'
             });
             continue;
         }
+        const animationClass = 'exit' === presetClass ? 'exit' : 'entrance';
         const targets = Array.from(new Set(pptxDescendants(node, 'spTgt').map((target)=>attribute(target, 'spid')?.trim()).filter((target)=>Boolean(target))));
         if (1 !== targets.length) {
             diagnostics.push({
                 code: 'pptx.animation.target',
-                message: 'An entrance animation with a missing or ambiguous object target was ignored.'
+                message: 'An object animation with a missing or ambiguous target was ignored.'
             });
             continue;
         }
@@ -952,22 +955,23 @@ function readPptxAnimations(document, elementIdByPptxShapeId) {
         if (!elementId) {
             diagnostics.push({
                 code: 'pptx.animation.target',
-                message: 'An entrance animation points to an unavailable slide object and was ignored.'
+                message: 'An object animation points to an unavailable slide object and was ignored.'
             });
             continue;
         }
-        if (animatedElements.has(elementId)) {
+        const animatedClass = `${elementId}\u0000${animationClass}`;
+        if (animatedClasses.has(animatedClass)) {
             diagnostics.push({
                 code: 'pptx.animation.duplicate-target',
-                message: 'Only the first supported entrance animation for an object is editable; additional effects remain in the source PPTX only.'
+                message: `Only the first supported ${animationClass} animation for an object is editable; additional effects remain in the source PPTX only.`
             });
             continue;
         }
-        const effectResult = readPptxAnimationEffect(node);
+        const effectResult = readPptxAnimationEffect(node, animationClass);
         if (!effectResult.effect) {
             diagnostics.push({
                 code: 'pptx.animation.effect',
-                message: 'An entrance animation uses an unsupported or malformed effect and remains in the source PPTX only.'
+                message: 'An entrance or exit animation uses an unsupported or malformed effect and remains in the source PPTX only.'
             });
             continue;
         }
@@ -985,12 +989,22 @@ function readPptxAnimations(document, elementIdByPptxShapeId) {
             delayMs: timingResult.delayMs,
             direction: effectResult.direction
         });
+        if ('overlapping-target' === workSlideAnimationSequenceIssue([
+            ...animations,
+            animation
+        ])) {
+            diagnostics.push({
+                code: 'pptx.animation.overlap',
+                message: 'Overlapping animations for one object in one playback cue remain in the source PPTX only.'
+            });
+            continue;
+        }
         animations.push(animation);
-        animatedElements.add(elementId);
+        animatedClasses.add(animatedClass);
     }
     if (!effectNodes.length) diagnostics.push({
         code: 'pptx.animation.structure',
-        message: 'The slide timing tree does not contain a supported object entrance sequence and remains in the source PPTX only.'
+        message: 'The slide timing tree does not contain a supported object animation sequence and remains in the source PPTX only.'
     });
     return {
         animations,
@@ -1041,30 +1055,35 @@ function clonePptxAnimationElement(document, source) {
     for (const child of Array.from(source.childNodes))element.append(child instanceof Element ? clonePptxAnimationElement(document, child) : document.createTextNode(child.textContent ?? ''));
     return element;
 }
-function readPptxAnimationEffect(node) {
+function readPptxAnimationEffect(node, animationClass) {
     const presetId = attribute(node, 'presetID');
     const animationEffects = pptxDescendants(node, 'animEffect');
+    const expectedTransition = 'exit' === animationClass ? 'out' : 'in';
+    if (animationEffects.some((effect)=>{
+        const transition = attribute(effect, 'transition');
+        return null !== transition && transition !== expectedTransition;
+    })) return {};
     const filters = animationEffects.map((effect)=>attribute(effect, 'filter')?.trim()).filter((filter)=>Boolean(filter));
     const attributes = new Set(pptxDescendants(node, 'attrName').map((name)=>name.textContent?.trim()));
     if (filters.some((filter)=>'fade' === filter)) return {
-        effect: 'fade'
+        effect: 'exit' === animationClass ? 'fade-out' : 'fade'
     };
     for (const filter of filters){
         const direction = directionFromPptxSlideFilter(filter);
         if (direction) return {
-            effect: 'fly-in',
+            effect: 'exit' === animationClass ? 'fly-out' : 'fly-in',
             direction
         };
     }
     if ('23' === presetId || pptxDescendants(node, 'animScale').length > 0 || attributes.has('ppt_w') && attributes.has('ppt_h')) return {
-        effect: 'zoom'
+        effect: 'exit' === animationClass ? 'zoom-out' : 'zoom'
     };
     if ('2' === presetId && (attributes.has('ppt_x') || attributes.has('ppt_y'))) return {
-        effect: 'fly-in',
+        effect: 'exit' === animationClass ? 'fly-out' : 'fly-in',
         direction: directionFromPptxMotion(node)
     };
     if ('1' === presetId && pptxDescendants(node, 'set').length > 0 && 0 === animationEffects.length && 0 === pptxDescendants(node, 'anim').length && 0 === pptxDescendants(node, 'animScale').length) return {
-        effect: 'appear'
+        effect: 'exit' === animationClass ? 'disappear' : 'appear'
     };
     return {};
 }
@@ -1131,7 +1150,7 @@ function pptxAnimationTimingXml(targets) {
         const delay = group.automatic ? '0' : 'indefinite';
         return `<p:par><p:cTn id="${outerId}" fill="hold"><p:stCondLst><p:cond delay="${delay}"/></p:stCondLst><p:childTnLst>${wrappers}</p:childTnLst></p:cTn></p:par>`;
     }).join('');
-    const builds = targets.map(({ spid })=>`<p:bldP spid="${spid}" grpId="0" animBg="1"/>`).join('');
+    const builds = Array.from(new Set(targets.map(({ spid })=>spid))).map((spid)=>`<p:bldP spid="${spid}" grpId="0" animBg="1"/>`).join('');
     return `<p:timing xmlns:p="${PRESENTATIONML_NAMESPACE}"><p:tnLst><p:par><p:cTn id="${rootId}" dur="indefinite" restart="never" nodeType="tmRoot"><p:childTnLst><p:seq concurrent="1" nextAc="seek"><p:cTn id="${mainSequenceId}" dur="indefinite" nodeType="mainSeq"><p:childTnLst>${groupXml}</p:childTnLst></p:cTn><p:prevCondLst><p:cond evt="onPrev" delay="0"><p:tgtEl><p:sldTgt/></p:tgtEl></p:cond></p:prevCondLst><p:nextCondLst><p:cond evt="onNext" delay="0"><p:tgtEl><p:sldTgt/></p:tgtEl></p:cond></p:nextCondLst></p:seq></p:childTnLst></p:cTn></p:par></p:tnLst><p:bldLst>${builds}</p:bldLst></p:timing>`;
 }
 function pptxAnimationGroups(animations) {
@@ -1156,36 +1175,39 @@ function pptxAnimationGroups(animations) {
 }
 function pptxAnimationEffectXml(target, nextId) {
     const animation = normalizeWorkSlideAnimation(target.animation);
+    const animationClass = workSlideAnimationClass(animation.effect);
     const preset = pptxAnimationPreset(animation);
     const leafId = nextId();
     const visibilityId = nextId();
-    const visibility = `<p:set><p:cBhvr><p:cTn id="${visibilityId}" dur="1" fill="hold"><p:stCondLst><p:cond delay="0"/></p:stCondLst></p:cTn><p:tgtEl><p:spTgt spid="${target.spid}"/></p:tgtEl><p:attrNameLst><p:attrName>style.visibility</p:attrName></p:attrNameLst></p:cBhvr><p:to><p:strVal val="visible"/></p:to></p:set>`;
+    const visibilityDelay = 'exit' === animationClass ? Math.max(0, animation.durationMs - 1) : 0;
+    const visibility = `<p:set><p:cBhvr><p:cTn id="${visibilityId}" dur="1" fill="hold"><p:stCondLst><p:cond delay="${visibilityDelay}"/></p:stCondLst></p:cTn><p:tgtEl><p:spTgt spid="${target.spid}"/></p:tgtEl><p:attrNameLst><p:attrName>style.visibility</p:attrName></p:attrNameLst></p:cBhvr><p:to><p:strVal val="${'exit' === animationClass ? 'hidden' : 'visible'}"/></p:to></p:set>`;
     const behavior = pptxAnimationBehaviorXml(animation, target.spid, nextId);
-    return `<p:par><p:cTn id="${leafId}" presetID="${preset.id}" presetClass="entr" presetSubtype="${preset.subtype}" fill="hold" nodeType="${pptxAnimationNodeType(animation.trigger)}" dur="${animation.durationMs}"><p:stCondLst><p:cond delay="${animation.delayMs}"/></p:stCondLst><p:childTnLst>${visibility}${behavior}</p:childTnLst></p:cTn></p:par>`;
+    return `<p:par><p:cTn id="${leafId}" presetID="${preset.id}" presetClass="${'exit' === animationClass ? 'exit' : 'entr'}" presetSubtype="${preset.subtype}" fill="hold" nodeType="${pptxAnimationNodeType(animation.trigger)}" dur="${animation.durationMs}"><p:stCondLst><p:cond delay="${animation.delayMs}"/></p:stCondLst><p:childTnLst>${visibility}${behavior}</p:childTnLst></p:cTn></p:par>`;
 }
 function pptxAnimationBehaviorXml(animation, spid, nextId) {
-    if ('appear' === animation.effect) return '';
-    if ('zoom' === animation.effect) return [
+    const animationClass = workSlideAnimationClass(animation.effect);
+    if ('appear' === animation.effect || 'disappear' === animation.effect) return '';
+    if ('zoom' === animation.effect || 'zoom-out' === animation.effect) return [
         'ppt_w',
         'ppt_h'
     ].map((attributeName)=>{
         const id = nextId();
-        return `<p:anim calcMode="lin" valueType="num"><p:cBhvr><p:cTn id="${id}" dur="${animation.durationMs}" fill="hold"/><p:tgtEl><p:spTgt spid="${spid}"/></p:tgtEl><p:attrNameLst><p:attrName>${attributeName}</p:attrName></p:attrNameLst></p:cBhvr><p:tavLst><p:tav tm="0"><p:val><p:fltVal val="0"/></p:val></p:tav><p:tav tm="100000"><p:val><p:strVal val="#${attributeName}"/></p:val></p:tav></p:tavLst></p:anim>`;
+        return `<p:anim calcMode="lin" valueType="num"><p:cBhvr><p:cTn id="${id}" dur="${animation.durationMs}" fill="hold"/><p:tgtEl><p:spTgt spid="${spid}"/></p:tgtEl><p:attrNameLst><p:attrName>${attributeName}</p:attrName></p:attrNameLst></p:cBhvr>` + ('exit' === animationClass ? `<p:tavLst><p:tav tm="0"><p:val><p:strVal val="#${attributeName}"/></p:val></p:tav><p:tav tm="100000"><p:val><p:fltVal val="0"/></p:val></p:tav></p:tavLst></p:anim>` : `<p:tavLst><p:tav tm="0"><p:val><p:fltVal val="0"/></p:val></p:tav><p:tav tm="100000"><p:val><p:strVal val="#${attributeName}"/></p:val></p:tav></p:tavLst></p:anim>`);
     }).join('');
     const id = nextId();
-    const filter = 'fade' === animation.effect ? 'fade' : pptxSlideFilter(animation.direction ?? 'left');
-    return `<p:animEffect transition="in" filter="${filter}"><p:cBhvr><p:cTn id="${id}" dur="${animation.durationMs}"/><p:tgtEl><p:spTgt spid="${spid}"/></p:tgtEl></p:cBhvr></p:animEffect>`;
+    const filter = 'fade' === animation.effect || 'fade-out' === animation.effect ? 'fade' : pptxSlideFilter(animation.direction ?? 'left');
+    return `<p:animEffect transition="${'exit' === animationClass ? 'out' : 'in'}" filter="${filter}"><p:cBhvr><p:cTn id="${id}" dur="${animation.durationMs}"/><p:tgtEl><p:spTgt spid="${spid}"/></p:tgtEl></p:cBhvr></p:animEffect>`;
 }
 function pptxAnimationPreset(animation) {
-    if ('appear' === animation.effect) return {
+    if ('appear' === animation.effect || 'disappear' === animation.effect) return {
         id: 1,
         subtype: 0
     };
-    if ('fade' === animation.effect) return {
+    if ('fade' === animation.effect || 'fade-out' === animation.effect) return {
         id: 10,
         subtype: 0
     };
-    if ('zoom' === animation.effect) return {
+    if ('zoom' === animation.effect || 'zoom-out' === animation.effect) return {
         id: 23,
         subtype: 16
     };

package/dist/0~document-editor.js

@@ -1170,6 +1170,7 @@ function documentChangeKindLabel(kind) {
     if ('insertion' === kind) return '插入';
     if ('formatting' === kind) return '格式';
     if ('paragraph-formatting' === kind) return '段落格式';
+    if ('numbering' === kind) return '编号格式';
     return '删除';
 }
 function documentChangeWindowKey(change) {