super-page-runtime 2.3.5-sit2 → 2.3.5-sit3

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

@@ -106,6 +106,8 @@ function P(e2, t2, s2, i2) {
   return n2;
 }
 function M(e2, t2) {
+  var _a, _b;
+  if (false === ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.isPermission)) return "true";
   const s2 = [];
   if (e2.autoPermissions) for (const i2 of e2.autoPermissions) s2.push(t2.code + "." + i2.simpleCode);
   if (e2.functionCodes) {

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

@@ -3,12 +3,13 @@ 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 {

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,7 +65,7 @@ class ExpressionEvaluator {
     return t;
   }
   static parseValue(e, t) {
-    if (t = this.changeDataType(t), null == e) return e;
+    if (t = this.changeDataType(t), null == e) return null;
     switch (t) {
       case "number":
         return getNumberValue(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.3.5-sit2",
+  "version": "2.3.5-sit3",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",