super-page-runtime 2.3.37-sit5 → 2.3.38-cdn1

package/dist/es/components/runtime/index.d.ts

@@ -1,5 +1,6 @@
 import { default as SuperPageNew } from './views/super-page.vue';
 import { default as SuperPageDialogNew } from './views/super-page-dialog.vue';
 import { default as HomeChart } from './views/home-chart.vue';
+import { default as HomeChartConditionRender } from './views/assemblys/chart/common/home-chart-condition-render.vue';
 
-export { SuperPageNew, SuperPageDialogNew, HomeChart };
+export { SuperPageNew, SuperPageDialogNew, HomeChart, HomeChartConditionRender };

package/dist/es/components/runtime/utils/assemblys-config.js

@@ -1,6 +1,6 @@
 import { defineAsyncComponent as e } from "vue";
 import { usePageContextStore as t } from "./page-store.js";
-const m = [{ name: "container", label: "容器", icon: "assets/images/group-container.png", items: [{ name: "form", label: "表单", runtimeComponent: e(() => import("../views/assemblys/container/form/form-runtime.vue.js")) }, { name: "card", label: "卡片", runtimeComponent: e(() => import("../views/assemblys/container/card/card-runtime.vue.js")) }, { name: "collapse", label: "折叠面板", runtimeComponent: e(() => import("../views/assemblys/container/collapse/collapse-runtime.vue.js")) }, { name: "layout", label: "Flex", runtimeComponent: e(() => import("../views/assemblys/container/flex/flex-runtime.vue.js")) }, { name: "tabs", label: "Tabs", runtimeComponent: e(() => import("../views/assemblys/container/tabs/tabs-runtime.vue.js")) }, { name: "tools", label: "工具栏", runtimeComponent: e(() => import("../views/assemblys/container/tools/tools-runtime.vue.js")) }, { name: "iframe", label: "Iframe", runtimeComponent: e(() => import("../views/assemblys/container/iframe/iframe-runtime.vue.js")) }, { name: "container", label: "布局", runtimeComponent: e(() => import("../views/assemblys/container/container/container-runtime.vue.js")) }] }, { name: "form", label: "表单", items: [{ name: "input-text", label: "文本框", runtimeComponent: e(() => import("../views/assemblys/form/input-text/inputtext-runtime.vue.js")) }, { name: "select", label: "下拉框", runtimeComponent: e(() => import("../views/assemblys/form/select/select-runtime.vue.js")) }, { name: "radio", label: "单选框", runtimeComponent: e(() => import("../views/assemblys/form/radio/radio-runtime.vue.js")) }, { name: "checkbox", label: "复选框", runtimeComponent: e(() => import("../views/assemblys/form/checkbox/checkbox-runtime.vue.js")) }, { name: "textarea", label: "文本域", runtimeComponent: e(() => import("../views/assemblys/form/textarea/textarea-runtime.vue.js")) }, { name: "datePicker", label: "日期/时间", runtimeComponent: e(() => import("../views/assemblys/form/date-picker/datepicker-runtime.vue.js")) }, { name: "switch", label: "开关", runtimeComponent: e(() => import("../views/assemblys/form/switch/switch-runtime.vue.js")) }, { name: "inputNumber", label: "计数器", runtimeComponent: e(() => import("../views/assemblys/form/input-number/input-number-runtime.vue.js")) }, { name: "tag", label: "标签", runtimeComponent: e(() => import("../views/assemblys/form/tag/tag-runtime.vue.js")) }, { name: "richText", label: "富文本", runtimeComponent: e(() => import("../views/assemblys/form/rich-text/richtext-runtime.vue.js")) }, { name: "divider", label: "分割线", runtimeComponent: e(() => import("../views/assemblys/form/divider/divider-runtime.vue.js")) }, { name: "separatelabel", label: "分割标签", runtimeComponent: e(() => import("../views/assemblys/form/separatelabel/separatelabel-runtime.vue.js")) }, { name: "placeholder", label: "占位符", runtimeComponent: e(() => import("../views/assemblys/form/placeholder/placeholder-runtime.vue.js")) }, { name: "link", label: "链接", runtimeComponent: e(() => import("../views/assemblys/form/link/link-runtime.vue.js")) }, { name: "label", label: "Label组件", runtimeComponent: e(() => import("../views/assemblys/form/label/label-runtime.vue.js")) }, { name: "dept-tree", label: "组织树", runtimeComponent: e(() => import("../views/assemblys/form/dept-tree/depttree-runtime.vue.js")) }, { name: "file-upload", label: "文件上传", runtimeComponent: e(() => import("../views/assemblys/form/file-upload/fileupload-runtime.vue.js")) }] }, { name: "button", label: "按钮", items: [{ name: "button-detail", label: "按钮", runtimeComponent: e(() => import("../views/assemblys/button/button/button-runtime.vue.js")) }, { name: "button-group", label: "按钮组", runtimeComponent: e(() => import("../views/assemblys/button/button-group/buttongroup-runtime.vue.js")) }, { name: "dropdown", label: "下拉菜单", runtimeComponent: e(() => import("../views/assemblys/button/dropdown/dropdown-runtime.vue.js")) }, { name: "print-label", label: "打印标签", runtimeComponent: e(() => import("../views/assemblys/button/print-label/printlabel-runtime.vue.js")) }, { name: "export-pdf", label: "打印标签", runtimeComponent: e(() => import("../views/assemblys/button/export-pdf/exportpdf-runtime.vue.js")) }] }, { name: "workflow", label: "工作流", items: [{ name: "workflow-button", label: "工作流按钮", runtimeComponent: e(() => import("../views/assemblys/workflow/workflow-button/workflowbutton-runtime.vue.js")) }, { name: "picture-flow", label: "图形历史", runtimeComponent: e(() => import("../views/assemblys/workflow/picture-flow/pictureflow-runtime.vue.js")) }, { name: "text-flow", label: "文本历史", runtimeComponent: e(() => import("../views/assemblys/workflow/text-history/textflow-runtime.vue.js")) }, { name: "workflow-node", label: "流程环节", runtimeComponent: e(() => import("../views/assemblys/workflow/workflow-node/workflownode-runtime.vue.js")) }, { name: "extract-workflow", label: "抽单", runtimeComponent: e(() => import("../views/assemblys/workflow/extract-workflow/extract-workflow-runtime.vue.js")) }, { name: "extract-workflow-dialog", label: "抽单Dialog", runtimeComponent: e(() => import("../views/assemblys/workflow/extract-workflow/extract-workflow-runtime-dialog.vue.js")) }] }, { name: "chart", label: "统计图", items: [{ name: "chart-column-line", label: "柱/折图", runtimeComponent: e(() => import("../views/assemblys/chart/column-line/column-line-runtime.vue.js")) }, { name: "chart-pie", label: "饼图", runtimeComponent: e(() => import("../views/assemblys/chart/pie/pie-runtime.vue.js")) }, { name: "chart-gauge", label: "仪表盘", runtimeComponent: e(() => import("../views/assemblys/chart/gauge/gauge-runtime.vue.js")) }, { name: "chart-radar", label: "雷达图", runtimeComponent: e(() => import("../views/assemblys/chart/radar/radar-runtime.vue.js")) }, { name: "chart-scatter", label: "散点图", runtimeComponent: e(() => import("../views/assemblys/chart/scatter/scatter-runtime.vue.js")) }, { name: "statistical-table", label: "统计表格", runtimeComponent: e(() => import("../views/assemblys/chart/table/table-runtime.vue.js")) }] }, { name: "data", label: "数据", items: [{ name: "table", label: "表格", runtimeComponent: e(() => import("../views/assemblys/data/table/table-runtime.vue.js")) }, { name: "tree", label: "树控件", runtimeComponent: e(() => import("../views/assemblys/data/tree/tree-runtime.vue.js")) }, { name: "bar-code", label: "条码", runtimeComponent: e(() => import("../views/assemblys/data/bar-code/barcode-runtime.vue.js")) }] }, { name: "other", label: "其他", items: [{ name: "custom", label: "自定义", runtimeComponent: e(() => import("../views/assemblys/form/custom/custom-runtime.vue.js")) }] }];
+const m = [{ name: "container", label: "容器", icon: "assets/images/group-container.png", items: [{ name: "form", label: "表单", runtimeComponent: e(() => import("../views/assemblys/container/form/form-runtime.vue.js")) }, { name: "card", label: "卡片", runtimeComponent: e(() => import("../views/assemblys/container/card/card-runtime.vue.js")) }, { name: "collapse", label: "折叠面板", runtimeComponent: e(() => import("../views/assemblys/container/collapse/collapse-runtime.vue.js")) }, { name: "layout", label: "Flex", runtimeComponent: e(() => import("../views/assemblys/container/flex/flex-runtime.vue.js")) }, { name: "tabs", label: "Tabs", runtimeComponent: e(() => import("../views/assemblys/container/tabs/tabs-runtime.vue.js")) }, { name: "tools", label: "工具栏", runtimeComponent: e(() => import("../views/assemblys/container/tools/tools-runtime.vue.js")) }, { name: "iframe", label: "Iframe", runtimeComponent: e(() => import("../views/assemblys/container/iframe/iframe-runtime.vue.js")) }, { name: "container", label: "布局", runtimeComponent: e(() => import("../views/assemblys/container/container/container-runtime.vue.js")) }] }, { name: "form", label: "表单", items: [{ name: "input-text", label: "文本框", runtimeComponent: e(() => import("../views/assemblys/form/input-text/inputtext-runtime.vue.js")) }, { name: "select", label: "下拉框", runtimeComponent: e(() => import("../views/assemblys/form/select/select-runtime.vue.js")) }, { name: "radio", label: "单选框", runtimeComponent: e(() => import("../views/assemblys/form/radio/radio-runtime.vue.js")) }, { name: "checkbox", label: "复选框", runtimeComponent: e(() => import("../views/assemblys/form/checkbox/checkbox-runtime.vue.js")) }, { name: "textarea", label: "文本域", runtimeComponent: e(() => import("../views/assemblys/form/textarea/textarea-runtime.vue.js")) }, { name: "datePicker", label: "日期/时间", runtimeComponent: e(() => import("../views/assemblys/form/date-picker/datepicker-runtime.vue.js")) }, { name: "switch", label: "开关", runtimeComponent: e(() => import("../views/assemblys/form/switch/switch-runtime.vue.js")) }, { name: "inputNumber", label: "计数器", runtimeComponent: e(() => import("../views/assemblys/form/input-number/input-number-runtime.vue.js")) }, { name: "tag", label: "标签", runtimeComponent: e(() => import("../views/assemblys/form/tag/tag-runtime.vue.js")) }, { name: "richText", label: "富文本", runtimeComponent: e(() => import("../views/assemblys/form/rich-text/richtext-runtime.vue.js")) }, { name: "divider", label: "分割线", runtimeComponent: e(() => import("../views/assemblys/form/divider/divider-runtime.vue.js")) }, { name: "separatelabel", label: "分割标签", runtimeComponent: e(() => import("../views/assemblys/form/separatelabel/separatelabel-runtime.vue.js")) }, { name: "placeholder", label: "占位符", runtimeComponent: e(() => import("../views/assemblys/form/placeholder/placeholder-runtime.vue.js")) }, { name: "link", label: "链接", runtimeComponent: e(() => import("../views/assemblys/form/link/link-runtime.vue.js")) }, { name: "label", label: "Label组件", runtimeComponent: e(() => import("../views/assemblys/form/label/label-runtime.vue.js")) }, { name: "dept-tree", label: "组织树", runtimeComponent: e(() => import("../views/assemblys/form/dept-tree/depttree-runtime.vue.js")) }, { name: "file-upload", label: "文件上传", runtimeComponent: e(() => import("../views/assemblys/form/file-upload/fileupload-runtime.vue.js")) }, { name: "image-upload", label: "图片上传", runtimeComponent: e(() => import("../views/assemblys/form/image-upload/imageupload-runtime.vue.js")) }] }, { name: "button", label: "按钮", items: [{ name: "button-detail", label: "按钮", runtimeComponent: e(() => import("../views/assemblys/button/button/button-runtime.vue.js")) }, { name: "button-group", label: "按钮组", runtimeComponent: e(() => import("../views/assemblys/button/button-group/buttongroup-runtime.vue.js")) }, { name: "dropdown", label: "下拉菜单", runtimeComponent: e(() => import("../views/assemblys/button/dropdown/dropdown-runtime.vue.js")) }, { name: "print-label", label: "打印标签", runtimeComponent: e(() => import("../views/assemblys/button/print-label/printlabel-runtime.vue.js")) }, { name: "export-pdf", label: "打印标签", runtimeComponent: e(() => import("../views/assemblys/button/export-pdf/exportpdf-runtime.vue.js")) }] }, { name: "workflow", label: "工作流", items: [{ name: "workflow-button", label: "工作流按钮", runtimeComponent: e(() => import("../views/assemblys/workflow/workflow-button/workflowbutton-runtime.vue.js")) }, { name: "picture-flow", label: "图形历史", runtimeComponent: e(() => import("../views/assemblys/workflow/picture-flow/pictureflow-runtime.vue.js")) }, { name: "text-flow", label: "文本历史", runtimeComponent: e(() => import("../views/assemblys/workflow/text-history/textflow-runtime.vue.js")) }, { name: "workflow-node", label: "流程环节", runtimeComponent: e(() => import("../views/assemblys/workflow/workflow-node/workflownode-runtime.vue.js")) }, { name: "extract-workflow", label: "抽单", runtimeComponent: e(() => import("../views/assemblys/workflow/extract-workflow/extract-workflow-runtime.vue.js")) }, { name: "extract-workflow-dialog", label: "抽单Dialog", runtimeComponent: e(() => import("../views/assemblys/workflow/extract-workflow/extract-workflow-runtime-dialog.vue.js")) }] }, { name: "chart", label: "统计图", items: [{ name: "chart-column-line", label: "柱/折图", runtimeComponent: e(() => import("../views/assemblys/chart/column-line/column-line-runtime.vue.js")) }, { name: "chart-pie", label: "饼图", runtimeComponent: e(() => import("../views/assemblys/chart/pie/pie-runtime.vue.js")) }, { name: "chart-gauge", label: "仪表盘", runtimeComponent: e(() => import("../views/assemblys/chart/gauge/gauge-runtime.vue.js")) }, { name: "chart-radar", label: "雷达图", runtimeComponent: e(() => import("../views/assemblys/chart/radar/radar-runtime.vue.js")) }, { name: "chart-scatter", label: "散点图", runtimeComponent: e(() => import("../views/assemblys/chart/scatter/scatter-runtime.vue.js")) }, { name: "statistical-table", label: "统计表格", runtimeComponent: e(() => import("../views/assemblys/chart/table/table-runtime.vue.js")) }] }, { name: "data", label: "数据", items: [{ name: "table", label: "表格", runtimeComponent: e(() => import("../views/assemblys/data/table/table-runtime.vue.js")) }, { name: "tree", label: "树控件", runtimeComponent: e(() => import("../views/assemblys/data/tree/tree-runtime.vue.js")) }, { name: "bar-code", label: "条码", runtimeComponent: e(() => import("../views/assemblys/data/bar-code/barcode-runtime.vue.js")) }] }, { name: "other", label: "其他", items: [{ name: "custom", label: "自定义", runtimeComponent: e(() => import("../views/assemblys/form/custom/custom-runtime.vue.js")) }] }];
 function n(e2) {
   if (!e2) return null;
   for (let n2 = 0; n2 < m.length; n2++) {

package/dist/es/components/runtime/utils/barcode-util.js

@@ -1,11 +1,11 @@
-function e(e2, n) {
-  let t = true, r = "";
+function e(e2, t) {
+  let n = true, r = "";
   return e2.forEach((e3) => {
     if ("-1" !== e3.propDbName && -1 !== e3.propDbName) {
-      const a = n[e3.propDbName];
-      e3.supplementaryCharacters && e3.length ? a ? a.length > e3.length ? r += a.substring(0, e3.length) : r += a.padEnd(e3.length, e3.supplementaryCharacters) : r += "".padEnd(e3.length, e3.supplementaryCharacters) : a ? r += a : t = false;
+      const a = t[e3.propDbName];
+      e3.supplementaryCharacters && e3.length ? a ? a.length > e3.length ? r += a.substring(0, e3.length) : r += a.padEnd(e3.length, e3.supplementaryCharacters) : r += "".padEnd(e3.length, e3.supplementaryCharacters) : a ? r += a : n = false;
     } else r += e3.fixedValue;
-  }), console.log("跟据规则生成条码：" + r), t ? r : null;
+  }), n ? r : null;
 }
 export {
   e as generateCodeByRule

package/dist/es/components/runtime/utils/charts/chart-pie-util.js

@@ -1,82 +1,81 @@
-import { getValueFromSource as o, setValueForVariableName as e } from "../page-helper-util.js";
-import { deepCopy as t } from "../common-util.js";
-import { setDefaultGrid as r, CommonName as s, caculateFormulaValue as l, executeChartFormula as n, sortDatas as p, limitDatas as i, formatToolboxI18n as u } from "./chart-util.js";
-import { handleChartEvent as a } from "../events/event-util.js";
+import { getValueFromSource as o, setValueForVariableName as t } from "../page-helper-util.js";
+import { deepCopy as e } from "../common-util.js";
+import { setDefaultGrid as r, CommonName as s, caculateFormulaValue as l, executeChartFormula as n, sortDatas as p, limitDatas as i, formatToolboxI18n as a } from "./chart-util.js";
+import { handleChartEvent as u } from "../events/event-util.js";
 function c(c2, f, g, m) {
   if (!m || !m.result) return;
-  a(c2, f, "beforeUpdateChart", g, { resultData: m }), r(g);
+  u(c2, f, "beforeUpdateChart", g, { resultData: m }), r(g);
   const h = m && m.result ? m.result : {};
   let d = m && m.groupValue ? m.groupValue : void 0;
-  const v = f.serviceDataField;
-  let y = null;
-  v ? y = h[v] : h && (y = Array.isArray(h) ? h : [h]), y || (y = []);
+  const y = f.serviceDataField;
+  let v = null;
+  y ? v = h[y] : h && (v = Array.isArray(h) ? h : [h]), v || (v = []);
   let x = f.props ? f.props.groups : null;
   if (x || (x = []), !d || 0 === d.length) {
     d = [];
     for (const o2 of x) d.push(o2.group);
   }
-  const F = {}, D = [], E = [];
-  for (const o2 of x) F[o2.group] = o2.target, o2.target && !D.includes(o2.target) && (D.push(o2.target), d.includes(o2.group) && E.push(o2.target));
+  const D = {}, E = [], F = [];
+  for (const o2 of x) D[o2.group] = o2.target, o2.target && !E.includes(o2.target) && (E.push(o2.target), d.includes(o2.group) && F.push(o2.target));
   let S = f.props ? f.props.mulGroupShow : "";
-  S = "break" == S ? "\r\n" : " ", console.log("groupValue", d);
-  for (const e2 of y) {
-    if (!e2) continue;
-    const t2 = [];
+  S = "break" == S ? "\r\n" : " ";
+  for (const t2 of v) {
+    if (!t2) continue;
+    const e2 = [];
     for (const r3 of d) {
-      const s2 = F[r3], l2 = o(e2, s2, void 0);
-      l2 && t2.push(l2);
+      const s2 = D[r3], l2 = o(t2, s2, void 0);
+      l2 && e2.push(l2);
     }
-    const r2 = t2.join(S);
-    e2[s.X_FIELD_NAME] = r2;
+    const r2 = e2.join(S);
+    t2[s.X_FIELD_NAME] = r2;
   }
   const _ = f.items ? f.items : [];
-  if (0 == _.length) return void console.log("饼图的系列为空,操作失败!", f);
+  if (0 == _.length) return;
   const j = f.props ? f.props : {};
   let A = j.yaxisField;
-  if (console.log("valueField", A), _[0].props.yaxisField = A, _[0].props.yaxisSource = j.yaxisSource, _[0].props.formula = j.formula, "formula" === j.yaxisSource) {
-    const e2 = [], t2 = l(_, y, e2);
+  if (_[0].props.yaxisField = A, _[0].props.yaxisSource = j.yaxisSource, _[0].props.formula = j.formula, "formula" === j.yaxisSource) {
+    const t2 = [], e2 = l(_, v, t2);
     let r2 = j.formula ? j.formula : "";
-    for (const o2 in t2) r2 = r2.replace(new RegExp(o2.replace("$", "\\$"), "g"), t2[o2]);
+    for (const o2 in e2) r2 = r2.replace(new RegExp(o2.replace("$", "\\$"), "g"), e2[o2]);
     A = s.Y_TEMP_NAME;
     const p2 = {};
-    for (const t3 of y) {
-      if (!t3) continue;
-      for (const r3 of e2) {
-        const e3 = o(t3, r3, void 0);
+    for (const e3 of v) {
+      if (!e3) continue;
+      for (const r3 of t2) {
+        const t3 = o(e3, r3, void 0);
         let s3 = p2[r3];
-        void 0 === e3 || isNaN(e3) || (void 0 === s3 ? s3 = e3 : s3 += e3), p2[r3] = s3;
+        void 0 === t3 || isNaN(t3) || (void 0 === s3 ? s3 = t3 : s3 += t3), p2[r3] = s3;
       }
-      console.log("formula", r2);
-      const s2 = n(r2, p2, t3, c2);
-      console.log("formula-result", s2), t3[A] = s2;
+      const s2 = n(r2, p2, e3, c2);
+      e3[A] = s2;
     }
   }
-  _[0].props.yaxisField = A, _[0].props.yaxisSource = "", p(c2, f, y), y = i(c2, f, y, D, [A]);
+  _[0].props.yaxisField = A, _[0].props.yaxisSource = "", p(c2, f, v), v = i(c2, f, v, E, [A]);
   const M = [], N = [];
-  for (const e2 of y) {
-    if (!e2) continue;
-    M.push(e2[s.X_FIELD_NAME]);
-    const t2 = o(e2, A, void 0);
-    N.push(t2);
+  for (const t2 of v) {
+    if (!t2) continue;
+    M.push(t2[s.X_FIELD_NAME]);
+    const e2 = o(t2, A, void 0);
+    N.push(e2);
   }
   const b = f.defaultSeries;
   let C = b[0].pieColors;
   C = C || [];
-  let V = b[0].pieColorMap;
-  V = V || {};
-  const w = [];
+  let w = b[0].pieColorMap;
+  w = w || {};
+  const I = [];
   for (let o2 = 0; o2 < M.length && o2 < N.length; o2++) {
-    const e2 = { value: N[o2], name: M[o2] };
-    if (o2 < C.length || V[e2.name]) {
-      let t2 = V[e2.name];
-      t2 || (t2 = C[o2]), t2 && (e2.itemStyle = { color: t2 });
+    const t2 = { value: N[o2], name: M[o2] };
+    if (o2 < C.length || w[t2.name]) {
+      let e2 = w[t2.name];
+      e2 || (e2 = C[o2]), e2 && (t2.itemStyle = { color: e2 });
     }
-    w.push(e2);
+    I.push(t2);
   }
-  const I = t(b);
-  I[0].data = w, g.series = [I[0]], u(g);
+  const V = e(b);
+  V[0].data = I, g.series = [V[0]], a(g);
   const G = f.props ? f.props.selGroupVariable : null;
-  !(f.props ? f.props.enableDrill : null) && G && (f.highlightInfos = [], e(c2.entity, G, null)), a(c2, f, "afterUpdateChart", g, { resultData: m }), f.groupFields = E, f.cacheDatas = y, f.rawResult = m;
+  !(f.props ? f.props.enableDrill : null) && G && (f.highlightInfos = [], t(c2.entity, G, null)), u(c2, f, "afterUpdateChart", g, { resultData: m }), f.groupFields = F, f.cacheDatas = v, f.rawResult = m;
 }
 export {
   c as updateChartOption

package/dist/es/components/runtime/utils/charts/chart-scatter-util.js

@@ -35,9 +35,7 @@ function l(l2, u, f, c) {
       e2.sizeField ? r2.push(o(s2, e2.xaxisField, void 0)) : r2.push(e2.symbolSize), i2.push(r2);
     }
   }
-  const S = u.defaultSeries;
-  console.log("defaultSeries", S);
-  const z = s(S);
+  const S = u.defaultSeries, z = s(S);
   for (const o2 of z) {
     const s2 = y[o2.uuid];
     o2.data = s2.data;

package/dist/es/components/runtime/utils/charts/chart-util.js

@@ -3,31 +3,31 @@ import e from "../../../../assets/chart-themes/gauge-theme.js";
 import i from "../../../../assets/chart-themes/pie-theme.js";
 import n from "../../../../assets/chart-themes/radar-theme.js";
 import s from "../../../../assets/chart-themes/scatter-theme.js";
-import { getDefaultValue as o } from "../page-init-util.js";
-import { getValueFromSource as r, setValueForVariableName as a, getParamNames as l, getValueFromVariable as c, formatVariableValue as f, setVariableValue as u } from "../page-helper-util.js";
+import { getDefaultValue as r } from "../page-init-util.js";
+import { getValueFromSource as o, setValueForVariableName as a, getParamNames as l, getValueFromVariable as c, formatVariableValue as f, setVariableValue as u } from "../page-helper-util.js";
 import { getI18n as d } from "agilebuilder-ui/src/utils/util";
 import { appendDefaultMethods as p } from "../events/event-util.js";
 var h = ((t2) => (t2.X_FIELD_NAME = "__x", t2.Y_TEMP_NAME = "__y", t2))(h || {});
-function g(o2, r2 = "bar") {
-  return "bar" === r2 ? t[o2] : "gauge" === r2 ? e[o2] : "pie" === r2 ? i[o2] : "radar" === r2 ? n[o2] : "scatter" === r2 ? s[o2] : t[o2];
+function g(r2, o2 = "bar") {
+  return "bar" === o2 ? t[r2] : "gauge" === o2 ? e[r2] : "pie" === o2 ? i[r2] : "radar" === o2 ? n[r2] : "scatter" === o2 ? s[r2] : t[r2];
 }
 function m() {
   return [{ value: "theme1", label: "主题1" }, { value: "theme2", label: "主题2" }, { value: "theme3", label: "主题3" }];
 }
 function x(t2, e2, i2, n2, s2) {
-  return function(o2) {
-    let r2 = o2 == null ? void 0 : o2.value;
-    if (s2 && (r2 = o2), null == r2 || null == r2) return r2;
-    if (Array.isArray(r2)) return console.log("numformatter is array", r2), r2;
-    if (isNaN(r2) || !t2 || !t2.indexOf) return r2;
+  return function(r2) {
+    let o2 = r2 == null ? void 0 : r2.value;
+    if (s2 && (o2 = r2), null == o2 || null == o2) return o2;
+    if (Array.isArray(o2)) return o2;
+    if (isNaN(o2) || !t2 || !t2.indexOf) return o2;
     if (t2.indexOf("precision") > -1) {
       let t3 = parseInt(e2);
-      (null == t3 || isNaN(t3)) && (t3 = 2), r2 = parseFloat(parseFloat(r2).toFixed(t3));
+      (null == t3 || isNaN(t3)) && (t3 = 2), o2 = parseFloat(parseFloat(o2).toFixed(t3));
     }
     let a2 = "";
     t2.indexOf("prefix") > -1 && i2 && (a2 = i2);
     let l2 = "";
-    return t2.indexOf("append") > -1 && n2 && (l2 = n2), a2 + r2.toLocaleString() + l2;
+    return t2.indexOf("append") > -1 && n2 && (l2 = n2), a2 + o2.toLocaleString() + l2;
   };
 }
 function b(t2, e2) {
@@ -53,39 +53,37 @@ function I(t2, e2, i2) {
   if (!(i2 && e2 && e2.clickSet && t2)) return;
   const n2 = e2.clickSet;
   i2.on("click", function(s2) {
-    let o2 = e2.highlightInfos ? e2.highlightInfos : [];
-    console.log("highlightInfos", o2, s2);
-    let r2 = -1;
-    if (o2) {
+    let r2 = e2.highlightInfos ? e2.highlightInfos : [], o2 = -1;
+    if (r2) {
       const t3 = [];
-      for (let a2 = 0; a2 < o2.length; a2++) {
-        const l2 = o2[a2], c2 = l2.seriesIndex === s2.seriesIndex && l2.dataIndex === s2.dataIndex;
+      for (let a2 = 0; a2 < r2.length; a2++) {
+        const l2 = r2[a2], c2 = l2.seriesIndex === s2.seriesIndex && l2.dataIndex === s2.dataIndex;
         if (c2 || !n2.multiple) {
           if (n2.selected) {
             const t4 = "chart-pie" === e2.name ? "unselect" : "downplay";
             i2.dispatchAction({ type: t4, seriesIndex: l2.seriesIndex, dataIndex: l2.dataIndex });
           }
         } else t3.push(l2);
-        c2 && (r2 = a2);
+        c2 && (o2 = a2);
       }
-      o2 = t3;
+      r2 = t3;
     }
-    if (-1 === r2) {
+    if (-1 === o2) {
       if (n2.selected) {
         const t3 = "chart-pie" === e2.name ? "select" : "highlight";
         i2.dispatchAction({ type: t3, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
       }
-      o2.push({ seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
+      r2.push({ seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
     }
-    e2.highlightInfos = o2, N(t2, e2);
+    e2.highlightInfos = r2, N(t2, e2);
   });
 }
 function v(t2, e2, i2) {
   if (!i2 || !e2 || !t2) return;
   const n2 = e2.highlightInfos ? e2.highlightInfos : [];
   for (let t3 = 0; t3 < n2.length; t3++) {
-    const s2 = n2[t3], o2 = "chart-pie" === e2.name ? "unselect" : "downplay";
-    i2.dispatchAction({ type: o2, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
+    const s2 = n2[t3], r2 = "chart-pie" === e2.name ? "unselect" : "downplay";
+    i2.dispatchAction({ type: r2, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
   }
   e2.highlightInfos = [], N(t2, e2);
 }
@@ -93,13 +91,13 @@ function N(t2, e2) {
   if (!e2.clickSet) return;
   const i2 = e2.clickSet, n2 = i2.variables;
   if (!n2 || 0 == n2.length) return;
-  const s2 = e2.highlightInfos ? e2.highlightInfos : [], o2 = e2.cacheDatas ? e2.cacheDatas : [], l2 = [], c2 = [];
-  for (const t3 of s2) c2.includes(t3.dataIndex) || (c2.push(t3.dataIndex), t3.dataIndex < o2.length && l2.push(o2[t3.dataIndex]));
+  const s2 = e2.highlightInfos ? e2.highlightInfos : [], r2 = e2.cacheDatas ? e2.cacheDatas : [], l2 = [], c2 = [];
+  for (const t3 of s2) c2.includes(t3.dataIndex) || (c2.push(t3.dataIndex), t3.dataIndex < r2.length && l2.push(r2[t3.dataIndex]));
   for (const e3 of n2) {
     if (!e3.fieldName || !e3.variable) continue;
     const n3 = [];
     for (const t3 of l2) {
-      const i3 = r(t3, e3.fieldName, void 0);
+      const i3 = o(t3, e3.fieldName, void 0);
       null != i3 && n3.push(i3);
     }
     i2.multiple ? a(t2.entity, e3.variable, n3) : a(t2.entity, e3.variable, n3.length > 0 ? n3[0] : void 0);
@@ -107,22 +105,22 @@ function N(t2, e2) {
 }
 function y(t2, e2, i2) {
   const n2 = e2.items ? e2.items : [], s2 = e2.props ? e2.props.orderByTarget : "";
-  let o2 = null;
-  if ("x" == s2 || "X" == s2) o2 = "__x";
+  let r2 = null;
+  if ("x" == s2 || "X" == s2) r2 = "__x";
   else if (s2) {
     for (const t3 of n2) if (t3.uuid == s2) {
       const e3 = t3.props ? t3.props : {}, i3 = e3.yaxisSource, n3 = e3.yaxisField;
       if (n3 && (!i3 || "variable" == i3)) {
-        o2 = n3;
+        r2 = n3;
         break;
       }
       if ("formula" == i3 && e3.formula) {
-        o2 = t3.uuid + "_field";
+        r2 = t3.uuid + "_field";
         break;
       }
     }
   }
-  if (!o2) return;
+  if (!r2) return;
   const a2 = e2.props ? e2.props.orderSource : "";
   let l2 = e2.props ? e2.props.orderFix : "";
   if ("variable" == a2) {
@@ -130,18 +128,18 @@ function y(t2, e2, i2) {
     l2 = f(t2, i3);
   }
   l2 = "desc" == l2 || "DESC" == l2 ? "desc" : "asc", i2.sort((t3, e3) => {
-    const i3 = r(t3, o2, void 0), n3 = r(e3, o2, void 0);
+    const i3 = o(t3, r2, void 0), n3 = o(e3, r2, void 0);
     return "desc" === l2 ? n3 - i3 : i3 - n3;
   });
 }
 function S(t2, e2, i2, n2, s2) {
   if (!i2) return i2;
-  const o2 = e2.props ? e2.props : {};
-  if (!o2.limitQuantity) return i2;
+  const r2 = e2.props ? e2.props : {};
+  if (!r2.limitQuantity) return i2;
   let a2 = null;
-  if (o2.itemNumVariable ? (a2 = f(t2, o2.itemNumVariable), a2 = parseInt(a2)) : a2 = o2.itemNumFix ? o2.itemNumFix : 10, null == a2 || null == a2 || isNaN(a2)) return i2;
+  if (r2.itemNumVariable ? (a2 = f(t2, r2.itemNumVariable), a2 = parseInt(a2)) : a2 = r2.itemNumFix ? r2.itemNumFix : 10, null == a2 || null == a2 || isNaN(a2)) return i2;
   if (i2.length < a2) return i2;
-  const l2 = o2.overItemAlias, c2 = [], u2 = {};
+  const l2 = r2.overItemAlias, c2 = [], u2 = {};
   n2 = n2 || [], s2 = s2 || [];
   for (let t3 = 0; t3 < i2.length; t3++) {
     const e3 = i2[t3];
@@ -150,14 +148,14 @@ function S(t2, e2, i2, n2, s2) {
       if (!l2) break;
       for (const t4 of n2) {
         if (!t4) continue;
-        let i3 = r(e3, t4, void 0);
+        let i3 = o(e3, t4, void 0);
         i3 = null == i3 || null == i3 ? "" : i3, u2[t4] || (u2[t4] = []);
         const n3 = u2[t4];
         n3.includes(i3) || n3.push(i3);
       }
       for (const t4 of s2) {
         if (!t4) continue;
-        const i3 = r(e3, t4, void 0);
+        const i3 = o(e3, t4, void 0);
         if (isNaN(i3)) continue;
         const n3 = u2[t4];
         isNaN(n3) ? u2[t4] = i3 : u2[t4] = i3 + n3;
@@ -189,7 +187,7 @@ function F(t2, e2, i2) {
 function _(t2, e2) {
   let i2;
   for (const n2 of t2) {
-    const t3 = parseFloat(r(n2, e2, null));
+    const t3 = parseFloat(o(n2, e2, null));
     (void 0 === i2 || !isNaN(t3) && t3 < i2) && (i2 = t3);
   }
   return i2;
@@ -197,7 +195,7 @@ function _(t2, e2) {
 function A(t2, e2) {
   let i2;
   for (const n2 of t2) {
-    const t3 = parseFloat(r(n2, e2, null));
+    const t3 = parseFloat(o(n2, e2, null));
     (void 0 === i2 || !isNaN(t3) && t3 > i2) && (i2 = t3);
   }
   return i2;
@@ -205,7 +203,7 @@ function A(t2, e2) {
 function M(t2, e2) {
   let i2;
   for (const n2 of t2) {
-    const t3 = parseFloat(r(n2, e2, null));
+    const t3 = parseFloat(o(n2, e2, null));
     void 0 === i2 ? i2 = t3 : isNaN(t3) || (i2 += t3);
   }
   return i2;
@@ -220,11 +218,11 @@ function w(t2, e2, i2, n2) {
   const s2 = l(t2);
   for (const e3 of s2) {
     let s3 = null;
-    s3 = e3.startsWith("${row.") ? r(i2, e3.substring(6, e3.length - 1), null) : c(n2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), s3);
+    s3 = e3.startsWith("${row.") ? o(i2, e3.substring(6, e3.length - 1), null) : c(n2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), s3);
   }
   t2.includes("return ") || (t2 = "return " + t2);
-  const o2 = new Function("params", t2);
-  return p(o2, n2), o2({ pageContext: n2, row: i2 });
+  const r2 = new Function("params", t2);
+  return p(r2, n2), r2({ pageContext: n2, row: i2 });
 }
 function $(t2, e2) {
   if (!t2 || !t2.$el) return;
@@ -248,7 +246,7 @@ function j(t2, e2, i2) {
   }
   if (s2 && t2) {
     for (const i3 of t2) if (i3.prop && i3.value) {
-      const t3 = o(e2, i3.value, "input-text", false), n3 = i3.prop.substring(2, i3.prop.length - 1).split(".");
+      const t3 = r(e2, i3.value, "input-text", false), n3 = i3.prop.substring(2, i3.prop.length - 1).split(".");
       null != t3 && u(e2.entity, n3, t3);
     }
   }

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

@@ -43,7 +43,7 @@ function x(e2, n2) {
       for (const t3 in n3) {
         j(n3[t3], e3);
       }
-    }(n2, t2), console.log("initPage  customEvents", t2), n2.customEvents = t2;
+    }(n2, t2), n2.customEvents = t2;
   }
 }
 function k(e2, n2) {
@@ -105,7 +105,7 @@ function w(e2, t2, o2, r2, u2, c2, l2) {
   const a2 = o2 && o2.runtime && o2.runtime.events ? o2.runtime.events : [];
   let s2;
   if (l2 || !function(e3) {
-    return e3 && P.indexOf(e3) >= 0;
+    return e3 && S.indexOf(e3) >= 0;
   }(r2)) {
     if (s2 = $(t2, a2, r2), u2) {
       return z(t2, o2, s2, R(t2, o2, e2, c2));
@@ -115,7 +115,7 @@ function w(e2, t2, o2, r2, u2, c2, l2) {
   !function(e3, t3, o3) {
     const r3 = i(t3, o3.ids);
     if (!r3) return;
-    if (void 0 !== e3.canClick && false === e3.canClick) return void console.log("不能重复点击");
+    if (void 0 !== e3.canClick && false === e3.canClick) return;
     Q(o3).then((i2) => {
       if (true === i2.canExecute) {
         e3.clickUuid = t3.uuid, e3.canClick = false;
@@ -125,14 +125,14 @@ function w(e2, t2, o2, r2, u2, c2, l2) {
         n(u3) ? u3.then((n2) => {
           n2 && true === n2 ? T(e3, t3, o3) : e3.canClick = true;
         }).catch((n2) => {
-          console.log(n2), e3.canClick = true;
+          e3.canClick = true;
         }) : T(e3, t3, o3);
       }
     });
   }(t2, o2, U(e2, t2, o2, c2));
 }
-const P = ["click", "suffixClick", "prefixClick", "menuClick"];
-function S(e2, n2) {
+const S = ["click", "suffixClick", "prefixClick", "menuClick"];
+function P(e2, n2) {
   return n2.props.base.tableUuid ? n2.props.base.tableUuid : e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null;
 }
 function R(e2, n2, t2, o2) {
@@ -143,7 +143,7 @@ function R(e2, n2, t2, o2) {
 function T(e2, t2, o2) {
   const i2 = t2.runtime && t2.runtime.events ? t2.runtime.events : [];
   let r2 = true;
-  console.log("doValidateForm---eventParams=", o2), (o2 == null ? void 0 : o2.skipValidate) && (r2 = false);
+  (o2 == null ? void 0 : o2.skipValidate) && (r2 = false);
   const c2 = H(e2, i2, "click");
   if (c2) {
     const e3 = function(e4, n2) {
@@ -168,7 +168,7 @@ function F(e2, n2, t2, o2, i2) {
   A(n2, t2, H(n2, t2.runtime && t2.runtime.events ? t2.runtime.events : [], o2), r2);
 }
 function U(e2, n2, t2, o2) {
-  const i2 = n2.code, r2 = n2.version, u2 = S(n2, t2);
+  const i2 = n2.code, r2 = n2.version, u2 = P(n2, t2);
   if (u2) {
     const e3 = c(n2, u2), t3 = e3 ? e3.getSelections() : null, l2 = e3 ? e3.getSelectionIds() : null;
     o2 || (o2 = {}), o2.tableUuid = u2, o2.listCode = f(i2, r2, u2);
@@ -353,7 +353,7 @@ function ne(e2, n2, t2) {
   return h(null, e2, n2, "header-click", t2);
 }
 function te(e2) {
-  return N(null, e2.pageContext, e2.configureObj, "before-upload", e2);
+  return h(null, e2.pageContext, e2.configureObj, "before-upload", e2);
 }
 function oe(e2, n2, t2) {
   return h(null, e2, n2, "uploaded", t2);
@@ -408,7 +408,7 @@ export {
   $ as getEventFuncByType,
   B as getEventNameByType,
   N as getHandleEvent,
-  S as getTableUuid,
+  P as getTableUuid,
   K as gridSelectAllRecords,
   J as gridSelectRecord,
   M as gridSelectionChange,

package/dist/es/components/runtime/utils/events/print-label.js

@@ -10,7 +10,6 @@ function a(n2, a2) {
       });
     });
     const i = new t.PrintTemplate({ template: a3 }), l = { callback: () => {
-      console.log("浏览器打印窗口已打开");
     }, styleHandler: () => "" }, c = { leftOffset: -1, topOffset: -1 }, f = {};
     a3.panels[0].printElements.forEach((e3) => {
       if ("datetime" === e3.options.dataType && e3.options.field) {

package/dist/es/components/runtime/utils/events/standard-event.d.ts

@@ -54,7 +54,7 @@ export declare const standardEvents: {
     removeTransactor: (params: any) => void;
 };
 export declare function exportFormReport(pageContext: any, configureObj: any, templateFile: any, isPdf: any): void;
-export declare function getSaveFormRequestWithRow(pageContext: PageContext, configureObj: any, url: string, isUnControlVersion: boolean, mainDefaultValueColumns: any, dynamicColumnInfo: any, row: any, otherParams: any): any;
+export declare function getSaveFormRequestWithRow(pageContext: PageContext, configureObj: any, url: string, isUnControlVersion: boolean, mainDefaultValueColumns: any, dynamicColumnInfo: any, row: any, otherParams: any, isTable?: any): any;
 export declare function getSaveFormRequest(pageContext: PageContext, configureObj: any, url: any, isUnControlVersion: any, mainDefaultValueColumns: any, dynamicColumnInfo: any): any;
 /**
  * 按钮执行后页面处理方式：刷新、关闭弹框等等