dfs-page-config 0.4.97 → 0.4.98

package/dist/dfs-page-config.js

@@ -27314,7 +27314,10 @@ function initData(k, L, ie) {
           pe = _e, console.error("[警告] 不建议直接替换formData对象,建议使用修改属性值的方式进行更新"), console.error("不推荐: formData = { ... }"), console.error("推荐: formData.propertyName = value");
         }
       }), ae.elementGroup && ae.elementGroup.length ? ae.elementGroup.forEach((_e) => {
-        _e.prop && (pe[_e.prop] = _e.value ?? null);
+        if (_e.prop) {
+          const xe = Object.prototype.toString.call(_e.value);
+          pe[_e.prop] = xe === "[object Object]" || xe === "[object Array]" ? JSON.parse(JSON.stringify(_e.value)) : _e.value ?? null;
+        }
       }) : ae.elementGroup = [];
     }
     ae.type == "AgTable" && (ae.pageInfo || (ae.pageInfo = { pageNum: 1, currentPage: 1, pageSize: 50 }), ae.initQuery && k.dispatch("_TABLE_QUERY", { pageKey: ie, tableComp: ae }));
@@ -28857,10 +28860,7 @@ const _sfc_main$l = defineComponent({
     }, nr = (wr) => {
       wr.type.includes("image") ? Ie.value = k.fileUrl || ie.state._BASE_URL + "/media-service/dfsGoodsCenterCn/image/upload" : Ie.value = k.fileUrl || ie.state._BASE_URL + "/media-service/dfsGoodsCenterCn/file/upload", Ne.value = getRequestHeaders(Ie.value), ie.commit("setLoading", !0);
       const hr = _e.value.includes(wr.type), Ar = wr.size / 1024 / 1024 < xe.value;
-      if (!hr)
-        return ElMessage.error(ae("上传图片格式错误") + "!");
-      if (!Ar)
-        return ElMessage.error(`${ae("上传图片大小不能超过")} ${xe.value}MB!`);
+      return hr ? Ar ? !0 : (ElMessage.error(`${ae("上传图片大小不能超过")} ${xe.value}MB!`), !1) : (ElMessage.error(ae("上传图片格式错误") + "!"), !1);
     }, er = () => {
       console.log("DownLoad");
     }, ar = () => ElMessage.warning(`${ae("文件数量不得超过")} ${k.limit} 个`), lr = (wr, hr) => {
@@ -28895,7 +28895,7 @@ const _sfc_main$l = defineComponent({
       handleChange: lr
     };
   }
-}), UploadComp_vue_vue_type_style_index_0_scoped_940b9248_lang = "", UploadComp_vue_vue_type_style_index_1_lang = "", _export_sfc = (k, L) => {
+}), UploadComp_vue_vue_type_style_index_0_scoped_ac43608a_lang = "", UploadComp_vue_vue_type_style_index_1_lang = "", _export_sfc = (k, L) => {
   const ie = k.__vccOpts || k;
   for (const [ae, pe] of L)
     ie[ae] = pe;
@@ -28972,7 +28972,7 @@ function _sfc_render$k(k, L, ie, ae, pe, _e) {
     }, null, 8, ["modelValue", "title"])
   ], 64);
 }
