g-ui-web 1.0.21 → 1.0.22

package/lib/g-ui-web.js

@@ -115170,9 +115170,18 @@ const b6t = { class: "g-datatable" }, _6t = H({
     const h = (C) => {
       const x = [];
       return C.forEach((S) => {
-        let E = x.find((A) => A.source === S.source);
-        E || (E = { source: S.source, count: S.count, children: [] }, x.push(E));
-        const T = { source1: S.source1, count1: S.count1 };
+        let E = x.find(
+          (A) => A[o.dbOptions.axisField] === S[o.dbOptions.axisField]
+        );
+        E || (E = {
+          [o.dbOptions.axisField]: S[o.dbOptions.axisField],
+          [o.dbOptions.dataField]: S[o.dbOptions.dataField],
+          children: []
+        }, x.push(E));
+        const T = {
+          [o.dbOptions.cDataField]: S[o.dbOptions.cDataField],
+          [o.dbOptions.cAxisField]: S[o.dbOptions.cAxisField]
+        };
         E.children.push(T);
       }), x;
     }, v = B({}), g = o.dbOptions.columns.find((C) => C.field === o.dbOptions.dataField), m = async (C) => {
@@ -115308,7 +115317,7 @@ const b6t = { class: "g-datatable" }, _6t = H({
       ], 2);
     };
   }
-}), M8t = /* @__PURE__ */ Qn(A8t, [["__scopeId", "data-v-50060849"]]), k8t = tr(M8t), D8t = { class: "g-calendar" }, O8t = { class: "g-calendar-header" }, I8t = { class: "switch-box" }, L8t = { class: "switch-box1" }, R8t = { class: "switch-box2" }, P8t = {
+}), M8t = /* @__PURE__ */ Qn(A8t, [["__scopeId", "data-v-5b1d7bcd"]]), k8t = tr(M8t), D8t = { class: "g-calendar" }, O8t = { class: "g-calendar-header" }, I8t = { class: "switch-box" }, L8t = { class: "switch-box1" }, R8t = { class: "switch-box2" }, P8t = {
   key: 0,
   class: "todoList"
 }, N8t = { class: "popover-inbox" }, $8t = ["onClick"], V8t = {