@fecp/designer 5.3.5 → 5.3.7

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

@@ -26,20 +26,20 @@ const eventFlowHandler = require("../../../utils/eventFlow/eventFlowHandler.js")
 ;/* empty css                                                                                                                                          */
 ;/* empty css                               */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
-const index$6 = require("../../../api/index.js");
+const index$1 = require("../../../api/index.js");
 ;/* empty css                                                                                                                                              */
 ;/* empty css                                                                                                                                        */
 const usePageEvents = require("../../../composables/usePageEvents.js");
-const index$1 = require("../../details/header/index.js");
-const index$2 = require("../../details/main/index.js");
-const index$4 = require("../../details/footer/index.js");
+const index$3 = require("../../details/header/index.js");
+const index$4 = require("../../details/main/index.js");
+const index$6 = require("../../details/footer/index.js");
 const parseFilterConfig = require("../../../utils/parseFilterConfig.js");
 const moment = require("../../../../../../node_modules/.pnpm/moment@2.30.1/node_modules/moment/dist/moment.js");
 ;/* empty css           */
-const index = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/container/index.js");
-const index$3 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
+const index = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.js");
+const index$2 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/container/index.js");
+const index$5 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
 const gridLayout_vue = require("../../../../../../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.js");
-const index$5 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.js");
 const _hoisted_1 = ["name", "value"];
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -121,6 +121,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       pageEvents.handleUnmounted();
     }
     const formMode = vue.ref("");
