super-page-runtime 2.3.4 → 2.3.5-rc1

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

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

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

@@ -1,4 +1,4 @@
-import { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as n, openBlock as a, normalizeClass as u, normalizeStyle as l, unref as i, withDirectives as c, createVNode as p, vShow as s } from "vue";
+import { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as n, openBlock as a, normalizeClass as u, normalizeStyle as i, unref as l, withDirectives as c, createVNode as p, vShow as s } from "vue";
 import { getCustomTheme as f, initChartOption as g, monitorChartClickToVariable as h, clearChartSelected as m, exportCommonChart as d } from "../../../../utils/charts/chart-util.js";
 import { updateChartOption as v } from "../../../../utils/charts/chart-pie-util.js";
 import { doClickJumpPageEvent as x } from "../../../../utils/events/event-util.js";
@@ -11,36 +11,35 @@ import { GridComponent as _, LegendComponent as b, TitleComponent as w, TooltipC
 import E from "vue-echarts";
 const A = e({ __name: "pie-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: A2 }) {
   y([D, V, _, b, w, I, P]);
-  const H = e2, O = r(null), S = r(null), T = r(null), U = H.configure.props ? H.configure.props.enableDrill : null, z = H.configure.props ? H.configure.props.drillEndTrigger : null, F = H.configure.props ? H.configure.props.linkPage : null, q = H.configure.runtime ? H.configure.runtime : {}, B = q.style, G = q.class, J = q.dataConfig, K = q.headerInfo ? q.headerInfo : {}, L = q.chartOption, M = H.configure.props ? H.configure.props : {}, N = f(M.customTheme);
+  const H = e2, S = r(null), T = r(null), U = r(null), z = H.configure.props ? H.configure.props.enableDrill : null, F = H.configure.props ? H.configure.props.drillEndTrigger : null, O = H.configure.props ? H.configure.props.linkPage : null, q = H.configure.runtime ? H.configure.runtime : {}, B = q.style, G = q.class, J = q.dataConfig, K = q.headerInfo ? q.headerInfo : {}, L = q.chartOption, M = H.configure.props ? H.configure.props : {}, N = f(M.customTheme);
   function Q(e3) {
-    "clearDrill" == z ? T.value && T.value.closeDrill && T.value.closeDrill(0) : "clickEvent" == z && W();
+    "clearDrill" == F ? U.value && U.value.closeDrill && U.value.closeDrill(0) : "clickEvent" == F && W();
   }
   function W() {
-    F && F.jumpPageUrl && x(H.pageContext, H.configure, void 0);
+    O && O.jumpPageUrl && x(H.pageContext, H.configure, void 0);
   }
   g(H.configure, L), o(() => {
     const e3 = C(H.pageContext, H.configure);
-    e3 && $(e3), S.value && (U || F && F.jumpPageUrl) && S.value.chart.on("click", function(e4) {
-      U ? T.value && T.value.drill && T.value.drill(e4, H.configure.cacheDatas) : W();
-    }), !U && H.configure.clickSet && S.value && h(H.pageContext, H.configure, S.value.chart);
+    e3 && $(e3), T.value && (z || O && O.jumpPageUrl) && T.value.chart.on("click", function(e4) {
+      z ? U.value && U.value.drill && U.value.drill(e4, H.configure.cacheDatas) : W();
+    }), !z && H.configure.clickSet && T.value && h(H.pageContext, H.configure, T.value.chart);
   });
   let X = K.groupValue;
   function Y(e3) {
-    J ? (true !== e3 && (J.autoRefresh = true), R(H.pageContext, [J], K.drillParams)) : console.log("无数据源配置，不需要查询!");
+    J && (true !== e3 && (J.autoRefresh = true), R(H.pageContext, [J], K.drillParams));
   }
   t(K, () => {
     X != K.groupValue && (X = K.groupValue, J && (J.services[0].groupValue = K.groupValue), Y(false));
   });
   const Z = K.monitorFields;
   function $(e3) {
-    if (e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender) return e3.hasRender = true, void console.log("重复更新!", e3);
-    e3.hasRender = true, J.autoRefresh || (X = e3.groupValue, X && "checkbox" !== K.groupComponent && (X = X.join(",")), K.groupValue = X), J.autoRefresh && U || m(H.pageContext, H.configure, S.value.chart), J.autoRefresh = false, v(H.pageContext, H.configure, L, e3), console.log("chartOption--pie", L);
+    e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender ? e3.hasRender = true : (e3.hasRender = true, J.autoRefresh || (X = e3.groupValue, X && "checkbox" !== K.groupComponent && (X = X.join(",")), K.groupValue = X), J.autoRefresh && z || m(H.pageContext, H.configure, T.value.chart), J.autoRefresh = false, v(H.pageContext, H.configure, L, e3));
   }
   return j(H.pageContext, Z, () => {
     Y(true);
   }), A2({ updateChartDatas: $, exportChart: function() {
-    return d(S.value);
-  } }), (e3, r2) => (a(), n("div", { style: l(i(B)), class: u([i(G), "amb-widget-chart amb-widget-flex"]), ref_key: "thisRef", ref: O }, [c(p(k, { ref_key: "headerRef", ref: T, headerInfo: i(K), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Q }, null, 8, ["headerInfo", "configure", "pageContext"]), [[s, i(K).showHeader || e3.pageContext.showHomepageSearch]]), p(i(E), { ref_key: "chartRef", ref: S, theme: i(N), option: i(L), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+    return d(T.value);
+  } }), (e3, r2) => (a(), n("div", { style: i(l(B)), class: u([l(G), "amb-widget-chart amb-widget-flex"]), ref_key: "thisRef", ref: S }, [c(p(k, { ref_key: "headerRef", ref: U, headerInfo: l(K), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Q }, null, 8, ["headerInfo", "configure", "pageContext"]), [[s, l(K).showHeader || e3.pageContext.showHomepageSearch]]), p(l(E), { ref_key: "chartRef", ref: T, theme: l(N), option: l(L), autoresize: "" }, null, 8, ["theme", "option"])], 6));
 } });
 export {
   A as default

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

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

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

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

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

@@ -5,7 +5,7 @@ import { getCustomFunc as $ } from "../../../../utils/events/event-util.js";
 import F from "./group-column.vue.js";
 import k from "./normal-column.vue.js";
 import I from "./table-pageination.vue.js";
-import { getSummaryTitleColumn as N, getSummaryDataColumn as R, rowDataToColumn as T, getColumnToRowTableConfig as H, colDataToRow as V, computeFormula as _, getNewColumnConfig as z, summaryStatistics as A, replacePlaceholders as D, getIndexColumn as J, getHeaderCellStyleUtil as P, getRowStyleUtil as U, getCellStyleUtil as G, formatColContent as K } from "./chart-table-util.js";
+import { getSummaryTitleColumn as N, getSummaryDataColumn as R, rowDataToColumn as T, getColumnToRowTableConfig as H, colDataToRow as _, computeFormula as z, getNewColumnConfig as A, summaryStatistics as D, replacePlaceholders as J, getIndexColumn as P, getHeaderCellStyleUtil as U, getRowStyleUtil as V, getCellStyleUtil as G, formatColContent as K } from "./chart-table-util.js";
 import { deepCopy as L } 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;
@@ -19,7 +19,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       }), e3.sort((e4, o2) => e4.displayOrder - o2.displayOrder), re.value = e3, function() {
         if (B.configure.props.base.showIndex) {
           re.value.unshift({ columnUuid: "$index", displayOrder: 0, isLeaf: true, prop: "$index", titleText: "序号", uuid: "$index" });
-          const e4 = J();
+          const e4 = P();
           e4 && (te.value.$index = e4);
         }
       }();
@@ -31,8 +31,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
   ie.value = B.configure.props.base.showSummary, (ie.value || B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0) && (ae.value = N(B.configure), ie.value && (ue.value = R(B.configure, "table")), B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0 && (pe.value = R(B.configure, "group")));
   let de = 300, he = b(B.pageContext, B.configure);
   function ve(e3) {
-    if (e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender) return e3.hasRender = true, void console.log("重复更新!", e3);
-    !function(e4) {
+    e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender ? e3.hasRender = true : (!function(e4) {
       var _a2;
       Ne(e4), "service" === B.configure.props.dataOrigin.dataSource && e4.result ? me = e4.result[B.configure.props.dataOrigin.service.serviceDataField] : "variable" === B.configure.props.dataOrigin.dataSource && (me = O(B.pageContext.entity, B.configure.props.dataOrigin.variable));
       if (me) if (((_a2 = B.configure.props) == null ? void 0 : _a2.dataOrigin.limitEnable) && B.configure.props.dataOrigin.itemNumSource) {
@@ -42,12 +41,12 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
           o2 = Number(O(B.pageContext.entity, B.configure.props.dataOrigin.itemNumVariable));
           const n2 = B.configure.props.dataOrigin.itemNumVariable.match(/\${(.*?)}/), t2 = n2 ? n2[1].split(".") : [], i2 = JSON.parse(JSON.stringify(me));
           r(() => t2.reduce((e5, o3) => e5[o3], B.pageContext.entity), (o3) => {
-            console.log("统计表格监听数据变量的变化 newVal：", o3), ye(o3, i2, e4);
+            ye(o3, i2, e4);
           });
         }
         ye(o2, me, e4);
       } else Ce(me, e4);
-    }(e3), e3.hasRender = true, X && (X.autoRefresh = false);
+    }(e3), e3.hasRender = true, X && (X.autoRefresh = false));
   }
   function ye(e3, o2, n2) {
     var _a2;
@@ -79,9 +78,9 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
           const r2 = B.configure.props.dataOrigin.rowToColumn.titleColumns, t2 = B.configure.props.dataOrigin.rowToColumn.dataColumns, i2 = e4.props.dataOrigin.groupField;
           if ((!i2 || 0 === i2.length) && n2.length > 0) {
             const e5 = [];
-            return e5.push(z("$GroupColumn", B.configure.props.dataOrigin.rowToColumn.firstColumnTitle, 0, "string")), Object.keys(n2[0]).forEach((o5, n3) => {
+            return e5.push(A("$GroupColumn", B.configure.props.dataOrigin.rowToColumn.firstColumnTitle, 0, "string")), Object.keys(n2[0]).forEach((o5, n3) => {
               if ("$GroupColumn" === o5) return;
-              const r3 = z(o5, o5, n3 + 1, "string");
+              const r3 = A(o5, o5, n3 + 1, "string");
               e5.push(r3);
             }), e5;
           }
@@ -97,7 +96,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
             }), a2.forEach((o5) => {
               t2.forEach((r3) => {
                 var _a3;
-                const t3 = (_a3 = ne.value.find((e6) => e6.props.base.prop === r3)) == null ? void 0 : _a3.props.base.name, i4 = z(`${o5}${r3}`, `${o5}${t3}`, e5.length + 1, "number" == typeof n2[0][`${o5}${r3}`] ? "number" : "string");
+                const t3 = (_a3 = ne.value.find((e6) => e6.props.base.prop === r3)) == null ? void 0 : _a3.props.base.name, i4 = A(`${o5}${r3}`, `${o5}${t3}`, e5.length + 1, "number" == typeof n2[0][`${o5}${r3}`] ? "number" : "string");
                 e5.push(i4);
               });
             }), e5;
@@ -105,7 +104,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
         }(B.configure, ne.value, e3);
         ne.value = o3;
       }
