super-page-runtime 2.2.77 → 2.2.80

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

@@ -1,35 +1,36 @@
-import { defineComponent as e, ref as r, onMounted as t, watch as o, createElementBlock as a, openBlock as n, normalizeClass as u, normalizeStyle as s, unref as i, withDirectives as c, createVNode as p, vShow as f } from "vue";
-import { getCustomTheme as m, initChartOption as h, exportCommonChart as l } from "../../../../utils/charts/chart-util.js";
+import { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as n, openBlock as a, normalizeClass as s, normalizeStyle as c, unref as i, withDirectives as u, createVNode as p, vShow as l } from "vue";
+import { getCustomTheme as f, initChartOption as m, exportCommonChart as h } from "../../../../utils/charts/chart-util.js";
 import { getChartDatasFromPage as g, updateChartDatasources as d, monitorFieldChange as x } from "../../../../utils/page-helper-util.js";
 import { updateChartOption as C } from "../../../../utils/charts/chart-scatter-util.js";
 import v from "../common/common-chart-header.vue.js";
 import { use as R } from "echarts/core";
 import { CanvasRenderer as y } from "echarts/renderers";
 import { ScatterChart as V } from "echarts/charts";
-import { GridComponent as _, LegendComponent as j, TitleComponent as w, TooltipComponent as I, ToolboxComponent as k, DataZoomComponent as b } from "echarts/components";
-import H from "vue-echarts";
-const z = e({ __name: "scatter-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: z2 }) {
-  R([y, V, _, j, w, I, k, b]);
-  const D = e2, F = r(null), O = r(null), P = r(null), S = D.configure.runtime ? D.configure.runtime : {}, T = S.style, q = S.class, A = S.dataConfig, B = S.headerInfo ? S.headerInfo : {}, E = S.chartOption, G = D.configure.props ? D.configure.props : {}, J = m(G.customTheme);
-  h(D.configure, E), t(() => {
-    const e3 = g(D.pageContext, D.configure);
+import { GridComponent as _, LegendComponent as j, TitleComponent as w, TooltipComponent as I, ToolboxComponent as k, DataZoomComponent as O } from "echarts/components";
+import b from "vue-echarts";
+const H = e({ __name: "scatter-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: H2 }) {
+  R([y, V, _, j, w, I, k, O]);
+  const z = e2, D = r(null), F = r(null), P = r(null), S = z.configure.runtime ? z.configure.runtime : {}, T = S.style, q = S.class, A = S.dataConfig, B = S.headerInfo ? S.headerInfo : {}, E = S.chartOption, G = z.configure.props ? z.configure.props : {}, J = f(G.customTheme);
+  m(z.configure, E), console.log("chartOption", E), o(() => {
+    const e3 = g(z.pageContext, z.configure);
     e3 && N(e3);
   });
   let K = B.groupValue;
   function L() {
-    A && d(D.pageContext, [A], B.drillParams);
+    A ? d(z.pageContext, [A], B.drillParams) : console.log("无数据源配置，不需要查询!");
   }
-  o(B, () => {
+  t(B, () => {
     K != B.groupValue && (K = B.groupValue, A && (A.services[0].groupValue = B.groupValue), L());
   });
   const M = B.monitorFields;
   function N(e3) {
-    e3 || (e3 = []), (e3 = e3.length > 0 ? e3[0] : {}) || (e3 = {}), e3.hasRender ? e3.hasRender = true : (e3.hasRender = true, C(D.pageContext, D.configure, E, e3));
+    if (e3 || (e3 = []), (e3 = e3.length > 0 ? e3[0] : {}) || (e3 = {}), e3.hasRender) return e3.hasRender = true, void console.log("重复更新!", e3);
+    e3.hasRender = true, C(z.pageContext, z.configure, E, e3), console.log("chartOption scatter", E);
   }
-  return x(D.pageContext, M, L), z2({ updateChartDatas: N, exportChart: function() {
-    return l(O.value);
-  } }), (e3, r2) => (n(), a("div", { style: s(i(T)), class: u([i(q), "amb-widget-chart amb-widget-flex"]), ref_key: "thisRef", ref: F }, [c(p(v, { ref_key: "headerRef", ref: P, headerInfo: i(B), configure: e3.configure, pageContext: e3.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[f, i(B).showHeader || e3.pageContext.showHomepageSearch]]), p(i(H), { ref_key: "chartRef", ref: O, theme: i(J), option: i(E), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+  return x(z.pageContext, M, L), H2({ updateChartDatas: N, exportChart: function() {
+    return h(F.value);
+  } }), (e3, r2) => (a(), n("div", { style: c(i(T)), class: s([i(q), "amb-widget-chart amb-widget-flex"]), ref_key: "thisRef", ref: D }, [u(p(v, { ref_key: "headerRef", ref: P, headerInfo: i(B), configure: e3.configure, pageContext: e3.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[l, i(B).showHeader || e3.pageContext.showHomepageSearch]]), p(i(b), { ref_key: "chartRef", ref: F, theme: i(J), option: i(E), autoresize: "" }, null, 8, ["theme", "option"])], 6));
 } });
 export {
-  z as default
+  H as default
 };

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

@@ -61,7 +61,7 @@ class ExpressionEvaluator {
     try {
       return eval(expression);
     } catch (e) {
-      return false;
+      return console.error("表达式错误:", expression, e), false;
     }
   }
 }
@@ -90,6 +90,7 @@ function summaryStatistics(e, t, o, r) {
       const e2 = n2.apply(n2, [{ data: t, prop: o }]);
       a = e2 ? ` ${e2}` : " N/A";
     } catch (e2) {
+      console.error("自定义函数脚本错误:", t, e2);
     }
     else a = " N/A";
   } else switch (n) {
@@ -122,7 +123,8 @@ function getHeaderCellStyleUtil(e, t, o) {
       const a2 = getCustomFunc(o.pageContext, t2.scopeFunc);
       if (a2) try {
         false !== a2.apply(a2, [{ item: t2, data: e }]) && copyStyle(r, t2);
-      } catch (e2) {
+      } catch (o2) {
+        console.error("自定义函数脚本错误:", t2, e, o2);
       }
     } else copyStyle(r, t2);
   }));
@@ -138,7 +140,8 @@ function getRowStyleUtil(e, t, o) {
       if (t3) try {
         const o2 = t3.apply(t3, [{ data: e }]);
         null != o2 && false !== o2 && copyStyle(r, a);
-      } catch (e2) {
+      } catch (t4) {
+        console.error("自定义函数脚本错误:", e, t4);
       }
     } else if (a.matchingCondition) {
       const t3 = ExpressionEvaluator.evaluate(o.pageContext, a.matchingCondition, e.row);
@@ -162,7 +165,8 @@ function getCellStyleUtil(e, t, o) {
       const t2 = getCustomFunc(o.pageContext, n.scopeFunc);
       if (t2) try {
         false !== t2.apply(t2, [{ data: e }]) && copyStyle(r, n);
-      } catch (e2) {
+      } catch (t3) {
+        console.error("自定义函数脚本错误:", e, t3);
       }
     } else if (n.matchingCondition) {
       const t2 = ExpressionEvaluator.evaluate(o.pageContext, n.matchingCondition, e.row);
@@ -286,7 +290,7 @@ function computeFormula(itemConfs, datas, entity) {
             o += Number(e2[t]);
           });
         } catch (e2) {
-          o = 0;
+          console.error("计算错误:", e2), o = 0;
         }
         totalValueMap[e] = o;
       } 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));
@@ -298,7 +302,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;
       }
     });
   });