+    vue.watch(
+      () => props.templateKey,
+      (key) => {
+        if (key) {
+          loadConfig();
+        }
+      }
+    );
     const loadConfig = async () => {
       if (!props.templateKey) {
         return;
@@ -154,6 +162,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         mergeOptionsToFields();
         loadFormData();
         loadEventFlow();
+        initGridLayoutDataConfig();
         if (pageEvents && localConfig.value.pageEventConfig) {
           const onCreatedEvent = localConfig.value.pageEventConfig.find(
             (e) => e.name === "onCreated"
@@ -165,7 +174,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       } catch (error) {
         console.error("加载配置失败:", error);
-        index$5.ElMessage.error("加载配置失败");
+        index.ElMessage.error("加载配置失败");
       } finally {
         configLoading.value = false;
       }
@@ -183,7 +192,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             defaultData[component.fieldName] = defaultValue;
           }
           if (component.fieldName) {
-            const fieldRules = validation.generateFieldRules(component);
+            const fieldRules = validation.generateFieldRules(component, formData, [
+              ...fieldsData.value,
+              ...hiddenFields.value
+            ]);
             if (fieldRules.length > 0) {
               rules[component.fieldName] = fieldRules;
             }
@@ -321,7 +333,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         return;
       }
       try {
-        const response = await index$6.default.getProductData(ctx.$http, prodIdValue);
+        const response = await index$1.default.getProductData(ctx.$http, prodIdValue);
         productData.value = response;
         console.log("产品数据加载成功:", productData.value);
       } catch (error) {
@@ -710,6 +722,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return result;
     };
     const applyLinkageEffectsForChangedFields = (changedFieldNames) => {
+      var _a;
       console.log(
         "🚀 ~ applyLinkageEffectsForChangedFields ~ 变化的字段:",
         changedFieldNames
@@ -725,9 +738,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           const fieldAssignments = item.fieldAssignments || [];
           fieldAssignments.forEach((assignment) => {
-            var _a, _b;
+            var _a2, _b;
             const fieldId = assignment.fieldId;
-            const formulaText = (_b = (_a = assignment.formula) == null ? void 0 : _a.value) == null ? void 0 : _b.text;
+            const formulaText = (_b = (_a2 = assignment.formula) == null ? void 0 : _a2.value) == null ? void 0 : _b.text;
             const field = fields.find((f) => f.id == fieldId);
             if (field && formulaText) {
               const calcResult = calculate.calculate({
@@ -780,7 +793,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const rules = {};
       updatedLayoutData.forEach(({ component }) => {
         if (component.fieldName) {
-          const fieldRules = validation.generateFieldRules(component);
+          const fieldRules = validation.generateFieldRules(component, formData, fields);
           if (fieldRules.length > 0) {
             rules[component.fieldName] = fieldRules;
           }
@@ -827,11 +840,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
+      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
     };
     vue.watch(
       formData,
       (newVal, oldVal) => {
-        initGridLayoutDataConfig();
         const changedFields = findChangedFields(newVal, prevFormData.value);
         if (changedFields.length > 0) {
           applyLinkageEffectsForChangedFields(changedFields);
@@ -841,11 +854,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       },
       { deep: true }
     );
-    function setFormItemHeight(id, h) {
+    function setFormItemHeight(id, fixedH, h) {
+      var _a;
       const item = gridLayoutFieldsData.value.find((item2) => item2.id == id);
-      if (item) {
-        item.h = h;
-      }
+      if (!fixedH) {
+        item.h = h * 60;
+      } else if (fixedH) {
+        item.h = h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
+      }
+      const oriItem = oriGridLayoutData.value.find((item2) => item2.id == id);
+      if (!fixedH) {
+        oriItem.h = h * 60;
+      } else if (fixedH) {
+        oriItem.h = h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
+      }
+      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
     }
     vue.provide("formData", formData);
     vue.provide("localConfig", localConfig);
@@ -866,8 +889,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       localConfig
     });
     return (_ctx, _cache) => {
-      const _component_el_form = index$3.ElForm;
-      const _component_el_container = index.ElContainer;
+      const _component_el_form = index$5.ElForm;
+      const _component_el_container = index$2.ElContainer;
       return vue.openBlock(), vue.createBlock(_component_el_container, {
         direction: "vertical",
         class: "fec-form",
@@ -877,11 +900,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         "data-version": "v5"
       }, {
         default: vue.withCtx(() => [
-          !configLoading.value && !__props.isSubForm && !__props.isDialog ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.header), {
+          !configLoading.value && !__props.isSubForm && !__props.isDialog ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.header), {
             key: 0,
             pageHeaderConfig: localConfig.value.pageHeaderConfig
           }, null, 8, ["pageHeaderConfig"])) : vue.createCommentVNode("", true),
-          vue.createVNode(vue.unref(index$2.main), null, {
+          vue.createVNode(vue.unref(index$4.main), null, {
             default: vue.withCtx(() => [
               vue.createVNode(_component_el_form, {
                 ref_key: "formRef",
@@ -935,7 +958,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             ]),
             _: 1
           }),
-          !__props.isSubForm && !__props.isDialog ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.footer), {
+          !__props.isSubForm && !__props.isDialog ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.footer), {
             key: 1,
             formMode: formMode.value,
             pageFooterConfig: localConfig.value.pageFooterConfig,
@@ -947,5 +970,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5e8468de"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-63966ae6"]]);
 exports.default = _Form;

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const parseFilterConfig = require("../../../utils/parseFilterConfig.js");
 const VALIDATION_RULES = {
   // 身份证
   idCard: {
@@ -47,7 +48,7 @@ const VALIDATION_RULES = {
     message: "请输入正确的联系电话"
   }
 };
-function generateFieldRules(component) {
+function generateFieldRules(component, formData, fields) {
   const rules = [];
   if (!component.fieldName) {
     return rules;
@@ -60,16 +61,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 = parseFilterConfig.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/lib/packages/vue/src/components/forms/subForm/SubForm.vue.js

@@ -52,6 +52,35 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     vue.inject("rowHeight");
     vue.inject("gridLayout");
     const setFormItemHeight = vue.inject("setFormItemHeight");
+    const templateKey = vue.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);
@@ -61,11 +90,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
-      const y = 1;
       const titleHeight = props.config.titleMode != "none" ? 1 : 0;
       if (foundItem) {
-        foundItem.h = maxY + y + titleHeight;
-        setFormItemHeight(props.config.id, maxY + y + titleHeight);
+        foundItem.h = maxY + titleHeight;
+        setFormItemHeight(props.config.id, false, maxY + titleHeight);
       }
     }
     return (_ctx, _cache) => {
@@ -80,7 +108,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }, null, 8, ["config"])) : vue.createCommentVNode("", true)
         ])) : vue.createCommentVNode("", true),
         vue.createVNode(vue.unref(index$2.Form), {
-          templateKey: __props.config.subFormKey,
+          templateKey: vue.unref(templateKey),
           isSubForm: "",
           onLoaded: subFormLoaded,
           canPageEvent: __props.config.triggerSubFormPageEvent,

package/lib/packages/vue/src/components/forms/subTable/SubTable.vue.js

@@ -81,7 +81,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     function subTableLoaded(subOption) {
       subTableOption.value = subOption;
-      console.log("🚀 ~ subTableLoaded ~ subOption:", subOption);
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
@@ -91,6 +90,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         foundItem.h = props.config.subTableHeight + titleHeight;
         setFormItemHeight(
           props.config.id,
+          true,
           props.config.subTableHeight + titleHeight
         );
       }

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

@@ -264,7 +264,7 @@ async function handleTableRefresh(node, data, fields, context) {
   var _a, _b, _c;
   console.log("[EventFlow] 执行表格刷新:", node.basic);
   const basic = node.basic || {};
-  const refreshOptions2 = {
+  const refreshOptions = {
     resetSort: basic.resetSort !== false,
     // 默认 true
     resetFilter: basic.resetFilter !== false,
@@ -272,11 +272,11 @@ async function handleTableRefresh(node, data, fields, context) {
     resetPagination: basic.resetPagination !== false
     // 默认 true
   };
-  console.log("[EventFlow] 刷新选项:", refreshOptions2);
+  console.log("[EventFlow] 刷新选项:", refreshOptions);
   const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
   const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
   if (typeof refreshMethod === "function") {
-    await refreshMethod(refreshOptions2);
+    await refreshMethod(refreshOptions);
     return {
       success: true,
       message: "表格已刷新"
@@ -348,6 +348,11 @@ async function handleTableRowDelete(node, data, fields, context) {
     const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
     const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
     if (typeof refreshMethod === "function") {
+      const refreshOptions = {
+        resetSort: false,
+        resetFilter: false,
+        resetPagination: false
+      };
       await refreshMethod(refreshOptions);
       return {
         success: true,
@@ -533,6 +538,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));

package/package.json

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