g-ui-web 0.10.14 → 0.10.15

package/lib/g-ui-web.js

@@ -48353,7 +48353,7 @@ const mr = (e) => {
       params: r[1] ? Ey.parse(r[1]) : {}
     });
   }
-  return e.path && (t = new bx(e)), e.dsKey && (t = e), !e.path && !e.dsKey && !(typeof e == "string" && UE.some((r) => e.includes(r))) && !["string", "number"].includes(typeof e) && (t = new bx(e)), t;
+  return e != null && e.path && (t = new bx(e)), e != null && e.dsKey && (t = e), !(e != null && e.path) && !(e != null && e.dsKey) && !(typeof e == "string" && UE.some((r) => e.includes(r))) && !["string", "number"].includes(typeof e) && (t = new bx(e)), t;
 }, _x = (e) => Array.isArray(e) ? "数组" : typeof e == "object" && e !== null ? "对象" : typeof e == "string" ? "字符串" : "其他类型";
 var i$e = {
   name: "zh-cn",
@@ -94460,7 +94460,11 @@ const Sst = (e, t) => {
             y.data.push(w[_.field]), y.name = w[_.title] || _.title, y.stack = _.stack;
           }), p.push(y);
         }), d.value.map((_) => {
-          r.dbOptions.direction == "horizontal" ? v.push(c == "function" ? r.dbOptions.xAxisField(_) : _[r.dbOptions.xAxisField]) : h.push(c == "function" ? r.dbOptions.xAxisField(_) : _[r.dbOptions.xAxisField]);
+          r.dbOptions.direction == "horizontal" ? v.push(
+            c == "function" ? r.dbOptions.xAxisField(_) : _[r.dbOptions.xAxisField]
+          ) : h.push(
+            c == "function" ? r.dbOptions.xAxisField(_) : _[r.dbOptions.xAxisField]
+          );
         }), r.dbOptions.direction == "horizontal" ? h.push({ type: "value", name: "" }) : v.push({ type: "value", name: "" }), f ? (r.dbOptions.direction == "horizontal" ? (f.yAxis ? f.yAxis[0].data = v : f.yAxis = [{ data: v }], f.xAxis ? f.xAxis = Vn({}, f.xAxis, h) : f.xAxis = h) : (f.xAxis ? f.xAxis[0].data = h : f.xAxis = [{ data: h }], f.yAxis ? f.yAxis = Vn({}, f.yAxis, v) : f.yAxis = v), f.series ? f.series = Vn({}, f.series, p) : f.series = p) : (r.dbOptions.direction == "horizontal" ? (g.xAxis = h, g.yAxis = [{ data: v }]) : (g.xAxis = [{ data: h }], g.yAxis = v), g.series = p), r.dbOptions && r.dbOptions.yAxis && r.dbOptions.yAxis.yAxises) {
           let _ = [];
           r.dbOptions.yAxis.yAxises.map((y) => {
@@ -94475,7 +94479,15 @@ const Sst = (e, t) => {
           }), r.dbOptions.direction == "horizontal" ? f.xAxis = Vn({}, f.xAxis, _) : f.yAxis = Vn({}, f.yAxis, _);
         }
       }
-      f ? n.value = yB(f, r.dbOptions.columns.length, r.dbOptions.direction) : n.value = yB(g, r.dbOptions.columns.length, r.dbOptions.direction);
+      f ? n.value = yB(
+        f,
+        r.dbOptions.columns.length,
+        r.dbOptions.direction
+      ) : n.value = yB(
+        g,
+        r.dbOptions.columns.length,
+        r.dbOptions.direction
+      );
     };
     return Me(
       () => r.dbOptions.data,
@@ -94510,7 +94522,7 @@ const Sst = (e, t) => {
       ]);
     };
   }