@@ -338,7 +342,8 @@ function formatCustomFunc(e, t, o, r, a) {
   if (n) {
     try {
       return n.apply(n, [{ pageContext: r, configureObj: a, row: e, prop: o.props.base.prop }]);
-    } catch (e2) {
+    } catch (t2) {
+      console.error("自定义函数脚本错误:", e, t2);
     }
     return "";
   }

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

@@ -1,15 +1,15 @@
-import { defineComponent as e, ref as o, onMounted as n, watch as r, resolveComponent as t, createElementBlock as i, openBlock as a, normalizeClass as u, normalizeStyle as p, unref as l, withDirectives as s, createVNode as c, createBlock as g, createCommentVNode as f, vShow as d, withCtx as m, Fragment as h, renderList as v, h as y } from "vue";
+import { defineComponent as e, ref as o, onMounted as n, watch as r, resolveComponent as t, createElementBlock as i, openBlock as a, normalizeClass as u, normalizeStyle as l, unref as p, withDirectives as s, createVNode as c, createBlock as g, createCommentVNode as f, vShow as d, withCtx as m, Fragment as h, renderList as v, h as y } from "vue";
 import C from "../common/common-chart-header.vue.js";
 import { getSizeConfig as x, getChartDatasFromPage as b, getValueFromVariable as O, isPromise as w, setValueForVariableName as S, updateChartDatasourcesByComponent as j, caculateShowCondition as E } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc as $ } from "../../../../utils/events/event-util.js";
 import k from "./group-column.vue.js";
 import F from "./normal-column.vue.js";
 import I from "./table-pageination.vue.js";
