@ecan-bi/tools 1.0.18 → 1.0.20

package/dist/index.es.js

@@ -1,95 +1,95 @@
-/*! @ecan-bi/tools@1.0.18 */
-var Pe = Object.defineProperty, qe = Object.defineProperties;
-var Xe = Object.getOwnPropertyDescriptors;
-var de = 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) => {
+/*! @ecan-bi/tools@1.0.20 */
+var Qe = Object.defineProperty, Pe = Object.defineProperties;
+var qe = Object.getOwnPropertyDescriptors;
+var se = Object.getOwnPropertySymbols;
+var Be = Object.prototype.hasOwnProperty, Ke = Object.prototype.propertyIsEnumerable;
+var Ye = (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))
-      Ue.call(o, l) && Be(e, l, o[l]);
+    Be.call(o, l) && Ye(e, l, o[l]);
+  if (se)
+    for (var l of se(o))
+      Ke.call(o, l) && Ye(e, l, o[l]);
   return e;
-}, Y = (e, o) => qe(e, Xe(o));
+}, Y = (e, o) => Pe(e, qe(o));
 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))
-      o.indexOf(t) < 0 && Ue.call(e, t) && (l[t] = e[t]);
+    Be.call(e, t) && o.indexOf(t) < 0 && (l[t] = e[t]);
+  if (e != null && se)
+    for (var t of se(e))
+      o.indexOf(t) < 0 && Ke.call(e, t) && (l[t] = e[t]);
   return l;
 };
