super-page-runtime 2.3.9-sit1 → 2.3.10

package/dist/es/components/runtime/utils/page-init-util.js

@@ -1,7 +1,7 @@
 import e from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap as t } from "./events/standard-event.js";
 import { PageDimensions as s } from "./interfaces/page-design-types.js";
-import { getFormPropName as i, getVariableValue as n, setVariableValue as o, formatVariableValue as r } from "./page-helper-util.js";
+import { getFormPropName as i, getVariableValue as o, setVariableValue as n, formatVariableValue as r } from "./page-helper-util.js";
 import { getSessionCache as l } from "agilebuilder-ui/src/utils/auth";
 import { functions as a } from "./api/page-expose-util.js";
 import { isWorkflowPage as p, deepCopy as u } from "./common-util.js";
@@ -40,6 +40,7 @@ function g(e2) {
       e3.duplicateFieldList && e3.duplicateFieldList.length > 0 && (e3.duplicateFieldList = e3.duplicateFieldList.map((e4) => "string" == typeof e4 ? { propDbName: e4 } : e4));
     }), e2.props.judgeHeavyList) : null;
   } catch (e3) {
+    console.error("getJudgeHeavyList error:", e3);
   }
 }
 function b(e2) {
@@ -61,7 +62,7 @@ function y(e2, t2) {
   }
 }
 function h(e2, t2) {
-  if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query)) {
+  if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query, e2.query)) {
     Object.assign(t2, e2.query);
     w(e2.query.paramStoreId, t2);
   }
