super-page-runtime 2.3.4-sit1 → 2.3.5-rc1

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

@@ -1,6 +1,6 @@
 import e from "async-validator";
 import { ElMessage as t } from "element-plus";
-import { getComponentRefByCode as n, getAllComponentRefs as s, getComponentRef as r } from "../global-refs.js";
+import { getComponentRefByCode as n, getComponentRef as s, getAllComponentRefs as r } from "../global-refs.js";
 import { getI18n as i } from "agilebuilder-ui/src/utils/util";
 import { getAdditionalParamMap as l } from "./standard-event.js";
 import { isPromise as o } from "agilebuilder-ui/src/utils/common-util";
@@ -94,17 +94,17 @@ function p(e2, n2, s2) {
 }
 function g(e2) {
   return new Promise((t2, n2) => {
-    const s2 = [], i2 = e2.customValidatorUuids;
+    const r2 = [], i2 = e2.customValidatorUuids;
     i2 && i2.forEach((t3) => {
-      const n3 = r(e2, t3);
-      n3 && n3.validator && s2.push(n3.validator());
-    }), s2 && s2.length > 0 ? Promise.all(s2).then((e3) => {
+      const n3 = s(e2, t3);
+      n3 && n3.validator && r2.push(n3.validator());
+    }), r2 && r2.length > 0 ? Promise.all(r2).then((e3) => {
       e3.includes(false) ? t2(false) : t2(true);
     }) : t2(true);
   });
 }
 function b(e2, t2, n2) {
-  return new Promise((s2, l2) => {
+  return new Promise((r2, l2) => {
     const a2 = JSON.parse(JSON.stringify(e2));
     if (n2 && 0 !== Object.keys(n2).length) {
       if (true === c(a2, n2, null, null)) {
@@ -113,7 +113,7 @@ function b(e2, t2, n2) {
           const t3 = e4.tableUuids;
           if (!t3) return true;
           for (let n3 = 0; n3 < t3.length; n3++) {
-            const s3 = t3[n3], i2 = r(e4, s3);
+            const r3 = t3[n3], i2 = s(e4, r3);
             if (i2) {
               if (!i2.validatorSunTableListData()) return false;
             }
@@ -124,33 +124,33 @@ function b(e2, t2, n2) {
           const e4 = function(e5) {
             const t3 = [];
             e5.customRuleEvents && e5.customRuleEvents.length > 0 && e5.customRuleEvents.forEach((n3) => {
-              n3.events.forEach((s3) => {
-                const r2 = e5.customEvents[s3];
-                t3.push(r2.apply(r2, [{ prop: n3.prop, pageContext: e5 }]));
+              n3.events.forEach((s2) => {
+                const r3 = e5.customEvents[s2];
+                t3.push(r3.apply(r3, [{ prop: n3.prop, pageContext: e5 }]));
               });
             });
             if (t3 && t3.length > 0) return new Promise((e6, n3) => {
-              const s3 = [], r2 = [];
+              const s2 = [], r3 = [];
               t3.forEach((e7) => {
-                o(e7) ? s3.push(e7) : r2.push(e7);
-              }), r2.includes(false) && e6(false), s3.length > 0 ? Promise.all(s3).then((t4) => {
+                o(e7) ? s2.push(e7) : r3.push(e7);
+              }), r3.includes(false) && e6(false), s2.length > 0 ? Promise.all(s2).then((t4) => {
                 t4.includes(false) ? e6(false) : e6(true);
               }).catch((t4) => {
-                e6(false);
+                console.error(t4), e6(false);
               }) : e6(true);
             });
             return null;
           }(t2);
           e4 && o(e4) ? e4.then((e5) => {
             e5 ? g(t2).then((e6) => {
-              s2(e6);
-            }) : s2(false);
+              r2(e6);
+            }) : r2(false);
           }) : g(t2).then((e5) => {
-            s2(e5);
+            r2(e5);
           });
         } else l2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
       } else l2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
-    } else s2(true);
+    } else r2(true);
   });
 }
 function h(e2, t2) {
@@ -212,19 +212,19 @@ function R(e2) {
   E(e2, { disabled: true });
 }
 function E(e2, t2) {
-  const n2 = s(e2);
+  const n2 = r(e2);
   if (n2) for (const e3 in n2) {
     const s2 = n2[e3];
     O(s2 ? s2.value : s2, t2);
   }
 }
-function k(e2, t2, s2) {
+function k(e2, t2, r2) {
   var _a;
   let i2, l2;
-  if (s2 ? (i2 = n(e2, s2), l2 = i2 ? i2.getTableUuid() : null) : (l2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = l2 ? r(e2, l2) : null), !i2) return;
+  if (r2 ? (i2 = n(e2, r2), l2 = i2 ? i2.getTableUuid() : null) : (l2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = l2 ? s(e2, l2) : null), !i2) return;
   const o2 = e2.code, u2 = e2.version, f2 = a(o2, u2, l2);
-  if (((_a = e2.workflowRules) == null ? void 0 : _a.subRules) && e2.workflowRules.subRules[s2]) {
-    const n2 = e2.workflowRules.subRules[s2];
+  if (((_a = e2.workflowRules) == null ? void 0 : _a.subRules) && e2.workflowRules.subRules[r2]) {
+    const n2 = e2.workflowRules.subRules[r2];
     t2.forEach((e3) => {
       n2[e3.name] = e3;
     });

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

@@ -44,5 +44,5 @@ export declare function getPermissionCodes(configure: Component, pageContext: Pa
  * @returns
  */
 export declare function queryPageSuperGrids(pageDesign: any, pageContext: any, publishVersion: any): Promise<any>;
-export declare function packageFormRules(pageContext: PageContext, configure: any): void;
+export declare function packageFormRules(pageContext: PageContext, configure: any, isHasPermission: boolean): void;
 export declare function controlObjectRenderState(pageContext: PageContext, propName: string): void;

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

@@ -1,19 +1,19 @@
 import e from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap as t } from "./events/standard-event.js";
 import { PageDimensions as s } from "./interfaces/page-design-types.js";
-import { getFormPropName as i, getVariableValue as n, setVariableValue as o, formatVariableValue as r } from "./page-helper-util.js";
+import { getFormPropName as i, getVariableValue as o, setVariableValue as n, formatVariableValue as r } from "./page-helper-util.js";
 import { getSessionCache as l } from "agilebuilder-ui/src/utils/auth";
 import { functions as a } from "./api/page-expose-util.js";
 import { isWorkflowPage as p, deepCopy as u } from "./common-util.js";
 import { packageCustomValidator as d } from "./events/validator-util.js";
-import { isMobileBrowser as m } from "agilebuilder-ui/src/utils/common-util";
-function f(t2) {
+import { isMobileBrowser as f } from "agilebuilder-ui/src/utils/common-util";
+function m(t2) {
   return e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + t2);
 }
 function c(e2) {
   var _a, _b, _c;
   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, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(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, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
+  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, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(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, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, branchFieldAuth: e2.branchFieldAuth, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
   if (e2.props && e2.props.notIdInitializationList) {
     let s2 = e2.props.notIdInitializationList;
     "string" == typeof s2 && (s2 = JSON.parse(s2)), s2.length > 0 && (t2.notIdInitializationList = s2);
@@ -23,7 +23,7 @@ function c(e2) {
     for (const t3 of e2.variables) t3.name && (t3.isArrayElement ? s2[t3.name] = [] : t3.defaultValue ? s2[t3.name] = t3.defaultValue : s2[t3.name] = void 0);
   }
   return function(e3) {
-    if (m()) {
+    if (f()) {
       e3.entity.page._isMobile = "true";
       const t3 = navigator ? navigator.userAgent : null;
       t3 ? t3.indexOf(" uni-app ") > 0 ? (e3.entity.page._isMobileApp = "true", e3.entity.page._isMobileBrowser = "false") : (e3.entity.page._isMobileApp = "false", e3.entity.page._isMobileBrowser = "true") : (e3.entity.page._isMobileApp = "false", e3.entity.page._isMobileBrowser = "false");
@@ -40,6 +40,7 @@ function g(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 b(e2) {
@@ -57,16 +58,16 @@ function b(e2) {
 function y(e2, t2) {
   if (e2) {
     Object.assign(t2, e2);
-    v(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
+    w(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
   }
 }
 function h(e2, t2) {
-  if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query)) {
+  if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query, e2.query)) {
     Object.assign(t2, e2.query);
-    v(e2.query.paramStoreId, t2);
+    w(e2.query.paramStoreId, t2);
   }
 }
-function v(e2, t2) {
+function w(e2, t2) {
   if (e2) {
     const s2 = l(e2);
     if (s2) {
@@ -78,85 +79,96 @@ function v(e2, t2) {
 function E(e2, t2) {
   let s2, i2 = t2;
   t2 || (s2 = e2.props.base ? e2.props.base : {}, i2 = s2.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"];
+  let o2 = null;
+  return t2 && !t2.startsWith("${") ? o2 = ["data", t2] : !e2 || i2 && i2.startsWith("${") ? i2.startsWith("${") ? (i2 = i2.substring(2, i2.length - 1), o2 = i2.split("."), e2 && o2.length < 2 && (o2 = [e2.uuid])) : e2 && (o2 = ["page", e2.uuid]) : o2 = ["page", e2.uuid], o2 || e2 ? o2 : ["temp"];
 }
-function w(e2, t2, s2) {
+function v(e2, t2, s2) {
   const i2 = E(t2, s2), r2 = e2.entity;
   if (null == r2.data.ID && null == r2.data.id) {
     let s3, l2, a2 = false;
     t2 && (s3 = t2.props.base ? t2.props.base : {}, l2 = t2.name, a2 = s3.multiple);
-    const p2 = n(r2, i2);
+    const p2 = o(r2, i2);
     if (null == p2) {
       const t3 = s3 ? s3.defaultValue : null;
       if (t3) {
         const s4 = P(e2, t3, l2, a2);
-        null != s4 && o(r2, i2, s4);
+        null != s4 && n(r2, i2, s4);
       }
     }
   }
   return i2;
 }
 function P(e2, t2, s2, i2) {
-  let n2;
-  if (t2 && (n2 = r(e2, t2), null != n2 && null != n2 && s2)) {
+  let o2;
+  if (t2 && (o2 = r(e2, t2), null != o2 && null != o2 && s2)) {
     let e3 = false;
-    "checkbox" == s2 ? e3 = true : "select" == s2 && (e3 = i2), e3 && (n2 = (n2 + "").split(","));
+    "checkbox" == s2 ? e3 = true : "select" == s2 && (e3 = i2), e3 && (o2 = (o2 + "").split(","));
   }
-  return n2;
+  return o2;
 }
 function M(e2, t2) {
   const s2 = [];
   if (e2.autoPermissions) for (const i2 of e2.autoPermissions) s2.push(t2.code + "." + i2.simpleCode);
   if (e2.functionCodes) {
-    const i2 = e2.sourceTypes ? e2.sourceTypes : [], n2 = e2.functionCodes;
-    for (let e3 = 0; e3 < n2.length; e3++) {
-      const o2 = n2[e3], r2 = e3 < i2.length ? i2[e3] : "";
+    const i2 = e2.sourceTypes ? e2.sourceTypes : [], o2 = e2.functionCodes;
+    for (let e3 = 0; e3 < o2.length; e3++) {
+      const n2 = o2[e3], r2 = e3 < i2.length ? i2[e3] : "";
       let l2 = "";
-      if ("service" == r2) l2 = o2;
-      else if ("standard" === r2) l2 = t2.code + "." + o2;
+      if ("service" == r2) l2 = n2;
+      else if ("standard" === r2) l2 = t2.code + "." + n2;
       else {
-        l2 = "custom" === j(o2, t2).type ? o2 : t2.code + "." + o2;
+        l2 = "custom" === k(n2, t2).type ? n2 : t2.code + "." + n2;
       }
       s2.includes(l2) || s2.push(l2);
     }
   }
   return s2.join(",");
 }
-function j(e2, t2) {
+function k(e2, t2) {
   const s2 = t2.pagePermissions;
   if (s2 && s2.length > 0) {
     for (let t3 = 0; t3 < s2.length; t3++) if (s2[t3].simpleCode === e2) return s2[t3];
   }
   return null;
 }
-function C(s2, i2, n2) {
-  const o2 = s2.tableRuntimes, r2 = t(i2);
+function j(s2, i2, o2) {
+  const n2 = s2.tableRuntimes, r2 = t(i2);
   let l2;
   const a2 = i2.code;
-  return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: o2, additionalParamMapJson: l2, pageCode: a2, publishVersion: n2, pageType: s2.pageType });
+  return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: n2, additionalParamMapJson: l2, pageCode: a2, publishVersion: o2, pageType: s2.pageType });
 }
-const I = ["button-detail", "print-label"];
-function O(e2, t2) {
+const C = ["button-detail", "print-label"];
+function I(e2, t2, s2) {
   var _a, _b;
-  const s2 = t2.props && t2.props.base ? t2.props.base.prop : null, n2 = p(e2);
-  let o2 = false;
-  if (n2 && I.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
+  const o2 = t2.props && t2.props.base ? t2.props.base.prop : null, n2 = p(e2);
+  let r2 = false;
+  if (n2 && C.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
     const s3 = e2.fieldPermissionMap.get("all_fields");
-    false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", o2 = true);
+    false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", r2 = true);
   }
-  if (s2) {
-    const r2 = i(s2);
-    if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[r2] || (e2.rules[r2] = []), t2.props.rules.forEach((e3) => {
-      d(e3);
-    }), e2.rules[r2] = t2.props.rules), n2 && !o2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
-      const s3 = e2.fieldPermissionMap.get(r2);
-      t2.runtime.props || (t2.runtime.props = {}), s3 ? false === s3.canEdit ? t2.runtime.props.state = "disabled" : s3.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true) : t2.runtime.props.state = "";
+  if (o2) {
+    const l2 = i(o2);
+    if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[l2] || (e2.rules[l2] = []), t2.props.rules.forEach((e3) => {
+      d(e3), !s2 && e3 && e3.required && (e3.required = false);
+    }), e2.rules[l2] = t2.props.rules), n2 && !r2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
+      const i2 = e2.fieldPermissionMap.get(l2);
+      if (!s2 && e2.workflowRules && (e2.workflowRules[l2] || e2.workflowRules.rules && e2.workflowRules.rules[l2])) {
+        let t3 = e2.workflowRules[l2];
+        if (!t3 && e2.workflowRules.rules && (t3 = e2.workflowRules.rules[l2]), t3 && Array.isArray(t3) && t3.length > 0) for (let e3 = 0; e3 < t3.length; e3++) {
+          const s3 = t3[e3];
+          if (s3 && s3.required) {
+            s3.required = false;
+            break;
+          }
+        }
+        else t3 && t3.required && (t3.required = false);
+      }
+      t2.runtime.props || (t2.runtime.props = {}), i2 ? (!s2 && 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: r2, events: t2.props.customRuleEvents }));
+    ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: l2, events: t2.props.customRuleEvents }));
   }
 }
-function _(e2, t2) {
+function O(e2, t2) {
   if (e2.initInfo) {
     ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((s2) => {
       const i2 = e2.initInfo[s2];
@@ -172,16 +184,16 @@ function _(e2, t2) {
   }
 }
 export {
-  _ as controlObjectRenderState,
+  O as controlObjectRenderState,
   c as convertToPageContext,
   P as getDefaultValue,
-  w as getFormModelFields,
+  v as getFormModelFields,
   E as getModelFields,
   M as getPermissionCodes,
   b as packageAdditionalMapWithLocationSearch,
   y as packageAdditionalMapWithPageRequest,
   h as packageAdditionalMapWithRoute,
-  O as packageFormRules,
-  f as queryPageDesignByCode,
-  C as queryPageSuperGrids
+  I as packageFormRules,
+  m as queryPageDesignByCode,
+  j as queryPageSuperGrids
 };

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

@@ -1,18 +1,18 @@
 import { ref as e } from "vue";
-import { defineStore as o } from "pinia";
-import a from "./eventBus.js";
-const t = o("pageContextUtil", () => {
-  const o2 = e({ systemCode: "", systemVersion: -1 }), t2 = e(false), n = e(false), u = e(false), l = e(0), d = e(0);
-  return { pageContext: o2, setPageContext: function(e2) {
-    o2.value = e2;
+import { defineStore as a } from "pinia";
+import o from "./eventBus.js";
+const t = a("pageContextUtil", () => {
+  const a2 = e({ systemCode: "", systemVersion: -1 }), t2 = e(false), n = e(false), u = e(false), l = e(0), v = e(0);
+  return { pageContext: a2, setPageContext: function(e2) {
+    a2.value = e2;
   }, countComponentsTotalNmber: function() {
     l.value++, t2.value = false, u.value = false;
   }, countComponentsLoadedNumber: function() {
-    d.value++, u.value = false;
-  }, componentsTotalNmber: l, componentsLoadedNumber: d, setPageComponentsLoaded: function(e2) {
-    t2.value = e2, t2.value && n.value && (a.$emit("pageLoaded"), u.value = true);
+    v.value++, u.value = false;
+  }, componentsTotalNmber: l, componentsLoadedNumber: v, setPageComponentsLoaded: function(e2) {
+    t2.value = e2, t2.value && n.value && (o.$emit("pageLoaded"), u.value = true);
   }, setFormPageDataLoadState: function(e2) {
-    n.value = e2, t2.value && n.value && (u.value = true);
+    n.value = e2, t2.value && n.value && (t2.value, n.value, u.value = true);
   }, formPageDataLoaded: n, pageComponentsLoaded: t2, restorePageLoadState: function() {
     t2.value = false, n.value = false, u.value = false;
   }, pageLoaded: u, getPageLoaded: function() {

package/dist/es/components/runtime/utils/table-utils.d.ts

@@ -18,3 +18,17 @@ export declare function getDistanceToAppContainer(tableDivRef: any): {
     distanceToTop: number;
     distanceToBottom: number;
 };
+/**
+ * 是否有字段的权限
+ * @param pageContext
+ * @param fieldName
+ * @returns
+ */
+export declare function isHasFieldAuth(pageContext: any, configure: any): boolean;
+/**
+ * 是否有字段的权限
+ * @param pageContext
+ * @param fieldName
+ * @returns
+ */
+export declare function isHasFieldPermissionAuth(pageContext: any, tableName: any, fieldName: any): boolean;

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

@@ -1,55 +1,80 @@
 import "agilebuilder-ui/src/utils/common-util";
 import "agilebuilder-ui/src/utils/util";
+import { ExpressionEvaluator as t } from "../views/assemblys/chart/table/chart-table-util.js";
+import { getCustomFunc as e } from "./events/event-util.js";
 import "agilebuilder-ui/src/utils/request";
-import t from "./eventBus.js";
-import { getPermissionCodes as e } from "./page-init-util.js";
-import { getCustomFunc as i } from "./events/event-util.js";
-import { $t as o } from "./i18n-util.js";
-import { ExpressionEvaluator as s } from "../views/assemblys/chart/table/chart-table-util.js";
-function n(e2) {
-  const i2 = e2.pageContext && e2.pageContext.code;
-  t.$emit(i2 + "_open-dialog", e2);
+import i from "./eventBus.js";
+import { getPermissionCodes as o } from "./page-init-util.js";
+import { $t as n } from "./i18n-util.js";
+import { getFormPropName as s } from "./page-helper-util.js";
+function r(t2) {
+  const e2 = t2.pageContext && t2.pageContext.code;
+  i.$emit(e2 + "_open-dialog", t2);
 }
-function r(t2, e2) {
+function u(t2, e2) {
   const i2 = t2.tableName;
   if (!e2 && i2) return i2;
   let o2;
   return t2.tableRuntimes && e2 && t2.tableRuntimes[e2] && (o2 = JSON.parse(t2.tableRuntimes[e2].configure)), o2 && o2.props && o2.props.dataOrigin ? o2.props.dataOrigin.tableName : null;
 }
-function u(t2, i2, s2, n2) {
-  const r2 = !(!i2.props || !i2.props.base) && i2.props.base.showOperation, u2 = i2.btnList;
-  r2 && u2 && u2.forEach((i3) => {
-    const r3 = {}, u3 = Object.assign({}, i3.props.base);
-    if ("custom" === i3.name ? u3.customControl = u3.name : u3.elementType = "el-button", void 0 === i3.isPermission || i3.isPermission + "" == "true") {
-      const o2 = e(i3, t2);
-      o2 && (u3.permission = o2);
+function l(t2, e2, i2, s2) {
+  const r2 = !(!e2.props || !e2.props.base) && e2.props.base.showOperation, u2 = e2.btnList;
+  e2.btnList, 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 i3 = o(e3, t2);
+      i3 && (u3.permission = i3);
     }
-    if (u3.label = o(u3.title), u3.sourceButton = { uuid: i3.uuid }, r3.props = u3, void 0 !== n2) {
-      const t3 = n2(i3);
+    if (u3.label = n(u3.title), u3.sourceButton = { uuid: e3.uuid }, r3.props = u3, void 0 !== s2) {
+      const t3 = s2(e3);
       r3.onClick = (t3 == null ? void 0 : t3.onClick) ?? t3, r3.eventName = t3 == null ? void 0 : t3.eventName;
     }
-    s2.push(r3);
+    i2.push(r3);
   });
 }
-function l(t2, e2, o2, n2) {
+function p(i2, o2, n2, s2) {
   let r2;
-  const u2 = o2 == null ? void 0 : o2.some((o3) => {
+  const u2 = n2 == null ? void 0 : n2.some((n3) => {
     let u3 = false;
-    if (o3.scopeFunc) {
-      const s2 = i(t2, o3.scopeFunc);
-      if (s2) {
-        s2.apply(s2, [{ pageContext: t2, configureObj: e2, row: n2 }]) && (u3 = true);
+    if (n3.scopeFunc) {
+      const t2 = e(i2, n3.scopeFunc);
+      if (t2) {
+        t2.apply(t2, [{ pageContext: i2, configureObj: o2, row: s2 }]) && (u3 = true);
       }
-    } else if (o3.showCondition && o3.showCondition.length > 0) {
-      s.evaluate(t2, o3.showCondition, n2) && (u3 = true);
+    } else if (n3.showCondition && n3.showCondition.length > 0) {
+      t.evaluate(i2, n3.showCondition, s2) && (u3 = true);
     } else u3 = true;
-    if (u3) return r2 = o3, true;
+    if (u3) return r2 = n3, true;
   });
   return { show: u2, toPage: r2 };
 }
+function a(t2, e2) {
+  var _a;
+  const i2 = t2.tableName;
+  let o2 = "";
+  const n2 = (_a = e2 == null ? void 0 : e2.props) == null ? void 0 : _a.base;
+  if (n2 && n2.prop) {
+    const t3 = n2.prop;
+    o2 = s(t3);
+  }
+  return c(t2, i2, o2);
+}
+function c(t2, e2, i2) {
+  if (!i2 || !e2) return true;
+  const o2 = t2.branchFieldAuth;
+  if (o2) {
+    const t3 = o2.hasAuthFields;
+    if (t3 && t3[e2] && t3[e2].indexOf(i2) >= 0) return true;
+    const n2 = o2.allAuthFields;
+    if (n2 && n2[e2] && n2[e2].indexOf(i2) >= 0) return false;
+  }
+  return true;
+}
 export {
-  l as expressJump,
-  u as getOperationButtons,
-  r as getTableNameByTableUuid,
-  n as popupToPage
+  p as expressJump,
+  l as getOperationButtons,
+  u as getTableNameByTableUuid,
+  a as isHasFieldAuth,
+  c as isHasFieldPermissionAuth,
+  r as popupToPage
 };

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, () => {
+    t2.headerInfo;
+  }), (l2, t3) => {
+    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": 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(b, { 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(V, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"]));
+  };
+} });
 export {
   t as default
 };

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

@@ -3,12 +3,13 @@ import { Search as p } from "@element-plus/icons-vue";
 import g from "./common-chart-header-group.vue.js";
 import m from "./common-chart-header-breadcrumb.vue.js";
 import b from "./common-homepage-search.vue.js";
-import { setVariableValueWithProp as v, getValueFromSource as y, setValueForVariableName as w } from "../../../../utils/page-helper-util.js";
-const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-header-item" }, k = { class: "amb-widget-chart-header-item amb-widget-chart-header-center" }, j = { class: "amb-widget-chart-header-item" }, C = { key: 0, class: "amb-widget-chart-header-item" }, P = e({ __name: "common-chart-header", props: { headerInfo: { type: Object, required: true }, configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["drill-end"], setup(e2, { expose: P2, emit: _ }) {
+import { setVariableValueWithProp as v, getValueFromSource as y, setValueForVariableName as O } from "../../../../utils/page-helper-util.js";
+const w = { class: "amb-widget-chart-header" }, x = { class: "amb-widget-chart-header-item" }, k = { class: "amb-widget-chart-header-item amb-widget-chart-header-center" }, j = { class: "amb-widget-chart-header-item" }, C = { key: 0, class: "amb-widget-chart-header-item" }, P = e({ __name: "common-chart-header", props: { headerInfo: { type: Object, required: true }, configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["drill-end"], setup(e2, { expose: P2, emit: _ }) {
   const N = e2, D = o(null), A = o(), R = _;
   function S(e3) {
     const o2 = N.headerInfo.drillOptions.length;
-    if (!(e3 >= o2)) {
+    if (e3 >= o2) N.headerInfo.drillOptions;
+    else {
       for (let r2 = o2 - 1; r2 >= e3; r2--) N.headerInfo.drillOptions.splice(r2, 1);
       q(e3);
     }
@@ -34,7 +35,7 @@ const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-h
     for (let e4 of o2.variables) {
       if (!e4.fieldName || !e4.variable) continue;
       const o3 = y(r2, e4.fieldName, void 0);
-      w(N.pageContext.entity, e4.variable, o3);
+      O(N.pageContext.entity, e4.variable, o3);
     }
   }
   N.headerInfo.drillOptions || (N.headerInfo.drillOptions = []);
@@ -46,11 +47,12 @@ const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-h
     if (r2 + 1 >= N.headerInfo.options.length) {
       return F(o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : void 0), void R("drill-end", e3);
     }
+    N.headerInfo.options;
     const n2 = N.headerInfo.options[r2], t2 = o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : null, a2 = { fieldName: n2.target ? n2.target.replace(".", "_") : "", rawFieldName: n2.target ? n2.target : "", label: e3.name, value: e3.name, data: t2 };
     N.headerInfo.drillOptions.push(a2), q(r2 + 1);
   }, closeDrill: S }), (o2, v2) => {
-    const y2 = r("el-icon"), w2 = r("el-tooltip");
-    return t(), n("div", x, [a("div", O, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(w2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(u(p))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
+    const y2 = r("el-icon"), O2 = r("el-tooltip");
+    return t(), n("div", w, [a("div", x, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(O2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(u(p))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
   };
 } });
 export {