@ecan-bi/tools 1.0.17 → 1.0.19

package/dist/index.es.js

@@ -1,13 +1,13 @@
-/*! @ecan-bi/tools@1.0.17 */
-var Qe = Object.defineProperty, qe = Object.defineProperties;
+/*! @ecan-bi/tools@1.0.19 */
+var Pe = Object.defineProperty, qe = Object.defineProperties;
 var Xe = Object.getOwnPropertyDescriptors;
-var se = Object.getOwnPropertySymbols;
+var de = Object.getOwnPropertySymbols;
 var Ke = Object.prototype.hasOwnProperty, Ue = Object.prototype.propertyIsEnumerable;
-var Be = (e, o, l) => o in e ? Qe(e, o, { enumerable: !0, configurable: !0, writable: !0, value: l }) : e[o] = l, C = (e, o) => {
+var Be = (e, o, l) => o in e ? Pe(e, o, { enumerable: !0, configurable: !0, writable: !0, value: l }) : e[o] = l, C = (e, o) => {
   for (var l in o || (o = {}))
     Ke.call(o, l) && Be(e, l, o[l]);
-  if (se)
-    for (var l of se(o))
+  if (de)
+    for (var l of de(o))
       Ue.call(o, l) && Be(e, l, o[l]);
   return e;
 }, Y = (e, o) => qe(e, Xe(o));
@@ -15,8 +15,8 @@ var Se = (e, o) => {
   var l = {};
   for (var t in e)
     Ke.call(e, t) && o.indexOf(t) < 0 && (l[t] = e[t]);
-  if (e != null && se)
-    for (var t of se(e))
+  if (e != null && de)
+    for (var t of de(e))
       o.indexOf(t) < 0 && Ue.call(e, t) && (l[t] = e[t]);
   return l;
 };
@@ -38,7 +38,7 @@ var We = (e, o, l) => new Promise((t, y) => {
 });
 import { unref as V, computed as oe } from "vue";
 import $ from "dayjs";
-import { cloneDeep as ue } from "lodash-es";
+import { cloneDeep as fe } from "lodash-es";
 const we = (e, o) => {
   const l = C({
     dayjs: $
@@ -83,10 +83,10 @@ const we = (e, o) => {
     }
   }
   return !1;
-}, W = (e, o) => Object.prototype.hasOwnProperty.call(e, o), ce = (e) => {
+}, W = (e, o) => Object.prototype.hasOwnProperty.call(e, o), ue = (e) => {
   const o = [];
   for (const l of e)
-    l.conditions ? o.push(...ce(l.conditions)) : (l == null ? void 0 : l.dataType) === "component" && o.push(l);
+    l.conditions ? o.push(...ue(l.conditions)) : (l == null ? void 0 : l.dataType) === "component" && o.push(l);
   return o;
 };
 function Je(e) {
@@ -154,31 +154,32 @@ function ll(s) {
       }
       if ((r = Object.keys(b)) != null && r.length) {
         const u = [];
-        for (const x in b)
+        for (const g in b)
           u.push(
             new Promise((c, m) => {
               o.post(
                 `${l}/diagram/hrpIndexWithComplex`,
                 {
                   pageId: t,
-                  indexGuid: x,
-                  indexCode: b[x],
+                  indexGuid: g,
+                  indexCode: b[g],
                   dataSourceId: y
                 }
-              ).then((g) => {
+              ).then((x) => {
                 var v;
-                const { success: w, data: N = [] } = g.data;
+                const { success: w, data: N = [] } = x.data;
                 w && ((v = N == null ? void 0 : N.dataViewColumns) != null && v.length) ? c(N.dataViewColumns) : m(N);
-              }).catch((g) => {
-                m(g);
+              }).catch((x) => {
+                console.error(x), m(x);
               });
             })
           );
         return (yield Promise.all(u)).reduce(
-          (x, c) => x.filter((m) => c.find((g) => g.typeGuid === m.typeGuid))
-        ).filter((x) => x.typeGuid);
+          (g, c) => g.filter((m) => c.find((x) => x.typeGuid === m.typeGuid))
+        ).filter((g) => g.typeGuid);
       }
     } catch (d) {
+      console.error(d);
     }
     return [];
   });