-    } else be("columnToRow") && (ee.value || (ne.value = H(B.configure)), e3 = V(e3, B.configure));
+    } else be("columnToRow") && (ee.value || (ne.value = H(B.configure)), e3 = _(e3, B.configure));
     if (B.configure.props.dataOrigin.dataFormatting) {
       const o3 = $(B.pageContext, B.configure.props.dataOrigin.dataFormatting);
       if (o3) {
@@ -113,7 +112,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
         n2 && (e3 = n2);
       }
     }
-    if (Object.keys(ce.value).length > 0 && e3 && e3.length > 0 && _(ce.value, e3, B.pageContext.entity), ((_a2 = B.configure.pageination) == null ? void 0 : _a2.enable) ? function(e4) {
+    if (Object.keys(ce.value).length > 0 && e3 && e3.length > 0 && z(ce.value, e3, B.pageContext.entity), ((_a2 = B.configure.pageination) == null ? void 0 : _a2.enable) ? function(e4) {
       "frontend" === B.configure.pageination.type ? (fe.value = me.length, Fe(1, B.configure.pageination.pageSize)) : "backend" === B.configure.pageination.type && (oe.value = me, B.configure.pageination.totalFrom && (fe.value = e4.result[B.configure.pageination.totalFrom]));
     }(o2) : oe.value = e3, B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0) {
       const e4 = B.configure.props.highOrder.groupField;
@@ -129,11 +128,11 @@ 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 = A(pe.value[n3], o4, n3, B.pageContext);
+            const n3 = e7.props.base.prop, r3 = D(pe.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] = D(e7.props.base.summaryTitle, o4[0]);
+            i3[n3] = J(e7.props.base.summaryTitle, o4[0]);
           }), n2.push(i3), le.push(n2.length - 1);
         }
         return n2;