@@ -78,32 +79,32 @@ function w(e2, t2) {
 function E(e2, t2) {
   let s2, i2 = t2;
   t2 || (s2 = e2.props.base ? e2.props.base : {}, i2 = s2.prop);
-  let n2 = null;
-  return t2 && !t2.startsWith("${") ? n2 = ["data", t2] : !e2 || i2 && i2.startsWith("${") ? i2.startsWith("${") ? (i2 = i2.substring(2, i2.length - 1), n2 = i2.split("."), e2 && n2.length < 2 && (n2 = [e2.uuid])) : e2 && (n2 = ["page", e2.uuid]) : n2 = ["page", e2.uuid], n2 || e2 ? n2 : ["temp"];
+  let o2 = null;
+  return t2 && !t2.startsWith("${") ? o2 = ["data", t2] : !e2 || i2 && i2.startsWith("${") ? i2.startsWith("${") ? (i2 = i2.substring(2, i2.length - 1), o2 = i2.split("."), e2 && o2.length < 2 && (o2 = [e2.uuid])) : e2 && (o2 = ["page", e2.uuid]) : o2 = ["page", e2.uuid], o2 || e2 ? o2 : ["temp"];
 }
 function v(e2, t2, s2) {
   const i2 = E(t2, s2), r2 = e2.entity;
   if (null == r2.data.ID && null == r2.data.id) {
     let s3, l2, a2 = false;
     t2 && (s3 = t2.props.base ? t2.props.base : {}, l2 = t2.name, a2 = s3.multiple);
-    const p2 = n(r2, i2);
+    const p2 = o(r2, i2);
     if (null == p2) {
       const t3 = s3 ? s3.defaultValue : null;
       if (t3) {
         const s4 = P(e2, t3, l2, a2);
-        null != s4 && o(r2, i2, s4);
+        null != s4 && n(r2, i2, s4);
       }
     }
   }
   return i2;
 }
 function P(e2, t2, s2, i2) {
-  let n2;
-  if (t2 && (n2 = r(e2, t2), null != n2 && null != n2 && s2)) {
+  let o2;
+  if (t2 && (o2 = r(e2, t2), null != o2 && null != o2 && s2)) {
     let e3 = false;
-    "checkbox" == s2 ? e3 = true : "select" == s2 && (e3 = i2), e3 && (n2 = (n2 + "").split(","));
+    "checkbox" == s2 ? e3 = true : "select" == s2 && (e3 = i2), e3 && (o2 = (o2 + "").split(","));
   }
-  return n2;
+  return o2;
 }
 function M(e2, t2) {
   var _a, _b;
@@ -111,14 +112,14 @@ function M(e2, t2) {
   const s2 = [];
   if (e2.autoPermissions) for (const i2 of e2.autoPermissions) s2.push(t2.code + "." + i2.simpleCode);
   if (e2.functionCodes) {
-    const i2 = e2.sourceTypes ? e2.sourceTypes : [], n2 = e2.functionCodes;
-    for (let e3 = 0; e3 < n2.length; e3++) {
-      const o2 = n2[e3], r2 = e3 < i2.length ? i2[e3] : "";
+    const i2 = e2.sourceTypes ? e2.sourceTypes : [], o2 = e2.functionCodes;
+    for (let e3 = 0; e3 < o2.length; e3++) {
+      const n2 = o2[e3], r2 = e3 < i2.length ? i2[e3] : "";
       let l2 = "";
-      if ("service" == r2) l2 = o2;
-      else if ("standard" === r2) l2 = t2.code + "." + o2;
+      if ("service" == r2) l2 = n2;
+      else if ("standard" === r2) l2 = t2.code + "." + n2;
       else {
-        l2 = "custom" === k(o2, t2).type ? o2 : t2.code + "." + o2;
+        l2 = "custom" === k(n2, t2).type ? n2 : t2.code + "." + n2;
       }
       s2.includes(l2) || s2.push(l2);
     }
@@ -132,26 +133,26 @@ function k(e2, t2) {
   }
   return null;
 }
-function j(s2, i2, n2) {
-  const o2 = s2.tableRuntimes, r2 = t(i2);
+function j(s2, i2, o2) {
+  const n2 = s2.tableRuntimes, r2 = t(i2);
   let l2;
   const a2 = i2.code;
-  return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: o2, additionalParamMapJson: l2, pageCode: a2, publishVersion: n2, pageType: s2.pageType });
+  return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: n2, additionalParamMapJson: l2, pageCode: a2, publishVersion: o2, pageType: s2.pageType });
 }
 const C = ["button-detail", "print-label"];
 function I(e2, t2, s2) {
   var _a, _b;
-  const n2 = t2.props && t2.props.base ? t2.props.base.prop : null, o2 = p(e2);
+  const o2 = t2.props && t2.props.base ? t2.props.base.prop : null, n2 = p(e2);
   let r2 = false;
-  if (o2 && C.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
+  if (n2 && C.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
     const s3 = e2.fieldPermissionMap.get("all_fields");
     false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", r2 = true);
   }
-  if (n2) {
-    const l2 = i(n2);
+  if (o2) {
+    const l2 = i(o2);
     if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[l2] || (e2.rules[l2] = []), t2.props.rules.forEach((e3) => {
       d(e3), !s2 && e3 && e3.required && (e3.required = false);
-    }), e2.rules[l2] = t2.props.rules), o2 && !r2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
+    }), e2.rules[l2] = t2.props.rules), n2 && !r2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
       const i2 = e2.fieldPermissionMap.get(l2);
       if (!s2 && e2.workflowRules && (e2.workflowRules[l2] || e2.workflowRules.rules && e2.workflowRules.rules[l2])) {
         let t3 = e2.workflowRules[l2];

package/dist/es/components/runtime/utils/page-store.js

@@ -1,18 +1,18 @@
 import { ref as e } from "vue";
-import { defineStore as o } from "pinia";
-import a from "./eventBus.js";
-const t = o("pageContextUtil", () => {
-  const o2 = e({ systemCode: "", systemVersion: -1 }), t2 = e(false), n = e(false), u = e(false), l = e(0), d = e(0);
-  return { pageContext: o2, setPageContext: function(e2) {
-    o2.value = e2;
+import { defineStore as a } from "pinia";
+import o from "./eventBus.js";
+const t = a("pageContextUtil", () => {
+  const a2 = e({ systemCode: "", systemVersion: -1 }), t2 = e(false), n = e(false), u = e(false), l = e(0), v = e(0);
+  return { pageContext: a2, setPageContext: function(e2) {
+    a2.value = e2;
   }, countComponentsTotalNmber: function() {
     l.value++, t2.value = false, u.value = false;
   }, countComponentsLoadedNumber: function() {
-    d.value++, u.value = false;
-  }, componentsTotalNmber: l, componentsLoadedNumber: d, setPageComponentsLoaded: function(e2) {
-    t2.value = e2, t2.value && n.value && (a.$emit("pageLoaded"), u.value = true);
+    v.value++, u.value = false;
+  }, componentsTotalNmber: l, componentsLoadedNumber: v, setPageComponentsLoaded: function(e2) {
+    t2.value = e2, t2.value && n.value && (o.$emit("pageLoaded"), u.value = true);
   }, setFormPageDataLoadState: function(e2) {
-    n.value = e2, t2.value && n.value && (u.value = true);
+    n.value = e2, t2.value && n.value && (t2.value, n.value, u.value = true);
   }, formPageDataLoaded: n, pageComponentsLoaded: t2, restorePageLoadState: function() {
     t2.value = false, n.value = false, u.value = false;
   }, pageLoaded: u, getPageLoaded: function() {

package/dist/es/components/runtime/utils/table-utils.js

@@ -19,7 +19,7 @@ function u(t2, e2) {
 }
 function l(t2, e2, i2, s2) {
   const r2 = !(!e2.props || !e2.props.base) && e2.props.base.showOperation, u2 = e2.btnList;
-  r2 && u2 && u2.forEach((e3) => {
+  e2.btnList, r2 && u2 && u2.forEach((e3) => {
     const r3 = {}, u3 = Object.assign({}, e3.props.base);
     if ("custom" === e3.name ? u3.customControl = u3.name : u3.elementType = "el-button", void 0 === e3.isPermission || e3.isPermission + "" == "true") {
       const i3 = o(e3, t2);

package/dist/es/components/runtime/views/assemblys/chart/common/common-chart-header-group.vue.js

@@ -1,9 +1,13 @@
-import { defineComponent as e, watch as l, resolveComponent as o, createBlock as a, createElementBlock as u, openBlock as r, withCtx as d, Fragment as n, renderList as p } from "vue";
-const t = e({ __name: "common-chart-header-group", props: { headerInfo: { type: Object, required: true } }, setup: (e2) => (l(e2.headerInfo, () => {
-}), (l2, t2) => {
-  const h = o("el-checkbox"), f = o("el-checkbox-group"), m = o("el-radio"), V = o("el-radio-button"), b = o("el-radio-group");
-  return "checkbox" == e2.headerInfo.groupComponent ? (r(), a(f, { key: 0, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t2[0] || (t2[0] = (l3) => e2.headerInfo.groupValue = l3) }, { default: d(() => [(r(true), u(n, null, p(e2.headerInfo.options, (e3) => (r(), a(h, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"])) : "radio" == e2.headerInfo.groupComponent ? (r(true), u(n, { key: 1 }, p(e2.headerInfo.options, (l3) => (r(), a(m, { modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t2[1] || (t2[1] = (l4) => e2.headerInfo.groupValue = l4), value: l3.value, label: l3.label }, null, 8, ["modelValue", "value", "label"]))), 256)) : (r(), a(b, { key: 2, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t2[2] || (t2[2] = (l3) => e2.headerInfo.groupValue = l3) }, { default: d(() => [(r(true), u(n, null, p(e2.headerInfo.options, (e3) => (r(), a(V, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"]));
-}) });
+import { defineComponent as e, watch as l, resolveComponent as o, createBlock as a, createElementBlock as u, openBlock as r, withCtx as n, Fragment as d, renderList as p } from "vue";
+const t = e({ __name: "common-chart-header-group", props: { headerInfo: { type: Object, required: true } }, setup(e2) {
+  const t2 = e2;
+  return l(t2.headerInfo, () => {
+    t2.headerInfo;
+  }), (l2, t3) => {
+    const h = o("el-checkbox"), f = o("el-checkbox-group"), m = o("el-radio"), V = o("el-radio-button"), b = o("el-radio-group");
+    return "checkbox" == e2.headerInfo.groupComponent ? (r(), a(f, { key: 0, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[0] || (t3[0] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(h, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"])) : "radio" == e2.headerInfo.groupComponent ? (r(true), u(d, { key: 1 }, p(e2.headerInfo.options, (l3) => (r(), a(m, { modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[1] || (t3[1] = (l4) => e2.headerInfo.groupValue = l4), value: l3.value, label: l3.label }, null, 8, ["modelValue", "value", "label"]))), 256)) : (r(), a(b, { key: 2, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[2] || (t3[2] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(V, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"]));
+  };
+} });
 export {
   t as default
 };

package/dist/es/components/runtime/views/assemblys/chart/common/common-chart-header.vue.js

@@ -3,12 +3,13 @@ import { Search as p } from "@element-plus/icons-vue";
 import g from "./common-chart-header-group.vue.js";
 import m from "./common-chart-header-breadcrumb.vue.js";
 import b from "./common-homepage-search.vue.js";
-import { setVariableValueWithProp as v, getValueFromSource as y, setValueForVariableName as w } from "../../../../utils/page-helper-util.js";
-const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-header-item" }, k = { class: "amb-widget-chart-header-item amb-widget-chart-header-center" }, j = { class: "amb-widget-chart-header-item" }, C = { key: 0, class: "amb-widget-chart-header-item" }, P = e({ __name: "common-chart-header", props: { headerInfo: { type: Object, required: true }, configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["drill-end"], setup(e2, { expose: P2, emit: _ }) {
+import { setVariableValueWithProp as v, getValueFromSource as y, setValueForVariableName as O } from "../../../../utils/page-helper-util.js";
+const w = { class: "amb-widget-chart-header" }, x = { class: "amb-widget-chart-header-item" }, k = { class: "amb-widget-chart-header-item amb-widget-chart-header-center" }, j = { class: "amb-widget-chart-header-item" }, C = { key: 0, class: "amb-widget-chart-header-item" }, P = e({ __name: "common-chart-header", props: { headerInfo: { type: Object, required: true }, configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["drill-end"], setup(e2, { expose: P2, emit: _ }) {
   const N = e2, D = o(null), A = o(), R = _;
   function S(e3) {
     const o2 = N.headerInfo.drillOptions.length;
-    if (!(e3 >= o2)) {
+    if (e3 >= o2) N.headerInfo.drillOptions;
+    else {
       for (let r2 = o2 - 1; r2 >= e3; r2--) N.headerInfo.drillOptions.splice(r2, 1);
       q(e3);
     }
@@ -34,7 +35,7 @@ const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-h
     for (let e4 of o2.variables) {
       if (!e4.fieldName || !e4.variable) continue;
       const o3 = y(r2, e4.fieldName, void 0);
-      w(N.pageContext.entity, e4.variable, o3);
+      O(N.pageContext.entity, e4.variable, o3);
     }
   }
   N.headerInfo.drillOptions || (N.headerInfo.drillOptions = []);
@@ -46,11 +47,12 @@ const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-h
     if (r2 + 1 >= N.headerInfo.options.length) {
       return F(o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : void 0), void R("drill-end", e3);
     }
+    N.headerInfo.options;
     const n2 = N.headerInfo.options[r2], t2 = o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : null, a2 = { fieldName: n2.target ? n2.target.replace(".", "_") : "", rawFieldName: n2.target ? n2.target : "", label: e3.name, value: e3.name, data: t2 };
     N.headerInfo.drillOptions.push(a2), q(r2 + 1);
   }, closeDrill: S }), (o2, v2) => {
-    const y2 = r("el-icon"), w2 = r("el-tooltip");
-    return t(), n("div", x, [a("div", O, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(w2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(u(p))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
+    const y2 = r("el-icon"), O2 = r("el-tooltip");
+    return t(), n("div", w, [a("div", x, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(O2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(u(p))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/chart/table/chart-table-util.js

@@ -11,24 +11,24 @@ class ExpressionEvaluator {
     return this.evaluateExpression(o);
   }
   static createExpression(e, t, r) {
-    const { propName: o, operator: a, propValue: n, leftBracket: s, rightBracket: l, joinSign: i, dataType: c } = t;
+    const { propName: o, operator: n, propValue: a, leftBracket: s, rightBracket: l, joinSign: i, dataType: c } = t;
     if (!o || "" === o) return "";
     const u = getValueFromVariable(e.entity, o, r);
-    let p = `${s} ${this.getComparisonExpression(u, t, getValueFromVariable(e.entity, n, r))} ${l}`;
+    let p = `${s} ${this.getComparisonExpression(u, t, getValueFromVariable(e.entity, a, r))} ${l}`;
     return i && ("and" === i || "AND" === i ? p += "&&" : "or" !== i && "OR" !== i || (p += "||")), p.trim();
   }
   static getComparisonExpression(e, t, r) {
-    const { dataType: o, variableIsNull: a } = t;
-    let n = t.operator;
-    n || (n = "EQ");
+    const { dataType: o, variableIsNull: n } = t;
+    let a = t.operator;
+    a || (a = "EQ");
     let s = this.parseValue(e, o);
     const l = this.parseValue(r, o);
-    if (null == l && a) {
-      if (null == s && (s = "null"), "null" === a) return `${s} === null`;
-      if ("ignore" === a) return "1=1";
-      if ("notequal" === a) return "1!=1";
+    if (null == l && n) {
+      if (null == s && (s = "null"), "null" === n) return `${s} === null`;
+      if ("ignore" === n) return "1=1";
+      if ("notequal" === n) return "1!=1";
     }
-    switch (n) {
+    switch (a) {
       case "EQ":
         return `${s} === ${l}`;
       case "GT":
@@ -55,7 +55,7 @@ class ExpressionEvaluator {
         }
         return `[${l}].includes(${s})`;
       default:
-        throw new Error(`比较符号不匹配: ${n}`);
+        throw new Error(`比较符号不匹配: ${a}`);
     }
   }
   static changeDataType(e) {
@@ -86,7 +86,7 @@ class ExpressionEvaluator {
     try {
       return eval(expression);
     } catch (e) {
-      return false;
+      return console.error("表达式错误:", expression, e), false;
     }
   }
 }
@@ -114,39 +114,40 @@ function getSummaryDataColumn(e, t) {
   const r = {};
   return ((_a = e.props.summaries) == null ? void 0 : _a.dataColumn) && e.props.summaries.dataColumn.length > 0 && e.props.summaries.dataColumn.forEach((o) => {
     var _a2;
-    const a = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => o.prop === e2.props.base.prop);
-    a && ("table" === t && a.props.base.tableSummary || "group" === t && a.props.base.groupSummary) && (r[o.prop] = o);
+    const n = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => o.prop === e2.props.base.prop);
+    n && ("table" === t && n.props.base.tableSummary || "group" === t && n.props.base.groupSummary) && (r[o.prop] = o);
   }), r;
 }
 function summaryStatistics(e, t, r, o) {
-  let a = "";
-  const n = e.summaryMode, s = t.map((e2) => Number(e2[r])).filter((e2) => !Number.isNaN(e2));
-  if (s.length > 0) if ("custom" === n) {
-    const n2 = getCustomFunc(o, e.customFunc);
-    if (n2) try {
-      const e2 = n2.apply(n2, [{ data: t, prop: r }]);
-      a = e2 ? ` ${e2}` : " N/A";
+  let n = "";
+  const a = e.summaryMode, s = t.map((e2) => Number(e2[r])).filter((e2) => !Number.isNaN(e2));
+  if (s.length > 0) if ("custom" === a) {
+    const a2 = getCustomFunc(o, e.customFunc);
+    if (a2) try {
+      const e2 = a2.apply(a2, [{ data: t, prop: r }]);
+      n = e2 ? ` ${e2}` : " N/A";
     } catch (e2) {
+      console.error("自定义函数脚本错误:", t, e2);
     }
-    else a = " N/A";
-  } else switch (n) {
+    else n = " N/A";
+  } else switch (a) {
     case "sum":
-      a = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
+      n = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
       break;
     case "avg":
-      a = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
+      n = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
       break;
     case "min":
-      a = ` ${Math.min(...s)}`;
+      n = ` ${Math.min(...s)}`;
       break;
     case "max":
-      a = ` ${Math.max(...s)}`;
+      n = ` ${Math.max(...s)}`;
       break;
     default:
-      a = " N/A";
+      n = " N/A";
   }
-  else a = " N/A";
-  return a;
+  else n = " N/A";
+  return n;
 }
 function replacePlaceholders(e, t) {
   if (e) return e.replace(/\$\{row\.(\w+)\}/g, (e2, r) => Object.prototype.hasOwnProperty.call(t, r) ? t[r] : "");
@@ -156,31 +157,33 @@ function getHeaderCellStyleUtil(e, t, r) {
   const o = {};
   e.column.property && ((_a = t.titleStyle) == null ? void 0 : _a.forEach((t2) => {
     if (t2.field && t2.field.includes(e.column.property)) if (t2.scopeFunc) {
-      const a2 = getCustomFunc(r.pageContext, t2.scopeFunc);
-      if (a2) try {
-        false !== a2.apply(a2, [{ item: t2, data: e }]) && copyStyle(o, t2);
-      } catch (e2) {
+      const n2 = getCustomFunc(r.pageContext, t2.scopeFunc);
+      if (n2) try {
+        false !== n2.apply(n2, [{ item: t2, data: e }]) && copyStyle(o, t2);
+      } catch (r2) {
+        console.error("自定义函数脚本错误:", t2, e, r2);
       }
     } else copyStyle(o, t2);
   }));
-  const a = getCellStyleUtil(e, t.cellTitleStyle, r);
-  return a && Object.assign(o, a), o;
+  const n = getCellStyleUtil(e, t.cellTitleStyle, r);
+  return n && Object.assign(o, n), o;
 }
 function getRowStyleUtil(e, t, r) {
   const o = {};
   if (r.configure.style.rowStyle) for (let t2 = 0; t2 < r.configure.style.rowStyle.length; t2++) {
-    const a = r.configure.style.rowStyle[t2];
-    if (a.scopeFunc) {
-      const t3 = getCustomFunc(r.pageContext, a.scopeFunc);
+    const n = r.configure.style.rowStyle[t2];
+    if (n.scopeFunc) {
+      const t3 = getCustomFunc(r.pageContext, n.scopeFunc);
       if (t3) try {
         const r2 = t3.apply(t3, [{ data: e }]);
-        null != r2 && false !== r2 && copyStyle(o, a);
-      } catch (e2) {
+        null != r2 && false !== r2 && copyStyle(o, n);
+      } catch (t4) {
+        console.error("自定义函数脚本错误:", e, t4);
       }
-    } else if (a.matchingCondition) {
-      const t3 = ExpressionEvaluator.evaluate(r.pageContext, a.matchingCondition, e.row);
-      (t3 || void 0 === t3) && copyStyle(o, a);
-    } else copyStyle(o, a);
+    } else if (n.matchingCondition) {
+      const t3 = ExpressionEvaluator.evaluate(r.pageContext, n.matchingCondition, e.row);
+      (t3 || void 0 === t3) && copyStyle(o, n);
+    } else copyStyle(o, n);
   }
   if (t && t.length > 0 && -1 !== t.indexOf(e.rowIndex)) {
     const e2 = {};
@@ -193,18 +196,19 @@ function getRowStyleUtil(e, t, r) {
 }
 function getCellStyleUtil(e, t, r) {
   const o = {};
-  if (t) for (let a = 0; a < t.length; a++) {
-    const n = t[a];
-    if (isSetStyle(n)) if (n.scopeFunc) {
-      const t2 = getCustomFunc(r.pageContext, n.scopeFunc);
+  if (t) for (let n = 0; n < t.length; n++) {
+    const a = t[n];
+    if (isSetStyle(a)) if (a.scopeFunc) {
+      const t2 = getCustomFunc(r.pageContext, a.scopeFunc);
       if (t2) try {
-        false !== t2.apply(t2, [{ data: e }]) && copyStyle(o, n);
-      } catch (e2) {
+        false !== t2.apply(t2, [{ data: e }]) && copyStyle(o, a);
+      } catch (t3) {
+        console.error("自定义函数脚本错误:", e, t3);
       }
-    } else if (n.matchingCondition) {
-      const t2 = ExpressionEvaluator.evaluate(r.pageContext, n.matchingCondition, e.row);
-      (t2 || void 0 === t2) && copyStyle(o, n);
-    } else copyStyle(o, n);
+    } else if (a.matchingCondition) {
+      const t2 = ExpressionEvaluator.evaluate(r.pageContext, a.matchingCondition, e.row);
+      (t2 || void 0 === t2) && copyStyle(o, a);
+    } else copyStyle(o, a);
   }
   return o;
 }
@@ -216,33 +220,33 @@ function copyStyle(e, t) {
   Object.assign(e, t.style), t.customStyle && Object.assign(e, JSON.parse(t.customStyle));
 }
 function rowDataToColumn(e, t, r) {
-  const o = t.props.dataOrigin.groupField, a = t.props.dataOrigin.rowToColumn.titleColumns, n = t.props.dataOrigin.rowToColumn.dataColumns, s = [], l = {};
+  const o = t.props.dataOrigin.groupField, n = t.props.dataOrigin.rowToColumn.titleColumns, a = t.props.dataOrigin.rowToColumn.dataColumns, s = [], l = {};
   if (o && o.length > 0) e.forEach((e2) => {
     const t2 = o.map((t3) => e2[t3]).join("|");
     if (!l[t2]) {
       const r2 = {};
       o.forEach((t3) => r2[t3] = e2[t3]), l[t2] = r2, s.push(r2);
     }
-    n.forEach((r2) => {
-      const o2 = `${a.map((t3) => e2[t3]).join("")}${r2}`;
+    a.forEach((r2) => {
+      const o2 = `${n.map((t3) => e2[t3]).join("")}${r2}`;
       l[t2][o2] = e2[r2];
     });
   });
   else {
     const t2 = [];
     e.forEach((e2) => {
-      a.forEach((r2) => {
+      n.forEach((r2) => {
         e2[r2] && t2.push(e2[r2]);
       });
-    }), n.forEach((t3) => {
-      const o2 = {}, n2 = r.find((e2) => {
+    }), a.forEach((t3) => {
+      const o2 = {}, a2 = r.find((e2) => {
         var _a, _b;
         return ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop) === t3;
       });
-      n2 && (o2.$GroupColumn = n2.props.base.name), e.forEach((e2) => {
-        a.forEach((r2) => {
-          const a2 = e2[r2], n3 = e2[t3];
-          o2[a2] = n3;
+      a2 && (o2.$GroupColumn = a2.props.base.name), e.forEach((e2) => {
+        n.forEach((r2) => {
+          const n2 = e2[r2], a3 = e2[t3];
+          o2[n2] = a3;
         });
       }), s.push(o2);
     });
@@ -250,9 +254,9 @@ function rowDataToColumn(e, t, r) {
   return s;
 }
 function colDataToRow(e, t) {
-  const r = t.props.dataOrigin.groupField, o = t.props.dataOrigin.columnToRow.titleColumns, a = t.props.dataOrigin.columnToRow.dataColumns, n = t.props.dataOrigin.columnToRow.transColumns, s = t.props.dataOrigin.columnToRow.dataColumnsMapping;
+  const r = t.props.dataOrigin.groupField, o = t.props.dataOrigin.columnToRow.titleColumns, n = t.props.dataOrigin.columnToRow.dataColumns, a = t.props.dataOrigin.columnToRow.transColumns, s = t.props.dataOrigin.columnToRow.dataColumnsMapping;
   if (0 === e.length) return e;
-  const l = [], i = groupBy(e, r), c = a.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, a[0]), u = a.reduce((e2, t2) => (t2.columns.forEach((r2) => {
+  const l = [], i = groupBy(e, r), c = n.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, n[0]), u = n.reduce((e2, t2) => (t2.columns.forEach((r2) => {
     e2[r2] = t2.prop;
   }), e2), {});
   return i.forEach((e2) => {
@@ -260,14 +264,14 @@ function colDataToRow(e, t) {
       const i2 = c.prop, p = {};
       if (r.forEach((t3) => {
         p[t3] = e2[t3];
-      }), p[i2] = e2[t2], a.length > 1) {
+      }), p[i2] = e2[t2], n.length > 1) {
         const r2 = s.find((e3) => e3.props.includes(t2));
         r2 && r2.props.length > 1 && r2.props.forEach((r3) => {
           r3 !== t2 && u[r3] && (p[u[r3]] = e2[r3]);
         });
       }
       o.forEach((e3) => {
-        const r2 = n.filter((t3) => t3.relatedTitle === e3.prop);
+        const r2 = a.filter((t3) => t3.relatedTitle === e3.prop);
         let o2 = false;
         r2 && r2.length > 0 && r2.forEach((r3) => {
           if (r3.columns.includes(t2)) return p[e3.prop] = r3.label, void (o2 = true);
@@ -277,25 +281,25 @@ function colDataToRow(e, t) {
   }), l;
 }
 function getColumnToRowTableConfig(e) {
-  const t = e.items, r = e.props.dataOrigin.groupField, o = e.props.dataOrigin.columnToRow.titleColumns, a = e.props.dataOrigin.columnToRow.dataColumns, n = [];
+  const t = e.items, r = e.props.dataOrigin.groupField, o = e.props.dataOrigin.columnToRow.titleColumns, n = e.props.dataOrigin.columnToRow.dataColumns, a = [];
   r && r.length > 0 && r.forEach((e2) => {
     if (t) {
       const r2 = t.find((t2) => t2.props.base.prop === e2);
-      r2 && n.push(r2);
+      r2 && a.push(r2);
     }
   });
-  return [...o, ...a].forEach((e2) => {
+  return [...o, ...n].forEach((e2) => {
     if (t) {
       const r2 = t.find((t2) => t2.props.base.prop === e2);
-      r2 ? n.push(r2) : n.push({ uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e2.prop, name: e2.title, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: "string" }, format: {}, size: { pc: {} } }, style: {}, componentIndex: 0, runtime: { common: { class: "", style: { pc_style: {}, pc_class: "" } } } });
+      r2 ? a.push(r2) : a.push({ uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e2.prop, name: e2.title, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: "string" }, format: {}, size: { pc: {} } }, style: {}, componentIndex: 0, runtime: { common: { class: "", style: { pc_style: {}, pc_class: "" } } } });
     }
-  }), n;
+  }), a;
 }
 function groupBy(e, t) {
   const r = {};
   return e.forEach((e2) => {
     const o = t.map((t2) => e2[t2]).join("|");
-    r[o] || (r[o] = { ...e2, records: [] }, t.forEach((t2, a) => {
+    r[o] || (r[o] = { ...e2, records: [] }, t.forEach((t2, n) => {
       r[o][t2] = e2[t2];
     })), r[o].records.push(e2);
   }), Object.values(r).map((e2) => ({ ...e2, records: void 0 }));
@@ -323,7 +327,7 @@ function computeFormula(itemConfs, datas, entity) {
             r += Number(e2[t]);
           });
         } catch (e2) {
-          r = 0;
+          console.error("计算错误:", e2), r = 0;
         }
         totalValueMap[e] = r;
       } else (e.startsWith("${page.") || e.startsWith("${data.") || e.startsWith("${row.") || e.startsWith("${request.") || e.startsWith("${context.") || e.startsWith("${system.") || e.startsWith("${fixed.")) && (totalValueMap[e] = getValueFromVariable(entity, e, data));
@@ -335,7 +339,7 @@ function computeFormula(itemConfs, datas, entity) {
       try {
         data[key] = eval(expr);
       } catch (e) {
-        data[key] = 0;
+        console.error(itemConfs[key] + " 计算错误, 替换后表达式为：" + expr, e), data[key] = 0;
       }
     });
   });
@@ -343,19 +347,19 @@ function computeFormula(itemConfs, datas, entity) {
 function getFieldName(e) {
   return e.substring(6, e.length - 1);
 }
-function formatColContent(e, t, r, o, a) {
-  const n = e[r.props.base.prop];
+function formatColContent(e, t, r, o, n) {
+  const a = e[r.props.base.prop];
   switch (t.type) {
     case "number":
-      return formatNumber(n, t);
+      return formatNumber(a, t);
     case "currency":
-      return formatCurrency(n, t);
+      return formatCurrency(a, t);
     case "percent":
-      return formatPercent(n, t);
+      return formatPercent(a, t);
     case "custom":
-      return formatCustomFunc(e, t, r, o, a);
+      return formatCustomFunc(e, t, r, o, n);
     default:
-      return n;
+      return a;
   }
 }
 function formatNumber(e, t) {
@@ -370,12 +374,13 @@ function formatPercent(e, t) {
   let r = e;
   return r || (r = 0), t.decimalDigit && (r = Number(e).toFixed(t.decimalDigit)), r + " %";
 }
-function formatCustomFunc(e, t, r, o, a) {
-  const n = getCustomFunc(o, t.customFunc);
-  if (n) {
+function formatCustomFunc(e, t, r, o, n) {
+  const a = getCustomFunc(o, t.customFunc);
+  if (a) {
     try {
-      return n.apply(n, [{ pageContext: o, configureObj: a, row: e, prop: r.props.base.prop }]);
-    } catch (e2) {
+      return a.apply(a, [{ pageContext: o, configureObj: n, row: e, prop: r.props.base.prop }]);
+    } catch (t2) {
+      console.error("自定义函数脚本错误:", e, t2);
     }
     return "";
   }