@mce/bigesj 0.2.2 → 0.2.4

package/dist/convert/text.d.ts

@@ -1,7 +1,7 @@
 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, ctx?: CanvasRenderingContext2D): Promise<Partial<StyleObject>[] | undefined>;
+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 {};

package/dist/index.js

@@ -1,110 +1,110 @@
-import { useEditor as Y, definePlugin as k } from "mce";
-import { Element2D as O } from "modern-canvas";
-import { ref as I, effectScope as v, getCurrentScope as Q, onScopeDispose as X, onBeforeUnmount as G } from "vue";
-import { idGenerator as x, normalizeCRLF as W, isGradient as F } from "modern-idoc";
-import { gunzipSync as P } from "fflate";
-const p = I([]);
-function U(e, o) {
+import { useEditor as k, definePlugin as O } from "mce";
+import { Element2D as v } from "modern-canvas";
+import { ref as D, effectScope as Q, getCurrentScope as X, onScopeDispose as G, onBeforeUnmount as W } from "vue";
+import { idGenerator as h, normalizeCRLF as F, isGradient as P } from "modern-idoc";
+import { gunzipSync as B } from "fflate";
+const C = D([]);
+function J(e, r) {
   const n = [];
-  for (let t = 0; t <= o.length; t++)
+  for (let t = 0; t <= r.length; t++)
     n[t] = [t];
   for (let t = 0; t <= e.length; t++)
     n[0][t] = t;
-  for (let t = 1; t <= o.length; t++)
-    for (let a = 1; a <= e.length; a++) {
-      const s = e[a - 1] === o[t - 1] ? 0 : 1;
-      n[t][a] = Math.min(n[t - 1][a] + 1, n[t][a - 1] + 1, n[t - 1][a - 1] + s);
+  for (let t = 1; t <= r.length; t++)
+    for (let i = 1; i <= e.length; i++) {
+      const o = e[i - 1] === r[t - 1] ? 0 : 1;
+      n[t][i] = Math.min(n[t - 1][i] + 1, n[t][i - 1] + 1, n[t - 1][i - 1] + o);
     }
-  return n[o.length][e.length];
+  return n[r.length][e.length];
 }
-function B() {
+function U() {
   const {
     loadFont: e
-  } = Y(), o = I(/* @__PURE__ */ new Map());
-  async function n(s) {
-    let f = p.value;
-    return f.length || (f = await fetch(s).then((M) => M.json()).then((M) => M.data.datalist), p.value = f), f;
+  } = k(), r = D(/* @__PURE__ */ new Map());
+  async function n(o) {
+    let s = C.value;
+    return s.length || (s = await fetch(o).then((f) => f.json()).then((f) => f.data.datalist), C.value = s), s;
   }
-  function t(s, f = p.value) {
-    const M = new Map(f.map((r, c) => [r.id, c])), L = new Map(
-      f.flatMap((r, c) => [...r.en_name.split(","), ...r.name.split(",")].map((l) => [l, c]))
-    ), d = s.replace(/"/g, "").split(",");
-    let i;
-    if (d.forEach((r) => {
-      i ??= M.get(r), i ??= L.get(r);
-    }), i === void 0) {
-      let r;
+  function t(o, s = C.value) {
+    const f = new Map(s.map((a, c) => [a.id, c])), L = new Map(
+      s.flatMap((a, c) => [...a.en_name.split(","), ...a.name.split(",")].map((l) => [l, c]))
+    ), d = o.replace(/"/g, "").split(",");
+    let M;
+    if (d.forEach((a) => {
+      M ??= f.get(a), M ??= L.get(a);
+    }), M === void 0) {
+      let a;
       d.forEach((c) => {
         let l = c;
         l.endsWith(" R") ? l = `${l.substring(0, l.length - 2)}常规` : l.endsWith(" B") && (l = `${l.substring(0, l.length - 2)}粗体`);
         const w = l.length;
-        L.forEach((m, u) => {
-          const y = U(l, u);
+        L.forEach((u, m) => {
+          const y = J(l, m);
           if (w <= y)
             return;
-          const g = -(y * 0.9 + (u.endsWith("常规") ? 0 : 1) * 0.1);
-          (r === void 0 || g > r) && (r = g, i = m);
+          const j = -(y * 0.9 + (m.endsWith("常规") ? 0 : 1) * 0.1);
+          (a === void 0 || j > a) && (a = j, M = u);
         });
       });
     }
-    return i !== void 0 ? f[i] : void 0;
+    return M !== void 0 ? s[M] : void 0;
   }
-  async function a(s) {
-    const f = typeof s == "string" ? [s] : s, M = [];
-    for (const L of f) {
-      let d = o.value.get(L);
+  async function i(o) {
+    const s = typeof o == "string" ? [o] : o, f = [];
+    for (const L of s) {
+      let d = r.value.get(L);
       if (!d) {
-        const i = t(L);
-        if (i && (d = o.value.get(i.en_name), !d)) {
-          const r = Array.from(
+        const M = t(L);
+        if (M && (d = r.value.get(M.en_name), !d)) {
+          const a = Array.from(
             new Set(
-              [L, i.en_name].filter(Boolean).map((c) => c.replace(/"/g, ""))
+              [L, M.en_name].filter(Boolean).map((c) => c.replace(/"/g, ""))
             )
           );
           d = e({
-            family: r,
-            src: i.fonturl
-          }), r.forEach((c) => o.value.set(c, d)), o.value.set(String(L), d);
+            family: a,
+            src: M.fonturl
+          }), a.forEach((c) => r.value.set(c, d)), r.value.set(String(L), d);
         }
       }
-      d && M.push(d);
+      d && f.push(d);
     }
-    return await Promise.all(M);
+    return await Promise.all(f);
   }
   return {
-    bigeFonts: p,
+    bigeFonts: C,
     searchBigeFont: t,
     loadBigeFonts: n,
-    loadFont: a
+    loadFont: i
   };
 }
-function J(e, o) {
-  return Q() ? (X(e, o), !0) : !1;
+function R(e, r) {
+  return X() ? (G(e, r), !0) : !1;
 }
-const R = typeof window < "u" && typeof document < "u";
+const Z = typeof window < "u" && typeof document < "u";
 typeof WorkerGlobalScope < "u" && globalThis instanceof WorkerGlobalScope;
 // @__NO_SIDE_EFFECTS__
-function Z(e) {
-  if (!R) return e;
-  let o = 0, n, t;
-  const a = () => {
-    o -= 1, t && o <= 0 && (t.stop(), n = void 0, t = void 0);
+function $(e) {
+  if (!Z) return e;
+  let r = 0, n, t;
+  const i = () => {
+    r -= 1, t && r <= 0 && (t.stop(), n = void 0, t = void 0);
   };
-  return ((...s) => (o += 1, t || (t = v(!0), n = t.run(() => e(...s))), J(a), n));
+  return ((...o) => (r += 1, t || (t = Q(!0), n = t.run(() => e(...o))), R(i), n));
 }
-const S = /* @__PURE__ */ Z(() => {
+const I = /* @__PURE__ */ $(() => {
   const e = /* @__PURE__ */ new Map();
-  function o(t, a) {
-    let s = e.get(t);
-    return s || (s = fetch(t).then(a), e.set(t, s)), s;
+  function r(t, i) {
+    let o = e.get(t);
+    return o || (o = fetch(t).then(i), e.set(t, o)), o;
   }
   async function n(t) {
-    return o(t, (a) => a.text());
+    return r(t, (i) => i.text());
   }
   return {
     fetchToText: n
   };
-}), C = {
+}), g = {
   easing: {
     匀速: "linear",
     加速: "cubic-bezier(0.55, 0, 1, 0.45)",
@@ -437,190 +437,179 @@ const S = /* @__PURE__ */ Z(() => {
     ]
   }
 };
-function h(e, o, n) {
+function A(e, r, n) {
   const {
     name: t,
-    delay: a = 0,
-    duration: s,
-    iterations: f,
-    mode: M,
+    delay: i = 0,
+    duration: o,
+    iterations: s,
+    mode: f,
     easing: L,
     path: d,
-    offsetRotate: i,
-    ...r
-  } = o;
+    offsetRotate: M,
+    ...a
+  } = r;
   let c;
   if (t === "自定义路径" && d) {
     let l = `M ${e.style.width / 2} ${e.style.height / 2}`;
-    d.forEach((m) => {
-      const u = Object.keys(m);
-      l += ` ${u[0]}${m[u[0]].join(" ")}`;
+    d.forEach((u) => {
+      const m = Object.keys(u);
+      l += ` ${m[0]}${u[m[0]].join(" ")}`;
     });
     const w = `path("${l}")`;
     switch (n) {
       case "in":
         c = [
-          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: i },
-          { offsetDistance: "0%", offsetPath: w, offsetRotate: i }
+          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: M },
+          { offsetDistance: "0%", offsetPath: w, offsetRotate: M }
         ];
         break;
       case "stay":
         c = [
-          { offsetDistance: "0%", offsetPath: w, offsetRotate: i },
-          { offsetDistance: "100%", offsetPath: w, offsetRotate: i }
+          { offsetDistance: "0%", offsetPath: w, offsetRotate: M },
+          { offsetDistance: "100%", offsetPath: w, offsetRotate: M }
         ];
         break;
       case "out":
         c = [
-          { offsetDistance: "0%", offsetPath: w, offsetRotate: i },
-          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: i }
+          { offsetDistance: "0%", offsetPath: w, offsetRotate: M },
+          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: M }
         ];
         break;
     }
   } else
     switch (n) {
       case "in":
-        c = C.textIn[t]?.[0] ?? C.in[t];
+        c = g.textIn[t]?.[0] ?? g.in[t];
         break;
       case "stay":
-        c = C.stay[t];
+        c = g.stay[t];
         break;
       case "out":
-        c = C.out[t];
+        c = g.out[t];
         break;
     }
   return {
-    id: x(),
-    name: o.name ?? o.title ?? o.id,
-    delay: a,
-    duration: t ? s * (f || 1) : 0,
-    effectMode: M === "逐字" || M === "逐行" ? "sibling" : "parent",
+    id: h(),
+    name: r.name ?? r.title ?? r.id,
+    delay: i,
+    duration: t ? o * (s || 1) : 0,
+    effectMode: f === "逐字" || f === "逐行" ? "sibling" : "parent",
     keyframes: c ?? [],
-    easing: C.easing[L],
+    easing: g.easing[L],
     meta: {
-      ...r,
+      ...a,
       inCanvasIs: "Animation",
       inPptIs: "Animation",
       inEditorIs: "Node"
     }
   };
 }
-function $(e) {
+function H(e) {
   if (!e.animations?.length)
     return {
       delay: 0,
       duration: 0,
       animations: []
     };
-  let o, n, t;
-  e.animations[0].in ? (o = e.animations[0].in, n = e.animations[0].stay, t = e.animations[0].out) : (o = e.animations?.find((M) => M.category === "in"), n = e.animations?.find((M) => M.category === "stay"), t = e.animations?.find((M) => M.category === "out"));
-  const a = o?.delay ?? 0, s = t ? t.delay - a + t.duration : 0, f = [];
-  return o && f.push(
-    h(e, {
-      ...o,
+  let r, n, t;
+  e.animations[0].in ? (r = e.animations[0].in, n = e.animations[0].stay, t = e.animations[0].out) : (r = e.animations?.find((f) => f.category === "in"), n = e.animations?.find((f) => f.category === "stay"), t = e.animations?.find((f) => f.category === "out"));
+  const i = r?.delay ?? 0, o = t ? t.delay - i + t.duration : 0, s = [];
+  return r && s.push(
+    A(e, {
+      ...r,
       delay: 0
     }, "in")
-  ), n && f.push(
-    h(e, {
+  ), n && s.push(
+    A(e, {
       ...n,
-      delay: n.delay - a
+      delay: n.delay - i
     }, "stay")
-  ), t && f.push(
-    h(e, {
+  ), t && s.push(
+    A(e, {
       ...t,
-      delay: t.delay - a
+      delay: t.delay - i
     }, "out")
   ), {
-    delay: a,
-    duration: s - a,
-    animations: f.filter((M) => !!M?.keyframes)
+    delay: i,
+    duration: o - i,
+    animations: s.filter((f) => !!f?.keyframes)
   };
 }
-const H = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNzIgNzIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDcyIDcyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggZD0iTTE5LjMsMzguMWMwLjIsMC41LDAuNCwwLjksMC43LDEuNGMwLjIsMC4zLDAuNCwwLjQsMC44LDAuNGMwLjMsMCwwLjUtMC4xLDAuNi0wLjRjMC4xLTAuMywwLjEtMC42LDAuMi0wLjkgICBjMC0wLjIsMC4xLTAuNCwwLjMtMC41YzAuMi0wLjEsMC40LTAuMiwwLjYtMC4xYzAuMiwwLDAuNCwwLjEsMC41LDAuM2MwLjEsMC4yLDAuMiwwLjQsMC4xLDAuNmMtMC4xLDAuNi0wLjIsMS4yLTAuNCwxLjcgICBjLTAuMywwLjgtMC45LDEuMi0xLjcsMS4yYy0wLjksMC0xLjYtMC40LTIuMS0xLjJjLTAuMy0wLjQtMC41LTAuOC0wLjctMS4zYy0wLjQsMC4zLTEsMC42LTEuNywxYy0wLjUsMC4yLTAuOCwwLjEtMS4xLTAuMyAgIGMtMC4yLTAuNS0wLjEtMC45LDAuMy0xLjFjMC43LTAuNCwxLjQtMC44LDEuOS0xLjFjLTAuMi0wLjktMC40LTIuMS0wLjUtMy43TDE1LjksMzRjLTAuMiwwLTAuNCwwLTAuNi0wLjEgICBjLTAuMi0wLjEtMC4zLTAuMy0wLjMtMC41YzAtMC4yLDAtMC40LDAuMi0wLjZzMC4zLTAuMywwLjUtMC4zbDEuMi0wLjFjLTAuMS0wLjktMC4xLTEuOS0wLjEtMi45YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMywwLjZjMCwwLjEsMCwxLDAuMSwyLjdsMy4yLTAuNGMwLjIsMCwwLjQsMCwwLjUsMC4xICAgYzAuMiwwLjEsMC4zLDAuMywwLjMsMC41czAsMC40LTAuMSwwLjVjLTAuMSwwLjItMC4zLDAuMy0wLjUsMC4zbC0zLjMsMC40YzAuMSwxLjIsMC4yLDIuMSwwLjMsMi44YzAuNy0wLjYsMS40LTEuNCwyLTIuMiAgIGMwLjMtMC40LDAuNy0wLjQsMS4xLTAuMmMwLjQsMC4zLDAuNCwwLjcsMC4yLDFDMjEuMywzNi4zLDIwLjQsMzcuMywxOS4zLDM4LjF6IE0yMC42LDMxLjFjLTAuMy0wLjItMC43LTAuNS0xLjEtMC44ICAgYy0wLjMtMC4zLTAuMy0wLjYtMC4xLTAuOWMwLjMtMC4zLDAuNi0wLjQsMS0wLjJjMC40LDAuMiwwLjcsMC41LDEuMSwwLjdjMC40LDAuMywwLjQsMC42LDAuMiwxQzIxLjMsMzEuMywyMSwzMS4zLDIwLjYsMzEuMXogICAgTTIzLjMsMzAuOWMwLTAuMiwwLjEtMC40LDAuMi0wLjVjMC4xLTAuMSwwLjMtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMSwwLjEsMC4yLDAuMywwLjIsMC41djYuNWMwLDAuMi0wLjEsMC40LTAuMiwwLjUgICBjLTAuMSwwLjEtMC4zLDAuMi0wLjYsMC4ycy0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjEtMC4yLTAuMy0wLjItMC41VjMwLjl6IE0yNC4zLDQxLjZjLTAuMiwwLTAuNC0wLjEtMC42LTAuMiAgIGMtMC4yLTAuMS0wLjItMC4zLTAuMi0wLjZjMC0wLjIsMC4xLTAuNCwwLjItMC42YzAuMi0wLjEsMC4zLTAuMiwwLjYtMC4yaDAuOWMwLjYsMCwxLTAuNCwxLTEuMXYtOS40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMiwwLjZWMzljMCwwLjgtMC4yLDEuNS0wLjcsMS45cy0xLjEsMC43LTEuOCwwLjdIMjQuM3oiLz4KCTxwYXRoIGQ9Ik00MC42LDM3LjdoLTMuOHYwLjdoNC40YzAuMSwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNGMwLDAuMS0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yICAgaC00LjR2MC43SDQyYzAuMiwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNHMtMC4xLDAuMy0wLjIsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMkgzMGMtMC4yLDAtMC4zLTAuMS0wLjQtMC4yICAgYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNHMwLjEtMC4zLDAuMi0wLjRjMC4xLTAuMSwwLjItMC4yLDAuNC0wLjJoNS4ydi0wLjdoLTQuNGMtMC4xLDAtMC4zLTAuMS0wLjQtMC4ycy0wLjItMC4yLTAuMi0wLjQgICBjMC0wLjEsMC4xLTAuMywwLjItMC40czAuMi0wLjIsMC40LTAuMmg0LjR2LTAuN2gtMy43aDBjLTAuMiwwLTAuNC0wLjEtMC42LTAuMnMtMC4yLTAuMy0wLjItMC42di0zLjFjMC0wLjIsMC4xLTAuNCwwLjItMC42ICAgYzAuMS0wLjEsMC4zLTAuMiwwLjYtMC4yaDMuOHYtMC44SDMwYy0wLjIsMC0wLjMtMC4xLTAuNC0wLjJjLTAuMS0wLjEtMC4yLTAuMi0wLjItMC40czAuMS0wLjMsMC4yLTAuNGMwLjEtMC4xLDAuMi0wLjIsMC40LTAuMiAgIGg1LjJ2LTAuOGMtMS40LDAtMi45LDAuMS00LjMsMC4xYy0wLjIsMC0wLjMsMC0wLjQtMC4xYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNGMwLTAuMiwwLTAuMywwLjItMC40YzAuMS0wLjEsMC4zLTAuMiwwLjQtMC4yICAgYzMuMywwLDYuOC0wLjEsMTAuMi0wLjNjMC4yLDAsMC4zLDAsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjMsMC4yLDAuNGMwLDAuMiwwLDAuMy0wLjEsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMiAgIGMtMS4xLDAtMi41LDAuMS00LjMsMC4xdjAuOGg1LjFjMC4yLDAsMC4zLDAuMSwwLjQsMC4yYzAuMSwwLjEsMC4yLDAuMiwwLjIsMC40cy0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yaC01LjEgICB2MC44aDMuOGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My4xYzAsMC4yLTAuMSwwLjQtMC4yLDAuNkM0MSwzNy43LDQwLjgsMzcuNyw0MC42LDM3Ljd6IE0zNS4xLDM0LjlWMzQgICBoLTIuOXYwLjlIMzUuMXogTTM1LjEsMzYuN3YtMC45aC0yLjl2MC45SDM1LjF6IE0zOS44LDM0LjlWMzRoLTIuOXYwLjlIMzkuOHogTTM5LjgsMzYuN3YtMC45aC0yLjl2MC45SDM5Ljh6Ii8+Cgk8cGF0aCBkPSJNNDUuNSw0MS4xYy0wLjMsMC40LTAuNywwLjUtMS4xLDAuM2MtMC40LTAuMy0wLjUtMC43LTAuMy0xLjFsMS0xLjdjMC4zLTAuNCwwLjctMC41LDEuMS0wLjNjMC40LDAuMywwLjUsMC43LDAuMywxLjEgICBMNDUuNSw0MS4xeiBNNTUsMzcuN2MtMC4xLDAtMC4xLDAtMC4yLDBoLTguOWMtMC4zLDAtMC41LTAuMS0wLjYtMC4yYy0wLjItMC4yLTAuMi0wLjQtMC4yLTAuNnYtMy40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjEtMC4xLDAuMy0wLjIsMC42LTAuMmgzLjN2LTMuMWMwLTAuMiwwLjEtMC40LDAuMi0wLjZjMC4yLTAuMiwwLjQtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMiwwLjIsMC4yLDAuNCwwLjIsMC42djAuM0g1NiAgIGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZzLTAuMSwwLjQtMC4yLDAuNWMtMC4xLDAuMS0wLjMsMC4yLTAuNiwwLjJoLTUuMnYxLjNoNGMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My40QzU1LjYsMzcuMyw1NS40LDM3LjYsNTUsMzcuN3ogTTUzLjksMzYuMnYtMmgtNy4xdjJINTMuOXogTTQ5LjYsNDAuN2MwLDAuMy0wLjEsMC41LTAuMiwwLjYgICBjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjItMC4yLTAuNC0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMiAgIHMwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTUyLjgsNDAuN2MwLDAuMi0wLjEsMC40LTAuMiwwLjZjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yICAgYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMi0wLjEtMC4yLTAuMy0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTU2LjYsNDAuM2MwLjIsMC40LDAuMSwwLjgtMC4zLDEuMWMtMC41LDAuMy0wLjgsMC4yLTEuMS0wLjNsLTEtMS43Yy0wLjItMC41LTAuMS0wLjgsMC4zLTEuMSAgIGMwLjUtMC4yLDAuOS0wLjEsMS4xLDAuM0w1Ni42LDQwLjN6Ii8+CjwvZz4KPC9zdmc+";
-async function _(e, o = !1) {
-  const { fetchToText: n } = S(), t = {
+const _ = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNzIgNzIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDcyIDcyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggZD0iTTE5LjMsMzguMWMwLjIsMC41LDAuNCwwLjksMC43LDEuNGMwLjIsMC4zLDAuNCwwLjQsMC44LDAuNGMwLjMsMCwwLjUtMC4xLDAuNi0wLjRjMC4xLTAuMywwLjEtMC42LDAuMi0wLjkgICBjMC0wLjIsMC4xLTAuNCwwLjMtMC41YzAuMi0wLjEsMC40LTAuMiwwLjYtMC4xYzAuMiwwLDAuNCwwLjEsMC41LDAuM2MwLjEsMC4yLDAuMiwwLjQsMC4xLDAuNmMtMC4xLDAuNi0wLjIsMS4yLTAuNCwxLjcgICBjLTAuMywwLjgtMC45LDEuMi0xLjcsMS4yYy0wLjksMC0xLjYtMC40LTIuMS0xLjJjLTAuMy0wLjQtMC41LTAuOC0wLjctMS4zYy0wLjQsMC4zLTEsMC42LTEuNywxYy0wLjUsMC4yLTAuOCwwLjEtMS4xLTAuMyAgIGMtMC4yLTAuNS0wLjEtMC45LDAuMy0xLjFjMC43LTAuNCwxLjQtMC44LDEuOS0xLjFjLTAuMi0wLjktMC40LTIuMS0wLjUtMy43TDE1LjksMzRjLTAuMiwwLTAuNCwwLTAuNi0wLjEgICBjLTAuMi0wLjEtMC4zLTAuMy0wLjMtMC41YzAtMC4yLDAtMC40LDAuMi0wLjZzMC4zLTAuMywwLjUtMC4zbDEuMi0wLjFjLTAuMS0wLjktMC4xLTEuOS0wLjEtMi45YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMywwLjZjMCwwLjEsMCwxLDAuMSwyLjdsMy4yLTAuNGMwLjIsMCwwLjQsMCwwLjUsMC4xICAgYzAuMiwwLjEsMC4zLDAuMywwLjMsMC41czAsMC40LTAuMSwwLjVjLTAuMSwwLjItMC4zLDAuMy0wLjUsMC4zbC0zLjMsMC40YzAuMSwxLjIsMC4yLDIuMSwwLjMsMi44YzAuNy0wLjYsMS40LTEuNCwyLTIuMiAgIGMwLjMtMC40LDAuNy0wLjQsMS4xLTAuMmMwLjQsMC4zLDAuNCwwLjcsMC4yLDFDMjEuMywzNi4zLDIwLjQsMzcuMywxOS4zLDM4LjF6IE0yMC42LDMxLjFjLTAuMy0wLjItMC43LTAuNS0xLjEtMC44ICAgYy0wLjMtMC4zLTAuMy0wLjYtMC4xLTAuOWMwLjMtMC4zLDAuNi0wLjQsMS0wLjJjMC40LDAuMiwwLjcsMC41LDEuMSwwLjdjMC40LDAuMywwLjQsMC42LDAuMiwxQzIxLjMsMzEuMywyMSwzMS4zLDIwLjYsMzEuMXogICAgTTIzLjMsMzAuOWMwLTAuMiwwLjEtMC40LDAuMi0wLjVjMC4xLTAuMSwwLjMtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMSwwLjEsMC4yLDAuMywwLjIsMC41djYuNWMwLDAuMi0wLjEsMC40LTAuMiwwLjUgICBjLTAuMSwwLjEtMC4zLDAuMi0wLjYsMC4ycy0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjEtMC4yLTAuMy0wLjItMC41VjMwLjl6IE0yNC4zLDQxLjZjLTAuMiwwLTAuNC0wLjEtMC42LTAuMiAgIGMtMC4yLTAuMS0wLjItMC4zLTAuMi0wLjZjMC0wLjIsMC4xLTAuNCwwLjItMC42YzAuMi0wLjEsMC4zLTAuMiwwLjYtMC4yaDAuOWMwLjYsMCwxLTAuNCwxLTEuMXYtOS40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMiwwLjZWMzljMCwwLjgtMC4yLDEuNS0wLjcsMS45cy0xLjEsMC43LTEuOCwwLjdIMjQuM3oiLz4KCTxwYXRoIGQ9Ik00MC42LDM3LjdoLTMuOHYwLjdoNC40YzAuMSwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNGMwLDAuMS0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yICAgaC00LjR2MC43SDQyYzAuMiwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNHMtMC4xLDAuMy0wLjIsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMkgzMGMtMC4yLDAtMC4zLTAuMS0wLjQtMC4yICAgYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNHMwLjEtMC4zLDAuMi0wLjRjMC4xLTAuMSwwLjItMC4yLDAuNC0wLjJoNS4ydi0wLjdoLTQuNGMtMC4xLDAtMC4zLTAuMS0wLjQtMC4ycy0wLjItMC4yLTAuMi0wLjQgICBjMC0wLjEsMC4xLTAuMywwLjItMC40czAuMi0wLjIsMC40LTAuMmg0LjR2LTAuN2gtMy43aDBjLTAuMiwwLTAuNC0wLjEtMC42LTAuMnMtMC4yLTAuMy0wLjItMC42di0zLjFjMC0wLjIsMC4xLTAuNCwwLjItMC42ICAgYzAuMS0wLjEsMC4zLTAuMiwwLjYtMC4yaDMuOHYtMC44SDMwYy0wLjIsMC0wLjMtMC4xLTAuNC0wLjJjLTAuMS0wLjEtMC4yLTAuMi0wLjItMC40czAuMS0wLjMsMC4yLTAuNGMwLjEtMC4xLDAuMi0wLjIsMC40LTAuMiAgIGg1LjJ2LTAuOGMtMS40LDAtMi45LDAuMS00LjMsMC4xYy0wLjIsMC0wLjMsMC0wLjQtMC4xYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNGMwLTAuMiwwLTAuMywwLjItMC40YzAuMS0wLjEsMC4zLTAuMiwwLjQtMC4yICAgYzMuMywwLDYuOC0wLjEsMTAuMi0wLjNjMC4yLDAsMC4zLDAsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjMsMC4yLDAuNGMwLDAuMiwwLDAuMy0wLjEsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMiAgIGMtMS4xLDAtMi41LDAuMS00LjMsMC4xdjAuOGg1LjFjMC4yLDAsMC4zLDAuMSwwLjQsMC4yYzAuMSwwLjEsMC4yLDAuMiwwLjIsMC40cy0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yaC01LjEgICB2MC44aDMuOGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My4xYzAsMC4yLTAuMSwwLjQtMC4yLDAuNkM0MSwzNy43LDQwLjgsMzcuNyw0MC42LDM3Ljd6IE0zNS4xLDM0LjlWMzQgICBoLTIuOXYwLjlIMzUuMXogTTM1LjEsMzYuN3YtMC45aC0yLjl2MC45SDM1LjF6IE0zOS44LDM0LjlWMzRoLTIuOXYwLjlIMzkuOHogTTM5LjgsMzYuN3YtMC45aC0yLjl2MC45SDM5Ljh6Ii8+Cgk8cGF0aCBkPSJNNDUuNSw0MS4xYy0wLjMsMC40LTAuNywwLjUtMS4xLDAuM2MtMC40LTAuMy0wLjUtMC43LTAuMy0xLjFsMS0xLjdjMC4zLTAuNCwwLjctMC41LDEuMS0wLjNjMC40LDAuMywwLjUsMC43LDAuMywxLjEgICBMNDUuNSw0MS4xeiBNNTUsMzcuN2MtMC4xLDAtMC4xLDAtMC4yLDBoLTguOWMtMC4zLDAtMC41LTAuMS0wLjYtMC4yYy0wLjItMC4yLTAuMi0wLjQtMC4yLTAuNnYtMy40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjEtMC4xLDAuMy0wLjIsMC42LTAuMmgzLjN2LTMuMWMwLTAuMiwwLjEtMC40LDAuMi0wLjZjMC4yLTAuMiwwLjQtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMiwwLjIsMC4yLDAuNCwwLjIsMC42djAuM0g1NiAgIGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZzLTAuMSwwLjQtMC4yLDAuNWMtMC4xLDAuMS0wLjMsMC4yLTAuNiwwLjJoLTUuMnYxLjNoNGMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My40QzU1LjYsMzcuMyw1NS40LDM3LjYsNTUsMzcuN3ogTTUzLjksMzYuMnYtMmgtNy4xdjJINTMuOXogTTQ5LjYsNDAuN2MwLDAuMy0wLjEsMC41LTAuMiwwLjYgICBjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjItMC4yLTAuNC0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMiAgIHMwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTUyLjgsNDAuN2MwLDAuMi0wLjEsMC40LTAuMiwwLjZjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yICAgYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMi0wLjEtMC4yLTAuMy0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTU2LjYsNDAuM2MwLjIsMC40LDAuMSwwLjgtMC4zLDEuMWMtMC41LDAuMy0wLjgsMC4yLTEuMS0wLjNsLTEtMS43Yy0wLjItMC41LTAuMS0wLjgsMC4zLTEuMSAgIGMwLjUtMC4yLDAuOS0wLjEsMS4xLDAuM0w1Ni42LDQwLjN6Ii8+CjwvZz4KPC9zdmc+";
+async function V(e, r = !1) {
+  const { fetchToText: n } = I(), t = {
     ...e.style,
-    highlightReferImage: H,
+    highlightReferImage: _,
     listStyleType: "none",
     listStyleImage: "none"
   };
-  return e.style.fontSize && (t.fontSize = Math.floor(e.style.fontSize)), e.listStyle?.colormap && (t.listStyleColormap = e.listStyle?.colormap), o || (e.listMode ? t.listStyleType = "disc" : e.listStyle && (t.listStyleImage = await n(e.listStyle.image), t.listStyleSize = `${e.listStyle.size * 100}%`)), e.background?.enabled ? (t.backgroundImage = e.background.image, t.backgroundSize = e.background.size, t.backgroundColormap = e.background.colormap, t.padding = e.background.padding) : t.padding = 0, t;
+  return e.style.fontSize && (t.fontSize = Math.floor(e.style.fontSize)), e.listStyle?.colormap && (t.listStyleColormap = e.listStyle?.colormap), r || (e.listMode ? t.listStyleType = "disc" : e.listStyle && (t.listStyleImage = await n(e.listStyle.image), t.listStyleSize = `${e.listStyle.size * 100}%`)), e.background?.enabled ? (t.backgroundImage = e.background.image, t.backgroundSize = e.background.size, t.backgroundColormap = e.background.colormap, t.padding = e.background.padding) : t.padding = 0, t;
 }
-async function V(e, o) {
-  const n = e.textEffects ?? [];
-  if (n.length)
+async function q(e) {
+  const r = e.textEffects ?? [];
+  if (r.length)
     return await Promise.all(
-      [...n].reverse().map(async (t) => {
-        const a = {}, { offset: s, skew: f, stroke: M, shadow: L, filling: d } = t;
-        if (s && (a.translateX = s.x, a.translateY = s.y), f && (a.skewX = f.x, a.skewY = f.y), M?.color && M.width && (a.textStrokeWidth = M.width, a.textStrokeColor = M.color), L && (a.shadowOffsetX = L.offsetX, a.shadowOffsetY = L.offsetY, a.shadowBlur = L.blur, a.shadowColor = L.color), d) {
-          const { color: i, imageContent: r, gradient: c } = d;
-          if (!r?.image)
-            c ? a.color = `linear-gradient(${90 - c.angle}deg, ${c.stops.map((l) => `${l.color} ${l.offset * 100}%`).join(",")})` : i && (a.color = i);
-          else {
-            const { image: l, repeat: w } = r, m = await fetch(l).then((g) => g.blob()), u = URL.createObjectURL(m), y = await new Promise((g) => {
-              const j = new Image();
-              j.crossOrigin = "anonymous", j.onload = () => g(j), j.src = u;
-            });
-            a.color = o?.createPattern(y, w ? "repeat" : "no-repeat"), URL.revokeObjectURL(u);
-          }
+      [...r].reverse().map(async (n) => {
+        const t = {}, { offset: i, skew: o, stroke: s, shadow: f, filling: L } = n;
+        if (i && (t.translateX = i.x, t.translateY = i.y), o && (t.skewX = o.x, t.skewY = o.y), s?.color && s.width && (t.textStrokeWidth = s.width, t.textStrokeColor = s.color), f && (t.shadowOffsetX = f.offsetX, t.shadowOffsetY = f.offsetY, t.shadowBlur = f.blur, t.shadowColor = f.color), L) {
+          const { color: d, imageContent: M, gradient: a } = L;
+          M?.image || (a ? t.color = `linear-gradient(${90 - a.angle}deg, ${a.stops.map((c) => `${c.color} ${c.offset * 100}%`).join(",")})` : d && (t.color = d));
         }
-        return a;
+        return t;
       })
     );
 }
-function q(e) {
-  return e.version ? e.contents : e.contents.map((o) => {
+function K(e) {
+  return e.version ? e.contents : e.contents.map((r) => {
     let n;
-    return o.map((t, a) => {
-      let s = t.content;
-      s = s.replace(/ |\r\n|\n\r|[\n\r\t\v]/g, " "), s = s.replace(/<br\/>/g, `
+    return r.map((t, i) => {
+      let o = t.content;
+      o = o.replace(/ |\r\n|\n\r|[\n\r\t\v]/g, " "), o = o.replace(/<br\/>/g, `
 `);
-      let f = "";
-      for (const M of Array.from(s))
-        a === 0 && M === " " || n === " " && M === " " || (f += M), n = M;
+      let s = "", f = 0;
+      for (const L of Array.from(o))
+        i === 0 && f === 0 && L === " " || n === " " && L === " " || (s += L), n = L, f++;
       return {
         ...t,
-        content: f
+        content: s
       };
     }).filter((t) => t.content);
   });
 }
-async function K(e, o = !1) {
-  const { fetchToText: n } = S(), t = q(e), a = [];
-  for (let s = 0, f = t.length; s < f; s++) {
-    const M = t[s], L = {
+async function tt(e, r = !1) {
+  const { fetchToText: n } = I(), t = K(e), i = [];
+  for (let o = 0, s = t.length; o < s; o++) {
+    const f = t[o], L = {
       fragments: []
     };
-    a.push(L);
-    for (let d = 0, i = M.length; d < i; d++) {
-      const r = { ...M[d] };
-      r.fontSize && (r.fontSize = Math.floor(r.fontSize)), r.content = W(r.content), r.highlight && (r.highlightImage = await n(r.highlight.image), o ? r.highlightSize = "cover" : r.highlight.size && (r.highlightSize = `${r.highlight.size}rem`), r.highlight.colormap && (r.highlightColormap = r.highlight.colormap), r.highlight.line && (r.highlightLine = r.highlight.line), r.highlight.thickness && (r.highlightThickness = `${r.highlight.thickness}%`), delete r.highlight), o || (r.listMode ? L.listStyleType = "disc" : r.listStyle && (L.listStyleImage = await n(r.listStyle.image), L.listStyleSize = `${r.listStyle.size * 100}%`)), L.fragments.push(r);
+    i.push(L);
+    for (let d = 0, M = f.length; d < M; d++) {
+      const a = {}, c = f[d];
+      for (const w in c)
+        w !== "id" && c[w] !== "" && (a[w] = c[w]);
+      a.fontSize && (a.fontSize = Math.floor(a.fontSize)), a.content = F(a.content), a.highlight && (a.highlightImage = await n(a.highlight.image), r ? a.highlightSize = "cover" : a.highlight.size && (a.highlightSize = `${a.highlight.size}rem`), a.highlight.colormap && (a.highlightColormap = a.highlight.colormap), a.highlight.line && (a.highlightLine = a.highlight.line), a.highlight.thickness && (a.highlightThickness = `${a.highlight.thickness}%`), delete a.highlight), r || (a.listMode ? L.listStyleType = "disc" : a.listStyle && (L.listStyleImage = await n(a.listStyle.image), L.listStyleSize = `${a.listStyle.size * 100}%`));
+      const l = L.fragments[L.fragments.length - 1];
+      l && Object.keys(l).length === 1 && l.content && Object.keys(a).length === 1 && a.content ? l.content += a.content : L.fragments.push(a);
     }
   }
-  return a;
+  return i;
 }
-const A = (e) => (Number.parseFloat(e) || 0) / 100;
-async function z(e, o, n) {
-  const t = e.style ?? e;
-  t.borderRadius && (t.borderRadius = t.borderRadius * 0.01 * Math.max(t.height, t.width)), o && e.groupStyle && (t.width = o.style.width * A(e.groupStyle.width), t.height = o.style.height * A(e.groupStyle.height), t.left = o.style.width * A(e.groupStyle.left), t.top = o.style.height * A(e.groupStyle.top));
-  const a = {
-    id: x(),
+const p = (e) => (Number.parseFloat(e) || 0) / 100;
+async function S(e, r, n) {
+  const t = { ...e.style ?? e }, i = {
+    inPptIs: "Shape",
+    inEditorIs: "Element"
+  }, o = {
+    id: h(),
     name: e.name ?? e.title ?? e.id,
-    style: {
-      // TODO 过滤掉部分属性
-      ...t,
-      visibility: e.editable === !1 ? "hidden" : "visible"
-    },
-    meta: {
-      inPptIs: "Shape",
-      inEditorIs: "Element",
-      lock: e.lock === !0
-    },
+    style: t,
+    meta: i,
     children: []
   };
-  if (e.animations?.length) {
-    const s = $(e);
-    a.delay = s.delay, a.duration = s.duration, a.children.push(...s.animations), n && (s.animations.forEach((f) => {
+  if (t.borderRadius && (t.borderRadius = t.borderRadius * 0.01 * Math.max(t.height, t.width)), r && e.groupStyle && (t.width = r.style.width * p(e.groupStyle.width), t.height = r.style.height * p(e.groupStyle.height), t.left = r.style.width * p(e.groupStyle.left), t.top = r.style.height * p(e.groupStyle.top)), e.editable === !1 && (t.visibility = "hidden"), e.lock === !0 && (i.lock = !0), e.animations?.length) {
+    const s = H(e);
+    o.delay = s.delay, o.duration = s.duration, o.children.push(...s.animations), n && (s.animations.forEach((f) => {
       n.endTime = Math.max(
         n.endTime,
         s.delay + f.delay + f.duration
@@ -629,49 +618,49 @@ async function z(e, o, n) {
   }
   switch (e.type) {
     case "image":
-      if (a.meta.inPptIs = "Picture", a.foreground = {
+      if (i.inPptIs = "Picture", o.foreground = {
         image: e.url,
         fillWithShape: !0
       }, e.maskUrl, e.cropping) {
         const s = e.style.width, f = e.style.height, {
-          imageWidth: M,
-          imageHeight: L,
-          maskWidth: d = s,
-          maskHeight: i = f,
-          translateX: r,
-          translateY: c,
-          zoom: l = 1
-        } = e.cropping, w = M * l, m = L * l, u = (w - d) / 2 - r, y = (m - i) / 2 - c, g = u + d / 2, j = y + i / 2, T = -(s / 2 - g), D = -(f / 2 - j), b = w - (T + s), E = m - (D + f);
-        a.foreground.cropRect = {
-          left: T / w,
-          top: D / m,
-          right: b / w,
-          bottom: E / m
+          imageWidth: L,
+          imageHeight: d,
+          maskWidth: M = s,
+          maskHeight: a = f,
+          translateX: c,
+          translateY: l,
+          zoom: w = 1
+        } = e.cropping, u = L * w, m = d * w, y = (u - M) / 2 - c, j = (m - a) / 2 - l, N = y + M / 2, E = j + a / 2, x = -(s / 2 - N), T = -(f / 2 - E), b = u - (x + s), Y = m - (T + f);
+        o.foreground.cropRect = {
+          left: x / u,
+          top: T / m,
+          right: b / u,
+          bottom: Y / m
         };
       }
       break;
     case "svg": {
-      a.meta.inPptIs = "Picture";
+      i.inPptIs = "Picture";
       let s = e.doc;
-      s || (s = await fetch(e.url).then((f) => f.text())), s = s.replace(new RegExp(`#el-${e.id} `, "gi"), ""), s = s.replace('width="100%"', `width="${t.width * 2}"`), s = s.replace('height="100%"', `height="${t.height * 2}"`), a.foreground = {
+      s || (s = await fetch(e.url).then((f) => f.text())), s = s.replace(new RegExp(`#el-${e.id} `, "gi"), ""), s = s.replace('width="100%"', `width="${t.width * 2}"`), s = s.replace('height="100%"', `height="${t.height * 2}"`), o.foreground = {
         image: `data:image/svg+xml;charset=utf-8,${encodeURIComponent(s)}`,
         fillWithShape: !0
       };
       break;
     }
     case "text": {
-      a.meta.inPptIs = "Shape", t.writingMode === "horizontal-tb" ? a.style.width = Math.ceil(t.width + t.letterSpacing) : a.style.height = Math.ceil(t.height + t.letterSpacing), a.text = {
-        content: await K(e),
-        style: await _(e),
-        effects: await V(e),
+      i.inPptIs = "Shape", t.writingMode === "horizontal-tb" ? t.width = Math.ceil(t.width + t.letterSpacing) : t.height = Math.ceil(t.height + t.letterSpacing), o.text = {
+        content: await tt(e),
+        style: await V(e),
+        effects: await q(e),
         // plugins: [deformation(el.deformation?.type?.endsWith("byWord") ? -1 : 999, () => el.deformation)],
         drawMode: "texture"
       };
       break;
     }
     case "com":
-      a.meta.inPptIs = "GroupShape", a.children = await Promise.all(
-        e.children.map((s) => z(s, e, n))
+      i.inPptIs = "GroupShape", o.children = await Promise.all(
+        e.children.map((s) => S(s, e, n))
       );
       break;
     case "pic":
@@ -699,119 +688,119 @@ async function z(e, o, n) {
       console.warn(e);
       break;
   }
-  return a;
+  return o;
 }
-async function tt(e, o = !0, n) {
-  const t = x(), a = {
+async function et(e, r = !0, n) {
+  const t = h(), i = {
     ...e.style ?? e
   };
-  o && (a.overflow = "hidden");
-  let s;
-  return e.background && (e.background.color && (s ??= {}, F(e.background.color ?? "") ? s.image = e.background.color : s.color = e.background.color), e.background.image && (s ??= {}, s.image = e.background.image)), {
+  r && (i.overflow = "hidden");
+  let o;
+  return e.background && (e.background.color && (o ??= {}, P(e.background.color ?? "") ? o.image = e.background.color : o.color = e.background.color), e.background.image && (o ??= {}, o.image = e.background.image)), {
     id: t,
-    name: o ? `Frame ${t}` : e.name,
-    style: a,
+    name: r ? `Frame ${t}` : e.name,
+    style: i,
     // TODO 过滤掉部分属性
-    background: s,
+    background: o,
     children: await Promise.all(
-      e.elements.map((f) => z(f, void 0, n))
+      e.elements.map((s) => S(s, void 0, n))
     ),
     meta: {
-      inPptIs: o ? "Slide" : "GroupShape",
-      inEditorIs: o ? "Frame" : "Element"
+      inPptIs: r ? "Slide" : "GroupShape",
+      inEditorIs: r ? "Frame" : "Element"
     }
   };
 }
-async function N(e, o = 48) {
+async function z(e, r = 48) {
   const {
     layouts: n,
     metas: t = {}
-  } = e, a = {
+  } = e, i = {
     endTime: 0
   };
-  let s = await Promise.all(
+  let o = await Promise.all(
     n.map(async (L, d) => ({
       index: d,
-      element: await tt(L, !0, a)
+      element: await et(L, !0, i)
     }))
-  ), f = 0;
-  s = s.sort((L, d) => L.index - d.index).map((L, d) => {
-    const i = L.element;
-    return i.style && (i.style.top = f, f += Number(i.style.height) + o), i.name = `Frame ${d + 1}`, i;
+  ), s = 0;
+  o = o.sort((L, d) => L.index - d.index).map((L, d) => {
+    const M = L.element;
+    return M.style && (M.style.top = s, s += Number(M.style.height) + r), M.name = `Frame ${d + 1}`, M;
   });
-  const M = s.reduce((L) => {
-    const d = L.style?.left ?? 0, i = L.style?.top ?? 0, r = L.style?.width ?? 0, c = L.style?.height ?? 0;
+  const f = o.reduce((L) => {
+    const d = L.style?.left ?? 0, M = L.style?.top ?? 0, a = L.style?.width ?? 0, c = L.style?.height ?? 0;
     return {
       minX: d,
-      minY: i,
-      maxX: d + r,
-      maxY: i + c
+      minY: M,
+      maxX: d + a,
+      maxY: M + c
     };
   }, { minX: 0, minY: 0, maxX: 0, maxY: 0 });
   return {
     name: t.name || "doc",
     style: {
-      width: t?.width ?? M.maxX - M.minX,
-      height: t?.height ?? M.maxY - M.minY
+      width: t?.width ?? f.maxX - f.minX,
+      height: t?.height ?? f.maxY - f.minY
     },
-    children: s,
+    children: o,
     meta: {
       ...t,
-      endTime: a.endTime,
+      endTime: i.endTime,
       inEditorIs: "Doc"
     }
   };
 }
-function et(e, o) {
+function at(e, r) {
   const { config: n } = e;
   return {
     name: "bigesj:bidTid",
     test: (t) => typeof t == "object" && t && !!(t.bid || t.tid),
     load: async (t) => {
-      const a = t.bid ?? t.tid ?? "", s = async (i) => await fetch(
-        (t.bid ? o.bid : o.tid).replace("%d", i)
-      ).then((r) => r.json()).then((r) => JSON.parse(r.data.content));
-      let f = 0;
-      const M = await Promise.all(
-        a.split("|").map(async (i) => {
-          let [r, c] = i.split("[");
+      const i = t.bid ?? t.tid ?? "", o = async (M) => await fetch(
+        (t.bid ? r.bid : r.tid).replace("%d", M)
+      ).then((a) => a.json()).then((a) => JSON.parse(a.data.content));
+      let s = 0;
+      const f = await Promise.all(
+        i.split("|").map(async (M) => {
+          let [a, c] = M.split("[");
           c && (c = c.substring(0, c.length - 1));
-          const l = c ? c.split(",").map((u) => Number(u)) : void 0, w = await s(r);
-          l !== void 0 && (w.layouts = w.layouts.filter((u, y) => l.includes(y)));
-          const m = await N(w, n.value.frameGap);
-          return f = Math.max(f, m.meta?.maxTime ?? 0), m;
+          const l = c ? c.split(",").map((m) => Number(m)) : void 0, w = await o(a);
+          l !== void 0 && (w.layouts = w.layouts.filter((m, y) => l.includes(y)));
+          const u = await z(w, n.value.frameGap);
+          return s = Math.max(s, u.meta?.maxTime ?? 0), u;
         })
-      ), L = { ...M[0], id: a, children: [] };
-      L.meta ??= {}, L.meta.maxTime = f, L.meta.inEditorIs = "Doc";
+      ), L = { ...f[0], id: i, children: [] };
+      L.meta ??= {}, L.meta.maxTime = s, L.meta.inEditorIs = "Doc";
       let d = 0;
-      return M.forEach((i) => {
-        let r = 0;
-        i.children?.forEach((c) => {
-          c.style && (c.style.left = d, r = Math.max(r, Number(c.style.width)), L.children.push(c));
-        }), d += r + n.value.frameGap;
+      return f.forEach((M) => {
+        let a = 0;
+        M.children?.forEach((c) => {
+          c.style && (c.style.left = d, a = Math.max(a, Number(c.style.width)), L.children.push(c));
+        }), d += a + n.value.frameGap;
       }), L;
     }
   };
 }
-function at(e) {
-  const { config: o } = e;
+function st(e) {
+  const { config: r } = e;
   return {
     name: "bigesj:bige",
     accept: ".bige",
     test: (n) => n instanceof File && n.name.endsWith(".bige"),
-    load: async (n) => await N(
+    load: async (n) => await z(
       JSON.parse(
         new TextDecoder().decode(
-          P(new Uint8Array(await n.arrayBuffer()))
+          B(new Uint8Array(await n.arrayBuffer()))
         )
       ).content,
-      o.value.frameGap
+      r.value.frameGap
     )
   };
 }
-function Mt(e = {}) {
+function Lt(e = {}) {
   const {
-    font: o,
+    font: r,
     api: n
   } = e, t = {
     fonts: "/new/design/fonts",
@@ -819,55 +808,55 @@ function Mt(e = {}) {
     tid: "/new/design/info/%d",
     ...n
   };
-  return k((a) => ({
+  return O((i) => ({
     name: "bigesj",
     loaders: [
-      at(a),
-      et(a, t)
+      st(i),
+      at(i, t)
     ],
     setup: async () => {
-      o && await st(a, t);
+      r && await rt(i, t);
     }
   }));
 }
-async function st(e, o) {
+async function rt(e, r) {
   const {
     on: n,
     off: t,
-    root: a
+    root: i
   } = e, {
-    loadBigeFonts: s,
-    loadFont: f
-  } = B();
-  function M(i) {
-    i instanceof O && (i.style.fontFamily && f(i.style.fontFamily).then(() => i.text.update()), i.text.content.forEach((r) => {
-      r.fragments.forEach((c) => {
-        c.fontFamily && f(c.fontFamily).then(() => i.text.update());
-      }), r.fontFamily && f(r.fontFamily).then(() => i.text.update());
+    loadBigeFonts: o,
+    loadFont: s
+  } = U();
+  function f(M) {
+    M instanceof v && (M.style.fontFamily && s(M.style.fontFamily).then(() => M.text.update()), M.text.content.forEach((a) => {
+      a.fragments.forEach((c) => {
+        c.fontFamily && s(c.fontFamily).then(() => M.text.update());
+      }), a.fontFamily && s(a.fontFamily).then(() => M.text.update());
     }));
   }
-  function L(i) {
-    i.forEach((r) => {
-      M(r), r.findOne((c) => (M(c), !1));
+  function L(M) {
+    M.forEach((a) => {
+      f(a), a.findOne((c) => (f(c), !1));
     });
   }
   async function d() {
-    a.value && L([a.value]);
+    i.value && L([i.value]);
   }
-  G(() => {
+  W(() => {
     t("setDoc", d), t("addElement", L);
-  }), n("setDoc", d), n("addElement", L), await s(o.fonts);
+  }), n("setDoc", d), n("addElement", L), await o(r.fonts);
 }
 export {
-  et as bidTidLoader,
-  at as bigeLoader,
-  h as convertAnimation,
-  N as convertDoc,
-  z as convertElement,
-  tt as convertLayout,
-  Mt as default,
-  $ as parseAnimations,
-  Mt as plugin,
-  B as useFonts,
-  S as useSharedTextAssets
+  at as bidTidLoader,
+  st as bigeLoader,
+  A as convertAnimation,
+  z as convertDoc,
+  S as convertElement,
+  et as convertLayout,
+  Lt as default,
+  H as parseAnimations,
+  Lt as plugin,
+  U as useFonts,
+  I as useSharedTextAssets
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mce/bigesj",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Plugin for mce",
   "author": "wxm",
   "license": "MIT",
@@ -48,11 +48,11 @@
     "fflate": "^0.8.2"
   },
   "devDependencies": {
-    "modern-canvas": "^0.12.16",
+    "modern-canvas": "^0.12.19",
     "modern-font": "^0.4.4",
-    "modern-idoc": "^0.10.4",
+    "modern-idoc": "^0.10.5",
     "vue": "^3.5.22",
-    "mce": "0.2.2"
+    "mce": "0.2.4"
   },
   "peerDependencies": {
     "mce": "^0"