g-ui-web 1.1.25 → 1.1.26

package/lib/g-ui-web.js

@@ -48722,7 +48722,7 @@ class K3 {
     R0(this, "events");
     if (this.events = {}, !t)
       throw console.error("dataUrl is undefined or null"), new Error("Invalid dataUrl");
-    if (typeof t == "string" || typeof t == "number" || typeof t == "object" && t !== null && !t.path)
+    if (!(t != null && t.path) && !["string", "number"].includes(typeof t) && !Array.isArray(t) || Array.isArray(t) && !t.some((r) => r.path))
       this.loadStaticData(t);
     else if (Array.isArray(t)) {
       if (!t.some((r) => r && r.path))
@@ -95500,87 +95500,130 @@ const Clt = (e, t) => {
     let i = z(0);
     const s = z(!1), l = z(), u = z(null), c = z({});
     let d = null, f = z(!1);
-    const p = async (v) => {
-      if (ya(v)) {
+    const p = async (g) => {
+      if (ya(g)) {
         s.value = !0;
         return;
       } else
         s.value = !1;
-      const g = Zd(o.dbOptions.xAxisField);
-      f.value = !1;
-      let m = z([]), _ = zp(o.options), b = [], w = [], C = {
+      const m = Zd(o.dbOptions.xAxisField), { newDbO: _, newData: b } = h(o.dbOptions, g);
+      console.log(_, b), g = b, f.value = !1;
+      let w = z([]), C = zp(o.options), x = [], S = [], E = {
         xAxis: [],
         series: []
       };
-      if (d = v, m.value = v, f.value = !0, m.value && o.dbOptions) {
-        m.value.map((S) => {
-          w.push(
-            g == "function" ? o.dbOptions.xAxisField(S) : S[o.dbOptions.xAxisField]
+      if (d = g, w.value = g, f.value = !0, w.value && _) {
+        w.value.map((A) => {
+          S.push(
+            m == "function" ? _.xAxisField(A) : A[_.xAxisField]
           );
         });
-        let x = [];
-        if (o.dbOptions.yAxis && o.dbOptions.yAxis.yAxisFields ? x = o.dbOptions.columns.map((S) => {
-          const E = o.dbOptions.yAxis.yAxisFields.find((T) => T.field === S.field);
-          return E ? { ...S, ...E } : S;
+        let T = [];
+        if (_.yAxis && _.yAxis.yAxisFields ? T = _.columns.map((A) => {
+          const M = _.yAxis.yAxisFields.find((k) => k.field === A.field);
+          return M ? { ...A, ...M } : A;
         }).concat(
-          o.dbOptions.yAxis.yAxisFields.filter(
-            (S) => !o.dbOptions.columns.some((E) => E.field === S.field)
+          _.yAxis.yAxisFields.filter(
+            (A) => !_.columns.some((M) => M.field === A.field)
           )
-        ) : x = o.dbOptions.columns, x.map((S) => {
-          let E = {
+        ) : T = _.columns, T.map((A) => {
+          let M = {
             name: "",
-            type: S.type || "line",
-            yAxisIndex: S.yAxisIndex,
-            stack: S.stack,
+            type: A.type || "line",
+            yAxisIndex: A.yAxisIndex,
+            stack: A.stack,
             data: [],
-            lineStyle: S.lineStyle,
-            areaStyle: S.areaStyle
+            lineStyle: A.lineStyle,
+            areaStyle: A.areaStyle
           };
-          m.value.map((T) => {
-            E.name = T[S.title] || S.title, E.data.push(T[S.field]);
-          }), b.push(E);
-        }), _) {
-          if (_.xAxis ? _.xAxis[0].data = w : _.xAxis = [{ data: w }], _.series ? _.series = An({}, _.series, b) : _.series = b, o.dbOptions && o.dbOptions.yAxis && o.dbOptions.yAxis.yAxises) {
-            let S = [];
-            o.dbOptions.yAxis.yAxises.map((E) => {
-              let T = {
-                name: E.name,
+          w.value.map((k) => {
+            M.name = k[A.title] || A.title, M.data.push(k[A.field]);
+          }), x.push(M);
+        }), C) {
+          if (C.xAxis ? C.xAxis[0].data = S : C.xAxis = [{ data: S }], C.series ? C.series = An({}, C.series, x) : C.series = x, _ && _.yAxis && _.yAxis.yAxises) {
+            let A = [];
+            _.yAxis.yAxises.map((M) => {
+              let k = {
+                name: M.name,
                 type: "value",
-                position: E.position,
-                alignTicks: E.alignTicks,
-                offset: E.offset
+                position: M.position,
+                alignTicks: M.alignTicks,
+                offset: M.offset
               };
-              S.push(T);
-            }), _.yAxis = An({}, _.yAxis, S);
+              A.push(k);
+            }), C.yAxis = An({}, C.yAxis, A);
           }
         } else
-          C.xAxis = [{ data: w }], C.series = b;
-      }
-      _ ? l.value = UB(_, o.dbOptions.columns) : l.value = UB(C, o.dbOptions.columns);
+          E.xAxis = [{ data: S }], E.series = x;
+      }
+      C ? l.value = UB(C, _.columns) : l.value = UB(E, _.columns);
+    }, h = (g, m) => {
+      if (g.groupField) {
+        const _ = g.groupField, b = g.xAxisField, w = g.columns && g.columns[0].field, C = m, x = [...new Set(C.map((A) => A[_]))], S = [];
+        x.forEach((A, M) => {
+          C.filter((O) => O[_] === A).forEach((O) => {
+            const V = S.find((L) => L[b] === O[b]);
+            if (V)
+              V[`${_}${M + 1}`] = A, V[`${w}${M + 1}`] = O.contractAmount;
+            else {
+              const L = {
+                [b]: O[b],
+                [`${_}${M + 1}`]: A,
+                [`${w}${M + 1}`]: O.contractAmount
+              };
+              for (let P = 0; P < x.length; P++)
+                P !== M && (L[`${_}${P + 1}`] = "", L[`${w}${P + 1}`] = 0);
+              S.push(L);
+            }
+          });
+        });
+        const E = [];
+        return x.forEach((A, M) => {
+          g.columns.forEach((k, O) => {
+            E.push({
+              // ...column,
+              title: A,
+              field: `${k.field}${M + 1}`
+            });
+          });
+        }), {
+          newDbO: {
+            xAxisField: g.xAxisField,
+            groupField: g.groupField,
+            columns: E,
+            data: S
+          },
+          newData: S
+        };
+      } else
+        return {
+          newDbO: g,
+          newData: m
+        };
     };
     ke(
       () => o.dbOptions.data,
-      (v) => {
-        c.value = Kt(v);
-        const g = ["http://", "https://", void 0];
-        v ? (typeof v == "object" && !v.path && !v.dsKey && !c.value.dataUrl && !(typeof v == "string" && g.some((m) => v.includes(m))) && c.value.loadStaticData(v), (typeof v == "string" || typeof v == "object") && (v.path || v.data && typeof v.data == "string") && c.value.reload(v.data || v)) : console.warn("props.dbOptions.data is undefined");
+      (g) => {
+        c.value = Kt(g);
+        const m = ["http://", "https://", void 0];
+        g ? (typeof g == "object" && !g.path && !g.dsKey && !c.value.dataUrl && !(typeof g == "string" && m.some((_) => g.includes(_))) && c.value.loadStaticData(g), (typeof g == "string" || typeof g == "object") && (g.path || g.data && typeof g.data == "string") && c.value.reload(g.data || g)) : console.warn("props.dbOptions.data is undefined");
       },
       {
         deep: !0
       }
     ), ke(
       () => n["gui-theme"],
-      async (v) => {
+      async (g) => {
         c.value = null, xe(async () => {
-          i++, c.value = Kt(o.dbOptions.data), p(c.value.data), c.value.on("load", (g) => {
-            p(g);
+          i++, c.value = Kt(o.dbOptions.data), p(c.value.data), c.value.on("load", (m) => {
+            p(m);
           });
         });
       },
       { deep: !0 }
     ), xe(async () => {
-      c.value = Kt(o.dbOptions.data), c.value.on("load", (v) => {
-        p(v);
+      c.value = Kt(o.dbOptions.data), c.value.on("load", (g) => {
+        p(g);
       });
     }), t({
       props: o,
@@ -95592,24 +95635,24 @@ const Clt = (e, t) => {
         return f.value;
       }
     });
-    const h = (v) => {
-      a("chart-click", v);
+    const v = (g) => {
+      a("chart-click", g);
     };
-    return (v, g) => {
-      const m = vt("g-chart");
+    return (g, m) => {
+      const _ = vt("g-chart");
       return D(), $("div", Blt, [
-        (D(), Se(m, Pt({ options: l.value }, v.$attrs, {
+        (D(), Se(_, Pt({ options: l.value }, g.$attrs, {
           ref_key: "lineRef",
           ref: u,
           isEmpty: s.value,
           description: e.description,
-          onClick: h,
+          onClick: v,
           key: y(i)
         }), null, 16, ["options", "isEmpty", "description"]))
       ]);
     };
   }
-}), Wlt = /* @__PURE__ */ Qn(Hlt, [["__scopeId", "data-v-1cd424a9"]]), Glt = rr(Wlt), wm = Tr(), Gf = document.documentElement, Ult = (e) => e || "-", Klt = (e) => e || "", Ylt = (e, t) => {
+}), Wlt = /* @__PURE__ */ Qn(Hlt, [["__scopeId", "data-v-7bf18ebb"]]), Glt = rr(Wlt), wm = Tr(), Gf = document.documentElement, Ult = (e) => e || "-", Klt = (e) => e || "", Ylt = (e, t) => {
   let r = [];
   for (let n = 0; n <= e; n++)
     r.push({