-var We = (e, o, l) => new Promise((t, y) => {
-  var s = (n) => {
+var Ue = (e, o, l) => new Promise((t, c) => {
+  var f = (n) => {
     try {
-      d(l.next(n));
+      s(l.next(n));
     } catch (i) {
-      y(i);
+      c(i);
     }
   }, r = (n) => {
     try {
-      d(l.throw(n));
+      s(l.throw(n));
     } catch (i) {
-      y(i);
+      c(i);
     }
-  }, d = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, r);
-  d((l = l.apply(e, o)).next());
+  }, s = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(f, r);
+  s((l = l.apply(e, o)).next());
 });
-import { unref as V, computed as oe } from "vue";
+import { unref as k, computed as le } from "vue";
 import $ from "dayjs";
-import { cloneDeep as fe } from "lodash-es";
-const we = (e, o) => {
+import { cloneDeep as ue } from "lodash-es";
+const Le = (e, o) => {
   const l = C({
     dayjs: $
   }, o);
   let t = "";
-  const y = [];
-  for (const d in l)
-    t += `${d},`, y.push(l[d]);
+  const c = [];
+  for (const s in l)
+    t += `${s},`, c.push(l[s]);
   t = t.replace(/,$/, "");
-  const s = `function (${t}){return ${e}}`;
+  const f = `function (${t}){return ${e}}`;
   let r;
   try {
-    r = Function(`"use strict";return (${s})`)()(...y);
-  } catch (d) {
+    r = Function(`"use strict";return (${f})`)()(...c);
+  } catch (s) {
     return e;
   }
   return r;
-}, ie = (e = "", { textData: o, codeData: l } = {}, { useNewline: t = !1, useSpace: y = !1 } = {}) => {
-  const s = C({}, o), r = (e || "").match(/\{(.+?)\}/g);
+}, te = (e = "", { textData: o, codeData: l } = {}, { useNewline: t = !1, useSpace: c = !1 } = {}) => {
+  const f = C({}, o), r = (e || "").match(/\{(.+?)\}/g);
   if (r == null || r.length === 0)
     return e;
-  for (let d = 0; d < r.length; d++) {
-    const n = r[d];
+  for (let s = 0; s < r.length; s++) {
+    const n = r[s];
     let i = n.slice(1, -1).trim();
-    const f = /[\u4e00-\u9fa5a-z-_A-Z0-9]*/g, a = i.match(f);
-    for (let b = 0; b < a.length; b++) {
-      const u = a[b], S = s[u];
-      S != null && (i = i.replace(u, S));
+    const a = /[\u4e00-\u9fa5a-z-_A-Z0-9]*/g, d = i.match(a);
+    for (let y = 0; y < d.length; y++) {
+      const m = d[y], g = f[m];
+      g != null && (i = i.replace(m, g));
     }
-    (/\(.*\)/g.test(i) || /[+/\\*]/g.test(i)) && (i = we(i, l)), e = e.replace(n, i);
+    (/\(.*\)/g.test(i) || /[+/\\*]/g.test(i)) && (i = Le(i, l)), e = e.replace(n, i);
   }
-  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;
+  return t && (e = e == null ? void 0 : e.replace(/\n|\\n/g, "<br/>")), c && (e = e == null ? void 0 : e.replace(/\s{2,}?/g, "&nbsp;&nbsp;")), e = e.replace(/Qfw\((.*?)\)/, (s, 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 y = o[t];
-      if (typeof y == "string" && e.toLocaleLowerCase().includes(y.toLocaleLowerCase()))
+      const c = o[t];
+      if (typeof c == "string" && e.toLocaleLowerCase().includes(c.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) {
+function Xe(e) {
   const o = e.split("-");
   let l = "";
   if (o != null && o.length)
@@ -106,21 +106,21 @@ function Je(e) {
     }
   return l;
 }
-const Ze = (e) => e.replace(/\\n/g, `
-`), Oe = (e = "", o) => {
+const Je = (e) => e.replace(/\\n/g, `
+`), Ze = (e = "", o) => {
   var r;
   const l = e.match(/\{(.+?)\}/g), t = ((r = e.split(`
 `)) == null ? void 0 : r.length) - 1;
-  let y = "";
+  let c = "";
   if (t)
-    for (let d = 0; d < t; d++)
-      y += `
+    for (let s = 0; s < t; s++)
+      c += `
 `;
-  let s = e;
+  let f = e;
   if (l != null && l.length) {
-    for (const d of l) {
-      const n = ie(
-        d,
+    for (const s of l) {
+      const n = te(
+        s,
         {
           textData: o
         },
@@ -129,63 +129,64 @@ const Ze = (e) => e.replace(/\\n/g, `
           useSpace: !1
         }
       );
-      n && (s = s.replace(d, n));
+      n && (f = f.replace(s, n));
     }
-    return `${y}{text|${s}}`;
+    return `${c}{text|${f}}`;
   } else
     return e;
 };
-function el(e) {
-  let o = "", l = "", t = "", y = "";
+function Oe(e) {
+  let o = "", l = "", t = "", c = "";
   e.indexOf(".") > -1 ? (l = e.split(".")[0], t = e.split(".")[1]) : l = e;
-  let s = 0, r = 0;
+  let f = 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 ? y = o + "." + t : y = o, y;
+    f % 3 === 0 && f !== 0 ? l[r] === "-" ? o += l[r] : o += "," + l[r] : o += l[r], r--, f++;
+  return o = o.split("").reverse().join(""), e.indexOf(".") > -1 ? c = o + "." + t : c = o, c;
 }
-function ll(s) {
-  return We(this, arguments, function* ({ graphicConfig: e, request: o, INDICATOR_URL: l = "", PAGE_ID: t, dataSourceId: y }) {
+function el(f) {
+  return Ue(this, arguments, function* ({ graphicConfig: e, request: o, INDICATOR_URL: l = "", PAGE_ID: t, dataSourceId: c }) {
     var r;
     try {
-      const { leftAxisList: d = [], rightAxisList: n = [], queryColumnList: i = [], indicators: f = [] } = V(e), a = [...d, ...n, ...i, ...f], b = {};
-      for (const u of a) {
-        const { indexCode: S = "", parentId: A = "" } = u;
-        A && !W(u, "calcType") && !b[A] && (b[A] = S);
+      const { leftAxisList: s = [], rightAxisList: n = [], queryColumnList: i = [], indicators: a = [] } = k(e), d = [...s, ...n, ...i, ...a], y = {};
+      for (const m of d) {
+        const { indexCode: g = "", parentId: A = "" } = m;
+        A && !W(m, "calcType") && !y[A] && (y[A] = g);
       }
-      if ((r = Object.keys(b)) != null && r.length) {
-        const u = [];
-        for (const x in b)
-          u.push(
-            new Promise((c, m) => {
+      if ((r = Object.keys(y)) != null && r.length) {
+        const m = [];
+        for (const b in y)
+          m.push(
+            new Promise((u, x) => {
               o.post(
                 `${l}/diagram/hrpIndexWithComplex`,
                 {
                   pageId: t,
-                  indexGuid: x,
-                  indexCode: b[x],
-                  dataSourceId: y
+                  indexGuid: b,
+                  indexCode: y[b],
+                  dataSourceId: c
                 }
-              ).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) : m(N);
-              }).catch((g) => {
-                m(g);
+              ).then((S) => {
+                var V;
+                const { success: L, data: p = [] } = S.data;
+                L && ((V = p == null ? void 0 : p.dataViewColumns) != null && V.length) ? u(p.dataViewColumns) : x(p);
+              }).catch((S) => {
+                console.error(S), x(S);
               });
             })
           );
-        return (yield Promise.all(u)).reduce(
-          (x, c) => x.filter((m) => c.find((g) => g.typeGuid === m.typeGuid))
-        ).filter((x) => x.typeGuid);
+        return (yield Promise.all(m)).reduce(
+          (b, u) => b.filter((x) => u.find((S) => S.typeGuid === x.typeGuid))
+        ).filter((b) => b.typeGuid);
       }
-    } catch (d) {
+    } catch (s) {
+      console.error(s);
     }
     return [];
   });
 }
-const ol = ["table", "bar", "combograph", "line", "pie", "radar", "scatter", "list", "circulate"];
-let ze = /* @__PURE__ */ new Map();
-const tl = [
+const ll = ["table", "bar", "combograph", "line", "pie", "radar", "scatter", "list", "circulate"];
+let _e = /* @__PURE__ */ new Map();
+const ol = [
   "keyValue",
   "conditionKey",
   "conditionLabel",
@@ -194,46 +195,46 @@ const tl = [
   "customValue",
   "id",
   "keyName"
-], 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) || {};
+], ye = (e) => _e.get(e), tl = (e, o = {}) => {
+  const { around: l, unit: t, id: c } = e;
+  let f = "";
+  const { pageMode: r = "", componentList: s = [] } = (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 === y);
-    if (!f)
+    const a = s == null ? void 0 : s.find((u) => u.id === c);
+    if (!a)
       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;
-      switch (c) {
+    const { interval: d, intervalUnit: y, startTime: m, endTime: g, operate: A, useCurrentTime: b } = a || {};
+    if (b && (n = $().subtract(d, y), i = $()), m && (n = $(m)), g && (i = $(g)), A) {
+      const { type: u, value: x, mode: S } = A;
+      switch (u) {
         case "add":
-          n = n && n.add(m, g), i = i && i.add(m, g);
+          n = n && n.add(x, S), i = i && i.add(x, S);
           break;
         case "minus":
-          n = n && n.subtract(m, g), i = i && i.subtract(m, g);
+          n = n && n.subtract(x, S), i = i && i.subtract(x, S);
       }
     }
   } else {
-    const f = ce(y) || {};
-    V(f.startTime) && (n = $(V(f.startTime))), V(f.endTime) && (i = $(V(f.endTime)));
+    const a = ye(c) || {};
+    k(a.startTime) && (n = $(k(a.startTime))), k(a.endTime) && (i = $(k(a.endTime)));
   }
   if (n && i) {
-    const f = i.diff(n, t.toLowerCase());
-    s = `${l === "before" ? "-" : ""}${f + 1}`;
+    const a = i.diff(n, t.toLowerCase());
+    f = `${l === "before" ? "-" : ""}${a + 1}`;
   }
-  return s ? [s] : [];
-}, _e = (e, o) => {
+  return f ? [f] : [];
+}, We = (e, o) => {
   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: y, componentId: s = "" } = e;
-    if (y === 5 && (l != null && l.length) && (t != null && t.length) && s) {
+    const { calcWays: l = [], dateCalcTypes: t = [], activeKey: c, componentId: f = "" } = e;
+    if (c === 5 && (l != null && l.length) && (t != null && t.length) && f) {
       const r = l[0].split("-");
-      (r == null ? void 0 : r.length) > 1 && r[0] === "rangeValue" && (e.calcWays = il({
+      (r == null ? void 0 : r.length) > 1 && r[0] === "rangeValue" && (e.calcWays = tl({
         around: r[1],
         unit: t[0],
-        id: s
+        id: f
       })), delete e.radioValue;
     }
     if (W(e, "dataType")) {
@@ -247,216 +248,216 @@ const tl = [
     }
     W(e, "activeKey") && delete e.activeKey, W(e, "radioValue") && delete e.radioValue, W(e, "indexCode") && (e.hrpIndexCode = e.indexCode, delete e.indexCode), W(e, "indexCodeNum") && (e.hrpIndexCodeNum = e.indexCodeNum, delete e.indexCodeNum), e.dataType !== "component" && e.useCurrentTime && (e.fieldValue = $().format(e.dateFormat)), W(e, "modelKey") && delete e.modelKey, W(e, "prop") && delete e.prop, delete e.useCurrentTime;
   }
-}, le = (e, o) => {
+}, ee = (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 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), y)
-          l.push(C(C({}, d), s));
-        else if (s.join && s.conditions) {
+      const c = !t.conditions.some((f) => f.join && f.conditions);
+      t.conditions.forEach((f, r) => {
+        We(f, o);
+        const s = {};
+        if (r < t.conditions.length - 1 && (s.join = t.join), c)
+          l.push(C(C({}, s), f));
+        else if (f.join && f.conditions) {
           const n = o ? "sqlConditions" : "conditions";
           l.push(C({
-            [n]: le([s], o)
-          }, d));
+            [n]: ee([f], o)
+          }, s));
         } else
-          l.push(C(C({}, d), s));
+          l.push(C(C({}, s), f));
       });
     } else
-      _e(t, o), l.push(t);
+      We(t, o), l.push(t);
   }), l;
 }, Ae = (e = {}, o) => {
   if (e != null && e.sortCpnts && o) {
-    const w = Qe(e);
-    w && (o.sort = w);
+    const L = He(e);
+    L && (o.sort = L);
   }
   const {
     label: l,
     name: t,
-    location: y,
-    show: s,
+    location: c,
+    show: f,
     indexCode: r,
-    indexCodeNum: d,
+    indexCodeNum: s,
     calcType: n = "COLUMN",
     builtInFormula: i,
-    builtInValueSource: f,
-    builtInCalcWay: a,
-    formula: b,
-    conditions: u,
-    aggregate: S,
+    builtInValueSource: a,
+    builtInCalcWay: d,
+    formula: y,
+    conditions: m,
+    aggregate: g,
     distinct: A,
-    dimByCount: x,
-    dataTo: c
+    dimByCount: b,
+    dataTo: u
   } = e;
-  let m;
-  if (u && (m = le(u)), n === "COMPONENT") {
-    const w = {};
-    return ye(w, f), {
+  let x;
+  if (m && (x = ee(m)), n === "COMPONENT") {
+    const L = {};
+    return me(L, a), {
       label: l.trim(),
       columnName: t,
-      show: s,
+      show: f,
       calcType: n,
-      componentAlias: a,
-      componentValue: w.fieldValue || null
+      componentAlias: d,
+      componentValue: L.fieldValue || null
     };
   }
-  const g = {
+  const S = {
     label: l.trim(),
     columnName: t,
-    location: y,
-    show: s,
-    calcType: c === "1" ? "VIEW" : n,
+    location: c,
+    show: f,
+    calcType: u === "1" ? "VIEW" : n,
     hrpIndexCode: r,
-    hrpIndexCodeNum: d,
-    aggregate: S,
+    hrpIndexCodeNum: s,
+    aggregate: g,
     builtInFormula: i,
-    builtInValueSource: f,
-    formula: b,
-    conditions: m
+    builtInValueSource: a,
+    formula: y,
+    conditions: x
   };
   if (i === "DATE_OFFSET") {
-    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), {
-        calcWays: [N],
-        dateCalcTypes: [w[1]]
+    const L = d.split("-");
+    if ((L == null ? void 0 : L.length) === 3) {
+      let p = L[0];
+      return L[2] === "before" && L[0] !== "0" && (p = `-${L[0]}`), Y(C({}, S), {
+        calcWays: [p],
+        dateCalcTypes: [L[1]]
       });
     }
   } else
-    return t === "the_count" && (g.calcType = "AGGREGATE", g.distinct = !!A, g.typeGuid = x), Y(C({}, g), {
-      builtInCalcWay: a
+    return t === "the_count" && (S.calcType = "AGGREGATE", S.distinct = !!A, S.typeGuid = b), Y(C({}, S), {
+      builtInCalcWay: d
     });
-}, nl = (e) => {
+}, il = (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((g) => g.conditionKey !== "parentCode"), {
     classificationList: l = [],
     rowHeaderList: t = [],
-    dimensionList: y = [],
-    seriesList: s = [],
+    dimensionList: c = [],
+    seriesList: f = [],
     leftAxisList: r = [],
-    rightAxisList: d = [],
+    rightAxisList: s = [],
     queryColumnList: n = [],
     indicators: i = []
   } = e;
-  He(o);
-  const f = [
+  $e(o);
+  const a = [
     ...l,
     ...t,
-    ...y,
-    ...s,
+    ...c,
+    ...f,
     ...r,
-    ...d,
+    ...s,
     ...n,
     ...i
-  ], a = [];
-  for (const S of f) {
-    const A = ue((S == null ? void 0 : S.conditions) || []);
+  ], d = [];
+  for (const g of a) {
+    const A = ce((g == null ? void 0 : g.conditions) || []);
     if (A != null && A.length) {
-      const x = 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,
-          conditionLabel: c.fieldName,
-          conditionName: c.fieldName,
-          conditionValueType: c.fieldType,
-          id: c.componentId,
-          keyName: c.fieldValue,
-          rule: c.rule,
+      const b = A.filter((u) => (u == null ? void 0 : u.dataType) === "component").map((u) => {
+        const x = {};
+        return u != null && u.dateFormat && (x.format = u.dateFormat), u.fieldValue === "PARENT" && (x.id = "PARENT", x.keyName = u.modelKey, x.modelKey = u.modelKey, x.prop = u.prop), C({
+          conditionKey: u.fieldName,
+          conditionLabel: u.fieldName,
+          conditionName: u.fieldName,
+          conditionValueType: u.fieldType,
+          id: u.componentId,
+          keyName: u.fieldValue,
+          rule: u.rule,
           notGlobal: !0,
-          indexCode: c.indexCode,
-          typeGuid: c.typeGuid,
-          indexCodeNum: c.indexCodeNum
-        }, m);
+          indexCode: u.indexCode,
+          typeGuid: u.typeGuid,
+          indexCodeNum: u.indexCodeNum
+        }, x);
       });
-      if (x != null && x.length)
-        for (const c of x)
-          a.find((m) => m.keyName === c.keyName) || a.push(c);
+      if (b != null && b.length)
+        for (const u of b)
+          d.find((x) => x.keyName === u.keyName) || d.push(u);
     }
   }
-  const b = a.length, u = o;
-  for (let S = 0; S < b; S++) {
-    const A = a[S];
+  const y = d.length, m = o;
+  for (let g = 0; g < y; g++) {
+    const A = d[g];
     if ((A == null ? void 0 : A.conditionKey) === "parentCode")
       continue;
     const {
-      id: x,
-      keyName: c,
-      prop: m,
-      format: g,
-      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);
+      id: b,
+      keyName: u,
+      prop: x,
+      format: S,
+      modelKey: L,
+      dataType: p = "component",
+      customValue: V
+    } = A, E = ze(A);
+    me(E, b, { prop: x, dateFormat: S, modelKey: L, keyName: u }), p === "" && (E.fieldValue = V || ""), m.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);
+  for (let g = m.length - 1; g >= 0; g--) {
+    const A = m[g];
+    A.globalCondition || ce(m).find((u) => u.alias === A.alias && u.globalCondition) && m.splice(g, 1);
   }
-  return u;
+  return m;
 };
-function $e(e) {
+function ze(e) {
   const {
     id: o,
     keyName: l,
     conditionLabel: t,
-    conditionKey: y,
-    conditionValueType: s,
+    conditionKey: c,
+    conditionValueType: f,
     prop: r,
-    rule: d = "NONE",
+    rule: s = "NONE",
     notGlobal: n = !1,
     indexCode: i,
-    typeGuid: f,
-    indexCodeNum: a,
-    dataType: b = "component"
+    typeGuid: a,
+    indexCodeNum: d,
+    dataType: y = "component"
   } = e;
-  let u = l || o;
-  u && r && (u += `-${r}`);
-  let S = d;
-  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,
+  let m = l || o;
+  m && r && (m += `-${r}`);
+  let g = s;
+  return g === "NONE" && (["startTime", "endTime"].includes(r) ? g = r === "startTime" ? "GREATER_EQUAL" : "LESS_EQUAL" : l != null && l.includes("startTime") ? g = r === "GREATER_EQUAL" : l != null && l.includes("endTime") ? g = r === "LESS_EQUAL" : g = "EQUAL"), o === "PARENT" && (m = e.modelKey, m && r && (m += `-${r}`), g = s), {
+    rule: g,
     label: t,
-    fieldName: y,
+    fieldName: c,
     fieldValue: "",
     // 在关联控件中取
     // dateFormat: 'YYYY-MM',
-    valueType: s,
-    alias: u,
+    valueType: f,
+    alias: m,
     globalCondition: !n,
     indexCode: i,
-    typeGuid: f,
-    indexCodeNum: a,
-    dataType: b
+    typeGuid: a,
+    indexCodeNum: d,
+    dataType: y
   };
 }
-function He(e) {
+function $e(e) {
   if (e != null && e.length)
     for (const o of e)
       if (o != null && o.conditions)
-        He(o.conditions);
+        $e(o.conditions);
       else {
         const {
           id: l,
           keyName: t,
-          prop: y,
-          modelKey: s,
+          prop: c,
+          modelKey: f,
           format: r,
-          dataType: d = "component",
+          dataType: s = "component",
           customValue: n
-        } = o, i = $e(o);
-        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)
-          delete o[f];
+        } = o, i = ze(o);
+        me(i, l, { prop: c, dateFormat: r, modelKey: f, keyName: t }), s === "" && (i.fieldValue = n || "");
+        for (const a in i)
+          o[a] = i[a];
+        for (const a of ol)
+          delete o[a];
       }
 }
-function rl(e) {
+function nl(e) {
   const o = [];
   if (e != null && e.length) {
     for (const l of e)
@@ -467,7 +468,7 @@ function rl(e) {
           valueType: l.variableType,
           alias: l.keyName || ""
         };
-        ye(t, l.id, {
+        me(t, l.id, {
           dateFormat: l.format,
           prop: l.dateTypeValue,
           keyName: l.keyName,
@@ -479,107 +480,107 @@ function rl(e) {
   }
   return o;
 }
-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;
-    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;
+function me(e, o, l) {
+  const { prop: t = "", dateFormat: c = "", modelKey: f = "", keyName: r = "", operateValue: s, operateMode: n, operateType: i } = l || {}, a = f || r;
+  if (o === "PARENT" && a && t) {
+    const x = window.config.record;
+    let S = t, L = c;
+    const p = t.match(/\{(.+?)\}/g);
+    if (p != null && p.length) {
+      const V = p[0].slice(1, -1).trim();
+      S = t.replace(p[0], ""), L = V, e.dateFormat = L;
     }
-    if (m && m[f]) {
-      const v = V(m[f][g]);
-      $.isDayjs(v) ? e.fieldValue = v.format(w || "YYYY-MM-DD") : e.fieldValue = v;
+    if (x && x[a]) {
+      const V = k(x[a][S]);
+      $.isDayjs(V) ? e.fieldValue = V.format(L || "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;
-  if (K(a.type, "date")) {
-    let m;
-    if (A ? b ? m = V(b) : m = $() : m = V(b), d && n && i)
+  const d = ye(o) || {}, { value: y, format: m = "YYYY-MM-DD", type: g = "", useCurrentTime: A, RECORD: b } = d || {}, u = c || m;
+  if (K(d.type, "date")) {
+    let x;
+    if (A ? y ? x = k(y) : x = $() : x = k(y), s && n && i)
       switch (i) {
         case "add":
-          m = m.add(d, n);
+          x = x.add(s, n);
           break;
         case "minus":
-          m = m.subtract(d, n);
+          x = x.subtract(s, n);
           break;
       }
-    e.fieldValue = m == null ? void 0 : m.format(c), e.dateFormat = c;
-  } else if (S === "ecanRangePicker") {
-    let m = t;
+    e.fieldValue = x == null ? void 0 : x.format(u), e.dateFormat = u;
+  } else if (g === "ecanRangePicker") {
+    let x = t;
     if (!t) {
-      const w = r && r.split("-");
-      w != null && w.length && (m = w[w.length - 1]);
+      const L = r && r.split("-");
+      L != null && L.length && (x = L[L.length - 1]);
     }
-    if (!m)
+    if (!x)
       return;
-    let g = null;
-    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;
+    let S = null;
+    if (k(d[x]) && (S = $(k(d[x]))), s && n && i) {
+      if (s === "rangeValue") {
+        if (d.startTime && d.endTime) {
+          const L = k(d.endTime).diff(k(d.startTime), n) + 1;
           switch (i) {
             case "add":
-              g = g && g.add(w, n);
+              S = S && S.add(L, n);
               break;
             case "minus":
-              g = g && g.subtract(w, n);
+              S = S && S.subtract(L, n);
           }
         }
-      } else if (!isNaN(+d))
+      } else if (!isNaN(+s))
         switch (i) {
           case "add":
-            g = g && g.add(d, n);
+            S = S && S.add(s, n);
             break;
           case "minus":
-            g = g && g.subtract(d, n);
+            S = S && S.subtract(s, n);
         }
     }
-    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);
+    if (S && (e.fieldValue = S == null ? void 0 : S.format(u)), x === "rangeValue" && d.startTime && d.endTime) {
+      const L = Xe(u);
+      L && (e.fieldValue = k(d.endTime).diff(k(d.startTime), L) + 1);
     }
-    e.dateFormat = c;
+    e.dateFormat = u;
   } 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(g, ll) ? f && b ? e.fieldValue = b[f] : !f && b ? e.fieldValue = b.value : e.fieldValue = k(y) : e.fieldValue = k(y);
 }
-const se = (e) => {
+const fe = (e) => {
   var o;
   if (e) {
-    const l = Array.isArray(e) ? fe(e) : [fe(e)];
-    let t = "", y = [];
-    const s = [], r = [], d = [];
+    const l = Array.isArray(e) ? ue(e) : [ue(e)];
+    let t = "", c = [];
+    const f = [], r = [], s = [];
     for (const n of l) {
-      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_")) {
+      if (n.defaultCode && (n.label = n.columnName, delete n.defaultCode), n.type === "CUSTOM" && (c = n.customOrderColumns), t = n.type, f.push(n.label), (o = n.columnName) != null && o.includes("_ecanrepeat_")) {
         const i = n.columnName.split("_ecanrepeat_");
         r.push(i[0]);
       } else
         r.push(n.columnName);
-      d.push(n.order);
+      s.push(n.order);
     }
-    return t !== "CUSTOM" && (s == null ? void 0 : s.length) > 1 && (t = "COMBINATION"), t === "CUSTOM" ? {
-      label: s.join(","),
+    return t !== "CUSTOM" && (f == null ? void 0 : f.length) > 1 && (t = "COMBINATION"), t === "CUSTOM" ? {
+      label: f.join(","),
       columnName: r.join(","),
       type: t,
-      customOrderColumns: y
+      customOrderColumns: c
     } : {
-      label: s.join(","),
+      label: f.join(","),
       columnName: r.join(","),
-      order: d.join(","),
+      order: s.join(","),
       type: t
     };
   } else
     return e;
-}, Qe = (e) => {
+}, He = (e) => {
   const { sortCpnts: o = [] } = e;
   let l, t = "";
-  for (const y of o) {
-    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();
+  for (const c of o) {
+    const f = ye(c) || {}, { type: r, RECORD: s } = f;
+    if (K(r, "image") && K(s == null ? void 0 : s.value, ["asc", "desc"])) {
+      t = s.value.toUpperCase();
       break;
     }
   }
@@ -589,169 +590,168 @@ const se = (e) => {
     order: t,
     type: "NORMAL"
   }), l;
-}, al = (e, o = {}) => {
-  var Ne, Fe, ve, ke, Ve, Ie, he, Ge, De, je;
-  const { graphicConfig: l, type: t, globalModel: y, isGroupTable: s = !1 } = e;
-  y && (ze = y);
-  let r = e.pageId;
-  const d = K(t, "pivottable");
+}, rl = (e, o = {}) => {
+  var pe, Ne, Fe, ve, ke, Ve, Ie, Ee, Ge, De;
+  const { graphicConfig: l, type: t, globalModel: c, isGroupTable: f = !1 } = e;
+  c && (_e = c);
+  const r = K(t, "pivottable");
   let {
-    source: n,
-    dataViewId: i,
-    plugin: f = "1",
+    source: s,
+    dataViewId: n,
+    plugin: i = "1",
     // 插件类型
     layer: a,
     // 后台图表类型，值分0，1
-    chartType: b,
+    chartType: d,
     // 前端图表类型
-    classificationList: u = [],
-    rowHeaderList: S = [],
-    dimensionList: A = [],
+    classificationList: y = [],
+    rowHeaderList: m = [],
+    dimensionList: g = [],
     // 文本组件的维度列表
-    seriesList: x = [],
-    leftAxisList: c = [],
-    rightAxisList: m = [],
-    queryColumnList: g = [],
-    indicators: w = [],
-    controlList: N = [],
-    formFields: v = {},
-    variableList: E = [],
-    variableConditions: Z = [],
+    seriesList: A = [],
+    leftAxisList: b = [],
+    rightAxisList: u = [],
+    queryColumnList: x = [],
+    indicators: S = [],
+    controlList: L = [],
+    formFields: p = {},
+    variableList: V = [],
+    variableConditions: E = [],
     // dataSourceId, // 所属数据源ID
-    idxLibMode: re,
+    idxLibMode: ne,
     // 指标库模式, source= INDICATOR_LIB时候必填, NORMAL_YEAR_TABLE = 普通年表, WITH_DATE_DIM_TABLE = 带有时间维度表
-    preview: me = !1,
+    preview: re = !1,
     // 预览开关
-    edvDataSetId: Le
+    edvDataSetId: ae
     // 数据集id
   } = l || {}, I = [];
-  if ((l == null ? void 0 : l.pageMode) === "design" ? (I = ((Ne = l.sqlConditions) != null ? Ne : []).map((L) => {
-    const T = {};
-    if (!W(L, "globalCondition") && !L.join && (T.globalCondition = !0), !L.join) {
-      const p = L.rule || "EQUAL";
-      T.rule = p === "NONE" ? "EQUAL" : p;
+  if ((l == null ? void 0 : l.pageMode) === "design" ? (I = ((pe = l.sqlConditions) != null ? pe : []).map((w) => {
+    const N = {};
+    if (!W(w, "globalCondition") && !w.join && (N.globalCondition = !0), !w.join) {
+      const T = w.rule || "EQUAL";
+      N.rule = T === "NONE" ? "EQUAL" : T;
     }
-    return C(C({}, L), T);
-  }), Z != null && Z.length && (I = I.concat(Z))) : (I = nl(l), E != null && E.length && (I = I.concat(rl(E)))), I != null && I.length) {
-    const L = I.filter((p) => p.globalCondition), T = I.filter((p) => !p.globalCondition);
-    (L == null ? void 0 : L.length) > 1 && (I = [
+    return C(C({}, w), N);
+  }), E != null && E.length && (I = I.concat(E))) : (I = il(l), V != null && V.length && (I = I.concat(nl(V)))), I != null && I.length) {
+    const w = I.filter((T) => T.globalCondition), N = I.filter((T) => !T.globalCondition);
+    (w == null ? void 0 : w.length) > 1 && (I = [
       {
         join: "&&",
-        conditions: L
+        conditions: w
       },
-      ...T
+      ...N
     ]);
   }
-  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");
+  I != null && I.length && (I = ee(I, "1")), a == null && (K(t, ["table", "card"]) || K(t, ["list", "circulate"]) && (y == null ? void 0 : y.length) > 1 ? a = "1" : K(t, ["select", "checkbox", "radio"]) ? a = "3" : a = "2");
   let H;
-  const Ce = [];
+  const we = [];
   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++) {
-      const p = u[T] || {}, {
+  if (Array.isArray(y) && y.length > 0 && (!["ecanList", "ecanCirculate"].includes(t) || (y == null ? void 0 : y.length) === 1)) {
+    const w = y.length;
+    for (let N = 0; N < w; N++) {
+      const T = y[N] || {}, {
         label: G = "",
         name: D = "",
         show: j = !1,
         sort: Q,
         customGroup: q,
         conditions: F,
-        dateFormat: k,
+        dateFormat: v,
         typeGuid: R = "",
-        truncations: M = []
-      } = p;
-      if (j || L === 1) {
+        truncations: h = []
+      } = T;
+      if (j || w === 1) {
         xe = R, H = {
           label: G.trim(),
           columnName: D,
           show: j,
-          sort: Qe(p) || se(Q) || Q,
+          sort: He(T) || fe(Q) || Q,
           customGroup: q,
-          conditions: le(F),
+          conditions: ee(F),
           typeGuid: R
-        }, k && (H.dateFormat = k), D === "the_date" && !H.dateFormat && (H.dateFormat = "YYYY-MM");
-        const h = {};
-        if (Array.isArray(M) && M.length > 0) {
-          const U = M.length;
+        }, v && (H.dateFormat = v), D === "the_date" && !H.dateFormat && (H.dateFormat = "YYYY-MM");
+        const M = {};
+        if (Array.isArray(h) && h.length > 0) {
+          const U = h.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 = h[_] || {}, { rule: P = "", num: X = 0, name: O = "" } = z;
+            P && X && (M.num = X, M.rule = P, O && (M.otherGroupName = O));
           }
         }
-        if ((Fe = Object.keys(h)) != null && Fe.length && (H.truncation = h), K(t, ["scatter", "valueline"]))
-          Ce.push(H);
+        if ((Ne = Object.keys(M)) != null && Ne.length && (H.truncation = M), K(t, ["scatter", "valueline"]))
+          we.push(H);
         else
           break;
       }
     }
   }
-  let Te;
-  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;
-      if (j || L === 1) {
-        Te = {
+  let Ce;
+  if (Array.isArray(A) && A.length > 0) {
+    const w = A.length;
+    for (let N = 0; N < w; N++) {
+      const T = A[N] || {}, { label: G = "", name: D = "", show: j = !1, sort: Q, customGroup: q, conditions: F, typeGuid: v } = T;
+      if (j || w === 1) {
+        Ce = {
           label: G.trim(),
           columnName: D,
           show: j,
-          sort: se(Q),
+          sort: fe(Q),
           customGroup: q,
-          conditions: le(F),
-          typeGuid: k
+          conditions: ee(F),
+          typeGuid: v
         };
         break;
       }
     }
   }
   const B = [];
-  c == null || c.forEach((L) => {
-    L.location = "LEFT", B.push(Ae(L, H));
-  }), m == null || m.forEach((L) => {
-    L.location = "RIGHT", B.push(Ae(L, H));
+  b == null || b.forEach((w) => {
+    w.location = "LEFT", B.push(Ae(w, H));
+  }), u == null || u.forEach((w) => {
+    w.location = "RIGHT", B.push(Ae(w, H));
   });
-  let ae = w;
-  (ke = (ve = o == null ? void 0 : o.pivotTableCal) == null ? void 0 : ve.indicators) != null && ke.length && (ae = o.pivotTableCal.indicators), ae == null || ae.forEach((L) => {
-    L.location = "LEFT", B.push(Ae(L, H));
+  let de = S;
+  (ve = (Fe = o == null ? void 0 : o.pivotTableCal) == null ? void 0 : Fe.indicators) != null && ve.length && (de = o.pivotTableCal.indicators), de == null || de.forEach((w) => {
+    w.location = "LEFT", B.push(Ae(w, 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: Q, typeGuid: q, indexCodeNum: F, dateFormat: k, conditions: R } = L;
-    let M = se(Q);
+  ["ecanList", "ecanCirculate"].includes(t) && (y == null ? void 0 : y.length) > 1 && (x = y), (Ve = (ke = o == null ? void 0 : o.pivotTableCal) == null ? void 0 : ke.dimensions) != null && Ve.length && (x = o.pivotTableCal.dimensions), x == null || x.forEach((w) => {
+    const { label: N, name: T, location: G, show: D, indexCode: j, sort: Q, typeGuid: q, indexCodeNum: F, dateFormat: v, conditions: R } = w;
+    let h = fe(Q);
     if (o.sort) {
       const { field: U, order: _ } = o.sort;
       let z = B.find((P) => P.label === U);
-      !z && T === U && (z = L), z && (M = {
+      !z && N === U && (z = w), z && (h = {
         columnName: z.columnName,
         label: o.sort.field,
         order: _.toUpperCase(),
         type: "NORMAL"
       });
     }
-    const h = {
-      label: T,
-      columnName: p,
+    const M = {
+      label: N,
+      columnName: T,
       location: G,
       show: D,
-      sort: M,
+      sort: h,
       calcType: "COLUMN",
       hrpIndexCode: j,
       hrpIndexCodeNum: F,
-      conditions: le(R),
+      conditions: ee(R),
       typeGuid: q
     };
-    k && (h.dateFormat = k), p === "the_date" && !h.dateFormat && (h.dateFormat = "YYYY-MM"), J.push(h);
+    v && (M.dateFormat = v), T === "the_date" && !M.dateFormat && (M.dateFormat = "YYYY-MM"), J.push(M);
   });
-  let ne = [], O = [];
-  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);
+  let ie = [], Z = [];
+  if (Array.isArray(m) && m.length > 0 ? Z = m : Array.isArray(g) && g.length > 0 && (Z = g), Z != null && Z.length) {
+    const w = Z.length;
+    for (let N = 0; N < w; N++) {
+      const T = Z[N] || {}, { label: G = "", name: D = "", show: j = !1, sort: Q, customGroup: q, conditions: F, truncations: v, typeGuid: R = "", dateFormat: h } = T;
+      let M = fe(Q);
       if (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 = {
+        let X = B.find((O) => O.label === z);
+        !X && T.label === z && (X = T), X && (M = {
           columnName: X.columnName,
           label: o.sort.field,
           order: P.toUpperCase(),
@@ -762,288 +762,280 @@ const se = (e) => {
         label: G.trim(),
         columnName: D,
         show: j,
-        sort: h,
+        sort: M,
         customGroup: q,
-        conditions: le(F),
+        conditions: ee(F),
         typeGuid: R
       };
-      M && (U.dateFormat = M), D === "the_date" && !U.dateFormat && (U.dateFormat = "YYYY-MM");
+      h && (U.dateFormat = h), D === "the_date" && !U.dateFormat && (U.dateFormat = "YYYY-MM");
       const _ = {};
-      if (Array.isArray(k) && k.length > 0) {
-        const z = k.length;
+      if (Array.isArray(v) && v.length > 0) {
+        const z = v.length;
         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));
+          const X = v[P] || {}, { rule: O = "", num: je = 0, name: Re = "" } = X;
+          O && je && (_.num = je, _.rule = O, Re && (_.otherGroupName = Re));
         }
       }
-      (he = Object.keys(_)) != null && he.length && (U.truncation = _), ne.push(U);
+      (Ie = Object.keys(_)) != null && Ie.length && (U.truncation = _), ie.push(U);
     }
   }
-  let ge = [], pe;
+  let ge = [], Te;
   if (o != null && o.pivotTableCal) {
-    let L = [];
+    let w = [];
     const {
-      calc: T = [],
-      filter: p = [],
+      calc: N = [],
+      filter: T = [],
       truncations: G = [],
       sorts: D = [],
       aggregateMethod: j = [],
       rowDimensionKeys: Q = [],
       colDimensionKeys: q = []
     } = o.pivotTableCal;
-    if (B.push(...T), p != null && p.length)
-      for (const F of p) {
-        const Me = F, { type: k } = Me, R = Se(Me, ["type"]);
-        k === "indicators" ? L = B : k === "dimension" && (L = J);
-        const M = L.find((h) => h.columnName === F.fieldName);
-        M && (M.conditions || (M.conditions = []), M.conditions.push(R));
+    if (B.push(...N), T != null && T.length)
+      for (const F of T) {
+        const Me = F, { type: v } = Me, R = Se(Me, ["type"]);
+        v === "indicators" ? w = B : v === "dimension" && (w = J);
+        const h = w.find((M) => M.columnName === F.fieldName);
+        h && (h.conditions || (h.conditions = []), h.conditions.push(R));
       }
     if (G != null && G.length)
       for (const F of G) {
-        const k = J.find((R) => R.columnName === F.key);
-        k && (k.truncation = {
+        const v = J.find((R) => R.columnName === F.key);
+        v && (v.truncation = {
           num: F.num,
           rule: F.rule
         });
       }
     if (D != null && D.length)
       for (const F of D) {
-        const Ee = F, { fieldType: k, columnData: R } = Ee, M = Se(Ee, ["fieldType", "columnData"]);
-        k === "indicators" ? (L = B, pe = R) : k === "dimension" && (L = J);
-        const h = L.find((U) => U.label === M.label);
-        h && (h.sort = Y(C({}, M), {
-          columnName: h.columnName
+        const he = F, { fieldType: v, columnData: R } = he, h = Se(he, ["fieldType", "columnData"]);
+        v === "indicators" ? (w = B, Te = R) : v === "dimension" && (w = J);
+        const M = w.find((U) => U.label === h.label);
+        M && (M.sort = Y(C({}, h), {
+          columnName: M.columnName
         }));
       }
-    if ((Ge = Object.keys(j)) != null && Ge.length)
+    if ((Ee = Object.keys(j)) != null && Ee.length)
       for (const F in j) {
-        const k = J.find((R) => R.label === F);
-        k && ((De = j[F]) != null && De.length) && (k.aggregateMethod = j[F]);
+        const v = J.find((R) => R.label === F);
+        v && ((Ge = j[F]) != null && Ge.length) && (v.aggregateMethod = j[F]);
       }
-    ne = [], ge = [];
+    ie = [], ge = [];
     for (const F of J)
-      Q.includes(F.columnName) ? ne.push(F) : q.includes(F.columnName) && ge.push(F);
+      Q.includes(F.columnName) ? ie.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)
+  if (K(t, ["text", "proportion", "counter"]) ? d = "zb" : K(t, ["valueline"]) && (d = "valueline"), f || t === "card") {
+    if (ie.length === 0 || B.length === 0)
       return;
-    b = "grouptable";
+    d = "grouptable";
   } else {
     if (a === "1" && J.length === 0)
       return;
     if (a === "2" && B.length === 0)
       return;
-    if (a === "3" && (!xe && n !== "EDV_DATA_SET" || !v.labelField || !v.valueField))
+    if (a === "3" && (!xe && s !== "EDV_DATA_SET" || !p.labelField || !p.valueField))
       return;
     if (a === "3" && t === "ecanDataSelect" && B.length === 0)
       return;
   }
-  if (A != null && A.length && (a = "1", b = "grouptable"), !r) {
-    const { pathname: L } = window == null ? void 0 : window.location;
-    if (L) {
-      const T = L.split("/");
-      T != null && T.length && (r = T[T.length - 1]);
-    }
-  }
+  g != null && g.length && (a = "1", d = "grouptable");
   let be;
-  if (!K(t, ["scatter", "valueline"]) && ((je = Object.keys(v)) != null && je.length)) {
-    const L = ue(N).find((p) => p.conditionKey === "parentCode"), T = {};
-    if (L) {
-      const p = ce(L.id) || {};
-      if (p != null && p.itemCodes)
-        T.parentItemCodes = p.itemCodes;
+  if (!K(t, ["scatter", "valueline"]) && ((De = Object.keys(p)) != null && De.length)) {
+    const w = ce(L).find((T) => T.conditionKey === "parentCode"), N = {};
+    if (w) {
+      const T = ye(w.id) || {};
+      if (T != null && T.itemCodes)
+        N.parentItemCodes = T.itemCodes;
       else
         return;
     }
-    t === "ecanDataSelect" && (T.indicatorList = B.filter((p) => p.show)), n === "EDV_DATA_SET" && (T.edvDataSetId = Le), be = C({
+    t === "ecanDataSelect" && (N.indicatorList = B.filter((T) => T.show)), s === "EDV_DATA_SET" && (N.edvDataSetId = ae), be = C({
       url: "/diagram/formData",
-      source: n,
-      dataViewId: i,
+      source: s,
+      dataViewId: n,
       plugin: "4",
       layer: a,
       chartType: "normalSelect",
       rangeIndexTypeGuid: xe,
       type: t === "ecanDataSelect" ? "normalSelectData" : "normalSelect",
-      labelField: v.labelField,
-      valueField: v.valueField,
-      pageId: r,
+      labelField: p.labelField,
+      valueField: p.valueField,
       sqlConditions: I,
       idxLibMode: "WITH_DATE_DIM_TABLE",
       keyName: e.keyName
-    }, T);
+    }, N);
   } else {
-    let L = {};
-    K(t, ["scatter", "valueline"]) ? L = {
-      classifications: Ce
-    } : L = {
+    let w = {};
+    K(t, ["scatter", "valueline"]) ? w = {
+      classifications: we
+    } : w = {
       classification: H
     }, be = C({
       url: "/diagram",
-      source: n,
-      dataViewId: i,
-      plugin: d ? "5" : f,
+      source: s,
+      dataViewId: n,
+      plugin: r ? "5" : i,
       layer: a,
-      chartType: d ? "pivot-table" : b,
-      series: Te,
+      chartType: r ? "pivot-table" : d,
+      series: Ce,
       indicatorList: B,
-      queryColumns: s ? [] : J,
+      queryColumns: f ? [] : J,
       pageFlag: !0,
-      pageId: r,
-      edvDataSetId: Le || "",
-      sqlConditions: I.map((T) => {
-        const { fieldValue: p } = T, G = {};
-        return p && Array.isArray(p) && (G.fieldValue = JSON.stringify(p)), C(C({}, T), G);
+      edvDataSetId: ae || "",
+      sqlConditions: I.map((N) => {
+        const { fieldValue: T } = N, G = {};
+        return T && Array.isArray(T) && (G.fieldValue = JSON.stringify(T)), C(C({}, N), G);
       }),
-      idxLibMode: re,
-      preview: me,
-      rowHeaders: ne,
+      idxLibMode: ne,
+      preview: re,
+      rowHeaders: ie,
       keyName: e.keyName,
       // 透视表指标排序相关入参
-      columnData: pe,
+      columnData: Te,
       columnHeaders: ge
-    }, L);
+    }, w);
   }
   return be;
-}, dl = {
-  formatIndicatorParams: al
-}, sl = (e = [], o) => {
+}, al = {
+  formatIndicatorParams: rl
+}, dl = (e = [], o) => {
   let { name: l = "name", types: t = [] } = o || {};
   l = (l == null ? void 0 : l.trim()) || l;
-  const y = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Map(), r = e.length, d = t.length;
+  const c = /* @__PURE__ */ new Set(), f = /* @__PURE__ */ new Map(), r = e.length, s = 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] });
-      y.add(S), f.push(x);
+    const a = [];
+    for (let y = 0; y < s; y++) {
+      const m = t[y], { label: g, value: A } = m, b = Y(C({}, e[0]), { value: e[0][A] });
+      c.add(g), a.push(b);
     }
-    const a = e[0][l] || "";
-    s.set(a, f);
+    const d = e[0][l] || "";
+    f.set(d, a);
   } else
-    for (let f = 0; f < r; f++) {
-      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] });
-        if (s.has(A)) {
-          const m = s.get(A);
-          m.push(c), s.set(A, m);
+    for (let a = 0; a < r; a++) {
+      const d = e[a], y = d[l];
+      c.add(y);
+      for (let m = 0; m < s; m++) {
+        const g = t[m], { label: A, value: b } = g, u = Y(C({}, d), { value: d[b] });
+        if (f.has(A)) {
+          const x = f.get(A);
+          x.push(u), f.set(A, x);
         } else
-          s.set(A, [c]);
+          f.set(A, [u]);
       }
     }
-  const n = Array.from(y), i = [];
-  for (const [f, a] of s)
+  const n = Array.from(c), i = [];
+  for (const [a, d] of f)
     i.push({
-      name: f,
-      data: a
+      name: a,
+      data: d
     });
   return {
     dimensions: n,
     dataset: i
   };
-}, 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[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);
+}, sl = (e, o) => {
+  let { name: l = "name", value: t = "value", type: c = "type" } = o || {};
+  l = l == null ? void 0 : l.trim(), t = t == null ? void 0 : t.trim(), c = c == null ? void 0 : c.trim();
+  const f = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Map(), s = e.length;
+  for (let a = 0; a < s; a++) {
+    const d = e[a], y = d[l] || "", m = d[t] || "", g = d[c] || "";
+    if (f.add(y), r.has(g)) {
+      const A = r.get(g);
+      A.push(C({ name: y, value: m }, d)), r.set(g, A);
     } else
-      r.set(S, [C({ name: b, value: u }, a)]);
+      r.set(g, [C({ name: y, value: m }, d)]);
   }
-  const n = Array.from(s), i = [];
-  for (const [f, a] of r)
+  const n = Array.from(f), i = [];
+  for (const [a, d] of r)
     i.push({
-      name: f,
-      data: a
+      name: a,
+      data: d
     });
   return {
     dimensions: n,
     dataset: i
   };
-}, te = (e, o) => {
-  var y;
+}, oe = (e, o) => {
+  var c;
   if (e == null)
     return o;
   const l = e.match(/\{.*\}/g);
   if (l == null || l.length === 0)
     return o;
   const t = l.length;
-  for (let s = 0; s < t; s++) {
-    const r = l[s];
+  for (let f = 0; f < t; f++) {
+    const r = l[f];
     if (r == null || r === "")
       break;
-    let d = (y = r.slice(1, -1)) == null ? void 0 : y.trim();
-    d = d == null ? void 0 : d.replace(/value/g, o);
+    let s = (c = r.slice(1, -1)) == null ? void 0 : c.trim();
+    s = s == null ? void 0 : s.replace(/value/g, o);
     try {
-      let n = d;
-      (/\(.*\)/g.test(d) || /[+/\\*]/g.test(d)) && (n = we(d)), e = e.replace(r, n);
+      let n = s;
+      (/\(.*\)/g.test(s) || /[+/\\*]/g.test(s)) && (n = Le(s)), e = e.replace(r, n);
     } catch (n) {
-      e = e.replace(r, d);
+      e = e.replace(r, s);
     }
   }
   return e;
 };
-function ul(e) {
+function fl(e) {
   return e.isShowMarkLine ? {
     markLine: {
       data: [{ type: e.markLineType }]
     }
   } : {};
 }
-const cl = (e, o, l) => {
+const ul = (e, o, l) => {
   switch (e.type) {
     case "bar":
-      return yl(e, o, l);
+      return cl(e, o, l);
     case "line":
-      return ml(e, o, l);
+      return yl(e, o, l);
     case "pie":
-      return xl(e, o, l);
+      return ml(e, o, l);
     case "comboGraph":
-      return gl(e, o, l);
+      return xl(e, o, l);
     default:
       return {};
   }
-}, 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]), {
+}, cl = (e, o, l) => {
+  const t = e.yAxisLabelFormatter, c = e.xAxisLabelFormatter, { dimensions: f = [], dataset: r = [] } = o, s = le(() => {
+    const { gradientShow: i, gradientColors: a, gradientOffset: d, barBorderRadius: y } = e, m = r, g = m.length, A = [];
+    for (let b = 0; b < g; b++) {
+      const u = Y(C({}, m[b]), {
         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: x, stackColumns: S } = e;
+      if (x && S.includes(m[b].name || !S) && (u.stack = "stack"), u.label = {
         show: e.labelShow,
         fontSize: e.labelFontSize,
         position: e.labelPosition,
         color: e.labelColor,
         width: e.labelWidth,
         overflow: e.labelOverflow,
-        formatter: (w) => {
-          let N = "", v = e.labelFormatter;
-          v === "" && (v = "{c}");
-          const { seriesName: E, name: Z, value: re, data: me } = w || {};
-          return N += ie(
-            v,
+        formatter: (L) => {
+          let p = "", V = e.labelFormatter;
+          V === "" && (V = "{c}");
+          const { seriesName: E, name: ne, value: re, data: ae } = L || {};
+          return p += te(
+            V,
             {
               textData: C({
-                name: Z,
+                name: ne,
                 value: re,
                 a: E,
-                b: Z,
+                b: ne,
                 c: re || 0
-              }, me)
+              }, ae)
             },
             {
               useNewline: !0,
               useSpace: !0
             }
-          ), N;
+          ), p;
         }
-      }, c.itemStyle = {}, i && (c.itemStyle = {
+      }, u.itemStyle = {}, i && (u.itemStyle = {
         color: {
           x: e.isUseHorizontalAxis ? 1 : 0,
           y: 0,
@@ -1051,78 +1043,78 @@ const cl = (e, o, l) => {
           y2: e.isUseHorizontalAxis ? 0 : 1,
           colorStops: [{
             offset: 0,
-            color: e.colors[x]
+            color: e.colors[b]
           }, {
-            offset: a,
-            color: f[x]
+            offset: d,
+            color: a[b]
           }, {
             offset: 1,
-            color: f[x]
+            color: a[b]
           }]
         }
-      }), b) {
-        const w = b.split(",");
-        if (w != null && w.length) {
-          const N = [];
-          for (const v of w) {
-            const E = parseFloat(v);
-            isNaN(E) || N.push(E);
+      }), y) {
+        const L = y.split(",");
+        if (L != null && L.length) {
+          const p = [];
+          for (const V of L) {
+            const E = parseFloat(V);
+            isNaN(E) || p.push(E);
           }
-          c.itemStyle.barBorderRadius = N;
+          u.itemStyle.barBorderRadius = p;
         }
       }
-      e.isShowMarkLine && (c.markLine = {
+      e.isShowMarkLine && (u.markLine = {
         data: [{ type: e.markLineType }]
-      }), A.push(c);
+      }), A.push(u);
     }
     return A;
-  }), n = oe(() => s.map((i) => {
-    let f = {};
-    return i && typeof i == "object" ? f = Y(C({}, i), {
+  }), n = le(() => f.map((i) => {
+    let a = {};
+    return i && typeof i == "object" ? a = Y(C({}, i), {
       textStyle: {
         fontSize: l
       }
-    }) : f = {
+    }) : a = {
       value: i,
       textStyle: {
         fontSize: l
       }
-    }, f;
+    }, a;
   }));
   return {
     tooltip: {
       trigger: "axis",
       show: e.tooltipShow,
       formatter: (i) => {
-        const f = i.length;
-        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] || {};
-          if (u === 0) {
-            let g = x;
-            typeof x == "string" && x[0] === "0" && !isNaN(+x) && (g = (+x).toString()), a += `${te(y, g)}<br/>`;
+        const a = i.length;
+        let d = "", y = e.tooltipFormatter;
+        y === "" && (y = "{marker} {a}    {c}");
+        for (let m = 0; m < a; m++) {
+          const { marker: g, seriesName: A, name: b, value: u, data: x } = i[m] || {};
+          if (m === 0) {
+            let S = b;
+            typeof b == "string" && b[0] === "0" && !isNaN(+b) && (S = (+b).toString()), d += `${oe(c, S)}<br/>`;
           }
-          a += ie(
-            b,
+          d += te(
+            y,
             {
               textData: C({
-                marker: S,
-                name: x,
-                value: c,
-                Qfw: el,
+                marker: g,
+                name: b,
+                value: u,
+                Qfw: Oe,
                 a: A,
-                b: x,
-                c: c || 0
-              }, m)
+                b,
+                c: u || 0
+              }, x)
             },
             {
               useNewline: !0,
               useSpace: !0
             }
-          ), a += "<br/>";
+          ), d += "<br/>";
         }
-        return a;
+        return d;
       },
       // valueFormatter: (value) => {
       //   return useVariablesInText(chartsOptions.tooltipValueFormatter as string, { value })
@@ -1155,20 +1147,20 @@ const cl = (e, o, l) => {
       itemHeight: e.legendItemHeight,
       itemWidth: e.legendItemWidth,
       itemGap: e.legendItemGap,
-      data: r.map((i, f) => ({
+      data: r.map((i, a) => ({
         name: i.name,
         itemStyle: {
-          color: e.colors[f]
+          color: e.colors[a]
         },
         icon: e.legendType
       })),
-      formatter: (i) => Oe(e.legendFormatter, {
+      formatter: (i) => Ze(e.legendFormatter, {
         name: i
       })
     },
     xAxis: {
       type: e.isUseHorizontalAxis ? "value" : "category",
-      data: e.isUseHorizontalAxis ? null : V(n),
+      data: e.isUseHorizontalAxis ? null : k(n),
       inverse: e.isUseHorizontalAxis ? e.xAxisInverse : e.axisInverse,
       minInterval: e.xAxisMinInterval,
       splitLine: {
@@ -1190,7 +1182,7 @@ const cl = (e, o, l) => {
         overflow: e.xAxisLabelOverflow,
         fontSize: e.xAxisLabelFontSize,
         formatter(i) {
-          return typeof i == "string" && i[0] === "0" && !isNaN(+i) && (i = (+i).toString()), te(y, i);
+          return typeof i == "string" && i[0] === "0" && !isNaN(+i) && (i = (+i).toString()), oe(c, i);
         }
       },
       axisLine: {
@@ -1212,7 +1204,7 @@ const cl = (e, o, l) => {
     },
     yAxis: {
       type: e.isUseHorizontalAxis ? "category" : "value",
-      data: e.isUseHorizontalAxis ? V(s) : null,
+      data: e.isUseHorizontalAxis ? k(f) : null,
       inverse: e.isUseHorizontalAxis ? e.axisInverse : e.yAxisInverse,
       minInterval: e.yAxisMinInterval,
       splitLine: {
@@ -1233,7 +1225,7 @@ const cl = (e, o, l) => {
         width: e.yAxisLabelWidth,
         overflow: e.yAxisLabelOverflow,
         formatter(i) {
-          return te(t, i);
+          return oe(t, i);
         }
       },
       axisLine: {
@@ -1250,28 +1242,28 @@ const cl = (e, o, l) => {
       },
       max: e.yAxisMaxValue || null
     },
-    series: V(d)
+    series: k(s)
   };
-}, 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), {
+}, yl = (e, o, l) => {
+  const t = e.yAxisLabelFormatter, c = e.xAxisLabelFormatter, { dimensions: f = [], dataset: r = [] } = o, s = le(() => f.map((i) => {
+    let a = {};
+    return i && typeof i == "object" ? a = Y(C({}, i), {
       textStyle: {
         fontSize: l
       }
-    }) : f = {
+    }) : a = {
       value: i,
       textStyle: {
         fontSize: l
       }
-    }, f;
-  })), n = oe(() => {
-    const i = [], f = r.length;
-    for (let a = 0; a < f; a++) {
-      const b = {};
-      e.shadowColor && (b.shadowColor = e.shadowColor, b.shadowBlur = e.shadowBlur, b.shadowOffsetY = e.shadowOffsetY, b.shadowOffsetX = e.shadowOffsetX), i.push(C(Y(C({
+    }, a;
+  })), n = le(() => {
+    const i = [], a = r.length;
+    for (let d = 0; d < a; d++) {
+      const y = {};
+      e.shadowColor && (y.shadowColor = e.shadowColor, y.shadowBlur = e.shadowBlur, y.shadowOffsetY = e.shadowOffsetY, y.shadowOffsetX = e.shadowOffsetX), i.push(C(Y(C({
         type: "line"
-      }, r[a]), {
+      }, r[d]), {
         symbolSize: e.symbolSize,
         smooth: e.smooth,
         areaStyle: {
@@ -1283,19 +1275,19 @@ const cl = (e, o, l) => {
             y2: 1,
             colorStops: [{
               offset: 0,
-              color: e.colors[a]
+              color: e.colors[d]
             }, {
               offset: 1,
               color: e.areaGradientColor || "transparent"
             }],
             global: !1
-          } : e.colors[a],
+          } : e.colors[d],
           opacity: e.areaStyleOpacity
         },
         lineStyle: C({
           width: e.lineStyleWidth
-        }, b)
-      }), ul(e)));
+        }, y)
+      }), fl(e)));
     }
     return i;
   });
@@ -1304,30 +1296,30 @@ const cl = (e, o, l) => {
       trigger: "axis",
       show: e.tooltipShow,
       formatter: (i) => {
-        const f = i.length;
-        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(
-            b,
+        const a = i.length;
+        let d = "", y = e.tooltipFormatter;
+        y === "" && (y = "{marker} {a}    {c}");
+        for (let m = 0; m < a; m++) {
+          const { marker: g, seriesName: A, name: b, value: u, data: x } = i[m] || {};
+          m === 0 && (d += `${b}<br/>`), d += te(
+            y,
             {
               textData: C({
-                marker: S,
-                name: x,
-                value: c,
+                marker: g,
+                name: b,
+                value: u,
                 a: A,
-                b: x,
-                c
-              }, m)
+                b,
+                c: u
+              }, x)
             },
             {
               useNewline: !0,
               useSpace: !0
             }
-          ), a += "<br/>";
+          ), d += "<br/>";
         }
-        return a;
+        return d;
       },
       textStyle: {
         color: e.tooltipTextStyleColor,
@@ -1339,7 +1331,7 @@ const cl = (e, o, l) => {
     xAxis: {
       name: e.xAxisName,
       type: "category",
-      data: V(d),
+      data: k(s),
       minInterval: e.xAxisMinInterval,
       splitLine: {
         show: e.xAxisSplitLineShow,
@@ -1354,7 +1346,7 @@ const cl = (e, o, l) => {
         width: e.xAxisLabelWidth,
         overflow: e.xAxisLabelOverflow,
         formatter(i) {
-          return te(y, i);
+          return oe(c, i);
         }
       },
       axisLine: {
@@ -1380,7 +1372,7 @@ const cl = (e, o, l) => {
         fontSize: l,
         color: e.yAxisLabelColor,
         formatter(i) {
-          return te(t, i);
+          return oe(t, i);
         }
       },
       axisLine: {
@@ -1400,16 +1392,16 @@ const cl = (e, o, l) => {
         fontSize: l
       }
     },
-    series: V(n)
+    series: k(n)
   };
-}, xl = (e, o, l) => {
+}, ml = (e, o, l) => {
   const { dataset: t = [] } = o;
-  let { data: y = [] } = t[0] || {};
+  let { data: c = [] } = t[0] || {};
   if (Array.isArray(e.colors)) {
-    const s = e.isUseLabelColors, r = e.colors;
-    y = y.map((d, n) => C({
-      label: s ? { color: r[n] } : {}
-    }, d));
+    const f = e.isUseLabelColors, r = e.colors;
+    c = c.map((s, n) => C({
+      label: f ? { color: r[n] } : {}
+    }, s));
   }
   return {
     title: {
@@ -1426,21 +1418,21 @@ const cl = (e, o, l) => {
     tooltip: {
       show: e.tooltipShow,
       trigger: e.tooltipTrigger,
-      formatter: (s) => {
-        const { marker: r, seriesName: d, name: n, value: i, percent: f, data: a } = s || {};
-        return ie(
+      formatter: (f) => {
+        const { marker: r, seriesName: s, name: n, value: i, percent: a, data: d } = f || {};
+        return te(
           e.tooltipFormatter,
           {
             textData: C({
               marker: r,
               name: n,
               value: i,
-              percent: f,
-              a: d,
+              percent: a,
+              a: s,
               b: n,
               c: i,
-              d: f
-            }, a)
+              d: a
+            }, d)
           },
           {
             useNewline: !0,
@@ -1467,7 +1459,7 @@ const cl = (e, o, l) => {
     },
     series: [
       {
-        data: y,
+        data: c,
         type: "pie",
         radius: [e.innerRadius, e.outerRadius],
         center: [e.centerLeft, e.centerTop],
@@ -1479,7 +1471,7 @@ const cl = (e, o, l) => {
           color: e.labelColor,
           fontSize: l === 18 ? l : e.labelFontSize,
           position: e.labelPosition,
-          formatter: Ze(e.labelFormatter)
+          formatter: Je(e.labelFormatter)
         },
         labelLine: {
           show: e.labelLineShow,
@@ -1497,8 +1489,8 @@ const cl = (e, o, l) => {
       }
     ]
   };
-}, gl = (e, o, l) => {
-  const { dimensions: t = [], dataset: y = [] } = o, s = oe(() => t.map((n) => {
+}, xl = (e, o, l) => {
+  const { dimensions: t = [], dataset: c = [] } = o, f = le(() => t.map((n) => {
     let i = {};
     return n && typeof n == "object" ? i = Y(C({}, n), {
       textStyle: {
@@ -1510,21 +1502,21 @@ const cl = (e, o, l) => {
         fontSize: l
       }
     }, i;
-  })), r = oe(() => {
-    const n = [], i = y.length, f = e.seriesTypes;
-    for (let a = 0; a < i; a++) {
-      const b = f[a], { type: u, axisIndex: S } = b || {};
+  })), r = le(() => {
+    const n = [], i = c.length, a = e.seriesTypes;
+    for (let d = 0; d < i; d++) {
+      const y = a[d], { type: m, axisIndex: g } = y || {};
       let A = C({
-        type: u,
-        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), {
+        type: m,
+        yAxisIndex: g
+      }, c[d]);
+      if (m === "line") {
+        const b = {};
+        e.shadowColor && (b.shadowColor = e.shadowColor, b.shadowBlur = e.shadowBlur, b.shadowOffsetY = e.shadowOffsetY, b.shadowOffsetX = e.shadowOffsetX), A = Y(C({}, A), {
           symbolSize: e.symbolSize,
           smooth: e.smooth,
           itemStyle: {
-            color: e.colors[a]
+            color: e.colors[d]
           },
           areaStyle: {
             color: e.areaGradientShow ? {
@@ -1535,51 +1527,51 @@ const cl = (e, o, l) => {
               y2: 1,
               colorStops: [{
                 offset: 0,
-                color: e.colors[a]
+                color: e.colors[d]
               }, {
                 offset: 1,
                 color: e.areaGradientColor || "transparent"
               }],
               global: !1
-            } : e.colors[a],
+            } : e.colors[d],
             opacity: e.areaStyleOpacity
           },
           lineStyle: C({
             width: e.lineStyleWidth
-          }, x)
+          }, b)
         });
       }
-      if (u === "bar") {
-        const { gradientShow: x, gradientColors: c, gradientOffset: m } = e, g = {};
+      if (m === "bar") {
+        const { gradientShow: b, gradientColors: u, gradientOffset: x } = e, S = {};
         if (e.barBorderRadius) {
-          const w = e.barBorderRadius.split(",");
-          if (w != null && w.length) {
-            const N = [];
-            for (const v of w) {
-              const E = parseFloat(v);
-              isNaN(E) || N.push(E);
+          const L = e.barBorderRadius.split(",");
+          if (L != null && L.length) {
+            const p = [];
+            for (const V of L) {
+              const E = parseFloat(V);
+              isNaN(E) || p.push(E);
             }
-            g.borderRadius = N;
+            S.borderRadius = p;
           }
         }
-        x && (g.color = {
+        b && (S.color = {
           x: 0,
           y: 0,
           x2: 0,
           y2: 1,
           colorStops: [{
             offset: 0,
-            color: e.colors[a]
+            color: e.colors[d]
           }, {
-            offset: m,
-            color: c[a]
+            offset: x,
+            color: u[d]
           }, {
             offset: 1,
-            color: c[a]
+            color: u[d]
           }]
         }), A = Y(C({}, A), {
           barWidth: e.barWidth,
-          itemStyle: g
+          itemStyle: S
         });
       }
       e.isShowMarkLine && (A.markLine = {
@@ -1587,16 +1579,16 @@ const cl = (e, o, l) => {
       }), n.push(A);
     }
     return n;
-  }), d = oe(() => {
+  }), s = le(() => {
     const n = e.yAxis;
-    return n == null ? void 0 : n.map((i, f) => ({
+    return n == null ? void 0 : n.map((i, a) => ({
       type: "value",
       minInterval: e.yAxisMinInterval,
       splitLine: {
-        show: f === 0 ? e.yAxisLeftSplitLineShow : e.yAxisRightSplitLineShow,
+        show: a === 0 ? e.yAxisLeftSplitLineShow : e.yAxisRightSplitLineShow,
         lineStyle: {
           color: e.yAxisSplitLineStyleColor,
-          type: f === 0 ? e.yAxisLeftSplitLineType : e.yAxisRightSplitLineType
+          type: a === 0 ? e.yAxisLeftSplitLineType : e.yAxisRightSplitLineType
         }
       },
       splitArea: {
@@ -1606,8 +1598,8 @@ const cl = (e, o, l) => {
         fontSize: l,
         show: e.yAxisLabelShow,
         color: e.yAxisLabelColor,
-        formatter(a) {
-          return te(i.axisLabelFormatter, a);
+        formatter(d) {
+          return oe(i.axisLabelFormatter, d);
         }
       },
       axisLine: {
@@ -1616,11 +1608,11 @@ const cl = (e, o, l) => {
           color: e.yAxisLineStyleColor
         }
       },
-      name: f === 0 ? e.yAxisLeftName : e.yAxisRightName,
+      name: a === 0 ? e.yAxisLeftName : e.yAxisRightName,
       nameTextStyle: {
         fontSize: e.yAxisLabelFontSize,
         color: e.yAxisLabelColor,
-        align: f === 0 ? "right" : "left"
+        align: a === 0 ? "right" : "left"
       },
       max: e.yAxisMaxValue || null
     }));
@@ -1641,32 +1633,32 @@ const cl = (e, o, l) => {
       show: e.tooltipShow,
       formatter: (n) => {
         const i = n.length;
-        let f = "", a = e.tooltipFormatter;
-        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] || {};
-          u === 0 && (f += `${m}<br/>`), f += ie(
+        let a = "", d = e.tooltipFormatter;
+        d === "" && (d = "{marker} {a}    {c}");
+        const y = e.seriesTypes;
+        for (let m = 0; m < i; m++) {
+          const g = y[m], { tooltipFormatter: A } = g || {}, { marker: b, seriesName: u, name: x, value: S, data: L } = n[m] || {};
+          m === 0 && (a += `${x}<br/>`), a += te(
             // 如果系列有提示框组件就使用自定义，没有就用默认的
-            A || a,
+            A || d,
             {
               textData: C({
-                marker: x,
-                name: m,
-                value: g,
-                seriesName: c,
-                a: c,
-                b: m,
-                c: g
-              }, w)
+                marker: b,
+                name: x,
+                value: S,
+                seriesName: u,
+                a: u,
+                b: x,
+                c: S
+              }, L)
             },
             {
               useNewline: !0,
               useSpace: !0
             }
-          ), f += "<br/>";
+          ), a += "<br/>";
         }
-        return f;
+        return a;
       },
       textStyle: {
         color: e.tooltipTextStyleColor || "#333",
@@ -1679,7 +1671,7 @@ const cl = (e, o, l) => {
       name: e.xAxisName,
       minInterval: e.xAxisMinInterval,
       type: "category",
-      data: V(s),
+      data: k(f),
       splitLine: {
         show: e.xAxisSplitLineShow,
         lineStyle: {
@@ -1702,10 +1694,10 @@ const cl = (e, o, l) => {
         show: e.xAxisTickShow
       }
     },
-    yAxis: V(d),
-    series: V(r)
+    yAxis: k(s),
+    series: k(r)
   };
-}, bl = (e) => ({
+}, gl = (e) => ({
   title: {
     text: e.titleText,
     subtext: e.titleSubtext,
@@ -1724,16 +1716,16 @@ const cl = (e, o, l) => {
     containLabel: e.gridContainLabel
   },
   color: e.colors
-}), Sl = (e, o, l = 12) => C(C({}, bl(e)), cl(e, o, l)), Tl = Y(C({}, dl), {
-  runCode: we,
-  useTransformChartDataByAttrKey: sl,
-  useTransformChartDataByAttrValue: fl,
-  useValueFormatter: te,
-  useVariablesInText: ie,
-  transformProps: Sl,
-  getIndicatorParams: ll
+}), bl = (e, o, l = 12) => C(C({}, gl(e)), ul(e, o, l)), Cl = Y(C({}, al), {
+  runCode: Le,
+  useTransformChartDataByAttrKey: dl,
+  useTransformChartDataByAttrValue: sl,
+  useValueFormatter: oe,
+  useVariablesInText: te,
+  transformProps: bl,
+  getIndicatorParams: el
 });
 export {
-  Tl as default
+  Cl as default
 };
 //# sourceMappingURL=index.es.js.map