@fecp/designer 5.4.59 → 5.4.61

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.4.59";
+const version = "5.4.61";
 const packageJson = {
   version
 };

package/es/designer.css

@@ -5904,28 +5904,28 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-499ac4ec] {
+.fec-form[data-v-67c25477] {
   height: 100%;
 }
-[data-v-499ac4ec] .vgl-item {
+[data-v-67c25477] .vgl-item {
   transition: none;
 }
-[data-v-499ac4ec] .vgl-item > .el-form-item {
+[data-v-67c25477] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-499ac4ec] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-67c25477] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-499ac4ec] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-67c25477] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
   pointer-events: none;
 }
-[data-v-499ac4ec] .vgl-item > .el-container {
+[data-v-67c25477] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -845,40 +845,48 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       });
       const updatedLayoutData = cloneDeep(oriGridLayoutData.value || []);
+      const allVisibilityFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.visibility.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allVisibilityFieldIds.add(fieldId);
+        });
+      });
+      allVisibilityFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.hidden = true;
+        }
+      });
       relevantConfigs.visibility.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.hidden = false;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.hidden = true;
-            }
-          });
+        }
+      });
+      const allRequiredFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.required.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allRequiredFieldIds.add(fieldId);
+        });
+      });
+      allRequiredFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.component.required = false;
         }
       });
       relevantConfigs.required.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.required = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.required = false;
-            }
-          });
         }
       });
       const rules = {};
@@ -894,40 +902,48 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         rules[fieldName] = prodRules.value[fieldName];
       }
       formRules.value = rules;
+      const allReadonlyFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.readonly.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allReadonlyFieldIds.add(fieldId);
+        });
+      });
+      allReadonlyFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.component.readOnly = false;
+        }
+      });
       relevantConfigs.readonly.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.readOnly = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.readOnly = false;
-            }
-          });
+        }
+      });
+      const allDisabledFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.disabled.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allDisabledFieldIds.add(fieldId);
+        });
+      });
+      allDisabledFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.component.disabled = false;
         }
       });
       relevantConfigs.disabled.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.disabled = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.disabled = false;
-            }
-          });
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
@@ -1083,7 +1099,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-499ac4ec"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-67c25477"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -13,6 +13,7 @@ import api from "../../api/index.mjs";
 import { ElMessageBox } from "../../../../../node_modules/element-plus/es/components/message-box/index.mjs";
 import { ElMessage } from "../../../../../node_modules/element-plus/es/components/message/index.mjs";
 async function handlePageJump(node, data, fields, context) {
+  var _a, _b, _c;
   const dialogDoms = document.querySelectorAll(".el-modal-dialog");
   if ((dialogDoms == null ? void 0 : dialogDoms.length) > 0) {
     for (let i = 0; i < dialogDoms.length; i++) {
@@ -26,7 +27,10 @@ async function handlePageJump(node, data, fields, context) {
   }
   const basic = node.basic || {};
   const transitionType = basic.transitionType || "page";
-  const params = parseRouteParams(basic.routeParams, data, fields);
+  const formComponent = (_a = context.components) == null ? void 0 : _a.form;
+  const getFormDataMethod = (_c = (_b = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.getFormData;
+  let formData = getFormDataMethod();
+  const params = parseRouteParams(basic.routeParams, formData, fields);
   if (transitionType === "external") {
     const url = basic.routePath;
     if (!url) {

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.4.59";
+const version = "5.4.61";
 const packageJson = {
   version
 };

package/lib/designer.css

@@ -5904,28 +5904,28 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-499ac4ec] {
+.fec-form[data-v-67c25477] {
   height: 100%;
 }
-[data-v-499ac4ec] .vgl-item {
+[data-v-67c25477] .vgl-item {
   transition: none;
 }
-[data-v-499ac4ec] .vgl-item > .el-form-item {
+[data-v-67c25477] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-499ac4ec] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-67c25477] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-499ac4ec] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-67c25477] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
   pointer-events: none;
 }
-[data-v-499ac4ec] .vgl-item > .el-container {
+[data-v-67c25477] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -847,40 +847,48 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       });
       const updatedLayoutData = common.cloneDeep(oriGridLayoutData.value || []);
+      const allVisibilityFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.visibility.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allVisibilityFieldIds.add(fieldId);
+        });
+      });
+      allVisibilityFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.hidden = true;
+        }
+      });
       relevantConfigs.visibility.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.hidden = false;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.hidden = true;
-            }
-          });
+        }
+      });
+      const allRequiredFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.required.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allRequiredFieldIds.add(fieldId);
+        });
+      });
+      allRequiredFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.component.required = false;
         }
       });
       relevantConfigs.required.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.required = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.required = false;
-            }
-          });
         }
       });
       const rules = {};
@@ -896,40 +904,48 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         rules[fieldName] = prodRules.value[fieldName];
       }
       formRules.value = rules;
+      const allReadonlyFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.readonly.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allReadonlyFieldIds.add(fieldId);
+        });
+      });
+      allReadonlyFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.component.readOnly = false;
+        }
+      });
       relevantConfigs.readonly.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.readOnly = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.readOnly = false;
-            }
-          });
+        }
+      });
+      const allDisabledFieldIds = /* @__PURE__ */ new Set();
+      relevantConfigs.disabled.forEach((item) => {
+        (item.dataLinkFieldList || []).forEach((fieldId) => {
+          allDisabledFieldIds.add(fieldId);
+        });
+      });
+      allDisabledFieldIds.forEach((fieldId) => {
+        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+        if (layoutFieldItem) {
+          layoutFieldItem.component.disabled = false;
         }
       });
       relevantConfigs.disabled.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          dataLinkFieldList.forEach((fieldId) => {
+          (item.dataLinkFieldList || []).forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.disabled = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.disabled = false;
-            }
-          });
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
@@ -1085,5 +1101,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-499ac4ec"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-67c25477"]]);
 exports.default = _Form;

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -15,6 +15,7 @@ const index$1 = require("../../api/index.js");
 const index$3 = require("../../../../../node_modules/element-plus/es/components/message-box/index.js");
 const index$4 = require("../../../../../node_modules/element-plus/es/components/message/index.js");
 async function handlePageJump(node, data, fields, context) {
+  var _a, _b, _c;
   const dialogDoms = document.querySelectorAll(".el-modal-dialog");
   if ((dialogDoms == null ? void 0 : dialogDoms.length) > 0) {
     for (let i = 0; i < dialogDoms.length; i++) {
@@ -28,7 +29,10 @@ async function handlePageJump(node, data, fields, context) {
   }
   const basic = node.basic || {};
   const transitionType = basic.transitionType || "page";
-  const params = parseRouteParams.parseRouteParams(basic.routeParams, data, fields);
+  const formComponent = (_a = context.components) == null ? void 0 : _a.form;
+  const getFormDataMethod = (_c = (_b = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.getFormData;
+  let formData = getFormDataMethod();
+  const params = parseRouteParams.parseRouteParams(basic.routeParams, formData, fields);
   if (transitionType === "external") {
     const url = basic.routePath;
     if (!url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.4.59",
+  "version": "5.4.61",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [