@ecan-bi/tools 1.0.12 → 1.0.13

package/dist/index.es.js

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