@fecp/designer 5.5.72 → 5.5.73

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

@@ -98,6 +98,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     isApproval: {
       type: Boolean,
       default: false
+    },
+    class: {
+      type: String,
+      default: ""
     }
   },
   emits: [
@@ -660,6 +664,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       subFormPromises.push((_a = formRef.value) == null ? void 0 : _a.validate());
       return Promise.all(subFormPromises).then(() => getFormData());
     };
+    const docValidate = () => {
+      const documentComps = gridLayoutFieldsData.value.filter((item) => item.component.fieldType == "document").map((item) => item.component);
+      const compPromises = documentComps.map((comp) => {
+        var _a;
+        const compRef = getFormItemRef(String(comp.id));
+        return ((_a = compRef == null ? void 0 : compRef.validate) == null ? void 0 : _a.call(compRef)) || Promise.resolve();
+      });
+      return Promise.all(compPromises);
+    };
     const resetFields = () => {
       var _a, _b;
       (_a = formRef.value) == null ? void 0 : _a.clearValidate();
@@ -851,10 +864,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
     const applyLinkageEffectsForChangedFields = (changedFieldNames) => {
       var _a;
-      console.log(
-        "🚀 ~ applyLinkageEffectsForChangedFields ~ 变化的字段:",
-        changedFieldNames
-      );
       const linkedConfig = localConfig.value.linkedConfig || {};
       const fields = [...fieldsData.value, ...hiddenFields.value];
       const relevantConfigs = filterRelevantLinkageConfigs(
@@ -930,40 +939,46 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         rules[fieldName] = prodRules.value[fieldName];
       }
       formRules.value = rules;
-      relevantConfigs.readonly.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
-        dataLinkFieldList.forEach((fieldId) => {
-          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-          if (layoutFieldItem) {
-            layoutFieldItem.component.readOnly = false;
-          }
-        });
-        if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
+      if (formMode.value != "query") {
+        relevantConfigs.readonly.forEach((item) => {
+          const dataLinkFieldList = item.dataLinkFieldList || [];
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
-              layoutFieldItem.component.readOnly = true;
+              layoutFieldItem.component.readOnly = false;
             }
           });
-        }
-      });
-      relevantConfigs.disabled.forEach((item) => {
-        const dataLinkFieldList = item.dataLinkFieldList || [];
-        dataLinkFieldList.forEach((fieldId) => {
-          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-          if (layoutFieldItem) {
-            layoutFieldItem.component.disabled = false;
+          if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
+            dataLinkFieldList.forEach((fieldId) => {
+              const layoutFieldItem = updatedLayoutData.find(
+                (g) => g.id == fieldId
+              );
+              if (layoutFieldItem) {
+                layoutFieldItem.component.readOnly = true;
+              }
+            });
           }
         });
-        if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
+        relevantConfigs.disabled.forEach((item) => {
+          const dataLinkFieldList = item.dataLinkFieldList || [];
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
-              layoutFieldItem.component.disabled = true;
+              layoutFieldItem.component.disabled = false;
             }
           });
-        }
-      });
+          if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
+            dataLinkFieldList.forEach((fieldId) => {
+              const layoutFieldItem = updatedLayoutData.find(
+                (g) => g.id == fieldId
+              );
+              if (layoutFieldItem) {
+                layoutFieldItem.component.disabled = true;
+              }
+            });
+          }
+        });
+      }
       const fieldsConfigArr = updatedLayoutData.filter((item) => !item.hidden);
       gridLayoutFieldsData.value = sortLayoutItems(fieldsConfigArr);
       (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
@@ -1079,6 +1094,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     Vue.provide("getFormData", getFormData);
     __expose({
       validate,
+      docValidate,
       resetFields,
       getFormData,
       setFormData,
@@ -1095,7 +1111,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const _directive_fec_layout = Vue.resolveDirective("fec-layout");
       return !configLoading.value ? Vue.withDirectives((Vue.openBlock(), Vue.createBlock(_component_el_container, {
         key: 0,
-        class: "fec-form",
+        class: Vue.normalizeClass(["fec-form", __props.class]),
         "data-id": localConfig.value.templateKey,
         "data-name": localConfig.value.templateName,
         "data-pkId": localConfig.value.pkId,
@@ -1209,11 +1225,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           })) : Vue.createCommentVNode("", true)
         ]),
         _: 1
-      }, 8, ["data-id", "data-name", "data-pkId"])), [
+      }, 8, ["class", "data-id", "data-name", "data-pkId"])), [
         [_directive_fec_layout]
       ]) : Vue.createCommentVNode("", true);
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-c86c3354"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d3057435"]]);
 exports.default = _Form;

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