@@ -194,7 +195,7 @@ const tl = [
   "customValue",
   "id",
   "keyName"
-], ye = (e) => ze.get(e), il = (e, o = {}) => {
+], ce = (e) => ze.get(e), il = (e, o = {}) => {
   const { around: l, unit: t, id: y } = e;
   let s = "";
   const { pageMode: r = "", componentList: d = [] } = (o == null ? void 0 : o.graphicConfig) || {};
@@ -203,19 +204,19 @@ const tl = [
     const f = d == null ? void 0 : d.find((c) => c.id === y);
     if (!f)
       return [];
-    const { interval: a, intervalUnit: b, startTime: u, endTime: S, operate: A, useCurrentTime: x } = f || {};
-    if (x && (n = $().subtract(a, b), i = $()), u && (n = $(u)), S && (i = $(S)), A) {
-      const { type: c, value: m, mode: g } = A;
+    const { interval: a, intervalUnit: b, startTime: u, endTime: S, operate: A, useCurrentTime: g } = f || {};
+    if (g && (n = $().subtract(a, b), i = $()), u && (n = $(u)), S && (i = $(S)), A) {
+      const { type: c, value: m, mode: x } = A;
       switch (c) {
         case "add":
-          n = n && n.add(m, g), i = i && i.add(m, g);
+          n = n && n.add(m, x), i = i && i.add(m, x);
           break;
         case "minus":
-          n = n && n.subtract(m, g), i = i && i.subtract(m, g);
+          n = n && n.subtract(m, x), i = i && i.subtract(m, x);
       }
     }
   } else {
-    const f = ye(y) || {};
+    const f = ce(y) || {};
     V(f.startTime) && (n = $(V(f.startTime))), V(f.endTime) && (i = $(V(f.endTime)));
   }
   if (n && i) {
@@ -249,7 +250,7 @@ const tl = [
   }
 }, le = (e, o) => {
   const l = [];
-  return e != null && e.length && ue(e).forEach((t) => {
+  return e != null && e.length && fe(e).forEach((t) => {
     if (t.join && t.conditions) {
       const y = !t.conditions.some((s) => s.join && s.conditions);
       t.conditions.forEach((s, r) => {
@@ -270,7 +271,7 @@ const tl = [
   }), l;
 }, Ae = (e = {}, o) => {
   if (e != null && e.sortCpnts && o) {
-    const w = Pe(e);
+    const w = Qe(e);
     w && (o.sort = w);
   }
   const {
@@ -288,13 +289,13 @@ const tl = [
     conditions: u,
     aggregate: S,
     distinct: A,
-    dimByCount: x,
+    dimByCount: g,
     dataTo: c
   } = e;
   let m;
   if (u && (m = le(u)), n === "COMPONENT") {
     const w = {};
-    return me(w, f), {
+    return ye(w, f), {
       label: l.trim(),
       columnName: t,
       show: s,
@@ -303,7 +304,7 @@ const tl = [
       componentValue: w.fieldValue || null
     };
   }
-  const g = {
+  const x = {
     label: l.trim(),
     columnName: t,
     location: y,
@@ -321,19 +322,19 @@ const tl = [
     const w = a.split("-");
     if ((w == null ? void 0 : w.length) === 3) {
       let N = w[0];
-      return w[2] === "before" && w[0] !== "0" && (N = `-${w[0]}`), Y(C({}, g), {
+      return w[2] === "before" && w[0] !== "0" && (N = `-${w[0]}`), Y(C({}, x), {
         calcWays: [N],
         dateCalcTypes: [w[1]]
       });
     }
   } else
-    return t === "the_count" && (g.calcType = "AGGREGATE", g.distinct = !!A, g.typeGuid = x), Y(C({}, g), {
+    return t === "the_count" && (x.calcType = "AGGREGATE", x.distinct = !!A, x.typeGuid = g), Y(C({}, x), {
       builtInCalcWay: a
     });
 }, nl = (e) => {
   if (!e)
     return [];
-  const o = ue((e == null ? void 0 : e.controlList) || []).filter((S) => S.conditionKey !== "parentCode"), {
+  const o = fe((e == null ? void 0 : e.controlList) || []).filter((S) => S.conditionKey !== "parentCode"), {
     classificationList: l = [],
     rowHeaderList: t = [],
     dimensionList: y = [],
@@ -355,9 +356,9 @@ const tl = [
     ...i
   ], a = [];
   for (const S of f) {
-    const A = ce((S == null ? void 0 : S.conditions) || []);
+    const A = ue((S == null ? void 0 : S.conditions) || []);
     if (A != null && A.length) {
-      const x = A.filter((c) => (c == null ? void 0 : c.dataType) === "component").map((c) => {
+      const g = A.filter((c) => (c == null ? void 0 : c.dataType) === "component").map((c) => {
         const m = {};
         return c != null && c.dateFormat && (m.format = c.dateFormat), c.fieldValue === "PARENT" && (m.id = "PARENT", m.keyName = c.modelKey, m.modelKey = c.modelKey, m.prop = c.prop), C({
           conditionKey: c.fieldName,
@@ -373,8 +374,8 @@ const tl = [
           indexCodeNum: c.indexCodeNum
         }, m);
       });
-      if (x != null && x.length)
-        for (const c of x)
+      if (g != null && g.length)
+        for (const c of g)
           a.find((m) => m.keyName === c.keyName) || a.push(c);
     }
   }
@@ -384,19 +385,19 @@ const tl = [
     if ((A == null ? void 0 : A.conditionKey) === "parentCode")
       continue;
     const {
-      id: x,
+      id: g,
       keyName: c,
       prop: m,
-      format: g,
+      format: x,
       modelKey: w,
       dataType: N = "component",
       customValue: v
     } = A, E = $e(A);
-    me(E, x, { prop: m, dateFormat: g, modelKey: w, keyName: c }), N === "" && (E.fieldValue = v || ""), u.push(E);
+    ye(E, g, { prop: m, dateFormat: x, modelKey: w, keyName: c }), N === "" && (E.fieldValue = v || ""), u.push(E);
   }
   for (let S = u.length - 1; S >= 0; S--) {
     const A = u[S];
-    A.globalCondition || ce(u).find((c) => c.alias === A.alias && c.globalCondition) && u.splice(S, 1);
+    A.globalCondition || ue(u).find((c) => c.alias === A.alias && c.globalCondition) && u.splice(S, 1);
   }
   return u;
 };
@@ -449,7 +450,7 @@ function He(e) {
           dataType: d = "component",
           customValue: n
         } = o, i = $e(o);
-        me(i, l, { prop: y, dateFormat: r, modelKey: s, keyName: t }), d === "" && (i.fieldValue = n || "");
+        ye(i, l, { prop: y, dateFormat: r, modelKey: s, keyName: t }), d === "" && (i.fieldValue = n || "");
         for (const f in i)
           o[f] = i[f];
         for (const f of tl)
@@ -467,7 +468,7 @@ function rl(e) {
           valueType: l.variableType,
           alias: l.keyName || ""
         };
-        me(t, l.id, {
+        ye(t, l.id, {
           dateFormat: l.format,
           prop: l.dateTypeValue,
           keyName: l.keyName,
@@ -479,23 +480,23 @@ function rl(e) {
   }
   return o;
 }
-function me(e, o, l) {
+function ye(e, o, l) {
   const { prop: t = "", dateFormat: y = "", modelKey: s = "", keyName: r = "", operateValue: d, operateMode: n, operateType: i } = l || {}, f = s || r;
   if (o === "PARENT" && f && t) {
     const m = window.config.record;
-    let g = t, w = y;
+    let x = t, w = y;
     const N = t.match(/\{(.+?)\}/g);
     if (N != null && N.length) {
       const v = N[0].slice(1, -1).trim();
-      g = t.replace(N[0], ""), w = v, e.dateFormat = w;
+      x = t.replace(N[0], ""), w = v, e.dateFormat = w;
     }
     if (m && m[f]) {
-      const v = V(m[f][g]);
+      const v = V(m[f][x]);
       $.isDayjs(v) ? e.fieldValue = v.format(w || "YYYY-MM-DD") : e.fieldValue = v;
     }
     return;
   }
-  const a = ye(o) || {}, { value: b, format: u = "YYYY-MM-DD", type: S = "", useCurrentTime: A, RECORD: x } = a || {}, c = y || u;
+  const a = ce(o) || {}, { value: b, format: u = "YYYY-MM-DD", type: S = "", useCurrentTime: A, RECORD: g } = a || {}, c = y || u;
   if (K(a.type, "date")) {
     let m;
     if (A ? b ? m = V(b) : m = $() : m = V(b), d && n && i)
@@ -516,40 +517,40 @@ function me(e, o, l) {
     }
     if (!m)
       return;
-    let g = null;
-    if (V(a[m]) && (g = $(V(a[m]))), d && n && i) {
+    let x = null;
+    if (V(a[m]) && (x = $(V(a[m]))), d && n && i) {
       if (d === "rangeValue") {
         if (a.startTime && a.endTime) {
           const w = V(a.endTime).diff(V(a.startTime), n) + 1;
           switch (i) {
             case "add":
-              g = g && g.add(w, n);
+              x = x && x.add(w, n);
               break;
             case "minus":
-              g = g && g.subtract(w, n);
+              x = x && x.subtract(w, n);
           }
         }
       } else if (!isNaN(+d))
         switch (i) {
           case "add":
-            g = g && g.add(d, n);
+            x = x && x.add(d, n);
             break;
           case "minus":
-            g = g && g.subtract(d, n);
+            x = x && x.subtract(d, n);
         }
     }
-    if (g && (e.fieldValue = g == null ? void 0 : g.format(c)), m === "rangeValue" && a.startTime && a.endTime) {
+    if (x && (e.fieldValue = x == null ? void 0 : x.format(c)), m === "rangeValue" && a.startTime && a.endTime) {
       const w = Je(c);
       w && (e.fieldValue = V(a.endTime).diff(V(a.startTime), w) + 1);
     }
     e.dateFormat = c;
   } else
-    K(S, ol) ? s && x ? e.fieldValue = x[s] : !s && x ? e.fieldValue = x.value : e.fieldValue = V(b) : e.fieldValue = V(b);
+    K(S, ol) ? s && g ? e.fieldValue = g[s] : !s && g ? e.fieldValue = g.value : e.fieldValue = V(b) : e.fieldValue = V(b);
 }
-const fe = (e) => {
+const se = (e) => {
   var o;
   if (e) {
-    const l = Array.isArray(e) ? ue(e) : [ue(e)];
+    const l = Array.isArray(e) ? fe(e) : [fe(e)];
     let t = "", y = [];
     const s = [], r = [], d = [];
     for (const n of l) {
@@ -573,11 +574,11 @@ const fe = (e) => {
     };
   } else
     return e;
-}, Pe = (e) => {
+}, Qe = (e) => {
   const { sortCpnts: o = [] } = e;
   let l, t = "";
   for (const y of o) {
-    const s = ye(y) || {}, { type: r, RECORD: d } = s;
+    const s = ce(y) || {}, { type: r, RECORD: d } = s;
     if (K(r, "image") && K(d == null ? void 0 : d.value, ["asc", "desc"])) {
       t = d.value.toUpperCase();
       break;
@@ -608,10 +609,10 @@ const fe = (e) => {
     rowHeaderList: S = [],
     dimensionList: A = [],
     // 文本组件的维度列表
-    seriesList: x = [],
+    seriesList: g = [],
     leftAxisList: c = [],
     rightAxisList: m = [],
-    queryColumnList: g = [],
+    queryColumnList: x = [],
     indicators: w = [],
     controlList: N = [],
     formFields: v = {},
@@ -620,7 +621,7 @@ const fe = (e) => {
     // dataSourceId, // 所属数据源ID
     idxLibMode: re,
     // 指标库模式, source= INDICATOR_LIB时候必填, NORMAL_YEAR_TABLE = 普通年表, WITH_DATE_DIM_TABLE = 带有时间维度表
-    preview: xe = !1,
+    preview: me = !1,
     // 预览开关
     edvDataSetId: Le
     // 数据集id
@@ -645,7 +646,7 @@ const fe = (e) => {
   I != null && I.length && (I = le(I, "1")), a == null && (K(t, ["table", "card"]) || K(t, ["list", "circulate"]) && (u == null ? void 0 : u.length) > 1 ? a = "1" : K(t, ["select", "checkbox", "radio"]) ? a = "3" : a = "2");
   let H;
   const Ce = [];
-  let ge = "";
+  let xe = "";
   if (Array.isArray(u) && u.length > 0 && (!["ecanList", "ecanCirculate"].includes(t) || (u == null ? void 0 : u.length) === 1)) {
     const L = u.length;
     for (let T = 0; T < L; T++) {
@@ -653,7 +654,7 @@ const fe = (e) => {
         label: G = "",
         name: D = "",
         show: j = !1,
-        sort: P,
+        sort: Q,
         customGroup: q,
         conditions: F,
         dateFormat: k,
@@ -661,11 +662,11 @@ const fe = (e) => {
         truncations: M = []
       } = p;
       if (j || L === 1) {
-        ge = R, H = {
+        xe = R, H = {
           label: G.trim(),
           columnName: D,
           show: j,
-          sort: Pe(p) || fe(P) || P,
+          sort: Qe(p) || se(Q) || Q,
           customGroup: q,
           conditions: le(F),
           typeGuid: R
@@ -674,8 +675,8 @@ const fe = (e) => {
         if (Array.isArray(M) && M.length > 0) {
           const U = M.length;
           for (let _ = 0; _ < U; _++) {
-            const z = M[_] || {}, { rule: Q = "", num: X = 0, name: ee = "" } = z;
-            Q && X && (h.num = X, h.rule = Q, ee && (h.otherGroupName = ee));
+            const z = M[_] || {}, { rule: P = "", num: X = 0, name: ee = "" } = z;
+            P && X && (h.num = X, h.rule = P, ee && (h.otherGroupName = ee));
           }
         }
         if ((Fe = Object.keys(h)) != null && Fe.length && (H.truncation = h), K(t, ["scatter", "valueline"]))
@@ -686,16 +687,16 @@ const fe = (e) => {
     }
   }
   let Te;
-  if (Array.isArray(x) && x.length > 0) {
-    const L = x.length;
+  if (Array.isArray(g) && g.length > 0) {
+    const L = g.length;
     for (let T = 0; T < L; T++) {
-      const p = x[T] || {}, { label: G = "", name: D = "", show: j = !1, sort: P, customGroup: q, conditions: F, typeGuid: k } = p;
+      const p = g[T] || {}, { label: G = "", name: D = "", show: j = !1, sort: Q, customGroup: q, conditions: F, typeGuid: k } = p;
       if (j || L === 1) {
         Te = {
           label: G.trim(),
           columnName: D,
           show: j,
-          sort: fe(P),
+          sort: se(Q),
           customGroup: q,
           conditions: le(F),
           typeGuid: k
@@ -715,12 +716,12 @@ const fe = (e) => {
     L.location = "LEFT", B.push(Ae(L, H));
   });
   const J = [];
-  ["ecanList", "ecanCirculate"].includes(t) && (u == null ? void 0 : u.length) > 1 && (g = u), (Ie = (Ve = o == null ? void 0 : o.pivotTableCal) == null ? void 0 : Ve.dimensions) != null && Ie.length && (g = o.pivotTableCal.dimensions), g == null || g.forEach((L) => {
-    const { label: T, name: p, location: G, show: D, indexCode: j, sort: P, typeGuid: q, indexCodeNum: F, dateFormat: k, conditions: R } = L;
-    let M = fe(P);
+  ["ecanList", "ecanCirculate"].includes(t) && (u == null ? void 0 : u.length) > 1 && (x = u), (Ie = (Ve = o == null ? void 0 : o.pivotTableCal) == null ? void 0 : Ve.dimensions) != null && Ie.length && (x = o.pivotTableCal.dimensions), x == null || x.forEach((L) => {
+    const { label: T, name: p, location: G, show: D, indexCode: j, sort: Q, typeGuid: q, indexCodeNum: F, dateFormat: k, conditions: R } = L;
+    let M = se(Q);
     if (o.sort) {
       const { field: U, order: _ } = o.sort;
-      let z = B.find((Q) => Q.label === U);
+      let z = B.find((P) => P.label === U);
       !z && T === U && (z = L), z && (M = {
         columnName: z.columnName,
         label: o.sort.field,
@@ -746,15 +747,15 @@ const fe = (e) => {
   if (Array.isArray(S) && S.length > 0 ? O = S : Array.isArray(A) && A.length > 0 && (O = A), O != null && O.length) {
     const L = O.length;
     for (let T = 0; T < L; T++) {
-      const p = O[T] || {}, { label: G = "", name: D = "", show: j = !1, sort: P, customGroup: q, conditions: F, truncations: k, typeGuid: R = "", dateFormat: M } = p;
-      let h = fe(P);
+      const p = O[T] || {}, { label: G = "", name: D = "", show: j = !1, sort: Q, customGroup: q, conditions: F, truncations: k, typeGuid: R = "", dateFormat: M } = p;
+      let h = se(Q);
       if (o.sort) {
-        const { field: z, order: Q } = o.sort;
+        const { field: z, order: P } = o.sort;
         let X = B.find((ee) => ee.label === z);
         !X && p.label === z && (X = p), X && (h = {
           columnName: X.columnName,
           label: o.sort.field,
-          order: Q.toUpperCase(),
+          order: P.toUpperCase(),
           type: "NORMAL"
         });
       }
@@ -771,15 +772,15 @@ const fe = (e) => {
       const _ = {};
       if (Array.isArray(k) && k.length > 0) {
         const z = k.length;
-        for (let Q = 0; Q < z; Q++) {
-          const X = k[Q] || {}, { rule: ee = "", num: Re = 0, name: Ye = "" } = X;
+        for (let P = 0; P < z; P++) {
+          const X = k[P] || {}, { rule: ee = "", num: Re = 0, name: Ye = "" } = X;
           ee && Re && (_.num = Re, _.rule = ee, Ye && (_.otherGroupName = Ye));
         }
       }
       (he = Object.keys(_)) != null && he.length && (U.truncation = _), ne.push(U);
     }
   }
-  let be = [], pe;
+  let ge = [], pe;
   if (o != null && o.pivotTableCal) {
     let L = [];
     const {
@@ -788,7 +789,7 @@ const fe = (e) => {
       truncations: G = [],
       sorts: D = [],
       aggregateMethod: j = [],
-      rowDimensionKeys: P = [],
+      rowDimensionKeys: Q = [],
       colDimensionKeys: q = []
     } = o.pivotTableCal;
     if (B.push(...T), p != null && p.length)
@@ -820,9 +821,9 @@ const fe = (e) => {
         const k = J.find((R) => R.label === F);
         k && ((De = j[F]) != null && De.length) && (k.aggregateMethod = j[F]);
       }
-    ne = [], be = [];
+    ne = [], ge = [];
     for (const F of J)
-      P.includes(F.columnName) ? ne.push(F) : q.includes(F.columnName) && be.push(F);
+      Q.includes(F.columnName) ? ne.push(F) : q.includes(F.columnName) && ge.push(F);
   }
   if (K(t, ["text", "proportion", "counter"]) ? b = "zb" : K(t, ["valueline"]) && (b = "valueline"), s || t === "card") {
     if (ne.length === 0 || B.length === 0)
@@ -833,7 +834,7 @@ const fe = (e) => {
       return;
     if (a === "2" && B.length === 0)
       return;
-    if (a === "3" && (!ge && n !== "EDV_DATA_SET" || !v.labelField || !v.valueField))
+    if (a === "3" && (!xe && n !== "EDV_DATA_SET" || !v.labelField || !v.valueField))
       return;
     if (a === "3" && t === "ecanDataSelect" && B.length === 0)
       return;
@@ -845,24 +846,24 @@ const fe = (e) => {
       T != null && T.length && (r = T[T.length - 1]);
     }
   }
-  let de;
+  let be;
   if (!K(t, ["scatter", "valueline"]) && ((je = Object.keys(v)) != null && je.length)) {
-    const L = ce(N).find((p) => p.conditionKey === "parentCode"), T = {};
+    const L = ue(N).find((p) => p.conditionKey === "parentCode"), T = {};
     if (L) {
-      const p = ye(L.id) || {};
+      const p = ce(L.id) || {};
       if (p != null && p.itemCodes)
         T.parentItemCodes = p.itemCodes;
       else
         return;
     }
-    t === "ecanDataSelect" && (T.indicatorList = B.filter((p) => p.show)), n === "EDV_DATA_SET" && (T.edvDataSetId = Le), de = C({
+    t === "ecanDataSelect" && (T.indicatorList = B.filter((p) => p.show)), n === "EDV_DATA_SET" && (T.edvDataSetId = Le), be = C({
       url: "/diagram/formData",
       source: n,
       dataViewId: i,
       plugin: "4",
       layer: a,
       chartType: "normalSelect",
-      rangeIndexTypeGuid: ge,
+      rangeIndexTypeGuid: xe,
       type: t === "ecanDataSelect" ? "normalSelectData" : "normalSelect",
       labelField: v.labelField,
       valueField: v.valueField,
@@ -877,7 +878,7 @@ const fe = (e) => {
       classifications: Ce
     } : L = {
       classification: H
-    }, de = C({
+    }, be = C({
       url: "/diagram",
       source: n,
       dataViewId: i,
@@ -895,15 +896,15 @@ const fe = (e) => {
         return p && Array.isArray(p) && (G.fieldValue = JSON.stringify(p)), C(C({}, T), G);
       }),
       idxLibMode: re,
-      preview: xe,
+      preview: me,
       rowHeaders: ne,
       keyName: e.keyName,
       // 透视表指标排序相关入参
       columnData: pe,
-      columnHeaders: be
+      columnHeaders: ge
     }, L);
   }
-  return console.log("resultParams", de), de;
+  return be;
 }, dl = {
   formatIndicatorParams: al
 }, sl = (e = [], o) => {
@@ -913,8 +914,8 @@ const fe = (e) => {
   if (r === 1) {
     const f = [];
     for (let b = 0; b < d; b++) {
-      const u = t[b], { label: S, value: A } = u, x = Y(C({}, e[0]), { value: e[0][A] });
-      y.add(S), f.push(x);
+      const u = t[b], { label: S, value: A } = u, g = Y(C({}, e[0]), { value: e[0][A] });
+      y.add(S), f.push(g);
     }
     const a = e[0][l] || "";
     s.set(a, f);
@@ -923,7 +924,7 @@ const fe = (e) => {
       const a = e[f], b = a[l];
       y.add(b);
       for (let u = 0; u < d; u++) {
-        const S = t[u], { label: A, value: x } = S, c = Y(C({}, a), { value: a[x] });
+        const S = t[u], { label: A, value: g } = S, c = Y(C({}, a), { value: a[g] });
         if (s.has(A)) {
           const m = s.get(A);
           m.push(c), s.set(A, m);
@@ -1009,13 +1010,13 @@ const cl = (e, o, l) => {
 }, yl = (e, o, l) => {
   const t = e.yAxisLabelFormatter, y = e.xAxisLabelFormatter, { dimensions: s = [], dataset: r = [] } = o, d = oe(() => {
     const { gradientShow: i, gradientColors: f, gradientOffset: a, barBorderRadius: b } = e, u = r, S = u.length, A = [];
-    for (let x = 0; x < S; x++) {
-      const c = Y(C({}, u[x]), {
+    for (let g = 0; g < S; g++) {
+      const c = Y(C({}, u[g]), {
         type: "bar",
         barWidth: e.barWidth,
         showBackground: e.showBarBackground
-      }), { isStack: m, stackColumns: g } = e;
-      if (m && g.includes(u[x].name || !g) && (c.stack = "stack"), c.label = {
+      }), { isStack: m, stackColumns: x } = e;
+      if (m && x.includes(u[g].name || !x) && (c.stack = "stack"), c.label = {
         show: e.labelShow,
         fontSize: e.labelFontSize,
         position: e.labelPosition,
@@ -1025,7 +1026,7 @@ const cl = (e, o, l) => {
         formatter: (w) => {
           let N = "", v = e.labelFormatter;
           v === "" && (v = "{c}");
-          const { seriesName: E, name: Z, value: re, data: xe } = w || {};
+          const { seriesName: E, name: Z, value: re, data: me } = w || {};
           return N += ie(
             v,
             {
@@ -1035,7 +1036,7 @@ const cl = (e, o, l) => {
                 a: E,
                 b: Z,
                 c: re || 0
-              }, xe)
+              }, me)
             },
             {
               useNewline: !0,
@@ -1051,13 +1052,13 @@ const cl = (e, o, l) => {
           y2: e.isUseHorizontalAxis ? 0 : 1,
           colorStops: [{
             offset: 0,
-            color: e.colors[x]
+            color: e.colors[g]
           }, {
             offset: a,
-            color: f[x]
+            color: f[g]
           }, {
             offset: 1,
-            color: f[x]
+            color: f[g]
           }]
         }
       }), b) {
@@ -1098,21 +1099,21 @@ const cl = (e, o, l) => {
         let a = "", b = e.tooltipFormatter;
         b === "" && (b = "{marker} {a}    {c}");
         for (let u = 0; u < f; u++) {
-          const { marker: S, seriesName: A, name: x, value: c, data: m } = i[u] || {};
+          const { marker: S, seriesName: A, name: g, value: c, data: m } = i[u] || {};
           if (u === 0) {
-            let g = x;
-            typeof x == "string" && x[0] === "0" && !isNaN(+x) && (g = (+x).toString()), a += `${te(y, g)}<br/>`;
+            let x = g;
+            typeof g == "string" && g[0] === "0" && !isNaN(+g) && (x = (+g).toString()), a += `${te(y, x)}<br/>`;
           }
           a += ie(
             b,
             {
               textData: C({
                 marker: S,
-                name: x,
+                name: g,
                 value: c,
                 Qfw: el,
                 a: A,
-                b: x,
+                b: g,
                 c: c || 0
               }, m)
             },
@@ -1308,16 +1309,16 @@ const cl = (e, o, l) => {
         let a = "", b = e.tooltipFormatter;
         b === "" && (b = "{marker} {a}    {c}");
         for (let u = 0; u < f; u++) {
-          const { marker: S, seriesName: A, name: x, value: c, data: m } = i[u] || {};
-          u === 0 && (a += `${x}<br/>`), a += ie(
+          const { marker: S, seriesName: A, name: g, value: c, data: m } = i[u] || {};
+          u === 0 && (a += `${g}<br/>`), a += ie(
             b,
             {
               textData: C({
                 marker: S,
-                name: x,
+                name: g,
                 value: c,
                 a: A,
-                b: x,
+                b: g,
                 c
               }, m)
             },
@@ -1519,8 +1520,8 @@ const cl = (e, o, l) => {
         yAxisIndex: S
       }, y[a]);
       if (u === "line") {
-        const x = {};
-        e.shadowColor && (x.shadowColor = e.shadowColor, x.shadowBlur = e.shadowBlur, x.shadowOffsetY = e.shadowOffsetY, x.shadowOffsetX = e.shadowOffsetX), A = Y(C({}, A), {
+        const g = {};
+        e.shadowColor && (g.shadowColor = e.shadowColor, g.shadowBlur = e.shadowBlur, g.shadowOffsetY = e.shadowOffsetY, g.shadowOffsetX = e.shadowOffsetX), A = Y(C({}, A), {
           symbolSize: e.symbolSize,
           smooth: e.smooth,
           itemStyle: {
@@ -1546,11 +1547,11 @@ const cl = (e, o, l) => {
           },
           lineStyle: C({
             width: e.lineStyleWidth
-          }, x)
+          }, g)
         });
       }
       if (u === "bar") {
-        const { gradientShow: x, gradientColors: c, gradientOffset: m } = e, g = {};
+        const { gradientShow: g, gradientColors: c, gradientOffset: m } = e, x = {};
         if (e.barBorderRadius) {
           const w = e.barBorderRadius.split(",");
           if (w != null && w.length) {
@@ -1559,10 +1560,10 @@ const cl = (e, o, l) => {
               const E = parseFloat(v);
               isNaN(E) || N.push(E);
             }
-            g.borderRadius = N;
+            x.borderRadius = N;
           }
         }
-        x && (g.color = {
+        g && (x.color = {
           x: 0,
           y: 0,
           x2: 0,
@@ -1579,7 +1580,7 @@ const cl = (e, o, l) => {
           }]
         }), A = Y(C({}, A), {
           barWidth: e.barWidth,
-          itemStyle: g
+          itemStyle: x
         });
       }
       e.isShowMarkLine && (A.markLine = {
@@ -1645,19 +1646,19 @@ const cl = (e, o, l) => {
         a === "" && (a = "{marker} {a}    {c}");
         const b = e.seriesTypes;
         for (let u = 0; u < i; u++) {
-          const S = b[u], { tooltipFormatter: A } = S || {}, { marker: x, seriesName: c, name: m, value: g, data: w } = n[u] || {};
+          const S = b[u], { tooltipFormatter: A } = S || {}, { marker: g, seriesName: c, name: m, value: x, data: w } = n[u] || {};
           u === 0 && (f += `${m}<br/>`), f += ie(
             // 如果系列有提示框组件就使用自定义，没有就用默认的
             A || a,
             {
               textData: C({
-                marker: x,
+                marker: g,
                 name: m,
-                value: g,
+                value: x,
                 seriesName: c,
                 a: c,
                 b: m,
-                c: g
+                c: x
               }, w)
             },
             {