@vue-start/element-pro 0.2.22 → 0.2.24

package/dist/index.es.js

@@ -1,8 +1,8 @@
-import { createExpose as Ce, createFormItemCompFn as ze, createExposeObj as U, ProForm as V, ProSearchForm as w, ProFormList as Z, ProTable as D, ProDesc as O, ProCurdDesc as H, ProCurdForm as J, ProCurdModal as Q, ProUploaderText as X, ElementKeys as y, ProCurd as Ae, ProList as Ue, ProShowText as Y, ProShowDigit as Le, ProShowDate as we, ProShowOptions as L, ProShowTree as _ } from "@vue-start/pro";
-import { ElFormItem as j, ElForm as q, ElLoading as De, ElDialog as ee, ElButton as M, ElPagination as te, ElPopover as ae, ElCheckboxGroup as ne, ElCheckboxButton as Oe, ElCheckbox as ke, ElRadioGroup as le, ElRadioButton as je, ElRadio as qe, ElSelect as re, ElOption as $e, ElTabs as ue, ElTabPane as Ge, ElMenu as N, ElUpload as oe, useFormItem as We, ElInputNumber as B, ElTree as de, ElInput as Ze, ElDatePicker as He, ElTimePicker as Je, ElTreeSelect as Qe, ElSwitch as Xe, ElCascader as Ye, ElTableColumn as ce, ElTable as ie, ElDescriptions as Fe, ElRow as _e, ElCol as et, ElDescriptionsItem as tt } from "element-plus";
-import { defineComponent as S, createVNode as d, mergeProps as m, reactive as at, ref as p, toRaw as nt, computed as z, Fragment as lt } from "vue";
-import { keys as s, omit as i, isBoolean as $, isString as rt, debounce as ut, map as F, size as A, pick as G, get as T, isNumber as K, filter as me, isArray as ot } from "lodash";
-import { useEffect as se, generateId as dt, useWatch as I, convertCollection as ct, isValidFileType as it, convertFileSize as mt } from "@vue-start/hooks";
+import { createExpose as pe, createFormItemCompFn as ze, createExposeObj as U, ProForm as R, ProSearchForm as L, ProFormList as Z, ProTable as O, ProDesc as D, ProCurdDesc as H, ProCurdForm as J, ProCurdModal as Q, ProUploaderText as X, ElementKeys as P, ProCurd as Ae, ProList as Ue, ProShowText as Y, ProShowDigit as we, ProShowDate as Le, ProShowOptions as w, ProShowTree as _ } from "@vue-start/pro";
+import { ElFormItem as j, ElForm as q, ElLoading as Oe, ElDialog as ee, ElButton as V, ElPagination as te, ElPopover as ae, ElCheckboxGroup as ne, ElCheckboxButton as De, ElCheckbox as Ce, ElRadioGroup as le, ElRadioButton as je, ElRadio as qe, ElSelect as re, ElOption as $e, ElTabs as oe, ElTabPane as Ge, ElMenu as N, ElUpload as ue, useFormItem as We, ElInputNumber as B, ElTree as de, ElInput as Ze, ElDatePicker as He, ElTimePicker as Je, ElTreeSelect as Qe, ElSwitch as Xe, ElCascader as Ye, ElTableColumn as ce, ElTable as ie, ElDescriptions as ke, ElRow as _e, ElCol as et, ElDescriptionsItem as tt } from "element-plus";
+import { defineComponent as S, createVNode as c, mergeProps as m, reactive as at, ref as p, toRaw as nt, computed as z, Fragment as lt } from "vue";
+import { keys as F, omit as i, isBoolean as $, isString as rt, debounce as ot, map as k, size as A, pick as G, get as T, isNumber as K, filter as me, isArray as ut } from "lodash";
+import { useEffect as Fe, generateId as dt, useWatch as M, convertCollection as ct, isValidFileType as it, convertFileSize as mt, getNameMapByMergeOpts as ft } from "@vue-start/hooks";
 const fe = () => ({
   name: {
     type: [String, Array]
@@ -15,18 +15,15 @@ const fe = () => ({
   setup: (e, {
     slots: t
   }) => {
-    const o = s(fe());
-    return () => d(j, m(i(e, ...o, "name", "prop"), {
+    const u = F(fe());
+    return () => c(j, m(i(e, ...u, "name", "prop"), {
       prop: e.prop || e.name
     }), {
-      ...i(t, "label"),
-      label: () => {
-        var a;
-        return ((a = t.label) == null ? void 0 : a.call(t)) || e.label;
-      }
+      label: e.label ? () => e.label : void 0,
+      ...t
     });
   }
-}), Ee = ["clearValidate", "resetFields", "scrollToField", "validate", "validateField", "submit"], ft = S({
+}), Ee = ["clearValidate", "resetFields", "scrollToField", "validate", "validateField", "submit"], yt = S({
   props: {
     ...q.props,
     hideRequiredMark: {
@@ -36,30 +33,30 @@ const fe = () => ({
   },
   setup: (e, {
     slots: t,
-    emit: o,
+    emit: u,
     expose: a
   }) => {
-    const u = e.model || at({}), n = p();
-    return se(() => {
+    const o = e.model || at({}), n = p();
+    return Fe(() => {
       !n.value || (n.value.submit = () => {
-        var l;
-        (l = n.value) == null || l.validate((c, r) => {
-          c ? o("finish", nt(u)) : o("finishFailed", r);
+        var r;
+        (r = n.value) == null || r.validate((d, l) => {
+          d ? u("finish", nt(o)) : u("finishFailed", l);
         });
       });
-    }, []), a(Ce(Ee, n)), () => d(q, m({
+    }, []), a(pe(Ee, n)), () => c(q, m({
       ref: n
     }, i(e, "model"), {
       hideRequiredAsterisk: $(e.hideRequiredMark) ? e.hideRequiredMark : e.hideRequiredAsterisk,
-      model: u
+      model: o
     }), t);
   }
-}), k = ze(xe, (e, t, o) => ({
+}), C = ze(xe, (e, t, u) => ({
   modelValue: e,
   "onUpdate:modelValue": t,
   clearable: !0,
-  disabled: o
-})), Te = (e = "comp") => e + "-" + dt(), yt = () => ({
+  disabled: u
+})), Te = (e = "comp") => e + "-" + dt(), vt = () => ({
   loading: {
     type: Boolean
   },
@@ -89,19 +86,19 @@ const fe = () => ({
   }
 }), Ke = S({
   props: {
-    ...yt()
+    ...vt()
   },
   setup: (e, {
     slots: t
   }) => {
-    const o = Te();
-    return se(() => {
+    const u = Te();
+    return Fe(() => {
       if (!e.loading)
         return;
       let a = e.target;
-      if (t.default ? a = document.getElementById(o) : e.target && rt(e.target) && (a = document.querySelector("#" + e.target)), !a)
+      if (t.default ? a = document.getElementById(u) : e.target && rt(e.target) && (a = document.querySelector("#" + e.target)), !a)
         return;
-      const u = De.service({
+      const o = Oe.service({
         target: a,
         body: e.body,
         fullscreen: e.fullscreen,
@@ -112,10 +109,10 @@ const fe = () => ({
         customClass: e.customClass
       });
       return () => {
-        u && u.close();
+        o && o.close();
       };
-    }, () => e.loading), () => t.default ? d("div", {
-      id: o
+    }, () => e.loading), () => t.default ? c("div", {
+      id: u
     }, [t.default()]) : null;
   }
 }), ye = () => ({
@@ -150,7 +147,7 @@ const fe = () => ({
     type: [Object, Boolean],
     default: void 0
   }
-}), Ie = S({
+}), Me = S({
   inheritAttrs: !1,
   props: {
     ...ee.props,
@@ -162,58 +159,58 @@ const fe = () => ({
   },
   setup: (e, {
     slots: t,
-    emit: o,
+    emit: u,
     attrs: a
   }) => {
-    const u = p(e.visible);
-    I(() => {
-      u.value !== e.visible && (u.value = e.visible);
+    const o = p(e.visible);
+    M(() => {
+      o.value !== e.visible && (o.value = e.visible);
     }, () => e.visible);
     const n = () => {
-      var r;
-      if ((r = e.cancelButtonProps) != null && r.onClick) {
+      var l;
+      if ((l = e.cancelButtonProps) != null && l.onClick) {
         e.cancelButtonProps.onClick();
         return;
       }
-      u.value = !1, o("update:visible", !1);
-    }, l = () => {
-      var r;
-      if ((r = e.okButtonProps) != null && r.onClick) {
+      o.value = !1, u("update:visible", !1);
+    }, r = () => {
+      var l;
+      if ((l = e.okButtonProps) != null && l.onClick) {
         e.okButtonProps.onClick();
         return;
       }
-      o("ok");
-    }, c = s(ye());
-    return () => d(ee, m({
+      u("ok");
+    }, d = F(ye());
+    return () => c(ee, m({
       class: e.clsName
-    }, i(a, "onCancel"), i(e, ...c, "modelValue"), {
+    }, i(a, "onCancel"), i(e, ...d, "modelValue"), {
       closeOnClickModal: $(e.maskClosable) ? e.maskClosable : e.closeOnClickModal,
-      modelValue: u.value,
-      "onUpdate:modelValue": [(r) => u.value = r, (r) => {
-        o("update:visible", r);
+      modelValue: o.value,
+      "onUpdate:modelValue": [(l) => o.value = l, (l) => {
+        u("update:visible", l);
       }],
       onClose: () => {
-        o("cancel");
+        u("cancel");
       }
     }), {
-      footer: e.footer === !1 ? void 0 : () => d("div", {
+      footer: e.footer === !1 ? void 0 : () => c("div", {
         class: `${e.clsName}-operate`
-      }, [d(M, m(i(e.cancelButtonProps, "onClick"), {
+      }, [c(V, m(i(e.cancelButtonProps, "onClick"), {
         onClick: n
       }), {
         default: () => [e.cancelText]
-      }), d(M, m({
+      }), c(V, m({
         type: "primary",
         loading: e.confirmLoading
       }, i(e.okButtonProps, "onClick"), {
-        onClick: l
+        onClick: r
       }), {
         default: () => [e.okText]
       })]),
       ...t
     });
   }
-}), vt = S({
+}), bt = S({
   props: {
     ...te.props,
     page: {
@@ -223,37 +220,37 @@ const fe = () => ({
   },
   setup: (e, {
     slots: t,
-    emit: o
+    emit: u
   }) => {
-    const a = p(e.page), u = p(e.pageSize);
-    I(() => {
+    const a = p(e.page), o = p(e.pageSize);
+    M(() => {
       a.value !== e.page && (a.value = e.page);
-    }, () => e.page), I(() => {
-      u.value !== e.pageSize && (u.value = e.pageSize);
+    }, () => e.page), M(() => {
+      o.value !== e.pageSize && (o.value = e.pageSize);
     }, () => e.pageSize);
-    const n = ut(() => {
-      o("composeChange", a.value, u.value);
-    }, 300), l = () => {
-      n(), o("update:page", a.value);
-    }, c = () => {
-      n(), o("update:pageSize", u.value);
+    const n = ot(() => {
+      u("composeChange", a.value, o.value);
+    }, 300), r = () => {
+      n(), u("update:page", a.value);
+    }, d = () => {
+      n(), u("update:pageSize", o.value);
     };
-    return () => d(te, m({
+    return () => c(te, m({
       currentPage: a.value,
-      "onUpdate:currentPage": (r) => a.value = r,
-      pageSize: u.value,
-      "onUpdate:pageSize": (r) => u.value = r,
-      onCurrentChange: l,
-      onSizeChange: c
+      "onUpdate:currentPage": (l) => a.value = l,
+      pageSize: o.value,
+      "onUpdate:pageSize": (l) => o.value = l,
+      onCurrentChange: r,
+      onSizeChange: d
     }, i(e, "currentPage", "pageSize")), t);
   }
-}), bt = S({
+}), gt = S({
   props: {
     ...ae.props
   },
   setup: (e, {
     slots: t
-  }) => () => d(ae, e, {
+  }) => () => c(ae, e, {
     reference: t.default,
     default: t.content
   })
@@ -267,45 +264,45 @@ const fe = () => ({
     type: String,
     default: "default"
   }
-}), gt = S({
+}), Pt = S({
   props: {
     ...ne.props,
     ...ve()
   },
   setup: (e, {
     slots: t,
-    emit: o,
+    emit: u,
     expose: a
   }) => {
-    const u = p();
-    a(U(u));
-    const n = s(ve());
-    return () => d(ne, m({
-      ref: u
+    const o = p();
+    a(U(o));
+    const n = F(ve());
+    return () => c(ne, m({
+      ref: o
     }, i(e, n), {
-      "onUpdate:modelValue": (l) => {
-        o("update:modelValue", l || void 0);
+      "onUpdate:modelValue": (r) => {
+        u("update:modelValue", r || void 0);
       }
     }), {
       default: () => {
-        var l, c;
-        return [(l = t.start) == null ? void 0 : l.call(t), F(e.options, (r) => {
-          var g;
-          const b = (g = t.label) == null ? void 0 : g.call(t, r);
-          return e.optionType === "button" || e.buttonStyle === "button" ? d(Oe, m({
-            key: r.value
-          }, i(r, "value"), {
-            label: r.value
+        var r, d;
+        return [(r = t.start) == null ? void 0 : r.call(t), k(e.options, (l) => {
+          var b;
+          const f = (b = t.label) == null ? void 0 : b.call(t, l);
+          return e.optionType === "button" || e.buttonStyle === "button" ? c(De, m({
+            key: l.value
+          }, i(l, "value"), {
+            label: l.value
           }), {
-            default: () => [b || r.label]
-          }) : d(ke, m({
-            key: r.value
-          }, r, {
-            label: r.value
+            default: () => [f || l.label]
+          }) : c(Ce, m({
+            key: l.value
+          }, l, {
+            label: l.value
           }), {
-            default: () => [b || r.label]
+            default: () => [f || l.label]
           });
-        }), (c = t.default) == null ? void 0 : c.call(t)];
+        }), (d = t.default) == null ? void 0 : d.call(t)];
       }
     });
   }
@@ -321,112 +318,112 @@ const fe = () => ({
     type: String,
     default: "default"
   }
-}), Pt = S({
+}), ht = S({
   props: {
     ...le.props,
     ...be()
   },
   setup: (e, {
     slots: t,
-    emit: o,
+    emit: u,
     expose: a
   }) => {
-    const u = p();
-    a(U(u));
-    const n = s(be());
-    return () => d(le, m({
-      ref: u
+    const o = p();
+    a(U(o));
+    const n = F(be());
+    return () => c(le, m({
+      ref: o
     }, i(e, n), {
-      "onUpdate:modelValue": (l) => {
-        o("update:modelValue", l);
+      "onUpdate:modelValue": (r) => {
+        u("update:modelValue", r);
       }
     }), {
       default: () => {
-        var l, c;
-        return [(l = t.start) == null ? void 0 : l.call(t), F(e.options, (r) => {
-          var g;
-          const b = (g = t.label) == null ? void 0 : g.call(t, r);
-          return e.optionType === "button" || e.buttonStyle === "button" ? d(je, m({
-            key: r.value
-          }, i(r, "value"), {
-            label: r.value
+        var r, d;
+        return [(r = t.start) == null ? void 0 : r.call(t), k(e.options, (l) => {
+          var b;
+          const f = (b = t.label) == null ? void 0 : b.call(t, l);
+          return e.optionType === "button" || e.buttonStyle === "button" ? c(je, m({
+            key: l.value
+          }, i(l, "value"), {
+            label: l.value
           }), {
-            default: () => [b || r.label]
-          }) : d(qe, m({
-            key: r.value
-          }, i(r, "value"), {
-            label: r.value
+            default: () => [f || l.label]
+          }) : c(qe, m({
+            key: l.value
+          }, i(l, "value"), {
+            label: l.value
           }), {
-            default: () => [b || r.label]
+            default: () => [f || l.label]
           });
-        }), (c = t.default) == null ? void 0 : c.call(t)];
+        }), (d = t.default) == null ? void 0 : d.call(t)];
       }
     });
   }
 }), ge = () => ({
   options: Array
-}), ht = S({
+}), St = S({
   props: {
     ...re.props,
     ...ge()
   },
   setup: (e, {
     slots: t,
-    emit: o,
+    emit: u,
     expose: a
   }) => {
-    const u = p();
-    a(U(u));
-    const n = s(ge());
-    return () => d(re, m({
-      ref: u
+    const o = p();
+    a(U(o));
+    const n = F(ge());
+    return () => c(re, m({
+      ref: o
     }, i(e, n), {
-      "onUpdate:modelValue": (l) => {
-        o("update:modelValue", l || void 0);
+      "onUpdate:modelValue": (r) => {
+        u("update:modelValue", r || void 0);
       }
     }), {
       default: () => {
-        var l, c;
-        return [(l = t.start) == null ? void 0 : l.call(t), F(e.options, (r) => {
-          var g;
-          const b = (g = t.label) == null ? void 0 : g.call(t, r);
-          return d($e, m({
-            key: r.value
-          }, r), {
-            default: () => [b || r.label]
+        var r, d;
+        return [(r = t.start) == null ? void 0 : r.call(t), k(e.options, (l) => {
+          var b;
+          const f = (b = t.label) == null ? void 0 : b.call(t, l);
+          return c($e, m({
+            key: l.value
+          }, l), {
+            default: () => [f || l.label]
           });
-        }), (c = t.default) == null ? void 0 : c.call(t)];
+        }), (d = t.default) == null ? void 0 : d.call(t)];
       },
       ...i(t, "default")
     });
   }
 }), Dt = S({
   props: {
-    ...ue.props,
+    ...oe.props,
     options: {
       type: Array
     }
   },
   setup: (e, {
     slots: t,
-    emit: o
-  }) => () => d(ue, m(i(e, "options"), {
+    emit: u
+  }) => () => c(oe, m(i(e, "options"), {
     "onUpdate:modelValue": (a) => {
-      o("update:modelValue", a);
+      u("update:modelValue", a);
     }
   }), {
     default: () => {
-      var a, u;
-      return [(a = t.start) == null ? void 0 : a.call(t), F(e.options, (n) => d(Ge, m({
+      var a, o;
+      return [(a = t.start) == null ? void 0 : a.call(t), k(e.options, (n) => c(Ge, m({
         key: n.value
       }, i(n, "value"), {
         name: n.value
       }), {
         label: () => {
-          var l;
-          return ((l = t.label) == null ? void 0 : l.call(t, n)) || n.label;
+          var r;
+          return ((r = t.label) == null ? void 0 : r.call(t, n)) || n.label;
         }
-      })), (u = t.default) == null ? void 0 : u.call(t)];
+      })), (o = t.default) == null ? void 0 : o.call(t)];
     }
   })
 }), W = {
@@ -439,7 +436,7 @@ const fe = () => ({
   onMenuItemClick: {
     type: Function
   }
-}, Re = s(W), Ve = S({
+}, Ie = F(W), Re = S({
   inheritAttrs: !1,
   props: {
     menu: {
@@ -450,35 +447,35 @@ const fe = () => ({
   setup: (e, {
     slots: t
   }) => {
-    const o = () => {
+    const u = () => {
       var a;
       (a = e.onMenuItemClick) == null || a.call(e, e.menu);
     };
     return () => {
-      var u, n;
+      var o, n;
       const a = e.menu;
-      return (a == null ? void 0 : a.children) && A(a.children) > 0 ? d(N.SubMenu, m({
+      return (a == null ? void 0 : a.children) && A(a.children) > 0 ? c(N.SubMenu, m({
         index: a == null ? void 0 : a.value
-      }, (u = e.convertSubMenuProps) == null ? void 0 : u.call(e, a)), {
-        default: () => [F(a.children, (l) => d(Ve, m({
-          menu: l
-        }, G(e, Re)), t))],
+      }, (o = e.convertSubMenuProps) == null ? void 0 : o.call(e, a)), {
+        default: () => [k(a.children, (r) => c(Re, m({
+          menu: r
+        }, G(e, Ie)), t))],
         title: () => {
-          var l;
-          return ((l = t.title) == null ? void 0 : l.call(t, a)) || (a == null ? void 0 : a.label);
+          var r;
+          return ((r = t.title) == null ? void 0 : r.call(t, a)) || (a == null ? void 0 : a.label);
         }
-      }) : d(N.MenuItem, m({
+      }) : c(N.MenuItem, m({
         index: a == null ? void 0 : a.value
       }, (n = e.convertMenuItemProps) == null ? void 0 : n.call(e, a), {
-        onClick: o
+        onClick: u
       }), {
         title: () => {
-          var l;
-          return ((l = t.title) == null ? void 0 : l.call(t, a)) || (a == null ? void 0 : a.label);
+          var r;
+          return ((r = t.title) == null ? void 0 : r.call(t, a)) || (a == null ? void 0 : a.label);
         },
         default: t.default ? () => {
-          var l;
-          return (l = t.default) == null ? void 0 : l.call(t, a);
+          var r;
+          return (r = t.default) == null ? void 0 : r.call(t, a);
         } : void 0
       });
     };
@@ -499,7 +496,7 @@ const fe = () => ({
     }
   },
   ...W
-}), St = S({
+}), st = S({
   props: {
     ...i(N.props, "defaultActive"),
     ...Pe()
@@ -507,31 +504,31 @@ const fe = () => ({
   setup: (e, {
     slots: t
   }) => {
-    const o = p(e.activeKey);
-    I(() => {
-      e.activeKey !== o.value && (o.value = e.activeKey);
+    const u = p(e.activeKey);
+    M(() => {
+      e.activeKey !== u.value && (u.value = e.activeKey);
     }, () => e.activeKey);
     const a = z(() => {
       var n;
-      return ct(e.options, (l) => {
-        var b, g;
-        const c = ((b = e.fieldNames) == null ? void 0 : b.value) || "value", r = ((g = e.fieldNames) == null ? void 0 : g.label) || "label";
+      return ct(e.options, (r) => {
+        var f, b;
+        const d = ((f = e.fieldNames) == null ? void 0 : f.value) || "value", l = ((b = e.fieldNames) == null ? void 0 : b.label) || "label";
         return {
-          ...i(l, c, r),
-          value: T(l, c),
-          label: T(l, r)
+          ...i(r, d, l),
+          value: T(r, d),
+          label: T(r, l)
         };
       }, {
         children: ((n = e.fieldNames) == null ? void 0 : n.children) || "children",
         childrenName: "children"
       });
-    }), u = s(Pe());
-    return () => d(N, m({
-      defaultActive: o.value
-    }, i(e, u)), {
-      default: () => d(lt, null, [F(a.value, (n) => d(Ve, m({
+    }), o = F(Pe());
+    return () => c(N, m({
+      defaultActive: u.value
+    }, i(e, o)), {
+      default: () => c(lt, null, [k(a.value, (n) => c(Re, m({
         menu: n
-      }, G(e, Re)), t))])
+      }, G(e, Ie)), t))])
     });
   }
 }), he = () => ({
@@ -557,43 +554,43 @@ const fe = () => ({
   beforeUpload: {
     type: Function
   }
-}), pt = ["abort", "submit", "clearFiles", "handleStart", "handleRemove"], Me = S({
+}), pt = ["abort", "submit", "clearFiles", "handleStart", "handleRemove"], Ve = S({
   props: {
-    ...i(oe.props, "fileList"),
+    ...i(ue.props, "fileList"),
     ...he()
   },
   setup: (e, {
     slots: t,
-    expose: o,
+    expose: u,
     emit: a
   }) => {
-    const u = p();
-    o(U(u, pt));
+    const o = p();
+    u(U(o, pt));
     const {
       formItem: n
-    } = We(), l = () => ot(e.modelValue) ? F(e.modelValue, (v) => {
-      var P;
-      return ((P = e.convertItemData) == null ? void 0 : P.call(e, v)) || v;
-    }) : [], c = p(l());
-    let r = !1;
-    const b = () => {
-      var P;
-      r = !0;
-      const v = me(c.value, (h) => h.status === "success");
-      a("update:modelValue", F(v, (h) => {
+    } = We(), r = () => ut(e.modelValue) ? k(e.modelValue, (v) => {
+      var g;
+      return ((g = e.convertItemData) == null ? void 0 : g.call(e, v)) || v;
+    }) : [], d = p(r());
+    let l = !1;
+    const f = () => {
+      var g;
+      l = !0;
+      const v = me(d.value, (h) => h.status === "success");
+      a("update:modelValue", k(v, (h) => {
         var x;
         return ((x = e.convertResponseData) == null ? void 0 : x.call(e, h)) || h;
-      })), (P = n == null ? void 0 : n.validate) == null || P.call(n, "change");
+      })), (g = n == null ? void 0 : n.validate) == null || g.call(n, "change");
     };
-    I(() => {
-      r || (c.value = l(), r = !1);
+    M(() => {
+      l || (d.value = r(), l = !1);
     }, () => e.modelValue);
-    const g = (v) => {
-      var P, h, x, E;
+    const b = (v) => {
+      var g, h, x, E;
       if (e.beforeUpload)
         return e.beforeUpload(v);
       if (e.accept && !it(e.accept, v.name))
-        return (P = e.onErrorMsg) == null || P.call(e, "FileTypeError", `\u8BF7\u4E0A\u4F20\u6B63\u786E\u683C\u5F0F\uFF08${e.accept.replace(/,/g, "\uFF0C")}\uFF09\u7684\u6587\u4EF6`), !1;
+        return (g = e.onErrorMsg) == null || g.call(e, "FileTypeError", `\u8BF7\u4E0A\u4F20\u6B63\u786E\u683C\u5F0F\uFF08${e.accept.replace(/,/g, "\uFF0C")}\uFF09\u7684\u6587\u4EF6`), !1;
       if (K(v.size)) {
         if (v.size <= 0)
           return (h = e.onErrorMsg) == null || h.call(e, "FileSizeError-Zero", "\u4E0A\u4F20\u6587\u4EF6\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A"), !1;
@@ -601,32 +598,32 @@ const fe = () => ({
           return (x = e.onErrorMsg) == null || x.call(e, "FileSizeError-MaxSize", `\u8BF7\u4E0A\u4F20\u5C0F\u4E8E${mt(e.maxSize)}\u7684\u6587\u4EF6`), !1;
       }
       return (E = e.onStart) == null || E.call(e, v), !0;
-    }, f = z(() => K(e.limit) ? e.limit > A(c.value) : !0), C = s(he());
+    }, y = z(() => K(e.limit) ? e.limit > A(d.value) : !0), s = F(he());
     return () => {
-      var v, P;
-      return d("div", {
-        class: `pro-uploader ${f.value ? "" : "pro-uploader-limit"}`
-      }, [(v = t.start) == null ? void 0 : v.call(t), d(oe, m({
-        ref: u,
-        fileList: c.value,
-        "onUpdate:fileList": (h) => c.value = h
-      }, i(e, "fileList", "onSuccess", "onRemove", "beforeUpload", ...C), {
-        beforeUpload: g,
+      var v, g;
+      return c("div", {
+        class: `pro-uploader ${y.value ? "" : "pro-uploader-limit"}`
+      }, [(v = t.start) == null ? void 0 : v.call(t), c(ue, m({
+        ref: o,
+        fileList: d.value,
+        "onUpdate:fileList": (h) => d.value = h
+      }, i(e, "fileList", "onSuccess", "onRemove", "beforeUpload", ...s), {
+        beforeUpload: b,
         onSuccess: (h, x, E) => {
-          var R;
-          (R = e.onSuccess) == null || R.call(e, h, x, E), b();
+          var I;
+          (I = e.onSuccess) == null || I.call(e, h, x, E), f();
         },
         onRemove: (h, x) => {
           var E;
-          c.value = me(c.value, (R) => !(h.uid === R.uid && h.name === R.name)), (E = e.onRemove) == null || E.call(e, h, x), b();
+          d.value = me(d.value, (I) => !(h.uid === I.uid && h.name === I.name)), (E = e.onRemove) == null || E.call(e, h, x), f();
         }
       }), {
         default: () => {
           var h;
-          return [f.value && ((h = t.default) == null ? void 0 : h.call(t))];
+          return [y.value && ((h = t.default) == null ? void 0 : h.call(t))];
         },
         ...i(t, "default")
-      }), (P = t.end) == null ? void 0 : P.call(t)]);
+      }), (g = t.end) == null ? void 0 : g.call(t)]);
     };
   }
 }), Se = () => ({
@@ -657,43 +654,43 @@ const fe = () => ({
   },
   setup: (e, {
     slots: t,
-    emit: o
+    emit: u
   }) => {
-    const a = p(T(e.modelValue, 0)), u = p(T(e.modelValue, 1));
+    const a = p(T(e.modelValue, 0)), o = p(T(e.modelValue, 1));
     let n = !1;
-    I(() => {
-      n || (a.value = T(e.modelValue, 0), u.value = T(e.modelValue, 1)), n = !1;
+    M(() => {
+      n || (a.value = T(e.modelValue, 0), o.value = T(e.modelValue, 1)), n = !1;
     }, [e.modelValue, () => e.modelValue]);
-    const l = () => {
-      n = !0, e.singleEmit ? o("update:modelValue", [a.value, u.value]) : K(a.value) && K(u.value) ? o("update:modelValue", [a.value, u.value]) : o("update:modelValue", null);
-    }, c = (f) => {
-      for (let C = 0; C < f.length; C++)
-        if (K(f[C]))
-          return f[C];
-    }, r = z(() => {
-      var f;
-      return c([u.value, (f = e.start) == null ? void 0 : f.max, e.max]);
-    }), b = z(() => {
-      var f;
-      return c([a.value, (f = e.end) == null ? void 0 : f.min, e.min]);
-    }), g = s(Se());
+    const r = () => {
+      n = !0, e.singleEmit ? u("update:modelValue", [a.value, o.value]) : K(a.value) && K(o.value) ? u("update:modelValue", [a.value, o.value]) : u("update:modelValue", null);
+    }, d = (y) => {
+      for (let s = 0; s < y.length; s++)
+        if (K(y[s]))
+          return y[s];
+    }, l = z(() => {
+      var y;
+      return d([o.value, (y = e.start) == null ? void 0 : y.max, e.max]);
+    }), f = z(() => {
+      var y;
+      return d([a.value, (y = e.end) == null ? void 0 : y.min, e.min]);
+    }), b = F(Se());
     return () => {
-      var C, v;
-      const f = i(e, ...g, "min", "max");
-      return d("span", {
+      var s, v;
+      const y = i(e, ...b, "min", "max");
+      return c("span", {
         class: "pro-number-range"
-      }, [d(B, m(f, i(e.start, "max"), {
-        max: r.value,
+      }, [c(B, m(y, i(e.start, "max"), {
+        max: l.value,
         modelValue: a.value,
-        "onUpdate:modelValue": [(P) => a.value = P, l]
-      }), null), d("span", null, [((C = t.divider) == null ? void 0 : C.call(t)) || ((v = e.divider) == null ? void 0 : v.call(e)) || " - "]), d(B, m(f, i(e.start, "min"), {
-        min: b.value,
-        modelValue: u.value,
-        "onUpdate:modelValue": [(P) => u.value = P, l]
+        "onUpdate:modelValue": [(g) => a.value = g, r]
+      }), null), c("span", null, [((s = t.divider) == null ? void 0 : s.call(t)) || ((v = e.divider) == null ? void 0 : v.call(e)) || " - "]), c(B, m(y, i(e.start, "min"), {
+        min: f.value,
+        modelValue: o.value,
+        "onUpdate:modelValue": [(g) => o.value = g, r]
       }), null)]);
     };
   }
-}), pe = () => ({
+}), se = () => ({
   treeData: {
     type: Array
   },
@@ -710,15 +707,15 @@ const fe = () => ({
   checkedKeys: {
     type: Array
   }
-}), Ot = S({
+}), jt = S({
   props: {
     ...de.props,
-    ...pe()
+    ...se()
   },
   setup: (e, {
     slots: t
   }) => {
-    const o = s(pe()), u = (() => {
+    const u = F(se()), o = (() => {
       const n = e.fieldNames;
       if (!!n)
         return {
@@ -731,9 +728,9 @@ const fe = () => ({
     })();
     return () => {
       var n;
-      return d(de, m(i(e, o), {
+      return c(de, m(i(e, u), {
         data: e.treeData || e.data,
-        props: u || e.props,
+        props: o || e.props,
         nodeKey: ((n = e.fieldNames) == null ? void 0 : n.key) || e.nodeKey,
         showCheckbox: $(e.selectable) ? e.selectable : e.showCheckbox,
         defaultExpandedKeys: e.expandedKeys || e.defaultExpandedKeys,
@@ -741,47 +738,47 @@ const fe = () => ({
       }), t);
     };
   }
-}), kt = k({
+}), kt = C({
   InputComp: Ze,
   valueType: "text",
   name: "PFromText"
-}), Ft = k({
+}), Ft = C({
   InputComp: B,
   valueType: "digit",
   name: "PFormNumber"
-}), st = k({
+}), xt = C({
   InputComp: Ct,
   valueType: "digitRange",
   name: "PFormNumberRange"
-}), xt = k({
+}), Et = C({
   InputComp: He,
   valueType: "date",
   name: "PFormDate"
-}), Et = k({
+}), Tt = C({
   InputComp: Je,
   valueType: "time",
   name: "PFormTime"
-}), Tt = k({
-  InputComp: ht,
+}), Kt = C({
+  InputComp: St,
   valueType: "select",
   name: "PFormSelect"
-}), Kt = k({
+}), Mt = C({
   InputComp: Qe,
   valueType: "treeSelect",
   name: "PFormTreeSelect"
-}), It = k({
-  InputComp: gt,
+}), It = C({
+  InputComp: Pt,
   valueType: "checkbox",
   name: "PFromCheckbox"
-}), Rt = k({
-  InputComp: Pt,
+}), Rt = C({
+  InputComp: ht,
   valueType: "radio",
   name: "PFromRadio"
-}), Vt = k({
+}), Vt = C({
   InputComp: Xe,
   valueType: "switch",
   name: "PFromSwitch"
-}), Mt = k({
+}), Bt = C({
   InputComp: Ye,
   valueType: "cascader",
   name: "PFormCascader"
@@ -804,53 +801,53 @@ const fe = () => ({
   setup: (e, {
     slots: t
   }) => {
-    const o = ({
+    const u = ({
       row: n,
-      column: l,
-      $index: c
+      column: r,
+      $index: d
     }) => {
-      var P;
-      const r = n, b = c, g = {
-        ...l,
-        title: l.label,
-        dataIndex: l.property
-      }, f = T(n, g.dataIndex), C = {
-        value: f,
-        text: f,
-        record: r,
-        column: g,
-        index: b
-      }, v = (P = t.bodyCell) == null ? void 0 : P.call(t, C);
-      return v || (e.customRender ? e.customRender(C) : f);
-    }, u = {
+      var g;
+      const l = n, f = d, b = {
+        ...r,
+        title: r.label,
+        dataIndex: r.property
+      }, y = T(n, b.dataIndex), s = {
+        value: y,
+        text: y,
+        record: l,
+        column: b,
+        index: f
+      }, v = (g = t.bodyCell) == null ? void 0 : g.call(t, s);
+      return v || (e.customRender ? e.customRender(s) : y);
+    }, o = {
       header: ({
         column: n,
-        $index: l
+        $index: r
       }) => {
-        var f;
-        const c = l, r = n.label, b = {
+        var y;
+        const d = r, l = n.label, f = {
           ...n,
-          title: r,
+          title: l,
           dataIndex: n.property
         };
-        return ((f = t.headerCell) == null ? void 0 : f.call(t, {
-          title: r,
-          column: b,
-          index: c
-        })) || r;
+        return ((y = t.headerCell) == null ? void 0 : y.call(t, {
+          title: l,
+          column: f,
+          index: d
+        })) || l;
       }
     };
-    return (!e.children || A(e.children) <= 0) && (u.default = o), () => d(ce, m(i(e, "title", "dataIndex", "prop", "customRender", "children"), {
+    return (!e.children || A(e.children) <= 0) && (o.default = u), () => c(ce, m(i(e, "title", "dataIndex", "prop", "customRender", "children"), {
       prop: e.dataIndex,
       label: e.title
     }), {
-      default: () => [A(e.children) > 0 && F(e.children, (n) => d(Be, m({
+      default: () => [A(e.children) > 0 && k(e.children, (n) => c(Be, m({
         key: n.dataIndex
       }, n), t))],
-      ...u
+      ...o
     });
   }
-}), Bt = ["clearSelection", "getSelectionRows", "toggleRowSelection", "toggleAllSelection", "toggleRowExpansion", "setCurrentRow", "clearSort", "clearFilter", "doLayout", "sort", "scrollTo", "setScrollTop", "setScrollLeft"], Ne = S({
+}), Nt = ["clearSelection", "getSelectionRows", "toggleRowSelection", "toggleAllSelection", "toggleRowExpansion", "setCurrentRow", "clearSort", "clearFilter", "doLayout", "sort", "scrollTo", "setScrollTop", "setScrollLeft"], Ne = S({
   props: {
     ...ie.props,
     columns: {
@@ -861,34 +858,61 @@ const fe = () => ({
     },
     loading: {
       type: Boolean
+    },
+    mergeOpts: {
+      type: Object
     }
   },
   setup: (e, {
     slots: t,
-    expose: o
+    expose: u
   }) => {
-    const a = p(), u = Te("table");
-    return o(Ce(Bt, a)), () => d(ie, m({
+    const a = p(), o = Te("table");
+    u(pe(Nt, a));
+    const r = (() => {
+      var d, l;
+      if (e.spanMethod)
+        return e.spanMethod;
+      if (((d = e.mergeOpts) == null ? void 0 : d.rowNames) || ((l = e.mergeOpts) == null ? void 0 : l.colNames)) {
+        const f = ft(e.mergeOpts);
+        return ({
+          row: b,
+          column: y
+        }) => {
+          const s = y.property;
+          if (f[s]) {
+            const v = b[f[s]], g = b[s + "-colspan"];
+            return {
+              rowspan: v !== void 0 ? v : 1,
+              colspan: g !== void 0 ? g : 1
+            };
+          }
+        };
+      }
+      return e.spanMethod;
+    })();
+    return () => c(ie, m({
       ref: a,
-      id: u
-    }, i(e, "columns", "dataSource", "loading"), {
-      data: e.dataSource || e.data
+      id: o
+    }, i(e, "columns", "dataSource", "data", "loading", "spanMethod"), {
+      data: e.dataSource || e.data,
+      spanMethod: r
     }), {
       default: () => {
-        var n, l;
-        return [(n = t.start) == null ? void 0 : n.call(t), F(e.columns, (c) => d(Be, m({
-          key: c.dataIndex
-        }, c), t)), (l = t.default) == null ? void 0 : l.call(t), e.loading && d(Ke, {
-          target: u,
+        var d, l;
+        return [(d = t.start) == null ? void 0 : d.call(t), k(e.columns, (f) => c(Be, m({
+          key: f.dataIndex
+        }, f), t)), (l = t.default) == null ? void 0 : l.call(t), e.loading && c(Ke, {
+          target: o,
           loading: !0
         }, null)];
       },
       ...G(t, "append", "empty")
     });
   }
-}), Nt = S({
+}), zt = S({
   props: {
-    ...M.props,
+    ...V.props,
     type: {
       type: String,
       default: "primary"
@@ -900,125 +924,125 @@ const fe = () => ({
   },
   setup: (e, {
     slots: t
-  }) => () => d(M, e, t)
+  }) => () => c(V, e, t)
 });
-V.props = {
+R.props = {
   ...q.props,
-  ...V.props,
+  ...R.props,
   formMethods: { type: Array, default: Ee }
 };
-w.props = {
-  ...V.props,
-  ...w.props,
+L.props = {
+  ...R.props,
+  ...L.props,
   inline: { type: Boolean, default: !0 }
 };
 Z.props = {
   ...j.props,
   ...Z.props
 };
-D.props = {
-  ...Ne.props,
-  ...D.props
-};
 O.props = {
-  ...Fe.props,
+  ...Ne.props,
   ...O.props
 };
+D.props = {
+  ...ke.props,
+  ...D.props
+};
 H.props = {
-  ...O.props,
+  ...D.props,
   ...H.props
 };
 J.props = {
-  ...V.props,
+  ...R.props,
   ...J.props
 };
 Q.props = {
-  ...Ie.props,
+  ...Me.props,
   ...Q.props
 };
 X.props = {
-  ...Me.props,
+  ...Ve.props,
   ...X.props,
   modelValue: String
 };
-const jt = {
-  [y.LoadingKey]: Ke,
-  [y.RowKey]: _e,
-  [y.ColKey]: et,
-  [y.ButtonKey]: M,
-  [y.DescriptionsKey]: Fe,
-  [y.DescriptionsItemKey]: tt,
-  [y.MenusKey]: St,
-  [y.ModalKey]: Ie,
-  [y.PaginationKey]: vt,
-  [y.PopoverKey]: bt,
-  [y.CheckboxKey]: ke,
-  [y.FormKey]: ft,
-  [y.FormItemKey]: xe,
-  [y.TableKey]: Ne,
-  [y.TableOperateKey]: Nt,
-  [y.UploaderKey]: Me,
-  [y.ProFormKey]: V,
-  [y.ProSearchFormKey]: w,
-  [y.ProTableKey]: D,
-  [y.ProCurdKey]: Ae,
-  [y.ProListKey]: Ue,
+const qt = {
+  [P.LoadingKey]: Ke,
+  [P.RowKey]: _e,
+  [P.ColKey]: et,
+  [P.ButtonKey]: V,
+  [P.DescriptionsKey]: ke,
+  [P.DescriptionsItemKey]: tt,
+  [P.MenusKey]: st,
+  [P.ModalKey]: Me,
+  [P.PaginationKey]: bt,
+  [P.PopoverKey]: gt,
+  [P.CheckboxKey]: Ce,
+  [P.FormKey]: yt,
+  [P.FormItemKey]: xe,
+  [P.TableKey]: Ne,
+  [P.TableOperateKey]: zt,
+  [P.UploaderKey]: Ve,
+  [P.ProFormKey]: R,
+  [P.ProSearchFormKey]: L,
+  [P.ProTableKey]: O,
+  [P.ProCurdKey]: Ae,
+  [P.ProListKey]: Ue,
   text: Y,
-  digit: Le,
-  date: we,
+  digit: we,
+  date: Le,
   time: Y,
-  select: L,
-  radio: L,
-  checkbox: L,
+  select: w,
+  radio: w,
+  checkbox: w,
   treeSelect: _,
   cascader: _
-}, qt = {
+}, $t = {
   text: kt,
   digit: Ft,
-  digitRange: st,
-  date: xt,
-  time: Et,
-  select: Tt,
-  treeSelect: Kt,
+  digitRange: xt,
+  date: Et,
+  time: Tt,
+  select: Kt,
+  treeSelect: Mt,
   checkbox: It,
   radio: Rt,
   switch: Vt,
-  cascader: Mt
+  cascader: Bt
 };
 export {
   Ee as FormMethods,
   Ct as InputNumberRange,
-  gt as ProCheckbox,
-  ft as ProForm,
-  Mt as ProFormCascader,
+  Pt as ProCheckbox,
+  yt as ProForm,
+  Bt as ProFormCascader,
   It as ProFormCheckbox,
-  xt as ProFormDatePicker,
-  st as ProFormInputNumberRange,
+  Et as ProFormDatePicker,
+  xt as ProFormInputNumberRange,
   xe as ProFormItem,
   Rt as ProFormRadio,
-  Tt as ProFormSelect,
+  Kt as ProFormSelect,
   Vt as ProFormSwitch,
   kt as ProFormText,
   Ft as ProFormTextNumber,
-  Et as ProFormTimePicker,
-  Kt as ProFormTreeSelect,
+  Tt as ProFormTimePicker,
+  Mt as ProFormTreeSelect,
   Ke as ProLoading,
-  St as ProMenus,
-  Ie as ProModal,
-  vt as ProPagination,
-  bt as ProPopover,
-  Pt as ProRadio,
-  ht as ProSelect,
+  st as ProMenus,
+  Me as ProModal,
+  bt as ProPagination,
+  gt as ProPopover,
+  ht as ProRadio,
+  St as ProSelect,
   Ne as ProTable,
   Be as ProTableColumn,
-  Nt as ProTableOperateItem,
+  zt as ProTableOperateItem,
   Dt as ProTabs,
-  Ot as ProTree,
-  Me as ProUploader,
-  Bt as TableMethods,
+  jt as ProTree,
+  Ve as ProUploader,
+  Nt as TableMethods,
   pt as UploadMethods,
-  k as createFormItemComponent,
+  C as createFormItemComponent,
   Te as createLoadingId,
-  jt as elementMap,
-  qt as formElementMap
+  qt as elementMap,
+  $t as formElementMap
 };