super-page-designer 2.2.13 → 2.2.16

package/dist/es/components/design/utils/common-util.d.ts

@@ -22,3 +22,4 @@ export declare function getUuidv4(): string;
  * @returns
  */
 export declare function findDesignItemByUuid(data: any, uuid: string): Component | null;
+export declare function isNumberType(type: string): boolean;

package/dist/es/components/design/utils/common-util.js

@@ -1,23 +1,28 @@
-import { v4 as r } from "uuid";
-function t(r2) {
-  if ("object" != typeof r2 || null === r2) return r2;
-  const n2 = Array.isArray(r2) ? [] : {};
-  for (const o2 in r2) r2.hasOwnProperty(o2) && (n2[o2] = t(r2[o2]));
-  return n2;
+import { v4 as t } from "uuid";
+function n(t2) {
+  if ("object" != typeof t2 || null === t2) return t2;
+  const r2 = Array.isArray(t2) ? [] : {};
+  for (const o2 in t2) t2.hasOwnProperty(o2) && (r2[o2] = n(t2[o2]));
+  return r2;
 }
-function n() {
-  return r().replace(/-/g, "");
+function r() {
+  return t().replace(/-/g, "");
 }
-function o(r2, t2) {
-  for (const n2 of r2.items) if (n2.uuid === t2) return n2;
-  for (const n2 of r2.items) if (n2.items && n2.items.length > 0) {
-    const r3 = o(n2, t2);
-    if (r3) return r3;
+function o(t2, n2) {
+  for (const r2 of t2.items) if (r2.uuid === n2) return r2;
+  for (const r2 of t2.items) if (r2.items && r2.items.length > 0) {
+    const t3 = o(r2, n2);
+    if (t3) return t3;
   }
   return null;
 }
+function e(t2) {
+  const n2 = t2.toLowerCase();
+  return "int" === n2 || "long" === n2 || "float" === n2 || "double" === n2 || "number" === n2;
+}
 export {
-  t as deepCopy,
+  n as deepCopy,
   o as findDesignItemByUuid,
-  n as getUuidv4
+  r as getUuidv4,
+  e as isNumberType
 };

package/dist/es/components/design/utils/data-table-util.d.ts

@@ -1,5 +1,5 @@
 export declare function formatConditionList(conditionList: any, attributeMap: [], fieldMap: []): string;
-export declare function getOperators(item: object): {
+export declare function getOperators(item: any): {
     name: string;
     label: string;
 }[];

package/dist/es/components/design/utils/data-table-util.js

@@ -1,92 +1,89 @@
 import { getUuidv4 as e } from "./common-util.js";
-import l from "./eventBus.js";
-function a(e2, l2, a2) {
-  if (e2) {
-    const l3 = e2;
-    e2 = [];
-    for (const a3 in l3) e2.push(l3[a3]);
-  }
-  let n2 = "";
-  if (e2 && e2.length > 0) for (var t2 = 0; t2 < e2.length; t2++) {
-    const i2 = e2[t2];
-    if (i2 && i2.propDbName && l2) {
-      const e3 = r(a2[i2.propDbName]);
-      if (e3 && e3.length > 0) {
-        const l3 = e3.filter((e4) => e4.name === i2.operator);
-        n2 += i2.leftBracket, a2[i2.propDbName] && a2[i2.propDbName].alias && (n2 += a2[i2.propDbName].alias + " "), l3 && l3.length > 0 && (n2 += l3[0].label + " "), n2 += i2.propValue + i2.rightBracket + " ", i2.joinSign && ("or" === i2.joinSign ? n2 += "或者" : n2 += "并且");
+import a from "./eventBus.js";
+function l(e2, a2, l2) {
+  let n2 = [];
+  e2 && (n2 = "string" == typeof e2 ? JSON.parse(e2) : JSON.parse(JSON.stringify(e2)));
+  let t2 = "";
+  if (n2 && n2.length > 0) for (var i2 = 0; i2 < n2.length; i2++) {
+    const e3 = n2[i2];
+    if (e3 && e3.propDbName && a2) {
+      const a3 = r(l2[e3.propDbName]);
+      if (a3 && a3.length > 0) {
+        const r2 = a3.filter((a4) => a4.name === e3.operator);
+        t2 += e3.leftBracket, l2[e3.propDbName] && l2[e3.propDbName].alias && (t2 += l2[e3.propDbName].alias + " "), r2 && r2.length > 0 && (t2 += r2[0].label + " "), "IS_NULL" === e3.operator || "IS_NOT_NULL" === e3.operator ? t2 += e3.rightBracket + " " : t2 += e3.propValue + e3.rightBracket + " ", e3.joinSign && ("or" === e3.joinSign ? t2 += "或者" : t2 += "并且");
       }
     }
   }
-  if (n2 && "" !== n2) {
-    const e3 = n2.substring(n2.length - 1);
-    "者" !== e3 && "且" !== e3 || (n2 = n2.substring(0, n2.length - 2));
+  if (t2 && "" !== t2) {
+    const e3 = t2.substring(t2.length - 1);
+    "者" !== e3 && "且" !== e3 || (t2 = t2.substring(0, t2.length - 2));
   }
-  return n2;
+  return t2;
 }
 function r(e2) {
-  return e2 ? "INTEGER" === e2.dataType || "LONG" === e2.dataType || "DOUBLE" === e2.dataType || "FLOAT" === e2.dataType ? [{ name: "GT", label: "大于" }, { name: "LT", label: "小于" }, { name: "EQ", label: "等于" }, { name: "LET", label: "不大于" }, { name: "GET", label: "不小于" }, { name: "NET", label: "不等于" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }] : "DATE" === e2.dataType || "TIME" === e2.dataType ? [{ name: "GT", label: "晚于" }, { name: "LT", label: "早于" }, { name: "EQ", label: "等于" }, { name: "LET", label: "不晚于" }, { name: "GET", label: "不早于" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }, { name: "BETWEEN", label: "时间范围" }] : "TEXT" === e2.dataType || "STRING" === e2.dataType ? [{ name: "EQ", label: "等于" }, { name: "NET", label: "不等于" }, { name: "CONTAIN", label: "包含" }, { name: "NOT_CONTAIN", label: "不包含" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }] : [{ name: "EQ", label: "等于" }, { name: "NET", label: "不等于" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }] : [{ name: "EQ", label: "等于" }, { name: "NET", label: "不等于" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }];
+  return e2 ? "INTEGER" === e2.dataType || "LONG" === e2.dataType || "DOUBLE" === e2.dataType || "FLOAT" === e2.dataType ? [{ name: "GT", label: "大于" }, { name: "LT", label: "小于" }, { name: "EQ", label: "等于" }, { name: "LET", label: "不大于" }, { name: "GET", label: "不小于" }, { name: "NET", label: "不等于" }, { name: "RANGE_QUERY", label: "in" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }] : "DATE" === e2.dataType || "TIME" === e2.dataType ? [{ name: "GT", label: "晚于" }, { name: "LT", label: "早于" }, { name: "EQ", label: "等于" }, { name: "LET", label: "不晚于" }, { name: "GET", label: "不早于" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }, { name: "BETWEEN", label: "时间范围" }] : "TEXT" === e2.dataType || "STRING" === e2.dataType ? [{ name: "EQ", label: "等于" }, { name: "NET", label: "不等于" }, { name: "CONTAIN", label: "包含" }, { name: "NOT_CONTAIN", label: "不包含" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }] : [{ name: "EQ", label: "等于" }, { name: "NET", label: "不等于" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }] : [{ name: "EQ", label: "等于" }, { name: "NET", label: "不等于" }, { name: "IS_NULL", label: "等于Null" }, { name: "IS_NOT_NULL", label: "不等于Null" }];
 }
-function n(l2, a2, r2) {
-  let n2 = { uuid: e(), parentUuid: a2, columnUuid: l2.uuid, prop: l2.props.base.prop, titleText: l2.props.base.name, isLeaf: true };
-  t(a2, n2, r2), r2.push(n2);
+function n(a2, l2, r2) {
+  let n2 = { uuid: e(), parentUuid: l2, columnUuid: a2.uuid, prop: a2.props.base.prop, titleText: a2.props.base.name, isLeaf: true };
+  t(l2, n2, r2), r2.push(n2);
 }
-function t(e2, l2, a2) {
+function t(e2, a2, l2) {
   let r2 = [];
-  if (r2 = e2 ? a2.filter((l3) => l3.parentUuid === e2) : a2.filter((e3) => !e3.parentUuid), r2 && r2.length > 0) {
-    r2 = r2.sort((e4, l3) => e4.displayOrder - l3.displayOrder);
+  if (r2 = e2 ? l2.filter((a3) => a3.parentUuid === e2) : l2.filter((e3) => !e3.parentUuid), r2 && r2.length > 0) {
+    r2 = r2.sort((e4, a3) => e4.displayOrder - a3.displayOrder);
     const e3 = r2[r2.length - 1];
-    l2.displayOrder = e3.displayOrder + 1;
-  } else l2.displayOrder = 1;
+    a2.displayOrder = e3.displayOrder + 1;
+  } else a2.displayOrder = 1;
 }
-function i(e2, l2) {
-  const a2 = e2.findIndex((e3) => e3.uuid === l2);
-  null != a2 && a2 >= 0 && e2.splice(a2, 1);
+function i(e2, a2) {
+  const l2 = e2.findIndex((e3) => e3.uuid === a2);
+  null != l2 && l2 >= 0 && e2.splice(l2, 1);
 }
 function p(e2) {
-  let l2 = [];
-  return e2.forEach((a2) => {
-    a2.parentUuid ? a2.isLeaf = true : (a2.isLeaf = s(a2, e2), l2.push(a2));
-  }), l2 = l2.sort((e3, l3) => e3.displayOrder - l3.displayOrder), l2;
+  let a2 = [];
+  return e2.forEach((l2) => {
+    l2.parentUuid ? l2.isLeaf = true : (l2.isLeaf = s(l2, e2), a2.push(l2));
+  }), a2 = a2.sort((e3, a3) => e3.displayOrder - a3.displayOrder), a2;
 }
-function s(e2, l2) {
-  for (const a2 of l2) {
-    if (a2.parentUuid === e2.uuid) return false;
-    if (a2.children && a2.children.length > 0 && !s(e2, a2.children)) return false;
+function s(e2, a2) {
+  for (const l2 of a2) {
+    if (l2.parentUuid === e2.uuid) return false;
+    if (l2.children && l2.children.length > 0 && !s(e2, l2.children)) return false;
   }
   return true;
 }
-function o(e2, l2, a2) {
+function o(e2, a2, l2) {
   const r2 = e2.uuid;
-  let n2 = l2.filter((e3) => e3.parentUuid === r2);
+  let n2 = a2.filter((e3) => e3.parentUuid === r2);
   n2 && n2.length > 0 ? (n2.forEach((e3) => {
     if (e3.columnUuid) {
-      const l3 = a2.filter((l4) => l4.uuid === e3.columnUuid);
-      l3 && l3.length > 0 && Object.assign(e3, l3[0]);
+      const a3 = l2.filter((a4) => a4.uuid === e3.columnUuid);
+      a3 && a3.length > 0 && Object.assign(e3, a3[0]);
     }
-  }), n2 = n2.sort((e3, l3) => e3.displayOrder - l3.displayOrder), e2.children = n2, n2.forEach((e3) => o(e3, l2, a2))) : e2.children = [];
+  }), n2 = n2.sort((e3, a3) => e3.displayOrder - a3.displayOrder), e2.children = n2, n2.forEach((e3) => o(e3, a2, l2))) : e2.children = [];
 }
 function u(e2) {
   if (!e2.props.groupHeaders) return;
-  let a2 = [], r2 = e2.items, n2 = JSON.parse(JSON.stringify(e2.props.groupHeaders));
-  return !r2 || n2 && 0 !== n2.length ? (a2 = function(e3, a3) {
+  let l2 = [], r2 = e2.items, n2 = JSON.parse(JSON.stringify(e2.props.groupHeaders));
+  return !r2 || n2 && 0 !== n2.length ? (l2 = function(e3, l3) {
     let r3 = [];
     if (!e3) return r3;
     let n3 = [];
-    return e3.forEach((l2) => {
-      if (l2.columnUuid) {
-        const e4 = a3.filter((e5) => e5.uuid === l2.columnUuid);
-        e4 && e4.length > 0 && Object.assign(l2, e4[0]);
+    return e3.forEach((a2) => {
+      if (a2.columnUuid) {
+        const e4 = l3.filter((e5) => e5.uuid === a2.columnUuid);
+        e4 && e4.length > 0 && Object.assign(a2, e4[0]);
       }
-      l2.parentUuid ? l2.isLeaf = true : (l2.isLeaf = s(l2, e3), r3.push(l2), n3.push(l2));
-    }), l.$emit("setFieldGroup", n3), a3 && a3.forEach((e4) => {
+      a2.parentUuid ? a2.isLeaf = true : (a2.isLeaf = s(a2, e3), r3.push(a2), n3.push(a2));
+    }), a.$emit("setFieldGroup", n3), l3 && l3.forEach((e4) => {
       e4.props.base && "$selection" == e4.props.base.prop ? r3.unshift(e4) : e4.props.base && "$index" == e4.props.base.prop ? r3.splice(1, 0, e4) : e4.props.base && "operation" == e4.props.base.prop && r3.push(e4);
-    }), r3 = r3.sort((e4, l2) => e4.displayOrder - l2.displayOrder), r3;
-  }(n2, r2), a2.forEach((e3) => o(e3, n2, r2))) : a2 = r2.sort((e3, l2) => e3.props.base ? e3.props.base.displayOrder - l2.props.base.displayOrder : 0), a2;
+    }), r3 = r3.sort((e4, a2) => e4.displayOrder - a2.displayOrder), r3;
+  }(n2, r2), l2.forEach((e3) => o(e3, n2, r2))) : l2 = r2.sort((e3, a2) => e3.props.base ? e3.props.base.displayOrder - a2.props.base.displayOrder : 0), l2;
 }
 export {
   n as addColumnToGroupHeaders,
   i as deleteGroupHeaderByColumnUuid,
-  a as formatConditionList,
+  l as formatConditionList,
   u as getColumnsWithGroupHeader,
   r as getOperators,
   p as getTopGroupHeaderList,

package/dist/es/components/design/utils/page-table-util.js

@@ -29,7 +29,7 @@ function o(e2, r2) {
         const r4 = { titleText: e5.titleText, parentCode: e5.parentUuid, displayOrder: e5.displayOrder, prop: e5.prop, uuid: e5.uuid };
         t2.push(r4);
       });
-      return t2;
+      return t2.sort((e5, t3) => e5.displayOrder - t3.displayOrder), t2;
     }(e3), n2;
   }(s2, r2, i2), delete e2.btnList, delete e2.items, delete e2.modelFields, e2.runtime && e2.runtime.events) {
     const { events: t2 } = e2.runtime;
@@ -210,16 +210,16 @@ function C(e2, t2) {
   let a2 = { uuid: e2.uuid, base: e2.props.base, dataOrigin: e2.props.dataOrigin, dynamicColumnData: e2.props.dynamicColumnData, editLine: e2.props.editLine, format: e2.props.format, verification: e2.props.verification, definition: e2.props.definition, size: e2.props.size };
   e2.props = {}, e2.uuid = a2.uuid, e2.props.base = a2.base, e2.props.dataOrigin = a2.dataOrigin, e2.props.dynamicColumnData = a2.dynamicColumnData, e2.props.editLine = a2.editLine, e2.props.format = a2.format, e2.props.verification = a2.verification, e2.props.definition = a2.definition, e2.props.size = a2.size, e2.events = r(t2), e2.name = t2;
 }
-function T(e2, t2) {
+function O(e2, t2) {
   return e2 = {}, t2.forEach((t3) => {
     e2[t3.dbColumnName] = t3;
   }), e2;
 }
-function N(e2, t2) {
+function T(e2, t2) {
   let r2, a2 = e2.tableName;
   return a2 || (e2.tableRuntimes && t2 && e2.tableRuntimes[t2] && e2.pageType && "list" === e2.pageType && (r2 = JSON.parse(e2.tableRuntimes[t2].configure)), r2 && r2.props && r2.props.dataOrigin ? r2.props.dataOrigin.tableName : null);
 }
-function O(e2) {
+function N(e2) {
   let t2 = [];
   return e2 && e2.forEach((e3) => {
     t2.push({ value: e3.dbColumnName, label: e3.alias, alias: e3.alias, dataType: e3.dataType });
@@ -232,10 +232,10 @@ function h(e2, t2) {
   return (t2 == null ? void 0 : t2.props.base.tableUuid) ? (s2 = t2.props.base.tableUuid, a2 = i(e2, s2)) : r2 && "list" === r2 && ((_a = e2 == null ? void 0 : e2.tableUuids) == null ? void 0 : _a.length) > 0 ? (s2 = e2 == null ? void 0 : e2.tableUuids[0], a2 = i(e2, s2)) : (e2 == null ? void 0 : e2.currentTableConfig) && (a2 = e2.currentTableConfig), a2;
 }
 export {
-  T as changeFeieldToMap,
-  O as getModelOptionsByFields,
+  O as changeFeieldToMap,
+  N as getModelOptionsByFields,
   h as getTableConfigByTableUuid,
-  N as getTableNameByTableUuid,
+  T as getTableNameByTableUuid,
   n as querySublist,
   s as queryTableFields,
   o as setTableRuntimesFromConfigure,

package/dist/es/components/design/views/assemblys/button/button/button-attr-advanced.vue.js

@@ -1,60 +1,61 @@
-import { defineComponent as e, ref as o, watch as l, resolveComponent as n, createBlock as i, openBlock as a, withCtx as t, createVNode as s, createCommentVNode as u, createElementVNode as r, createElementBlock as c, Fragment as p, renderList as d, createTextVNode as m } from "vue";
-import f from "../component/condition-dialog.vue.js";
-import g from "../component/set-dialog.vue.js";
+import { defineComponent as e, ref as o, watch as l, resolveComponent as i, createBlock as n, openBlock as a, withCtx as t, createVNode as s, createCommentVNode as u, createElementVNode as r, createElementBlock as c, Fragment as p, renderList as f, createTextVNode as g } from "vue";
+import d from "../component/condition-dialog.vue.js";
+import m from "../component/set-dialog.vue.js";
 import b from "../component/combination.vue.js";
 import v from "../component/journal-set-dialog.vue.js";
-import y from "../../common/common-advanced-basic-showcondition.vue.js";
-import { isShowOpinionSetting as _ } from "../../../../utils/form-design-util.js";
-import V from "agilebuilder-ui/src/utils/request";
-const C = { style: { padding: "8px 0px 0px 0px" } }, k = e({ __name: "button-attr-advanced", props: { configure: { type: Object, default: () => {
+import C from "../../common/common-advanced-basic-showcondition.vue.js";
+import { isShowOpinionSetting as y } from "../../../../utils/form-design-util.js";
+import _ from "agilebuilder-ui/src/utils/request";
+import { getTableConfigByTableUuid as V } from "../../../../utils/page-table-util.js";
+const k = { style: { padding: "8px 0px 0px 0px" } }, h = e({ __name: "button-attr-advanced", props: { configure: { type: Object, default: () => {
 } }, pageDesign: { type: Object, default: () => {
 } } }, setup(e2) {
   var _a;
-  const k2 = e2, h = o(["base"]), w = o(false), D = o([]), O = (_a = k2.pageDesign) == null ? void 0 : _a.systemVersion;
-  function j() {
+  const h2 = e2, D = o(["base"]), w = o(false), O = o([]), j = (_a = h2.pageDesign) == null ? void 0 : _a.systemVersion, x = o(V(h2.pageDesign, h2.configure));
+  function M() {
     w.value = false;
   }
-  function x(e3) {
-    k2.configure.props.base.logSetting = e3, j();
+  function S(e3) {
+    h2.configure.props.base.logSetting = e3, M();
   }
-  V.post(window.$vueApp.config.globalProperties.baseAPI + `/mms/setting-transformations/option/${k2.pageDesign.systemCode}/${O}`).then((e3) => {
-    D.value = e3;
+  _.post(window.$vueApp.config.globalProperties.baseAPI + `/mms/setting-transformations/option/${h2.pageDesign.systemCode}/${j}`).then((e3) => {
+    O.value = e3;
   });
-  const M = o(false);
-  function S() {
-    M.value = false;
-  }
   const L = o(false);
   function N() {
     L.value = false;
   }
-  function U(e3) {
-    k2.configure.props.setValueList = e3;
+  const U = o(false);
+  function A() {
+    U.value = false;
+  }
+  function $(e3) {
+    h2.configure.props.setValueList = e3;
   }
-  const A = o(false);
-  function $() {
-    A.value = false;
+  const z = o(false);
+  function F() {
+    z.value = false;
   }
-  function z(e3) {
-    k2.configure.props.base.showConditions = JSON.stringify(e3);
+  function P(e3) {
+    h2.configure.props.base.showConditions = JSON.stringify(e3);
   }
-  const F = o(P());
-  function P() {
+  const W = o(q());
+  function q() {
     let e3 = false;
-    const o2 = k2.configure.events.filter((e4) => "click" === e4.name && e4.eventName);
+    const o2 = h2.configure.events.filter((e4) => "click" === e4.name && e4.eventName);
     if (o2 && o2.length > 0) {
       const l2 = o2[0].eventName;
-      e3 = _(l2);
+      e3 = y(l2);
     }
     return e3;
   }
-  return l(k2.configure.events, (e3) => {
-    F.value = P(), F.value || (k2.configure.props.base.isMustOpinion = false);
+  return l(h2.configure.events, (e3) => {
+    W.value = q(), W.value || (h2.configure.props.base.isMustOpinion = false);
   }, { immediate: true }), (o2, l2) => {
-    const _2 = n("el-option"), V2 = n("el-select"), k3 = n("el-form-item"), O2 = n("el-button"), P2 = n("el-switch"), W = n("el-collapse-item"), q = n("el-collapse"), I = n("el-form");
-    return a(), i(I, { "label-width": "80px", size: "small" }, { default: t(() => [s(q, { modelValue: h.value, "onUpdate:modelValue": l2[6] || (l2[6] = (e3) => h.value = e3), style: { "margin-top": "6px" } }, { default: t(() => [s(W, { title: "高级设置", name: "base", class: "amb-design-attr-group-header" }, { default: t(() => [r("div", C, [s(k3, { label: "成功后", class: "amb-design-attr-item" }, { default: t(() => [s(V2, { modelValue: e2.configure.props.base.successOperation, "onUpdate:modelValue": l2[0] || (l2[0] = (o3) => e2.configure.props.base.successOperation = o3), class: "ml-4" }, { default: t(() => [s(_2, { label: "无操作", value: "noOperation" }), s(_2, { label: "刷新", value: "refresh" }), s(_2, { label: "关闭窗口", value: "closeWindow" }), s(_2, { label: "关闭窗口并刷新列表", value: "closeWindowAndRefresh" })]), _: 1 }, 8, ["modelValue"])]), _: 1 }), s(k3, { label: "转换规则", class: "amb-design-attr-item" }, { default: t(() => [s(V2, { modelValue: e2.configure.props.base.conversionCodes, "onUpdate:modelValue": l2[1] || (l2[1] = (o3) => e2.configure.props.base.conversionCodes = o3), multiple: "", class: "ml-4" }, { default: t(() => [(a(true), c(p, null, d(D.value, (e3) => (a(), i(_2, { key: e3.code, label: e3.name, value: e3.code }, null, 8, ["label", "value"]))), 128))]), _: 1 }, 8, ["modelValue"])]), _: 1 }), s(k3, { label: "执行条件", class: "amb-design-attr-item" }, { default: t(() => [s(O2, { type: "primary", onClick: l2[2] || (l2[2] = (e3) => M.value = true) }, { default: t(() => l2[7] || (l2[7] = [m("编辑")])), _: 1 })]), _: 1 }), s(k3, { label: "启用条件", class: "amb-design-attr-item" }, { default: t(() => [(a(), i(y, { key: e2.configure.uuid + "_edit", configure: e2.configure, title: "启用条件", type: "editConditions" }, null, 8, ["configure"]))]), _: 1 }), s(k3, { label: "自动设值", class: "amb-design-attr-item" }, { default: t(() => [s(O2, { type: "primary", onClick: l2[3] || (l2[3] = (e3) => L.value = true) }, { default: t(() => l2[8] || (l2[8] = [m("编辑")])), _: 1 })]), _: 1 }), s(k3, { label: "显示条件", class: "amb-design-attr-item" }, { default: t(() => [(a(), i(y, { key: e2.configure.uuid + "_show", configure: e2.configure, type: "showConditions" }, null, 8, ["configure"]))]), _: 1 }), s(k3, { label: "日志设置", class: "amb-design-attr-item" }, { default: t(() => [s(O2, { type: "primary", onClick: l2[4] || (l2[4] = (e3) => w.value = true) }, { default: t(() => l2[9] || (l2[9] = [m("编辑")])), _: 1 })]), _: 1 }), F.value ? (a(), i(k3, { key: 0, label: "意见必填", class: "amb-design-attr-item" }, { default: t(() => [s(P2, { modelValue: e2.configure.props.base.isMustOpinion, "onUpdate:modelValue": l2[5] || (l2[5] = (o3) => e2.configure.props.base.isMustOpinion = o3), size: "default" }, null, 8, ["modelValue"])]), _: 1 })) : u("", true), e2.configure.props.base.isMustOpinion ? (a(), i(k3, { key: 1, label: "意见必填条件", class: "amb-design-attr-item" }, { default: t(() => [(a(), i(y, { key: e2.configure.uuid + "_opinion", configure: e2.configure, type: "mustOpinionConditions", title: "意见必填条件" }, null, 8, ["configure"]))]), _: 1 })) : u("", true)])]), _: 1 }), M.value ? (a(), i(f, { key: 0, pageDesign: e2.pageDesign, configure: e2.configure, onClose: S }, null, 8, ["pageDesign", "configure"])) : u("", true), L.value ? (a(), i(g, { key: 1, pageDesign: e2.pageDesign, configure: e2.configure, onSave: U, onClose: N }, null, 8, ["pageDesign", "configure"])) : u("", true), A.value ? (a(), i(b, { key: 2, conditionList: e2.configure.props.base.showConditions, fieldNameList: e2.pageDesign.modelFields, fieldMap: e2.pageDesign.modelFieldsMap, onSave: z, onClose: $ }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : u("", true), w.value ? (a(), i(v, { key: 3, modelValue: e2.configure.props.base.logSetting, onClose: j, onSave: x }, null, 8, ["modelValue"])) : u("", true)]), _: 1 }, 8, ["modelValue"])]), _: 1 });
+    const y2 = i("el-option"), _2 = i("el-select"), V2 = i("el-form-item"), h3 = i("el-button"), j2 = i("el-switch"), q2 = i("el-collapse-item"), I = i("el-collapse"), J = i("el-form");
+    return a(), n(J, { "label-width": "80px", size: "small" }, { default: t(() => [s(I, { modelValue: D.value, "onUpdate:modelValue": l2[6] || (l2[6] = (e3) => D.value = e3), style: { "margin-top": "6px" } }, { default: t(() => [s(q2, { title: "高级设置", name: "base", class: "amb-design-attr-group-header" }, { default: t(() => [r("div", k, [s(V2, { label: "成功后", class: "amb-design-attr-item" }, { default: t(() => [s(_2, { modelValue: e2.configure.props.base.successOperation, "onUpdate:modelValue": l2[0] || (l2[0] = (o3) => e2.configure.props.base.successOperation = o3), class: "ml-4" }, { default: t(() => [s(y2, { label: "无操作", value: "noOperation" }), s(y2, { label: "刷新", value: "refresh" }), s(y2, { label: "关闭窗口", value: "closeWindow" }), s(y2, { label: "关闭窗口并刷新列表", value: "closeWindowAndRefresh" })]), _: 1 }, 8, ["modelValue"])]), _: 1 }), s(V2, { label: "转换规则", class: "amb-design-attr-item" }, { default: t(() => [s(_2, { modelValue: e2.configure.props.base.conversionCodes, "onUpdate:modelValue": l2[1] || (l2[1] = (o3) => e2.configure.props.base.conversionCodes = o3), multiple: "", class: "ml-4" }, { default: t(() => [(a(true), c(p, null, f(O.value, (e3) => (a(), n(y2, { key: e3.code, label: e3.name, value: e3.code }, null, 8, ["label", "value"]))), 128))]), _: 1 }, 8, ["modelValue"])]), _: 1 }), s(V2, { label: "执行条件", class: "amb-design-attr-item" }, { default: t(() => [s(h3, { type: "primary", onClick: l2[2] || (l2[2] = (e3) => L.value = true) }, { default: t(() => l2[7] || (l2[7] = [g("编辑")])), _: 1 })]), _: 1 }), s(V2, { label: "启用条件", class: "amb-design-attr-item" }, { default: t(() => [(a(), n(C, { key: e2.configure.uuid + "_edit", configure: e2.configure, title: "启用条件", tableConfigure: x.value, type: "editConditions" }, null, 8, ["configure", "tableConfigure"]))]), _: 1 }), s(V2, { label: "自动设值", class: "amb-design-attr-item" }, { default: t(() => [s(h3, { type: "primary", onClick: l2[3] || (l2[3] = (e3) => U.value = true) }, { default: t(() => l2[8] || (l2[8] = [g("编辑")])), _: 1 })]), _: 1 }), s(V2, { label: "显示条件", class: "amb-design-attr-item" }, { default: t(() => [(a(), n(C, { key: e2.configure.uuid + "_show", configure: e2.configure, type: "showConditions", tableConfigure: x.value }, null, 8, ["configure", "tableConfigure"]))]), _: 1 }), s(V2, { label: "日志设置", class: "amb-design-attr-item" }, { default: t(() => [s(h3, { type: "primary", onClick: l2[4] || (l2[4] = (e3) => w.value = true) }, { default: t(() => l2[9] || (l2[9] = [g("编辑")])), _: 1 })]), _: 1 }), W.value ? (a(), n(V2, { key: 0, label: "意见必填", class: "amb-design-attr-item" }, { default: t(() => [s(j2, { modelValue: e2.configure.props.base.isMustOpinion, "onUpdate:modelValue": l2[5] || (l2[5] = (o3) => e2.configure.props.base.isMustOpinion = o3), size: "default" }, null, 8, ["modelValue"])]), _: 1 })) : u("", true), e2.configure.props.base.isMustOpinion ? (a(), n(V2, { key: 1, label: "意见必填条件", class: "amb-design-attr-item" }, { default: t(() => [(a(), n(C, { key: e2.configure.uuid + "_opinion", configure: e2.configure, type: "mustOpinionConditions", tableConfigure: x.value, title: "意见必填条件" }, null, 8, ["configure", "tableConfigure"]))]), _: 1 })) : u("", true)])]), _: 1 }), L.value ? (a(), n(d, { key: 0, pageDesign: e2.pageDesign, configure: e2.configure, tableConfigure: x.value, onClose: N }, null, 8, ["pageDesign", "configure", "tableConfigure"])) : u("", true), U.value ? (a(), n(m, { key: 1, pageDesign: e2.pageDesign, configure: e2.configure, tableConfigure: x.value, onSave: $, onClose: A }, null, 8, ["pageDesign", "configure", "tableConfigure"])) : u("", true), z.value ? (a(), n(b, { key: 2, conditionList: e2.configure.props.base.showConditions, fieldNameList: e2.pageDesign.modelFields, fieldMap: e2.pageDesign.modelFieldsMap, tableConfigure: x.value, onSave: P, onClose: F }, null, 8, ["conditionList", "fieldNameList", "fieldMap", "tableConfigure"])) : u("", true), w.value ? (a(), n(v, { key: 3, modelValue: e2.configure.props.base.logSetting, onClose: M, onSave: S }, null, 8, ["modelValue"])) : u("", true)]), _: 1 }, 8, ["modelValue"])]), _: 1 });
   };
 } });
 export {
-  k as default
+  h as default
 };

package/dist/es/components/design/views/assemblys/button/component/combination.vue.js

@@ -1,39 +1,42 @@
 import { defineComponent as e, ref as l, onMounted as a, resolveComponent as o, createBlock as t, openBlock as u, withCtx as d, createVNode as r, unref as n, createTextVNode as i, createElementBlock as p, Fragment as m, renderList as s } from "vue";
 import { CirclePlus as f, Delete as b } from "@element-plus/icons-vue";
-import c from "../../common/common-variable-bind.vue.js";
-import { ElMessage as v } from "element-plus";
+import v from "../../common/common-variable-bind.vue.js";
+import { ElMessage as c } from "element-plus";
 import { getOperators as V } from "../../../../utils/data-table-util.js";
+import { getModelOptionsByFields as _ } from "../../../../utils/page-table-util.js";
 const w = e({ __name: "combination", props: { conditionList: { type: String, default: null }, list: { type: Array, default: () => [] }, fieldNameList: { type: Array, default: () => {
 } }, fieldMap: { type: Object, default: () => {
+} }, tableConfigure: { type: Object, default: () => {
 } } }, emits: ["remove", "save", "close"], setup(e2, { emit: w2 }) {
-  const _ = e2, y = w2, g = l({}), h = l([]), U = l([]);
-  function N() {
-    h.value = h.value.filter((e3) => e3 != g.value);
+  const y = e2, g = w2, U = l({}), h = l([]), N = l([]), k = l(null);
+  var C;
+  function j() {
+    h.value = h.value.filter((e3) => e3 != U.value);
   }
-  function k(e3) {
-    g.value = e3;
-  }
-  function C() {
-    h.value.push({ leftBracket: "", propName: "", operator: "", rightBracket: "", joinSign: "" }), U.value.push([]);
+  function L(e3) {
+    U.value = e3;
   }
   function z() {
+    h.value.push({ leftBracket: "", propName: "", operator: "", rightBracket: "", joinSign: "" }), N.value.push([]);
+  }
+  function S() {
     if (h.value && h.value.length > 0) for (let e3 = 0; e3 < h.value.length; e3++) {
       const l2 = h.value[e3];
-      if (!l2.propName || !l2.propValue) return v.warning("第" + e3 + "行字段名或值有空白");
+      if (!(l2.propName && l2.propValue || "IS_NULL" == l2.operator || "IS_NOT_NULL" == l2.operator)) return c.warning("第" + e3 + "行字段名或值有空白");
     }
-    y("save", h.value), y("close");
+    g("save", h.value), g("close");
   }
-  return a(() => {
-    _.conditionList ? h.value = JSON.parse(_.conditionList) : _.list && (h.value = _.list);
+  return (C = y.tableConfigure) && (k.value = _(C.modelFields)), a(() => {
+    y.conditionList ? h.value = JSON.parse(y.conditionList) : y.list && (h.value = y.list);
   }), (l2, a2) => {
-    const v2 = o("el-button"), w3 = o("el-row"), g2 = o("el-option"), j = o("el-select"), B = o("el-table-column"), L = o("el-table"), S = o("el-dialog");
-    return u(), t(S, { "model-value": "", title: "组合条件", width: "70%", "close-on-click-modal": false, onClose: a2[0] || (a2[0] = (e3) => y("close")) }, { default: d(() => [r(w3, { style: { "padding-bottom": "8px" } }, { default: d(() => [r(v2, { icon: n(f), plain: "", type: "primary", onClick: z }, { default: d(() => a2[1] || (a2[1] = [i(" 保存 ")])), _: 1 }, 8, ["icon"]), r(v2, { icon: n(f), plain: "", type: "primary", onClick: C }, { default: d(() => a2[2] || (a2[2] = [i(" 添加 ")])), _: 1 }, 8, ["icon"]), r(v2, { icon: n(b), plain: "", type: "primary", onClick: N }, { default: d(() => a2[3] || (a2[3] = [i(" 删除 ")])), _: 1 }, 8, ["icon"])]), _: 1 }), r(L, { ref: "tableRef", "highlight-current-row": "", onCurrentChange: k, data: h.value, style: { width: "100%" } }, { default: d(() => [r(B, { prop: "date", label: "(" }, { default: d((e3) => [r(j, { modelValue: e3.row.leftBracket, "onUpdate:modelValue": (l3) => e3.row.leftBracket = l3, clearable: "", size: "default" }, { default: d(() => [r(g2, { label: "", value: "" }), r(g2, { label: "(", value: "(" }), r(g2, { label: "((", value: "((" }), r(g2, { label: "(((", value: "(((" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(B, { prop: "name", label: "字段名(*)" }, { default: d((l3) => [r(j, { modelValue: l3.row.propDbName, "onUpdate:modelValue": (e3) => l3.row.propDbName = e3, clearable: "", filterable: "", size: "default", onChange: (e3) => function(e4, l4, a3) {
-      const o2 = _.fieldMap[a3];
-      l4.dataType = o2.dataType, l4.propName = o2.name, U.value[e4] = V(o2);
-    }(l3.$index, l3.row, l3.row.propDbName) }, { default: d(() => [(u(true), p(m, null, s(e2.fieldNameList, (e3) => (u(), t(g2, { key: e3.id, label: e3.alias, value: e3.dbColumnName }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"])]), _: 1 }), r(B, { prop: "address", label: "操作符" }, { default: d((e3) => [r(j, { modelValue: e3.row.operator, "onUpdate:modelValue": (l3) => e3.row.operator = l3, clearable: "", size: "default" }, { default: d(() => [(u(true), p(m, null, s(n(V)(e3.row), (e4) => (u(), t(g2, { key: e4.name, label: e4.label, value: e4.name }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(B, { prop: "address", label: "值(*)" }, { default: d((e3) => [r(c, { modelValue: e3.row.propValue, "onUpdate:modelValue": (l3) => {
+    const c2 = o("el-button"), _2 = o("el-row"), w3 = o("el-option"), U2 = o("el-select"), C2 = o("el-table-column"), B = o("el-table"), O = o("el-dialog");
+    return u(), t(O, { "model-value": "", title: "组合条件", width: "70%", "close-on-click-modal": false, onClose: a2[0] || (a2[0] = (e3) => g("close")) }, { default: d(() => [r(_2, { style: { "padding-bottom": "8px" } }, { default: d(() => [r(c2, { icon: n(f), plain: "", type: "primary", onClick: S }, { default: d(() => a2[1] || (a2[1] = [i(" 保存 ")])), _: 1 }, 8, ["icon"]), r(c2, { icon: n(f), plain: "", type: "primary", onClick: z }, { default: d(() => a2[2] || (a2[2] = [i(" 添加 ")])), _: 1 }, 8, ["icon"]), r(c2, { icon: n(b), plain: "", type: "primary", onClick: j }, { default: d(() => a2[3] || (a2[3] = [i(" 删除 ")])), _: 1 }, 8, ["icon"])]), _: 1 }), r(B, { ref: "tableRef", "highlight-current-row": "", onCurrentChange: L, data: h.value, style: { width: "100%" } }, { default: d(() => [r(C2, { prop: "date", label: "(" }, { default: d((e3) => [r(U2, { modelValue: e3.row.leftBracket, "onUpdate:modelValue": (l3) => e3.row.leftBracket = l3, clearable: "", size: "default" }, { default: d(() => [r(w3, { label: "", value: "" }), r(w3, { label: "(", value: "(" }), r(w3, { label: "((", value: "((" }), r(w3, { label: "(((", value: "(((" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(C2, { prop: "name", label: "字段名(*)" }, { default: d((l3) => [r(U2, { modelValue: l3.row.propDbName, "onUpdate:modelValue": (e3) => l3.row.propDbName = e3, clearable: "", filterable: "", size: "default", onChange: (e3) => function(e4, l4, a3) {
+      const o2 = y.fieldMap[a3];
+      l4.dataType = o2.dataType, l4.propName = o2.name, N.value[e4] = V(o2);
+    }(l3.$index, l3.row, l3.row.propDbName) }, { default: d(() => [(u(true), p(m, null, s(e2.fieldNameList, (e3) => (u(), t(w3, { key: e3.id, label: e3.alias, value: e3.dbColumnName }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"])]), _: 1 }), r(C2, { prop: "address", label: "操作符" }, { default: d((e3) => [r(U2, { modelValue: e3.row.operator, "onUpdate:modelValue": (l3) => e3.row.operator = l3, clearable: "", size: "default" }, { default: d(() => [(u(true), p(m, null, s(n(V)(e3.row), (e4) => (u(), t(w3, { key: e4.name, label: e4.label, value: e4.name }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(C2, { prop: "address", label: "值(*)" }, { default: d((e3) => [r(v, { modelValue: e3.row.propValue, objModelOptions: k.value, "onUpdate:modelValue": (l3) => {
       return a3 = l3, void (e3.row.propValue = a3);
       var a3;
-    } }, null, 8, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(B, { prop: "address", label: "日期格式" }, { default: d((e3) => [r(j, { modelValue: e3.row.date, "onUpdate:modelValue": (l3) => e3.row.date = l3, clearable: "", size: "default" }, { default: d(() => [r(g2, { label: "年份", value: "year" }), r(g2, { label: "季度", value: "quarter" }), r(g2, { label: "月份", value: "month" }), r(g2, { label: "日", value: "day" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(B, { prop: "address", label: ")" }, { default: d((e3) => [r(j, { modelValue: e3.row.rightBracket, "onUpdate:modelValue": (l3) => e3.row.rightBracket = l3, clearable: "", size: "default" }, { default: d(() => [r(g2, { label: "", value: "" }), r(g2, { label: ")", value: ")" }), r(g2, { label: "))", value: "))" }), r(g2, { label: ")))", value: ")))" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(B, { prop: "address", label: "并且/或者" }, { default: d((e3) => [r(j, { modelValue: e3.row.joinSign, "onUpdate:modelValue": (l3) => e3.row.joinSign = l3, clearable: "", size: "default" }, { default: d(() => [r(g2, { label: "或者", value: "or" }), r(g2, { label: "并且", value: "and" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(B, { prop: "address", label: "变量为空时" }, { default: d((e3) => [r(j, { modelValue: e3.row.variableIsNull, "onUpdate:modelValue": (l3) => e3.row.variableIsNull = l3, clearable: "", size: "default" }, { default: d(() => [r(g2, { label: "Null", value: "null" }), r(g2, { label: "忽略(1=1)", value: "1=1" }), r(g2, { label: "不符合(1<>1)", value: "1<>1" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 })]), _: 1 }, 8, ["data"])]), _: 1 });
+    } }, null, 8, ["modelValue", "objModelOptions", "onUpdate:modelValue"])]), _: 1 }), r(C2, { prop: "address", label: "日期格式" }, { default: d((e3) => [r(U2, { modelValue: e3.row.date, "onUpdate:modelValue": (l3) => e3.row.date = l3, clearable: "", size: "default" }, { default: d(() => [r(w3, { label: "年份", value: "year" }), r(w3, { label: "季度", value: "quarter" }), r(w3, { label: "月份", value: "month" }), r(w3, { label: "日", value: "day" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(C2, { prop: "address", label: ")" }, { default: d((e3) => [r(U2, { modelValue: e3.row.rightBracket, "onUpdate:modelValue": (l3) => e3.row.rightBracket = l3, clearable: "", size: "default" }, { default: d(() => [r(w3, { label: "", value: "" }), r(w3, { label: ")", value: ")" }), r(w3, { label: "))", value: "))" }), r(w3, { label: ")))", value: ")))" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(C2, { prop: "address", label: "并且/或者" }, { default: d((e3) => [r(U2, { modelValue: e3.row.joinSign, "onUpdate:modelValue": (l3) => e3.row.joinSign = l3, clearable: "", size: "default" }, { default: d(() => [r(w3, { label: "或者", value: "or" }), r(w3, { label: "并且", value: "and" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), r(C2, { prop: "address", label: "变量为空时" }, { default: d((e3) => [r(U2, { modelValue: e3.row.variableIsNull, "onUpdate:modelValue": (l3) => e3.row.variableIsNull = l3, clearable: "", size: "default" }, { default: d(() => [r(w3, { label: "Null", value: "null" }), r(w3, { label: "忽略(1=1)", value: "1=1" }), r(w3, { label: "不符合(1<>1)", value: "1<>1" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 })]), _: 1 }, 8, ["data"])]), _: 1 });
   };
 } });
 export {

package/dist/es/components/design/views/assemblys/button/component/condition-dialog.vue.js

@@ -1,36 +1,37 @@
-import { defineComponent as e, ref as l, resolveComponent as o, createBlock as a, openBlock as i, withCtx as n, createVNode as t, createCommentVNode as d, unref as u, createTextVNode as p, createElementVNode as s } from "vue";
-import { formatConditionList as r } from "../../../../utils/data-table-util.js";
+import { defineComponent as e, ref as l, resolveComponent as o, createBlock as a, openBlock as i, withCtx as n, createVNode as t, createCommentVNode as u, unref as d, createTextVNode as p, createElementVNode as r } from "vue";
+import { formatConditionList as s } from "../../../../utils/data-table-util.js";
 import { CirclePlus as c, Delete as m } from "@element-plus/icons-vue";
 import f from "./combination.vue.js";
-const _ = { class: "dialog-footer" }, b = e({ __name: "condition-dialog", props: { configure: { type: Object, default: () => {
+const b = { class: "dialog-footer" }, g = e({ __name: "condition-dialog", props: { configure: { type: Object, default: () => {
 } }, pageDesign: { type: Object, default: () => {
-} } }, emits: ["close"], setup(e2, { emit: b2 }) {
-  const T = e2, g = b2, v = l({}), y = l(false), I = l("");
+} }, tableConfigure: { type: Object, default: () => {
+} } }, emits: ["close"], setup(e2, { emit: g2 }) {
+  const _ = e2, T = g2, v = l({}), y = l(false), I = l("");
   l([{ dbColumnName: "FIRST_TASK_ID", label: "该流程的第一个任务的id", type: "TEXT", value: "FIRST_TASK_ID" }, { dbColumnName: "ID", label: "id", type: "LONG", value: "ID" }, { dbColumnName: "AUDIT_REPORT_NO", label: "审核报告编号", type: "TEXT", value: "AUDIT_REPORT_NO" }]), l({ FIRST_TASK_ID: { dbColumnName: "FIRST_TASK_ID", label: "该流程的第一个任务的id", type: "TEXT", value: "FIRST_TASK_ID" }, ID: { dbColumnName: "ID", label: "id", type: "LONG", value: "ID" }, AUDIT_REPORT_NO: { dbColumnName: "AUDIT_REPORT_NO", label: "审核报告编号", type: "TEXT", value: "AUDIT_REPORT_NO" } });
-  const D = l(null);
-  function C(e3) {
-    T.configure.props.base.condition[I.value].conditionList = JSON.stringify(e3);
+  const C = l(null);
+  function D(e3) {
+    _.configure.props.base.condition[I.value].conditionList = JSON.stringify(e3);
   }
   function N() {
     y.value = false;
   }
   function O() {
-    T.configure.props.base.condition = T.configure.props.base.condition.filter((e3) => e3 !== v.value);
+    _.configure.props.base.condition = _.configure.props.base.condition.filter((e3) => e3 !== v.value);
   }
   function R(e3) {
     v.value = e3;
   }
   function S() {
-    T.configure.props.base.condition.push({});
+    _.configure.props.base.condition || (_.configure.props.base.condition = []), _.configure.props.base.condition.push({});
   }
-  return (l2, b3) => {
+  return (l2, g3) => {
     const v2 = o("el-button"), A = o("el-row"), w = o("el-input"), E = o("el-table-column"), F = o("el-table"), L = o("el-dialog");
-    return i(), a(L, { "model-value": "", title: "可执行条件", "append-to-body": "", onClose: b3[2] || (b3[2] = (e3) => g("close")) }, { footer: n(() => [s("div", _, [t(v2, { onClick: b3[0] || (b3[0] = (e3) => g("close")) }, { default: n(() => b3[5] || (b3[5] = [p("取消")])), _: 1 }), t(v2, { type: "primary", onClick: b3[1] || (b3[1] = (e3) => g("close")) }, { default: n(() => b3[6] || (b3[6] = [p(" 确定 ")])), _: 1 })])]), default: n(() => [t(A, { style: { "padding-bottom": "8px" } }, { default: n(() => [t(v2, { icon: u(c), plain: "", type: "primary", onClick: S }, { default: n(() => b3[3] || (b3[3] = [p(" 添加 ")])), _: 1 }, 8, ["icon"]), t(v2, { icon: u(m), plain: "", type: "primary", onClick: O }, { default: n(() => b3[4] || (b3[4] = [p(" 删除 ")])), _: 1 }, 8, ["icon"])]), _: 1 }), t(F, { "highlight-current-row": "", onCurrentChange: R, data: T.configure.props.base.condition, style: { width: "100%" } }, { default: n(() => [t(E, { prop: "date", label: "组合条件", align: "center" }, { default: n((l3) => [t(w, { "model-value": u(r)(l3.row.conditionList, e2.pageDesign.modelFields, e2.pageDesign.modelFieldsMap), size: "default", onClick: (e3) => {
-      return o2 = l3.row, a2 = l3.$index, D.value = o2.conditionList, I.value = a2, void (y.value = true);
+    return i(), a(L, { "model-value": "", title: "可执行条件", "append-to-body": "", onClose: g3[2] || (g3[2] = (e3) => T("close")) }, { footer: n(() => [r("div", b, [t(v2, { onClick: g3[0] || (g3[0] = (e3) => T("close")) }, { default: n(() => g3[5] || (g3[5] = [p("取消")])), _: 1 }), t(v2, { type: "primary", onClick: g3[1] || (g3[1] = (e3) => T("close")) }, { default: n(() => g3[6] || (g3[6] = [p(" 确定 ")])), _: 1 })])]), default: n(() => [t(A, { style: { "padding-bottom": "8px" } }, { default: n(() => [t(v2, { icon: d(c), plain: "", type: "primary", onClick: S }, { default: n(() => g3[3] || (g3[3] = [p(" 添加 ")])), _: 1 }, 8, ["icon"]), t(v2, { icon: d(m), plain: "", type: "primary", onClick: O }, { default: n(() => g3[4] || (g3[4] = [p(" 删除 ")])), _: 1 }, 8, ["icon"])]), _: 1 }), t(F, { "highlight-current-row": "", onCurrentChange: R, data: _.configure.props.base.condition, style: { width: "100%" } }, { default: n(() => [t(E, { prop: "date", label: "组合条件", align: "center" }, { default: n((l3) => [t(w, { "model-value": d(s)(l3.row.conditionList, e2.pageDesign.modelFields, e2.pageDesign.modelFieldsMap), size: "default", onClick: (e3) => {
+      return o2 = l3.row, a2 = l3.$index, C.value = o2.conditionList, I.value = a2, void (y.value = true);
       var o2, a2;
-    } }, null, 8, ["model-value", "onClick"])]), _: 1 }), t(E, { prop: "name", label: "提示信息", align: "center" }, { default: n((e3) => [t(w, { size: "default", modelValue: e3.row.toolTips, "onUpdate:modelValue": (l3) => e3.row.toolTips = l3 }, null, 8, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), t(E, { prop: "address", label: "国际化key", align: "center" }, { default: n((e3) => [t(w, { size: "default", modelValue: e3.row.labelI18nKey, "onUpdate:modelValue": (l3) => e3.row.labelI18nKey = l3 }, null, 8, ["modelValue", "onUpdate:modelValue"])]), _: 1 })]), _: 1 }, 8, ["data"]), y.value ? (i(), a(f, { key: 0, conditionList: D.value, fieldNameList: e2.pageDesign.modelFields, fieldMap: e2.pageDesign.modelFieldsMap, onSave: C, onClose: N }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : d("", true)]), _: 1 });
+    } }, null, 8, ["model-value", "onClick"])]), _: 1 }), t(E, { prop: "name", label: "提示信息", align: "center" }, { default: n((e3) => [t(w, { size: "default", modelValue: e3.row.toolTips, "onUpdate:modelValue": (l3) => e3.row.toolTips = l3 }, null, 8, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), t(E, { prop: "address", label: "国际化key", align: "center" }, { default: n((e3) => [t(w, { size: "default", modelValue: e3.row.labelI18nKey, "onUpdate:modelValue": (l3) => e3.row.labelI18nKey = l3 }, null, 8, ["modelValue", "onUpdate:modelValue"])]), _: 1 })]), _: 1 }, 8, ["data"]), y.value ? (i(), a(f, { key: 0, conditionList: C.value, fieldNameList: e2.pageDesign.modelFields, fieldMap: e2.pageDesign.modelFieldsMap, tableConfigure: e2.tableConfigure, onSave: D, onClose: N }, null, 8, ["conditionList", "fieldNameList", "fieldMap", "tableConfigure"])) : u("", true)]), _: 1 });
   };
 } });
 export {
-  b as default
+  g as default
 };