super-page-runtime 2.3.5 → 2.3.6-sit1

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

@@ -8,8 +8,8 @@ import C from "../eventBus.js";
 import T from "axios";
 import { handleEvent as y, getTableUuid as h, doAfterClickEvent as P } from "./event-util.js";
 import { setStoreInfo as w } from "../store-util.js";
-import { getPermissionCodes as k, getDefaultValue as R, getModelFields as M } from "../page-init-util.js";
-import { updateChartDatasources as N, caculateShowCondition as v, getVariableValue as S, setVariableValue as I } from "../page-helper-util.js";
+import { getPermissionCodes as k, getDefaultValue as R, getModelFields as N } from "../page-init-util.js";
+import { updateChartDatasources as M, caculateShowCondition as v, getVariableValue as S, setVariableValue as I } from "../page-helper-util.js";
 import x from "./print-label.js";
 import { getTableNameByTableUuid as A } from "../table-utils.js";
 import { getWorkflowRules as O, packageCustomRules as U } from "./validator-util.js";
@@ -71,7 +71,7 @@ const j = { save: function(e2) {
 }, downloadTemplate: function(e2) {
   !function(e3) {
     var _a;
-    const t2 = e3.pageContext, s2 = e3.configureObj, o2 = s2.props.base, a2 = i(o2.templateFiles);
+    const t2 = e3.pageContext, s2 = e3.configureObj, o2 = s2.props.base, a2 = i(o2.templateFiles, t2, s2);
     let r2, c2;
     a2 && a2.length > 0 && (r2 = a2[0].templateUuid, c2 = a2[0].templateName);
     const u2 = t2.systemCode, l2 = t2.backendUrl, p2 = c2;
@@ -226,8 +226,7 @@ const j = { save: function(e2) {
     let t2 = null;
     try {
       if (t2 = e3.menuItem ? e3.menuItem.templateUuid : e3.configureObj.props.base.template[0].templateUuid, !t2) throw new Error("未找到模板");
-    } catch (t3) {
-      console.error("打印标签失败，未在配置中找到找到模板", t3, e3);
+    } catch (e4) {
     }
     x.printLabel(e3, t2);
   }(e2);
@@ -280,7 +279,7 @@ function D(e2) {
   let o2 = null;
   n2 && n2.runtime && (o2 = n2.runtime.props);
   const i2 = o2 ? o2.state : void 0;
-  o2 && (o2.state = "disabled"), N(t2, s2, void 0, e2.isInitChart).then(() => {
+  o2 && (o2.state = "disabled"), M(t2, s2, void 0, e2.isInitChart).then(() => {
     o2 && (o2.state = i2);
   }).catch(() => {
     o2 && (o2.state = i2);
@@ -288,6 +287,7 @@ function D(e2) {
 }
 function L(e2, s2, o2, i2) {
   var _a;
+  e2.clickUuid = s2.uuid;
   const a2 = o2.templateUuid, r2 = o2.templateName, c2 = e2.systemCode, u2 = (_a = s2.props.base) == null ? void 0 : _a.logSetting, l2 = t(e2), p2 = e2.beanName, d2 = s2.props.base, m2 = s2.tableName ? s2.tableName : e2.tableName, f2 = e2.backendUrl, g2 = E.getFormViewData(e2), b2 = void 0 === d2.isPermission || "true" === d2.isPermission || d2.isPermission, C2 = { entity: g2, fileName: a2, showName: r2, beanName: p2, isWorkflowForm: l2, functionCode: k(s2, e2), tableName: m2, isPermission: b2 + "", systemCode: c2, listCodesMap: e2.listCodesMap, pageCode: e2.code, pageVersion: e2.version };
   u2 && (C2.logSettingText = u2.join(""));
   const y2 = ie(e2);
@@ -319,6 +319,7 @@ function L(e2, s2, o2, i2) {
     });
   }(r2, f2, C2, e2.isTest), h2 && h2.then(() => {
     P(e2, s2);
+  }).catch((e3) => {
   });
 }
 function B() {
@@ -378,10 +379,11 @@ function q(t2, s2, n2, o2, i2) {
     let i3 = s3.props.base.successOperation;
     const a3 = s3.props.base.isNeedValueMapping, r2 = h(t3, s3);
     i3 || z.includes(s3.name) || (i3 = "refresh");
-    if ("refresh" === i3) if (r2) {
-      b(t3, r2).refresh();
-    } else console.error("tableUuid is empty");
-    else if ("closeWindow" === i3 || "closeWindowAndRefresh" === i3) {
+    if ("refresh" === i3) {
+      if (r2) {
+        b(t3, r2).refresh();
+      }
+    } else if ("closeWindow" === i3 || "closeWindowAndRefresh" === i3) {
       const o4 = e(t3.entity.page);
       let i4 = n3;
       i4 || (i4 = {}), Object.assign(o4, i4), J(t3, s3, o4, a3);
@@ -435,7 +437,7 @@ function Y(e2, t2, s2, n2, o2) {
       Array.isArray(e3) && e3.length > 0 && (n3 = e3[0]), t3.forEach((e4) => {
         const t4 = e4.source;
         if (!t4) return;
-        const o3 = t4.split("."), i3 = S(n3, o3), a2 = e4.target, r2 = M(null, a2);
+        const o3 = t4.split("."), i3 = S(n3, o3), a2 = e4.target, r2 = N(null, a2);
         I(s3.entity, r2, i3);
       });
     }
@@ -453,7 +455,7 @@ function K(e2, t2, s2, n2) {
       const s3 = h(e2, t2);
       if (s3) {
         b(e2, s3).refresh();
-      } else console.error("tableUuid is empty");
+      }
     } else if (i2 && "form" === i2) {
       const t3 = e2.entity.data;
       fe(e2, t3.ID ? t3.ID : t3.id);
@@ -514,10 +516,10 @@ function X(e2, s2) {
   null != w2 && f2.append("isWorkflowEntity", w2 + "");
   const R2 = k(a2, i2);
   R2 && f2.append("functionCode", R2);
-  const M2 = ie(i2);
-  f2.append("additionalParamMapStr", JSON.stringify(M2));
-  const N2 = void 0 === p2.isPermission || "true" === p2.isPermission || p2.isPermission;
-  f2.append("isPermission", N2 + "");
+  const N2 = ie(i2);
+  f2.append("additionalParamMapStr", JSON.stringify(N2));
+  const M2 = void 0 === p2.isPermission || "true" === p2.isPermission || p2.isPermission;
+  f2.append("isPermission", M2 + "");
   const v2 = i2.systemCode;
   v2 && f2.append("systemCode", v2);
   const S2 = i2.backendUrl;
@@ -554,7 +556,7 @@ function ee(e2) {
   const p2 = (_a = n2.props.base) == null ? void 0 : _a.logSetting;
   p2 && (c2.logSettingText = p2.join("")), c2.systemCode || (c2.systemCode = i2);
   const d2 = ie(t2);
-  c2.additionalParamMap = d2, d2.ids && d2.ids.length > 0 && ("string" == typeof d2.ids ? c2.ids = d2.ids.split(",") : Array.isArray(d2.ids) ? c2.ids = d2.ids : "number" == typeof ids ? c2.ids = [d2.ids] : console.error("ids参数类型错误"));
+  c2.additionalParamMap = d2, d2.ids && d2.ids.length > 0 && ("string" == typeof d2.ids ? c2.ids = d2.ids.split(",") : Array.isArray(d2.ids) ? c2.ids = d2.ids : "number" == typeof ids && (c2.ids = [d2.ids]));
   const m2 = n2.props.base.successOperation;
   return m2 && "noOperation" === m2 && (c2.unControlVersion = true), c2.isWorkflowEntity = true, c2;
 }
@@ -807,7 +809,7 @@ function ge(e2, s2, o2) {
         let d2 = t2 || null, f2 = t2 ? [t2] : null;
         void 0 === s3 || s3 ? (d2 || (d2 = p2 && p2.id ? p2.id : null), f2 || (f2 = p2 ? p2.ids : null)) : (d2 = null, f2 = null, p2._id = p2.id, p2.id = null);
         const g2 = p2 ? p2.taskId : null, b2 = u2, C2 = { pageCode: u2, pageVersion: l2, tableName: e3.tableName, formNoRuleCode: e3.formNoRuleCode, isWorkflowEntity: true, systemCode: a2, functionCode: b2 + ".workflowGets", listCodesMap: e3.listCodesMap };
-        if (e3.listCodesMap, (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
+        if ((!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
           const t3 = {};
           e3.tableUuids.forEach((e4) => {
             const s4 = r(u2, l2, e4);
@@ -860,7 +862,7 @@ function ge(e2, s2, o2) {
         let d2 = t2 || null, f2 = t2 ? [t2] : null;
         void 0 === s3 || s3 ? (d2 || (d2 = p2 && p2.id ? p2.id : null), f2 || (f2 = p2 ? p2.ids : null)) : (d2 = null, f2 = null, p2._id = p2.id, p2.id = null);
         const g2 = p2 ? p2.taskId : null, b2 = u2, C2 = n(e3.backendUrl, e3.isTest), T2 = { pageCode: u2, pageVersion: l2, tableName: e3.tableName, formNoRuleCode: e3.formNoRuleCode, id: d2, systemCode: a2, functionCode: b2 + ".gets", listCodesMap: e3.listCodesMap };
-        if (!T2.id && p2 && p2._t_ && m(p2._t_ + "_id") && (T2.id = m(p2._t_ + "_id")), f2 && (T2.ids = be(f2)), e3.notIdInitializationList && (T2.noIdAndTaskIdInitSetting = JSON.stringify(e3.notIdInitializationList)), p2 && (T2.additionalParamMap = p2), e3.beanName && (T2.beanName = e3.beanName), g2 && (T2.taskId = g2), e3.listCodesMap, (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
+        if (!T2.id && p2 && p2._t_ && m(p2._t_ + "_id") && (T2.id = m(p2._t_ + "_id")), f2 && (T2.ids = be(f2)), e3.notIdInitializationList && (T2.noIdAndTaskIdInitSetting = JSON.stringify(e3.notIdInitializationList)), p2 && (T2.additionalParamMap = p2), e3.beanName && (T2.beanName = e3.beanName), g2 && (T2.taskId = g2), (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
           const t3 = {};
           e3.tableUuids.forEach((e4) => {
             const s4 = r(u2, l2, e4);

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) => {
-                console.error(t4), e6(false);
+                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

@@ -6,14 +6,14 @@ 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,7 +40,6 @@ 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) {
@@ -58,16 +57,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, e2.query)) {
+  if (e2 && (e2.params && Object.assign(t2, e2.params), 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) {
@@ -82,7 +81,7 @@ function E(e2, t2) {
   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 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;
@@ -107,6 +106,8 @@ function P(e2, t2, s2, i2) {
   return n2;
 }
 function M(e2, t2) {
+  var _a, _b;
+  if (false === ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.isPermission)) return "true";
   const s2 = [];
   if (e2.autoPermissions) for (const i2 of e2.autoPermissions) s2.push(t2.code + "." + i2.simpleCode);
   if (e2.functionCodes) {
@@ -117,47 +118,58 @@ function M(e2, t2) {
       if ("service" == r2) l2 = o2;
       else if ("standard" === r2) l2 = t2.code + "." + o2;
       else {
-        l2 = "custom" === j(o2, t2).type ? o2 : t2.code + "." + o2;
+        l2 = "custom" === k(o2, t2).type ? o2 : t2.code + "." + o2;
       }
       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) {
+function j(s2, i2, n2) {
   const o2 = 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 });
 }
-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 n2 = t2.props && t2.props.base ? t2.props.base.prop : null, o2 = p(e2);
+  let r2 = false;
+  if (o2 && 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 (n2) {
+    const l2 = i(n2);
+    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), o2 && !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];
@@ -173,16 +185,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 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;
+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;
   }, countComponentsTotalNmber: function() {
     l.value++, t2.value = false, u.value = false;
   }, countComponentsLoadedNumber: function() {
-    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);
+    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);
   }, setFormPageDataLoadState: function(e2) {
-    n.value = e2, t2.value && n.value && (t2.value, n.value, u.value = true);
+    n.value = e2, 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;
-  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;
+  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,13 +1,9 @@
-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"]));
-  };
-} });
+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"]));
+}) });
 export {
   t as default
 };