super-page-runtime 2.3.5 → 2.3.6-sit1

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

@@ -3,13 +3,12 @@ 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 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: _ }) {
+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: _ }) {
   const N = e2, D = o(null), A = o(), R = _;
   function S(e3) {
     const o2 = N.headerInfo.drillOptions.length;
-    if (e3 >= o2) N.headerInfo.drillOptions;
-    else {
+    if (!(e3 >= o2)) {
       for (let r2 = o2 - 1; r2 >= e3; r2--) N.headerInfo.drillOptions.splice(r2, 1);
       q(e3);
     }
@@ -35,7 +34,7 @@ const w = { class: "amb-widget-chart-header" }, x = { 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);
-      O(N.pageContext.entity, e4.variable, o3);
+      w(N.pageContext.entity, e4.variable, o3);
     }
   }
   N.headerInfo.drillOptions || (N.headerInfo.drillOptions = []);
@@ -47,12 +46,11 @@ const w = { class: "amb-widget-chart-header" }, x = { 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"), 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)]);
+    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)]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/chart/common/common-homepage-search.vue2.js

@@ -5,14 +5,14 @@ import { ElLoading as y, ElMessage as C } from "element-plus";
 import S from "agilebuilder-ui/src/utils/request";
 import "agilebuilder-ui/src/utils/common-util";
 import "agilebuilder-ui/src/utils/util";
-import "agilebuilder-ui/src/utils/auth";
+import "async-validator";
 import "../../../../utils/global-refs.js";
 import "../../../../utils/eventBus.js";
-import "axios";
-import "async-validator";
 import "../../../../utils/page-store.js";
 import "agilebuilder-ui/src/utils/i18n-util";
 import "vue-i18n";
