super-page-runtime 2.3.5 → 2.3.6

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

@@ -1,19 +1,19 @@
 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";
 import { packageCustomValidator as d } from "./events/validator-util.js";
-import { isMobileBrowser as m } from "agilebuilder-ui/src/utils/common-util";
-function f(t2) {
+import { isMobileBrowser as f } from "agilebuilder-ui/src/utils/common-util";
+function m(t2) {
   return e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + t2);
 }
 function c(e2) {
   var _a, _b, _c;
   if (null == e2) return null;
-  const t2 = { uuid: e2.uuid, name: e2.name, label: e2.label, code: e2.code, version: e2.version, dimensions: e2.dimensions, systemCode: e2.systemCode, systemVersion: e2.systemVersion, backendUrl: e2.backendUrl, rules: {}, tableUuids: e2.tableUuids, listCodesMap: e2.listCodesMap, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(e2), pageType: e2.pageType, beanName: e2.props ? e2.props.beanName : null, importBeanName: e2.props ? e2.props.importBeanName : null, subTablePageInfo: e2.subTablePageInfo, workflowCode: e2.workflowCode, workflowVersion: e2.workflowVersion, refercePropMap: (_a = e2.runtime) == null ? void 0 : _a.refercePropMap, subTableWatchProps: e2.subTableWatchProps, dataTypeMaps: e2.dataTypeMaps, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
+  const t2 = { uuid: e2.uuid, name: e2.name, label: e2.label, code: e2.code, version: e2.version, dimensions: e2.dimensions, systemCode: e2.systemCode, systemVersion: e2.systemVersion, backendUrl: e2.backendUrl, rules: {}, tableUuids: e2.tableUuids, listCodesMap: e2.listCodesMap, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(e2), pageType: e2.pageType, beanName: e2.props ? e2.props.beanName : null, importBeanName: e2.props ? e2.props.importBeanName : null, subTablePageInfo: e2.subTablePageInfo, workflowCode: e2.workflowCode, workflowVersion: e2.workflowVersion, refercePropMap: (_a = e2.runtime) == null ? void 0 : _a.refercePropMap, subTableWatchProps: e2.subTableWatchProps, dataTypeMaps: e2.dataTypeMaps, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, branchFieldAuth: e2.branchFieldAuth, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
   if (e2.props && e2.props.notIdInitializationList) {
     let s2 = e2.props.notIdInitializationList;
     "string" == typeof s2 && (s2 = JSON.parse(s2)), s2.length > 0 && (t2.notIdInitializationList = s2);
@@ -23,7 +23,7 @@ function c(e2) {
     for (const t3 of e2.variables) t3.name && (t3.isArrayElement ? s2[t3.name] = [] : t3.defaultValue ? s2[t3.name] = t3.defaultValue : s2[t3.name] = void 0);
   }
   return function(e3) {
-    if (m()) {
+    if (f()) {
       e3.entity.page._isMobile = "true";
       const t3 = navigator ? navigator.userAgent : null;
       t3 ? t3.indexOf(" uni-app ") > 0 ? (e3.entity.page._isMobileApp = "true", e3.entity.page._isMobileBrowser = "false") : (e3.entity.page._isMobileApp = "false", e3.entity.page._isMobileBrowser = "true") : (e3.entity.page._isMobileApp = "false", e3.entity.page._isMobileBrowser = "false");
@@ -58,16 +58,16 @@ function b(e2) {
 function y(e2, t2) {
   if (e2) {
     Object.assign(t2, e2);
-    v(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
+    w(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
   }
 }
 function h(e2, t2) {
   if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query, e2.query)) {
     Object.assign(t2, e2.query);
-    v(e2.query.paramStoreId, t2);
+    w(e2.query.paramStoreId, t2);
   }
 }
-function v(e2, t2) {
+function w(e2, t2) {
   if (e2) {
     const s2 = l(e2);
     if (s2) {
@@ -79,85 +79,98 @@ function v(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 w(e2, t2, s2) {
+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;
+  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) {
-    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" === j(o2, t2).type ? o2 : t2.code + "." + o2;
+        l2 = "custom" === k(n2, t2).type ? n2 : t2.code + "." + n2;
       }
       s2.includes(l2) || s2.push(l2);
     }
   }
   return s2.join(",");
 }
-function j(e2, t2) {
+function k(e2, t2) {
   const s2 = t2.pagePermissions;
   if (s2 && s2.length > 0) {
     for (let t3 = 0; t3 < s2.length; t3++) if (s2[t3].simpleCode === e2) return s2[t3];
   }
   return null;
 }
-function C(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 I = ["button-detail", "print-label"];
-function O(e2, t2) {
+const C = ["button-detail", "print-label"];
+function I(e2, t2, s2) {
   var _a, _b;
-  const s2 = t2.props && t2.props.base ? t2.props.base.prop : null, n2 = p(e2);
-  let o2 = false;
-  if (n2 && I.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
+  const o2 = t2.props && t2.props.base ? t2.props.base.prop : null, n2 = p(e2);
+  let r2 = false;
+  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", o2 = true);
+    false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", r2 = true);
   }
-  if (s2) {
-    const r2 = i(s2);
-    if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[r2] || (e2.rules[r2] = []), t2.props.rules.forEach((e3) => {
-      d(e3);
-    }), e2.rules[r2] = t2.props.rules), n2 && !o2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
-      const s3 = e2.fieldPermissionMap.get(r2);
-      t2.runtime.props || (t2.runtime.props = {}), s3 ? false === s3.canEdit ? t2.runtime.props.state = "disabled" : s3.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true) : t2.runtime.props.state = "";
+  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), 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];
+        if (!t3 && e2.workflowRules.rules && (t3 = e2.workflowRules.rules[l2]), t3 && Array.isArray(t3) && t3.length > 0) for (let e3 = 0; e3 < t3.length; e3++) {
+          const s3 = t3[e3];
+          if (s3 && s3.required) {
+            s3.required = false;
+            break;
+          }
+        }
+        else t3 && t3.required && (t3.required = false);
+      }
+      t2.runtime.props || (t2.runtime.props = {}), i2 ? (!s2 && i2.canEdit && (i2.canEdit = false), false === i2.canEdit ? t2.runtime.props.state = "disabled" : i2.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true)) : t2.runtime.props.state = "";
     }
-    ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: r2, events: t2.props.customRuleEvents }));
+    ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: l2, events: t2.props.customRuleEvents }));
   }
 }
