super-page-runtime 2.3.12-rc1 → 2.3.12-rc2

package/dist/es/components/runtime/utils/events/validator-util.d.ts

@@ -18,7 +18,8 @@ export declare function disabledAllFields(pageContext: PageContext): void;
 export declare function dynamicControlTableEdit(pageContext: PageContext, customRules: any[], tableCode?: any): void;
 export declare function updateComponentDisplayState(ref: any, item: any): void;
 /**
- * 布尔型和日期校验需要自定义，为了兼容oracle和mysql数据库
+ * 布尔型和日期校验需要自定义，为了兼容oracle和mysql数据库,
+ * 数字类型的校验，防止select、radio、checkbox传字符串类型的数字
  * @param fieldRule
  */
 export declare function packageCustomValidator(fieldRule: any): void;

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -257,16 +257,19 @@ function O(e2, t2) {
   }
 }
 function j(e2) {
-  e2 && e2.type && "boolean" === e2.type ? e2.validator = function(e3, t2, s2) {
-    return null == t2 ? !e3.required : "number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2);
-  } : e2 && e2.type && "date" === e2.type && (e2.validator = function(e3, t2, s2) {
-    if (null == t2) return !e3.required;
-    {
-      const e4 = new Date(t2);
-      return !isNaN(e4.getTime());
-    }
-  });
+  if (!(e2 == null ? void 0 : e2.type)) return;
+  const t2 = C[e2.type];
+  t2 && (e2.validator = t2.validator);
 }
