@ecan-bi/tools 1.0.15 → 1.0.17

package/dist/index.es.js

@@ -1,13 +1,13 @@
-/*! @ecan-bi/tools@1.0.15 */
-var Pe = Object.defineProperty, qe = Object.defineProperties;
+/*! @ecan-bi/tools@1.0.17 */
+var Qe = Object.defineProperty, qe = Object.defineProperties;
 var Xe = Object.getOwnPropertyDescriptors;
-var de = Object.getOwnPropertySymbols;
+var se = Object.getOwnPropertySymbols;
 var Ke = Object.prototype.hasOwnProperty, Ue = Object.prototype.propertyIsEnumerable;
-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) => {
+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) => {
   for (var l in o || (o = {}))
     Ke.call(o, l) && Be(e, l, o[l]);
-  if (de)
-    for (var l of de(o))
+  if (se)
+    for (var l of se(o))
       Ue.call(o, l) && Be(e, l, o[l]);
   return e;
 }, Y = (e, o) => qe(e, Xe(o));
@@ -15,48 +15,48 @@ 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 && de)
-    for (var t of de(e))
+  if (e != null && se)
+    for (var t of se(e))
       o.indexOf(t) < 0 && Ue.call(e, t) && (l[t] = e[t]);
   return l;
 };
-var We = (e, o, l) => new Promise((t, m) => {
+var We = (e, o, l) => new Promise((t, y) => {
   var s = (n) => {
     try {
       d(l.next(n));
     } catch (i) {
-      m(i);
+      y(i);
     }
   }, r = (n) => {
     try {
       d(l.throw(n));
     } catch (i) {
-      m(i);
+      y(i);
     }
   }, d = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, r);
   d((l = l.apply(e, o)).next());
 });
 import { unref as V, computed as oe } from "vue";
 import $ from "dayjs";
-import { cloneDeep as fe } from "lodash-es";
+import { cloneDeep as ue } from "lodash-es";
 const we = (e, o) => {
   const l = C({
     dayjs: $
   }, o);
   let t = "";
-  const m = [];
+  const y = [];
   for (const d in l)
-    t += `${d},`, m.push(l[d]);
+    t += `${d},`, y.push(l[d]);
   t = t.replace(/,$/, "");
   const s = `function (${t}){return ${e}}`;
   let r;
   try {
-    r = Function(`"use strict";return (${s})`)()(...m);
+    r = Function(`"use strict";return (${s})`)()(...y);
   } catch (d) {
     return e;
   }
   return r;
-}, ie = (e = "", { textData: o, codeData: l } = {}, { useNewline: t = !1, useSpace: m = !1 } = {}) => {
+}, ie = (e = "", { textData: o, codeData: l } = {}, { useNewline: t = !1, useSpace: y = !1 } = {}) => {
   const s = C({}, o), r = (e || "").match(/\{(.+?)\}/g);
   if (r == null || r.length === 0)
     return e;
@@ -70,23 +70,23 @@ const we = (e, o) => {
     }
     (/\(.*\)/g.test(i) || /[+/\\*]/g.test(i)) && (i = we(i, l)), e = e.replace(n, i);
   }
-  return t && (e = e == null ? void 0 : e.replace(/\n|\\n/g, "<br/>")), m && (e = e == null ? void 0 : e.replace(/\s{2,}?/g, "&nbsp;&nbsp;")), e = e.replace(/Qfw\((.*?)\)/, (d, n) => o != null && o.Qfw ? o == null ? void 0 : o.Qfw(n) : n), e;
+  return t && (e = e == null ? void 0 : e.replace(/\n|\\n/g, "<br/>")), y && (e = e == null ? void 0 : e.replace(/\s{2,}?/g, "&nbsp;&nbsp;")), e = e.replace(/Qfw\((.*?)\)/, (d, n) => o != null && o.Qfw ? o == null ? void 0 : o.Qfw(n) : n), e;
 }, K = (e, o) => {
   if (typeof e == "string" && typeof o == "string")
     return e.toLocaleLowerCase().includes(o.toLocaleLowerCase());
   if (typeof e == "string" && Array.isArray(o)) {
     const l = o.length;
     for (let t = 0; t < l; t++) {
-      const m = o[t];
-      if (typeof m == "string" && e.toLocaleLowerCase().includes(m.toLocaleLowerCase()))
+      const y = o[t];
+      if (typeof y == "string" && e.toLocaleLowerCase().includes(y.toLocaleLowerCase()))
         return !0;
     }
   }
   return !1;
-}, W = (e, o) => Object.prototype.hasOwnProperty.call(e, o), ue = (e) => {
+}, W = (e, o) => Object.prototype.hasOwnProperty.call(e, o), ce = (e) => {
   const o = [];
   for (const l of e)
-    l.conditions ? o.push(...ue(l.conditions)) : (l == null ? void 0 : l.dataType) === "component" && o.push(l);
+    l.conditions ? o.push(...ce(l.conditions)) : (l == null ? void 0 : l.dataType) === "component" && o.push(l);
   return o;
 };
 function Je(e) {
@@ -111,10 +111,10 @@ const Ze = (e) => e.replace(/\\n/g, `
   var r;
   const l = e.match(/\{(.+?)\}/g), t = ((r = e.split(`
 `)) == null ? void 0 : r.length) - 1;
-  let m = "";
+  let y = "";
   if (t)
     for (let d = 0; d < t; d++)
-      m += `
+      y += `
 `;
   let s = e;
   if (l != null && l.length) {
@@ -131,20 +131,20 @@ const Ze = (e) => e.replace(/\\n/g, `
       );
       n && (s = s.replace(d, n));
     }
-    return `${m}{text|${s}}`;
+    return `${y}{text|${s}}`;
   } else
     return e;
 };
 function el(e) {
-  let o = "", l = "", t = "", m = "";
+  let o = "", l = "", t = "", y = "";
   e.indexOf(".") > -1 ? (l = e.split(".")[0], t = e.split(".")[1]) : l = e;
   let s = 0, r = 0;
   for (r = l.length - 1; r >= 0; )
     s % 3 === 0 && s !== 0 ? l[r] === "-" ? o += l[r] : o += "," + l[r] : o += l[r], r--, s++;
-  return o = o.split("").reverse().join(""), e.indexOf(".") > -1 ? m = o + "." + t : m = o, m;
+  return o = o.split("").reverse().join(""), e.indexOf(".") > -1 ? y = o + "." + t : y = o, y;
 }
 function ll(s) {
-  return We(this, arguments, function* ({ graphicConfig: e, request: o, INDICATOR_URL: l = "", PAGE_ID: t, dataSourceId: m }) {
+  return We(this, arguments, function* ({ graphicConfig: e, request: o, INDICATOR_URL: l = "", PAGE_ID: t, dataSourceId: y }) {
     var r;
     try {
       const { leftAxisList: d = [], rightAxisList: n = [], queryColumnList: i = [], indicators: f = [] } = V(e), a = [...d, ...n, ...i, ...f], b = {};
@@ -156,26 +156,26 @@ function ll(s) {
         const u = [];
         for (const x in b)
           u.push(
-            new Promise((c, y) => {
+            new Promise((c, m) => {
               o.post(
                 `${l}/diagram/hrpIndexWithComplex`,
                 {
                   pageId: t,
                   indexGuid: x,
                   indexCode: b[x],
-                  dataSourceId: m
+                  dataSourceId: y
                 }
               ).then((g) => {
                 var v;
                 const { success: w, data: N = [] } = g.data;
-                w && ((v = N == null ? void 0 : N.dataViewColumns) != null && v.length) ? c(N.dataViewColumns) : y(N);
+                w && ((v = N == null ? void 0 : N.dataViewColumns) != null && v.length) ? c(N.dataViewColumns) : m(N);
               }).catch((g) => {
-                y(g);
+                m(g);
               });
             })
           );
         return (yield Promise.all(u)).reduce(
-          (x, c) => x.filter((y) => c.find((g) => g.typeGuid === y.typeGuid))
+          (x, c) => x.filter((m) => c.find((g) => g.typeGuid === m.typeGuid))
         ).filter((x) => x.typeGuid);
       }
     } catch (d) {
@@ -194,28 +194,28 @@ const tl = [
   "customValue",
   "id",
   "keyName"
-], ce = (e) => ze.get(e), il = (e, o = {}) => {
-  const { around: l, unit: t, id: m } = e;
+], ye = (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) || {};
   let n = null, i = null;
   if (r === "design") {
-    const f = d == null ? void 0 : d.find((c) => c.id === m);
+    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: y, mode: g } = A;
+      const { type: c, value: m, mode: g } = A;
       switch (c) {
         case "add":
-          n = n && n.add(y, g), i = i && i.add(y, g);
+          n = n && n.add(m, g), i = i && i.add(m, g);
           break;
         case "minus":
-          n = n && n.subtract(y, g), i = i && i.subtract(y, g);
+          n = n && n.subtract(m, g), i = i && i.subtract(m, g);
       }
     }
   } else {
-    const f = ce(m) || {};
+    const f = ye(y) || {};
     V(f.startTime) && (n = $(V(f.startTime))), V(f.endTime) && (i = $(V(f.endTime)));
   }
   if (n && i) {
@@ -227,8 +227,8 @@ const tl = [
   if (o)
     W(e, "indexCode") && (e.hrpIndexCode = e.indexCode, delete e.indexCode), W(e, "indexCodeNum") && (e.hrpIndexCodeNum = e.indexCodeNum, delete e.indexCodeNum), W(e, "dataType") && delete e.dataType;
   else {
-    const { calcWays: l = [], dateCalcTypes: t = [], activeKey: m, componentId: s = "" } = e;
-    if (m === 5 && (l != null && l.length) && (t != null && t.length) && s) {
+    const { calcWays: l = [], dateCalcTypes: t = [], activeKey: y, componentId: s = "" } = e;
+    if (y === 5 && (l != null && l.length) && (t != null && t.length) && s) {
       const r = l[0].split("-");
       (r == null ? void 0 : r.length) > 1 && r[0] === "rangeValue" && (e.calcWays = il({
         around: r[1],
@@ -249,13 +249,13 @@ const tl = [
   }
 }, le = (e, o) => {
   const l = [];
-  return e != null && e.length && fe(e).forEach((t) => {
+  return e != null && e.length && ue(e).forEach((t) => {
     if (t.join && t.conditions) {
-      const m = !t.conditions.some((s) => s.join && s.conditions);
+      const y = !t.conditions.some((s) => s.join && s.conditions);
       t.conditions.forEach((s, r) => {
         _e(s, o);
         const d = {};
-        if (r < t.conditions.length - 1 && (d.join = t.join), m)
+        if (r < t.conditions.length - 1 && (d.join = t.join), y)
           l.push(C(C({}, d), s));
         else if (s.join && s.conditions) {
           const n = o ? "sqlConditions" : "conditions";
@@ -270,13 +270,13 @@ const tl = [
   }), l;
 }, Ae = (e = {}, o) => {
   if (e != null && e.sortCpnts && o) {
-    const w = Qe(e);
+    const w = Pe(e);
     w && (o.sort = w);
   }
   const {
     label: l,
     name: t,
-    location: m,
+    location: y,
     show: s,
     indexCode: r,
     indexCodeNum: d,
@@ -291,8 +291,8 @@ const tl = [
     dimByCount: x,
     dataTo: c
   } = e;
-  let y;
-  if (u && (y = le(u)), n === "COMPONENT") {
+  let m;
+  if (u && (m = le(u)), n === "COMPONENT") {
     const w = {};
     return me(w, f), {
       label: l.trim(),
@@ -306,7 +306,7 @@ const tl = [
   const g = {
     label: l.trim(),
     columnName: t,
-    location: m,
+    location: y,
     show: s,
     calcType: c === "1" ? "VIEW" : n,
     hrpIndexCode: r,
@@ -315,7 +315,7 @@ const tl = [
     builtInFormula: i,
     builtInValueSource: f,
     formula: b,
-    conditions: y
+    conditions: m
   };
   if (i === "DATE_OFFSET") {
     const w = a.split("-");
@@ -333,10 +333,10 @@ const tl = [
 }, nl = (e) => {
   if (!e)
     return [];
-  const o = fe((e == null ? void 0 : e.controlList) || []).filter((S) => S.conditionKey !== "parentCode"), {
+  const o = ue((e == null ? void 0 : e.controlList) || []).filter((S) => S.conditionKey !== "parentCode"), {
     classificationList: l = [],
     rowHeaderList: t = [],
-    dimensionList: m = [],
+    dimensionList: y = [],
     seriesList: s = [],
     leftAxisList: r = [],
     rightAxisList: d = [],
@@ -347,7 +347,7 @@ const tl = [
   const f = [
     ...l,
     ...t,
-    ...m,
+    ...y,
     ...s,
     ...r,
     ...d,
@@ -355,11 +355,11 @@ const tl = [
     ...i
   ], a = [];
   for (const S of f) {
-    const A = ue((S == null ? void 0 : S.conditions) || []);
+    const A = ce((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 y = {};
-        return c != null && c.dateFormat && (y.format = c.dateFormat), c.fieldValue === "PARENT" && (y.id = "PARENT", y.keyName = c.modelKey, y.modelKey = c.modelKey, y.prop = c.prop), 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,
           conditionLabel: c.fieldName,
           conditionName: c.fieldName,
@@ -371,11 +371,11 @@ const tl = [
           indexCode: c.indexCode,
           typeGuid: c.typeGuid,
           indexCodeNum: c.indexCodeNum
-        }, y);
+        }, m);
       });
       if (x != null && x.length)
         for (const c of x)
-          a.find((y) => y.keyName === c.keyName) || a.push(c);
+          a.find((m) => m.keyName === c.keyName) || a.push(c);
     }
   }
   const b = a.length, u = o;
@@ -386,17 +386,17 @@ const tl = [
     const {
       id: x,
       keyName: c,
-      prop: y,
+      prop: m,
       format: g,
       modelKey: w,
       dataType: N = "component",
       customValue: v
     } = A, E = $e(A);
-    me(E, x, { prop: y, dateFormat: g, modelKey: w, keyName: c }), N === "" && (E.fieldValue = v || ""), u.push(E);
+    me(E, x, { prop: m, dateFormat: g, 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 || ue(u).find((c) => c.alias === A.alias && c.globalCondition) && u.splice(S, 1);
+    A.globalCondition || ce(u).find((c) => c.alias === A.alias && c.globalCondition) && u.splice(S, 1);
   }
   return u;
 };
@@ -405,7 +405,7 @@ function $e(e) {
     id: o,
     keyName: l,
     conditionLabel: t,
-    conditionKey: m,
+    conditionKey: y,
     conditionValueType: s,
     prop: r,
     rule: d = "NONE",
@@ -421,7 +421,7 @@ function $e(e) {
   return S === "NONE" && (["startTime", "endTime"].includes(r) ? S = r === "startTime" ? "GREATER_EQUAL" : "LESS_EQUAL" : l != null && l.includes("startTime") ? S = r === "GREATER_EQUAL" : l != null && l.includes("endTime") ? S = r === "LESS_EQUAL" : S = "EQUAL"), o === "PARENT" && (u = e.modelKey, u && r && (u += `-${r}`), S = d), {
     rule: S,
     label: t,
-    fieldName: m,
+    fieldName: y,
     fieldValue: "",
     // 在关联控件中取
     // dateFormat: 'YYYY-MM',
@@ -443,13 +443,13 @@ function He(e) {
         const {
           id: l,
           keyName: t,
-          prop: m,
+          prop: y,
           modelKey: s,
           format: r,
           dataType: d = "component",
           customValue: n
         } = o, i = $e(o);
-        me(i, l, { prop: m, dateFormat: r, modelKey: s, keyName: t }), d === "" && (i.fieldValue = n || "");
+        me(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)
@@ -480,44 +480,44 @@ function rl(e) {
   return o;
 }
 function me(e, o, l) {
-  const { prop: t = "", dateFormat: m = "", modelKey: s = "", keyName: r = "", operateValue: d, operateMode: n, operateType: i } = l || {}, f = s || r;
+  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 y = window.config.record;
-    let g = t, w = m;
+    const m = window.config.record;
+    let g = 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;
     }
-    if (y && y[f]) {
-      const v = V(y[f][g]);
+    if (m && m[f]) {
+      const v = V(m[f][g]);
       $.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 = m || u;
+  const a = ye(o) || {}, { value: b, format: u = "YYYY-MM-DD", type: S = "", useCurrentTime: A, RECORD: x } = a || {}, c = y || u;
   if (K(a.type, "date")) {
-    let y;
-    if (A ? b ? y = V(b) : y = $() : y = V(b), d && n && i)
+    let m;
+    if (A ? b ? m = V(b) : m = $() : m = V(b), d && n && i)
       switch (i) {
         case "add":
-          y = y.add(d, n);
+          m = m.add(d, n);
           break;
         case "minus":
-          y = y.subtract(d, n);
+          m = m.subtract(d, n);
           break;
       }
-    e.fieldValue = y == null ? void 0 : y.format(c), e.dateFormat = c;
+    e.fieldValue = m == null ? void 0 : m.format(c), e.dateFormat = c;
   } else if (S === "ecanRangePicker") {
-    let y = t;
+    let m = t;
     if (!t) {
       const w = r && r.split("-");
-      w != null && w.length && (y = w[w.length - 1]);
+      w != null && w.length && (m = w[w.length - 1]);
     }
-    if (!y)
+    if (!m)
       return;
     let g = null;
-    if (V(a[y]) && (g = $(V(a[y]))), d && n && i) {
+    if (V(a[m]) && (g = $(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;
@@ -538,7 +538,7 @@ function me(e, o, l) {
             g = g && g.subtract(d, n);
         }
     }
-    if (g && (e.fieldValue = g == null ? void 0 : g.format(c)), y === "rangeValue" && a.startTime && a.endTime) {
+    if (g && (e.fieldValue = g == null ? void 0 : g.format(c)), m === "rangeValue" && a.startTime && a.endTime) {
       const w = Je(c);
       w && (e.fieldValue = V(a.endTime).diff(V(a.startTime), w) + 1);
     }
@@ -546,14 +546,14 @@ function me(e, o, l) {
   } else
     K(S, ol) ? s && x ? e.fieldValue = x[s] : !s && x ? e.fieldValue = x.value : e.fieldValue = V(b) : e.fieldValue = V(b);
 }
-const se = (e) => {
+const fe = (e) => {
   var o;
   if (e) {
-    const l = Array.isArray(e) ? fe(e) : [fe(e)];
-    let t = "", m = [];
+    const l = Array.isArray(e) ? ue(e) : [ue(e)];
+    let t = "", y = [];
     const s = [], r = [], d = [];
     for (const n of l) {
-      if (n.defaultCode && (n.label = n.columnName, delete n.defaultCode), n.type === "CUSTOM" && (m = n.customOrderColumns), t = n.type, s.push(n.label), (o = n.columnName) != null && o.includes("_ecanrepeat_")) {
+      if (n.defaultCode && (n.label = n.columnName, delete n.defaultCode), n.type === "CUSTOM" && (y = n.customOrderColumns), t = n.type, s.push(n.label), (o = n.columnName) != null && o.includes("_ecanrepeat_")) {
         const i = n.columnName.split("_ecanrepeat_");
         r.push(i[0]);
       } else
@@ -564,7 +564,7 @@ const se = (e) => {
       label: s.join(","),
       columnName: r.join(","),
       type: t,
-      customOrderColumns: m
+      customOrderColumns: y
     } : {
       label: s.join(","),
       columnName: r.join(","),
@@ -573,11 +573,11 @@ const se = (e) => {
     };
   } else
     return e;
-}, Qe = (e) => {
+}, Pe = (e) => {
   const { sortCpnts: o = [] } = e;
   let l, t = "";
-  for (const m of o) {
-    const s = ce(m) || {}, { type: r, RECORD: d } = s;
+  for (const y of o) {
+    const s = ye(y) || {}, { type: r, RECORD: d } = s;
     if (K(r, "image") && K(d == null ? void 0 : d.value, ["asc", "desc"])) {
       t = d.value.toUpperCase();
       break;
@@ -591,8 +591,8 @@ const se = (e) => {
   }), l;
 }, al = (e, o = {}) => {
   var Ne, Fe, ve, ke, Ve, Ie, he, Ge, De, je;
-  const { graphicConfig: l, type: t, globalModel: m, isGroupTable: s = !1 } = e;
-  m && (ze = m);
+  const { graphicConfig: l, type: t, globalModel: y, isGroupTable: s = !1 } = e;
+  y && (ze = y);
   let r = e.pageId;
   const d = K(t, "pivottable");
   let {
@@ -610,7 +610,7 @@ const se = (e) => {
     // 文本组件的维度列表
     seriesList: x = [],
     leftAxisList: c = [],
-    rightAxisList: y = [],
+    rightAxisList: m = [],
     queryColumnList: g = [],
     indicators: w = [],
     controlList: N = [],
@@ -620,7 +620,7 @@ const se = (e) => {
     // dataSourceId, // 所属数据源ID
     idxLibMode: re,
     // 指标库模式, source= INDICATOR_LIB时候必填, NORMAL_YEAR_TABLE = 普通年表, WITH_DATE_DIM_TABLE = 带有时间维度表
-    preview: ye = !1,
+    preview: xe = !1,
     // 预览开关
     edvDataSetId: Le
     // 数据集id
@@ -645,7 +645,7 @@ const se = (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 xe = "";
+  let ge = "";
   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 +653,7 @@ const se = (e) => {
         label: G = "",
         name: D = "",
         show: j = !1,
-        sort: Q,
+        sort: P,
         customGroup: q,
         conditions: F,
         dateFormat: k,
@@ -661,11 +661,11 @@ const se = (e) => {
         truncations: M = []
       } = p;
       if (j || L === 1) {
-        xe = R, H = {
+        ge = R, H = {
           label: G.trim(),
           columnName: D,
           show: j,
-          sort: Qe(p) || se(Q) || Q,
+          sort: Pe(p) || fe(P) || P,
           customGroup: q,
           conditions: le(F),
           typeGuid: R
@@ -674,8 +674,8 @@ const se = (e) => {
         if (Array.isArray(M) && M.length > 0) {
           const U = M.length;
           for (let _ = 0; _ < U; _++) {
-            const z = M[_] || {}, { rule: P = "", num: X = 0, name: ee = "" } = z;
-            P && X && (h.num = X, h.rule = P, ee && (h.otherGroupName = ee));
+            const z = M[_] || {}, { rule: Q = "", num: X = 0, name: ee = "" } = z;
+            Q && X && (h.num = X, h.rule = Q, ee && (h.otherGroupName = ee));
           }
         }
         if ((Fe = Object.keys(h)) != null && Fe.length && (H.truncation = h), K(t, ["scatter", "valueline"]))
@@ -689,13 +689,13 @@ const se = (e) => {
   if (Array.isArray(x) && x.length > 0) {
     const L = x.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 = x[T] || {}, { label: G = "", name: D = "", show: j = !1, sort: P, customGroup: q, conditions: F, typeGuid: k } = p;
       if (j || L === 1) {
         Te = {
           label: G.trim(),
           columnName: D,
           show: j,
-          sort: se(Q),
+          sort: fe(P),
           customGroup: q,
           conditions: le(F),
           typeGuid: k
@@ -707,7 +707,7 @@ const se = (e) => {
   const B = [];
   c == null || c.forEach((L) => {
     L.location = "LEFT", B.push(Ae(L, H));
-  }), y == null || y.forEach((L) => {
+  }), m == null || m.forEach((L) => {
     L.location = "RIGHT", B.push(Ae(L, H));
   });
   let ae = w;
@@ -716,11 +716,11 @@ const se = (e) => {
   });
   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: Q, typeGuid: q, indexCodeNum: F, dateFormat: k, conditions: R } = L;
-    let M = se(Q);
+    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);
     if (o.sort) {
       const { field: U, order: _ } = o.sort;
-      let z = B.find((P) => P.label === U);
+      let z = B.find((Q) => Q.label === U);
       !z && T === U && (z = L), z && (M = {
         columnName: z.columnName,
         label: o.sort.field,
@@ -746,15 +746,15 @@ const se = (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: Q, customGroup: q, conditions: F, truncations: k, typeGuid: R = "", dateFormat: M } = p;
-      let h = se(Q);
+      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);
       if (o.sort) {
-        const { field: z, order: P } = o.sort;
+        const { field: z, order: Q } = 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: P.toUpperCase(),
+          order: Q.toUpperCase(),
           type: "NORMAL"
         });
       }
@@ -771,15 +771,15 @@ const se = (e) => {
       const _ = {};
       if (Array.isArray(k) && k.length > 0) {
         const z = k.length;
-        for (let P = 0; P < z; P++) {
-          const X = k[P] || {}, { rule: ee = "", num: Re = 0, name: Ye = "" } = X;
+        for (let Q = 0; Q < z; Q++) {
+          const X = k[Q] || {}, { 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 ge = [], pe;
+  let be = [], pe;
   if (o != null && o.pivotTableCal) {
     let L = [];
     const {
@@ -788,7 +788,7 @@ const se = (e) => {
       truncations: G = [],
       sorts: D = [],
       aggregateMethod: j = [],
-      rowDimensionKeys: Q = [],
+      rowDimensionKeys: P = [],
       colDimensionKeys: q = []
     } = o.pivotTableCal;
     if (B.push(...T), p != null && p.length)
@@ -820,9 +820,9 @@ const se = (e) => {
         const k = J.find((R) => R.label === F);
         k && ((De = j[F]) != null && De.length) && (k.aggregateMethod = j[F]);
       }
-    ne = [], ge = [];
+    ne = [], be = [];
     for (const F of J)
-      Q.includes(F.columnName) ? ne.push(F) : q.includes(F.columnName) && ge.push(F);
+      P.includes(F.columnName) ? ne.push(F) : q.includes(F.columnName) && be.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 +833,7 @@ const se = (e) => {
       return;
     if (a === "2" && B.length === 0)
       return;
-    if (a === "3" && (!xe && n !== "EDV_DATA_SET" || !v.labelField || !v.valueField))
+    if (a === "3" && (!ge && n !== "EDV_DATA_SET" || !v.labelField || !v.valueField))
       return;
     if (a === "3" && t === "ecanDataSelect" && B.length === 0)
       return;
@@ -845,24 +845,24 @@ const se = (e) => {
       T != null && T.length && (r = T[T.length - 1]);
     }
   }
-  let be;
+  let de;
   if (!K(t, ["scatter", "valueline"]) && ((je = Object.keys(v)) != null && je.length)) {
-    const L = ue(N).find((p) => p.conditionKey === "parentCode"), T = {};
+    const L = ce(N).find((p) => p.conditionKey === "parentCode"), T = {};
     if (L) {
-      const p = ce(L.id) || {};
+      const p = ye(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), be = C({
+    t === "ecanDataSelect" && (T.indicatorList = B.filter((p) => p.show)), n === "EDV_DATA_SET" && (T.edvDataSetId = Le), de = C({
       url: "/diagram/formData",
       source: n,
       dataViewId: i,
       plugin: "4",
       layer: a,
       chartType: "normalSelect",
-      rangeIndexTypeGuid: xe,
+      rangeIndexTypeGuid: ge,
       type: t === "ecanDataSelect" ? "normalSelectData" : "normalSelect",
       labelField: v.labelField,
       valueField: v.valueField,
@@ -877,7 +877,7 @@ const se = (e) => {
       classifications: Ce
     } : L = {
       classification: H
-    }, be = C({
+    }, de = C({
       url: "/diagram",
       source: n,
       dataViewId: i,
@@ -895,46 +895,43 @@ const se = (e) => {
         return p && Array.isArray(p) && (G.fieldValue = JSON.stringify(p)), C(C({}, T), G);
       }),
       idxLibMode: re,
-      preview: ye,
+      preview: xe,
       rowHeaders: ne,
       keyName: e.keyName,
       // 透视表指标排序相关入参
       columnData: pe,
-      columnHeaders: ge
+      columnHeaders: be
     }, L);
   }
-  return be;
-}, dl = () => {
-  console.log("This is indicator");
-}, sl = {
-  formatIndicatorParams: al,
-  formatTest: dl
-}, fl = (e = [], o) => {
+  return console.log("resultParams", de), de;
+}, dl = {
+  formatIndicatorParams: al
+}, sl = (e = [], o) => {
   let { name: l = "name", types: t = [] } = o || {};
   l = (l == null ? void 0 : l.trim()) || l;
-  const m = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Map(), r = e.length, d = t.length;
+  const y = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Map(), r = e.length, d = t.length;
   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] });
-      m.add(S), f.push(x);
+      y.add(S), f.push(x);
     }
     const a = e[0][l] || "";
     s.set(a, f);
   } else
     for (let f = 0; f < r; f++) {
       const a = e[f], b = a[l];
-      m.add(b);
+      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] });
         if (s.has(A)) {
-          const y = s.get(A);
-          y.push(c), s.set(A, y);
+          const m = s.get(A);
+          m.push(c), s.set(A, m);
         } else
           s.set(A, [c]);
       }
     }
-  const n = Array.from(m), i = [];
+  const n = Array.from(y), i = [];
   for (const [f, a] of s)
     i.push({
       name: f,
@@ -944,12 +941,12 @@ const se = (e) => {
     dimensions: n,
     dataset: i
   };
-}, ul = (e, o) => {
-  let { name: l = "name", value: t = "value", type: m = "type" } = o || {};
-  l = l == null ? void 0 : l.trim(), t = t == null ? void 0 : t.trim(), m = m == null ? void 0 : m.trim();
+}, fl = (e, o) => {
+  let { name: l = "name", value: t = "value", type: y = "type" } = o || {};
+  l = l == null ? void 0 : l.trim(), t = t == null ? void 0 : t.trim(), y = y == null ? void 0 : y.trim();
   const s = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Map(), d = e.length;
   for (let f = 0; f < d; f++) {
-    const a = e[f], b = a[l] || "", u = a[t] || "", S = a[m] || "";
+    const a = e[f], b = a[l] || "", u = a[t] || "", S = a[y] || "";
     if (s.add(b), r.has(S)) {
       const A = r.get(S);
       A.push(C({ name: b, value: u }, a)), r.set(S, A);
@@ -967,8 +964,8 @@ const se = (e) => {
     dataset: i
   };
 }, te = (e, o) => {
-  var m;
-  if (console.log("This is useValueFormatter"), e == null)
+  var y;
+  if (e == null)
     return o;
   const l = e.match(/\{.*\}/g);
   if (l == null || l.length === 0)
@@ -978,7 +975,7 @@ const se = (e) => {
     const r = l[s];
     if (r == null || r === "")
       break;
-    let d = (m = r.slice(1, -1)) == null ? void 0 : m.trim();
+    let d = (y = r.slice(1, -1)) == null ? void 0 : y.trim();
     d = d == null ? void 0 : d.replace(/value/g, o);
     try {
       let n = d;
@@ -989,36 +986,36 @@ const se = (e) => {
   }
   return e;
 };
-function cl(e) {
+function ul(e) {
   return e.isShowMarkLine ? {
     markLine: {
       data: [{ type: e.markLineType }]
     }
   } : {};
 }
-const ml = (e, o, l) => {
+const cl = (e, o, l) => {
   switch (e.type) {
     case "bar":
       return yl(e, o, l);
     case "line":
-      return xl(e, o, l);
+      return ml(e, o, l);
     case "pie":
-      return gl(e, o, l);
+      return xl(e, o, l);
     case "comboGraph":
-      return bl(e, o, l);
+      return gl(e, o, l);
     default:
       return {};
   }
 }, yl = (e, o, l) => {
-  const t = e.yAxisLabelFormatter, m = e.xAxisLabelFormatter, { dimensions: s = [], dataset: r = [] } = o, d = oe(() => {
+  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]), {
         type: "bar",
         barWidth: e.barWidth,
         showBackground: e.showBarBackground
-      }), { isStack: y, stackColumns: g } = e;
-      if (y && g.includes(u[x].name || !g) && (c.stack = "stack"), c.label = {
+      }), { isStack: m, stackColumns: g } = e;
+      if (m && g.includes(u[x].name || !g) && (c.stack = "stack"), c.label = {
         show: e.labelShow,
         fontSize: e.labelFontSize,
         position: e.labelPosition,
@@ -1028,7 +1025,7 @@ const ml = (e, o, l) => {
         formatter: (w) => {
           let N = "", v = e.labelFormatter;
           v === "" && (v = "{c}");
-          const { seriesName: E, name: Z, value: re, data: ye } = w || {};
+          const { seriesName: E, name: Z, value: re, data: xe } = w || {};
           return N += ie(
             v,
             {
@@ -1038,7 +1035,7 @@ const ml = (e, o, l) => {
                 a: E,
                 b: Z,
                 c: re || 0
-              }, ye)
+              }, xe)
             },
             {
               useNewline: !0,
@@ -1101,10 +1098,10 @@ const ml = (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: y } = i[u] || {};
+          const { marker: S, seriesName: A, name: x, 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(m, g)}<br/>`;
+            typeof x == "string" && x[0] === "0" && !isNaN(+x) && (g = (+x).toString()), a += `${te(y, g)}<br/>`;
           }
           a += ie(
             b,
@@ -1117,7 +1114,7 @@ const ml = (e, o, l) => {
                 a: A,
                 b: x,
                 c: c || 0
-              }, y)
+              }, m)
             },
             {
               useNewline: !0,
@@ -1193,7 +1190,7 @@ const ml = (e, o, l) => {
         overflow: e.xAxisLabelOverflow,
         fontSize: e.xAxisLabelFontSize,
         formatter(i) {
-          return typeof i == "string" && i[0] === "0" && !isNaN(+i) && (i = (+i).toString()), te(m, i);
+          return typeof i == "string" && i[0] === "0" && !isNaN(+i) && (i = (+i).toString()), te(y, i);
         }
       },
       axisLine: {
@@ -1255,8 +1252,8 @@ const ml = (e, o, l) => {
     },
     series: V(d)
   };
-}, xl = (e, o, l) => {
-  const t = e.yAxisLabelFormatter, m = e.xAxisLabelFormatter, { dimensions: s = [], dataset: r = [] } = o, d = oe(() => s.map((i) => {
+}, ml = (e, o, l) => {
+  const t = e.yAxisLabelFormatter, y = e.xAxisLabelFormatter, { dimensions: s = [], dataset: r = [] } = o, d = oe(() => s.map((i) => {
     let f = {};
     return i && typeof i == "object" ? f = Y(C({}, i), {
       textStyle: {
@@ -1298,7 +1295,7 @@ const ml = (e, o, l) => {
         lineStyle: C({
           width: e.lineStyleWidth
         }, b)
-      }), cl(e)));
+      }), ul(e)));
     }
     return i;
   });
