@fecp/designer 5.4.19 → 5.4.21

package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js

@@ -127,6 +127,9 @@ const _sfc_main = {
       },
       (val) => {
         dialogVisible.value = val;
+        if (val) {
+          loadComponentByPath(currentDialogConfig.value.componentPath);
+        }
       },
       {
         immediate: true
@@ -135,21 +138,31 @@ const _sfc_main = {
     vue.watch(dialogVisible, (val) => {
       emit("update:modelValue", val);
     });
-    const loadComponent = (path) => {
-      if (!path) return null;
-      try {
-        const component = vue.defineAsyncComponent(
-          () => import(
-            /* @vite-ignore */
-            path
-          )
-        );
-        return component;
-      } catch (error) {
-        console.error("组件加载失败:", error);
-        return null;
+    const componentParams = vue.computed(() => {
+      var _a;
+      const params = parseRouteParams.parseRouteParams(
+        ((_a = currentDialogConfig.value) == null ? void 0 : _a.componentParams) || [],
+        props.formData,
+        props.fieldsList
+      );
+      return params;
+    });
+    const currentComponent = vue.ref(null);
+    function loadComponentByPath(path) {
+      console.log("🚀 ~ loadComponentByPath ~ path:", path);
+      debugger;
+      const route = props.componentCtx.$router.getRoutes().find((item) => item.path === path);
+      if (!route) return;
+      const comp = route.components.default;
+      if (!comp) return;
+      if (typeof comp === "function") {
+        comp().then((module2) => {
+          currentComponent.value = module2.default;
+        });
+      } else {
+        currentComponent.value = comp;
       }
-    };
+    }
     const handleSubmit = (data) => {
       emit("confirm", data);
     };
@@ -318,9 +331,22 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       const _component_el_button = index$3.ElButton;
       const _component_el_dialog = index.ElDialog;
-      return vue.openBlock(), vue.createBlock(_component_el_dialog, {
+      return __props.dialogConfig.componentIsDialog ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(currentComponent.value), vue.mergeProps({
+        key: 0,
         modelValue: dialogVisible.value,
-        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dialogVisible.value = $event),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dialogVisible.value = $event),
+        width: dialogWidth.value,
+        draggable: true,
+        "close-on-click-modal": false,
+        "append-to-body": ""
+      }, componentParams.value, {
+        formData: __props.formData,
+        onClose: handleClose,
+        onSubmit: handleSubmit
+      }), null, 16, ["modelValue", "width", "formData"])) : (vue.openBlock(), vue.createBlock(_component_el_dialog, {
+        key: 1,
+        modelValue: dialogVisible.value,
+        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => dialogVisible.value = $event),
         width: dialogWidth.value,
         draggable: true,
         "close-on-click-modal": false,
@@ -339,7 +365,7 @@ const _sfc_main = {
           var _a, _b, _c;
           return [
             vue.createVNode(_component_el_button, { onClick: handleCancel }, {
-              default: vue.withCtx(() => _cache[2] || (_cache[2] = [
+              default: vue.withCtx(() => _cache[3] || (_cache[3] = [
                 vue.createTextVNode("取消")
               ])),
               _: 1
@@ -350,7 +376,7 @@ const _sfc_main = {
                 type: "primary",
                 onClick: handleConfirm
               }, {
-                default: vue.withCtx(() => _cache[3] || (_cache[3] = [
+                default: vue.withCtx(() => _cache[4] || (_cache[4] = [
                   vue.createTextVNode("确定")
                 ])),
                 _: 1
@@ -407,26 +433,21 @@ const _sfc_main = {
                 templateKey: __props.dialogConfig.subFormKey,
                 isDialog: "",
                 modelValue: initDialogParams.value,
-                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => initDialogParams.value = $event),
+                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => initDialogParams.value = $event),
                 onLoaded: subFormLoaded,
                 initFormMode: __props.dialogConfig.subFormMode,
                 ref_key: "dialogFormRef",
                 ref: dialogFormRef
               }, null, 8, ["templateKey", "modelValue", "initFormMode"])) : ((_d = __props.dialogConfig) == null ? void 0 : _d.contentSource) === "component" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
-                loadComponent(__props.dialogConfig.componentPath) ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(loadComponent(__props.dialogConfig.componentPath)), {
-                  key: 0,
-                  "dialog-params": __props.dialogConfig.dialogParams,
-                  onClose: handleClose,
-                  onSubmit: handleSubmit
-                }, null, 40, ["dialog-params"])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, " 组件加载失败，请检查组件路径: " + vue.toDisplayString((_e = __props.dialogConfig) == null ? void 0 : _e.componentPath), 1))
+                currentComponent.value ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(currentComponent.value), vue.normalizeProps(vue.mergeProps({ key: 0 }, componentParams.value)), null, 16)) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, " 组件加载失败，请检查组件路径: " + vue.toDisplayString((_e = __props.dialogConfig) == null ? void 0 : _e.componentPath), 1))
               ], 64)) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, "请配置弹层内容"))
             ], 6)
           ];
         }),
         _: 1
-      }, 8, ["modelValue", "width"]);
+      }, 8, ["modelValue", "width"]));
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8b571a63"]]);
+const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8f4f0d44"]]);
 exports.default = DialogRenderer;

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

@@ -5,6 +5,7 @@ const index$2 = require("../form/index.js");
 const index$1 = require("../subTitle/index.js");
 const index = require("../h2/index.js");
 const common = require("../../../utils/common.js");
+const parseRouteParams = require("../../../utils/parseRouteParams.js");
 const _hoisted_1 = {
   key: 0,
   style: { "height": "60px", "position": "relative" }
@@ -55,11 +56,33 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const setFormItemHeight = vue.inject("setFormItemHeight");
     const subFormData = vue.computed({
       get: () => {
+        if (props.config.dataSourceFrom == "self") {
+          return common.cloneDeep(subFormParams.value);
+        }
         return common.cloneDeep(formData.value);
       },
       set: (val) => {
-        formData.value = { ...formData.value, ...val };
+        if (props.config.dataSourceFrom != "self") {
+          formData.value = { ...formData.value, ...val };
+        }
+      }
+    });
+    const fieldList = vue.computed(() => {
+      return [
+        ...props.localConfig.fieldsData.map((item) => item.component),
+        ...props.localConfig.hiddenFields
+      ];
+    });
+    const subFormParams = vue.computed(() => {
+      if (props.config.dataSourceFrom == "self") {
+        const params = parseRouteParams.parseRouteParams(
+          props.config.subFormParams,
+          formData.value,
+          fieldList.value
+        );
+        return params;
       }
+      return {};
     });
     const templateKey = vue.computed(() => {
       if (props.config.formSource == "dynamic") {
@@ -128,7 +151,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           templateKey: vue.unref(templateKey),
           isSubForm: "",
           onLayoutUpdated: subFormLoaded,
-          canPageEvent: __props.config.triggerSubFormPageEvent,
+          canPageEvent: __props.config.dataSourceFrom == "self",
           initFormMode: __props.formMode,
           modelValue: vue.unref(subFormData),
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(subFormData) ? subFormData.value = $event : null)

package/lib/packages/vue/src/components/forms/text/Text.vue.js

@@ -262,5 +262,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Text = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5bb684f4"]]);
+const _Text = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-185ddd14"]]);
 exports.default = _Text;

package/package.json

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