@ecan-bi/tools 1.0.18 → 1.0.19

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/tools@1.0.18 */
+/*! @ecan-bi/tools@1.0.19 */
 var Pe = Object.defineProperty, qe = Object.defineProperties;
 var Xe = Object.getOwnPropertyDescriptors;
 var de = Object.getOwnPropertySymbols;
@@ -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 [];
   });
@@ -203,15 +204,15 @@ 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 {
@@ -288,7 +289,7 @@ const tl = [
     conditions: u,
     aggregate: S,
     distinct: A,
-    dimByCount: x,
+    dimByCount: g,
     dataTo: c
   } = e;
   let m;
@@ -303,7 +304,7 @@ const tl = [
       componentValue: w.fieldValue || null
     };
   }
-  const g = {
+  const x = {
     label: l.trim(),
     columnName: t,
     location: y,
@@ -321,13 +322,13 @@ 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) => {
@@ -357,7 +358,7 @@ const tl = [
   for (const S of f) {
     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,15 +385,15 @@ 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);
-    ye(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];
@@ -483,19 +484,19 @@ 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 = ce(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,35 +517,35 @@ function ye(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 se = (e) => {
   var o;
@@ -608,10 +609,10 @@ const se = (e) => {
     rowHeaderList: S = [],
     dimensionList: A = [],
     // 文本组件的维度列表
-    seriesList: x = [],
+    seriesList: g = [],
     leftAxisList: c = [],
     rightAxisList: m = [],
-    queryColumnList: g = [],
+    queryColumnList: x = [],
     indicators: w = [],
     controlList: N = [],
     formFields: v = {},
@@ -686,10 +687,10 @@ const se = (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: Q, 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(),
@@ -715,7 +716,7 @@ const se = (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) => {
+  ["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) {
@@ -913,8 +914,8 @@ const se = (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 se = (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,
@@ -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)
             },
             {