-}), Nst = /* @__PURE__ */ ma(Lst, [["__scopeId", "data-v-4e402101"]]), Pst = tr(Nst), $b = Jn(), $st = {
+}), Nst = /* @__PURE__ */ ma(Lst, [["__scopeId", "data-v-f68384a8"]]), Pst = tr(Nst), $b = Jn(), $st = {
   backgroundColor: $b.chartOption.backgroundColor,
   color: $b.chartOption.colors,
   tooltip: {
@@ -94726,59 +94738,67 @@ const Sst = (e, t) => {
   },
   setup(e, { expose: t }) {
     const r = Jn(), n = e, a = z();
-    let o = z([]), i = n.options;
-    const s = z({});
-    let l = [], u = [], c = [], d = z(0);
-    const f = z(null);
-    let p = {
+    let o = n.options;
+    const i = z({});
+    let s = [], l = [], u = [], c = z(0);
+    const d = z(null);
+    let f = {
       xAxis: [],
       yAxis: [],
       series: []
     };
-    const h = async (g) => {
-      const m = Sg(n.dbOptions.xAxisField);
-      if (o.value = g, o.value && n.dbOptions) {
-        let _ = [];
-        n.dbOptions.yAxis && n.dbOptions.yAxis.yAxisFields ? _ = n.dbOptions.columns.map((w) => {
-          const C = n.dbOptions.yAxis.yAxisFields.find((x) => x.field === w.field);
-          return C ? { ...w, ...C } : w;
+    const p = () => {
+      f = {
+        xAxis: [],
+        yAxis: [],
+        series: []
+      }, s = [], l = [], u = [];
+    }, h = async (g) => {
+      let m = z([]);
+      p();
+      const _ = Sg(n.dbOptions.xAxisField);
+      if (m.value = g, m.value && n.dbOptions) {
+        let y = [];
+        n.dbOptions.yAxis && n.dbOptions.yAxis.yAxisFields ? y = n.dbOptions.columns.map((C) => {
+          const x = n.dbOptions.yAxis.yAxisFields.find((S) => S.field === C.field);
+          return x ? { ...C, ...x } : C;
         }).concat(
           n.dbOptions.yAxis.yAxisFields.filter(
-            (w) => !n.dbOptions.columns.some((C) => C.field === w.field)
+            (C) => !n.dbOptions.columns.some((x) => x.field === C.field)
           )
-        ) : _ = n.dbOptions.columns;
-        let y = [];
-        if (_.map((w) => {
-          let C = {
-            name: w.title,
-            type: w.type,
-            yAxisIndex: w.yAxisIndex,
-            stack: w.stack,
+        ) : y = n.dbOptions.columns;
+        let w = [];
+        if (y.map((C) => {
+          let x = {
+            name: C.title,
+            type: C.type,
+            yAxisIndex: C.yAxisIndex,
+            stack: C.stack,
             data: []
           };
-          o.value.map((x) => {
-            C.name = x[w.title] || w.title, C.data.push(x[w.field]);
-          }), l.push(C), w.type == "bar" && y.push(w);
-        }), y.length > 0 && (d.value = y.length), o.value.map((w) => {
-          u.push(m == "function" ? n.dbOptions.xAxisField(w) : w[n.dbOptions.xAxisField]);
-        }), i) {
-          if (i.xAxis ? i.xAxis[0].data = u : i.xAxis = [{ data: u }], i.yAxis ? i.yAxis = Vn({}, i.yAxis, c) : i.yAxis = c, i.series ? i.series = Vn({}, i.series, l) : i.series = l, n.dbOptions && n.dbOptions.yAxis && n.dbOptions.yAxis.yAxises) {
-            let w = [];
-            n.dbOptions.yAxis.yAxises.map((C) => {
-              let x = {
-                name: C.name,
+          m.value.map((S) => {
+            x.name = S[C.title] || C.title, x.data.push(S[C.field]);
+          }), s.push(x), C.type == "bar" && w.push(C);
+        }), w.length > 0 && (c.value = w.length), m.value.map((C) => {
+          l.push(_ == "function" ? n.dbOptions.xAxisField(C) : C[n.dbOptions.xAxisField]);
+        }), o) {
+          if (o.xAxis ? o.xAxis[0].data = l : o.xAxis = [{ data: l }], o.yAxis ? o.yAxis = Vn({}, o.yAxis, u) : o.yAxis = u, o.series ? o.series = Vn({}, o.series, s) : o.series = s, n.dbOptions && n.dbOptions.yAxis && n.dbOptions.yAxis.yAxises) {
+            let C = [];
+            n.dbOptions.yAxis.yAxises.map((x) => {
+              let S = {
+                name: x.name,
                 type: "value",
-                position: C.position,
-                alignTicks: C.alignTicks,
-                offset: C.offset
+                position: x.position,
+                alignTicks: x.alignTicks,
+                offset: x.offset
               };
-              w.push(x);
-            }), i.yAxis = Vn({}, i.yAxis, w);
+              C.push(S);
+            }), o.yAxis = Vn({}, o.yAxis, C);
           }
         } else
-          p.xAxis = [{ data: u }], p.yAxis = c, p.series = l;
+          f.xAxis = [{ data: l }], f.yAxis = u, f.series = s;
       }
-      i ? (v(i), a.value = _B(i, d.value)) : (v(i), a.value = _B(p, d.value));
+      o ? (v(o), a.value = _B(o, c.value)) : (v(o), a.value = _B(f, c.value));
     }, v = (g) => {
       let m = [], _ = [];
       return g.series.length > 0 && g.series.map((y, w) => {
@@ -94797,36 +94817,36 @@ const Sst = (e, t) => {
             }
           });
         });
-      }), console.log(g), g;
+      }), g;
     };
     return Me(
       () => n.dbOptions.data,
       (g) => {
-        s.value = mr(g);
+        i.value = mr(g);
         const m = ["http://", "https://", void 0];
-        !g.path && !g.dsKey && !s.value.dataUrl && !(typeof g == "string" && m.some((_) => g.includes(_))) && s.value.loadStaticData(g), (typeof g == "string" || g.path) && s.value.reload(g.data);
+        !g.path && !g.dsKey && !i.value.dataUrl && !(typeof g == "string" && m.some((_) => g.includes(_))) && i.value.loadStaticData(g), (typeof g == "string" || g.path) && i.value.reload(g.data);
       },
       {
         deep: !0
       }
     ), xe(async () => {
-      s.value = mr(n.dbOptions.data), s.value.on("load", (g) => {
+      i.value = mr(n.dbOptions.data), i.value.on("load", (g) => {
         h(g);
       });
     }), t({
       props: n,
-      barLineRef: f
+      barLineRef: d
     }), (g, m) => {
       const _ = xt("g-chart");
       return k(), F("div", Gst, [
         fe(_, $t({ options: a.value }, g.$attrs, {
           ref_key: "barLineRef",
-          ref: f
+          ref: d
         }), null, 16, ["options"])
       ]);
     };
   }
-}), Kst = /* @__PURE__ */ ma(jst, [["__scopeId", "data-v-25d6e4cf"]]), Yst = tr(Kst), Uh = Jn(), qst = (e) => {
+}), Kst = /* @__PURE__ */ ma(jst, [["__scopeId", "data-v-84757fc5"]]), Yst = tr(Kst), Uh = Jn(), qst = (e) => {
   let t = [];
   return e == "pie" ? t = [
     {