-import { getSummaryTitleColumn as R, getSummaryDataColumn as H, rowDataToColumn as T, getColumnToRowTableConfig as _, colDataToRow as z, computeFormula as D, getNewColumnConfig as P, summaryStatistics as U, replacePlaceholders as G, getIndexColumn as K, getHeaderCellStyleUtil as N, getRowStyleUtil as J, getCellStyleUtil as L, formatColContent as V } from "./chart-table-util.js";
+import { getSummaryTitleColumn as R, getSummaryDataColumn as H, rowDataToColumn as T, getColumnToRowTableConfig as _, colDataToRow as z, computeFormula as D, getNewColumnConfig as P, summaryStatistics as U, replacePlaceholders as G, getIndexColumn as K, getHeaderCellStyleUtil as N, getRowStyleUtil as V, getCellStyleUtil as J, formatColContent as L } from "./chart-table-util.js";
 import { deepCopy as A } from "../../../../utils/common-util.js";
 const q = e({ __name: "table-runtime", props: { configure: { type: Object, default: () => ({}) }, pageContext: { type: Object, default: () => ({}) } }, setup(e2, { expose: q2 }) {
   var _a;
-  const B = e2, M = B.configure.runtime ? B.configure.runtime : {}, Q = M.style, W = M.class, X = M.dataConfig, Y = M.headerInfo ? M.headerInfo : {}, Z = o(null), ee = o(M.props.isEnableGroupHeader), oe = o([]), ne = o([]), re = o([]), te = o({}), ie = o(false), ae = o({}), ue = o({}), pe = o({}), le = [], se = o({}), ce = o({}), ge = o(null), fe = o(0);
+  const B = e2, M = B.configure.runtime ? B.configure.runtime : {}, Q = M.style, W = M.class, X = M.dataConfig, Y = M.headerInfo ? M.headerInfo : {}, Z = o(null), ee = o(M.props.isEnableGroupHeader), oe = o([]), ne = o([]), re = o([]), te = o({}), ie = o(false), ae = o({}), ue = o({}), le = o({}), pe = [], se = o({}), ce = o({}), ge = o(null), fe = o(0);
   let de = [];
   if (!B.configure.props.modelCustom) {
     if (ee.value) {
@@ -28,19 +28,20 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       te.value[e3.uuid] = e3, Object.keys(e3.style).length > 0 && (se.value[e3.props.base.prop] = { cellStyle: e3.style, titleStyle: e3.titleStyle }), e3.formula && "" !== e3.formula.trim() && (ce.value[e3.props.base.prop] = e3.formula);
     });
   }
-  ie.value = B.configure.props.base.showSummary, (ie.value || B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0) && (ae.value = R(B.configure), ie.value && (ue.value = H(B.configure, "table")), B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0 && (pe.value = H(B.configure, "group")));
+  ie.value = B.configure.props.base.showSummary, (ie.value || B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0) && (ae.value = R(B.configure), ie.value && (ue.value = H(B.configure, "table")), B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0 && (le.value = H(B.configure, "group")));
   let me = 300, he = x(B.pageContext, B.configure);
   function ve() {
     const e3 = B.configure.props.dataOrigin.variable.match(/\${(.*?)}/), o2 = e3 ? e3[1].split(".") : [];
     r(() => o2.reduce((e4, o3) => e4[o3], B.pageContext.entity), (e4) => {
-      e4 ? ye(JSON.parse(JSON.stringify(e4))) : (oe.value = [], B.configure.props.modelCustom ? Re(null) : ee.value ? re.value = B.configure.props.groupHeaders : ne.value = B.configure.items);
+      console.log("统计表格监听数据变量的变化 newVal：", e4), e4 ? ye(JSON.parse(JSON.stringify(e4))) : (oe.value = [], console.log("重置统计表格列配置"), B.configure.props.modelCustom ? Re(null) : ee.value ? re.value = B.configure.props.groupHeaders : ne.value = B.configure.items);
     });
   }
   function ye(e3) {
-    e3 || (e3 = []), (e3 = e3.length > 0 ? e3[0] : {}) || (e3 = {}), e3.hasRender ? e3.hasRender = true : (!function(e4) {
+    if (e3 || (e3 = []), (e3 = e3.length > 0 ? e3[0] : {}) || (e3 = {}), e3.hasRender) return e3.hasRender = true, void console.log("重复更新!", e3);
+    !function(e4) {
       Re(e4), "service" === B.configure.props.dataOrigin.dataSource && e4.result ? de = e4.result[B.configure.props.dataOrigin.service.serviceDataField] : "variable" === B.configure.props.dataOrigin.dataSource && (ve(), de = O(B.pageContext.entity, B.configure.props.dataOrigin.variable));
       de && Ce(de, e4);
-    }(e3), e3.hasRender = true, X && (X.autoRefresh = false));
+    }(e3), e3.hasRender = true, X && (X.autoRefresh = false);
   }
   function Ce(e3, o2) {
     var _a2;
@@ -90,7 +91,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       const e4 = B.configure.props.highOrder.groupField;
       oe.value = function(e5, o3) {
         var _a3, _b;
-        if (0 === pe.value.length) return e5;
+        if (0 === le.value.length) return e5;
         const n2 = [], r2 = (_a3 = B.configure.items) == null ? void 0 : _a3.filter((e6) => o3.includes(e6.props.base.prop)), t2 = (_b = B.configure.items) == null ? void 0 : _b.filter((e6) => true === e6.props.base.groupSummary), i2 = {};
         e5.forEach((e6) => {
           const n3 = o3.map((o4) => e6[o4]).join("|");
@@ -100,12 +101,12 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
         for (let e6 = 0; e6 < a2.length; e6++) {
           const o4 = a2[e6], i3 = {};
           t2 == null ? void 0 : t2.forEach((e7) => {
-            const n3 = e7.props.base.prop, r3 = U(pe.value[n3], o4, n3, B.pageContext);
+            const n3 = e7.props.base.prop, r3 = U(le.value[n3], o4, n3, B.pageContext);
             i3[n3] = r3;
           }), n2.push(...o4), r2 == null ? void 0 : r2.forEach((e7) => {
             const n3 = e7.props.base.prop;
             i3[n3] = G(e7.props.base.summaryTitle, o4[0]);
-          }), n2.push(i3), le.push(n2.length - 1);
+          }), n2.push(i3), pe.push(n2.length - 1);
         }
         return n2;
       }(oe.value, e4);
@@ -125,11 +126,11 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
     return N(e3, { cellTitleStyle: o2, titleStyle: n2 }, B);
   }
   function Oe(e3) {
-    return J(e3, le, B);
+    return V(e3, pe, B);
   }
   function we(e3) {
     const o2 = se.value[e3.column.property] ? se.value[e3.column.property].cellStyle : null;
-    return L(e3, o2, B);
+    return J(e3, o2, B);
   }
   he && he.fixHeight && (me = he.fixHeight), he && he.maxHeight && (me = he.maxHeight), me && (me = Number(me + "")), n(() => {
     const e3 = b(B.pageContext, B.configure);
@@ -147,7 +148,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
         const t2 = ae.value[e4.property].label;
         r2[o3] = y("div", {}, [G(t2, n2)]);
       } else if (ue.value[e4.property]) {
-        const t2 = n2.filter((e5, o4) => !le.includes(o4));
+        const t2 = n2.filter((e5, o4) => !pe.includes(o4));
         r2[o3] = U(ue.value[e4.property], t2, e4.property, B.pageContext);
       }
     }), r2;
@@ -205,7 +206,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       let o3 = [];
       oe.value && (o3 = A(oe.value), o3.forEach((o4) => {
         e4.forEach((e5) => {
-          const n3 = V(o4, e5.props.format, e5, B.pageContext, B.configure);
+          const n3 = L(o4, e5.props.format, e5, B.pageContext, B.configure);
           o4[e5.props.base.prop] = n3;
         });
       }));
@@ -213,7 +214,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
     }(n2), columns: e3 };
   } }), (o2, n2) => {
     const r2 = t("el-table");
-    return a(), i("div", { style: p([l(Q), { display: "flex", "flex-direction": "column" }]), class: u([l(W), "amb-widget-chart amb-widget-flex"]), ref: "thisRef" }, [s(c(C, { ref_key: "headerRef", ref: Z, headerInfo: l(Y), configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[d, l(Y).showHeader || e2.pageContext.showHomepageSearch]]), c(r2, { ref_key: "gridRef", ref: ge, data: oe.value, style: { width: "100%" }, "max-height": l(me), "header-cell-style": be, "row-style": Oe, "cell-style": we, "show-summary": ie.value, stripe: e2.configure.props.base.stripe, "summary-method": Se, "span-method": je }, { default: m(() => [ee.value ? (a(true), i(h, { key: 0 }, v(re.value, (o3, n3) => (a(), i(h, { key: n3 }, [o3.isLeaf ? Ie(te.value[o3.columnUuid]) ? (a(), g(F, { key: 1, configure: e2.configure, pageContext: e2.pageContext, column: te.value[o3.columnUuid] }, null, 8, ["configure", "pageContext", "column"])) : f("", true) : (a(), g(k, { key: 0, configure: e2.configure, pageContext: e2.pageContext, groupColumn: o3, columnsConfigKeyValues: te.value }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"]))], 64))), 128)) : (a(true), i(h, { key: 1 }, v(ne.value, (o3, n3) => (a(), i(h, { key: n3 }, [Ie(o3) ? (a(), g(F, { key: 0, column: o3, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["column", "configure", "pageContext"])) : f("", true)], 64))), 128))]), _: 1 }, 8, ["data", "max-height", "show-summary", "stripe"]), e2.configure.pageination && e2.configure.pageination.enable ? (a(), g(I, { key: 0, configure: e2.configure, "table-data": oe.value, total: fe.value, onPageChange: Ee, onPageSizeChange: $e }, null, 8, ["configure", "table-data", "total"])) : f("", true)], 6);
+    return a(), i("div", { style: l([p(Q), { display: "flex", "flex-direction": "column" }]), class: u([p(W), "amb-widget-chart amb-widget-flex"]), ref: "thisRef" }, [s(c(C, { ref_key: "headerRef", ref: Z, headerInfo: p(Y), configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[d, p(Y).showHeader || e2.pageContext.showHomepageSearch]]), c(r2, { ref_key: "gridRef", ref: ge, data: oe.value, style: { width: "100%" }, "max-height": p(me), "header-cell-style": be, "row-style": Oe, "cell-style": we, "show-summary": ie.value, stripe: e2.configure.props.base.stripe, "summary-method": Se, "span-method": je }, { default: m(() => [ee.value ? (a(true), i(h, { key: 0 }, v(re.value, (o3, n3) => (a(), i(h, { key: n3 }, [o3.isLeaf ? Ie(te.value[o3.columnUuid]) ? (a(), g(F, { key: 1, configure: e2.configure, pageContext: e2.pageContext, column: te.value[o3.columnUuid] }, null, 8, ["configure", "pageContext", "column"])) : f("", true) : (a(), g(k, { key: 0, configure: e2.configure, pageContext: e2.pageContext, groupColumn: o3, columnsConfigKeyValues: te.value }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"]))], 64))), 128)) : (a(true), i(h, { key: 1 }, v(ne.value, (o3, n3) => (a(), i(h, { key: n3 }, [Ie(o3) ? (a(), g(F, { key: 0, column: o3, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["column", "configure", "pageContext"])) : f("", true)], 64))), 128))]), _: 1 }, 8, ["data", "max-height", "show-summary", "stripe"]), e2.configure.pageination && e2.configure.pageination.enable ? (a(), g(I, { key: 0, configure: e2.configure, "table-data": oe.value, total: fe.value, onPageChange: Ee, onPageSizeChange: $e }, null, 8, ["configure", "table-data", "total"])) : f("", true)], 6);
   };
 } });
 export {

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;
+import { defineComponent as e, ref as t, onMounted as l, resolveComponent as o, createBlock as a, openBlock as n, withCtx as s, createVNode as r, createTextVNode as u, toDisplayString as p } from "vue";
+import { packageTemplateFiles as i } from "../../../utils/common-util.js";
+const m = "${", c = "}", g = e({ __name: "export-form-report-dialog", props: { configure: { type: Object, required: true }, pageContext: { type: Object } }, emits: ["export", "close"], setup(e2, { emit: g2 }) {
+  const d = e2, f = g2, x = t([]), b = t([]), h = d.configure.props.base, v = d.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;
+    let t2, l2;
+    console.log("templateShowName", e3);
+    let o2 = e3;
+    const a2 = o2.indexOf(m), n2 = o2.indexOf(c);
+    return console.log("prefixIndex", a2), console.log("suffixIndex", n2), -1 !== a2 && -1 !== n2 ? (a2 > n2 ? (o2 = o2.substring(0, n2) + o2.substring(n2 + 1), console.log("non replacement value === newValue", o2)) : (t2 = o2.substring(a2 + 2, n2), l2 = o2.substring(a2, n2 + 1), console.log("field", t2), console.log("formatStr", l2), b.value.push(t2), console.log("fields", b.value), o2 = o2.replace(l2, ""), console.log("newValue", o2)), w(o2)) : b.value;
   }
-  function y() {
+  function N() {
     f("close");
   }
-  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));
+  return l(() => {
+    h.templateFiles && h.templateFiles.length > 0 ? x.value = i(h.templateFiles) : h.templateUuid && h.templateName && x.value.push({ templateUuid: h.templateUuid, templateName: h.templateName }), x.value.forEach((e3) => {
+      e3 && e3.templateName && (e3.templateName = function(e4) {
+        const t2 = w(e4);
+        return console.log("fields", t2), t2.forEach((t3) => {
+          const l2 = m + t3 + c;
+          let o2;
+          -1 !== e4.indexOf(l2) && v.hasOwnProperty(t3) && (o2 = v[t3] ? v[t3] : "", e4 = e4.replace(l2, o2));
+        }), e4;
+      }(e3.templateName));
     });
   }), (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 = o("el-table-column"), i2 = o("el-button"), m2 = o("el-table"), c2 = o("el-dialog");
+    return n(), a(c2, { "show-close": true, "append-to-body": true, title: e3.$t("superPageRuntimeMessage.selectTemplate"), "model-value": "", onClose: N }, { default: s(() => [r(m2, { data: x.value, style: { width: "100%" } }, { default: s(() => [r(l2, { label: e3.$t("superPageRuntimeMessage.temlpate"), prop: "templateShowPath" }, { default: s((e4) => [u(p(e4.row.templateName), 1)]), _: 1 }, 8, ["label"]), r(l2, { label: e3.$t("superPageRuntimeMessage.operating"), width: "200", fixed: "right" }, { default: s((t3) => [r(i2, { type: "text", size: "small", onClick: (e4) => {
+      return l3 = t3.row, void f("export", d.configure, l3);
+      var l3;
+    } }, { default: s(() => [u(p(e3.$t("superPageRuntimeMessage.export")), 1)]), _: 2 }, 1032, ["onClick"])]), _: 1 }, 8, ["label"])]), _: 1 }, 8, ["data"])]), _: 1 }, 8, ["title"]);
   };
 } });
 export {
-  c as default
+  g as default
 };

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

@@ -1,9 +1,9 @@
 import { defineComponent as e, ref as t, onMounted as o, nextTick as n, onUnmounted as i, watchEffect as l, computed as a, createElementBlock as r, openBlock as s, createCommentVNode as u, createElementVNode as f, normalizeStyle as c, normalizeClass as d, renderSlot as p } from "vue";
 const v = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 }, position: { type: String, default: "top", validator: (e2) => ["top", "bottom"].includes(e2) }, target: { type: [String, HTMLElement], default: () => window }, autoDetectParentScroll: { type: Boolean, default: true }, stickyInScrollContainer: { type: Boolean, default: true }, zIndex: { type: Number, default: 100 }, enableIntervalUpdate: { type: Boolean, default: true }, enableIntervalTime: { type: Number, default: 2e3 } }, emits: ["change"], setup(e2, { emit: v2 }) {
-  const m = e2, w = v2, h = t(null), x = t(null), y = t(false), g = t({}), b = t([]), T = t(window), B = t(0), I = t(null), E = () => {
+  const m = e2, w = v2, h = t(null), g = t(null), x = t(false), y = t({}), b = t([]), T = t(window), B = t(0), I = t(null), E = () => {
     try {
-      if (!x.value) return;
-      const e3 = x.value.getBoundingClientRect(), t2 = T.value;
+      if (!g.value) return;
+      const e3 = g.value.getBoundingClientRect(), t2 = T.value;
       if (t2 === window) {
         const t3 = "top" === m.position ? e3.top <= m.offset : e3.bottom >= window.innerHeight - m.offset;
         B.value = 0, S(t3, e3);
@@ -17,16 +17,17 @@ const v = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
         B.value = l2 ?? 0, S(n2 || i2 || false, e3);
       }
     } catch (e3) {
+      console.error(e3);
     }
   }, S = (e3, t2) => {
     var _a;
-    e3 === y.value && ((_a = g.value) == null ? void 0 : _a.height) === `${t2.height}px` || (y.value = e3, w("change", e3), g.value = e3 ? { width: "100%", height: `${t2.height}px` } : {});
+    e3 === x.value && ((_a = y.value) == null ? void 0 : _a.height) === `${t2.height}px` || (x.value = e3, w("change", e3), y.value = e3 ? { width: "100%", height: `${t2.height}px` } : {});
   }, C = () => {
     requestAnimationFrame(E);
   };
   let L;
   const k = () => {
-    y.value = false, clearTimeout(L), L = window.setTimeout(() => {
+    x.value = false, clearTimeout(L), L = window.setTimeout(() => {
       E();
     }, 100);
   };
@@ -36,9 +37,9 @@ const v = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
         try {
           m.enableIntervalUpdate && (I.value = setInterval(C, m.enableIntervalTime));
           const e3 = (() => {
-            if (m.autoDetectParentScroll && x.value) {
+            if (m.autoDetectParentScroll && g.value) {
               const e4 = [];
-              let t2 = x.value.parentElement;
+              let t2 = g.value.parentElement;
               for (; t2 && t2 !== document.body; ) {
                 const { overflowY: o2 } = window.getComputedStyle(t2);
                 /(auto|scroll)/.test(o2) && e4.push(t2), t2 = t2.parentElement;
@@ -51,8 +52,9 @@ const v = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
             }
             return [window];
           })();
-          b.value = e3, T.value = e3[0], b.value.forEach((e4) => e4.addEventListener("scroll", C)), window.addEventListener("resize", k), E();
+          console.log("检测父级滚动节点", e3), b.value = e3, T.value = e3[0], b.value.forEach((e4) => e4.addEventListener("scroll", C)), window.addEventListener("resize", k), E();
         } catch (e3) {
+          console.error(e3);
         }
       });
     }, 100);
@@ -65,9 +67,9 @@ const v = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
   });
   const z = a(() => {
     var _a;
-    return y.value ? { position: "fixed", width: `${(_a = x.value) == null ? void 0 : _a.offsetWidth}px`, zIndex: m.zIndex, [m.position]: `${m.offset + B.value}px` } : { position: "relative" };
+    return x.value ? { position: "fixed", width: `${(_a = g.value) == null ? void 0 : _a.offsetWidth}px`, zIndex: m.zIndex, [m.position]: `${m.offset + B.value}px` } : { position: "relative" };
   });
-  return (e3, t2) => (s(), r("div", { ref_key: "affixMainRef", ref: h, class: "yx-affix" }, [y.value ? (s(), r("div", { key: 0, style: c(g.value), class: "yx-affix-placeholder" }, null, 4)) : u("", true), f("div", { ref_key: "affixRef", ref: x, style: c(z.value), class: d({ "yx-affix-content": true, "is-fixed": y.value, "is-top": "top" === m.position, "is-bottom": "bottom" === m.position }) }, [p(e3.$slots, "default", {}, void 0, true)], 6)], 512));
+  return (e3, t2) => (s(), r("div", { ref_key: "affixMainRef", ref: h, class: "yx-affix" }, [x.value ? (s(), r("div", { key: 0, style: c(y.value), class: "yx-affix-placeholder" }, null, 4)) : u("", true), f("div", { ref_key: "affixRef", ref: g, style: c(z.value), class: d({ "yx-affix-content": true, "is-fixed": x.value, "is-top": "top" === m.position, "is-bottom": "bottom" === m.position }) }, [p(e3.$slots, "default", {}, void 0, true)], 6)], 512));
 } });
 export {
   v as default

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 {