@mce/bigesj 0.13.13 → 0.13.15

package/dist/convert/background.d.ts

@@ -0,0 +1,3 @@
+import type { NormalizedBackground } from 'modern-idoc';
+import type { BigeElement } from './types';
+export declare function convertBackground(el: BigeElement): NormalizedBackground | undefined;

package/dist/convert/element.d.ts

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

package/dist/convert/index.d.ts

@@ -1,7 +1,10 @@
 export * from './animation';
+export * from './background';
 export * from './doc';
 export * from './element';
 export * from './image';
 export * from './layout';
+export * from './style';
 export * from './svg';
 export * from './text';
+export * from './types';

package/dist/convert/layout.d.ts

@@ -1,4 +1,5 @@
 import type { NormalizedElement } from 'modern-idoc';
-export declare function convertLayout(layout: Record<string, any>, isFrame?: boolean, context?: {
+import type { BigeLayout } from './types';
+export declare function convertLayout(layout: BigeLayout, isFrame?: boolean, context?: {
     endTime: number;
 }): Promise<NormalizedElement>;

package/dist/convert/style.d.ts

@@ -0,0 +1 @@
+export declare function getStyle(el: Record<string, any>): any;

package/dist/convert/text.d.ts

@@ -1,7 +1,6 @@
 import type { NormalizedTextContent, StyleObject } from 'modern-idoc';
-type BigeElementText = Record<string, any>;
-export declare function convertTextStyle(el: BigeElementText, isByWord?: boolean): Promise<Partial<StyleObject>>;
-export declare function convertTextEffects(el: BigeElementText): Promise<Partial<StyleObject>[] | undefined>;
-export declare function getTextContents(el: BigeElementText): BigeElementText['contents'];
-export declare function convertTextContent(el: BigeElementText, isByWord?: boolean): Promise<NormalizedTextContent>;
-export {};
+import type { BigeElement } from './types';
+export declare function convertTextStyle(el: BigeElement, isByWord?: boolean): Promise<Partial<StyleObject>>;
+export declare function convertTextEffects(el: BigeElement): Promise<Partial<StyleObject>[] | undefined>;
+export declare function getTextContents(el: BigeElement): BigeElement['contents'];
+export declare function convertTextContent(el: BigeElement, isByWord?: boolean): Promise<NormalizedTextContent>;

package/dist/convert/types.d.ts

@@ -0,0 +1,2 @@
+export type BigeLayout = Record<string, any>;
+export type BigeElement = Record<string, any>;

package/dist/index.js

@@ -1,7 +1,7 @@
 import { useEditor, definePlugin } from "mce";
 import { ref, onBeforeUnmount } from "vue";
 import { createSharedComposable } from "@vueuse/core";
-import { idGenerator, normalizeCRLF, isGradient } from "modern-idoc";
+import { idGenerator, isGradient, normalizeCRLF } from "modern-idoc";
 import { assets } from "modern-canvas";
 import { gunzipSync } from "fflate";
 const bigeFonts = ref([]);
@@ -581,6 +581,28 @@ function parseAnimations(el) {
     animations: animations2.filter((v) => !!v?.keyframes)
   };
 }
+function convertBackground(el) {
+  let background;
+  const backgroundColor = el.backgroundColor ?? el.background?.color;
+  const backgroundImage = el.backgroundImage ?? el.background?.image;
+  if (backgroundColor) {
+    if (isGradient(backgroundColor ?? "")) {
+      background = {
+        image: backgroundColor
+      };
+    } else {
+      background = {
+        color: backgroundColor
+      };
+    }
+  }
+  if (backgroundImage) {
+    background = {
+      image: backgroundImage
+    };
+  }
+  return background;
+}
 async function convertImageElementToUrl(el) {
   const {
     transform = {},
@@ -813,6 +835,9 @@ function getContours(ctx) {
   trace();
   return paths;
 }
+function getStyle(el) {
+  return el.style ?? el;
+}
 async function convertSvgElementToUrl(el) {
   const {
     id,
@@ -870,14 +895,15 @@ async function convertSvgElementToUrl(el) {
 const highlightReferImage = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNzIgNzIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDcyIDcyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggZD0iTTE5LjMsMzguMWMwLjIsMC41LDAuNCwwLjksMC43LDEuNGMwLjIsMC4zLDAuNCwwLjQsMC44LDAuNGMwLjMsMCwwLjUtMC4xLDAuNi0wLjRjMC4xLTAuMywwLjEtMC42LDAuMi0wLjkgICBjMC0wLjIsMC4xLTAuNCwwLjMtMC41YzAuMi0wLjEsMC40LTAuMiwwLjYtMC4xYzAuMiwwLDAuNCwwLjEsMC41LDAuM2MwLjEsMC4yLDAuMiwwLjQsMC4xLDAuNmMtMC4xLDAuNi0wLjIsMS4yLTAuNCwxLjcgICBjLTAuMywwLjgtMC45LDEuMi0xLjcsMS4yYy0wLjksMC0xLjYtMC40LTIuMS0xLjJjLTAuMy0wLjQtMC41LTAuOC0wLjctMS4zYy0wLjQsMC4zLTEsMC42LTEuNywxYy0wLjUsMC4yLTAuOCwwLjEtMS4xLTAuMyAgIGMtMC4yLTAuNS0wLjEtMC45LDAuMy0xLjFjMC43LTAuNCwxLjQtMC44LDEuOS0xLjFjLTAuMi0wLjktMC40LTIuMS0wLjUtMy43TDE1LjksMzRjLTAuMiwwLTAuNCwwLTAuNi0wLjEgICBjLTAuMi0wLjEtMC4zLTAuMy0wLjMtMC41YzAtMC4yLDAtMC40LDAuMi0wLjZzMC4zLTAuMywwLjUtMC4zbDEuMi0wLjFjLTAuMS0wLjktMC4xLTEuOS0wLjEtMi45YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMywwLjZjMCwwLjEsMCwxLDAuMSwyLjdsMy4yLTAuNGMwLjIsMCwwLjQsMCwwLjUsMC4xICAgYzAuMiwwLjEsMC4zLDAuMywwLjMsMC41czAsMC40LTAuMSwwLjVjLTAuMSwwLjItMC4zLDAuMy0wLjUsMC4zbC0zLjMsMC40YzAuMSwxLjIsMC4yLDIuMSwwLjMsMi44YzAuNy0wLjYsMS40LTEuNCwyLTIuMiAgIGMwLjMtMC40LDAuNy0wLjQsMS4xLTAuMmMwLjQsMC4zLDAuNCwwLjcsMC4yLDFDMjEuMywzNi4zLDIwLjQsMzcuMywxOS4zLDM4LjF6IE0yMC42LDMxLjFjLTAuMy0wLjItMC43LTAuNS0xLjEtMC44ICAgYy0wLjMtMC4zLTAuMy0wLjYtMC4xLTAuOWMwLjMtMC4zLDAuNi0wLjQsMS0wLjJjMC40LDAuMiwwLjcsMC41LDEuMSwwLjdjMC40LDAuMywwLjQsMC42LDAuMiwxQzIxLjMsMzEuMywyMSwzMS4zLDIwLjYsMzEuMXogICAgTTIzLjMsMzAuOWMwLTAuMiwwLjEtMC40LDAuMi0wLjVjMC4xLTAuMSwwLjMtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMSwwLjEsMC4yLDAuMywwLjIsMC41djYuNWMwLDAuMi0wLjEsMC40LTAuMiwwLjUgICBjLTAuMSwwLjEtMC4zLDAuMi0wLjYsMC4ycy0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjEtMC4yLTAuMy0wLjItMC41VjMwLjl6IE0yNC4zLDQxLjZjLTAuMiwwLTAuNC0wLjEtMC42LTAuMiAgIGMtMC4yLTAuMS0wLjItMC4zLTAuMi0wLjZjMC0wLjIsMC4xLTAuNCwwLjItMC42YzAuMi0wLjEsMC4zLTAuMiwwLjYtMC4yaDAuOWMwLjYsMCwxLTAuNCwxLTEuMXYtOS40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMiwwLjZWMzljMCwwLjgtMC4yLDEuNS0wLjcsMS45cy0xLjEsMC43LTEuOCwwLjdIMjQuM3oiLz4KCTxwYXRoIGQ9Ik00MC42LDM3LjdoLTMuOHYwLjdoNC40YzAuMSwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNGMwLDAuMS0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yICAgaC00LjR2MC43SDQyYzAuMiwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNHMtMC4xLDAuMy0wLjIsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMkgzMGMtMC4yLDAtMC4zLTAuMS0wLjQtMC4yICAgYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNHMwLjEtMC4zLDAuMi0wLjRjMC4xLTAuMSwwLjItMC4yLDAuNC0wLjJoNS4ydi0wLjdoLTQuNGMtMC4xLDAtMC4zLTAuMS0wLjQtMC4ycy0wLjItMC4yLTAuMi0wLjQgICBjMC0wLjEsMC4xLTAuMywwLjItMC40czAuMi0wLjIsMC40LTAuMmg0LjR2LTAuN2gtMy43aDBjLTAuMiwwLTAuNC0wLjEtMC42LTAuMnMtMC4yLTAuMy0wLjItMC42di0zLjFjMC0wLjIsMC4xLTAuNCwwLjItMC42ICAgYzAuMS0wLjEsMC4zLTAuMiwwLjYtMC4yaDMuOHYtMC44SDMwYy0wLjIsMC0wLjMtMC4xLTAuNC0wLjJjLTAuMS0wLjEtMC4yLTAuMi0wLjItMC40czAuMS0wLjMsMC4yLTAuNGMwLjEtMC4xLDAuMi0wLjIsMC40LTAuMiAgIGg1LjJ2LTAuOGMtMS40LDAtMi45LDAuMS00LjMsMC4xYy0wLjIsMC0wLjMsMC0wLjQtMC4xYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNGMwLTAuMiwwLTAuMywwLjItMC40YzAuMS0wLjEsMC4zLTAuMiwwLjQtMC4yICAgYzMuMywwLDYuOC0wLjEsMTAuMi0wLjNjMC4yLDAsMC4zLDAsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjMsMC4yLDAuNGMwLDAuMiwwLDAuMy0wLjEsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMiAgIGMtMS4xLDAtMi41LDAuMS00LjMsMC4xdjAuOGg1LjFjMC4yLDAsMC4zLDAuMSwwLjQsMC4yYzAuMSwwLjEsMC4yLDAuMiwwLjIsMC40cy0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yaC01LjEgICB2MC44aDMuOGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My4xYzAsMC4yLTAuMSwwLjQtMC4yLDAuNkM0MSwzNy43LDQwLjgsMzcuNyw0MC42LDM3Ljd6IE0zNS4xLDM0LjlWMzQgICBoLTIuOXYwLjlIMzUuMXogTTM1LjEsMzYuN3YtMC45aC0yLjl2MC45SDM1LjF6IE0zOS44LDM0LjlWMzRoLTIuOXYwLjlIMzkuOHogTTM5LjgsMzYuN3YtMC45aC0yLjl2MC45SDM5Ljh6Ii8+Cgk8cGF0aCBkPSJNNDUuNSw0MS4xYy0wLjMsMC40LTAuNywwLjUtMS4xLDAuM2MtMC40LTAuMy0wLjUtMC43LTAuMy0xLjFsMS0xLjdjMC4zLTAuNCwwLjctMC41LDEuMS0wLjNjMC40LDAuMywwLjUsMC43LDAuMywxLjEgICBMNDUuNSw0MS4xeiBNNTUsMzcuN2MtMC4xLDAtMC4xLDAtMC4yLDBoLTguOWMtMC4zLDAtMC41LTAuMS0wLjYtMC4yYy0wLjItMC4yLTAuMi0wLjQtMC4yLTAuNnYtMy40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjEtMC4xLDAuMy0wLjIsMC42LTAuMmgzLjN2LTMuMWMwLTAuMiwwLjEtMC40LDAuMi0wLjZjMC4yLTAuMiwwLjQtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMiwwLjIsMC4yLDAuNCwwLjIsMC42djAuM0g1NiAgIGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZzLTAuMSwwLjQtMC4yLDAuNWMtMC4xLDAuMS0wLjMsMC4yLTAuNiwwLjJoLTUuMnYxLjNoNGMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My40QzU1LjYsMzcuMyw1NS40LDM3LjYsNTUsMzcuN3ogTTUzLjksMzYuMnYtMmgtNy4xdjJINTMuOXogTTQ5LjYsNDAuN2MwLDAuMy0wLjEsMC41LTAuMiwwLjYgICBjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjItMC4yLTAuNC0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMiAgIHMwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTUyLjgsNDAuN2MwLDAuMi0wLjEsMC40LTAuMiwwLjZjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yICAgYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMi0wLjEtMC4yLTAuMy0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTU2LjYsNDAuM2MwLjIsMC40LDAuMSwwLjgtMC4zLDEuMWMtMC41LDAuMy0wLjgsMC4yLTEuMS0wLjNsLTEtMS43Yy0wLjItMC41LTAuMS0wLjgsMC4zLTEuMSAgIGMwLjUtMC4yLDAuOS0wLjEsMS4xLDAuM0w1Ni42LDQwLjN6Ii8+CjwvZz4KPC9zdmc+";
 async function convertTextStyle(el, isByWord = false) {
   const { fetchToText } = useSharedTextAssets();
+  const elStyle = getStyle(el);
   const style = {
-    ...el.style,
+    ...elStyle,
     highlightReferImage,
     listStyleType: "none",
     listStyleImage: "none"
   };
-  if (el.style.fontSize) {
-    style.fontSize = Math.floor(el.style.fontSize);
+  if (elStyle.fontSize) {
+    style.fontSize = Math.floor(elStyle.fontSize);
   }
   if (el.listStyle?.colormap) {
     style.listStyleColormap = el.listStyle?.colormap;
@@ -1030,7 +1056,7 @@ async function convertTextContent(el, isByWord = false) {
 }
 const percentageToPx = (per) => (Number.parseFloat(per) || 0) / 100;
 async function convertElement(el, parent, context) {
-  const style = { ...el.style ?? el };
+  const style = { ...getStyle(el) };
   delete style.bottom;
   delete style.right;
   const { children: _children, ...raw } = el;
@@ -1190,9 +1216,7 @@ async function convertElement(el, parent, context) {
 }
 async function convertLayout(layout, isFrame = true, context) {
   const id = idGenerator();
-  const style = {
-    ...layout.style ?? layout
-  };
+  const style = { ...getStyle(layout) };
   delete style.right;
   delete style.bottom;
   if (isFrame) {
@@ -1208,31 +1232,12 @@ async function convertLayout(layout, isFrame = true, context) {
   if (layout.name) {
     meta.rawName = layout.name;
   }
-  let background;
-  if (layout.background) {
-    if (layout.background.color) {
-      if (isGradient(layout.background.color ?? "")) {
-        background = {
-          image: layout.background.color
-        };
-      } else {
-        background = {
-          color: layout.background.color
-        };
-      }
-    }
-    if (layout.background.image) {
-      background = {
-        image: layout.background.image
-      };
-    }
-  }
   return {
     id,
     name: isFrame ? `Frame ${id}` : layout.name,
     style,
     // TODO 过滤掉部分属性
-    background,
+    background: convertBackground(layout),
     children: (await Promise.all(
       layout.elements.map(async (element) => {
         try {
@@ -1269,7 +1274,7 @@ async function convertDoc(doc, gap = 0) {
       element.style.top = top;
       top += Number(element.style.height) + gap;
     }
-    element.name = `页面 ${index + 1}`;
+    element.name = `画板 ${index + 1}`;
     return element;
   });
   const minmax = children.reduce((child) => {
@@ -1456,6 +1461,7 @@ export {
   bidTidLoader,
   bigeLoader,
   convertAnimation,
+  convertBackground,
   convertDoc,
   convertElement,
   convertImageElementToUrl,
@@ -1465,6 +1471,7 @@ export {
   convertTextEffects,
   convertTextStyle,
   plugin as default,
+  getStyle,
   getTextContents,
   parseAnimations,
   plugin,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mce/bigesj",
   "type": "module",
-  "version": "0.13.13",
+  "version": "0.13.15",
   "description": "Plugin for mce",
   "author": "wxm",
   "license": "MIT",
@@ -48,7 +48,7 @@
     "fflate": "^0.8.2"
   },
   "devDependencies": {
-    "mce": "0.13.13"
+    "mce": "0.13.15"
   },
   "peerDependencies": {
     "mce": "^0"