dfs-page-config 0.4.59 → 0.4.60

package/dist/dfs-page-config.js

@@ -28683,40 +28683,43 @@ const __unplugin_components_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["re
       if (pe.validate)
         ae.value.validate((kt) => {
           if (kt) {
-            if (!$e(Ue))
+            const jt = $e(Ue);
+            if (jt === !1)
               return;
-            Et(Dt);
+            Et(Dt, jt);
           }
         });
       else {
-        if (!$e(Ue))
+        const kt = $e(Ue);
+        if (kt === !1)
           return;
-        Et(Dt);
+        Et(Dt, kt);
       }
     }
     function $e(Dt) {
       if (pe.submitBefore) {
         let Ue = {};
-        if (pe.relation && (Ue = getRelationComp(ie, k.pageKey, pe.relation)), pe.submitBefore({ relation: Ue, formData: pe.formData, row: pe.row, triggerButton: Dt }) === !1)
-          return !1;
+        pe.relation && (Ue = getRelationComp(ie, k.pageKey, pe.relation));
+        const kt = pe.submitBefore({ relation: Ue, formData: pe.formData, row: pe.row, triggerButton: Dt });
+        return kt === !1 ? !1 : kt;
       }
       return !0;
     }
-    function Et(Dt) {
+    function Et(Dt, Ue) {
       ie.commit("setLoading", !0);
-      let Ue = pe.method == "GET" ? "params" : "data";
+      let kt = pe.method == "GET" ? "params" : "data";
       service({
         url: ie.state._BASE_URL + pe.url,
-        [Ue]: pe.formData || {},
+        [kt]: typeof Ue == "object" ? Ue : pe.formData || {},
         method: pe.method || "POST"
-      }).then((kt) => {
+      }).then((jt) => {
         if (pe.submitAfter) {
-          let jt = {};
-          pe.relation && (jt = getRelationComp(ie, k.pageKey, pe.relation)), pe.submitAfter({ res: kt, relation: jt, formData: pe.formData, row: pe.row });
+          let tr = {};
+          pe.relation && (tr = getRelationComp(ie, k.pageKey, pe.relation)), pe.submitAfter({ res: jt, relation: tr, formData: pe.formData, row: pe.row });
         }
         Dt({ ..._e.formData });
-      }).catch((kt) => {
-        console.log(kt);
+      }).catch((jt) => {
+        console.log(jt);
       }).finally(() => {
         ie.commit("setLoading", !1);
       });
@@ -28733,7 +28736,7 @@ const __unplugin_components_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["re
       remoteMethod: Oe
     };
   }
-}), Form_vue_vue_type_style_index_0_scoped_d69c8f00_lang = "", _hoisted_1$g = {
+}), Form_vue_vue_type_style_index_0_scoped_0c9aa8ab_lang = "", _hoisted_1$g = {
   key: 0,
   class: "mask"
 };
@@ -29054,7 +29057,7 @@ function _sfc_render$h(k, L, ie, ae, pe, _e) {
     _: 3
   }, 8, ["class", "model", "size", "inline", "label-width", "style"]);
 }
-const Form = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$h], ["__scopeId", "data-v-d69c8f00"]]), _sfc_main$h = defineComponent({
+const Form = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$h], ["__scopeId", "data-v-0c9aa8ab"]]), _sfc_main$h = defineComponent({
   name: "Upload",
   props: {
     url: String,
@@ -101428,7 +101431,7 @@ const CellItemEdit = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_r
               Ue.prop && (Ie[Ue.prop] = Ue.value ?? null);
             });
           }
-        }), setTimeout(() => {
+        }), Oe && setTimeout(() => {
           Object.keys(Oe).forEach((Et) => {
             Ie[Et] = Oe[Et];
           }), Oe = null;
@@ -101649,10 +101652,25 @@ const __unplugin_components_0 = { name: "ep-warning-filled", render: render$1 },
     });
     let ae = {};
     function pe(xe) {
+      ae = {};
       const Oe = getTargetComp(L, k.pageKey, ie.option.target);
-      Oe.currentRow = xe, !(Oe.beforeOpen && Oe.beforeOpen({ component: Oe }) === !1) && (ae = {}, Oe.children && Oe.children.forEach((Ie) => {
-        Ie.type === "Form" && (xe && (Ie.row = xe), ae = Ie);
-      }), ie.component = Oe, ie.dialog = !0);
+      if (Oe.currentRow = xe, Oe.beforeOpen && Oe.beforeOpen({ component: Oe }) === !1)
+        return;
+      let Ie = null;
+      Oe.children && Oe.children.forEach((Ne) => {
+        if (Ne.type === "Form" && (xe && (Ne.row = xe), ae = Ne, Oe.beforeOpen)) {
+          const $e = Ne.formData;
+          Ie = JSON.parse(JSON.stringify($e));
+          const Et = Ne.elementGroup;
+          Et && Et.length && Et.forEach((qe) => {
+            qe.prop && ($e[qe.prop] = qe.value ?? null);
+          }), Ie && setTimeout(() => {
+            Object.keys(Ie).forEach((qe) => {
+              $e[qe] = Ie[qe];
+            }), Ie = null;
+          });
+        }
+      }), ie.component = Oe, ie.dialog = !0;
     }
     function _e() {
       ie.component.beforeClose && ie.component.beforeClose({ component: ie.component }) === !1 || (ie.dialog = !1, ae.reset && ae.reset());