@fecp/designer 5.3.6 → 5.3.7

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

@@ -5,7 +5,7 @@
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                       */
 /* empty css                                                                                                                                       */
-import { getCurrentInstance, ref, onMounted, onBeforeUnmount, watch, provide, createBlock, openBlock, withCtx, createCommentVNode, createVNode, unref, normalizeStyle, createElementBlock, Fragment, renderList } from "vue";
+import { getCurrentInstance, ref, watch, onMounted, onBeforeUnmount, provide, createBlock, openBlock, withCtx, createCommentVNode, createVNode, unref, normalizeStyle, createElementBlock, Fragment, renderList } from "vue";
 import "../../../../../../node_modules/.pnpm/grid-layout-plus@1.1.1_vue@3.5.13_typescript@5.7.3_/node_modules/grid-layout-plus/es/index.mjs";
 import { getCurrentVueInstance } from "../../../utils/getInstance.mjs";
 import getJsonAsyncUtil from "../../../utils/getJsonAsyncUtil.mjs";
@@ -34,10 +34,10 @@ import { footer } from "../../details/footer/index.mjs";
 import { checkFilterMatch, checkFieldInFilterConfig, checkFieldInResultConfig } from "../../../utils/parseFilterConfig.mjs";
 import hooks from "../../../../../../node_modules/.pnpm/moment@2.30.1/node_modules/moment/dist/moment.mjs";
 /* empty css           */
+import { ElMessage } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
 import { ElContainer } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/container/index.mjs";
 import { ElForm } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.mjs";
 import De from "../../../../../../node_modules/.pnpm/grid-layout-plus@1.1.1_vue@3.5.13_typescript@5.7.3_/node_modules/grid-layout-plus/es/components/grid-layout.vue.mjs";
-import { ElMessage } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
 const _hoisted_1 = ["name", "value"];
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -119,6 +119,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       pageEvents.handleUnmounted();
     }
     const formMode = ref("");
+    watch(
+      () => props.templateKey,
+      (key) => {
+        if (key) {
+          loadConfig();
+        }
+      }
+    );
     const loadConfig = async () => {
       if (!props.templateKey) {
         return;
@@ -182,7 +190,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             defaultData[component.fieldName] = defaultValue;
           }
           if (component.fieldName) {
-            const fieldRules = generateFieldRules(component);
+            const fieldRules = generateFieldRules(component, formData, [
+              ...fieldsData.value,
+              ...hiddenFields.value
+            ]);
             if (fieldRules.length > 0) {
               rules[component.fieldName] = fieldRules;
             }
@@ -780,7 +791,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const rules = {};
       updatedLayoutData.forEach(({ component }) => {
         if (component.fieldName) {
-          const fieldRules = generateFieldRules(component);
+          const fieldRules = generateFieldRules(component, formData, fields);
           if (fieldRules.length > 0) {
             rules[component.fieldName] = fieldRules;
           }
@@ -957,7 +968,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a3082b55"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-63966ae6"]]);
 export {
   _Form as default
 };

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

@@ -1,3 +1,4 @@
+import { checkFilterMatch } from "../../../utils/parseFilterConfig.mjs";
 const VALIDATION_RULES = {
   // 身份证
   idCard: {
@@ -45,7 +46,7 @@ const VALIDATION_RULES = {
     message: "请输入正确的联系电话"
   }
 };
-function generateFieldRules(component) {
+function generateFieldRules(component, formData, fields) {
   const rules = [];
   if (!component.fieldName) {
     return rules;
@@ -58,16 +59,27 @@ function generateFieldRules(component) {
     });
   }
   if (component.validationType && component.validationType !== "none") {
-    if (component.validationType === "regex" && component.regexPattern) {
+    if (component.validationType === "regex" && component.validationPattern) {
       try {
-        const regex = new RegExp(component.regexPattern);
+        const validator = (_rule, _value, callback) => {
+          try {
+            const isMatch = checkFilterMatch(component.validationPattern, formData.value, fields);
+            if (!isMatch) {
+              callback(new Error(component.validationMessage || "校验失败"));
+            } else {
+              callback();
+            }
+          } catch (error) {
+            console.error("Validation function error:", error);
+            callback(new Error(component.validationMessage || "校验函数执行出错"));
+          }
+        };
         rules.push({
-          pattern: regex,
-          message: component.regexMessage || "输入格式不正确",
+          validator,
           trigger: "blur"
         });
       } catch (e) {
-        console.error("Invalid regex pattern:", component.regexPattern, e);
+        console.error("Invalid validation pattern:", component.validationPattern, e);
       }
     } else if (component.validationType === "custom" && component.customValidator) {
       try {

package/es/packages/vue/src/components/forms/subForm/SubForm.vue.mjs

@@ -1,4 +1,4 @@
-import { inject, createElementBlock, openBlock, Fragment, createCommentVNode, createVNode, createBlock, unref, isRef } from "vue";
+import { inject, computed, createElementBlock, openBlock, Fragment, createCommentVNode, createVNode, createBlock, unref, isRef } from "vue";
 import { Form } from "../form/index.mjs";
 import { SubTitle } from "../subTitle/index.mjs";
 import { H2 } from "../h2/index.mjs";
@@ -50,6 +50,35 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     inject("rowHeight");
     inject("gridLayout");
     const setFormItemHeight = inject("setFormItemHeight");
+    const templateKey = computed(() => {
+      if (props.config.formSource == "dynamic") {
+        const dynamicSubFormKey = props.config.dynamicSubFormKey;
+        if (dynamicSubFormKey) {
+          if (typeof dynamicSubFormKey === "object") {
+            const fieldId = dynamicSubFormKey.value;
+            const fieldsData = props.localConfig.fieldsData.map((item) => {
+              return item.component;
+            });
+            const hiddenFields = props.localConfig.hiddenFields;
+            const formItem = [...fieldsData, ...hiddenFields].find(
+              (item) => item.id == fieldId
+            );
+            if (formItem != null) {
+              const key = formData.value[formItem.fieldName];
+              return key ? key + "V5" : "";
+            } else {
+              return "";
+            }
+          } else {
+            return dynamicSubFormKey;
+          }
+        } else {
+          return "";
+        }
+      } else {
+        return props.config.subFormKey;
+      }
+    });
     function subFormLoaded(subOption) {
       const fieldsData = subOption.fieldsData;
       console.log("🚀 ~ loaded ~ subOption:", subOption);
@@ -77,7 +106,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }, null, 8, ["config"])) : createCommentVNode("", true)
         ])) : createCommentVNode("", true),
         createVNode(unref(Form), {
-          templateKey: __props.config.subFormKey,
+          templateKey: unref(templateKey),
           isSubForm: "",
           onLoaded: subFormLoaded,
           canPageEvent: __props.config.triggerSubFormPageEvent,

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

@@ -536,6 +536,8 @@ async function handleDialog(node, data, fields, context) {
   } else if (basic.dialogSource == "custom") {
     const dialogList = context.localConfig.dialogs || [];
     dialog = dialogList.find((item) => item.id == (basic == null ? void 0 : basic.dialogId));
+    dialog.subFormMode = basic.subFormMode;
+    dialog.selectionMode = basic.selectionMode;
   }
   if (!dialog) {
     console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));