@@ -1311,7 +1308,7 @@ const ml = (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: y } = i[u] || {};
+          const { marker: S, seriesName: A, name: x, value: c, data: m } = i[u] || {};
           u === 0 && (a += `${x}<br/>`), a += ie(
             b,
             {
@@ -1322,7 +1319,7 @@ const ml = (e, o, l) => {
                 a: A,
                 b: x,
                 c
-              }, y)
+              }, m)
             },
             {
               useNewline: !0,
@@ -1357,7 +1354,7 @@ const ml = (e, o, l) => {
         width: e.xAxisLabelWidth,
         overflow: e.xAxisLabelOverflow,
         formatter(i) {
-          return te(m, i);
+          return te(y, i);
         }
       },
       axisLine: {
@@ -1405,12 +1402,12 @@ const ml = (e, o, l) => {
     },
     series: V(n)
   };
-}, gl = (e, o, l) => {
+}, xl = (e, o, l) => {
   const { dataset: t = [] } = o;
-  let { data: m = [] } = t[0] || {};
+  let { data: y = [] } = t[0] || {};
   if (Array.isArray(e.colors)) {
     const s = e.isUseLabelColors, r = e.colors;
-    m = m.map((d, n) => C({
+    y = y.map((d, n) => C({
       label: s ? { color: r[n] } : {}
     }, d));
   }
@@ -1470,7 +1467,7 @@ const ml = (e, o, l) => {
     },
     series: [
       {
-        data: m,
+        data: y,
         type: "pie",
         radius: [e.innerRadius, e.outerRadius],
         center: [e.centerLeft, e.centerTop],
@@ -1500,8 +1497,8 @@ const ml = (e, o, l) => {
       }
     ]
   };
-}, bl = (e, o, l) => {
-  const { dimensions: t = [], dataset: m = [] } = o, s = oe(() => t.map((n) => {
+}, gl = (e, o, l) => {
+  const { dimensions: t = [], dataset: y = [] } = o, s = oe(() => t.map((n) => {
     let i = {};
     return n && typeof n == "object" ? i = Y(C({}, n), {
       textStyle: {
@@ -1514,13 +1511,13 @@ const ml = (e, o, l) => {
       }
     }, i;
   })), r = oe(() => {
-    const n = [], i = m.length, f = e.seriesTypes;
+    const n = [], i = y.length, f = e.seriesTypes;
     for (let a = 0; a < i; a++) {
       const b = f[a], { type: u, axisIndex: S } = b || {};
       let A = C({
         type: u,
         yAxisIndex: S
-      }, m[a]);
+      }, 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), {
@@ -1553,7 +1550,7 @@ const ml = (e, o, l) => {
         });
       }
       if (u === "bar") {
-        const { gradientShow: x, gradientColors: c, gradientOffset: y } = e, g = {};
+        const { gradientShow: x, gradientColors: c, gradientOffset: m } = e, g = {};
         if (e.barBorderRadius) {
           const w = e.barBorderRadius.split(",");
           if (w != null && w.length) {
@@ -1574,7 +1571,7 @@ const ml = (e, o, l) => {
             offset: 0,
             color: e.colors[a]
           }, {
-            offset: y,
+            offset: m,
             color: c[a]
           }, {
             offset: 1,
@@ -1648,18 +1645,18 @@ const ml = (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: y, value: g, data: w } = n[u] || {};
-          u === 0 && (f += `${y}<br/>`), f += ie(
+          const S = b[u], { tooltipFormatter: A } = S || {}, { marker: x, seriesName: c, name: m, value: g, data: w } = n[u] || {};
+          u === 0 && (f += `${m}<br/>`), f += ie(
             // 如果系列有提示框组件就使用自定义，没有就用默认的
             A || a,
             {
               textData: C({
                 marker: x,
-                name: y,
+                name: m,
                 value: g,
                 seriesName: c,
                 a: c,
-                b: y,
+                b: m,
                 c: g
               }, w)
             },
@@ -1708,7 +1705,7 @@ const ml = (e, o, l) => {
     yAxis: V(d),
     series: V(r)
   };
-}, Sl = (e) => ({
+}, bl = (e) => ({
   title: {
     text: e.titleText,
     subtext: e.titleSubtext,
@@ -1727,16 +1724,16 @@ const ml = (e, o, l) => {
     containLabel: e.gridContainLabel
   },
   color: e.colors
-}), Al = (e, o, l = 12) => C(C({}, Sl(e)), ml(e, o, l)), pl = Y(C({}, sl), {
+}), Sl = (e, o, l = 12) => C(C({}, bl(e)), cl(e, o, l)), Tl = Y(C({}, dl), {
   runCode: we,
-  useTransformChartDataByAttrKey: fl,
-  useTransformChartDataByAttrValue: ul,
+  useTransformChartDataByAttrKey: sl,
+  useTransformChartDataByAttrValue: fl,
   useValueFormatter: te,
   useVariablesInText: ie,
-  transformProps: Al,
+  transformProps: Sl,
   getIndicatorParams: ll
 });
 export {
-  pl as default
+  Tl as default
 };
 //# sourceMappingURL=index.es.js.map