super-page-runtime 2.3.37-sit2 → 2.3.37-sit4

package/dist/es/components/runtime/utils/page-init-util.js

@@ -1,45 +1,45 @@
 import e from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap as t } from "./events/standard-event.js";
-import { PageDimensions as n } from "./interfaces/page-design-types.js";
-import { getFormPropName as i, getVariableValue as s, formatVariableValue as o, setVariableValue as r } from "./page-helper-util.js";
+import { PageDimensions as o } from "./interfaces/page-design-types.js";
+import { getFormPropName as i, getVariableValue as n, formatVariableValue as r, setVariableValue as s } from "./page-helper-util.js";
 import { getSessionCache as a } from "agilebuilder-ui/src/utils/auth";
 import { functions as l } from "./api/page-expose-util.js";
-import { isWorkflowPage as p, deepCopy as u } from "./common-util.js";
+import { isWorkflowPage as u, deepCopy as p } from "./common-util.js";
 import { packageCustomValidator as d } from "./events/validator-util.js";
 import { isMobileBrowser as c } from "agilebuilder-ui/src/utils/common-util";
 function f(t2) {
-  return new Promise((n2, i2) => {
+  return new Promise((o2, i2) => {
     (function(t3) {
       return e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + t3);
     })(t2).then((e2) => {
       e2 ? b().then((t3) => {
         t3 && (e2.systemParam = h(t3)), g(e2.listViewTableName, e2.listViewTablePublishVersion).then((t4) => {
-          t4 ? (e2.contextParam = h(t4.contextParam), e2.branchFieldAuth = t4.branchFieldAuth, e2.isWorkflowEntity = t4.isWorkflowEntity, e2.dataTypeMaps = t4.dataTypeMaps, n2(e2)) : n2(null);
+          t4 ? (e2.contextParam = h(t4.contextParam), e2.branchFieldAuth = t4.branchFieldAuth, e2.isWorkflowEntity = t4.isWorkflowEntity, e2.dataTypeMaps = t4.dataTypeMaps, o2(e2)) : o2(null);
         });
       }).catch(() => {
-        n2(e2);
-      }) : n2(null);
+        o2(e2);
+      }) : o2(null);
     });
   });
 }
 function m(e2, t2) {
-  return new Promise((n2, i2) => {
-    e2 ? b().then((s2) => {
-      s2 && (e2.systemParam = h(s2)), e2.tableRuntimes && Object.keys(e2.tableRuntimes).length > 0 ? x(e2, t2, e2.systemVersion).then((t3) => {
-        e2.contextParam = h(t3.contextParam), e2.branchFieldAuth = t3.branchFieldAuth, e2.isWorkflowEntity = t3.isWorkflowEntity, e2.dataTypeMaps = t3.dataTypeMaps, e2.superGridItems = t3.superGrids, n2(e2);
+  return new Promise((o2, i2) => {
+    e2 ? b().then((n2) => {
+      n2 && (e2.systemParam = h(n2)), e2.tableRuntimes && Object.keys(e2.tableRuntimes).length > 0 ? T(e2, t2, e2.systemVersion).then((t3) => {
+        e2.contextParam = h(t3.contextParam), e2.branchFieldAuth = t3.branchFieldAuth, e2.isWorkflowEntity = t3.isWorkflowEntity, e2.dataTypeMaps = t3.dataTypeMaps, e2.superGridItems = t3.superGrids, o2(e2);
       }).catch((e3) => {
-        i2(e3);
+        console.log("queryPageSuperGrids error", e3), i2(e3);
       }) : g("", "").then((t3) => {
-        t3 ? (e2.contextParam = h(t3.contextParam), e2.branchFieldAuth = t3.branchFieldAuth, e2.isWorkflowEntity = t3.isWorkflowEntity, e2.dataTypeMaps = t3.dataTypeMaps, n2(e2)) : n2(null);
+        t3 ? (e2.contextParam = h(t3.contextParam), e2.branchFieldAuth = t3.branchFieldAuth, e2.isWorkflowEntity = t3.isWorkflowEntity, e2.dataTypeMaps = t3.dataTypeMaps, o2(e2)) : o2(null);
       }).catch((e3) => {
-        i2(e3);
+        console.log("queryPageRuntimeParam error", e3), i2(e3);
       });
-    }) : n2(null);
+    }) : o2(null);
   });
 }
-function g(t2, n2) {
+function g(t2, o2) {
   let i2 = "";
-  return t2 && n2 && (i2 = "?listViewTableName=" + t2 + "&listViewTablePublishVersion=" + n2), e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime-param" + i2);
+  return t2 && o2 && (i2 = "?listViewTableName=" + t2 + "&listViewTablePublishVersion=" + o2), e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime-param" + i2);
 }
 function b() {
   return e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/system-param");
@@ -49,12 +49,12 @@ function y(e2) {
   if (null == e2) return null;
   const t2 = { uuid: e2.uuid, name: e2.name, label: e2.label, code: e2.code, version: e2.version, dimensions: e2.dimensions, systemCode: e2.systemCode, systemVersion: e2.systemVersion, backendUrl: e2.backendUrl, rules: {}, tableUuids: e2.tableUuids, listCodesMap: e2.listCodesMap, listCodesInitSearchForm: e2.listCodesInitSearchForm, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: w(e2), pageType: e2.pageType, beanName: e2.props ? e2.props.beanName : null, importBeanName: e2.props ? e2.props.importBeanName : null, subTablePageInfo: e2.subTablePageInfo, workflowCode: e2.workflowCode, workflowVersion: e2.workflowVersion, refercePropMap: (_a = e2.runtime) == null ? void 0 : _a.refercePropMap, subTableWatchProps: e2.subTableWatchProps, dataTypeMaps: e2.dataTypeMaps, allChartUuids: e2.allChartUuids, branchFieldAuth: e2.branchFieldAuth, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam }, propTitleMap: {} };
   if (e2.props && e2.props.notIdInitializationList) {
-    let n2 = e2.props.notIdInitializationList;
-    "string" == typeof n2 && (n2 = JSON.parse(n2)), n2.length > 0 && (t2.notIdInitializationList = n2);
+    let o2 = e2.props.notIdInitializationList;
+    "string" == typeof o2 && (o2 = JSON.parse(o2)), o2.length > 0 && (t2.notIdInitializationList = o2);
   }
   if (e2.variables) {
-    const n2 = t2.entity.page;
-    for (const t3 of e2.variables) t3.name && (t3.isArrayElement ? n2[t3.name] = [] : t3.defaultValue ? n2[t3.name] = t3.defaultValue : n2[t3.name] = void 0);
+    const o2 = t2.entity.page;
+    for (const t3 of e2.variables) t3.name && (t3.isArrayElement ? o2[t3.name] = [] : t3.defaultValue ? o2[t3.name] = t3.defaultValue : o2[t3.name] = void 0);
   }
   return function(e3) {
     if (c()) {
@@ -64,8 +64,8 @@ function y(e2) {
     } else e3.entity.page._isMobile = "false";
   }(t2), Object.assign(t2, e2), t2.isWorkflowEntity = void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, t2.dimensions = function() {
     const e3 = window.outerWidth;
-    if (!e3) return n.PC;
-    return e3 > 768 ? n.PC : e3 > 414 ? n.IPAD : n.PHONE;
+    if (!e3) return o.PC;
+    return e3 > 768 ? o.PC : e3 > 414 ? o.IPAD : o.PHONE;
   }(), t2.events = e2.runtime && e2.runtime.events ? e2.runtime.events : [], t2;
 }
 function h(e2) {
@@ -73,8 +73,8 @@ function h(e2) {
     const t2 = function(e3) {
       if (!e3) return e3;
       try {
-        const t3 = window.CryptoJS.enc.Latin1.parse("qwertyuasdfgh456"), n2 = window.CryptoJS.enc.Latin1.parse("1234567812345678");
-        return window.CryptoJS.AES.decrypt(e3, t3, { iv: n2, mode: window.CryptoJS.mode.CBC, padding: window.CryptoJS.pad.ZeroPadding }).toString(CryptoJS.enc.Utf8);
+        const t3 = window.CryptoJS.enc.Latin1.parse("qwertyuasdfgh456"), o2 = window.CryptoJS.enc.Latin1.parse("1234567812345678");
+        return window.CryptoJS.AES.decrypt(e3, t3, { iv: o2, mode: window.CryptoJS.mode.CBC, padding: window.CryptoJS.pad.ZeroPadding }).toString(CryptoJS.enc.Utf8);
       } catch (t3) {
         return e3;
       }
@@ -91,6 +91,7 @@ function w(e2) {
       e3.duplicateFieldList && e3.duplicateFieldList.length > 0 && (e3.duplicateFieldList = e3.duplicateFieldList.map((e4) => "string" == typeof e4 ? { propDbName: e4 } : e4));
     }), e2.props.judgeHeavyList) : null;
   } catch (e3) {
+    console.error("getJudgeHeavyList error:", e3);
   }
 }
 function P(e2) {
@@ -101,12 +102,12 @@ function P(e2) {
   }
   if (t2 && t2.includes("?")) {
     t2 = t2.substring(t2.lastIndexOf("?") + 1);
-    const n2 = t2.split("&");
-    for (const t3 of n2) {
-      const n3 = t3.split("=");
-      let i2 = n3[0];
+    const o2 = t2.split("&");
+    for (const t3 of o2) {
+      const o3 = t3.split("=");
+      let i2 = o3[0];
       if (i2) {
-        const t4 = n3.length > 1 ? n3[1] : "";
+        const t4 = o3.length > 1 ? o3[1] : "";
         i2.indexOf("ai__") >= 0 && (i2 = i2.substring(i2.indexOf("ai__") + 4)), e2[i2] = t4;
       }
     }
@@ -115,164 +116,168 @@ function P(e2) {
 }
 function E(e2, t2) {
   if (e2) {
-    Object.assign(t2, e2);
-    C(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
+    console.log("packageAdditionalMapWithPageRequest----pageRequest=", e2), Object.assign(t2, e2);
+    v(e2.paramStoreId, t2), delete e2.paramStoreId, console.log("packageAdditionalMapWithPageRequest----requestObj=", t2), e2.jumpMode && (t2.jumpMode = e2.jumpMode);
   }
 }
-function v(e2, t2) {
-  if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query)) {
-    Object.assign(t2, e2.query);
-    C(e2.query.paramStoreId, t2);
+function k(e2, t2) {
+  if (console.log("packageAdditionalMapWithRoute----route=", e2), e2) {
+    if (e2.params && Object.assign(t2, e2.params), console.log("packageAdditionalMapWithRoute----route.query=", e2.query), e2.query) {
+      Object.assign(t2, e2.query);
+      v(e2.query.paramStoreId, t2);
+    }
+    console.log("packageAdditionalMapWithRoute----requestObj=", t2);
   }
 }
-function C(e2, t2) {
+function v(e2, t2) {
   if (e2) {
-    const n2 = a(e2);
-    if (n2) {
-      const e3 = JSON.parse(n2);
-      Object.assign(t2, e3);
+    const o2 = a(e2);
+    if (o2) {
+      const e3 = JSON.parse(o2);
+      Object.assign(t2, e3), console.log("已获取到附加参数", e3);
     }
   }
 }
-function k(e2, t2) {
-  let n2, i2 = t2;
-  t2 || (n2 = e2.props.base ? e2.props.base : {}, i2 = n2.prop);
-  let s2 = null;
-  return t2 && !t2.startsWith("${") ? s2 = ["data", t2] : !e2 || i2 && i2.startsWith("${") ? i2.startsWith("${") ? (i2 = i2.substring(2, i2.length - 1), s2 = i2.split("."), e2 && s2.length < 2 && (s2 = [e2.uuid])) : e2 && (s2 = ["page", e2.uuid]) : s2 = ["page", e2.uuid], s2 || e2 ? s2 : ["temp"];
+function A(e2, t2) {
+  let o2, i2 = t2;
+  t2 || (o2 = e2.props.base ? e2.props.base : {}, i2 = o2.prop);
+  let n2 = null;
+  return t2 && !t2.startsWith("${") ? n2 = ["data", t2] : !e2 || i2 && i2.startsWith("${") ? i2.startsWith("${") ? (i2 = i2.substring(2, i2.length - 1), n2 = i2.split("."), e2 && n2.length < 2 && (n2 = [e2.uuid])) : e2 && (n2 = ["page", e2.uuid]) : n2 = ["page", e2.uuid], n2 || e2 ? n2 : ["temp"];
 }
-function A(e2, t2, n2) {
+function M(e2, t2, o2) {
   var _a, _b;
-  const i2 = k(t2, n2), o2 = e2.entity;
-  if (null == o2.data.ID && null == o2.data.id) {
-    let n3, r2, a2 = false;
-    t2 && (n3 = t2.props.base ? t2.props.base : {}, r2 = t2.name, a2 = n3.multiple);
-    const l2 = s(o2, i2);
+  const i2 = A(t2, o2), r2 = e2.entity;
+  if (null == r2.data.ID && null == r2.data.id) {
+    let o3, s2, a2 = false;
+    t2 && (o3 = t2.props.base ? t2.props.base : {}, s2 = t2.name, a2 = o3.multiple);
+    const l2 = n(r2, i2);
     if (null == l2) {
-      const s2 = n3 ? n3.defaultValue : null, l3 = Boolean((_a = t2 == null ? void 0 : t2.runtime) == null ? void 0 : _a.arrayValue);
-      if (s2) try {
-        const t3 = T(e2, s2, r2, a2);
-        if (M(t3)) I(o2, i2, t3, l3);
-        else if (((_b = n3.moreDefaultValue) == null ? void 0 : _b.length) > 0) {
-          const t4 = n3.moreDefaultValue;
-          for (let n4 = 0; n4 < t4.length; n4++) {
-            const s3 = T(e2, t4[n4], r2, a2);
-            if (M(s3)) {
-              I(o2, i2, s3, l3);
+      const n2 = o3 ? o3.defaultValue : null, l3 = Boolean((_a = t2 == null ? void 0 : t2.runtime) == null ? void 0 : _a.arrayValue);
+      if (n2) try {
+        const t3 = I(e2, n2, s2, a2);
+        if (C(t3)) R(r2, i2, t3, l3);
+        else if (((_b = o3.moreDefaultValue) == null ? void 0 : _b.length) > 0) {
+          const t4 = o3.moreDefaultValue;
+          for (let o4 = 0; o4 < t4.length; o4++) {
+            const n3 = I(e2, t4[o4], s2, a2);
+            if (C(n3)) {
+              R(r2, i2, n3, l3);
               break;
             }
           }
         }
       } catch (e3) {
+        console.error("设置默认值出错:", i2, e3);
       }
     }
   }
   return i2;
 }
-function M(e2) {
+function C(e2) {
   return null != e2 && "" !== e2;
 }
-function I(e2, t2, n2, i2) {
-  !Array.isArray(n2) || i2 ? r(e2, t2, n2) : r(e2, t2, n2.join(","));
+function R(e2, t2, o2, i2) {
+  !Array.isArray(o2) || i2 ? s(e2, t2, o2) : s(e2, t2, o2.join(","));
 }
-function T(e2, t2, n2, i2) {
-  let s2;
-  if (t2 && (s2 = o(e2, t2), null != s2 && null != s2 && n2)) {
+function I(e2, t2, o2, i2) {
+  let n2;
+  if (t2 && (n2 = r(e2, t2), null != n2 && null != n2 && o2)) {
     let e3 = false;
-    "checkbox" == n2 ? e3 = true : "select" == n2 && (e3 = i2), e3 && (s2 = (s2 + "").split(","));
+    "checkbox" == o2 ? e3 = true : "select" == o2 && (e3 = i2), e3 && (n2 = (n2 + "").split(","));
   }
-  return s2;
+  return n2;
 }
 function j(e2, t2) {
   var _a, _b;
   if (false === ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.isPermission)) return "true";
-  const n2 = [];
-  if (e2.autoPermissions) for (const i2 of e2.autoPermissions) n2.push(t2.code + "." + i2.simpleCode);
+  const o2 = [];
+  if (e2.autoPermissions) for (const i2 of e2.autoPermissions) o2.push(t2.code + "." + i2.simpleCode);
   if (e2.functionCodes) {
-    const i2 = e2.sourceTypes ? e2.sourceTypes : [], s2 = e2.functionCodes;
-    for (let e3 = 0; e3 < s2.length; e3++) {
-      const o2 = s2[e3], r2 = e3 < i2.length ? i2[e3] : "";
+    const i2 = e2.sourceTypes ? e2.sourceTypes : [], n2 = e2.functionCodes;
+    for (let e3 = 0; e3 < n2.length; e3++) {
+      const r2 = n2[e3], s2 = e3 < i2.length ? i2[e3] : "";
       let a2 = "";
-      if ("service" == r2) a2 = o2;
-      else if ("standard" === r2) a2 = t2.code + "." + o2;
+      if ("service" == s2) a2 = r2;
+      else if ("standard" === s2) a2 = t2.code + "." + r2;
       else {
-        a2 = "custom" === O(o2, t2).type ? o2 : t2.code + "." + o2;
+        a2 = "custom" === O(r2, t2).type ? r2 : t2.code + "." + r2;
       }
-      n2.includes(a2) || n2.push(a2);
+      o2.includes(a2) || o2.push(a2);
     }
   }
-  return n2.join(",");
+  return o2.join(",");
 }
 function O(e2, t2) {
-  const n2 = t2.pagePermissions;
-  if (n2 && n2.length > 0) {
-    for (let t3 = 0; t3 < n2.length; t3++) if (n2[t3].simpleCode === e2) return n2[t3];
+  const o2 = t2.pagePermissions;
+  if (o2 && o2.length > 0) {
+    for (let t3 = 0; t3 < o2.length; t3++) if (o2[t3].simpleCode === e2) return o2[t3];
   }
   return null;
 }
-function x(n2, i2, s2) {
-  const o2 = n2.tableRuntimes, r2 = t(i2);
+function T(o2, i2, n2) {
+  const r2 = o2.tableRuntimes, s2 = t(i2);
   let a2;
-  const l2 = n2.code;
-  return r2 && Object.keys(r2) > 0 && (a2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: o2, additionalParamMapJson: a2, pageCode: l2, publishVersion: s2, pageType: n2.pageType });
+  const l2 = o2.code;
+  return s2 && Object.keys(s2) > 0 && (a2 = JSON.stringify(s2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: r2, additionalParamMapJson: a2, pageCode: l2, publishVersion: n2, pageType: o2.pageType });
 }
-const R = ["button-detail", "print-label"];
-function _(e2, t2, n2) {
+const q = ["button-detail", "print-label"];
+function W(e2, t2, o2) {
   var _a, _b;
-  const s2 = t2.props && t2.props.base ? t2.props.base.prop : null, o2 = p(e2);
-  let r2 = false;
-  if (o2 && R.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
-    const n3 = e2.fieldPermissionMap.get("all_fields");
-    false === (n3 == null ? void 0 : n3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", r2 = true);
+  const n2 = t2.props && t2.props.base ? t2.props.base.prop : null, r2 = u(e2);
+  let s2 = false;
+  if (r2 && q.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
+    const o3 = e2.fieldPermissionMap.get("all_fields");
+    false === (o3 == null ? void 0 : o3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", s2 = true);
   }
-  if (s2) {
-    const a2 = i(s2);
+  if (n2) {
+    const a2 = i(n2);
     if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[a2] || (e2.rules[a2] = []), t2.props.rules.forEach((e3) => {
-      d(e3), !n2 && e3 && e3.required && (e3.required = false);
-    }), e2.rules[a2] = t2.props.rules), o2 && !r2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
+      d(e3), !o2 && e3 && e3.required && (e3.required = false);
+    }), e2.rules[a2] = t2.props.rules), r2 && !s2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
       const i2 = e2.fieldPermissionMap.get(a2);
-      if (!n2 && e2.workflowRules && (e2.workflowRules[a2] || e2.workflowRules.rules && e2.workflowRules.rules[a2])) {
+      if (!o2 && e2.workflowRules && (e2.workflowRules[a2] || e2.workflowRules.rules && e2.workflowRules.rules[a2])) {
         let t3 = e2.workflowRules[a2];
         if (!t3 && e2.workflowRules.rules && (t3 = e2.workflowRules.rules[a2]), t3 && Array.isArray(t3) && t3.length > 0) for (let e3 = 0; e3 < t3.length; e3++) {
-          const n3 = t3[e3];
-          if (n3 && n3.required) {
-            n3.required = false;
+          const o3 = t3[e3];
+          if (o3 && o3.required) {
+            o3.required = false;
             break;
           }
         }
         else t3 && t3.required && (t3.required = false);
       }
-      t2.runtime.props || (t2.runtime.props = {}), i2 ? (!n2 && i2.canEdit && (i2.canEdit = false), false === i2.canEdit ? t2.runtime.props.state = "disabled" : i2.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true)) : t2.runtime.props.state = "";
+      t2.runtime.props || (t2.runtime.props = {}), i2 ? (!o2 && i2.canEdit && (i2.canEdit = false), false === i2.canEdit ? t2.runtime.props.state = "disabled" : i2.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true)) : t2.runtime.props.state = "";
     }
     ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: a2, events: t2.props.customRuleEvents }));
   }
 }
-function V(e2, t2) {
+function x(e2, t2) {
   if (e2.initInfo) {
-    ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((n2) => {
-      const i2 = e2.initInfo[n2];
-      if (i2) if ("dynamicControlFormEdit" === n2) {
-        let n3 = i2.filter((e3) => "_all_fields" === e3.name || e3.name === t2);
-        if (n3 && n3.length > 0 && (n3 = n3.filter((e3) => "_all_fields" === e3.name), n3 && n3.length > 0)) {
-          const e3 = u(n3[0]);
-          e3.name = t2, n3 = [e3];
+    ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((o2) => {
+      const i2 = e2.initInfo[o2];
+      if (i2) if ("dynamicControlFormEdit" === o2) {
+        let o3 = i2.filter((e3) => "_all_fields" === e3.name || e3.name === t2);
+        if (o3 && o3.length > 0 && (o3 = o3.filter((e3) => "_all_fields" === e3.name), o3 && o3.length > 0)) {
+          const e3 = p(o3[0]);
+          e3.name = t2, o3 = [e3];
         }
-        l.dynamicControlFormEdit(e2, n3, false);
-      } else "disableElement" === n2 ? i2.indexOf(t2) >= 0 && l.disableElement(e2, [t2], false) : "enableElement" === n2 ? i2.indexOf(t2) >= 0 && l.enableElement(e2, [t2], false) : "hideElement" === n2 ? i2.indexOf(t2) >= 0 && l.hideElement(e2, [t2], false) : "showElement" === n2 && i2.indexOf(t2) >= 0 && l.showElement(e2, [t2], false);
+        l.dynamicControlFormEdit(e2, o3, false);
+      } else "disableElement" === o2 ? i2.indexOf(t2) >= 0 && l.disableElement(e2, [t2], false) : "enableElement" === o2 ? i2.indexOf(t2) >= 0 && l.enableElement(e2, [t2], false) : "hideElement" === o2 ? i2.indexOf(t2) >= 0 && l.hideElement(e2, [t2], false) : "showElement" === o2 && i2.indexOf(t2) >= 0 && l.showElement(e2, [t2], false);
     });
   }
 }
 export {
-  V as controlObjectRenderState,
+  x as controlObjectRenderState,
   y as convertToPageContext,
-  T as getDefaultValue,
-  A as getFormModelFields,
-  k as getModelFields,
+  I as getDefaultValue,
+  M as getFormModelFields,
+  A as getModelFields,
   j as getPermissionCodes,
   P as packageAdditionalMapWithLocationSearch,
   E as packageAdditionalMapWithPageRequest,
-  v as packageAdditionalMapWithRoute,
-  _ as packageFormRules,
+  k as packageAdditionalMapWithRoute,
+  W as packageFormRules,
   f as queryPageDesignByCode,
   m as queryPageDesignWhenPreview,
-  x as queryPageSuperGrids
+  T as queryPageSuperGrids
 };

package/dist/es/components/runtime/utils/page-store.js

@@ -2,50 +2,50 @@ import { ref as e, nextTick as o } from "vue";
 import { defineStore as t } from "pinia";
 import n from "./eventBus.js";
 const u = t("pageContextUtil", () => {
-  const t2 = e({ systemCode: "", systemVersion: -1 }), u2 = e(false), a = e(false), i = e(false), l = e([]), r = e(0), s = e(0);
-  let v = null, c = -1, d = -1, m = 0;
-  function f() {
-    v && clearTimeout(v), v = setTimeout(() => {
+  const t2 = e({ systemCode: "", systemVersion: -1 }), u2 = e(false), a = e(false), l = e(false), i = e([]), r = e(0), s = e(0);
+  let d = null, c = -1, v = -1, m = 0;
+  function p() {
+    d && clearTimeout(d), d = setTimeout(() => {
       o(() => {
         !function() {
           const e2 = r.value, o2 = s.value;
-          if (m++, m >= 100) return void (e2 > 0 && e2 === o2 && p(true));
+          if (m++, m >= 100) return void (e2 > 0 && e2 === o2 && f(true));
           if (e2 > 0 && e2 === o2) {
-            if (e2 === c && o2 === d && !u2.value) return void p(true);
-            c = e2, d = o2, f();
-          } else c = -1, d = -1, f();
+            if (e2 === c && o2 === v && !u2.value) return console.log(`pageComponentsLoaded: total=${e2}, loaded=${o2}, checkCount=${m}`), void f(true);
+            c = e2, v = o2, p();
+          } else c = -1, v = -1, p();
         }();
       });
     }, 30);
   }
-  function p(e2) {
+  function f(e2) {
     u2.value = e2, C();
   }
   function C() {
-    u2.value && a.value && !i.value && (n.$emit("pageLoaded"), i.value = true);
+    u2.value && a.value && !l.value && (n.$emit("pageLoaded"), l.value = true);
   }
   return { pageContext: t2, setPageContext: function(e2) {
     t2.value = e2;
   }, countComponentsTotalNmber: function() {
-    r.value++, u2.value = false, i.value = false;
+    r.value++, u2.value = false, l.value = false;
   }, countComponentsLoadedNumber: function() {
-    s.value++, f();
-  }, componentsTotalNmber: r, componentsLoadedNumber: s, setPageComponentsLoaded: p, setFormPageDataLoadState: function(e2) {
+    s.value++, p();
+  }, componentsTotalNmber: r, componentsLoadedNumber: s, setPageComponentsLoaded: f, setFormPageDataLoadState: function(e2) {
     a.value = e2, C();
   }, formPageDataLoaded: a, pageComponentsLoaded: u2, restorePageLoadState: function() {
-    u2.value = false, a.value = false, i.value = false;
-  }, pageLoaded: i, getPageLoaded: function() {
-    return i.value;
+    u2.value = false, a.value = false, l.value = false;
+  }, pageLoaded: l, getPageLoaded: function() {
+    return l.value;
   }, setPageLoaded: function(e2) {
-    i.value = e2;
+    l.value = e2;
   }, setAutoAnchorComponentConditions: function(e2, o2) {
-    l.value.push({ uuid: e2, conditions: o2 });
+    i.value.push({ uuid: e2, conditions: o2 });
   }, getAutoAnchorComponentConditions: function() {
-    return l.value;
+    return i.value;
   }, resetAutoAnchorComponentConditions: function() {
-    l.value = [];
+    i.value = [];
   }, resetComponentCounters: function() {
-    r.value = 0, s.value = 0, u2.value = false, i.value = false, c = -1, d = -1, m = 0, v && (clearTimeout(v), v = null);
+    r.value = 0, s.value = 0, u2.value = false, l.value = false, c = -1, v = -1, m = 0, d && (clearTimeout(d), d = null);
   } };
 });
 export {

package/dist/es/components/runtime/utils/table-utils.js

@@ -8,7 +8,7 @@ import { ExpressionEvaluator as r } from "../views/assemblys/chart/table/chart-t
 import { getFormPropName as u } from "./page-helper-util.js";
 function a(t2) {
   const e2 = t2.pageContext && t2.pageContext.code;
-  o.$emit(e2 + "_open-dialog", t2);
+  console.log("弹框显示页面--popupToPage====params=", t2), o.$emit(e2 + "_open-dialog", t2);
 }
 function p(t2, e2) {
   const o2 = t2.tableName;
@@ -18,7 +18,7 @@ function p(t2, e2) {
 }
 function l(t2, e2, o2, i2) {
   const r2 = !(!e2.props || !e2.props.base) && e2.props.base.showOperation, u2 = e2.btnList;
-  r2 && u2 && u2.forEach((e3) => {
+  console.log("configure.btnList===", e2.btnList, "configure====", e2), r2 && u2 && u2.forEach((e3) => {
     const r3 = {}, u3 = Object.assign({}, e3.props.base);
     if ("custom" === e3.name ? u3.customControl = u3.name : u3.elementType = "el-button", void 0 === e3.isPermission || e3.isPermission + "" == "true") {
       const o3 = n(e3, t2);
@@ -73,7 +73,7 @@ function b(o2, n2, i2) {
   const s2 = t(o2, i2);
   return e.get(s2 + "/common/last-unread-file-task/" + n2);
 }
-function d(o2, n2, i2) {
+function g(o2, n2, i2) {
   const s2 = t(o2, i2);
   return e.put(s2 + "/common/file-task-read/" + n2);
 }
@@ -85,5 +85,5 @@ export {
   m as isHasFieldAuth,
   f as isHasFieldPermissionAuth,
   a as popupToPage,
-  d as setFileTaskRead
+  g as setFileTaskRead
 };

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-3175013a"]]);
+const r = o(e, [["__scopeId", "data-v-24135501"]]);
 export {
   r as default
 };

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

@@ -1,8 +1,8 @@
-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 { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as n, openBlock as a, normalizeClass as i, normalizeStyle as l, unref as s, withDirectives as u, 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 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 { updateChartOption as k } from "../../../../utils/charts/chart-columnline-util.js";
+import { doClickJumpPageEvent as I } 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";
@@ -18,21 +18,24 @@ const A = e({ __name: "column-line-runtime", props: { pageContext: {}, configure
     "clearDrill" == F ? U.value && U.value.closeDrill && U.value.closeDrill(0) : "clickEvent" === F && Z(e3);
   }
   function Z(e3) {
-    if (e3.seriesIndex >= Q.series.length) return;
-    const r2 = Q.series[e3.seriesIndex].uuid, o2 = B[r2];
-    if (!o2) return;
+    if (console.log("clik0", e3), e3.seriesIndex >= Q.series.length) return;
+    console.log("clik1", e3);
+    const r2 = Q.series[e3.seriesIndex].uuid;
+    console.log("clik2", r2);
+    const o2 = B[r2];
+    if (console.log("clik3", o2), !o2) return;
     const t2 = { data: e3.data, dataIndex: e3.dataIndex, name: e3.name, seriesId: e3.seriesId, seriesIndex: e3.seriesIndex, seriesName: e3.seriesName, seriesType: e3.seriesType, value: e3.value };
-    k(H.pageContext, o2, t2);
+    I(H.pageContext, o2, t2);
   }
   g(H.configure, Q), o(() => {
     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) {
+    e3 && oe(e3), !z && H.configure.clickSet && S.value && m(H.pageContext, H.configure, S.value.chart), 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), x(H.pageContext, [L], M.drillParams));
+    L ? (true !== e3 && (L.autoRefresh = true), x(H.pageContext, [L], M.drillParams)) : console.log("无数据源配置，不需要查询!");
   }
   t(M, () => {
     $ != M.groupValue && ($ = M.groupValue, L && (L.services[0].groupValue = M.groupValue), ee(false));
@@ -40,13 +43,14 @@ 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), S.value && S.value.setOption(Q, true));
+    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, 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, k(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, M);
-  }, 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));
+  }, chartOption: Q }), (e3, r2) => (a(), n("div", { style: l(s(J)), class: i([s(K), "amb-widget-chart amb-widget-flex amb-chart-container"]), ref_key: "thisRef", ref: N }, [u(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/common/common-chart-header-group.vue.js

@@ -1,9 +1,13 @@
-import { defineComponent as e, watch as l, resolveComponent as o, createBlock as a, createElementBlock as u, openBlock as r, withCtx as d, Fragment as n, renderList as p } from "vue";
-const t = e({ __name: "common-chart-header-group", props: { headerInfo: { type: Object, required: true } }, setup: (e2) => (l(e2.headerInfo, () => {
-}), (l2, t2) => {
-  const h = o("el-checkbox"), f = o("el-checkbox-group"), m = o("el-radio"), V = o("el-radio-button"), b = o("el-radio-group");
-  return "checkbox" == e2.headerInfo.groupComponent ? (r(), a(f, { key: 0, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t2[0] || (t2[0] = (l3) => e2.headerInfo.groupValue = l3) }, { default: d(() => [(r(true), u(n, null, p(e2.headerInfo.options, (e3) => (r(), a(h, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"])) : "radio" == e2.headerInfo.groupComponent ? (r(true), u(n, { key: 1 }, p(e2.headerInfo.options, (l3) => (r(), a(m, { modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t2[1] || (t2[1] = (l4) => e2.headerInfo.groupValue = l4), value: l3.value, label: l3.label }, null, 8, ["modelValue", "value", "label"]))), 256)) : (r(), a(b, { key: 2, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t2[2] || (t2[2] = (l3) => e2.headerInfo.groupValue = l3) }, { default: d(() => [(r(true), u(n, null, p(e2.headerInfo.options, (e3) => (r(), a(V, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"]));
-}) });
+import { defineComponent as e, watch as l, resolveComponent as o, createBlock as a, createElementBlock as u, openBlock as r, withCtx as n, Fragment as d, renderList as p } from "vue";
+const t = e({ __name: "common-chart-header-group", props: { headerInfo: { type: Object, required: true } }, setup(e2) {
+  const t2 = e2;
+  return l(t2.headerInfo, () => {
+    console.log("props.headerInfo", t2.headerInfo);
+  }), (l2, t3) => {
+    const h = o("el-checkbox"), f = o("el-checkbox-group"), m = o("el-radio"), I = o("el-radio-button"), V = o("el-radio-group");
+    return "checkbox" == e2.headerInfo.groupComponent ? (r(), a(f, { key: 0, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[0] || (t3[0] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(h, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"])) : "radio" == e2.headerInfo.groupComponent ? (r(true), u(d, { key: 1 }, p(e2.headerInfo.options, (l3) => (r(), a(m, { modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[1] || (t3[1] = (l4) => e2.headerInfo.groupValue = l4), value: l3.value, label: l3.label }, null, 8, ["modelValue", "value", "label"]))), 256)) : (r(), a(V, { key: 2, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[2] || (t3[2] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(I, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"]));
+  };
+} });
 export {
   t as default
 };