dfs-page-config 0.4.58 → 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,
@@ -29095,7 +29098,7 @@ const Form = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$h]
       default: "small"
     }
   },
-  emits: ["onSuccess"],
+  emits: ["onSuccess", "onError"],
   setup(k, L) {
     const { t: ie } = getCurrentInstance().appContext.config.globalProperties.useI18n(), ae = useStore(), pe = ref(), _e = reactive({
       uploadUrl: computed$1(
@@ -29114,11 +29117,11 @@ const Form = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$h]
       xe.value = !0, ae.commit("setLoading", !0);
     }
     function $e(qe) {
-      qe.code == 0 ? (ElMessage.success(qe.msg || ie("上传成功")), L.emit("onSuccess", qe)) : ElMessage.error(qe.msg), xe.value = !1, ae.commit("setLoading", !1);
+      qe.code == 0 ? (ElMessage.success(qe.msg || ie("上传成功")), L.emit("onSuccess", qe)) : (ElMessage.error(qe.msg), L.emit("onError", qe)), xe.value = !1, ae.commit("setLoading", !1);
     }
     function Et(qe) {
       const Dt = qe.toString(), Ue = new RegExp('"msg":"(.*?)(?<!\\\\)"'), kt = Dt.match(Ue);
-      kt && ElMessage.error(kt[1]), xe.value = !1, ae.commit("setLoading", !1);
+      kt && ElMessage.error(kt[1]), xe.value = !1, ae.commit("setLoading", !1), L.emit("onError", qe);
     }
     return {
       ...toRefs(_e),
@@ -29748,7 +29751,7 @@ const _sfc_main$g = defineComponent({
       }, Ue);
     }
     function Dt(Ue, kt) {
-      kt.queryTarget && _e(kt.queryTarget);
+      kt.queryTarget && _e(kt.queryTarget), kt.onSuccess && kt.onSuccess(Ue);
     }
     return {
       ...toRefs(ie),
@@ -29759,7 +29762,7 @@ const _sfc_main$g = defineComponent({
       // exportData
     };
   }
-}), ButtonGroup_vue_vue_type_style_index_0_scoped_16261382_lang = "", ButtonGroup_vue_vue_type_style_index_1_lang = "", _hoisted_1$f = ["onClick"];
+}), ButtonGroup_vue_vue_type_style_index_0_scoped_67d1b0c0_lang = "", ButtonGroup_vue_vue_type_style_index_1_lang = "", _hoisted_1$f = ["onClick"];
 function _sfc_render$f(k, L, ie, ae, pe, _e) {
   const xe = Upload, Oe = ElIcon, Ie = ElButton;
   return openBlock(), createElementBlock("div", {
@@ -29775,11 +29778,12 @@ function _sfc_render$f(k, L, ie, ae, pe, _e) {
           url: Ne.url,
           text: Ne.text,
           onOnSuccess: ($e) => k.uploadSuccess($e, Ne),
+          onOnError: ($e) => Ne.onError && Ne.onError($e),
           buttonType: Ne.buttonType,
           type: Ne.type,
           style: normalizeStyle(Ne.style),
           size: k.size
-        }, null, 8, ["url", "text", "onOnSuccess", "buttonType", "type", "style", "size"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        }, null, 8, ["url", "text", "onOnSuccess", "onOnError", "buttonType", "type", "style", "size"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
           Ne.type === "text" ? (openBlock(), createElementBlock("span", {
             key: 0,
             class: "dfs-text-btn",
@@ -29814,7 +29818,7 @@ function _sfc_render$f(k, L, ie, ae, pe, _e) {
     renderSlot(k.$slots, "default", {}, void 0, !0)
   ], 4);
 }
-const ButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$f], ["__scopeId", "data-v-16261382"]]), _sfc_main$f = defineComponent({
+const ButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$f], ["__scopeId", "data-v-67d1b0c0"]]), _sfc_main$f = defineComponent({
   props: {
     gridApi: {
       type: Object,
@@ -101427,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;
@@ -101648,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());