@@ -141,7 +140,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
     }
     !function(e4) {
       if (B.configure.props.base.showIndex && -1 === e4.findIndex((e5) => "$index" === e5.props.base.prop)) {
-        const o3 = J();
+        const o3 = P();
         o3 && e4.unshift(o3);
       }
     }(ne.value);
@@ -151,10 +150,10 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
   }
   function xe(e3) {
     const o2 = se.value[e3.column.property] ? se.value[e3.column.property].titleStyle : null, n2 = Q == null ? void 0 : Q.titleStyle;
-    return P(e3, { cellTitleStyle: o2, titleStyle: n2 }, B);
+    return U(e3, { cellTitleStyle: o2, titleStyle: n2 }, B);
   }
   function Oe(e3) {
-    return U(e3, le, B);
+    return V(e3, le, B);
   }
   function Se(e3) {
     const o2 = se.value[e3.column.property] ? se.value[e3.column.property].cellStyle : null;
@@ -167,7 +166,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       !function() {
         const e4 = B.configure.props.dataOrigin.variable.match(/\${(.*?)}/), o3 = e4 ? e4[1].split(".") : [];
         r(() => o3.reduce((e5, o4) => e5[o4], B.pageContext.entity), (e5) => {
-          console.log("统计表格监听数据变量的变化 newVal：", e5), e5 ? ve(JSON.parse(JSON.stringify(e5))) : (oe.value = [], console.log("重置统计表格列配置"), B.configure.props.modelCustom ? Ne(null) : ee.value ? re.value = B.configure.props.groupHeaders : ne.value = B.configure.items);
+          e5 ? ve(JSON.parse(JSON.stringify(e5))) : (oe.value = [], B.configure.props.modelCustom ? Ne(null) : ee.value ? re.value = B.configure.props.groupHeaders : ne.value = B.configure.items);
         });
       }();
       const o2 = O(B.pageContext.entity, B.configure.props.dataOrigin.variable);
@@ -179,10 +178,11 @@ 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", {}, [D(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] = A(ue.value[e4.property], t2, e4.property, B.pageContext);
+        r2[o3] = D(ue.value[e4.property], t2, e4.property, B.pageContext);
       }
     }), r2;
   };

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,34 +1,34 @@
-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 { 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";
-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, 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;
+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 N() {
-    f("close");
+  function O(e3) {
+    v("export", f.configure, e3);
+  }
+  function _() {
+    v("close");
   }
   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) => {
+    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 = 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));
+        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 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"]);
+    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 {

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

@@ -54,7 +54,7 @@ const p = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
             }
             return [window];
           })();
-          console.log("检测父级滚动节点", e3), b.value = e3, T.value = e3[0], b.value.forEach((e4) => e4.addEventListener("scroll", z)), window.addEventListener("resize", L), S();
+          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);
         }