+import "agilebuilder-ui/src/utils/auth";
+import "axios";
 import "../../../../utils/events/print-label.js";
 const b = { style: { overflow: "auto", height: "calc(100vh - 140px)" }, ref: "dialogBody" }, O = { class: "dialog-footer" }, x = e({ __name: "common-homepage-search", props: { configure: { type: Object, required: true }, pageContext: { type: Object, default: () => {
 } } }, setup(e2, { expose: x2 }) {

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

@@ -3,16 +3,24 @@ import { Component, PageContext } from '../../../../utils/interfaces/page-design
 type Condition = {
     propValueType: string;
     joinSign: string;
-    dataType: 'number' | 'date' | 'string';
+    dataType: 'number' | 'date' | 'string' | 'boolean' | 'TEXT' | 'DATE' | 'TIME' | 'DOUBLE' | 'FLOAT' | 'INTEGER' | 'LONG';
     rightBracket: string;
     leftBracket: string;
     propValue: string;
     propName: string;
     operator: 'GT' | 'LT' | 'GET' | 'LET' | 'NET' | 'CONTAIN' | 'NOT_CONTAIN' | 'IS_NULL' | 'IS_NOT_NULL';
+    variableIsNull?: string;
 };
 type Data = Record<string, any>;
 export declare class ExpressionEvaluator {
-    static evaluate(pageContext: PageContext, conditions: Condition[], data: Data): boolean;
+    /**
+     *
+     * @param pageContext 页面上下文
+     * @param conditions 条件集合
+     * @param data 数据对象，一般是行数据
+     * @returns
+     */
+    static evaluate(pageContext: PageContext, conditions: Condition[], data?: Data): boolean;
     private static createExpression;
     private static getComparisonExpression;
     private static changeDataType;

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

@@ -10,40 +10,48 @@ class ExpressionEvaluator {
     const { propName: o, operator: a, propValue: n, 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, a, getValueFromVariable(e.entity, n, r), c)} ${l}`;
+    let p = `${s} ${this.getComparisonExpression(u, t, getValueFromVariable(e.entity, n, r))} ${l}`;
     return i && ("and" === i || "AND" === i ? p += "&&" : "or" !== i && "OR" !== i || (p += "||")), p.trim();
   }
-  static getComparisonExpression(e, t, r, o) {
-    t || (t = "EQ");
-    const a = this.parseValue(e, o), n = this.parseValue(r, o);
-    switch (t) {
+  static getComparisonExpression(e, t, r) {
+    const { dataType: o, variableIsNull: a } = t;
+    let n = t.operator;
+    n || (n = "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";
+    }
+    switch (n) {
       case "EQ":
-        return `${a} === ${n}`;
+        return `${s} === ${l}`;
       case "GT":
-        return `${a} > ${n}`;
+        return `${s} > ${l}`;
       case "LT":
-        return `${a} < ${n}`;
+        return `${s} < ${l}`;
       case "GET":
-        return `${a} >= ${n}`;
+        return `${s} >= ${l}`;
       case "LET":
-        return `${a} <= ${n}`;
+        return `${s} <= ${l}`;
       case "NET":
-        return `${a} !== ${n}`;
+        return `${s} !== ${l}`;
       case "CONTAIN":
-        return `${a}.includes(${n})`;
+        return `${s}.includes(${l})`;
       case "NOT_CONTAIN":
-        return `!${a}.includes(${n})`;
+        return `!${s}.includes(${l})`;
       case "IS_NULL":
-        return `${a} === null`;
+        return `${s} === null`;
       case "IS_NOT_NULL":
-        return `${a} !== null`;
+        return `${s} !== null`;
       case "IN":
         if ("TEXT" === o) {
-          return `${n.split(",")}.includes(${a})`;
+          return `${l.split(",")}.includes(${s})`;
         }
-        return `[${n}].includes(${a})`;
+        return `[${l}].includes(${s})`;
       default:
-        throw new Error(`比较符号不匹配: ${t}`);
+        throw new Error(`比较符号不匹配: ${n}`);
     }
   }
   static changeDataType(e) {
@@ -57,24 +65,24 @@ class ExpressionEvaluator {
     return t;
   }
   static parseValue(e, t) {
-    switch (t = this.changeDataType(t)) {
+    if (t = this.changeDataType(t), null == e) return null;
+    switch (t) {
       case "number":
         return getNumberValue(e);
       case "date":
         return new Date(e).getTime();
       case "string":
+      default:
         return `"${e}"`;
       case "boolean":
         return "true" === e || true === e || 1 === e;
-      default:
-        throw new Error(`数据类型解析错误: ${t}`);
     }
   }
   static evaluateExpression(expression) {
     try {
       return eval(expression);
     } catch (e) {
-      return console.error("表达式错误:", expression, e), false;
+      return false;
     }
   }
 }
@@ -115,7 +123,6 @@ function summaryStatistics(e, t, r, o) {
       const e2 = n2.apply(n2, [{ data: t, prop: r }]);
       a = e2 ? ` ${e2}` : " N/A";
     } catch (e2) {
-      console.error("自定义函数脚本错误:", t, e2);
     }
     else a = " N/A";
   } else switch (n) {
@@ -148,8 +155,7 @@ function getHeaderCellStyleUtil(e, t, r) {
       const a2 = getCustomFunc(r.pageContext, t2.scopeFunc);
       if (a2) try {
         false !== a2.apply(a2, [{ item: t2, data: e }]) && copyStyle(o, t2);
-      } catch (r2) {
-        console.error("自定义函数脚本错误:", t2, e, r2);
+      } catch (e2) {
       }
     } else copyStyle(o, t2);
   }));
@@ -165,8 +171,7 @@ function getRowStyleUtil(e, t, r) {
       if (t3) try {
         const r2 = t3.apply(t3, [{ data: e }]);
         null != r2 && false !== r2 && copyStyle(o, a);
-      } catch (t4) {
-        console.error("自定义函数脚本错误:", e, t4);
+      } catch (e2) {
       }
     } else if (a.matchingCondition) {
       const t3 = ExpressionEvaluator.evaluate(r.pageContext, a.matchingCondition, e.row);
@@ -190,8 +195,7 @@ function getCellStyleUtil(e, t, r) {
       const t2 = getCustomFunc(r.pageContext, n.scopeFunc);
       if (t2) try {
         false !== t2.apply(t2, [{ data: e }]) && copyStyle(o, n);
-      } catch (t3) {
-        console.error("自定义函数脚本错误:", e, t3);
+      } catch (e2) {
       }
     } else if (n.matchingCondition) {
       const t2 = ExpressionEvaluator.evaluate(r.pageContext, n.matchingCondition, e.row);
@@ -315,7 +319,7 @@ function computeFormula(itemConfs, datas, entity) {
             r += Number(e2[t]);
           });
         } catch (e2) {
-          console.error("计算错误:", e2), r = 0;
+          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));
@@ -327,7 +331,7 @@ function computeFormula(itemConfs, datas, entity) {
       try {
         data[key] = eval(expr);
       } catch (e) {
-        console.error(itemConfs[key] + " 计算错误, 替换后表达式为：" + expr, e), data[key] = 0;
+        data[key] = 0;
       }
     });
   });
@@ -367,8 +371,7 @@ function formatCustomFunc(e, t, r, o, a) {
   if (n) {
     try {
       return n.apply(n, [{ pageContext: o, configureObj: a, row: e, prop: r.props.base.prop }]);
-    } catch (t2) {
-      console.error("自定义函数脚本错误:", e, t2);
+    } catch (e2) {
     }
     return "";
   }

package/dist/es/components/runtime/views/assemblys/chart/table/normal-column.vue.js

@@ -1,26 +1,26 @@
 import { defineComponent as o, ref as e, resolveComponent as t, createBlock as r, openBlock as p, withCtx as l, createElementBlock as s, Fragment as n, createTextVNode as a, toDisplayString as u, resolveDynamicComponent as i, createVNode as c, createCommentVNode as m, createElementVNode as f, normalizeClass as g } from "vue";
 import "agilebuilder-ui/src/utils/common-util";
 import "agilebuilder-ui/src/utils/util";
+import { formatColContent as d } from "./chart-table-util.js";
 import "agilebuilder-ui/src/utils/request";
 import "element-plus";
 import "agilebuilder-ui/src/utils/auth";
 import "../../../../utils/global-refs.js";
-import d from "../../../../utils/eventBus.js";
+import y from "../../../../utils/eventBus.js";
 import "axios";
 import "dayjs";
 import "agilebuilder-ui/src/utils/calculator/calculator-util";
 import "async-validator";
+import { expressJump as b } from "../../../../utils/table-utils.js";
 import "../../../../utils/events/print-label.js";
-import { expressJump as y } from "../../../../utils/table-utils.js";
 import "../../../../utils/page-store.js";
-import { formatColContent as b } from "./chart-table-util.js";
 const k = { key: 0 }, w = { key: 1 }, h = { key: 1 }, x = { key: 2 }, C = o({ __name: "normal-column", props: { configure: { type: Object, default: () => ({}) }, pageContext: { type: Object, default: () => ({}) }, column: { type: Object, default: () => ({}) } }, setup(o2) {
   const C2 = o2, j = e(false);
   let v = null;
   function O(o3, e2, t2, r2) {
   }
   function _(o3) {
-    const e2 = y(C2.pageContext, C2.configure, C2.column.linkPage, o3);
+    const e2 = b(C2.pageContext, C2.configure, C2.column.linkPage, o3);
     let t2 = false;
     return e2 && (t2 = e2.show, v = e2.toPage), t2;
   }
@@ -29,11 +29,11 @@ const k = { key: 0 }, w = { key: 1 }, h = { key: 1 }, x = { key: 2 }, C = o({ __
       const e2 = C2.pageContext.code + "_", t2 = JSON.parse(JSON.stringify(v));
       t2.base = { successOperation: "closeWindow" };
       const r2 = { id: o3.id ? o3.id : o3.ID, selections: [o3] };
-      d.$emit(e2 + "open-dialog", { pageContext: C2.pageContext, configureObj: { props: t2 }, eventParams: r2 });
+      y.$emit(e2 + "open-dialog", { pageContext: C2.pageContext, configureObj: { props: t2 }, eventParams: r2 });
     }
   }
   function T(o3, e2) {
-    return b(o3, e2, C2.column, C2.pageContext, C2.configure);
+    return d(o3, e2, C2.column, C2.pageContext, C2.configure);
   }
   return C2.column.linkPage && C2.column.linkPage.length > 0 && (j.value = true), (e2, d2) => {
     const y2 = t("el-table-column"), b2 = t("el-progress"), C3 = t("el-tag"), v2 = t("el-link");