@fecp/designer 5.4.5 → 5.4.8

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

@@ -162,22 +162,26 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           return item.component;
         });
         hiddenFields.value = option.hiddenFields || [];
-        await loadFieldDataSources();
-        await loadProductData();
-        applyProductConfigToForm();
-        mergeOptionsToFields();
         loadFormData();
         loadEventFlow();
-        initGridLayoutDataConfig();
         if (pageEvents && localConfig.value.pageEventConfig) {
           const onCreatedEvent = localConfig.value.pageEventConfig.find(
             (e) => e.name === "onCreated"
           );
           if (onCreatedEvent) {
             console.log("🚀 页面 onCreated 事件触发");
-            await pageEvents.executeEvent("onCreated");
+            try {
+              await pageEvents.executeEvent("onCreated");
+            } catch (error) {
+            }
           }
         }
+        await loadFieldDataSources();
+        await loadProductData();
+        applyProductConfigToForm();
+        mergeOptionsToFields();
+        initGridLayoutDataConfig();
+        initLinkage();
         emit("loaded", option);
       } catch (error) {
         console.error("加载配置失败:", error);
@@ -253,7 +257,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             http: ctx.$http,
             dataSources: localConfig.value.dataSources,
             currentDataSourceId: dataSourceId,
-            pagination: false
+            pagination: false,
+            data: formData.value,
+            fields: [...fieldsData.value, ...hiddenFields.value]
           });
           const data = await dsManager.fetch();
           let options = [];
@@ -599,7 +605,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
     const validate = () => {
       var _a;
-      return (_a = formRef.value) == null ? void 0 : _a.validate();
+      const subFormComps = gridLayoutFieldsData.value.filter((item) => item.component.fieldType == "subForm").map((item) => item.component);
+      const subFormPromises = subFormComps.map((subForm) => {
+        var _a2, _b;
+        const subFormRef = getFormItemRef(String(subForm.id));
+        return ((_b = (_a2 = subFormRef == null ? void 0 : subFormRef.subFormRef) == null ? void 0 : _a2.validate) == null ? void 0 : _b.call(_a2)) || Promise.resolve();
+      });
+      subFormPromises.push((_a = formRef.value) == null ? void 0 : _a.validate());
+      return Promise.all(subFormPromises);
     };
     const resetFields = () => {
       var _a, _b;
@@ -713,7 +726,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         });
       }
       if (flag) {
-        return processedData;
+        return common.removeEmptyValues(processedData);
       }
       Object.assign(formData.value, processedData);
     };
@@ -896,9 +909,21 @@ 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();
     };
+    let linkaged = false;
+    function initLinkage() {
+      const changedFields = findChangedFields(formData.value, prevFormData.value);
+      if (changedFields.length > 0) {
+        applyLinkageEffectsForChangedFields(changedFields);
+      }
+      prevFormData.value = { ...formData.value };
+      linkaged = true;
+    }
     vue.watch(
       formData,
       (newVal, oldVal) => {
+        if (!linkaged) {
+          return;
+        }
         const changedFields = findChangedFields(newVal, prevFormData.value);
         if (changedFields.length > 0) {
           applyLinkageEffectsForChangedFields(changedFields);
@@ -1029,5 +1054,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-c9bc9779"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8baf793f"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/formItem/FormItem.vue.js

@@ -102,7 +102,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     });
     const getInnerComponentRef = () => {
-      debugger;
       return innerComponentRef.value;
     };
     __expose({
@@ -191,5 +190,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f41d58fe"]]);
+const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-df2a70b8"]]);
 exports.default = _FormItem;

package/lib/packages/vue/src/components/forms/subForm/SubForm.vue.js

@@ -47,7 +47,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     //     default: false,
     //   },
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const props = __props;
     const formData = vue.inject("formData");
     vue.inject("rowHeight");
@@ -107,6 +107,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         setFormItemHeight(props.config.id, true, maxY + maxYH + titleHeight);
       }
     }
+    const formRef = vue.ref();
+    __expose({
+      subFormRef: formRef
+    });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
         __props.config.titleMode != "none" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
@@ -119,6 +123,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }, null, 8, ["config"])) : vue.createCommentVNode("", true)
         ])) : vue.createCommentVNode("", true),
         vue.createVNode(vue.unref(index$2.Form), {
+          ref_key: "formRef",
+          ref: formRef,
           templateKey: vue.unref(templateKey),
           isSubForm: "",
           onLayoutUpdated: subFormLoaded,

package/lib/packages/vue/src/components/forms/textarea/Textarea.vue.js

@@ -78,7 +78,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           "show-word-limit": __props.showWordCount,
           rows: __props.rows,
           autosize: __props.autosize,
-          clearable: "",
           resize: "none",
           onChange: handleChange
         }), null, 16, ["modelValue", "placeholder", "disabled", "readonly", "maxlength", "show-word-limit", "rows", "autosize"])
@@ -86,5 +85,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Textarea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-29a082f2"]]);
+const _Textarea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-34bc3c06"]]);
 exports.default = _Textarea;

package/lib/packages/vue/src/utils/datasource.js

@@ -19,7 +19,9 @@ class DataSourceManager {
     this.currentDataSourceId = options.currentDataSourceId;
     this.pagination = options.pagination || false;
     this.sortRules = vue.reactive(options.sortRules || []);
-    this.originalSortRules = JSON.parse(JSON.stringify(options.sortRules || []));
+    this.originalSortRules = JSON.parse(
+      JSON.stringify(options.sortRules || [])
+    );
     this.showSuccessMessage = options.showSuccessMessage || false;
     this.loading = false;
     this.error = null;
@@ -255,7 +257,9 @@ class DataSourceManager {
    * 更新排序
    */
   updateSort(field, order) {
-    const existingIndex = this.sortRules.findIndex((rule) => rule.field === field);
+    const existingIndex = this.sortRules.findIndex(
+      (rule) => rule.field === field
+    );
     if (!order) {
       if (existingIndex > -1) {
         this.sortRules.splice(existingIndex, 1);

package/package.json

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