super-page-runtime 2.3.3 → 2.3.4

package/dist/es/components/runtime/utils/barcode-util.js

@@ -1,11 +1,11 @@
-function e(e2, t) {
-  let n = true, r = "";
+function e(e2, n) {
+  let t = true, r = "";
   return e2.forEach((e3) => {
     if ("-1" !== e3.propDbName && -1 !== e3.propDbName) {
-      const a = t[e3.propDbName];
-      e3.supplementaryCharacters && e3.length ? a ? a.length > e3.length ? r += a.substring(0, e3.length) : r += a.padEnd(e3.length, e3.supplementaryCharacters) : r += "".padEnd(e3.length, e3.supplementaryCharacters) : a ? r += a : n = false;
+      const a = n[e3.propDbName];
+      e3.supplementaryCharacters && e3.length ? a ? a.length > e3.length ? r += a.substring(0, e3.length) : r += a.padEnd(e3.length, e3.supplementaryCharacters) : r += "".padEnd(e3.length, e3.supplementaryCharacters) : a ? r += a : t = false;
     } else r += e3.fixedValue;
-  }), n ? r : null;
+  }), console.log("跟据规则生成条码：" + r), t ? r : null;
 }
 export {
   e as generateCodeByRule

package/dist/es/components/runtime/utils/charts/chart-pie-util.js

@@ -1,6 +1,6 @@
-import { getValueFromSource as o, setValueForVariableName as t } from "../page-helper-util.js";
-import { deepCopy as r } from "../common-util.js";
-import { CommonName as s, caculateFormulaValue as e, executeChartFormula as l, sortDatas as n, limitDatas as p } from "./chart-util.js";
+import { getValueFromSource as o, setValueForVariableName as e } from "../page-helper-util.js";
+import { deepCopy as s } from "../common-util.js";
+import { CommonName as r, caculateFormulaValue as t, executeChartFormula as l, sortDatas as n, limitDatas as p } from "./chart-util.js";
 function i(i2, u, c, a) {
   if (!a || !a.result) return;
   const f = a && a.result ? a.result : {};
@@ -13,67 +13,68 @@ function i(i2, u, c, a) {
     g = [];
     for (const o2 of d) g.push(o2.group);
   }
-  const y = {}, x = [], v = [];
-  for (const o2 of d) y[o2.group] = o2.target, o2.target && !x.includes(o2.target) && (x.push(o2.target), g.includes(o2.group) && v.push(o2.target));
-  let E = u.props ? u.props.mulGroupShow : "";
-  E = "break" == E ? "\r\n" : " ";
-  for (const t2 of h) {
-    if (!t2) continue;
-    const r2 = [];
-    for (const s2 of g) {
-      const e3 = y[s2], l2 = o(t2, e3, void 0);
-      l2 && r2.push(l2);
+  const y = {}, v = [], x = [];
+  for (const o2 of d) y[o2.group] = o2.target, o2.target && !v.includes(o2.target) && (v.push(o2.target), g.includes(o2.group) && x.push(o2.target));
+  let F = u.props ? u.props.mulGroupShow : "";
+  F = "break" == F ? "\r\n" : " ", console.log("groupValue", g);
+  for (const e2 of h) {
+    if (!e2) continue;
+    const s2 = [];
+    for (const r2 of g) {
+      const t3 = y[r2], l2 = o(e2, t3, void 0);
+      l2 && s2.push(l2);
     }
-    const e2 = r2.join(E);
-    t2[s.X_FIELD_NAME] = e2;
+    const t2 = s2.join(F);
+    e2[r.X_FIELD_NAME] = t2;
   }
-  const F = u.items ? u.items : [];
-  if (0 == F.length) return;
+  const E = u.items ? u.items : [];
+  if (0 == E.length) return void console.log("饼图的系列为空,操作失败!", u);
   const S = u.props ? u.props : {};
   let _ = S.yaxisField;
-  if (F[0].props.yaxisField = _, F[0].props.yaxisSource = S.yaxisSource, F[0].props.formula = S.formula, "formula" === S.yaxisSource) {
-    const t2 = [], r2 = e(F, h, t2);
+  if (console.log("valueField", _), E[0].props.yaxisField = _, E[0].props.yaxisSource = S.yaxisSource, E[0].props.formula = S.formula, "formula" === S.yaxisSource) {
+    const e2 = [], s2 = t(E, h, e2);
     let n2 = S.formula ? S.formula : "";
-    for (const o2 in r2) n2 = n2.replace(new RegExp(o2.replace("$", "\\$"), "g"), r2[o2]);
-    _ = s.Y_TEMP_NAME;
+    for (const o2 in s2) n2 = n2.replace(new RegExp(o2.replace("$", "\\$"), "g"), s2[o2]);
+    _ = r.Y_TEMP_NAME;
     const p2 = {};
-    for (const r3 of h) {
-      if (!r3) continue;
-      for (const s3 of t2) {
-        const t3 = o(r3, s3, void 0);
-        let e2 = p2[s3];
-        void 0 === t3 || isNaN(t3) || (void 0 === e2 ? e2 = t3 : e2 += t3), p2[s3] = e2;
+    for (const s3 of h) {
+      if (!s3) continue;
+      for (const r3 of e2) {
+        const e3 = o(s3, r3, void 0);
+        let t2 = p2[r3];
+        void 0 === e3 || isNaN(e3) || (void 0 === t2 ? t2 = e3 : t2 += e3), p2[r3] = t2;
       }
-      const s2 = l(n2, p2, r3, i2);
-      r3[_] = s2;
+      console.log("formula", n2);
+      const r2 = l(n2, p2, s3, i2);
+      console.log("formula-result", r2), s3[_] = r2;
     }
   }
-  F[0].props.yaxisField = _, F[0].props.yaxisSource = "", n(i2, u, h), h = p(i2, u, h, x, [_]);
+  E[0].props.yaxisField = _, E[0].props.yaxisSource = "", n(i2, u, h), h = p(i2, u, h, v, [_]);
   const A = [], D = [];
-  for (const t2 of h) {
-    if (!t2) continue;
-    A.push(t2[s.X_FIELD_NAME]);
-    const r2 = o(t2, _, void 0);
-    D.push(r2);
+  for (const e2 of h) {
+    if (!e2) continue;
+    A.push(e2[r.X_FIELD_NAME]);
+    const s2 = o(e2, _, void 0);
+    D.push(s2);
   }
   const M = u.defaultSeries;
   let N = M[0].pieColors;
   N = N || [];
   let j = M[0].pieColorMap;
   j = j || {};
-  const b = [];
+  const V = [];
   for (let o2 = 0; o2 < A.length && o2 < D.length; o2++) {
-    const t2 = { value: D[o2], name: A[o2] };
-    if (o2 < N.length || j[t2.name]) {
-      let r2 = j[t2.name];
-      r2 || (r2 = N[o2]), r2 && (t2.itemStyle = { color: r2 });
+    const e2 = { value: D[o2], name: A[o2] };
+    if (o2 < N.length || j[e2.name]) {
+      let s2 = j[e2.name];
+      s2 || (s2 = N[o2]), s2 && (e2.itemStyle = { color: s2 });
     }
-    b.push(t2);
+    V.push(e2);
   }
-  const w = r(M);
-  w[0].data = b, c.series = [w[0]];
-  const I = u.props ? u.props.selGroupVariable : null;
-  !(u.props ? u.props.enableDrill : null) && I && (u.highlightInfos = [], t(i2.entity, I, null)), u.groupFields = v, u.cacheDatas = h, u.rawResult = a;
+  const b = s(M);
+  b[0].data = V, c.series = [b[0]];
+  const w = u.props ? u.props.selGroupVariable : null;
+  !(u.props ? u.props.enableDrill : null) && w && (u.highlightInfos = [], e(i2.entity, w, null)), u.groupFields = x, u.cacheDatas = h, u.rawResult = a;
 }
 export {
   i as updateChartOption

package/dist/es/components/runtime/utils/charts/chart-scatter-util.js

@@ -1,44 +1,46 @@
 import { getValueFromSource as o } from "../page-helper-util.js";
 import { deepCopy as s } from "../common-util.js";
 import { caculateFormulaValue as i, executeChartFormula as e } from "./chart-util.js";
-function r(r2, t, a, l) {
-  if (!l || !l.result) return;
-  const u = l && l.result ? l.result : {}, f = t.serviceDataField;
-  let c = null;
-  f ? c = u[f] : u && (c = Array.isArray(u) ? u : [u]), c || (c = []);
+function r(r2, t, l, a) {
+  if (!a || !a.result) return;
+  const u = a && a.result ? a.result : {}, c = t.serviceDataField;
+  let f = null;
+  c ? f = u[c] : u && (f = Array.isArray(u) ? u : [u]), f || (f = []);
   const d = t.items ? t.items : [], n = [], p = {};
   for (const o2 of d) {
     const s2 = o2.props ? o2.props : {}, i2 = o2.props ? o2.style : {}, e2 = s2.xaxisField, r3 = s2.sizeField, t2 = { uuid: o2.uuid, xaxisField: e2, yaxisField: s2.yaxisField, yaxisSource: s2.yaxisSource, formula: s2.formula, sizeField: r3, symbolSize: i2.symbolSize, data: [] };
     n.push(t2), p[t2.uuid] = t2;
   }
-  const m = [], x = i(d, c, m);
+  const m = [], x = i(d, f, m);
   for (const o2 of n) if ("formula" === o2.yaxisSource) {
     let s2 = o2.formula ? o2.formula : "";
     for (const o3 in x) s2 = s2.replace(new RegExp(o3.replace("$", "\\$"), "g"), x[o3]);
     o2.formula = s2;
   }
   const y = {};
-  for (const s2 of c) if (s2) {
+  for (const s2 of f) if (s2) {
     for (const i2 of m) {
       const e2 = o(s2, i2, void 0);
       let r3 = y[i2];
       void 0 === e2 || isNaN(e2) || (void 0 === r3 ? r3 = e2 : r3 += e2), y[i2] = r3;
     }
     for (const i2 of n) {
-      const t2 = i2.data, a2 = [];
-      if (a2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
+      const t2 = i2.data, l2 = [];
+      if (l2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
         const o2 = e(i2.formula, y, s2, r2);
-        a2.push(o2);
-      } else a2.push(o(s2, i2.yaxisField, void 0));
-      i2.sizeField ? a2.push(o(s2, i2.xaxisField, void 0)) : a2.push(i2.symbolSize), t2.push(a2);
+        l2.push(o2);
+      } else l2.push(o(s2, i2.yaxisField, void 0));
+      i2.sizeField ? l2.push(o(s2, i2.xaxisField, void 0)) : l2.push(i2.symbolSize), t2.push(l2);
     }
   }
-  const F = t.defaultSeries, h = s(F);
+  const F = t.defaultSeries;
+  console.log("defaultSeries", F);
+  const h = s(F);
   for (const o2 of h) {
     const s2 = p[o2.uuid];
     o2.data = s2.data;
   }
-  a.series = h, t.cacheDatas = c, t.rawResult = l;
+  l.series = h, t.cacheDatas = f, t.rawResult = a;
 }
 export {
   r as updateChartOption

package/dist/es/components/runtime/utils/charts/chart-util.js

@@ -2,7 +2,7 @@ import t from "../../../../assets/chart-themes/theme1.js";
 import e from "../../../../assets/chart-themes/theme2.js";
 import n from "../../../../assets/chart-themes/theme3.js";
 import { getDefaultValue as i } from "../page-init-util.js";
-import { getValueFromSource as s, setValueForVariableName as o, getParamNames as r, formatVariableValue as a, getValueFromVariable as l, setVariableValue as c } from "../page-helper-util.js";
+import { getValueFromSource as s, setValueForVariableName as o, getParamNames as r, formatVariableValue as l, getValueFromVariable as a, setVariableValue as c } from "../page-helper-util.js";
 import { appendDefaultMethods as f } from "../events/event-util.js";
 var u = ((t2) => (t2.X_FIELD_NAME = "__x", t2.Y_TEMP_NAME = "__y", t2))(u || {});
 const d = { theme1: t, theme2: e, theme3: n };
@@ -16,16 +16,16 @@ function m(t2, e2, n2, i2, s2) {
   return function(o2) {
     let r2 = o2.value;
     if (s2 && (r2 = o2), null == r2 || null == r2) return r2;
-    if (Array.isArray(r2)) return r2;
+    if (Array.isArray(r2)) return console.log("numformatter is array", r2), r2;
     if (isNaN(r2) || !t2 || !t2.indexOf) return r2;
     if (t2.indexOf("precision") > -1) {
       let t3 = parseInt(e2);
       (null == t3 || isNaN(t3)) && (t3 = 2), r2 = parseFloat(parseFloat(r2).toFixed(t3));
     }
-    let a2 = "";
-    t2.indexOf("prefix") > -1 && n2 && (a2 = n2);
     let l2 = "";
-    return t2.indexOf("append") > -1 && i2 && (l2 = i2), a2 + r2.toLocaleString() + l2;
+    t2.indexOf("prefix") > -1 && n2 && (l2 = n2);
+    let a2 = "";
+    return t2.indexOf("append") > -1 && i2 && (a2 = i2), l2 + r2.toLocaleString() + a2;
   };
 }
 function g(t2, e2) {
@@ -51,18 +51,20 @@ function x(t2, e2, n2) {
   if (!(n2 && e2 && e2.clickSet && t2)) return;
   const i2 = e2.clickSet;
   n2.on("click", function(s2) {
-    let o2 = e2.highlightInfos ? e2.highlightInfos : [], r2 = -1;
+    let o2 = e2.highlightInfos ? e2.highlightInfos : [];
+    console.log("highlightInfos", o2, s2);
+    let r2 = -1;
     if (o2) {
       const t3 = [];
-      for (let a2 = 0; a2 < o2.length; a2++) {
-        const l2 = o2[a2], c2 = l2.seriesIndex === s2.seriesIndex && l2.dataIndex === s2.dataIndex;
+      for (let l2 = 0; l2 < o2.length; l2++) {
+        const a2 = o2[l2], c2 = a2.seriesIndex === s2.seriesIndex && a2.dataIndex === s2.dataIndex;
         if (c2 || !i2.multiple) {
           if (i2.selected) {
             const t4 = "chart-pie" === e2.name ? "unselect" : "downplay";
-            n2.dispatchAction({ type: t4, seriesIndex: l2.seriesIndex, dataIndex: l2.dataIndex });
+            n2.dispatchAction({ type: t4, seriesIndex: a2.seriesIndex, dataIndex: a2.dataIndex });
           }
-        } else t3.push(l2);
-        c2 && (r2 = a2);
+        } else t3.push(a2);
+        c2 && (r2 = l2);
       }
       o2 = t3;
     }
@@ -89,12 +91,12 @@ function b(t2, e2) {
   if (!e2.clickSet) return;
   const n2 = e2.clickSet, i2 = n2.variables;
   if (!i2 || 0 == i2.length) return;
-  const r2 = e2.highlightInfos ? e2.highlightInfos : [], a2 = e2.cacheDatas ? e2.cacheDatas : [], l2 = [], c2 = [];
-  for (const t3 of r2) c2.includes(t3.dataIndex) || (c2.push(t3.dataIndex), t3.dataIndex < a2.length && l2.push(a2[t3.dataIndex]));
+  const r2 = e2.highlightInfos ? e2.highlightInfos : [], l2 = e2.cacheDatas ? e2.cacheDatas : [], a2 = [], c2 = [];
+  for (const t3 of r2) c2.includes(t3.dataIndex) || (c2.push(t3.dataIndex), t3.dataIndex < l2.length && a2.push(l2[t3.dataIndex]));
   for (const e3 of i2) {
     if (!e3.fieldName || !e3.variable) continue;
     const i3 = [];
-    for (const t3 of l2) {
+    for (const t3 of a2) {
       const n3 = s(t3, e3.fieldName, void 0);
       null != n3 && i3.push(n3);
     }
@@ -115,11 +117,11 @@ function v(t2, e2, n2) {
     }
   }
   if (!r2) return;
-  const l2 = e2.props ? e2.props.orderSource : "";
+  const a2 = e2.props ? e2.props.orderSource : "";
   let c2 = e2.props ? e2.props.orderFix : "";
-  if ("variable" == l2) {
+  if ("variable" == a2) {
     const n3 = e2.props ? e2.props.orderVariable : "";
-    c2 = a(t2, n3);
+    c2 = l(t2, n3);
   }
   c2 = "desc" == c2 || "DESC" == c2 ? "desc" : "asc", n2.sort((t3, e3) => {
     const n3 = s(t3, r2, void 0), i3 = s(e3, r2, void 0);
@@ -130,14 +132,14 @@ function N(t2, e2, n2, i2, o2) {
   if (!n2) return n2;
   const r2 = e2.props ? e2.props : {};
   if (!r2.limitQuantity) return n2;
-  let l2 = null;
-  if (r2.itemNumVariable ? (l2 = a(t2, r2.itemNumVariable), l2 = parseInt(l2)) : l2 = r2.itemNumFix ? r2.itemNumFix : 10, null == l2 || null == l2 || isNaN(l2)) return n2;
-  if (n2.length < l2) return n2;
+  let a2 = null;
+  if (r2.itemNumVariable ? (a2 = l(t2, r2.itemNumVariable), a2 = parseInt(a2)) : a2 = r2.itemNumFix ? r2.itemNumFix : 10, null == a2 || null == a2 || isNaN(a2)) return n2;
+  if (n2.length < a2) return n2;
   const c2 = r2.overItemAlias, f2 = [], u2 = {};
   i2 = i2 || [], o2 = o2 || [];
   for (let t3 = 0; t3 < n2.length; t3++) {
     const e3 = n2[t3];
-    if (t3 < l2) f2.push(e3);
+    if (t3 < a2) f2.push(e3);
     else {
       if (!c2) break;
       for (const t4 of i2) {
@@ -212,11 +214,11 @@ function k(t2, e2, n2, i2) {
   const o2 = r(t2);
   for (const e3 of o2) {
     let o3 = null;
-    o3 = e3.startsWith("${row.") ? s(n2, e3.substring(6, e3.length - 1), null) : l(i2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), o3);
+    o3 = e3.startsWith("${row.") ? s(n2, e3.substring(6, e3.length - 1), null) : a(i2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), o3);
   }
   t2.includes("return ") || (t2 = "return " + t2);
-  const a2 = new Function("params", t2);
-  return f(a2, i2), a2({ pageContext: i2, row: n2 });
+  const l2 = new Function("params", t2);
+  return f(l2, i2), l2({ pageContext: i2, row: n2 });
 }
 function M(t2) {
   if (!t2 || !t2.$el) return;