@mce/bigesj 0.2.6 → 0.11.0

package/dist/index.js

@@ -1,70 +1,70 @@
-import { useEditor as rt, definePlugin as ot } from "mce";
-import { assets as B, Element2D as nt } from "modern-canvas";
+import { useEditor as rt, definePlugin as nt } from "mce";
+import { assets as B, Element2D as ot } from "modern-canvas";
 import { ref as Z, effectScope as it, getCurrentScope as ft, onScopeDispose as ct, onBeforeUnmount as lt } from "vue";
-import { idGenerator as U, normalizeCRLF as Mt, isGradient as dt } from "modern-idoc";
+import { idGenerator as F, normalizeCRLF as Mt, isGradient as dt } from "modern-idoc";
 import { gunzipSync as Lt } from "fflate";
 const X = Z([]);
 function wt(e, r) {
-  const i = [];
+  const o = [];
   for (let t = 0; t <= r.length; t++)
-    i[t] = [t];
+    o[t] = [t];
   for (let t = 0; t <= e.length; t++)
-    i[0][t] = t;
+    o[0][t] = t;
   for (let t = 1; t <= r.length; t++)
     for (let s = 1; s <= e.length; s++) {
-      const o = e[s - 1] === r[t - 1] ? 0 : 1;
-      i[t][s] = Math.min(i[t - 1][s] + 1, i[t][s - 1] + 1, i[t - 1][s - 1] + o);
+      const i = e[s - 1] === r[t - 1] ? 0 : 1;
+      o[t][s] = Math.min(o[t - 1][s] + 1, o[t][s - 1] + 1, o[t - 1][s - 1] + i);
     }
-  return i[r.length][e.length];
+  return o[r.length][e.length];
 }
 function mt() {
   const {
     loadFont: e
   } = rt(), r = Z(/* @__PURE__ */ new Map());
-  async function i(o) {
+  async function o(i) {
     let n = X.value;
-    return n.length || (n = await fetch(o).then((f) => f.json()).then((f) => f.data.datalist), X.value = n), n;
+    return n.length || (n = await fetch(i).then((f) => f.json()).then((f) => f.data.datalist), X.value = n), n;
   }
-  function t(o, n = X.value) {
-    const f = new Map(n.map((a, l) => [a.id, l])), M = new Map(
-      n.flatMap((a, l) => [...a.en_name.split(","), ...a.name.split(",")].map((L) => [L, l]))
-    ), d = o.replace(/"/g, "").split(",");
-    let c;
+  function t(i, n = X.value) {
+    const f = new Map(n.map((a, M) => [a.id, M])), c = new Map(
+      n.flatMap((a, M) => [...a.en_name.split(","), ...a.name.split(",")].map((L) => [L, M]))
+    ), d = i.replace(/"/g, "").split(",");
+    let l;
     if (d.forEach((a) => {
-      c ??= f.get(a), c ??= M.get(a);
-    }), c === void 0) {
+      l ??= f.get(a), l ??= c.get(a);
+    }), l === void 0) {
       let a;
-      d.forEach((l) => {
-        let L = l;
+      d.forEach((M) => {
+        let L = M;
         L.endsWith(" R") ? L = `${L.substring(0, L.length - 2)}常规` : L.endsWith(" B") && (L = `${L.substring(0, L.length - 2)}粗体`);
         const w = L.length;
-        M.forEach((y, m) => {
-          const C = wt(L, m);
+        c.forEach((h, u) => {
+          const C = wt(L, u);
           if (w <= C)
             return;
-          const j = -(C * 0.9 + (m.endsWith("常规") ? 0 : 1) * 0.1);
-          (a === void 0 || j > a) && (a = j, c = y);
+          const m = -(C * 0.9 + (u.endsWith("常规") ? 0 : 1) * 0.1);
+          (a === void 0 || m > a) && (a = m, l = h);
         });
       });
     }
-    return c !== void 0 ? n[c] : void 0;
+    return l !== void 0 ? n[l] : void 0;
   }
-  async function s(o) {
-    const n = typeof o == "string" ? [o] : o, f = [];
-    for (const M of n) {
-      let d = r.value.get(M);
+  async function s(i) {
+    const n = typeof i == "string" ? [i] : i, f = [];
+    for (const c of n) {
+      let d = r.value.get(c);
       if (!d) {
-        const c = t(M);
-        if (c && (d = r.value.get(c.en_name), !d)) {
+        const l = t(c);
+        if (l && (d = r.value.get(l.en_name), !d)) {
           const a = Array.from(
             new Set(
-              [M, c.en_name].filter(Boolean).map((l) => l.replace(/"/g, ""))
+              [c, l.en_name].filter(Boolean).map((M) => M.replace(/"/g, ""))
             )
           );
           d = e({
             family: a,
-            src: c.fonturl
-          }), a.forEach((l) => r.value.set(l, d)), r.value.set(String(M), d);
+            src: l.fonturl
+          }), a.forEach((M) => r.value.set(M, d)), r.value.set(String(c), d);
         }
       }
       d && f.push(d);
@@ -74,7 +74,7 @@ function mt() {
   return {
     bigeFonts: X,
     searchBigeFont: t,
-    loadBigeFonts: i,
+    loadBigeFonts: o,
     loadFont: s
   };
 }
@@ -86,23 +86,23 @@ typeof WorkerGlobalScope < "u" && globalThis instanceof WorkerGlobalScope;
 // @__NO_SIDE_EFFECTS__
 function yt(e) {
   if (!gt) return e;
-  let r = 0, i, t;
+  let r = 0, o, t;
   const s = () => {
-    r -= 1, t && r <= 0 && (t.stop(), i = void 0, t = void 0);
+    r -= 1, t && r <= 0 && (t.stop(), o = void 0, t = void 0);
   };
-  return ((...o) => (r += 1, t || (t = it(!0), i = t.run(() => e(...o))), ut(s), i));
+  return ((...i) => (r += 1, t || (t = it(!0), o = t.run(() => e(...i))), ut(s), o));
 }
 const _ = /* @__PURE__ */ yt(() => {
   const e = /* @__PURE__ */ new Map();
   function r(t, s) {
-    let o = e.get(t);
-    return o || (o = fetch(t).then(s), e.set(t, o)), o;
+    let i = e.get(t);
+    return i || (i = fetch(t).then(s), e.set(t, i)), i;
   }
-  async function i(t) {
+  async function o(t) {
     return r(t, (s) => s.text());
   }
   return {
-    fetchToText: i
+    fetchToText: o
   };
 }), Y = {
   easing: {
@@ -437,66 +437,66 @@ const _ = /* @__PURE__ */ yt(() => {
     ]
   }
 };
-function G(e, r, i) {
+function U(e, r, o) {
   const {
     name: t,
     delay: s = 0,
-    duration: o,
+    duration: i,
     iterations: n,
     mode: f,
-    easing: M,
+    easing: c,
     path: d,
-    offsetRotate: c,
+    offsetRotate: l,
     ...a
   } = r;
-  let l;
+  let M;
   if (t === "自定义路径" && d) {
     let L = `M ${e.style.width / 2} ${e.style.height / 2}`;
-    d.forEach((y) => {
-      const m = Object.keys(y);
-      L += ` ${m[0]}${y[m[0]].join(" ")}`;
+    d.forEach((h) => {
+      const u = Object.keys(h);
+      L += ` ${u[0]}${h[u[0]].join(" ")}`;
     });
     const w = `path("${L}")`;
-    switch (i) {
+    switch (o) {
       case "in":
-        l = [
-          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: c },
-          { offsetDistance: "0%", offsetPath: w, offsetRotate: c }
+        M = [
+          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: l },
+          { offsetDistance: "0%", offsetPath: w, offsetRotate: l }
         ];
         break;
       case "stay":
-        l = [
-          { offsetDistance: "0%", offsetPath: w, offsetRotate: c },
-          { offsetDistance: "100%", offsetPath: w, offsetRotate: c }
+        M = [
+          { offsetDistance: "0%", offsetPath: w, offsetRotate: l },
+          { offsetDistance: "100%", offsetPath: w, offsetRotate: l }
         ];
         break;
       case "out":
-        l = [
-          { offsetDistance: "0%", offsetPath: w, offsetRotate: c },
-          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: c }
+        M = [
+          { offsetDistance: "0%", offsetPath: w, offsetRotate: l },
+          { opacity: 0, offsetDistance: "100%", offsetPath: w, offsetRotate: l }
         ];
         break;
     }
   } else
-    switch (i) {
+    switch (o) {
       case "in":
-        l = Y.textIn[t]?.[0] ?? Y.in[t];
+        M = Y.textIn[t]?.[0] ?? Y.in[t];
         break;
       case "stay":
-        l = Y.stay[t];
+        M = Y.stay[t];
         break;
       case "out":
-        l = Y.out[t];
+        M = Y.out[t];
         break;
     }
   return {
-    id: U(),
+    id: F(),
     name: r.name ?? r.title ?? r.id,
     delay: s,
-    duration: t ? o * (n || 1) : 0,
+    duration: t ? i * (n || 1) : 0,
     effectMode: f === "逐字" || f === "逐行" ? "sibling" : "parent",
-    keyframes: l ?? [],
-    easing: Y.easing[M],
+    keyframes: M ?? [],
+    easing: Y.easing[c],
     meta: {
       ...a,
       inCanvasIs: "Animation",
@@ -512,79 +512,79 @@ function jt(e) {
       duration: 0,
       animations: []
     };
-  let r, i, t;
-  e.animations[0].in ? (r = e.animations[0].in, i = e.animations[0].stay, t = e.animations[0].out) : (r = e.animations?.find((f) => f.category === "in"), i = e.animations?.find((f) => f.category === "stay"), t = e.animations?.find((f) => f.category === "out"));
-  const s = r?.delay ?? 0, o = t ? t.delay - s + t.duration : 0, n = [];
+  let r, o, t;
+  e.animations[0].in ? (r = e.animations[0].in, o = e.animations[0].stay, t = e.animations[0].out) : (r = e.animations?.find((f) => f.category === "in"), o = e.animations?.find((f) => f.category === "stay"), t = e.animations?.find((f) => f.category === "out"));
+  const s = r?.delay ?? 0, i = t ? t.delay - s + t.duration : 0, n = [];
   return r && n.push(
-    G(e, {
+    U(e, {
       ...r,
       delay: 0
     }, "in")
-  ), i && n.push(
-    G(e, {
-      ...i,
-      delay: i.delay - s
+  ), o && n.push(
+    U(e, {
+      ...o,
+      delay: o.delay - s
     }, "stay")
   ), t && n.push(
-    G(e, {
+    U(e, {
       ...t,
       delay: t.delay - s
     }, "out")
   ), {
     delay: s,
-    duration: o - s,
+    duration: i - s,
     animations: n.filter((f) => !!f?.keyframes)
   };
 }
 async function V(e) {
   const {
     transform: r = {},
-    style: i = {},
+    style: o = {},
     maskUrl: t,
     imageEffects: s = [],
-    imageEffectsRatio: o = 1
+    imageEffectsRatio: i = 1
   } = e, n = e.clipUrl || e.url, {
     translateX: f = 0,
-    translateY: M = 0,
+    translateY: c = 0,
     zoom: d = 1
   } = r ?? {}, {
-    scaleX: c = 1,
+    scaleX: l = 1,
     scaleY: a = 1,
-    filter: l
-  } = i;
-  if (f === 0 && M === 0 && d === 1 && c === 1 && a === 1 && !t && !l && !s.length)
+    filter: M
+  } = o;
+  if (f === 0 && c === 0 && d === 1 && l === 1 && a === 1 && !t && !M && !s.length)
     return n;
   const L = await B.fetchImageBitmap(n), {
     originWidth: w = L.width,
-    originHeight: y = L.height,
-    imageWidth: m = w,
-    imageHeight: C = y
+    originHeight: h = L.height,
+    imageWidth: u = w,
+    imageHeight: C = h
   } = r, {
-    width: j = w,
-    height: h = y
-  } = i, D = window.devicePixelRatio || 1, [g, u] = W(j, h, D);
-  if (l && (u.filter = l), u.scale(c, a), u.translate(c < 0 ? -j : 0, a < 0 ? -h : 0), t) {
-    const T = await B.fetchImageBitmap(t);
-    u.drawImage(T, 0, 0, T.width, T.height, 0, 0, j, h), T.close(), u.globalCompositeOperation = "source-in";
+    width: m = w,
+    height: g = h
+  } = o, T = window.devicePixelRatio || 1, [j, y] = W(m, g, T);
+  if (M && (y.filter = M), y.scale(l, a), y.translate(l < 0 ? -m : 0, a < 0 ? -g : 0), t) {
+    const D = await B.fetchImageBitmap(t);
+    y.drawImage(D, 0, 0, D.width, D.height, 0, 0, m, g), D.close(), y.globalCompositeOperation = "source-in";
   }
-  const A = m * d, k = C * d, tt = -(A / 2 - m / 2) + f, et = -(k / 2 - C / 2) + M;
-  if (u.drawImage(L, 0, 0, L.width, L.height, tt, et, A, k), L.close(), u.globalCompositeOperation = "source-over", s.length > 0) {
+  const A = u * d, k = C * d, tt = -(A / 2 - u / 2) + f, et = -(k / 2 - C / 2) + c;
+  if (y.drawImage(L, 0, 0, L.width, L.height, tt, et, A, k), L.close(), y.globalCompositeOperation = "source-over", s.length > 0) {
     const S = {
-      x: (j - j * 0.9) / 2,
-      y: (h - h * 0.9) / 2
-    }, v = await createImageBitmap(g);
-    u.clearRect(0, 0, g.width, g.height), u.scale(0.9, 0.9);
-    for (let F = s.length - 1; F >= 0; F--) {
-      const { filling: E, offset: R, stroke: at } = s[F];
+      x: (m - m * 0.9) / 2,
+      y: (g - g * 0.9) / 2
+    }, v = await createImageBitmap(j);
+    y.clearRect(0, 0, j.width, j.height), y.scale(0.9, 0.9);
+    for (let G = s.length - 1; G >= 0; G--) {
+      const { filling: b, offset: R, stroke: at } = s[G];
       let z = v;
-      if (E) {
-        const [I, x] = W(j, h, D);
-        if (x.drawImage(z, 0, 0, j, h), x.globalCompositeOperation = "source-in", E.color) {
-          const [p, N] = W(j, h, D);
-          N.fillStyle = E.color, N.fillRect(0, 0, j, h), x.drawImage(p, 0, 0, j, h);
-        } else if (E.imageContent?.image) {
-          const p = await B.fetchImageBitmap(E.imageContent.image);
-          x.drawImage(p, 0, 0, j, h), p.close();
+      if (b) {
+        const [I, x] = W(m, g, T);
+        if (x.drawImage(z, 0, 0, m, g), x.globalCompositeOperation = "source-in", b.color) {
+          const [p, N] = W(m, g, T);
+          N.fillStyle = b.color, N.fillRect(0, 0, m, g), x.drawImage(p, 0, 0, m, g);
+        } else if (b.imageContent?.image) {
+          const p = await B.fetchImageBitmap(b.imageContent.image);
+          x.drawImage(p, 0, 0, m, g), p.close();
         }
         z = I;
       }
@@ -593,39 +593,39 @@ async function V(e) {
           const [, J] = W(N.width, N.height);
           J.drawImage(N, 0, 0);
           const st = Ct(J), $ = O.thickness, H = O.thickness;
-          p.strokeStyle = O.color, p.lineWidth = O.thickness * 2, p.lineJoin = "round", st.forEach((b) => {
-            p.beginPath(), p.moveTo($ + b[0].x, H + b[1].y);
-            for (let Q = 1; Q < b.length; Q++)
-              p.lineTo($ + b[Q].x, H + b[Q].y);
+          p.strokeStyle = O.color, p.lineWidth = O.thickness * 2, p.lineJoin = "round", st.forEach((E) => {
+            p.beginPath(), p.moveTo($ + E[0].x, H + E[1].y);
+            for (let Q = 1; Q < E.length; Q++)
+              p.lineTo($ + E[Q].x, H + E[Q].y);
             p.closePath();
           }), p.stroke();
         }).make(z, {
           color: x,
-          thickness: I / 50 * o
+          thickness: I / 50 * i
         });
       }), R) {
         let { x: I, y: x } = R;
-        I = I / 50 * o * 200, x = x / 50 * o * 200, u.drawImage(z, I + S.x, x + S.y, j, h);
+        I = I / 50 * i * 200, x = x / 50 * i * 200, y.drawImage(z, I + S.x, x + S.y, m, g);
       } else
-        u.drawImage(z, S.x, S.y, j, h);
+        y.drawImage(z, S.x, S.y, m, g);
     }
     v.close();
   }
-  return await new Promise((T) => {
-    g.toBlob((S) => {
+  return await new Promise((D) => {
+    j.toBlob((S) => {
       try {
-        T(URL.createObjectURL(S));
+        D(URL.createObjectURL(S));
       } catch (v) {
-        console.error(`Failed to URL.createObjectURL, url: ${n}`, v), T(n);
+        console.error(`Failed to URL.createObjectURL, url: ${n}`, v), D(n);
       }
     });
   });
 }
-function W(e, r, i = 1) {
+function W(e, r, o = 1) {
   const t = document.createElement("canvas");
-  t.width = e * i, t.height = r * i, t.style.width = `${e}px`, t.style.height = `${r}px`;
+  t.width = e * o, t.height = r * o, t.style.width = `${e}px`, t.style.height = `${r}px`;
   const s = t.getContext("2d");
-  return s.scale(i, i), [t, s];
+  return s.scale(o, o), [t, s];
 }
 class ht {
   canvas = document.createElement("canvas");
@@ -633,65 +633,65 @@ class ht {
   use(r) {
     return this.method = r, this;
   }
-  make(r, i) {
-    const { canvas: t } = this, s = this.canvas.getContext("2d"), o = i.thickness * 2, [n, f] = [r.width, r.height].map((M) => M + o);
-    return (n !== t.width || f !== t.height) && (t.width = n, t.height = f), s.clearRect(0, 0, s.canvas.width, s.canvas.height), this.method(s, r, i), s.drawImage(r, i.thickness, i.thickness), t;
+  make(r, o) {
+    const { canvas: t } = this, s = this.canvas.getContext("2d"), i = o.thickness * 2, [n, f] = [r.width, r.height].map((c) => c + i);
+    return (n !== t.width || f !== t.height) && (t.width = n, t.height = f), s.clearRect(0, 0, s.canvas.width, s.canvas.height), this.method(s, r, o), s.drawImage(r, o.thickness, o.thickness), t;
   }
 }
 function Ct(e) {
-  const t = e.canvas.width, s = e.canvas.height, o = [];
+  const t = e.canvas.width, s = e.canvas.height, i = [];
   let n = 3;
   const f = 100;
   return (() => {
-    const d = [], c = new Uint32Array(e.getImageData(0, 0, t, s).data.buffer);
-    let a, l, L, w, y = -1, m, C = 9;
-    const j = [9, 0, 3, 3, 2, 0, 9, 3, 1, 9, 1, 1, 2, 0, 2, 9];
-    function h(g, u) {
-      return g >= 0 && u >= 0 && g < t && u < s ? c[u * t + g] >>> 24 > f : !1;
+    const d = [], l = new Uint32Array(e.getImageData(0, 0, t, s).data.buffer);
+    let a, M, L, w, h = -1, u, C = 9;
+    const m = [9, 0, 3, 3, 2, 0, 9, 3, 1, 9, 1, 1, 2, 0, 2, 9];
+    function g(j, y) {
+      return j >= 0 && y >= 0 && j < t && y < s ? l[y * t + j] >>> 24 > f : !1;
     }
-    function D(g, u) {
+    function T(j, y) {
       let A = 0;
-      return h(g - 1, u - 1) && (A += 1), h(g, u - 1) && (A += 2), h(g - 1, u) && (A += 4), h(g, u) && (A += 8), A === 6 ? C === 0 ? 2 : 3 : A === 9 ? C === 3 ? 0 : 1 : j[A];
+      return g(j - 1, y - 1) && (A += 1), g(j, y - 1) && (A += 2), g(j - 1, y) && (A += 4), g(j, y) && (A += 8), A === 6 ? C === 0 ? 2 : 3 : A === 9 ? C === 3 ? 0 : 1 : m[A];
     }
-    for (let g = n; g < c.length; g++)
-      if (c[g] >>> 24 > f) {
-        y = n = g;
+    for (let j = n; j < l.length; j++)
+      if (l[j] >>> 24 > f) {
+        h = n = j;
         break;
       }
-    if (y >= 0) {
-      a = L = y % t, l = w = Math.floor(y / t);
+    if (h >= 0) {
+      a = L = h % t, M = w = Math.floor(h / t);
       do
-        m = D(a, l), m === 0 ? l-- : m === 1 ? l++ : m === 2 ? a-- : m === 3 && a++, m !== C && (d.push({ x: a + 0, y: l + 0 }), C = m);
-      while (a !== L || l !== w);
+        u = T(a, M), u === 0 ? M-- : u === 1 ? M++ : u === 2 ? a-- : u === 3 && a++, u !== C && (d.push({ x: a + 0, y: M + 0 }), C = u);
+      while (a !== L || M !== w);
     }
-    return o.push(d), d;
-  })(), o;
+    return i.push(d), d;
+  })(), i;
 }
 async function pt(e) {
   const {
     id: r,
-    doc: i,
+    doc: o,
     url: t,
     style: s = {},
-    background: o = {}
+    background: i = {}
   } = e;
-  let n = i;
-  n || (n = await fetch(t).then((M) => M.text()));
+  let n = o;
+  n || (n = await fetch(t).then((c) => c.text()));
   const f = new DOMParser().parseFromString(
     n.replace(new RegExp(`#el-${r} `, "gi"), "").replace(/data-colors\s/, " ").replace(/[a-z-]+="([^\s<]*<\S*)"/gi, ""),
     "image/svg+xml"
   ).documentElement;
   if (!(f instanceof SVGElement))
     throw new TypeError(`Failed to DOMParser, parse svg to DOM error: ${n}`);
-  if (o.src) {
-    const M = `#${r}-fill-blip`, d = f.querySelector(M), c = d?.querySelector("image");
-    if (d && c)
+  if (i.src) {
+    const c = `#${r}-fill-blip`, d = f.querySelector(c), l = d?.querySelector("image");
+    if (d && l)
       try {
-        const a = await B.fetchImageBitmap(o.src).then((l) => {
+        const a = await B.fetchImageBitmap(i.src).then((M) => {
           const L = document.createElement("canvas");
-          return L.width = l.width, L.height = l.height, L.getContext("2d")?.drawImage(l, 0, 0), l.close(), L.toDataURL("image/png");
+          return L.width = M.width, L.height = M.height, L.getContext("2d")?.drawImage(M, 0, 0), M.close(), L.toDataURL("image/png");
         });
-        c?.setAttribute("href", a), d?.setAttribute("fill", M);
+        l?.setAttribute("href", a), d?.setAttribute("fill", c);
       } catch (a) {
         console.error(a);
       }
@@ -708,23 +708,23 @@ async function pt(e) {
 }
 const At = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNzIgNzIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDcyIDcyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggZD0iTTE5LjMsMzguMWMwLjIsMC41LDAuNCwwLjksMC43LDEuNGMwLjIsMC4zLDAuNCwwLjQsMC44LDAuNGMwLjMsMCwwLjUtMC4xLDAuNi0wLjRjMC4xLTAuMywwLjEtMC42LDAuMi0wLjkgICBjMC0wLjIsMC4xLTAuNCwwLjMtMC41YzAuMi0wLjEsMC40LTAuMiwwLjYtMC4xYzAuMiwwLDAuNCwwLjEsMC41LDAuM2MwLjEsMC4yLDAuMiwwLjQsMC4xLDAuNmMtMC4xLDAuNi0wLjIsMS4yLTAuNCwxLjcgICBjLTAuMywwLjgtMC45LDEuMi0xLjcsMS4yYy0wLjksMC0xLjYtMC40LTIuMS0xLjJjLTAuMy0wLjQtMC41LTAuOC0wLjctMS4zYy0wLjQsMC4zLTEsMC42LTEuNywxYy0wLjUsMC4yLTAuOCwwLjEtMS4xLTAuMyAgIGMtMC4yLTAuNS0wLjEtMC45LDAuMy0xLjFjMC43LTAuNCwxLjQtMC44LDEuOS0xLjFjLTAuMi0wLjktMC40LTIuMS0wLjUtMy43TDE1LjksMzRjLTAuMiwwLTAuNCwwLTAuNi0wLjEgICBjLTAuMi0wLjEtMC4zLTAuMy0wLjMtMC41YzAtMC4yLDAtMC40LDAuMi0wLjZzMC4zLTAuMywwLjUtMC4zbDEuMi0wLjFjLTAuMS0wLjktMC4xLTEuOS0wLjEtMi45YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMywwLjZjMCwwLjEsMCwxLDAuMSwyLjdsMy4yLTAuNGMwLjIsMCwwLjQsMCwwLjUsMC4xICAgYzAuMiwwLjEsMC4zLDAuMywwLjMsMC41czAsMC40LTAuMSwwLjVjLTAuMSwwLjItMC4zLDAuMy0wLjUsMC4zbC0zLjMsMC40YzAuMSwxLjIsMC4yLDIuMSwwLjMsMi44YzAuNy0wLjYsMS40LTEuNCwyLTIuMiAgIGMwLjMtMC40LDAuNy0wLjQsMS4xLTAuMmMwLjQsMC4zLDAuNCwwLjcsMC4yLDFDMjEuMywzNi4zLDIwLjQsMzcuMywxOS4zLDM4LjF6IE0yMC42LDMxLjFjLTAuMy0wLjItMC43LTAuNS0xLjEtMC44ICAgYy0wLjMtMC4zLTAuMy0wLjYtMC4xLTAuOWMwLjMtMC4zLDAuNi0wLjQsMS0wLjJjMC40LDAuMiwwLjcsMC41LDEuMSwwLjdjMC40LDAuMywwLjQsMC42LDAuMiwxQzIxLjMsMzEuMywyMSwzMS4zLDIwLjYsMzEuMXogICAgTTIzLjMsMzAuOWMwLTAuMiwwLjEtMC40LDAuMi0wLjVjMC4xLTAuMSwwLjMtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMSwwLjEsMC4yLDAuMywwLjIsMC41djYuNWMwLDAuMi0wLjEsMC40LTAuMiwwLjUgICBjLTAuMSwwLjEtMC4zLDAuMi0wLjYsMC4ycy0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjEtMC4yLTAuMy0wLjItMC41VjMwLjl6IE0yNC4zLDQxLjZjLTAuMiwwLTAuNC0wLjEtMC42LTAuMiAgIGMtMC4yLTAuMS0wLjItMC4zLTAuMi0wLjZjMC0wLjIsMC4xLTAuNCwwLjItMC42YzAuMi0wLjEsMC4zLTAuMiwwLjYtMC4yaDAuOWMwLjYsMCwxLTAuNCwxLTEuMXYtOS40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjItMC4xLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMSwwLjIsMC4zLDAuMiwwLjZWMzljMCwwLjgtMC4yLDEuNS0wLjcsMS45cy0xLjEsMC43LTEuOCwwLjdIMjQuM3oiLz4KCTxwYXRoIGQ9Ik00MC42LDM3LjdoLTMuOHYwLjdoNC40YzAuMSwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNGMwLDAuMS0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yICAgaC00LjR2MC43SDQyYzAuMiwwLDAuMywwLjEsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjIsMC4yLDAuNHMtMC4xLDAuMy0wLjIsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMkgzMGMtMC4yLDAtMC4zLTAuMS0wLjQtMC4yICAgYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNHMwLjEtMC4zLDAuMi0wLjRjMC4xLTAuMSwwLjItMC4yLDAuNC0wLjJoNS4ydi0wLjdoLTQuNGMtMC4xLDAtMC4zLTAuMS0wLjQtMC4ycy0wLjItMC4yLTAuMi0wLjQgICBjMC0wLjEsMC4xLTAuMywwLjItMC40czAuMi0wLjIsMC40LTAuMmg0LjR2LTAuN2gtMy43aDBjLTAuMiwwLTAuNC0wLjEtMC42LTAuMnMtMC4yLTAuMy0wLjItMC42di0zLjFjMC0wLjIsMC4xLTAuNCwwLjItMC42ICAgYzAuMS0wLjEsMC4zLTAuMiwwLjYtMC4yaDMuOHYtMC44SDMwYy0wLjIsMC0wLjMtMC4xLTAuNC0wLjJjLTAuMS0wLjEtMC4yLTAuMi0wLjItMC40czAuMS0wLjMsMC4yLTAuNGMwLjEtMC4xLDAuMi0wLjIsMC40LTAuMiAgIGg1LjJ2LTAuOGMtMS40LDAtMi45LDAuMS00LjMsMC4xYy0wLjIsMC0wLjMsMC0wLjQtMC4xYy0wLjEtMC4xLTAuMi0wLjItMC4yLTAuNGMwLTAuMiwwLTAuMywwLjItMC40YzAuMS0wLjEsMC4zLTAuMiwwLjQtMC4yICAgYzMuMywwLDYuOC0wLjEsMTAuMi0wLjNjMC4yLDAsMC4zLDAsMC40LDAuMmMwLjEsMC4xLDAuMiwwLjMsMC4yLDAuNGMwLDAuMiwwLDAuMy0wLjEsMC40Yy0wLjEsMC4xLTAuMiwwLjItMC40LDAuMiAgIGMtMS4xLDAtMi41LDAuMS00LjMsMC4xdjAuOGg1LjFjMC4yLDAsMC4zLDAuMSwwLjQsMC4yYzAuMSwwLjEsMC4yLDAuMiwwLjIsMC40cy0wLjEsMC4zLTAuMiwwLjRjLTAuMSwwLjEtMC4yLDAuMi0wLjQsMC4yaC01LjEgICB2MC44aDMuOGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My4xYzAsMC4yLTAuMSwwLjQtMC4yLDAuNkM0MSwzNy43LDQwLjgsMzcuNyw0MC42LDM3Ljd6IE0zNS4xLDM0LjlWMzQgICBoLTIuOXYwLjlIMzUuMXogTTM1LjEsMzYuN3YtMC45aC0yLjl2MC45SDM1LjF6IE0zOS44LDM0LjlWMzRoLTIuOXYwLjlIMzkuOHogTTM5LjgsMzYuN3YtMC45aC0yLjl2MC45SDM5Ljh6Ii8+Cgk8cGF0aCBkPSJNNDUuNSw0MS4xYy0wLjMsMC40LTAuNywwLjUtMS4xLDAuM2MtMC40LTAuMy0wLjUtMC43LTAuMy0xLjFsMS0xLjdjMC4zLTAuNCwwLjctMC41LDEuMS0wLjNjMC40LDAuMywwLjUsMC43LDAuMywxLjEgICBMNDUuNSw0MS4xeiBNNTUsMzcuN2MtMC4xLDAtMC4xLDAtMC4yLDBoLTguOWMtMC4zLDAtMC41LTAuMS0wLjYtMC4yYy0wLjItMC4yLTAuMi0wLjQtMC4yLTAuNnYtMy40YzAtMC4yLDAuMS0wLjQsMC4yLTAuNiAgIGMwLjEtMC4xLDAuMy0wLjIsMC42LTAuMmgzLjN2LTMuMWMwLTAuMiwwLjEtMC40LDAuMi0wLjZjMC4yLTAuMiwwLjQtMC4yLDAuNi0wLjJzMC40LDAuMSwwLjYsMC4yYzAuMiwwLjIsMC4yLDAuNCwwLjIsMC42djAuM0g1NiAgIGMwLjIsMCwwLjQsMC4xLDAuNiwwLjJjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZzLTAuMSwwLjQtMC4yLDAuNWMtMC4xLDAuMS0wLjMsMC4yLTAuNiwwLjJoLTUuMnYxLjNoNGMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4xLDAuMSwwLjIsMC4zLDAuMiwwLjZ2My40QzU1LjYsMzcuMyw1NS40LDM3LjYsNTUsMzcuN3ogTTUzLjksMzYuMnYtMmgtNy4xdjJINTMuOXogTTQ5LjYsNDAuN2MwLDAuMy0wLjEsMC41LTAuMiwwLjYgICBjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMS0wLjItMC4yLTAuNC0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMiAgIHMwLjQsMC4xLDAuNiwwLjJjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTUyLjgsNDAuN2MwLDAuMi0wLjEsMC40LTAuMiwwLjZjLTAuMiwwLjEtMC40LDAuMi0wLjYsMC4yICAgYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjJjLTAuMi0wLjEtMC4yLTAuMy0wLjItMC42bDAtMS42YzAtMC4yLDAuMS0wLjQsMC4yLTAuNmMwLjItMC4yLDAuMy0wLjIsMC42LTAuMmMwLjIsMCwwLjQsMC4xLDAuNiwwLjIgICBjMC4yLDAuMiwwLjIsMC40LDAuMiwwLjZWNDAuN3ogTTU2LjYsNDAuM2MwLjIsMC40LDAuMSwwLjgtMC4zLDEuMWMtMC41LDAuMy0wLjgsMC4yLTEuMS0wLjNsLTEtMS43Yy0wLjItMC41LTAuMS0wLjgsMC4zLTEuMSAgIGMwLjUtMC4yLDAuOS0wLjEsMS4xLDAuM0w1Ni42LDQwLjN6Ii8+CjwvZz4KPC9zdmc+";
 async function xt(e, r = !1) {
-  const { fetchToText: i } = _(), t = {
+  const { fetchToText: o } = _(), t = {
     ...e.style,
     highlightReferImage: At,
     listStyleType: "none",
     listStyleImage: "none"
   };
-  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 i(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 o(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 Tt(e) {
   const r = e.textEffects ?? [];
   if (r.length)
     return await Promise.all(
-      [...r].reverse().map(async (i) => {
-        const t = {}, { offset: s, skew: o, stroke: n, shadow: f, filling: M } = i;
-        if (s && (t.translateX = s.x, t.translateY = s.y), o && (t.skewX = o.x, t.skewY = o.y), n?.color && n.width && (t.textStrokeWidth = n.width, t.textStrokeColor = n.color), f && (t.shadowOffsetX = f.offsetX, t.shadowOffsetY = f.offsetY, t.shadowBlur = f.blur, t.shadowColor = f.color), M) {
-          const { color: d, imageContent: c, gradient: a } = M;
-          c?.image || (a ? t.color = `linear-gradient(${90 - a.angle}deg, ${a.stops.map((l) => `${l.color} ${l.offset * 100}%`).join(",")})` : d && (t.color = d));
+      [...r].reverse().map(async (o) => {
+        const t = {}, { offset: s, skew: i, stroke: n, shadow: f, filling: c } = o;
+        if (s && (t.translateX = s.x, t.translateY = s.y), i && (t.skewX = i.x, t.skewY = i.y), n?.color && n.width && (t.textStrokeWidth = n.width, t.textStrokeColor = n.color), f && (t.shadowOffsetX = f.offsetX, t.shadowOffsetY = f.offsetY, t.shadowBlur = f.blur, t.shadowColor = f.color), c) {
+          const { color: d, imageContent: l, gradient: a } = c;
+          l?.image || (a ? t.color = `linear-gradient(${90 - a.angle}deg, ${a.stops.map((M) => `${M.color} ${M.offset * 100}%`).join(",")})` : d && (t.color = d));
         }
         return t;
       })
@@ -732,14 +732,14 @@ async function Tt(e) {
 }
 function Dt(e) {
   return e.version ? e.contents : e.contents.map((r) => {
-    let i;
+    let o;
     return r.map((t, s) => {
-      let o = t.content;
-      o = o.replace(/ |\r\n|\n\r|[\n\r\t\v]/g, " "), o = o.replace(/<br\/>/g, `
+      let i = t.content;
+      i = i.replace(/ |\r\n|\n\r|[\n\r\t\v]/g, " "), i = i.replace(/<br\/>/g, `
 `);
       let n = "", f = 0;
-      for (const M of Array.from(o))
-        s === 0 && f === 0 && M === " " || i === " " && M === " " || (n += M), i = M, f++;
+      for (const c of Array.from(i))
+        s === 0 && f === 0 && c === " " || o === " " && c === " " || (n += c), o = c, f++;
       return {
         ...t,
         content: n
@@ -748,30 +748,34 @@ function Dt(e) {
   });
 }
 async function It(e, r = !1) {
-  const { fetchToText: i } = _(), t = Dt(e), s = [];
-  for (let o = 0, n = t.length; o < n; o++) {
-    const f = t[o], M = {
+  const { fetchToText: o } = _(), t = Dt(e), s = [];
+  for (let i = 0, n = t.length; i < n; i++) {
+    const f = t[i], c = {
       fragments: []
     };
-    s.push(M);
-    for (let d = 0, c = f.length; d < c; d++) {
-      const a = {}, l = f[d];
-      for (const w in l)
-        w !== "id" && l[w] !== "" && (a[w] = l[w]);
-      a.fontSize && (a.fontSize = Math.floor(a.fontSize)), a.content = Mt(a.content), a.highlight && (a.highlightImage = await i(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 ? M.listStyleType = "disc" : a.listStyle && (M.listStyleImage = await i(a.listStyle.image), M.listStyleSize = `${a.listStyle.size * 100}%`));
-      const L = M.fragments[M.fragments.length - 1];
-      L && Object.keys(L).length === 1 && L.content && Object.keys(a).length === 1 && a.content ? L.content += a.content : M.fragments.push(a);
+    s.push(c);
+    for (let d = 0, l = f.length; d < l; d++) {
+      const a = {}, M = f[d];
+      for (const w in M)
+        w !== "id" && M[w] !== "" && (a[w] = M[w]);
+      a.fontSize && (a.fontSize = Math.floor(a.fontSize)), a.content = Mt(a.content), a.highlight && (a.highlightImage = await o(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 ? c.listStyleType = "disc" : a.listStyle && (c.listStyleImage = await o(a.listStyle.image), c.listStyleSize = `${a.listStyle.size * 100}%`));
+      const L = c.fragments[c.fragments.length - 1];
+      L && Object.keys(L).length === 1 && L.content && Object.keys(a).length === 1 && a.content ? L.content += a.content : c.fragments.push(a);
     }
   }
   return s;
 }
 const P = (e) => (Number.parseFloat(e) || 0) / 100;
-async function q(e, r, i) {
-  const t = { ...e.style ?? e }, s = {
+async function q(e, r, o) {
+  const t = { ...e.style ?? e };
+  delete t.bottom, delete t.right;
+  const s = {
     inPptIs: "Shape",
     inEditorIs: "Element"
-  }, o = {
-    id: U(),
+  };
+  e.id && (s.rawId = e.id), e.name && (s.rawName = e.name);
+  const i = {
+    id: F(),
     name: e.name ?? e.title ?? e.id,
     style: t,
     meta: s,
@@ -779,58 +783,57 @@ async function q(e, r, i) {
   };
   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 && (s.lock = !0), e.animations?.length) {
     const n = jt(e);
-    o.delay = n.delay, o.duration = n.duration, o.children.push(...n.animations), i && (n.animations.forEach((f) => {
-      i.endTime = Math.max(
-        i.endTime,
+    i.delay = n.delay, i.duration = n.duration, i.children.push(...n.animations), o && (n.animations.forEach((f) => {
+      o.endTime = Math.max(
+        o.endTime,
         n.delay + f.delay + f.duration
       );
-    }), i.endTime = Math.max(i.endTime, n.delay + n.duration));
+    }), o.endTime = Math.max(o.endTime, n.delay + n.duration));
   }
   switch (e.type) {
     case "image":
-      if (s.inPptIs = "Picture", o.foreground = {
+      if (s.inPptIs = "Picture", i.foreground = {
         image: await V(e),
         fillWithShape: !0
       }, e.clipUrl && (s.rawForegroundImage = e.url), e.cropping) {
         const n = e.style.width, f = e.style.height, {
-          imageWidth: M,
+          imageWidth: c,
           imageHeight: d,
-          maskWidth: c = n,
+          maskWidth: l = n,
           maskHeight: a = f,
-          translateX: l,
+          translateX: M,
           translateY: L,
           zoom: w = 1
-        } = e.cropping, y = M * w, m = d * w, C = (y - c) / 2 - l, j = (m - a) / 2 - L, h = C + c / 2, D = j + a / 2, g = -(n / 2 - h), u = -(f / 2 - D), A = y - (g + n), k = m - (u + f);
-        o.foreground.cropRect = {
-          left: g / y,
-          top: u / m,
-          right: A / y,
-          bottom: k / m
+        } = e.cropping, h = c * w, u = d * w, C = (h - l) / 2 - M, m = (u - a) / 2 - L, g = C + l / 2, T = m + a / 2, j = -(n / 2 - g), y = -(f / 2 - T), A = h - (j + n), k = u - (y + f);
+        i.foreground.cropRect = {
+          left: j / h,
+          top: y / u,
+          right: A / h,
+          bottom: k / u
         };
       }
       break;
     case "svg": {
-      s.inPptIs = "Picture", o.foreground = {
+      s.inPptIs = "Picture", i.foreground = {
         image: await pt(e),
         fillWithShape: !0
       };
       break;
     }
     case "text": {
-      s.inPptIs = "Shape", t.writingMode === "horizontal-tb" ? t.width = Math.ceil(t.width + t.letterSpacing) : t.height = Math.ceil(t.height + t.letterSpacing), o.text = {
+      s.inPptIs = "Shape", t.writingMode === "horizontal-tb" ? t.width = Math.ceil(t.width + t.letterSpacing) : t.height = Math.ceil(t.height + t.letterSpacing), i.text = {
         content: await It(e),
         style: await xt(e),
-        effects: await Tt(e),
+        effects: await Tt(e)
         // plugins: [deformation(el.deformation?.type?.endsWith("byWord") ? -1 : 999, () => el.deformation)],
-        drawMode: "texture"
       };
       break;
     }
     case "com":
-      s.inPptIs = "GroupShape", o.children = (await Promise.all(
+      s.inPptIs = "GroupShape", i.children = (await Promise.all(
         e.children.map(async (n) => {
           try {
-            return await q(n, e, i);
+            return await q(n, e, o);
           } catch (f) {
             console.warn(f);
             return;
@@ -863,69 +866,72 @@ async function q(e, r, i) {
       console.warn(e);
       break;
   }
-  return o;
+  return i;
 }
-async function St(e, r = !0, i) {
-  const t = U(), s = {
+async function St(e, r = !0, o) {
+  const t = F(), s = {
     ...e.style ?? e
   };
-  r && (s.overflow = "hidden");
-  let o;
-  return e.background && (e.background.color && (o ??= {}, dt(e.background.color ?? "") ? o.image = e.background.color : o.color = e.background.color), e.background.image && (o ??= {}, o.image = e.background.image)), {
+  delete s.right, delete s.bottom, r && (s.overflow = "hidden");
+  const i = {
+    inPptIs: r ? "Slide" : "GroupShape",
+    inEditorIs: r ? "Frame" : "Element"
+  };
+  e.id && (i.rawId = e.id), e.name && (i.rawName = e.name);
+  let n;
+  return e.background && (e.background.color && (n ??= {}, dt(e.background.color ?? "") ? n.image = e.background.color : n.color = e.background.color), e.background.image && (n ??= {}, n.image = e.background.image)), {
     id: t,
     name: r ? `Frame ${t}` : e.name,
     style: s,
     // TODO 过滤掉部分属性
-    background: o,
+    background: n,
     children: (await Promise.all(
-      e.elements.map(async (n) => {
+      e.elements.map(async (f) => {
         try {
-          return await q(n, void 0, i);
-        } catch (f) {
-          console.warn(f);
+          return await q(f, void 0, o);
+        } catch (c) {
+          console.warn(c);
           return;
         }
       })
     )).filter(Boolean),
-    meta: {
-      inPptIs: r ? "Slide" : "GroupShape",
-      inEditorIs: r ? "Frame" : "Element"
-    }
+    meta: i
   };
 }
 async function K(e, r = 0) {
   const {
-    layouts: i,
+    layouts: o,
     metas: t = {}
   } = e, s = {
     endTime: 0
   };
-  let o = await Promise.all(
-    i.map(async (M, d) => ({
+  let i = await Promise.all(
+    o.map(async (c, d) => ({
       index: d,
-      element: await St(M, !0, s)
+      element: await St(c, !0, s)
     }))
   ), n = 0;
-  o = o.sort((M, d) => M.index - d.index).map((M, d) => {
-    const c = M.element;
-    return c.style && (c.style.top = n, n += Number(c.style.height) + r), c.name = `Frame ${d + 1}`, c;
+  i = i.sort((c, d) => c.index - d.index).map((c, d) => {
+    const l = c.element;
+    return l.style && (l.style.top = n, n += Number(l.style.height) + r), l.name = `Frame ${d + 1}`, l;
   });
-  const f = o.reduce((M) => {
-    const d = M.style?.left ?? 0, c = M.style?.top ?? 0, a = M.style?.width ?? 0, l = M.style?.height ?? 0;
+  const f = i.reduce((c) => {
+    const d = c.style?.left ?? 0, l = c.style?.top ?? 0, a = c.style?.width ?? 0, M = c.style?.height ?? 0;
     return {
       minX: d,
-      minY: c,
+      minY: l,
       maxX: d + a,
-      maxY: c + l
+      maxY: l + M
     };
   }, { minX: 0, minY: 0, maxX: 0, maxY: 0 });
   return {
+    id: F(),
     name: t.name || "doc",
     style: {
       width: t?.width ?? f.maxX - f.minX,
       height: t?.height ?? f.maxY - f.minY
     },
-    children: o,
+    children: i,
     meta: {
       ...t,
       endTime: s.endTime,
@@ -934,33 +940,33 @@ async function K(e, r = 0) {
   };
 }
 function zt(e, r) {
-  const { config: i } = e;
+  const { config: o } = e;
   return {
     name: "bigesj:bidTid",
     test: (t) => typeof t == "object" && t && !!(t.bid || t.tid),
     load: async (t) => {
-      const s = t.bid ?? t.tid ?? "", o = async (c) => await fetch(
-        (t.bid ? r.bid : r.tid).replace("%d", c)
-      ).then((a) => a.json()).then((a) => JSON.parse(a.data.content));
+      const s = t.bid ?? t.tid ?? "", i = async (l) => await fetch(
+        (t.bid ? r.bid : r.tid).replace("%d", l)
+      ).then((a) => a.json()).then((a) => a.data);
       let n = 0;
       const f = await Promise.all(
-        s.split("|").map(async (c) => {
-          let [a, l] = c.split("[");
-          l && (l = l.substring(0, l.length - 1));
-          const L = l ? l.split(",").map((m) => Number(m)) : void 0, w = await o(a);
-          L !== void 0 && (w.layouts = w.layouts.filter((m, C) => L.includes(C)));
-          const y = await K(w);
-          return n = Math.max(n, y.meta?.maxTime ?? 0), y;
+        s.split("|").map(async (l) => {
+          let [a, M] = l.split("[");
+          M && (M = M.substring(0, M.length - 1));
+          const L = M ? M.split(",").map((g) => Number(g)) : void 0, w = await i(a), { content: h, ...u } = w, C = JSON.parse(h);
+          L !== void 0 && (C.layouts = C.layouts.filter((g, T) => L.includes(T)));
+          const m = await K(C);
+          return m.meta.raw = u, n = Math.max(n, m.meta?.maxTime ?? 0), m;
         })
-      ), M = { ...f[0], id: s, children: [] };
-      M.meta ??= {}, M.meta.maxTime = n, M.meta.inEditorIs = "Doc";
+      ), c = { ...f[0], id: s, children: [] };
+      c.meta ??= {}, c.meta.maxTime = n, c.meta.inEditorIs = "Doc";
       let d = 0;
-      return f.forEach((c) => {
+      return f.forEach((l) => {
         let a = 0;
-        c.children?.forEach((l) => {
-          l.style && (l.style.left = d, a = Math.max(a, Number(l.style.width)), M.children.push(l));
-        }), d += a + i.value.frameGap;
-      }), M;
+        l.children?.forEach((M) => {
+          M.style && (M.style.left = d, a = Math.max(a, Number(M.style.width)), c.children.push(M));
+        }), d += a + o.value.frameGap;
+      }), c;
     }
   };
 }
@@ -969,68 +975,69 @@ function Nt() {
     name: "bigesj:bige",
     accept: ".bige",
     test: (e) => e instanceof File && e.name.endsWith(".bige"),
-    load: async (e) => await K(
-      JSON.parse(
+    load: async (e) => {
+      const r = JSON.parse(
         new TextDecoder().decode(
           Lt(new Uint8Array(await e.arrayBuffer()))
         )
-      ).content
-    )
+      ), { content: o, ...t } = r, s = await K(o);
+      return s.meta.raw = t, s;
+    }
   };
 }
 function Qt(e = {}) {
   const {
     font: r,
-    api: i
+    api: o
   } = e, t = {
     fonts: "/new/design/fonts",
     bid: "/new/udesign/info/%d",
     tid: "/new/design/info/%d",
-    ...i
+    ...o
   };
-  return ot((s) => ({
+  return nt((s) => ({
     name: "bigesj",
     loaders: [
       Nt(),
       zt(s, t)
     ],
     setup: async () => {
-      r && await Et(s, t);
+      r && await bt(s, t);
     }
   }));
 }
-async function Et(e, r) {
+async function bt(e, r) {
   const {
-    on: i,
+    on: o,
     off: t,
     root: s
   } = e, {
-    loadBigeFonts: o,
+    loadBigeFonts: i,
     loadFont: n
   } = mt();
-  function f(c) {
-    c instanceof nt && (c.style.fontFamily && n(c.style.fontFamily).then(() => c.text.update()), c.text.content.forEach((a) => {
-      a.fragments.forEach((l) => {
-        l.fontFamily && n(l.fontFamily).then(() => c.text.update());
-      }), a.fontFamily && n(a.fontFamily).then(() => c.text.update());
+  function f(l) {
+    l instanceof ot && (l.style.fontFamily && n(l.style.fontFamily).then(() => l.text.update()), l.text.content.forEach((a) => {
+      a.fragments.forEach((M) => {
+        M.fontFamily && n(M.fontFamily).then(() => l.text.update());
+      }), a.fontFamily && n(a.fontFamily).then(() => l.text.update());
     }));
   }
-  function M(c) {
-    c.forEach((a) => {
-      f(a), a.findOne((l) => (f(l), !1));
+  function c(l) {
+    l.forEach((a) => {
+      f(a), a.findOne((M) => (f(M), !1));
     });
   }
   async function d() {
-    s.value && M([s.value]);
+    s.value && c([s.value]);
   }
   lt(() => {
-    t("setDoc", d), t("addElement", M);
-  }), i("setDoc", d), i("addElement", M), await o(r.fonts);
+    t("setDoc", d), t("addElement", c);
+  }), o("setDoc", d), o("addElement", c), await i(r.fonts);
 }
 export {
   zt as bidTidLoader,
   Nt as bigeLoader,
-  G as convertAnimation,
+  U as convertAnimation,
   K as convertDoc,
   q as convertElement,
   V as convertImageElementToUrl,

package/package.json

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