-const UploadComp = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$k], ["__scopeId", "data-v-940b9248"]]), elSwitch = "", elTimeSelect = "", elScrollbar = "", elPopper = "", elInput = "", elTag = "", elOption = "", elOptionGroup = "", elSelect = "", elDatePicker = "", elCheckboxGroup = "", elCheckbox = "", elRadioButton = "", elRadioGroup = "", elRadio = "", elCascader = "", elCascaderPanel = "", elInputNumber = "", _sfc_main$k = defineComponent({
+const UploadComp = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$k], ["__scopeId", "data-v-ac43608a"]]), elSwitch = "", elTimeSelect = "", elScrollbar = "", elPopper = "", elInput = "", elTag = "", elOption = "", elOptionGroup = "", elSelect = "", elDatePicker = "", elCheckboxGroup = "", elCheckbox = "", elRadioButton = "", elRadioGroup = "", elRadio = "", elCascader = "", elCascaderPanel = "", elInputNumber = "", _sfc_main$k = defineComponent({
   props: {
     option: Object,
     formComp: Object,
@@ -29686,7 +29686,7 @@ const Upload = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$
           ze(Ue);
           break;
         case "cancel":
-          Et(Ue.restTarget);
+          Et(Ue.restTarget || Ue.target);
           break;
         case "submit":
           qe(Ue);
@@ -29761,10 +29761,7 @@ const Upload = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$
     }
     function Et(Ue) {
       const kt = store.getters._GET_DIALOGREF(k.pageKey);
-      if (kt && kt.closeDialog(), Ue) {
-        const jt = getTargetComp(store, k.pageKey, Ue);
-        jt.reset && jt.reset();
-      }
+      kt && kt.closeDialog();
     }
     function qe(Ue) {
       getTargetComp(store, k.pageKey, Ue.target).submit((jt) => {
@@ -29783,7 +29780,7 @@ const Upload = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$
       // exportData
     };
   }
-}), ButtonGroup_vue_vue_type_style_index_0_scoped_37b097c3_lang = "", ButtonGroup_vue_vue_type_style_index_1_lang = "", _hoisted_1$g = ["onClick"];
+}), ButtonGroup_vue_vue_type_style_index_0_scoped_578dc16d_lang = "", ButtonGroup_vue_vue_type_style_index_1_lang = "", _hoisted_1$g = ["onClick"];
 function _sfc_render$g(k, L, ie, ae, pe, _e) {
   const xe = Upload, Oe = ElIcon, Ie = ElButton;
   return openBlock(), createElementBlock("div", {
@@ -29839,7 +29836,7 @@ function _sfc_render$g(k, L, ie, ae, pe, _e) {
     renderSlot(k.$slots, "default", {}, void 0, !0)
   ], 4);
 }
-const ButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$g], ["__scopeId", "data-v-37b097c3"]]), _sfc_main$g = defineComponent({
+const ButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$g], ["__scopeId", "data-v-578dc16d"]]), _sfc_main$g = defineComponent({
   props: {
     gridApi: {
       type: Object,
@@ -101664,41 +101661,45 @@ const __unplugin_components_0 = { name: "ep-warning-filled", render: render$1 },
       option: {},
       component: {},
       compChildrenSlots: computed$1(() => {
-        var Oe;
-        const xe = [];
-        return (Oe = ie.component.children) == null || Oe.forEach((Ie) => {
-          Ie.slot && xe.push(Ie), xe.push(...getAllSlots(Ie));
-        }), xe;
+        var Ie;
+        const Oe = [];
+        return (Ie = ie.component.children) == null || Ie.forEach((Ne) => {
+          Ne.slot && Oe.push(Ne), Oe.push(...getAllSlots(Ne));
+        }), Oe;
       }),
       dialog: !1,
       title: computed$1(() => typeof ie.component.title == "function" ? ie.component.title() : ie.component.title)
     });
     let ae = {};
-    function pe(xe) {
+    function pe(Oe) {
       ae = {};
-      const Oe = getTargetComp(L, k.pageKey, ie.option.target);
-      if (Oe.beforeOpen) {
-        Oe.currentRow = xe;
-        const Ie = {
-          component: Oe,
-          currentRow: xe,
+      const Ie = getTargetComp(L, k.pageKey, ie.option.target);
+      if (Ie.beforeOpen) {
+        Ie.currentRow = Oe;
+        const Ne = {
+          component: Ie,
+          currentRow: Oe,
           sourceOption: ie.option
         };
-        if (Oe.relation && (Ie.relation = getRelationComp(L, k.pageKey, Oe.relation)), Oe.beforeOpen(Ie) === !1)
+        if (Ie.relation && (Ne.relation = getRelationComp(L, k.pageKey, Ie.relation)), Ie.beforeOpen(Ne) === !1)
           return;
       }
-      Oe.children && Oe.children.forEach((Ie) => {
-        Ie.type === "Form" && (xe && (Ie.row = xe), ae = Ie);
-      }), ie.component = Oe, ie.dialog = !0;
+      Ie.children && Ie.children.forEach((Ne) => {
+        Ne.type === "Form" && (Oe && (Ne.row = Oe), ae = Ne);
+      }), ie.component = Ie, ie.dialog = !0;
     }
     function _e() {
-      ie.component.beforeClose && ie.component.beforeClose({ component: ie.component }) === !1 || (ie.dialog = !1, ae.reset && ae.reset());
+      ie.component.beforeClose && ie.component.beforeClose({ component: ie.component }) === !1 || (ie.dialog = !1);
+    }
+    function xe() {
+      ae.reset && ae.reset();
     }
     return {
       ...toRefs(ie),
       store: L,
       showDialog: pe,
       closeDialog: _e,
+      resetForm: xe,
       getAllSlots
     };
   }
@@ -101714,7 +101715,7 @@ function _sfc_render$9(k, L, ie, ae, pe, _e) {
     center: k.component.center !== !1,
     "close-on-click-modal": !1,
     key: k.component.updateKey,
-    onClose: k.closeDialog
+    onClose: k.resetForm
   }, {
     header: withCtx(() => [
       k.component.dialogType === "warning" ? (openBlock(), createBlock(Oe, {