+const C = { boolean: { validator: function(e2, t2, s2) {
+  return true === M(e2, t2) && ("number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2));
+} }, date: { validator: function(e2, t2, s2) {
+  if (true !== M(e2, t2)) return false;
+  const n2 = new Date(t2);
+  return !isNaN(n2.getTime());
+} }, number: { validator: function(e2, t2, s2) {
+  return true === M(e2, t2) && (("string" != typeof t2 || "" !== t2.trim()) && ("number" == typeof t2 || !isNaN(Number(t2))));
+} } }, M = (e2, t2) => null != t2 && "" !== t2 || !e2.required;
 export {
   P as disabledAllFields,
   k as dynamicControlTableEdit,

package/dist/es/components/runtime/views/assemblys/chart/column-line/column-line-runtime.vue.js

@@ -1,7 +1,7 @@
 import e from "./column-line-runtime.vue2.js";
 /* empty css                         */
 import o from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const r = o(e, [["__scopeId", "data-v-5b4e8687"]]);
+const r = o(e, [["__scopeId", "data-v-e1cf60d6"]]);
 export {
   r as default
 };

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

@@ -1,16 +1,16 @@
 import { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as n, openBlock as a, normalizeClass as i, normalizeStyle as u, unref as s, withDirectives as l, createVNode as c, vShow as p } from "vue";
 import { getCustomTheme as f, initChartOption as g, monitorChartClickToVariable as m, clearChartSelected as h, exportCommonChart as d } from "../../../../utils/charts/chart-util.js";
-import { getChartDatasFromPage as x, updateChartDatasources as v, monitorFieldChange as C } from "../../../../utils/page-helper-util.js";
+import { getChartDatasFromPage as v, updateChartDatasources as x, monitorFieldChange as C } from "../../../../utils/page-helper-util.js";
 import { updateChartOption as I } from "../../../../utils/charts/chart-columnline-util.js";
 import { doClickJumpPageEvent as k } from "../../../../utils/events/event-util.js";
 import y from "../common/common-chart-header.vue.js";
 import { use as R } from "echarts/core";
 import { CanvasRenderer as j } from "echarts/renderers";
 import { LineChart as b, BarChart as D } from "echarts/charts";
-import { GridComponent as V, LegendComponent as P, TitleComponent as _, TooltipComponent as w, ToolboxComponent as T, DataZoomComponent as E } from "echarts/components";
-import O from "vue-echarts";
+import { GridComponent as V, LegendComponent as P, TitleComponent as _, TooltipComponent as w, ToolboxComponent as O, DataZoomComponent as T } from "echarts/components";
+import E from "vue-echarts";
 const A = e({ __name: "column-line-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: A2 }) {
-  R([j, b, V, P, _, w, D, T, E]);
+  R([j, b, V, P, _, w, D, O, T]);
   const H = e2, N = r(null), S = r(), U = r(null), z = H.configure.props ? H.configure.props.enableDrill : null, F = H.configure.props ? H.configure.props.drillEndTrigger : null, q = H.configure.props ? H.configure.props.linkPage : null, B = {};
   if (H.configure.items) for (const e3 of H.configure.items) e3.props && e3.props.linkPage && e3.props.linkPage.jumpPageUrl ? B[e3.uuid] = e3 : q && q.jumpPageUrl && (B[e3.uuid] = H.configure);
   const G = H.configure.runtime ? H.configure.runtime : {}, J = G.style, K = G.class, L = G.dataConfig, M = G.headerInfo ? G.headerInfo : {}, Q = G.chartOption, W = H.configure.props ? H.configure.props : {}, X = f(W.customTheme);
@@ -25,14 +25,14 @@ const A = e({ __name: "column-line-runtime", props: { pageContext: {}, configure
     k(H.pageContext, o2, t2);
   }
   g(H.configure, Q), o(() => {
-    const e3 = x(H.pageContext, H.configure);
+    const e3 = v(H.pageContext, H.configure);
     e3 && oe(e3), S.value && (z || Object.keys(B).length > 0) && S.value.chart.on("click", function(e4) {
       z ? U.value && U.value.drill && U.value.drill(e4, H.configure.cacheDatas) : Z(e4);
     }), !z && H.configure.clickSet && S.value && m(H.pageContext, H.configure, S.value.chart);
   });
   let $ = M.groupValue;
   function ee(e3) {
-    L && (true !== e3 && (L.autoRefresh = true), v(H.pageContext, [L], M.drillParams));
+    L && (true !== e3 && (L.autoRefresh = true), x(H.pageContext, [L], M.drillParams));
   }
   t(M, () => {
     $ != M.groupValue && ($ = M.groupValue, L && (L.services[0].groupValue = M.groupValue), ee(false));
@@ -40,13 +40,13 @@ const A = e({ __name: "column-line-runtime", props: { pageContext: {}, configure
   const re = M.monitorFields;
   function oe(e3) {
     var _a;
-    e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender ? e3.hasRender = true : (e3.hasRender = true, L.autoRefresh || ($ = e3.groupValue, $ && "checkbox" !== M.groupComponent && ($ = $.join(",")), M.groupValue = $), L.autoRefresh && z || h(H.pageContext, H.configure, (_a = S.value) == null ? void 0 : _a.chart), L.autoRefresh = false, I(H.pageContext, H.configure, Q, e3));
+    e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender ? e3.hasRender = true : (e3.hasRender = true, L.autoRefresh || ($ = e3.groupValue, $ && "checkbox" !== M.groupComponent && ($ = $.join(",")), M.groupValue = $), L.autoRefresh && z || h(H.pageContext, H.configure, (_a = S.value) == null ? void 0 : _a.chart), L.autoRefresh = false, I(H.pageContext, H.configure, Q, e3), S.value && S.value.setOption(Q, true));
   }
   return C(H.pageContext, re, () => {
     ee(true);
   }), A2({ updateChartDatas: oe, exportChart: function() {
     return d(S.value);
-  }, chartOption: Q }), (e3, r2) => (a(), n("div", { style: u(s(J)), class: i([s(K), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: N }, [l(c(y, { ref_key: "headerRef", ref: U, headerInfo: s(M), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Y, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[p, s(M).showHeader || e3.pageContext.showHomepageSearch]]), c(s(O), { ref_key: "chartRef", ref: S, class: "amb-chart-content", theme: s(X), option: s(Q), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+  }, chartOption: Q }), (e3, r2) => (a(), n("div", { style: u(s(J)), class: i([s(K), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: N }, [l(c(y, { ref_key: "headerRef", ref: U, headerInfo: s(M), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Y, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[p, s(M).showHeader || e3.pageContext.showHomepageSearch]]), c(s(E), { ref_key: "chartRef", ref: S, class: "amb-chart-content", theme: s(X), option: s(Q), autoresize: "" }, null, 8, ["theme", "option"])], 6));
 } });
 export {
   A as default

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

@@ -1,7 +1,7 @@
 import e from "./gauge-runtime.vue2.js";
 /* empty css                   */
 import r from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const t = r(e, [["__scopeId", "data-v-8d392d9f"]]);
+const t = r(e, [["__scopeId", "data-v-807f72b1"]]);
 export {
   t as default
 };

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

@@ -1,16 +1,16 @@
-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 c, withDirectives as i, createVNode as p, vShow as m } from "vue";
+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 m } from "vue";
 import { getCustomTheme as f, 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-gauge-util.js";
-import y from "../common/common-chart-header.vue.js";
-import { use as v } from "echarts/core";
+import v from "../common/common-chart-header.vue.js";
+import { use as y } from "echarts/core";
 import { CanvasRenderer as R } from "echarts/renderers";
 import { GaugeChart as b } from "echarts/charts";
 import { GridComponent as V, TitleComponent as _, TooltipComponent as j, ToolboxComponent as w } from "echarts/components";
 import I from "vue-echarts";
 const k = e({ __name: "gauge-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: k2 }) {
-  v([R, b, V, _, j, w]);
-  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 = f(B.customTheme);
+  y([R, b, V, _, j, w]);
+  const A = e2, H = r(null), O = r(), z = r(null), D = A.configure.runtime ? A.configure.runtime : {}, F = D.style, P = D.class, S = D.dataConfig, T = D.headerInfo ? D.headerInfo : {}, q = D.chartOption, B = A.configure.props ? A.configure.props : {}, E = f(B.customTheme);
   h(A.configure, q), t(() => {
     const e3 = g(A.pageContext, A.configure);
     e3 && L(e3);
@@ -24,11 +24,11 @@ const k = e({ __name: "gauge-runtime", props: { pageContext: {}, configure: {} }
   });
   const K = T.monitorFields;
   function L(e3) {
-    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));
+    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), O.value && O.value.setOption(q, true));
   }
   return x(A.pageContext, K, J), k2({ updateChartDatas: L, exportChart: function() {
-    return l(z.value);
-  } }), (e3, r2) => (n(), a("div", { style: u(c(O)), class: s([c(P), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: H }, [i(p(y, { ref_key: "headerRef", ref: D, headerInfo: c(T), configure: e3.configure, pageContext: e3.pageContext, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[m, c(T).showHeader || e3.pageContext.showHomepageSearch]]), p(c(I), { ref_key: "chartRef", ref: z, class: "amb-chart-content", theme: c(E), option: c(q), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+    return l(O.value);
+  } }), (e3, r2) => (n(), a("div", { style: u(i(F)), class: s([i(P), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: H }, [c(p(v, { ref_key: "headerRef", ref: z, headerInfo: i(T), configure: e3.configure, pageContext: e3.pageContext, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[m, i(T).showHeader || e3.pageContext.showHomepageSearch]]), p(i(I), { ref_key: "chartRef", ref: O, class: "amb-chart-content", theme: i(E), option: i(q), autoresize: "" }, null, 8, ["theme", "option"])], 6));
 } });
 export {
   k as default

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

@@ -1,7 +1,7 @@
 import e from "./pie-runtime.vue2.js";
 /* empty css                 */
 import r from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const t = r(e, [["__scopeId", "data-v-961b3d1c"]]);
+const t = r(e, [["__scopeId", "data-v-17d626a7"]]);
 export {
   t 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 a, openBlock as n, normalizeClass as u, normalizeStyle as l, unref as i, withDirectives as c, createVNode as s, vShow as p } from "vue";
+import { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as a, openBlock as n, normalizeClass as u, normalizeStyle as i, unref as l, withDirectives as c, createVNode as s, vShow as p } 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,18 +11,18 @@ import { GridComponent as V, LegendComponent as _, TitleComponent as w, TooltipC
 import E from "vue-echarts";
 const A = e({ __name: "pie-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: A2 }) {
   b([y, D, V, _, w, I, P]);
-  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);
+  const H = e2, O = r(null), S = r(), 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);
   function Q(e3) {
-    "clearDrill" == F ? U.value && U.value.closeDrill && U.value.closeDrill(0) : "clickEvent" == F && W();
+    "clearDrill" == z ? T.value && T.value.closeDrill && T.value.closeDrill(0) : "clickEvent" == z && W();
   }
   function W() {
-    O && O.jumpPageUrl && x(H.pageContext, H.configure, void 0);
+    F && F.jumpPageUrl && x(H.pageContext, H.configure, void 0);
   }
   g(H.configure, L), o(() => {
     const e3 = C(H.pageContext, H.configure);
-    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);
+    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);
   });
   let X = K.groupValue;
   function Y(e3) {
@@ -33,13 +33,13 @@ const A = e({ __name: "pie-runtime", props: { pageContext: {}, configure: {} },
   });
   const Z = K.monitorFields;
   function $(e3) {
-    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));
+    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 && U || m(H.pageContext, H.configure, S.value.chart), J.autoRefresh = false, v(H.pageContext, H.configure, L, e3), S.value && S.value.setOption(L, true));
   }
   return j(H.pageContext, Z, () => {
     Y(true);
   }), A2({ updateChartDatas: $, exportChart: function() {
-    return d(T.value);
-  } }), (e3, r2) => (n(), a("div", { style: l(i(B)), class: u([i(G), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: S }, [c(s(k, { ref_key: "headerRef", ref: U, headerInfo: i(K), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Q, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[p, i(K).showHeader || e3.pageContext.showHomepageSearch]]), s(i(E), { ref_key: "chartRef", ref: T, class: "amb-chart-content", theme: i(N), option: i(L), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+    return d(S.value);
+  } }), (e3, r2) => (n(), a("div", { style: i(l(B)), class: u([l(G), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: O }, [c(s(k, { ref_key: "headerRef", ref: T, headerInfo: l(K), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Q, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[p, l(K).showHeader || e3.pageContext.showHomepageSearch]]), s(l(E), { ref_key: "chartRef", ref: S, class: "amb-chart-content", 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.vue.js

@@ -1,7 +1,7 @@
 import r from "./radar-runtime.vue2.js";
 /* empty css                   */
 import e from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const t = e(r, [["__scopeId", "data-v-f50eeed9"]]);
+const t = e(r, [["__scopeId", "data-v-a4e2d500"]]);
 export {
   t as default
 };

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

@@ -1,16 +1,16 @@
-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 c, withDirectives as i, createVNode as p, vShow as m } from "vue";
+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 m } from "vue";
 import { getCustomTheme as f, 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 y from "../common/common-chart-header.vue.js";
-import { use as v } from "echarts/core";
+import v from "../common/common-chart-header.vue.js";
+import { use as y } from "echarts/core";
 import { CanvasRenderer as R } from "echarts/renderers";
 import { RadarChart as b } from "echarts/charts";
 import { GridComponent as V, TitleComponent as _, TooltipComponent as j, ToolboxComponent as w, LegendComponent as I } from "echarts/components";
 import k from "vue-echarts";
 const A = e({ __name: "radar-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: A2 }) {
-  v([R, b, V, _, j, w, I]);
-  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 = f(E.customTheme);
+  y([R, b, V, _, j, w, I]);
+  const H = e2, O = r(null), z = r(), D = r(null), F = H.configure.runtime ? H.configure.runtime : {}, P = F.style, S = F.class, T = F.dataConfig, q = F.headerInfo ? F.headerInfo : {}, B = F.chartOption, E = H.configure.props ? H.configure.props : {}, G = f(E.customTheme);
   h(H.configure, B), t(() => {
     const e3 = g(H.pageContext, H.configure);
     e3 && M(e3);
@@ -24,11 +24,11 @@ const A = e({ __name: "radar-runtime", props: { pageContext: {}, configure: {} }
   });
   const L = q.monitorFields;
   function M(e3) {
-    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));
+    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), z.value && z.value.setOption(B, true));
   }
   return x(H.pageContext, L, K), A2({ updateChartDatas: M, exportChart: function() {
-    return l(D.value);
-  } }), (e3, r2) => (n(), a("div", { style: u(c(P)), class: s([c(S), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: z }, [i(p(y, { ref_key: "headerRef", ref: F, headerInfo: c(q), configure: e3.configure, pageContext: e3.pageContext, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[m, c(q).showHeader || e3.pageContext.showHomepageSearch]]), p(c(k), { ref_key: "chartRef", ref: D, class: "amb-chart-content", theme: c(G), option: c(B), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+    return l(z.value);
+  } }), (e3, r2) => (n(), a("div", { style: u(i(P)), class: s([i(S), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: O }, [c(p(v, { ref_key: "headerRef", ref: D, headerInfo: i(q), configure: e3.configure, pageContext: e3.pageContext, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[m, i(q).showHeader || e3.pageContext.showHomepageSearch]]), p(i(k), { ref_key: "chartRef", ref: z, class: "amb-chart-content", theme: i(G), option: i(B), autoresize: "" }, null, 8, ["theme", "option"])], 6));
 } });
 export {
   A as default

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

@@ -1,7 +1,7 @@
 import t from "./scatter-runtime.vue2.js";
 /* empty css                     */
 import e from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const r = e(t, [["__scopeId", "data-v-e08919a0"]]);
+const r = e(t, [["__scopeId", "data-v-a924cb6f"]]);
 export {
   r as default
 };

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

@@ -2,33 +2,33 @@ import { defineComponent as e, ref as r, onMounted as t, watch as o, createEleme
 import { getCustomTheme as f, 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 y from "../common/common-chart-header.vue.js";
-import { use as v } from "echarts/core";
+import v from "../common/common-chart-header.vue.js";
+import { use as y } from "echarts/core";
 import { CanvasRenderer as R } from "echarts/renderers";
 import { ScatterChart as b } from "echarts/charts";
 import { GridComponent as V, LegendComponent as _, TitleComponent as j, TooltipComponent as w, ToolboxComponent as I, DataZoomComponent as k } from "echarts/components";
 import A from "vue-echarts";
 const H = e({ __name: "scatter-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: H2 }) {
-  v([R, b, V, _, j, w, I, k]);
-  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 = f(G.customTheme);
-  h(z.configure, E), t(() => {
-    const e3 = g(z.pageContext, z.configure);
+  y([R, b, V, _, j, w, I, k]);
+  const O = e2, z = r(null), D = r(), F = r(null), P = O.configure.runtime ? O.configure.runtime : {}, S = P.style, T = P.class, q = P.dataConfig, B = P.headerInfo ? P.headerInfo : {}, E = P.chartOption, G = O.configure.props ? O.configure.props : {}, J = f(G.customTheme);
+  h(O.configure, E), t(() => {
+    const e3 = g(O.pageContext, O.configure);
     e3 && N(e3);
   });
   let K = B.groupValue;
   function L() {
-    q && d(z.pageContext, [q], B.drillParams);
+    q && d(O.pageContext, [q], B.drillParams);
   }
   o(B, () => {
     K != B.groupValue && (K = B.groupValue, q && (q.services[0].groupValue = B.groupValue), L());
   });
   const M = B.monitorFields;
   function N(e3) {
-    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));
+    e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender ? e3.hasRender = true : (e3.hasRender = true, C(O.pageContext, O.configure, E, e3), D.value && D.value.setOption(E, true));
   }
-  return x(z.pageContext, M, L), H2({ updateChartDatas: N, exportChart: function() {
-    return l(F.value);
-  } }), (e3, r2) => (n(), a("div", { style: c(u(S)), class: s([u(T), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: D }, [i(p(y, { ref_key: "headerRef", ref: O, headerInfo: u(B), configure: e3.configure, pageContext: e3.pageContext, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[m, u(B).showHeader || e3.pageContext.showHomepageSearch]]), p(u(A), { ref_key: "chartRef", ref: F, class: "amb-chart-content", theme: u(J), option: u(E), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+  return x(O.pageContext, M, L), H2({ updateChartDatas: N, exportChart: function() {
+    return l(D.value);
+  } }), (e3, r2) => (n(), a("div", { style: c(u(S)), class: s([u(T), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: z }, [i(p(v, { ref_key: "headerRef", ref: F, headerInfo: u(B), configure: e3.configure, pageContext: e3.pageContext, class: "amb-chart-header" }, null, 8, ["headerInfo", "configure", "pageContext"]), [[m, u(B).showHeader || e3.pageContext.showHomepageSearch]]), p(u(A), { ref_key: "chartRef", ref: D, class: "amb-chart-content", theme: u(J), option: u(E), autoresize: "" }, null, 8, ["theme", "option"])], 6));
 } });
 export {
   H as default

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

@@ -117,4 +117,5 @@ export declare function getNewColumnConfig(prop: string, name: string, displayOr
 };
 export declare function computeFormula(itemConfs: any, datas: any, entity: any): void;
 export declare function formatColContent(row: any, format: any, column: any, pageContext: any, configure: any): any;
+export declare function mergeRowByProperty(row: any, column: any, rowIndex: number, property: string, data: any): number[];
 export {};

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

@@ -385,6 +385,20 @@ function formatCustomFunc(e, t, r, o, n) {
     return "";
   }
 }
+function mergeRowByProperty(e, t, r, o, n) {
+  const a = e[o];
+  let s = 1, l = true;
+  for (let e2 = r - 1; e2 >= 0; e2--) {
+    if (n[e2][o] === a) {
+      l = false;
+      break;
+    }
+    break;
+  }
+  if (!l) return [0, 0];
+  for (let e2 = r + 1; e2 < n.length && n[e2][o] === a; e2++) s++;
+  return [s, 1];
+}
 export {
   ExpressionEvaluator,
   colDataToRow,
@@ -398,6 +412,7 @@ export {
   getRowStyleUtil,
   getSummaryDataColumn,
   getSummaryTitleColumn,
+  mergeRowByProperty,
   replacePlaceholders,
   rowDataToColumn,
   summaryStatistics