@@ -500,7 +500,7 @@ async function handleFormSetValue(node, data, fields, context) {
   }
 }
 async function handleFormSubmit(node, data, fields, context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const basic = node.basic || {};
   if (!(basic == null ? void 0 : basic.dataSourceId)) {
     console.error("form-setValue: 缺少 dataSourceId 配置");
@@ -529,6 +529,27 @@ async function handleFormSubmit(node, data, fields, context) {
       };
     }
   }
+  if (basic == null ? void 0 : basic.docValidate) {
+    const docValidateMethod = (_g = (_f = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _f.exposed) == null ? void 0 : _g.docValidate;
+    try {
+      if (typeof docValidateMethod === "function") {
+        await docValidateMethod();
+      } else {
+        console.error("未找到表单组件的 docValidate 方法");
+        return {
+          success: false,
+          message: "表单组件未正确配置或 docValidate 方法未暴露",
+          shouldShowError: true
+        };
+      }
+    } catch (error) {
+      return {
+        success: false,
+        message: "要件校验失败！",
+        shouldShowError: false
+      };
+    }
+  }
   if (typeof getFormDataMethod === "function") {
     try {
       let formData = getFormDataMethod();
@@ -555,8 +576,8 @@ async function handleFormSubmit(node, data, fields, context) {
         formData = common.removeEmptyValues(result.data || {});
         delete formData.pageNo;
         delete formData.pageSize;
-        const formComponent2 = (_f = context.components) == null ? void 0 : _f.form;
-        const setFormDataMethod = (_h = (_g = formComponent2 == null ? void 0 : formComponent2.$) == null ? void 0 : _g.exposed) == null ? void 0 : _h.setFormData;
+        const formComponent2 = (_h = context.components) == null ? void 0 : _h.form;
+        const setFormDataMethod = (_j = (_i = formComponent2 == null ? void 0 : formComponent2.$) == null ? void 0 : _i.exposed) == null ? void 0 : _j.setFormData;
         if (typeof setFormDataMethod === "function") {
           setFormDataMethod(formData);
         } else {
@@ -642,7 +663,7 @@ async function handleDialog(node, data, fields, context) {
   }
 }
 async function handleRiskSchDialog(node, data, fields, context) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f;
   const basic = node.basic || {};
   if (!(basic == null ? void 0 : basic.schNo)) {
     console.error("风险拦截校验: 缺少 schNo 配置");
@@ -659,6 +680,13 @@ async function handleRiskSchDialog(node, data, fields, context) {
       await validateMethod();
     }
   }
+  if (basic == null ? void 0 : basic.docValidate) {
+    const formComponent = (_d = context.components) == null ? void 0 : _d.form;
+    const docValidateMethod = (_f = (_e = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _e.exposed) == null ? void 0 : _f.docValidate;
+    if (typeof docValidateMethod === "function") {
+      await docValidateMethod();
+    }
+  }
   const schNo = basic.schNo;
   const paramList = parseRouteParams.parseRouteParams(basic == null ? void 0 : basic.params, data, fields);
   const busNo = parseRouteParams.parseSingleParamValue(basic.busNo, data, fields);

package/package.json

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