super-page-runtime 2.3.4-sit1 → 2.3.5-rc1

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

@@ -5,59 +5,59 @@ 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 }) {
-  const N = e2, _ = t(false), J = t({}), j = t(0);
+const _ = { style: { overflow: "auto", height: "calc(100vh - 140px)" }, ref: "dialogBody" }, b = { class: "dialog-footer" }, O = e({ __name: "common-homepage-search", props: { configure: { type: Object, required: true }, pageContext: { type: Object, default: () => {
+} } }, setup(e2, { expose: O2 }) {
+  const x = e2, N = t(false), J = t({}), j = t(0);
   let I;
   o(() => {
     I = setTimeout(() => {
-      J.value = JSON.parse(JSON.stringify(N.pageContext.entity));
+      J.value = JSON.parse(JSON.stringify(x.pageContext.entity));
     }, 200);
   }), i(() => {
     I && clearTimeout(I);
   });
   const k = t([]), w = () => {
-    _.value = false;
+    N.value = false;
   }, T = () => {
     const e3 = y.service({ lock: true, text: "Loading", background: "rgba(0, 0, 0, 0.7)" });
-    v(N.pageContext, N.pageContext.initChartServiceConfigs, null, false).then(() => {
-      _.value = false;
+    v(x.pageContext, x.pageContext.initChartServiceConfigs, null, false).then(() => {
+      N.value = false;
     }).finally(() => {
-      _.value = false, e3.close();
+      N.value = false, e3.close();
     });
   };
   function H() {
-    N.pageContext.entity = JSON.parse(JSON.stringify(J.value)), j.value++;
+    x.pageContext.entity = JSON.parse(JSON.stringify(J.value)), j.value++;
   }
   function A() {
     const e3 = {};
-    N.pageContext.variables.forEach((t3) => {
+    x.pageContext.variables.forEach((t3) => {
       const o3 = "${page." + t3.name + "}";
-      e3[o3] = h(N.pageContext.entity, o3, null);
+      e3[o3] = h(x.pageContext.entity, o3, null);
     });
     let t2 = window.localStorage.getItem("HOME_MY_CHARTS_CONDITIONS"), o2 = {};
-    t2 && (o2 = JSON.parse(t2)), o2[N.configure.homeChartSettingUserId] = e3;
+    t2 && (o2 = JSON.parse(t2)), o2[x.configure.homeChartSettingUserId] = e3;
     const i2 = JSON.stringify(e3);
-    window.localStorage.setItem("HOME_MY_CHARTS_CONDITIONS", JSON.stringify(o2)), J.value = JSON.parse(JSON.stringify(N.pageContext.entity)), S.post(window.$vueApp.config.globalProperties.baseAPI + "/component/home-chart-settings/search-conditions", { id: N.configure.homeChartSettingUserId, searchConditionsJson: i2 }).then((e4) => {
+    window.localStorage.setItem("HOME_MY_CHARTS_CONDITIONS", JSON.stringify(o2)), J.value = JSON.parse(JSON.stringify(x.pageContext.entity)), S.post(window.$vueApp.config.globalProperties.baseAPI + "/component/home-chart-settings/search-conditions", { id: x.configure.homeChartSettingUserId, searchConditionsJson: i2 }).then((e4) => {
       C.success("保存成功"), T();
     });
   }
-  return x2({ openSearch: () => {
-    _.value = true, k.value = N.configure.pushHomepage.searchConditions;
+  return O2({ openSearch: () => {
+    N.value = true, k.value = x.configure.pushHomepage.searchConditions;
   } }), (t2, o2) => {
     const i2 = l("el-empty"), v2 = l("el-form"), h2 = l("el-button"), y2 = l("el-dialog");
-    return r(), a(y2, { modelValue: _.value, "onUpdate:modelValue": o2[0] || (o2[0] = (e3) => _.value = e3), title: "筛选", close: w, "append-to-body": "", fullscreen: "", top: "40vh", append: "", width: "70%", draggable: "" }, { default: n(() => [u("div", b, [k.value && 0 !== k.value.length ? c("", true) : (r(), a(i2, { key: 0, description: "未设置筛选条件", "image-size": 50 })), (r(), a(v2, { key: j.value }, { default: n(() => [(r(true), g(m, null, d(k.value, (t3) => (r(), a(f, { key: t3.uuid, configure: t3, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"]))), 128))]), _: 1 }))], 512)]), footer: n(() => [u("div", O, [s(h2, { type: "primary", onClick: T }, { default: n(() => o2[1] || (o2[1] = [p(" 确定 ")])), _: 1 }), s(h2, { type: "default", onClick: H }, { default: n(() => o2[2] || (o2[2] = [p("重置")])), _: 1 }), s(h2, { type: "primary", onClick: A }, { default: n(() => o2[3] || (o2[3] = [p(" 保存为默认条件 ")])), _: 1 })])]), _: 1 }, 8, ["modelValue"]);
+    return r(), a(y2, { modelValue: N.value, "onUpdate:modelValue": o2[0] || (o2[0] = (e3) => N.value = e3), title: "筛选", close: w, "append-to-body": "", fullscreen: "", top: "40vh", append: "", width: "70%", draggable: "" }, { default: n(() => [u("div", _, [k.value && 0 !== k.value.length ? c("", true) : (r(), a(i2, { key: 0, description: "未设置筛选条件", "image-size": 50 })), (r(), a(v2, { key: j.value }, { default: n(() => [(r(true), g(m, null, d(k.value, (t3) => (r(), a(f, { key: t3.uuid, configure: t3, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"]))), 128))]), _: 1 }))], 512)]), footer: n(() => [u("div", b, [s(h2, { type: "primary", onClick: T }, { default: n(() => o2[1] || (o2[1] = [p(" 确定 ", -1)])), _: 1, __: [1] }), s(h2, { type: "default", onClick: H }, { default: n(() => o2[2] || (o2[2] = [p("重置", -1)])), _: 1, __: [2] }), s(h2, { type: "primary", onClick: A }, { default: n(() => o2[3] || (o2[3] = [p(" 保存为默认条件 ", -1)])), _: 1, __: [3] })])]), _: 1 }, 8, ["modelValue"]);
   };
 } });
 export {
-  x as default
+  O as default
 };

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

@@ -12,7 +12,14 @@ type Condition = {
 };
 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

@@ -57,24 +57,24 @@ class ExpressionEvaluator {
     return t;
   }
   static parseValue(e, t) {
-    switch (t = this.changeDataType(t)) {
+    if (t = this.changeDataType(t), null == e) return e;
+    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 false;
+      return console.error("表达式错误:", expression, e), false;
     }
   }
 }
@@ -115,6 +115,7 @@ 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) {
@@ -147,7 +148,8 @@ 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 (e2) {
+      } catch (r2) {
+        console.error("自定义函数脚本错误:", t2, e, r2);
       }
     } else copyStyle(o, t2);
   }));
@@ -163,7 +165,8 @@ function getRowStyleUtil(e, t, r) {
       if (t3) try {
         const r2 = t3.apply(t3, [{ data: e }]);
         null != r2 && false !== r2 && copyStyle(o, a);
-      } catch (e2) {
+      } catch (t4) {
+        console.error("自定义函数脚本错误:", e, t4);
       }
     } else if (a.matchingCondition) {
       const t3 = ExpressionEvaluator.evaluate(r.pageContext, a.matchingCondition, e.row);
@@ -187,7 +190,8 @@ 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 (e2) {
+      } catch (t3) {
+        console.error("自定义函数脚本错误:", e, t3);
       }
     } else if (n.matchingCondition) {
       const t2 = ExpressionEvaluator.evaluate(r.pageContext, n.matchingCondition, e.row);
@@ -311,7 +315,7 @@ function computeFormula(itemConfs, datas, entity) {
             r += Number(e2[t]);
           });
         } catch (e2) {
-          r = 0;
+          console.error("计算错误:", e2), r = 0;
         }
         totalValueMap[e] = r;
       } else (e.startsWith("${page.") || e.startsWith("${data.") || e.startsWith("${row.") || e.startsWith("${request.") || e.startsWith("${context.") || e.startsWith("${system.") || e.startsWith("${fixed.")) && (totalValueMap[e] = getValueFromVariable(entity, e, data));
@@ -323,7 +327,7 @@ function computeFormula(itemConfs, datas, entity) {
       try {
         data[key] = eval(expr);
       } catch (e) {
-        data[key] = 0;
+        console.error(itemConfs[key] + " 计算错误, 替换后表达式为：" + expr, e), data[key] = 0;
       }
     });
   });
@@ -363,7 +367,8 @@ 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 (e2) {
+    } catch (t2) {
+      console.error("自定义函数脚本错误:", e, t2);
     }
     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");

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

@@ -178,8 +178,9 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
     return o2.forEach((e4, o3) => {
       if (ae.value[e4.property]) {
         const t2 = ae.value[e4.property].label;
-        r2[o3] = y("div", {}, [J(t2, n2)]);
-      } else if (ue.value[e4.property]) {
+        return void (r2[o3] = y("div", {}, [J(t2, n2)]));
+      }
+      if (ue.value[e4.property]) {
         const t2 = n2.filter((e5, o4) => !le.includes(o4));
         r2[o3] = D(ue.value[e4.property], t2, e4.property, B.pageContext);
       }

package/dist/es/components/runtime/views/assemblys/common/export-form-report-dialog.vue.d.ts

@@ -1,21 +1,25 @@
+import { Component, PageContext } from '../../../utils/interfaces/page-design-types';
+
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     configure: {
-        type: ObjectConstructor;
+        type: () => Component;
         required: true;
     };
     pageContext: {
-        type: ObjectConstructor;
+        type: () => PageContext;
+        required: true;
     };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     close: (...args: any[]) => void;
     export: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     configure: {
-        type: ObjectConstructor;
+        type: () => Component;
         required: true;
     };
     pageContext: {
-        type: ObjectConstructor;
+        type: () => PageContext;
+        required: true;
     };
 }>> & Readonly<{
     onClose?: (...args: any[]) => any;

package/dist/es/components/runtime/views/assemblys/common/export-form-report-dialog.vue.js

@@ -1,32 +1,36 @@
-import { defineComponent as e, ref as t, onMounted as a, resolveComponent as l, createBlock as o, openBlock as p, withCtx as r, createVNode as s, createTextVNode as u, toDisplayString as i } from "vue";
-import { packageTemplateFiles as n } from "../../../utils/common-util.js";
-const m = "${", d = "}", c = e({ __name: "export-form-report-dialog", props: { configure: { type: Object, required: true }, pageContext: { type: Object } }, emits: ["export", "close"], setup(e2, { emit: c2 }) {
-  const g = e2, f = c2, b = t([]), h = t([]), x = g.configure.props.base, v = g.pageContext.entity.data;
-  function w(e3) {
-    let t2, a2, l2 = e3;
-    const o2 = l2.indexOf(m), p2 = l2.indexOf(d);
-    return -1 !== o2 && -1 !== p2 ? (o2 > p2 ? l2 = l2.substring(0, p2) + l2.substring(p2 + 1) : (t2 = l2.substring(o2 + 2, p2), a2 = l2.substring(o2, p2 + 1), h.value.push(t2), l2 = l2.replace(a2, "")), w(l2)) : h.value;
+import { defineComponent as e, ref as t, onMounted as l, resolveComponent as a, createBlock as o, openBlock as u, withCtx as p, createVNode as n, createTextVNode as s, toDisplayString as r } from "vue";
+import { packageTemplateFiles as i } from "../../../utils/common-util.js";
+import { ElMessage as m } from "element-plus";
+const c = "${", d = "}", g = e({ __name: "export-form-report-dialog", props: { configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["export", "close"], setup(e2, { emit: g2 }) {
+  var _a, _b;
+  const f = e2, b = t(false), v = g2, h = t([]), x = t([]), y = (_a = f.configure.props) == null ? void 0 : _a.base, w = (_b = f.pageContext) == null ? void 0 : _b.entity.data;
+  function N(e3) {
+    let t2, l2, a2 = e3;
+    const o2 = a2.indexOf(c), u2 = a2.indexOf(d);
+    return -1 !== o2 && -1 !== u2 ? (o2 > u2 ? a2 = a2.substring(0, u2) + a2.substring(u2 + 1) : (t2 = a2.substring(o2 + 2, u2), l2 = a2.substring(o2, u2 + 1), x.value.push(t2), x.value, a2 = a2.replace(l2, "")), N(a2)) : x.value;
   }
-  function y() {
-    f("close");
+  function O(e3) {
+    v("export", f.configure, e3);
   }
-  return a(() => {
-    x.templateFiles && x.templateFiles.length > 0 ? b.value = n(x.templateFiles) : x.templateUuid && x.templateName && b.value.push({ templateUuid: x.templateUuid, templateName: x.templateName }), b.value.forEach((e3) => {
-      var t2;
-      e3 && e3.templateName && (e3.templateName = (w(t2 = e3.templateName).forEach((e4) => {
-        const a2 = m + e4 + d;
-        let l2;
-        -1 !== t2.indexOf(a2) && v.hasOwnProperty(e4) && (l2 = v[e4] ? v[e4] : "", t2 = t2.replace(a2, l2));
-      }), t2));
-    });
+  function _() {
+    v("close");
+  }
+  return l(() => {
+    y.templateFiles && y.templateFiles.length > 0 ? h.value = i(y.templateFiles, f.pageContext, f.configure) : y.templateUuid && y.templateName && h.value.push({ templateUuid: y.templateUuid, templateName: y.templateName }), h.value.forEach((e3) => {
+      e3 && e3.templateName && (e3.templateName = function(e4) {
+        const t2 = N(e4);
+        return t2.forEach((t3) => {
+          const l2 = c + t3 + d;
+          let a2;
+          -1 !== e4.indexOf(l2) && Object.prototype.hasOwnProperty.call(w, t3) && (a2 = w[t3] ? w[t3] : "", e4 = e4.replace(l2, a2));
+        }), e4;
+      }(e3.templateName));
+    }), h.value && 0 !== h.value.length || (m({ message: "无符合条件可导出的模板！", type: "warning" }), v("close")), 1 === (h == null ? void 0 : h.value.length) ? (O(h.value[0]), v("close")) : b.value = true;
   }), (e3, t2) => {
-    const a2 = l("el-table-column"), n2 = l("el-button"), m2 = l("el-table"), d2 = l("el-dialog");
-    return p(), o(d2, { "show-close": true, "append-to-body": true, title: e3.$t("superPageRuntimeMessage.selectTemplate"), "model-value": "", onClose: y }, { default: r(() => [s(m2, { data: b.value, style: { width: "100%" } }, { default: r(() => [s(a2, { label: e3.$t("superPageRuntimeMessage.temlpate"), prop: "templateShowPath" }, { default: r((e4) => [u(i(e4.row.templateName), 1)]), _: 1 }, 8, ["label"]), s(a2, { label: e3.$t("superPageRuntimeMessage.operating"), width: "200", fixed: "right" }, { default: r((t3) => [s(n2, { type: "text", size: "small", onClick: (e4) => {
-      return a3 = t3.row, void f("export", g.configure, a3);
-      var a3;
-    } }, { default: r(() => [u(i(e3.$t("superPageRuntimeMessage.export")), 1)]), _: 2 }, 1032, ["onClick"])]), _: 1 }, 8, ["label"])]), _: 1 }, 8, ["data"])]), _: 1 }, 8, ["title"]);
+    const l2 = a("el-table-column"), i2 = a("el-button"), m2 = a("el-table"), c2 = a("el-dialog");
+    return u(), o(c2, { modelValue: b.value, "onUpdate:modelValue": t2[0] || (t2[0] = (e4) => b.value = e4), "show-close": true, "append-to-body": true, title: e3.$t("superPageRuntimeMessage.selectTemplate"), onClose: _ }, { default: p(() => [n(m2, { data: h.value, style: { width: "100%" } }, { default: p(() => [n(l2, { label: e3.$t("superPageRuntimeMessage.temlpate"), prop: "templateShowPath" }, { default: p((e4) => [s(r(e4.row.templateName), 1)]), _: 1 }, 8, ["label"]), n(l2, { label: e3.$t("superPageRuntimeMessage.operating"), width: "200", fixed: "right" }, { default: p((t3) => [n(i2, { type: "text", size: "small", onClick: (e4) => O(t3.row) }, { default: p(() => [s(r(e3.$t("superPageRuntimeMessage.export")), 1)]), _: 2 }, 1032, ["onClick"])]), _: 1 }, 8, ["label"])]), _: 1 }, 8, ["data"])]), _: 1 }, 8, ["modelValue", "title"]);
   };
 } });
 export {
-  c as default
+  g as default
 };

package/dist/es/components/runtime/views/assemblys/container/fixed/YxAffix.vue2.js

@@ -19,6 +19,7 @@ const p = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
         B.value = l2 ?? 0, R(n2 || i2 || false, e3);
       }
     } catch (e3) {
+      console.error(e3);
     }
   }, R = (e3, t2) => {
     var _a;
@@ -55,6 +56,7 @@ const p = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
           })();
           b.value = e3, T.value = e3[0], b.value.forEach((e4) => e4.addEventListener("scroll", z)), window.addEventListener("resize", L), S();
         } catch (e3) {
+          console.error(e3);
         }
       });
     }, 100);

package/dist/es/components/runtime/views/assemblys/data/bar-code/barcode-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as e, computed as t, ref as a, onMounted as r, watch as l, resolveComponent as o, createBlock as u, openBlock as n, normalizeStyle as i, normalizeClass as s, unref as p, withCtx as c, createElementBlock as m, createCommentVNode as f, toDisplayString as g } from "vue";
+import { defineComponent as e, computed as t, ref as r, onMounted as a, watch as o, resolveComponent as l, createBlock as n, openBlock as u, normalizeStyle as i, normalizeClass as s, unref as c, withCtx as p, createElementBlock as m, createCommentVNode as f, toDisplayString as g } from "vue";
 import d from "qrcode";
 import v from "jsbarcode";
 import { getFormModelFields as y } from "../../../../utils/page-init-util.js";
@@ -12,7 +12,7 @@ const j = ["src"], D = e({ __name: "barcode-runtime", props: { pageContext: {},
   let k = y(q.pageContext, q.configure);
   const A = t({ get: () => x(N, k), set(e3) {
     h(N, k, e3);
-  } }), E = q.configure.runtime ? q.configure.runtime : {}, _ = a(E.props ? E.props : {}), O = E.style, P = E.class, S = E.headerStyle, $ = a(""), I = a(null), Q = a(_.value.brCodeFormat ?? "CODE128"), V = a([]);
+  } }), E = q.configure.runtime ? q.configure.runtime : {}, _ = r(E.props ? E.props : {}), O = E.style, P = E.class, S = E.headerStyle, $ = r(""), I = r(null), Q = r(_.value.brCodeFormat ?? "CODE128"), V = r([]);
   function F(e3) {
     return h(N, k, e3);
   }
@@ -22,31 +22,32 @@ const j = ["src"], D = e({ __name: "barcode-runtime", props: { pageContext: {},
   function L(e3) {
     var t2;
     "QR-code" === _.value.type ? (t2 = e3, d.toDataURL(t2, (e4, t3) => {
-      e4 || ($.value = t3);
+      e4 ? console.error(e4) : $.value = t3;
     })) : function(e4) {
       try {
         v(I.value, e4, { format: Q.value });
       } catch (e5) {
+        console.error("生成条形码时发生错误:", e5);
       }
     }(e3);
   }
-  return r(() => {
+  return a(() => {
     _.value.generateRule && ("fixed" === _.value.generateRuleType ? (V.value = Array.from(_.value.generateRule.matchAll(/\$\{(\w+)\}/g), (e3) => e3[1]), V.value.forEach((e3) => {
-      l(() => q.pageContext.entity.data[e3], (e4, t2) => {
+      o(() => q.pageContext.entity.data[e3], (e4, t2) => {
         null != e4 && function() {
           let e5 = true;
           V.value.forEach((t3) => {
             q.pageContext.entity.data[t3] || (e5 = false);
           }), e5 && J(function(e6, t3) {
-            const a2 = /\$\{(\w+)\}/g;
-            return e6.replace(a2, (e7, a3) => t3.hasOwnProperty(a3) ? t3[a3] : e7);
+            const r2 = /\$\{(\w+)\}/g;
+            return e6.replace(r2, (e7, r3) => t3.hasOwnProperty(r3) ? t3[r3] : e7);
           }(_.value.generateRule, q.pageContext.entity.data));
         }();
       });
     })) : w.get(window.$vueApp.config.globalProperties.baseAPI + "/dc/setting-barcode-models/by-code/" + _.value.generateRule).then((e3) => {
       const t2 = JSON.parse(e3.barcodeModelItems);
       t2.forEach((e4) => {
-        "-1" !== e4.propDbName && -1 !== e4.propDbName && (V.value.push(e4.propDbName), l(() => q.pageContext.entity.data[e4.propDbName], (e5, a2) => {
+        "-1" !== e4.propDbName && -1 !== e4.propDbName && (V.value.push(e4.propDbName), o(() => q.pageContext.entity.data[e4.propDbName], (e5, r2) => {
           if (null != e5) {
             const e6 = b(t2, q.pageContext.entity.data);
             e6 && J(e6);
@@ -54,12 +55,13 @@ const j = ["src"], D = e({ __name: "barcode-runtime", props: { pageContext: {},
         }));
       });
     }).catch((e3) => {
+      console.error("获取条码规则失败:", e3);
     })), A.value && L(A.value);
   }), D2({ getValue: function() {
     return x(N, k);
   }, setValue: F }), (e3, t2) => {
-    const a2 = o("el-form-item");
-    return n(), u(a2, { required: !!_.value.required, class: s(p(P)), "label-width": _.value.labelWidth, style: i(p(O)) }, { label: c(() => [_.value.tittleShow ? (n(), m("div", { key: 0, style: i({ ...p(S) }) }, g(p(R)(_.value.title)), 5)) : f("", true)]), default: c(() => ["QR-code" === _.value.type ? (n(), m("img", { key: 0, src: $.value }, null, 8, j)) : (n(), m("canvas", { key: 1, ref_key: "barcode", ref: I }, null, 512))]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
+    const r2 = l("el-form-item");
+    return u(), n(r2, { required: !!_.value.required, class: s(c(P)), "label-width": _.value.labelWidth, style: i(c(O)) }, { label: p(() => [_.value.tittleShow ? (u(), m("div", { key: 0, style: i({ ...c(S) }) }, g(c(R)(_.value.title)), 5)) : f("", true)]), default: p(() => ["QR-code" === _.value.type ? (u(), m("img", { key: 0, src: $.value }, null, 8, j)) : (u(), m("canvas", { key: 1, ref_key: "barcode", ref: I }, null, 512))]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js

@@ -1,6 +1,6 @@
 import { defineComponent as e, ref as t, onMounted as n, watch as o, onUnmounted as i, resolveComponent as a, createElementBlock as l, openBlock as r, unref as u, createVNode as s } from "vue";
 import { setTableEvents as c, canExecuteButton as p, doAfterClickEvent as d, doBeforeClickEvent as f, gridSelectRecord as g, gridSelectAllRecords as m, gridSelectionChange as v, cellClick as h, cellDblClick as b, rowClick as w, rowDblClick as S, headerClick as C, getEventNameByType as y, getEventFuncByType as x, getHandleEvent as E } from "../../../../utils/events/event-util.js";
-import { getBaseUrl as D, getListCode as T, getRealRestApiPath as O, isWorkflowPage as R, isVariableInvalidValue as k } from "../../../../utils/common-util.js";
+import { getBaseUrl as D, getListCode as T, getRealRestApiPath as R, isWorkflowPage as O, isVariableInvalidValue as k } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap as I, getSaveFormRequestWithRow as V, standardEvents as j } from "../../../../utils/events/standard-event.js";
 import { isPromise as N } from "agilebuilder-ui/src/utils/common-util";
 import { getOperationButtons as B, popupToPage as P } from "../../../../utils/table-utils.js";
@@ -22,7 +22,7 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
     const e3 = Y.systemCode, t2 = Y.code;
     let n2 = J.props && J.props.dataOrigin && "[]" !== J.props.dataOrigin.sqlFilterCondition ? J.props.dataOrigin.sqlFilterCondition : null;
     null == n2 && (n2 = []);
-    const o2 = { isSql: true, optionTableHeight: 0, rowKeyProp: J.props.dataOrigin.principalLinkage, extraParam: { beanName: Y.beanName, functionCode: t2 + ".listData", tableName: ne, systemCode: e3, pageCode: Y.code, pageVersion: Y.version }, initSearchForm: n2, lineEditOptions: { aftersaveIsCreateRow: false, autoSave: false, enter: Se, esc: De }, indexContinuous: !(!J.props || !J.props.otherSettings) && J.props.otherSettings.serialNumberContinuous, initSearch: !J.props || false !== J.props.dataOrigin.initializationQuery, resizeHeight: je, pageCode: Y.code, pageVersion: Y.version, additionalParamMap: I(Y), showOverflowTooltip: !(!J.props || !J.props.otherSettings || void 0 !== J.props.otherSettings.isBreakLine && false !== J.props.otherSettings.isBreakLine), isEnableEnterEvent: J.props && J.props.otherSettings && J.props.otherSettings.isEnableEnterEvent, isWithDataPermission: !!(J.props && J.props.otherSettings && J.props.otherSettings.isWithDataPermission) && J.props.otherSettings.isWithDataPermission, pageDevMode: false, isWorkflowEntity: R(Y), tableClass: Z, tableStyle: X, pageContext: Y, configureObj: J, backendUrl: oe, cellStyleRender: qe, rowStyleRender: We, titleStyleRender: Qe, validateEitConditions: Xe };
+    const o2 = { isSql: true, optionTableHeight: 0, rowKeyProp: J.props.dataOrigin.principalLinkage, extraParam: { beanName: Y.beanName, functionCode: t2 + ".listData", tableName: ne, systemCode: e3, pageCode: Y.code, pageVersion: Y.version }, initSearchForm: n2, lineEditOptions: { aftersaveIsCreateRow: false, autoSave: false, enter: Se, esc: De }, indexContinuous: !(!J.props || !J.props.otherSettings) && J.props.otherSettings.serialNumberContinuous, initSearch: !J.props || false !== J.props.dataOrigin.initializationQuery, resizeHeight: je, pageCode: Y.code, pageVersion: Y.version, additionalParamMap: I(Y), showOverflowTooltip: !(!J.props || !J.props.otherSettings || void 0 !== J.props.otherSettings.isBreakLine && false !== J.props.otherSettings.isBreakLine), isEnableEnterEvent: J.props && J.props.otherSettings && J.props.otherSettings.isEnableEnterEvent, isWithDataPermission: !!(J.props && J.props.otherSettings && J.props.otherSettings.isWithDataPermission) && J.props.otherSettings.isWithDataPermission, pageDevMode: false, isWorkflowEntity: O(Y), tableClass: Z, tableStyle: X, pageContext: Y, configureObj: J, backendUrl: oe, cellStyleRender: qe, rowStyleRender: We, titleStyleRender: Qe, validateEitConditions: Xe };
     return function(e4) {
       var _a;
       ((_a = J.props.highOrder) == null ? void 0 : _a.mergeFields) && J.props.highOrder.mergeFields.length > 0 && (e4.mergeFields = J.props.highOrder.mergeFields.join(","));
@@ -56,7 +56,7 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
   }();
   const re = t(), ue = t(), se = function() {
     let e3 = oe + "/dsc/commons/list";
-    e3 && (e3 = O(e3, ee, te, Y.isTest));
+    e3 && (e3 = R(e3, ee, te, Y.isTest));
     return e3;
   }(), ce = T(Y.code, Y.version, J.uuid), pe = Y.code + "_" + ce, de = t([]), fe = Y.entity.page, ge = t({ data: [] }), me = Y.superGridItems, ve = me ? me[J.uuid] : null, he = t(false), be = q;
   function we() {
@@ -101,7 +101,7 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
     let t2;
     const n2 = y(e3.events, "click");
     if (n2) {
-      if (ie.value[n2] = e3, "lineEditSave" === n2 ? t2 = Ce : "restoreEdit" === n2 ? t2 = Te : "lineEditUpdate" === n2 ? t2 = Oe : "lineEditDelete" === n2 && (t2 = ke), !t2) {
+      if (ie.value[n2] = e3, "lineEditSave" === n2 ? t2 = Ce : "restoreEdit" === n2 ? t2 = Te : "lineEditUpdate" === n2 ? t2 = Re : "lineEditDelete" === n2 && (t2 = ke), !t2) {
         t2 = x(Y, e3.events, "click");
       }
     } else ie.value[e3.uuid] = e3, t2 = Be;
@@ -136,15 +136,15 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
     }) : ue.value.restoreRow(i2, ce);
     d(Y, J, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
   }
-  function Oe(e3, t2, n2, o2, i2) {
+  function Re(e3, t2, n2, o2, i2) {
     const a2 = ie.value.lineEditUpdate, l2 = J;
     a2.props.base.tableUuid = l2.uuid;
     const r2 = f(Y, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
     r2 && (N(r2) ? r2.then((l3) => {
-      l3 && Re(e3, t2, n2, o2, i2, a2);
-    }) : Re(e3, t2, n2, o2, i2, a2));
+      l3 && Oe(e3, t2, n2, o2, i2, a2);
+    }) : Oe(e3, t2, n2, o2, i2, a2));
   }
-  function Re(e3, t2, n2, o2, i2, a2) {
+  function Oe(e3, t2, n2, o2, i2, a2) {
     Y.editData = n2, p({ pageContext: Y, configureObj: a2 }).then((a3) => {
       if (true === a3.canExecute) {
         ue.value.editRow(i2, ce);
@@ -207,6 +207,7 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
   }
   function Ne() {
     if (!ue.value) return;
+    Q.configure.name, Q.configure;
     const e3 = U(Q.pageContext, Q.configure);
     if (e3) {
       if (e3.isCalcHeight) {
@@ -282,7 +283,7 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
   }
   n(() => {
     const e3 = Ke();
-    ue.value && e3 && e3.distanceToBottom && (ue.value.tableHeight = e3.distanceToBottom - 110), Q.pageContext.pageRuntimeStyle, window.addEventListener("message", Pe), F.$on(pe + "-close-component-page-dialog", function({ jumpInfo: e4, popEntity: t2, popPageCode: n2 }) {
+    ue.value && e3 && e3.distanceToBottom && (ue.value.tableHeight = e3.distanceToBottom - 110), Q.pageContext.pageRuntimeStyle && Q.pageContext.pageRuntimeStyle.height, window.addEventListener("message", Pe), F.$on(pe + "-close-component-page-dialog", function({ jumpInfo: e4, popEntity: t2, popPageCode: n2 }) {
       ue.value.closePageDialog({ entity: t2, pageCode: n2, jumpInfo: e4 });
     }), F.$on(pe + "_close-dialog-get-entity", () => {
       F.$emit(pe + "_close-super-dialog");