@mce/bigesj 0.15.7 → 0.15.8

package/dist/convert/element.d.ts

@@ -1,5 +1,5 @@
 import type { NormalizedElement } from 'modern-idoc';
 import type { BigeElement } from './types';
-export declare function convertElement(el: BigeElement, parent: Record<string, any> | undefined, context?: {
+export declare function convertElement(el: BigeElement, parent?: Record<string, any>, context?: {
     endTime: number;
 }): Promise<NormalizedElement>;

package/dist/index.js

@@ -585,6 +585,24 @@ function parseAnimations(el) {
     animations: animations2.filter((v) => !!v?.keyframes)
   };
 }
+function getStyle(el, clone = false) {
+  let style = el.style ?? el;
+  if (clone) {
+    style = { ...style };
+    delete style.right;
+    delete style.bottom;
+    delete style.backgroundColor;
+    delete style.backgroundImage;
+    delete style.backgroundImageOpacity;
+    delete style.backgroundPosition;
+    delete style.backgroundSize;
+    delete style.backgroundTransform;
+    delete style.backgroundUrl;
+    delete style.elements;
+    delete style.imageTransform;
+  }
+  return style;
+}
 function transformToCropRect(transform, width, height) {
   const {
     imageWidth,
@@ -607,31 +625,44 @@ function transformToCropRect(transform, width, height) {
   };
 }
 function convertBackground(el) {
+  const style = getStyle(el);
   let background;
-  const backgroundColor = el.backgroundColor ?? el.background?.color;
-  if (backgroundColor) {
-    if (isGradient(backgroundColor ?? "")) {
+  const color = el.backgroundColor ?? el.background?.color;
+  if (color) {
+    if (isGradient(color ?? "")) {
       background = {
-        image: backgroundColor
+        image: color
       };
     } else {
       background = {
-        color: backgroundColor
+        color
       };
     }
   }
-  const backgroundImage = el.backgroundImage ?? el.background?.image;
-  if (backgroundImage) {
+  const image = el.backgroundImage ?? el.background?.image;
+  if (image) {
     background = {
-      image: backgroundImage.match(/url\((.+)\)/)?.[1] ?? backgroundImage
+      image: image.match(/url\((.+)\)/)?.[1] ?? image
     };
   }
-  const backgroundTransform = el.backgroundTransform ?? el.background?.transform;
-  if (background && backgroundTransform) {
+  let transform = el.backgroundTransform ?? el.background?.transform;
+  if (!transform && el.imageTransform) {
+    const imageTransform = el.imageTransform;
+    transform = {
+      zoom: imageTransform?.scale || 1,
+      translateX: imageTransform?.translateX || 0,
+      translateY: imageTransform?.translateY || 0,
+      originWidth: imageTransform?.imageWidth,
+      originHeight: imageTransform?.imageHeight,
+      imageWidth: imageTransform?.imageWidth || style.width,
+      imageHeight: imageTransform?.imageHeight || style.height
+    };
+  }
+  if (background && transform) {
     background.cropRect = transformToCropRect(
-      backgroundTransform,
-      el.style.width,
-      el.style.height
+      transform,
+      style.width,
+      style.height
     );
   }
   return background;
@@ -1224,24 +1255,6 @@ function convertSvgLinearGradient(value) {
     return `linear-gradient(${args.join(", ")})`;
   }
 }
-function getStyle(el, clone = false) {
-  let style = el.style ?? el;
-  if (clone) {
-    style = { ...style };
-    delete style.right;
-    delete style.bottom;
-    delete style.backgroundColor;
-    delete style.backgroundImage;
-    delete style.backgroundImageOpacity;
-    delete style.backgroundPosition;
-    delete style.backgroundSize;
-    delete style.backgroundTransform;
-    delete style.backgroundUrl;
-    delete style.elements;
-    delete style.imageTransform;
-  }
-  return style;
-}
 async function convertSvgElementToUrl(el) {
   const {
     id,
@@ -1459,9 +1472,9 @@ async function convertTextContent(el, isByWord = false) {
 }
 const percentageToPx = (per) => (Number.parseFloat(per) || 0) / 100;
 async function convertElement(el, parent, context) {
+  const { children: _children, ...raw } = el;
   const oldStyle = getStyle(el);
   const style = getStyle(el, true);
-  const { children: _children, ...raw } = el;
   const meta = {
     raw,
     inPptIs: "Shape",
@@ -1621,22 +1634,18 @@ async function convertElement(el, parent, context) {
   return element;
 }
 async function convertLayout(layout, isFrame = true, context) {
+  const { elements, ...raw } = layout;
   const id = idGenerator();
   const style = getStyle(layout, true);
   if (isFrame) {
     style.overflow = "hidden";
   }
   const meta = {
+    raw,
     inPptIs: isFrame ? "Slide" : "GroupShape",
     inEditorIs: isFrame ? "Frame" : "Element",
     inCanvasIs: "Element2D"
   };
-  if (layout.id) {
-    meta.rawId = layout.id;
-  }
-  if (layout.name) {
-    meta.rawName = layout.name;
-  }
   return {
     id,
     name: isFrame ? `Frame ${id}` : layout.name,
@@ -1644,7 +1653,7 @@ async function convertLayout(layout, isFrame = true, context) {
     // TODO 过滤掉部分属性
     background: convertBackground(layout),
     children: (await Promise.all(
-      layout.elements.map(async (element) => {
+      elements.map(async (element) => {
         try {
           return await convertElement(element, void 0, context);
         } catch (e) {
@@ -1659,7 +1668,7 @@ async function convertLayout(layout, isFrame = true, context) {
 async function convertDoc(doc, gap = 0) {
   const {
     layouts,
-    metas = {}
+    raw = {}
   } = doc;
   const context = {
     endTime: 0
@@ -1696,14 +1705,14 @@ async function convertDoc(doc, gap = 0) {
   }, { minX: 0, minY: 0, maxX: 0, maxY: 0 });
   return {
     id: idGenerator(),
-    name: metas.name || "doc",
+    name: raw.name || "doc",
     style: {
-      width: metas?.width ?? minmax.maxX - minmax.minX,
-      height: metas?.height ?? minmax.maxY - minmax.minY
+      width: raw?.width ?? minmax.maxX - minmax.minX,
+      height: raw?.height ?? minmax.maxY - minmax.minY
     },
     children,
     meta: {
-      ...metas,
+      raw,
       endTime: context.endTime,
       inEditorIs: "Doc"
     }
@@ -1741,8 +1750,7 @@ function bidTidLoader(editor, api) {
             if (included !== void 0) {
               content.layouts = content.layouts.filter((_, index) => included.includes(index));
             }
-            doc2 = await convertDoc(content);
-            doc2.meta.raw = raw;
+            doc2 = await convertDoc({ ...content, raw });
           }
           maxTime = Math.max(maxTime, doc2.meta?.maxTime ?? 0);
           return doc2;
@@ -1782,9 +1790,7 @@ function bigeLoader() {
         )
       );
       const { content, ...raw } = bigeDoc;
-      const doc = await convertDoc(content);
-      doc.meta.raw = raw;
-      return doc;
+      return await convertDoc({ ...content, raw });
     }
   };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mce/bigesj",
   "type": "module",
-  "version": "0.15.7",
+  "version": "0.15.8",
   "description": "Plugin for mce",
   "author": "wxm",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "modern-openxml": "^1.10.1"
   },
   "devDependencies": {
-    "mce": "0.15.7"
+    "mce": "0.15.8"
   },
   "peerDependencies": {
     "mce": "^0"