@feedmepos/mf-report 5.10.2 → 5.10.3

package/dist/{App-Bh6L2Pph.js → App-B_0zunhK.js}

@@ -93,7 +93,7 @@ const ge = ["src"], he = ["src"], $e = /* @__PURE__ */ O({
     }), Z(() => {
       l(me);
     }), T(() => {
-      console.log("5.10.2", !0), window.addEventListener("message", F), window.addEventListener("message", B);
+      console.log("5.10.3", !0), window.addEventListener("message", F), window.addEventListener("message", B);
     });
     const L = ie(), R = de();
     M(() => {

package/dist/{ReportEditor-B8OHmx-E.js → ReportEditor-CqFvmqfu.js}

@@ -1,4 +1,4 @@
-import { defineComponent as G, mergeModels as J, useModel as j, ref as R, computed as N, resolveComponent as v, createBlock as C, openBlock as i, withCtx as s, createElementVNode as h, createVNode as a, unref as e, normalizeClass as le, createTextVNode as de, toDisplayString as E, createElementBlock as S, Fragment as L, renderSlot as Ce, createCommentVNode as Y, watch as me, renderList as Q, resolveDynamicComponent as Be, isRef as ke, normalizeStyle as ce, onMounted as Ue } from "vue";
+import { defineComponent as G, mergeModels as J, useModel as j, ref as R, computed as N, resolveComponent as v, createBlock as k, openBlock as i, withCtx as s, createElementVNode as h, createVNode as a, unref as e, normalizeClass as le, createTextVNode as de, toDisplayString as E, createElementBlock as S, Fragment as L, renderSlot as Ce, createCommentVNode as Y, watch as me, renderList as Q, resolveDynamicComponent as Be, isRef as ke, normalizeStyle as ce, onMounted as Ue } from "vue";
 import { W as We, i as De, S as he, d as ye, T as Re, _ as qe } from "./TransitionFade-DqkdfAWv.js";
 import { D as K, c as Ie, C as we, a as Ve, b as Ee, v as ee } from "./v4-BUVVByJY.js";
 import { storeToRefs as ae } from "pinia";
@@ -24,13 +24,13 @@ const Pe = /* @__PURE__ */ G({
     function u() {
       _("update:isOpen", !1);
     }
-    function k() {
+    function V() {
       c.value && (w.value = c.value, c.value = void 0, _("update:isOpen", !1));
     }
     const c = R(), q = N(() => !c.value);
     return (I, T) => {
       const B = v("FmButton"), b = v("FmDialog");
-      return i(), C(b, {
+      return i(), k(b, {
         "model-value": m.isOpen
       }, {
         "dialog-header": s(() => [
@@ -54,7 +54,7 @@ const Pe = /* @__PURE__ */ G({
           a(B, {
             label: e(n)("report.common.confirm"),
             disabled: q.value,
-            onClick: k
+            onClick: V
           }, null, 8, ["label", "disabled"])
         ]),
         _: 1
@@ -118,7 +118,7 @@ const Pe = /* @__PURE__ */ G({
     const d = j(x, "modelValue");
     return (n, r) => {
       const w = v("FmTopSheet"), m = v("FmCard");
-      return i(), C(m, { class: "fixed bottom-0 w-full" }, {
+      return i(), k(m, { class: "fixed bottom-0 w-full" }, {
         default: s(() => [
           a(pe, {
             modelValue: d.value,
@@ -169,51 +169,51 @@ const Pe = /* @__PURE__ */ G({
   }),
   emits: ["update:globalFilter", "update:isOpen"],
   setup(x) {
-    const { t: d } = te(), n = j(x, "globalFilter"), r = j(x, "isOpen"), w = Oe(), m = x, _ = R(), u = R(), k = R(), c = R([]);
+    const { t: d } = te(), n = j(x, "globalFilter"), r = j(x, "isOpen"), w = Oe(), m = x, _ = R(), u = R(), V = R(), c = R([]);
     me(r, (p) => {
-      var l, V, U;
+      var l, C, U;
       p && (_.value = ((l = n.value) == null ? void 0 : l.label) || "", u.value = m.schemas.find(
         (W) => {
           var M;
           return W.name === ((M = n.value) == null ? void 0 : M.schemaName);
         }
-      ), k.value = (V = I.value.find(
+      ), V.value = (C = I.value.find(
         (W) => {
           var M;
           return W.value.name === ((M = n.value) == null ? void 0 : M.name);
         }
-      )) == null ? void 0 : V.value, c.value = ((U = n.value) == null ? void 0 : U.tileIds) || []);
+      )) == null ? void 0 : C.value, c.value = ((U = n.value) == null ? void 0 : U.tileIds) || []);
     });
     const q = N(
       () => m.schemas.map((p) => ({
-        label: p.label,
+        label: p.label || p.name,
         value: p
       }))
     ), I = N(() => {
       var p;
       return (((p = u.value) == null ? void 0 : p.fields) || []).reduce(
-        (l, V) => ([K.Bool, K.String, K.Timestamp].includes(V.type) && l.push({
-          label: V.label,
-          value: V
+        (l, C) => ([K.Bool, K.String, K.Timestamp].includes(C.type) && l.push({
+          label: C.label || C.name,
+          value: C
         }), l),
         []
       );
-    }), T = N(() => m.tiles.reduce((p, l, V) => {
+    }), T = N(() => m.tiles.reduce((p, l, C) => {
       var M, P;
       const U = l.widget.config.schemaNames ?? [], W = (l.widget.config.joinDatasources ?? []).flatMap(
         (F) => F.schemaNames ?? []
       );
       return [...U, ...W].includes(((M = u.value) == null ? void 0 : M.name) || "") && p.push({
-        label: (P = l == null ? void 0 : l.widget.title) != null && P.trim() ? l.widget.title : `Widget ${V + 1}`,
+        label: (P = l == null ? void 0 : l.widget.title) != null && P.trim() ? l.widget.title : `Widget ${C + 1}`,
         value: l.id
       }), p;
     }, []));
     function B(p) {
       var l;
-      p.name !== ((l = u.value) == null ? void 0 : l.name) && (u.value = p, k.value = void 0);
+      p.name !== ((l = u.value) == null ? void 0 : l.name) && (u.value = p, V.value = void 0);
     }
     function b(p) {
-      k.value = p;
+      V.value = p;
     }
     function O(p) {
       switch (p) {
@@ -231,12 +231,12 @@ const Pe = /* @__PURE__ */ G({
         w.open({ message: "Invalid schema", type: "error" });
         return;
       }
-      k.value || w.open({ message: "Invalid dimension", type: "error" }), n.value = {
+      V.value || w.open({ message: "Invalid dimension", type: "error" }), n.value = {
         schemaName: u.value.name,
-        name: k.value.name,
+        name: V.value.name,
         label: _.value || name,
-        operator: O(k.value.type),
-        option: k.value.type === K.Timestamp ? Ie.DateTime : null,
+        operator: O(V.value.type),
+        option: V.value.type === K.Timestamp ? Ie.DateTime : null,
         tileIds: [...c.value],
         filters: []
       }, r.value = !1;
@@ -245,8 +245,8 @@ const Pe = /* @__PURE__ */ G({
       r.value = !1;
     }
     return (p, l) => {
-      const V = v("FmTextField"), U = v("FmLabel"), W = v("FmCheckbox"), M = v("FmForm"), P = v("FmButton"), F = v("FmDialog");
-      return i(), C(F, {
+      const C = v("FmTextField"), U = v("FmLabel"), W = v("FmCheckbox"), M = v("FmForm"), P = v("FmButton"), F = v("FmDialog");
+      return i(), k(F, {
         modelValue: r.value,
         "onUpdate:modelValue": l[4] || (l[4] = (o) => r.value = o),
         overlay: !0,
@@ -261,7 +261,7 @@ const Pe = /* @__PURE__ */ G({
             class: "flex flex-col gap-2 w-[490px]"
           }, {
             default: s(() => [
-              a(V, {
+              a(C, {
                 modelValue: _.value,
                 "onUpdate:modelValue": l[0] || (l[0] = (o) => _.value = o),
                 placeholder: e(d)("report.section.filter.displayName"),
@@ -276,7 +276,7 @@ const Pe = /* @__PURE__ */ G({
                 "onUpdate:modelValue": l[1] || (l[1] = (o) => B(o))
               }, null, 8, ["model-value", "items", "placeholder", "label"]),
               a(Fe, {
-                "model-value": k.value,
+                "model-value": V.value,
                 items: I.value,
                 placeholder: e(d)("report.section.dimension.Dimension"),
                 label: e(d)("report.section.dimension.Dimension"),
@@ -289,14 +289,14 @@ const Pe = /* @__PURE__ */ G({
                 _: 1
               }),
               x.tiles.length > 0 ? (i(), S("div", je, [
-                (i(!0), S(L, null, Q(T.value, (o) => (i(), C(W, {
+                (i(!0), S(L, null, Q(T.value, (o) => (i(), k(W, {
                   key: o.value,
                   modelValue: c.value,
                   "onUpdate:modelValue": l[3] || (l[3] = (t) => c.value = t),
                   label: o.label,
                   value: o.value
                 }, null, 8, ["modelValue", "label", "value"]))), 128))
-              ])) : (i(), C(U, {
+              ])) : (i(), k(U, {
                 key: 1,
                 class: "fm-typo-en-body-lg-400",
                 label: e(d)("report.section.filter.noWidget")
@@ -334,14 +334,14 @@ const Pe = /* @__PURE__ */ G({
   }),
   emits: /* @__PURE__ */ J(["hideConfiguration"], ["update:modelValue"]),
   setup(x, { emit: d }) {
-    const n = j(x, "modelValue"), { breakpoints: r } = ne(), w = x, m = d, _ = Se(), u = $e(), k = R(), {
+    const n = j(x, "modelValue"), { breakpoints: r } = ne(), w = x, m = d, _ = Se(), u = $e(), V = R(), {
       currentSelectWidgetType: c,
       categories: q,
       editingTile: I,
       editingTileIndex: T,
       editingGlobalFilter: B,
       editingGlobalFilterIndex: b
-    } = ae(Ve()), { schemas: O } = ae(Ee()), { promptMessage: A } = Te(), $ = R(!1), p = R(!1), { t: l, te: V } = te(), U = R(void 0), W = N(() => {
+    } = ae(Ve()), { schemas: O } = ae(Ee()), { promptMessage: A } = Te(), $ = R(!1), p = R(!1), { t: l, te: C } = te(), U = R(void 0), W = N(() => {
       const o = n.value.tiles.flatMap((t) => {
         var g;
         const D = t.widget.config.schemaNames ?? [], f = ((g = t.widget.config.joinDatasources) == null ? void 0 : g.flatMap((H) => H.schemaNames ?? [])) ?? [];
@@ -445,7 +445,7 @@ const Pe = /* @__PURE__ */ G({
     })));
     return (o, t) => {
       const D = v("FmTextField"), f = v("FmSelect"), g = v("FmButton"), H = v("FmIcon"), oe = v("FmTooltip"), ve = v("FmMenuItem"), fe = v("FmMenu"), ge = v("FmListItem"), be = v("FmList"), Me = v("FmForm");
-      return i(), C(Be(e(r).lg || e(r).md ? Le : Je), {
+      return i(), k(Be(e(r).lg || e(r).md ? Le : Je), {
         "model-value": w.hideConfiguration,
         "onUpdate:modelValue": t[8] || (t[8] = (y) => m("hideConfiguration", y))
       }, {
@@ -468,7 +468,7 @@ const Pe = /* @__PURE__ */ G({
           }, null, 8, ["modelValue", "is-open"]),
           a(Me, {
             ref_key: "form",
-            ref: k,
+            ref: V,
             class: "px-6 py-16 flex flex-col gap-24 overflow-y-auto overflow-x-hidden"
           }, {
             default: s(() => [
@@ -544,7 +544,7 @@ const Pe = /* @__PURE__ */ G({
                                   }, 1032, ["content"]),
                                   W.value.find(
                                     (z) => z.name === y.schemaName
-                                  ) ? Y("", !0) : (i(), C(oe, {
+                                  ) ? Y("", !0) : (i(), k(oe, {
                                     key: 0,
                                     content: "Missing schema",
                                     "z-index": 99
@@ -626,11 +626,11 @@ const Pe = /* @__PURE__ */ G({
                               class: "handle"
                             }),
                             a(oe, {
-                              content: y.widget.title ? e(_e)(e(l), e(V), y.widget.title, "other") : e(l)("report.editor.widget", { index: Z + 1 }),
+                              content: y.widget.title ? e(_e)(e(l), e(C), y.widget.title, "other") : e(l)("report.editor.widget", { index: Z + 1 }),
                               class: "handle"
                             }, {
                               default: s(() => [
-                                h("p", Ze, E(y.widget.title ? e(_e)(e(l), e(V), y.widget.title, "other") : e(l)("report.editor.widget", { index: Z + 1 })), 1)
+                                h("p", Ze, E(y.widget.title ? e(_e)(e(l), e(C), y.widget.title, "other") : e(l)("report.editor.widget", { index: Z + 1 })), 1)
                               ]),
                               _: 2
                             }, 1032, ["content"]),
@@ -712,17 +712,17 @@ const Pe = /* @__PURE__ */ G({
   emits: /* @__PURE__ */ J(["hideConfiguration"], ["update:modelValue"]),
   setup(x, { emit: d }) {
     const { breakpoints: n } = ne(), r = j(x, "modelValue"), w = x, m = N(() => w.previewWidth > 0 && w.previewHeight > 0), _ = N(() => n.value.sm || n.value.xs), u = d;
-    return (k, c) => {
+    return (V, c) => {
       const q = v("FmCircularProgress"), I = v("FmButton"), T = v("FmMenuDivider"), B = v("FmCard");
       return i(), S("div", el, [
         r.value ? (i(), S(L, { key: 1 }, [
-          m.value ? Y("", !0) : (i(), C(Re, {
+          m.value ? Y("", !0) : (i(), k(Re, {
             key: 0,
             "model-value": !w.hideConfiguration
           }, {
             right: s(() => [
               h("div", ll, [
-                r.value ? (i(), C(xe, {
+                r.value ? (i(), k(xe, {
                   key: 0,
                   modelValue: r.value,
                   "onUpdate:modelValue": c[0] || (c[0] = (b) => r.value = b),
@@ -752,28 +752,28 @@ const Pe = /* @__PURE__ */ G({
           }),
           !_.value && !m.value ? (i(), S("div", ol, [
             r.value.tiles.length > 0 ? (i(), S("div", al, [
-              (i(!0), S(L, null, Q(r.value.tiles, (b, O) => (i(), C(se, {
+              (i(!0), S(L, null, Q(r.value.tiles, (b, O) => (i(), k(se, {
                 key: `${e(ee)()}_${O}`,
                 "model-value": b,
                 index: O,
                 "hide-export": !0
               }, null, 8, ["model-value", "index"]))), 128))
-            ])) : (i(), C(ue, { key: 1 }))
+            ])) : (i(), k(ue, { key: 1 }))
           ])) : _.value && !m.value ? (i(), S("div", nl, [
             a(B, { class: "px-5 pb-28" }, {
               default: s(() => [
                 r.value.tiles.length > 0 ? (i(), S("div", rl, [
-                  (i(!0), S(L, null, Q(r.value.tiles, (b, O) => (i(), C(se, {
+                  (i(!0), S(L, null, Q(r.value.tiles, (b, O) => (i(), k(se, {
                     key: `${e(ee)()}_${O}`,
                     "model-value": b,
                     index: O,
                     "hide-export": !0
                   }, null, 8, ["model-value", "index"]))), 128))
-                ])) : (i(), C(ue, { key: 1 }))
+                ])) : (i(), k(ue, { key: 1 }))
               ]),
               _: 1
             }),
-            r.value ? (i(), C(xe, {
+            r.value ? (i(), k(xe, {
               key: 0,
               modelValue: r.value,
               "onUpdate:modelValue": c[3] || (c[3] = (b) => r.value = b),
@@ -797,25 +797,25 @@ const Pe = /* @__PURE__ */ G({
                 })
               }, [
                 r.value.tiles.length > 0 ? (i(), S("div", sl, [
-                  (i(!0), S(L, null, Q(r.value.tiles, (b, O) => (i(), C(se, {
+                  (i(!0), S(L, null, Q(r.value.tiles, (b, O) => (i(), k(se, {
                     key: `${e(ee)()}_${O}`,
                     "model-value": b,
                     index: O,
                     "hide-export": !0,
                     "custom-screen-width": w.previewWidth
                   }, null, 8, ["model-value", "index", "custom-screen-width"]))), 128))
-                ])) : (i(), C(ue, { key: 1 }))
+                ])) : (i(), k(ue, { key: 1 }))
               ], 4)
             ], 4)
           ]))
-        ], 64)) : (i(), C(q, { key: 0 }))
+        ], 64)) : (i(), k(q, { key: 0 }))
       ]);
     };
   }
 }), dl = { class: "flex items-center gap-4" }, ml = { class: "flex justify-center items-center gap-2 w-full" }, cl = { class: "flex gap-4" }, kl = /* @__PURE__ */ G({
   __name: "ReportEditor",
   setup(x) {
-    const d = Se(), n = $e(), r = Ve(), { promptLoader: w } = He(), { t: m } = te(), { currentReport: _, editingReport: u } = ae(r), { breakpoints: k } = ne(), c = N(() => {
+    const d = Se(), n = $e(), r = Ve(), { promptLoader: w } = He(), { t: m } = te(), { currentReport: _, editingReport: u } = ae(r), { breakpoints: V } = ne(), c = N(() => {
       var F;
       return !((F = u.value) != null && F.editable);
     }), q = N(() => {
@@ -887,10 +887,10 @@ const Pe = /* @__PURE__ */ G({
         width: 390,
         height: 859
       }
-    ], $ = R(A[0]), p = R(!1), l = N(() => p.value ? Math.max($.value.width || 0, $.value.height || 0) : Math.min($.value.width || 0, $.value.height || 0)), V = N(() => p.value ? Math.min($.value.width || 0, $.value.height || 0) : Math.max($.value.width || 0, $.value.height || 0)), U = N(() => window.innerHeight - 72 - 56), W = N(() => {
+    ], $ = R(A[0]), p = R(!1), l = N(() => p.value ? Math.max($.value.width || 0, $.value.height || 0) : Math.min($.value.width || 0, $.value.height || 0)), C = N(() => p.value ? Math.min($.value.width || 0, $.value.height || 0) : Math.max($.value.width || 0, $.value.height || 0)), U = N(() => window.innerHeight - 72 - 56), W = N(() => {
       if (!l.value) return 1;
-      let F = (U.value - 48) / l.value, o = V.value * F;
-      return o > window.innerWidth && (F = window.innerWidth / V.value, o = V.value * F), F > 1 ? 1 : F;
+      let F = (U.value - 48) / l.value, o = C.value * F;
+      return o > window.innerWidth && (F = window.innerWidth / C.value, o = C.value * F), F > 1 ? 1 : F;
     });
     function M(F) {
       $.value = F;
@@ -900,7 +900,7 @@ const Pe = /* @__PURE__ */ G({
     }
     return (F, o) => {
       const t = v("FmTooltip"), D = v("FmButton"), f = v("FmPageHead");
-      return i(), C(qe, null, {
+      return i(), k(qe, null, {
         default: s(() => [
           a(f, {
             actions: [
@@ -919,7 +919,7 @@ const Pe = /* @__PURE__ */ G({
                 }, {
                   default: s(() => [
                     h("p", {
-                      class: le(`${e(k).sm || e(k).xs ? "hidden" : ""} text-ellipsis overflow-hidden text-nowrap fm-typo-en-title-md-600 w-[250px]`)
+                      class: le(`${e(V).sm || e(V).xs ? "hidden" : ""} text-ellipsis overflow-hidden text-nowrap fm-typo-en-title-md-600 w-[250px]`)
                     }, E(q.value), 3)
                   ]),
                   _: 1
@@ -949,14 +949,14 @@ const Pe = /* @__PURE__ */ G({
             ]),
             _: 1
           }, 8, ["actions"]),
-          e(u) ? (i(), C(ul, {
+          e(u) ? (i(), k(ul, {
             key: 0,
             modelValue: e(u),
             "onUpdate:modelValue": o[1] || (o[1] = (g) => ke(u) ? u.value = g : null),
             style: ce({ height: U.value + "px" }),
-            class: le(e(k).lg || e(k).md ? "flex" : ""),
+            class: le(e(V).lg || e(V).md ? "flex" : ""),
             "hide-configuration": B.value,
-            "preview-width": V.value,
+            "preview-width": C.value,
             "preview-height": l.value,
             "preview-scale": W.value,
             onHideConfiguration: o[2] || (o[2] = (g) => B.value = g)

package/dist/app.js

@@ -4533,7 +4533,7 @@ const a = {
   {
     path: "/report-editor",
     name: "reportEditor",
-    component: () => import("./ReportEditor-B8OHmx-E.js")
+    component: () => import("./ReportEditor-CqFvmqfu.js")
   },
   {
     path: "/report-editor/tile-editor",
@@ -4581,7 +4581,7 @@ const u = {
   "zh-CN": m,
   "th-TH": c,
   "zh-Hant": p
-}, h = e(() => import("./App-Bh6L2Pph.js"));
+}, h = e(() => import("./App-B_0zunhK.js"));
 export {
   h as FmApp,
   u as i18nMessages,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-report",
-  "version": "5.10.2",
+  "version": "5.10.3",
   "files": [
     "dist"
   ],