-function _(e2, t2) {
+function O(e2, t2) {
   if (e2.initInfo) {
     ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((s2) => {
       const i2 = e2.initInfo[s2];
@@ -173,16 +186,16 @@ function _(e2, t2) {
   }
 }
 export {
-  _ as controlObjectRenderState,
+  O as controlObjectRenderState,
   c as convertToPageContext,
   P as getDefaultValue,
-  w as getFormModelFields,
+  v as getFormModelFields,
   E as getModelFields,
   M as getPermissionCodes,
   b as packageAdditionalMapWithLocationSearch,
   y as packageAdditionalMapWithPageRequest,
   h as packageAdditionalMapWithRoute,
-  O as packageFormRules,
-  f as queryPageDesignByCode,
-  C as queryPageSuperGrids
+  I as packageFormRules,
+  m as queryPageDesignByCode,
+  j as queryPageSuperGrids
 };

package/dist/es/components/runtime/utils/table-utils.d.ts

@@ -18,3 +18,17 @@ export declare function getDistanceToAppContainer(tableDivRef: any): {
     distanceToTop: number;
     distanceToBottom: number;
 };
+/**
+ * 是否有字段的权限
+ * @param pageContext
+ * @param fieldName
+ * @returns
+ */
+export declare function isHasFieldAuth(pageContext: any, configure: any): boolean;
+/**
+ * 是否有字段的权限
+ * @param pageContext
+ * @param fieldName
+ * @returns
+ */
+export declare function isHasFieldPermissionAuth(pageContext: any, tableName: any, fieldName: any): boolean;

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

@@ -1,55 +1,80 @@
 import "agilebuilder-ui/src/utils/common-util";
 import "agilebuilder-ui/src/utils/util";
+import { ExpressionEvaluator as t } from "../views/assemblys/chart/table/chart-table-util.js";
+import { getCustomFunc as e } from "./events/event-util.js";
 import "agilebuilder-ui/src/utils/request";
-import t from "./eventBus.js";
-import { getPermissionCodes as e } from "./page-init-util.js";
-import { getCustomFunc as i } from "./events/event-util.js";
-import { $t as o } from "./i18n-util.js";
-import { ExpressionEvaluator as s } from "../views/assemblys/chart/table/chart-table-util.js";
-function n(e2) {
-  const i2 = e2.pageContext && e2.pageContext.code;
-  t.$emit(i2 + "_open-dialog", e2);
+import i from "./eventBus.js";
+import { getPermissionCodes as o } from "./page-init-util.js";
+import { $t as n } from "./i18n-util.js";
+import { getFormPropName as s } from "./page-helper-util.js";
+function r(t2) {
+  const e2 = t2.pageContext && t2.pageContext.code;
+  i.$emit(e2 + "_open-dialog", t2);
 }
-function r(t2, e2) {
+function u(t2, e2) {
   const i2 = t2.tableName;
   if (!e2 && i2) return i2;
   let o2;
   return t2.tableRuntimes && e2 && t2.tableRuntimes[e2] && (o2 = JSON.parse(t2.tableRuntimes[e2].configure)), o2 && o2.props && o2.props.dataOrigin ? o2.props.dataOrigin.tableName : null;
 }
-function u(t2, i2, s2, n2) {
-  const r2 = !(!i2.props || !i2.props.base) && i2.props.base.showOperation, u2 = i2.btnList;
-  i2.btnList, r2 && u2 && u2.forEach((i3) => {
-    const r3 = {}, u3 = Object.assign({}, i3.props.base);
-    if ("custom" === i3.name ? u3.customControl = u3.name : u3.elementType = "el-button", void 0 === i3.isPermission || i3.isPermission + "" == "true") {
-      const o2 = e(i3, t2);
-      o2 && (u3.permission = o2);
+function l(t2, e2, i2, s2) {
+  const r2 = !(!e2.props || !e2.props.base) && e2.props.base.showOperation, u2 = e2.btnList;
+  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);
+      i3 && (u3.permission = i3);
     }
-    if (u3.label = o(u3.title), u3.sourceButton = { uuid: i3.uuid }, r3.props = u3, void 0 !== n2) {
-      const t3 = n2(i3);
+    if (u3.label = n(u3.title), u3.sourceButton = { uuid: e3.uuid }, r3.props = u3, void 0 !== s2) {
+      const t3 = s2(e3);
       r3.onClick = (t3 == null ? void 0 : t3.onClick) ?? t3, r3.eventName = t3 == null ? void 0 : t3.eventName;
     }
-    s2.push(r3);
+    i2.push(r3);
   });
 }
-function l(t2, e2, o2, n2) {
+function p(i2, o2, n2, s2) {
   let r2;
-  const u2 = o2 == null ? void 0 : o2.some((o3) => {
+  const u2 = n2 == null ? void 0 : n2.some((n3) => {
     let u3 = false;
-    if (o3.scopeFunc) {
-      const s2 = i(t2, o3.scopeFunc);
-      if (s2) {
-        s2.apply(s2, [{ pageContext: t2, configureObj: e2, row: n2 }]) && (u3 = true);
+    if (n3.scopeFunc) {
+      const t2 = e(i2, n3.scopeFunc);
+      if (t2) {
+        t2.apply(t2, [{ pageContext: i2, configureObj: o2, row: s2 }]) && (u3 = true);
       }
-    } else if (o3.showCondition && o3.showCondition.length > 0) {
-      s.evaluate(t2, o3.showCondition, n2) && (u3 = true);
+    } else if (n3.showCondition && n3.showCondition.length > 0) {
+      t.evaluate(i2, n3.showCondition, s2) && (u3 = true);
     } else u3 = true;
-    if (u3) return r2 = o3, true;
+    if (u3) return r2 = n3, true;
   });
   return { show: u2, toPage: r2 };
 }
+function a(t2, e2) {
+  var _a;
+  const i2 = t2.tableName;
+  let o2 = "";
+  const n2 = (_a = e2 == null ? void 0 : e2.props) == null ? void 0 : _a.base;
+  if (n2 && n2.prop) {
+    const t3 = n2.prop;
+    o2 = s(t3);
+  }
+  return c(t2, i2, o2);
+}
+function c(t2, e2, i2) {
+  if (!i2 || !e2) return true;
+  const o2 = t2.branchFieldAuth;
+  if (o2) {
+    const t3 = o2.hasAuthFields;
+    if (t3 && t3[e2] && t3[e2].indexOf(i2) >= 0) return true;
+    const n2 = o2.allAuthFields;
+    if (n2 && n2[e2] && n2[e2].indexOf(i2) >= 0) return false;
+  }
+  return true;
+}
 export {
-  l as expressJump,
-  u as getOperationButtons,
-  r as getTableNameByTableUuid,
-  n as popupToPage
+  p as expressJump,
+  l as getOperationButtons,
+  u as getTableNameByTableUuid,
+  a as isHasFieldAuth,
+  c as isHasFieldPermissionAuth,
+  r as popupToPage
 };

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,17 +65,17 @@ 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) {

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");