@vue-start/pro 0.5.31 → 0.5.33

package/dist/index.es.js

@@ -1,13 +1,13 @@
-import { defineComponent as w, provide as me, inject as ye, reactive as Ne, createVNode as s, Fragment as ae, computed as N, h as pe, isVNode as Ce, mergeProps as O, ref as G, createTextVNode as tt, toRef as nn } from "vue";
-import { reduce as ne, get as m, map as F, isString as oe, forEach as Z, size as _, endsWith as bt, set as le, isArray as W, pick as V, add as rn, subtract as an, isFunction as X, filter as Y, has as He, keys as z, isObject as Ee, omit as A, some as fe, isNumber as gt, head as on, split as un, isEmpty as St, mergeWith as cn, startsWith as ln, mapKeys as sn, debounce as Pt, clone as dn, isBoolean as ve, sortBy as pt, every as fn, join as We, findLast as mn, cloneDeep as Ct } from "lodash";
-import { filter as De, tap as xe, merge as yn, Subject as vn } from "rxjs";
-import { map as hn, tap as bn } from "rxjs/operators";
-import { mergeStateToData as gn, mergeStateToData2 as Sn, useEffect as ue, findFirstValidMenu as Pn, setReactiveValue as Et, restorePath as Mt, isValidPath as Tt, isPathHasParent as It, useRuleState as ke, convertCollection as Nt, useWatch as $t, useState as nt, useUpdateKey as pn, useResizeObserver as Ve, decimalFixed as Cn, thousandDivision as En, listToMap as Mn, treeToMap as Tn, getMenuTopNameMap as In, findTreeItem as rt, strToJson as At, jsonToStr as Nn, useSafeActivated as $n } from "@vue-start/hooks";
-import { useRequestProvide as $e, isDoneRequestActor as Ot, isFailedRequestActor as wt } from "@vue-start/request";
-import { useDispatchStore as Dt, useStore as xt, useObservableRef as An, useStoreConn as On, shallowEqual as wn, createStateUse as Dn } from "@vue-start/store";
-import { parseQuery as at, stringifyQuery as xn, useRouter as Ge, useRoute as Xe } from "vue-router";
-import { css as ot } from "@emotion/css";
-import ut from "dayjs";
+import { defineComponent as D, provide as me, inject as ye, reactive as Ne, createVNode as l, Fragment as ie, computed as N, h as Pe, isVNode as pe, mergeProps as x, ref as X, createTextVNode as et, toRef as rn } from "vue";
+import { reduce as ne, get as y, map as R, isString as ae, forEach as Z, size as Y, endsWith as ht, set as ce, isArray as W, pick as z, add as an, subtract as on, isFunction as V, filter as _, has as He, keys as H, isObject as Ce, omit as O, some as fe, isNumber as bt, head as un, split as cn, isEmpty as gt, mergeWith as sn, startsWith as ln, mapKeys as dn, debounce as St, clone as fn, isBoolean as Ee, sortBy as Pt, every as mn, join as We, findLast as yn, cloneDeep as pt } from "lodash";
+import { filter as De, tap as Fe, merge as vn, Subject as hn } from "rxjs";
+import { map as bn, tap as gn } from "rxjs/operators";
+import { mergeStateToData as Sn, mergeStateToData2 as Pn, useEffect as oe, findFirstValidMenu as pn, setReactiveValue as Ct, restorePath as Et, isValidPath as Mt, isPathHasParent as Tt, useUpdateKey as It, useRuleState as ke, convertCollection as Nt, useWatch as At, useState as tt, signTableMerge as Cn, useResizeObserver as Ve, decimalFixed as En, thousandDivision as Mn, listToMap as Tn, treeToMap as In, getMenuTopNameMap as Nn, findTreeItem as nt, strToJson as Ot, jsonToStr as An, useSafeActivated as On } from "@vue-start/hooks";
+import { useRequestProvide as Ae, isDoneRequestActor as $t, isFailedRequestActor as wt } from "@vue-start/request";
+import { useDispatchStore as Dt, useStore as Ft, useObservableRef as $n, useStoreConn as wn, shallowEqual as Dn, createStateUse as Fn } from "@vue-start/store";
+import { parseQuery as rt, stringifyQuery as xn, useRouter as Ge, useRoute as Xe } from "vue-router";
+import { css as at } from "@emotion/css";
+import ot from "dayjs";
 const Kn = () => ({
   elementMap: { type: Object },
   formElementMap: { type: Object },
@@ -15,9 +15,9 @@ const Kn = () => ({
   convertColumn: { type: Function },
   columnState: { type: Object },
   columnState2: { type: Object }
-}), he = Kn(), Fe = (e, t, a) => {
+}), ve = Kn(), Le = (e, t, r) => {
   let o = e;
-  return t && (o = gn(o, t, (r) => ie(r))), a && (o = Sn(o, a, (r) => ie(r))), o;
+  return t && (o = Sn(o, t, (a) => se(a))), r && (o = Pn(o, r, (a) => se(a))), o;
 }, Ln = () => ({
   elementMap: { type: Object },
   formElementMap: { type: Object },
@@ -30,34 +30,34 @@ const Kn = () => ({
   showMsg: { type: Object },
   showModal: { type: Object },
   showNotify: { type: Object }
-}), _e = Symbol("pro-config"), ee = () => ye(_e) || {}, qr = () => {
+}), _e = Symbol("pro-config"), ee = () => ye(_e) || {}, zr = () => {
   const { showMsg: e } = ee();
   return (t) => e(t);
-}, Vr = () => {
+}, Hr = () => {
   const { showModal: e } = ee();
   return (t) => e(t);
-}, zr = () => {
+}, Wr = () => {
   const { showNotify: e } = ee();
   return (t) => e(t);
-}, Hr = w({
+}, Gr = D({
   props: {
     ...Ln()
   },
   setup: (e, { slots: t }) => {
-    const a = ne(e.registerStores, (c, d) => ({ ...c, [d.key]: d }), {}), o = ne(e.registerActors, (c, d) => ({ ...c, [d.actor.name]: d }), {}), r = ne(e.registerMetas, (c, d) => ({ ...c, [d.actorName]: d }), {});
-    jn(r, o);
-    const { dispatchRequest: n } = $e(), u = (c, d, i) => {
-      const P = m(o, c);
-      if (!!P)
-        return n(P.actor, d, i);
+    const r = ne(e.registerStores, (c, s) => ({ ...c, [s.key]: s }), {}), o = ne(e.registerActors, (c, s) => ({ ...c, [s.actor.name]: s }), {}), a = ne(e.registerMetas, (c, s) => ({ ...c, [s.actorName]: s }), {});
+    kn(a, o);
+    const { dispatchRequest: n } = Ae(), u = (c, s, d) => {
+      const b = y(o, c);
+      if (!!b)
+        return n(b.actor, s, d);
     };
     return me(_e, {
       elementMap: e.elementMap,
       formElementMap: e.formElementMap,
       formExtraMap: e.formExtraMap,
-      registerStoreMap: a,
+      registerStoreMap: r,
       registerActorMap: o,
-      registerMetaMap: r,
+      registerMetaMap: a,
       dispatchRequest: u,
       convertRouter: e.convertRouter,
       showMsg: e.showMsg,
@@ -68,81 +68,81 @@ const Kn = () => ({
       return (c = t.default) == null ? void 0 : c.call(t);
     };
   }
-}), Wr = (e = {}) => (t) => {
+}), Xr = (e = {}) => (t) => {
   t.provide(_e, e);
-}, Kt = (e) => (t, a) => {
-  const { requestSubject$: o } = $e(), r = new Set(F(t, (n) => oe(n) ? n : n.name));
-  ue(() => {
+}, xt = (e) => (t, r) => {
+  const { requestSubject$: o } = Ae(), a = new Set(R(t, (n) => ae(n) ? n : n.name));
+  oe(() => {
     const n = o.pipe(
       De(e),
-      xe((u) => {
-        r.has(u.name) && a(u);
+      Fe((u) => {
+        a.has(u.name) && r(u);
       })
     ).subscribe();
     return () => {
       n.unsubscribe();
     };
   }, []);
-}, Gr = Kt(Ot), Xr = Kt(wt), Fn = (e, t, a) => {
-  const { requestSubject$: o, dispatchRequest: r } = $e(), n = new Set(F(e, (c) => oe(c) ? c : c.name)), u = {};
-  ue(() => {
-    const c = yn(
+}, _r = xt($t), Yr = xt(wt), Rn = (e, t, r) => {
+  const { requestSubject$: o, dispatchRequest: a } = Ae(), n = new Set(R(e, (c) => ae(c) ? c : c.name)), u = {};
+  oe(() => {
+    const c = vn(
       o.pipe(
-        De(Ot),
-        xe((d) => {
-          var i, P;
-          n.has(d.name) && ((i = t.onSuccess) == null || i.call(t, d), (P = t.onFinish) == null || P.call(t, d), u[d.name] = void 0);
+        De($t),
+        Fe((s) => {
+          var d, b;
+          n.has(s.name) && ((d = t.onSuccess) == null || d.call(t, s), (b = t.onFinish) == null || b.call(t, s), u[s.name] = void 0);
         })
       ),
       o.pipe(
         De(wt),
-        xe((d) => {
-          var i, P;
-          n.has(d.name) && ((i = t.onFailed) == null || i.call(t, d), (P = t.onFinish) == null || P.call(t, d), u[d.name] = void 0);
+        Fe((s) => {
+          var d, b;
+          n.has(s.name) && ((d = t.onFailed) == null || d.call(t, s), (b = t.onFinish) == null || b.call(t, s), u[s.name] = void 0);
         })
       )
     ).subscribe();
     return () => {
-      c.unsubscribe(), a && Z(u, (d) => {
-        d && r({ ...d, stage: "CANCEL" });
+      c.unsubscribe(), r && Z(u, (s) => {
+        s && a({ ...s, stage: "CANCEL" });
       });
     };
   }, []);
-}, Rn = (e, t, a) => {
-  var r;
-  const o = (r = e.res) == null ? void 0 : r.data;
-  return t ? t(o, e) : a ? m(o, a) : o;
-}, _r = () => {
-  const e = xt(), { registerMetaMap: t, dispatchRequest: a } = ee();
+}, jn = (e, t, r) => {
+  var a;
+  const o = (a = e.res) == null ? void 0 : a.data;
+  return t ? t(o, e) : r ? y(o, r) : o;
+}, Qr = () => {
+  const e = Ft(), { registerMetaMap: t, dispatchRequest: r } = ee();
   return (o) => {
-    const r = m(t, o);
-    if (!r)
+    const a = y(t, o);
+    if (!a)
       return;
-    const n = r.storeName || o;
-    m(e.value, n) || a(o, r.initParams || {});
+    const n = a.storeName || o;
+    y(e.value, n) || r(o, a.initParams || {});
   };
-}, jn = (e, t) => {
-  const { requestSubject$: a } = $e(), o = Dt(), r = (n) => {
-    const u = m(e, n.name), c = m(t, n.name);
+}, kn = (e, t) => {
+  const { requestSubject$: r } = Ae(), o = Dt(), a = (n) => {
+    const u = y(e, n.name), c = y(t, n.name);
     return !!(u && c && c.actor);
   };
-  ue(() => {
-    const n = a.pipe(
-      De(r),
-      xe((u) => {
-        const c = m(e, u.name);
+  oe(() => {
+    const n = r.pipe(
+      De(a),
+      Fe((u) => {
+        const c = y(e, u.name);
         if (!c)
           return;
-        const d = c.storeName || u.name, i = Rn(u, c.convertData, c.convertPath);
-        o(d, i, !1, void 0);
+        const s = c.storeName || u.name, d = jn(u, c.convertData, c.convertPath);
+        o(s, d, !1, void 0);
       })
     ).subscribe();
     return () => {
       n.unsubscribe();
     };
   }, []);
-}, kn = {
-  open: (e, t, a) => window.open(e, t, a),
+}, Un = {
+  open: (e, t, r) => window.open(e, t, r),
   parseStr: (e) => {
     var n;
     if (!e)
@@ -153,26 +153,26 @@ const Kn = () => ({
         protocol: u.protocol,
         path: u.pathname,
         origin: u.origin,
-        query: at(u.search),
+        query: rt(u.search),
         url: u.origin + u.pathname
       };
     } catch {
     }
     const t = e.indexOf("//") > -1 ? (n = e.split("//")) == null ? void 0 : n[0] : "";
-    let a = "", o = "";
-    e.indexOf("?") >= -1 && (a = e.substring(0, e.indexOf("?")), o = e.substring(e.indexOf("?")));
-    const r = o ? at(o) : {};
-    return { protocol: t, query: r, url: a };
+    let r = "", o = "";
+    e.indexOf("?") >= -1 && (r = e.substring(0, e.indexOf("?")), o = e.substring(e.indexOf("?")));
+    const a = o ? rt(o) : {};
+    return { protocol: t, query: a, url: r };
   },
   stringifyUrl: ({ url: e, query: t }) => {
-    const a = xn(t);
-    return `${e}${a ? "?" : ""}${a || ""}`;
+    const r = xn(t);
+    return `${e}${r ? "?" : ""}${r || ""}`;
   }
-}, Lt = () => {
-  const { convertRouter: e } = ee(), t = Ge(), a = Xe(), r = { ...t, openMenu: (u) => {
+}, Kt = () => {
+  const { convertRouter: e } = ee(), t = Ge(), r = Xe(), a = { ...t, openMenu: (u) => {
     if (!!u) {
-      if (_(u.children) > 0) {
-        const c = Pn(u.children, (d) => !d.children || _(d.children) <= 0);
+      if (Y(u.children) > 0) {
+        const c = pn(u.children, (s) => !s.children || Y(s.children) <= 0);
         if (c) {
           t.push({ name: c.value });
           return;
@@ -180,67 +180,67 @@ const Kn = () => ({
       }
       t.push({ name: u.value });
     }
-  }, ...kn };
-  return { router: e ? e(r) : r, route: a };
-}, Un = (e) => {
-  if (!W(e) || _(e) <= 0)
+  }, ...Un };
+  return { router: e ? e(a) : a, route: r };
+}, Bn = (e) => {
+  if (!W(e) || Y(e) <= 0)
     return !1;
   const t = e[0];
-  return oe(t) ? bt(t, "$") : !1;
-}, Bn = (e) => typeof e != "object" || !e.type$ ? !1 : e.type$ === "data$" && e.type$, qn = (e) => typeof e != "object" || !e.type$ ? !1 : e.type$ === "obj", Vn = { get: m, pick: V, add: rn, subtract: an }, Ke = (e, t) => {
-  if (Bn(e)) {
-    const a = m(t, e.name$);
-    return e.namePath$ ? m(a, e.namePath$) : a;
-  } else if (qn(e)) {
-    const a = {};
-    return Z(e, (o, r) => {
-      if (r !== "type$")
-        if (bt(r, "$")) {
-          const n = Ke(o, t);
-          le(a, r.replace("$", ""), n);
+  return ae(t) ? ht(t, "$") : !1;
+}, qn = (e) => typeof e != "object" || !e.type$ ? !1 : e.type$ === "data$" && e.type$, Vn = (e) => typeof e != "object" || !e.type$ ? !1 : e.type$ === "obj", zn = { get: y, pick: z, add: an, subtract: on }, xe = (e, t) => {
+  if (qn(e)) {
+    const r = y(t, e.name$);
+    return e.namePath$ ? y(r, e.namePath$) : r;
+  } else if (Vn(e)) {
+    const r = {};
+    return Z(e, (o, a) => {
+      if (a !== "type$")
+        if (ht(a, "$")) {
+          const n = xe(o, t);
+          ce(r, a.replace("$", ""), n);
         } else
-          a[r] = o;
-    }), a;
-  } else if (Un(e)) {
-    const [a, ...o] = e, r = t.expressionMethods || Vn, n = m(r, a.replace("$", ""));
+          r[a] = o;
+    }), r;
+  } else if (Bn(e)) {
+    const [r, ...o] = e, a = t.expressionMethods || zn, n = y(a, r.replace("$", ""));
     if (!n) {
       console.log("ex", "\u672A\u627E\u5230\u5BF9\u5E94\u7684\u65B9\u6CD5", e);
       return;
     }
-    const u = F(o, (c) => Ke(c, t));
+    const u = R(o, (c) => xe(c, t));
     return n(...u);
   }
   return e;
-}, zn = () => {
+}, Hn = () => {
   const e = Dt(), { registerStoreMap: t } = ee();
-  return (a, o) => {
-    const r = m(t, a);
-    !r || e(a, o, !!r.persist, r.initialState);
+  return (r, o) => {
+    const a = y(t, r);
+    !a || e(r, o, !!a.persist, a.initialState);
   };
-}, Yr = (e) => {
-  const { registerStoreMap: t } = ee(), a = m(t, e), o = `${a != null && a.persist ? "$" : ""}${a == null ? void 0 : a.key}`;
-  return An(On((n) => {
-    const u = m(n, o);
-    return u || (X(a == null ? void 0 : a.initialState) ? a == null ? void 0 : a.initialState() : a == null ? void 0 : a.initialState);
+}, Jr = (e) => {
+  const { registerStoreMap: t } = ee(), r = y(t, e), o = `${r != null && r.persist ? "$" : ""}${r == null ? void 0 : r.key}`;
+  return $n(wn((n) => {
+    const u = y(n, o);
+    return u || (V(r == null ? void 0 : r.initialState) ? r == null ? void 0 : r.initialState() : r == null ? void 0 : r.initialState);
   }));
-}, Ft = Symbol("pro-module"), be = () => ye(Ft), Hn = (e) => {
-  me(Ft, e);
+}, Lt = Symbol("pro-module"), he = () => ye(Lt), Wn = (e) => {
+  me(Lt, e);
 }, Ye = (e) => {
   const {
     subject$: t
-  } = be();
-  ue(() => {
-    const a = t.subscribe({
+  } = he();
+  oe(() => {
+    const r = t.subscribe({
       next: (o) => {
         e(o);
       }
     });
-    return () => a.unsubscribe();
+    return () => r.unsubscribe();
   }, []);
 }, Me = {
   Success: "request-success$",
   Fail: "request-fail$"
-}, Wn = () => ({
+}, Gn = () => ({
   state: {
     type: Object
   },
@@ -265,261 +265,294 @@ const Kn = () => ({
   requests: {
     type: Array
   }
-}), we = w({
+}), we = D({
   props: {
-    ...Wn()
+    ...Gn()
   },
   setup: (e, {
     slots: t,
-    expose: a
+    expose: r
   }) => {
-    const o = xt(), {
-      router: r
-    } = Lt(), {
+    const o = Ft(), {
+      router: a
+    } = Kt(), {
       elementMap: n,
       registerStoreMap: u,
       expressionMethods: c
-    } = ee(), d = e.elementMap || n, i = (S) => W(S) ? Ze(d, S) : Te(d, S), P = new vn(), b = (S) => {
-      P.next(S);
-    }, y = Y(e.storeKeys, (S) => He(u, S)), v = () => ne(y, (S, g) => {
-      const D = m(u, g);
+    } = ee(), s = e.elementMap || n, d = (v) => W(v) ? Je(s, v) : Te(s, v), b = new hn(), h = (v) => {
+      b.next(v);
+    }, m = _(e.storeKeys, (v) => He(u, v)), g = () => ne(m, (v, T) => {
+      const F = y(u, T);
       return {
-        ...S,
-        [g]: m(o.value, `${D.persist ? "$" : ""}${g}`) || m(u, [g, "initialState"])
+        ...v,
+        [T]: y(o.value, `${F.persist ? "$" : ""}${T}`) || y(u, [T, "initialState"])
       };
-    }, {}), p = v(), l = e.state || Ne({
-      ...p,
+    }, {}), S = g(), f = e.state || Ne({
+      ...S,
       ...e.initState
-    }), h = {}, E = (S) => {
-      const g = l[S.type], D = X(S.payload) ? S.payload(g) : S.payload;
-      if (Ee(g)) {
-        Et(l[S.type], D);
+    }), p = {}, C = (v) => {
+      const T = f[v.type], F = V(v.payload) ? v.payload(T) : v.payload;
+      if (Ce(T)) {
+        Ct(f[v.type], F);
         return;
       }
-      l[S.type] = D;
-    }, f = zn(), C = {
-      dispatch: E,
-      dispatchStore: f
+      f[v.type] = F;
+    }, i = Hn(), P = {
+      dispatch: C,
+      dispatchStore: i
     };
-    ue(() => {
-      const S = o.pipe(hn(() => v()), bn((g) => {
-        Z(g, (D, q) => {
-          const ce = m(l, q);
-          wn(ce, D) || E({
-            type: q,
-            payload: D
+    oe(() => {
+      const v = o.pipe(bn(() => g()), gn((T) => {
+        Z(T, (F, L) => {
+          const ue = y(f, L);
+          Dn(ue, F) || C({
+            type: L,
+            payload: F
           });
         });
       })).subscribe();
       return () => {
-        S.unsubscribe();
+        v.unsubscribe();
       };
     }, []);
     const {
-      dispatchRequest: T
-    } = $e(), R = (() => {
-      const S = {}, g = ne(e.actors || [], (D, q) => ({
-        ...D,
-        [q.name]: q
+      dispatchRequest: E
+    } = Ae(), M = (() => {
+      const v = {}, T = ne(e.actors || [], (F, L) => ({
+        ...F,
+        [L.name]: L
       }), {});
-      return Z(e.requests, (D) => {
-        if (oe(D.actor)) {
-          const q = m(g, D.actor);
-          if (!q)
+      return Z(e.requests, (F) => {
+        if (ae(F.actor)) {
+          const L = y(T, F.actor);
+          if (!L)
             return;
-          D.actor = q;
+          F.actor = L;
         }
-        !D.actor || (S[D.actor.name] = D, D.action && (S[D.action] = D));
-      }), S;
-    })(), H = (S, ...g) => S.convertParams ? S.convertParams(...g) : S.convertParamsEx ? L(S.convertParamsEx, g) : m(g, 0), M = (S, g) => {
-      var D;
-      return S.convertData ? S.convertData(g) : S.convertDataEx ? L(S.convertDataEx, g) : (D = g.res) == null ? void 0 : D.data;
-    }, I = (S, ...g) => {
-      const D = m(R, S);
-      if (!D)
+        !F.actor || (v[F.actor.name] = F, F.action && (v[F.action] = F));
+      }), v;
+    })(), k = (v, ...T) => v.convertParams ? v.convertParams(...T) : v.convertParamsEx ? $(v.convertParamsEx, T) : y(T, 0), Q = (v, T) => {
+      var F;
+      return v.convertData ? v.convertData(T) : v.convertDataEx ? $(v.convertDataEx, T) : (F = T.res) == null ? void 0 : F.data;
+    }, q = (v, ...T) => {
+      const F = y(M, v);
+      if (!F)
         return;
-      const q = H(D, ...g);
-      D.loadingName && E({
-        type: D.loadingName,
+      const L = k(F, ...T);
+      F.loadingName && C({
+        type: F.loadingName,
         payload: !0
-      }), T(D.actor, q);
+      }), E(F.actor, L);
     };
-    Fn(z(R), {
-      onSuccess: (S) => {
-        var q;
-        const g = m(R, S.name), D = M(g, S);
-        g != null && g.stateName && E({
-          type: g.stateName,
-          payload: D
-        }), b({
+    Rn(H(M), {
+      onSuccess: (v) => {
+        var L;
+        const T = y(M, v.name), F = Q(T, v);
+        T != null && T.stateName && C({
+          type: T.stateName,
+          payload: F
+        }), h({
           type: Me.Success,
           payload: {
-            actor: S,
-            requestOpts: g
+            actor: v,
+            requestOpts: T
           }
-        }), (q = g.onSuccess) == null || q.call(g, S), g.onSuccessEx && k(g.onSuccessEx, [D]);
+        }), (L = T.onSuccess) == null || L.call(T, v), T.onSuccessEx && A(T.onSuccessEx, [F]);
       },
-      onFailed: (S) => {
-        var D;
-        const g = m(R, S.name);
-        b({
+      onFailed: (v) => {
+        var F;
+        const T = y(M, v.name);
+        h({
           type: Me.Fail,
           payload: {
-            actor: S,
-            requestOpts: g
+            actor: v,
+            requestOpts: T
           }
-        }), (D = g.onFailed) == null || D.call(g, S), g.onFailedEx && k(g.onFailedEx, [S.err]);
+        }), (F = T.onFailed) == null || F.call(T, v), T.onFailedEx && A(T.onFailedEx, [v.err]);
       },
-      onFinish: (S) => {
-        const g = m(R, [S.name, "loadingName"]);
-        g && E({
-          type: g,
+      onFinish: (v) => {
+        const T = y(M, [v.name, "loadingName"]);
+        T && C({
+          type: T,
           payload: !1
         });
       }
     }, !0);
-    const L = (S, g) => Ke(S, {
-      state: l,
-      data: h,
-      args: g,
+    const $ = (v, T) => xe(v, {
+      state: f,
+      data: p,
+      args: T,
       expressionMethods: c
-    }), k = (S, g) => {
-      if (!S)
+    }), A = (v, T) => {
+      if (!v)
         return;
-      const D = {
-        state: l,
-        data: h,
-        args: g,
+      const F = {
+        state: f,
+        data: p,
+        args: T,
         expressionMethods: c
       };
-      Z(S, (q) => {
-        if (!W(q) || _(q) < 2) {
-          console.log("execute invalid", q);
+      Z(v, (L) => {
+        if (!W(L) || Y(L) < 2) {
+          console.log("execute invalid", L);
           return;
         }
-        const [ce, $, ...B] = q;
-        let J;
-        switch (ce) {
+        const [ue, w, ...j] = L;
+        let G;
+        switch (ue) {
           case "router":
-            J = m(r, $);
+            G = y(a, w);
             break;
           case "state":
-            J = m(C, $);
+            G = y(P, w);
             break;
         }
-        if (J)
+        if (G)
           try {
-            const je = F(B, (tn) => Ke(tn, D));
-            J(...je);
+            const je = R(j, (nn) => xe(nn, F));
+            G(...je);
           } catch (je) {
             console.log("execute err", je);
           }
       });
     };
-    return Hn({
-      elementMap: d,
-      subject$: P,
-      sendEvent: b,
-      state: l,
-      dispatch: E,
-      data: h,
+    return Wn({
+      elementMap: s,
+      subject$: b,
+      sendEvent: h,
+      state: f,
+      dispatch: C,
+      data: p,
       requests: e.requests,
-      sendRequest: I,
-      executeExp: L,
-      execute: k
-    }), a({
-      sendEvent: b,
-      sendRequest: I
+      sendRequest: q,
+      executeExp: $,
+      execute: A
+    }), r({
+      sendEvent: h,
+      sendRequest: q
     }), () => {
-      var S;
-      return s(ae, null, [_(e.elementConfigs) > 0 && i(e.elementConfigs), (S = t.default) == null ? void 0 : S.call(t)]);
+      var v;
+      return l(ie, null, [Y(e.elementConfigs) > 0 && d(e.elementConfigs), (v = t.default) == null ? void 0 : v.call(t)]);
     };
   }
-}), Rt = (e) => e.formValueType || e.valueType || "text", ie = (e) => {
-  var t;
-  return ((t = e.formItemProps) == null ? void 0 : t.name) || e.dataIndex;
-}, Qe = (e, t) => {
-  var n;
-  const a = Rt(t), o = m(e, a);
-  if (!o)
+}), Rt = (e) => e.formValueType || e.valueType || "text", se = (e) => {
+  var o, a;
+  const t = (o = e.formItemProps) == null ? void 0 : o.name;
+  return ((a = e.inputProps) == null ? void 0 : a.name) || t || e.dataIndex;
+}, Xn = (e, t) => {
+  let r = t;
+  return ae(t) && (r = y(e, t)), V(r) || (r = y(e, "render")), V(r) ? r : void 0;
+}, Qe = (e, t, r, o) => {
+  var b, h, m;
+  const a = Xn(t, o == null ? void 0 : o.render);
+  if (a)
+    return a({
+      ...r,
+      column: t
+    });
+  const n = t.valueType || "text", u = y(e, n);
+  if (!u)
     return null;
-  const r = ie(t);
-  return pe(o, {
-    key: r,
-    name: r,
-    label: t.title,
-    ...t.formItemProps,
-    fieldProps: A(t.formFieldProps, "slots"),
-    showProps: t.showProps
-  }, (n = t.formFieldProps) == null ? void 0 : n.slots);
-}, Je = (e, t, a) => {
-  var n;
-  const o = t.valueType || "text", r = m(e, o);
-  return r ? pe(r, {
-    ...A(t.formFieldProps, "slots"),
-    showProps: t.showProps,
-    value: a
-  }, (n = t.formFieldProps) == null ? void 0 : n.slots) : null;
-}, Gn = (e) => e && !X(e) && e.elementType, Ze = (e, t) => F(t, (a) => Te(e, a)), jt = (e, t) => {
+  const c = ((b = t.props) == null ? void 0 : b.slots) || ((h = t.formFieldProps) == null ? void 0 : h.slots) || {}, s = r || {};
+  u.props.showProps && (s.showProps = t.props ? (m = t.props) == null ? void 0 : m.showProps : t.showProps);
+  const d = t.props ? {
+    ...O(t.props, "slots"),
+    ...s
+  } : {
+    ...O(t.formFieldProps, "slots"),
+    ...s
+  };
+  return Pe(u, {
+    ...d
+  }, c);
+}, jt = (e, t, r) => {
+  var b, h;
+  const o = Rt(r), a = y(t, o);
+  if (!a)
+    return null;
+  const n = r.inputProps, u = ((b = n == null ? void 0 : n.fieldProps) == null ? void 0 : b.slots) || ((h = r.formFieldProps) == null ? void 0 : h.slots) || {};
+  !u.renderInput && V(r.inputRender) && (u.renderInput = (m) => r.inputRender({
+    ...m,
+    column: r
+  })), u.renderShow || (u.renderShow = (m) => Qe(e, r, {
+    value: m.value
+  }, {
+    render: "formReadRender"
+  }) || m.value);
+  const c = se(r), s = r.title, d = n ? {
+    ...n,
+    fieldProps: O(n, "slots")
+  } : {
+    ...r.formItemProps,
+    fieldProps: O(r.formFieldProps, "slots"),
+    showProps: r.showProps
+  };
+  return Pe(a, {
+    key: c,
+    name: c,
+    label: s,
+    ...d
+  }, u);
+}, _n = (e) => e && !V(e) && e.elementType, Je = (e, t) => R(t, (r) => Te(e, r)), kt = (e, t) => {
   var n;
-  const a = t.elementProps, o = {
+  const r = t.elementProps, o = {
     ...t.elementProps
-  }, r = a == null ? void 0 : a.class;
-  return r && (typeof r == "object" ? o.class = ot(r) : oe(r) && r.indexOf(":") > 0 && (o.class = ot`
-        ${r}
+  }, a = r == null ? void 0 : r.class;
+  return a && (typeof a == "object" ? o.class = at(a) : ae(a) && a.indexOf(":") > 0 && (o.class = at`
+        ${a}
       `)), Z((n = t.highConfig$) == null ? void 0 : n.registerPropsTrans, (u) => {
-    const c = m(a, u.name);
-    if (!(!c || Ce(c))) {
+    const c = y(r, u.name);
+    if (!(!c || pe(c))) {
       if (W(c)) {
-        if (fe(c, (d) => Ce(d)))
+        if (fe(c, (s) => pe(s)))
           return;
-        le(o, u.name, Ze(e, c));
+        ce(o, u.name, Je(e, c));
         return;
       }
-      !c.elementType || (u.isFun ? le(o, u.name, (...d) => {
-        const i = u.needParams ? {
+      !c.elementType || (u.isFun ? ce(o, u.name, (...s) => {
+        const d = u.needParams ? {
           ...c.elementProps,
-          params$: d
+          params$: s
         } : c.elementProps;
         return Te(e, {
           ...c,
-          elementProps: i
+          elementProps: d
         });
-      }) : le(o, u.name, Te(e, c)));
+      }) : ce(o, u.name, Te(e, c)));
     }
   }), o;
-}, kt = (e, t) => {
-  const a = _(t.children) > 0 ? Ze(e, t.children) : void 0, o = t.childrenSlotName || "default", r = A(t.slots, a ? o : "");
-  return Z(z(r), (n) => {
-    const u = r[n];
-    Gn(u) ? r[n] = (...c) => {
-      const d = u.needParams ? {
+}, Ut = (e, t) => {
+  const r = Y(t.children) > 0 ? Je(e, t.children) : void 0, o = t.childrenSlotName || "default", a = O(t.slots, r ? o : "");
+  return Z(H(a), (n) => {
+    const u = a[n];
+    _n(u) ? a[n] = (...c) => {
+      const s = u.needParams ? {
         ...u.elementProps,
         params$: c
       } : u.elementProps;
       return Te(e, {
         ...u,
-        elementProps: d
+        elementProps: s
       });
-    } : (oe(u) || gt(u)) && (r[n] = () => u);
+    } : (ae(u) || bt(u)) && (a[n] = () => u);
   }), {
-    [o]: a ? () => a : void 0,
-    ...r
+    [o]: r ? () => r : void 0,
+    ...a
   };
 }, Te = (e, t) => {
-  const a = m(e, t.elementType) || t.elementType;
+  const r = y(e, t.elementType) || t.elementType;
   if (t.highConfig$)
-    return pe(_n, {
+    return Pe(Qn, {
       key: t.elementId,
       elementMap: e,
       elementConfig: t
     });
-  const o = kt(e, t), r = jt(e, t);
-  return pe(a, {
+  const o = Ut(e, t), a = kt(e, t);
+  return Pe(r, {
     key: t.elementId,
-    ...r
+    ...a
   }, o);
-}, Xn = (e) => W(e) ? on(e) : oe(e) && e.indexOf(".") > 0 ? e.substring(0, e.indexOf(".")) : e, _n = w({
+}, Yn = (e) => W(e) ? un(e) : ae(e) && e.indexOf(".") > 0 ? e.substring(0, e.indexOf(".")) : e, Qn = D({
   props: {
     elementMap: {
       type: Object
@@ -529,49 +562,49 @@ const Kn = () => ({
     }
   },
   setup: (e) => {
-    var v;
+    var g;
     const {
       state: t,
-      sendEvent: a,
+      sendEvent: r,
       execute: o
-    } = be(), {
-      elementMap: r,
+    } = he(), {
+      elementMap: a,
       elementConfig: n
-    } = e, u = n.highConfig$, c = jt(r, n);
-    Z((v = n.highConfig$) == null ? void 0 : v.registerEventList, (p) => {
-      const l = (...E) => {
-        const f = `${n.elementId}-${p.name}`;
-        a({
-          type: f,
-          payload: E
-        }), o(p.executeList, E);
-      }, h = Mt(p.name, c);
-      c && Tt(h) && It(h, c) && le(c, h, l);
+    } = e, u = n.highConfig$, c = kt(a, n);
+    Z((g = n.highConfig$) == null ? void 0 : g.registerEventList, (S) => {
+      const f = (...C) => {
+        const i = `${n.elementId}-${S.name}`;
+        r({
+          type: i,
+          payload: C
+        }), o(S.executeList, C);
+      }, p = Et(S.name, c);
+      c && Mt(p) && Tt(p, c) && ce(c, p, f);
     });
-    const d = N(() => {
-      if (!u.registerStateList || _(u.registerStateList) <= 0)
+    const s = N(() => {
+      if (!u.registerStateList || Y(u.registerStateList) <= 0)
         return;
-      const p = {
+      const S = {
         ...c
-      }, l = Y(u.registerStateList, (E) => !E.target || E.target === "prop"), h = F(l, (E) => {
-        const f = E.mapName || E.name, C = m(t, E.name);
-        return le(p, f, C), Xn(f);
+      }, f = _(u.registerStateList, (C) => !C.target || C.target === "prop"), p = R(f, (C) => {
+        const i = C.mapName || C.name, P = y(t, C.name);
+        return ce(S, i, P), Yn(i);
       });
-      return V(p, h);
-    }), i = m(r, n.elementType) || n.elementType, P = kt(r, n), b = ne(Y(u.registerStateList, (p) => p.target === "slot"), (p, l) => ({
-      ...p,
-      [l.mapName]: () => m(t, l.name)
-    }), {}), y = {
-      ...P,
-      ...b
+      return z(S, p);
+    }), d = y(a, n.elementType) || n.elementType, b = Ut(a, n), h = ne(_(u.registerStateList, (S) => S.target === "slot"), (S, f) => ({
+      ...S,
+      [f.mapName]: () => y(t, f.name)
+    }), {}), m = {
+      ...b,
+      ...h
     };
-    return () => m(d.value, "show$") === !1 ? null : pe(i, {
+    return () => y(s.value, "show$") === !1 ? null : Pe(d, {
       key: n.elementId,
       ...c,
-      ...A(d.value, "show$")
-    }, y);
+      ...O(s.value, "show$")
+    }, m);
   }
-}), U = {
+}), B = {
   TypographyKey: "Typography$",
   LoadingKey: "Loading$",
   RowKey: "Row$",
@@ -594,14 +627,14 @@ const Kn = () => ({
   ProTableKey: "ProTable$",
   ProCurdKey: "ProCurd$",
   ProListKey: "ProList$"
-}, Q = () => {
+}, J = () => {
   const { elementMap: e } = ee();
-  return (t) => m(e, t);
+  return (t) => y(e, t);
 };
-function Yn(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !Ce(e);
+function Jn(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !pe(e);
 }
-const Qn = () => ({
+const Zn = () => ({
   row: {
     type: Object,
     default: void 0
@@ -612,69 +645,69 @@ const Qn = () => ({
   items: {
     type: Array
   }
-}), Se = w({
+}), ge = D({
   props: {
-    ...Qn()
+    ...Zn()
   },
   setup: (e) => {
-    const t = Q(), a = t(U.RowKey), o = t(U.ColKey);
+    const t = J(), r = t(B.RowKey), o = t(B.ColKey);
     return () => {
-      let r;
-      return !a || !o ? null : s(a, e.row, Yn(r = F(e.items, (n) => s(o, O({
+      let a;
+      return !r || !o ? null : l(r, e.row, Jn(a = R(e.items, (n) => l(o, x({
         key: n.rowKey
       }, e.col, n.col), {
         default: () => [n.vNode]
-      }))) ? r : {
-        default: () => [r]
+      }))) ? a : {
+        default: () => [a]
       });
     };
   }
-}), Jn = (e, t, a) => {
+}), er = (e, t, r) => {
   if (t) {
-    const o = Y(z(t), (r) => !t[r]);
-    return A(e, o);
+    const o = _(H(t), (a) => !t[a]);
+    return O(e, o);
   }
-  if (a) {
-    const o = Y(z(a), (r) => !a[r](e));
-    return A(e, o);
+  if (r) {
+    const o = _(H(r), (a) => !r[a](e));
+    return O(e, o);
   }
   return e;
-}, Ut = (e) => {
+}, Bt = (e) => {
   if (!!e)
-    return W(e) ? e : e && oe(e) && e.indexOf(".") > 0 ? un(e, ".") : [e];
-}, Qr = (e, t, a) => !t || !a ? e : F(e, (o) => {
-  const r = X(a) ? a(o) : m(o, a), n = m(t, r);
-  return !n || St(n) || X(n) || !Ee(n) ? o : cn(o, n, (u, c) => {
+    return W(e) ? e : e && ae(e) && e.indexOf(".") > 0 ? cn(e, ".") : [e];
+}, Zr = (e, t, r) => !t || !r ? e : R(e, (o) => {
+  const a = V(r) ? r(o) : y(o, r), n = y(t, a);
+  return !n || gt(n) || V(n) || !Ce(n) ? o : sn(o, n, (u, c) => {
     if (W(u) || W(c))
       return c;
   });
-}), ge = (e, t) => {
-  const a = ne(
+}), be = (e, t) => {
+  const r = ne(
     e,
-    (o, r) => ({
+    (o, a) => ({
       ...o,
-      [r]: (...n) => {
+      [a]: (...n) => {
         var u, c;
-        return (c = (u = t.value) == null ? void 0 : u[r]) == null ? void 0 : c.call(u, ...n);
+        return (c = (u = t.value) == null ? void 0 : u[a]) == null ? void 0 : c.call(u, ...n);
       }
     }),
     {}
   );
-  return a.originRef = t, a;
-}, Jr = (e, t, a) => {
-  const o = { originRef: e, ...a };
-  return t && _(t) > 0 && Z(t, (r) => {
-    o[r] = (...n) => {
+  return r.originRef = t, r;
+}, ea = (e, t, r) => {
+  const o = { originRef: e, ...r };
+  return t && Y(t) > 0 && Z(t, (a) => {
+    o[a] = (...n) => {
       var u, c;
-      return (c = (u = e.value) == null ? void 0 : u[r]) == null ? void 0 : c.call(u, ...n);
+      return (c = (u = e.value) == null ? void 0 : u[a]) == null ? void 0 : c.call(u, ...n);
     };
   }), o;
-}, Zn = (e, t) => m(e, ["extra", t]) || m(e, t), se = (e, t) => {
-  const a = z(e), o = `${t}-`, r = Y(a, (u) => ln(u, o)), n = V(e, r);
-  return sn(n, (u, c) => c.replace(o, ""));
-}, Bt = Symbol("pro-form-list"), qt = () => ye(Bt), Vt = (e) => {
-  me(Bt, e);
-}, er = w({
+}, tr = (e, t) => y(e, ["extra", t]) || y(e, t), le = (e, t) => {
+  const r = H(e), o = `${t}-`, a = _(r, (u) => ln(u, o)), n = z(e, a);
+  return dn(n, (u, c) => c.replace(o, ""));
+}, qt = Symbol("pro-form-list"), Vt = () => ye(qt), zt = (e) => {
+  me(qt, e);
+}, nr = D({
   props: {
     pathList: {
       type: Array
@@ -682,13 +715,13 @@ const Qn = () => ({
   },
   setup: (e, {
     slots: t
-  }) => (Vt({
+  }) => (zt({
     pathList: e.pathList
   }), () => {
-    var a;
-    return (a = t.default) == null ? void 0 : a.call(t);
+    var r;
+    return (r = t.default) == null ? void 0 : r.call(t);
   })
-}), ct = () => ({
+}), ut = () => ({
   rowKey: {
     type: String,
     default: "id"
@@ -712,80 +745,133 @@ const Qn = () => ({
   },
   renderItemMinus: {
     type: Function
+  },
+  onPreAdd: {
+    type: Function
+  },
+  onAdd: {
+    type: Function
+  },
+  onPreRemove: {
+    type: Function
+  },
+  onRemove: {
+    type: Function
   }
-}), Zr = w({
+}), ta = D({
   props: {
-    ...ct(),
-    ...A(Se.props, "items")
+    ...ut(),
+    ...O(ge.props, "items")
   },
   setup: (e, {
     slots: t
   }) => {
-    const o = Q()(U.FormItemKey), {
-      formState: r,
+    const o = J()(B.FormItemKey), {
+      formState: a,
       readonly: n,
-      formElementMap: u
-    } = Ht(), c = qt(), d = Ut(e.name), i = c != null && c.pathList ? [...c.pathList, ...d] : d, P = () => {
-      let l = m(r, i);
-      W(l) || (l = []), l.push({
-        [e.rowKey]: new Date().valueOf()
-      }), le(r, i, l);
-    }, b = (l) => {
-      const h = m(r, i);
-      _(h) <= 0 || h.splice(l, 1);
-    }, y = (l) => {
-      const h = ie(l);
-      return h && t[h] ? t[h](l, r) : Qe(u, l);
-    }, v = N(() => e.row ? F(e.columns, (l) => ({
-      rowKey: ie(l),
-      vNode: y(l),
-      col: m(l, ["extra", "col"])
-    })) : F(e.columns, (l) => y(l))), p = z(ct());
-    return () => o ? s(o, O({
+      elementMap: u,
+      formElementMap: c
+    } = Wt(), s = Vt(), d = Bt(e.name), b = s != null && s.pathList ? [...s.pathList, ...d] : d, [h, m] = It(), g = () => {
+      var E;
+      if (((E = e.onPreAdd) == null ? void 0 : E.call(e)) === !0)
+        return;
+      const P = () => {
+        let I = y(a, b);
+        W(I) || (I = []), I.push({
+          [e.rowKey]: new Date().valueOf()
+        }), ce(a, b, I);
+      };
+      if (e.onAdd) {
+        e.onAdd(P);
+        return;
+      }
+      P();
+    }, S = (i, P) => {
+      var M;
+      if (((M = e.onPreRemove) == null ? void 0 : M.call(e, {
+        index: i,
+        item: P
+      })) === !0)
+        return;
+      const I = () => {
+        const k = y(a, b);
+        Y(k) <= 0 || (k.splice(i, 1), m());
+      };
+      if (e.onRemove) {
+        e.onRemove(I, {
+          index: i,
+          item: P
+        });
+        return;
+      }
+      I();
+    }, f = (i, P) => {
+      const E = se(i);
+      return E && t[E] ? t[E]({
+        item: i,
+        formState: a,
+        pathList: P
+      }) : jt(u, c, i);
+    }, p = (i, P) => {
+      if (!c || Y(e.columns) <= 0)
+        return null;
+      if (!e.row)
+        return R(e.columns, (I) => f(I, i));
+      const E = R(e.columns, (I) => ({
+        rowKey: se(I),
+        vNode: f(I, i),
+        col: y(I, ["extra", "col"])
+      }));
+      return l(ge, {
+        row: e.row,
+        col: e.col,
+        items: E
+      }, null);
+    }, C = H(ut());
+    return () => o ? l(o, x({
       class: `pro-form-list ${e.inline ? "pro-form-list-inline" : ""}`,
       name: e.name
-    }, A(e, p)), {
+    }, O(e, C)), {
       default: () => {
-        var l, h;
-        return [F(m(r, i), (E, f) => s(er, {
-          key: E[e.rowKey] || f,
-          pathList: [...i, f]
-        }, {
-          default: () => {
-            var C, T, K, R, H, M;
-            return [s("div", {
-              class: "pro-form-list-item"
-            }, [(C = t.start) == null ? void 0 : C.call(t, {
-              state: r,
-              path: i,
-              index: f
-            }), u && _(e.columns) > 0 && s(ae, null, [e.row ? s(Se, {
-              row: e.row,
-              col: e.col,
-              items: v.value
-            }, null) : v.value]), (T = t.default) == null ? void 0 : T.call(t), !n.value && s(ae, null, [s("div", {
-              class: "pro-form-list-item-add",
-              onClick: P
-            }, [((K = t.itemAdd) == null ? void 0 : K.call(t)) || ((R = e.renderItemAdd) == null ? void 0 : R.call(e))]), s("div", {
-              class: "pro-form-list-item-minus",
-              onClick: () => b(f)
-            }, [((H = t.itemMinus) == null ? void 0 : H.call(t)) || ((M = e.renderItemMinus) == null ? void 0 : M.call(e))])])])];
-          }
-        })), !n.value && s("div", {
+        var i, P;
+        return [R(y(a, b), (E, I) => {
+          const M = [...b, I];
+          return l(nr, {
+            key: E[e.rowKey] + h.value,
+            pathList: M
+          }, {
+            default: () => {
+              var k, Q, q, $, A, v;
+              return [l("div", {
+                class: "pro-form-list-item"
+              }, [(k = t.start) == null ? void 0 : k.call(t, {
+                state: a,
+                path: b,
+                index: I
+              }), p(M), (Q = t.default) == null ? void 0 : Q.call(t), !n.value && l(ie, null, [l("div", {
+                class: "pro-form-list-item-add",
+                onClick: g
+              }, [((q = t.itemAdd) == null ? void 0 : q.call(t)) || (($ = e.renderItemAdd) == null ? void 0 : $.call(e))]), l("div", {
+                class: "pro-form-list-item-minus",
+                onClick: () => S(I, E)
+              }, [((A = t.itemMinus) == null ? void 0 : A.call(t)) || ((v = e.renderItemMinus) == null ? void 0 : v.call(e))])])])];
+            }
+          });
+        }), !n.value && l("div", {
           class: "pro-form-list-add",
-          onClick: P
-        }, [((l = t.add) == null ? void 0 : l.call(t)) || ((h = e.renderAdd) == null ? void 0 : h.call(e))])];
+          onClick: g
+        }, [((i = t.add) == null ? void 0 : i.call(t)) || ((P = e.renderAdd) == null ? void 0 : P.call(e))])];
       }
     }) : null;
   }
-}), zt = Symbol("pro-form"), Ht = () => ye(zt), tr = (e, t = 300, a) => Pt(e, t, a), nr = (e) => {
-  me(zt, e);
+}), Ht = Symbol("pro-form"), Wt = () => ye(Ht), rr = (e, t = 300, r) => St(e, t, r), ar = (e) => {
+  me(Ht, e);
 };
 let te;
 (function(e) {
   e.RESET = "RESET", e.SUBMIT = "SUBMIT", e.CONTINUE = "CONTINUE";
 })(te || (te = {}));
-const lt = () => ({
+const ct = () => ({
   clsName: {
     type: String,
     default: "pro-form"
@@ -835,45 +921,45 @@ const lt = () => ({
     type: Function,
     default: void 0
   }
-}), ea = w({
+}), na = D({
   inheritAttrs: !1,
   props: {
-    ...he,
-    ...lt(),
-    ...A(Se.props, "items")
+    ...ve,
+    ...ct(),
+    ...O(ge.props, "items")
   },
   setup: (e, {
     slots: t,
-    emit: a,
+    emit: r,
     expose: o,
-    attrs: r
+    attrs: a
   }) => {
     const {
       elementMap: n,
       formElementMap: u
-    } = ee(), c = e.elementMap || n, d = e.formElementMap || u, i = e.model || Ne({}), P = ke(i, e.showStateRules, e.showState), b = ke(i, e.readonlyStateRules, e.readonlyState), y = ke(i, e.disableStateRules, e.disableState), v = N(() => e.readonly), p = N(() => {
-      const $ = Fe(e.columns, e.columnState, e.columnState2);
-      return e.convertColumn ? Nt($, e.convertColumn) : $;
-    }), l = (...$) => {
-      var J;
-      ((J = e.onPreFinish) == null ? void 0 : J.call(e, ...$)) !== !0 && a("finish", ...$);
-    }, h = e.debounceSubmit, E = (typeof h == "object" ? h.wait : h) || 300, f = tr((...$) => l(...$), E, h == null ? void 0 : h.options), C = ($) => {
-      const B = Jn($, P, e.showStateRules);
-      h !== void 0 ? f(B, $) : l(B, $);
-    }, T = G();
-    o(ge(e.formMethods || [], T)), nr({
-      formState: i,
-      showState: P,
-      readonlyState: b,
-      disableState: y,
+    } = ee(), c = e.elementMap || n, s = e.formElementMap || u, d = e.model || Ne({}), b = ke(d, e.showStateRules, e.showState), h = ke(d, e.readonlyStateRules, e.readonlyState), m = ke(d, e.disableStateRules, e.disableState), g = N(() => e.readonly), S = N(() => {
+      const w = Le(e.columns, e.columnState, e.columnState2);
+      return e.convertColumn ? Nt(w, e.convertColumn) : w;
+    }), f = (...w) => {
+      var G;
+      ((G = e.onPreFinish) == null ? void 0 : G.call(e, ...w)) !== !0 && r("finish", ...w);
+    }, p = e.debounceSubmit, C = (typeof p == "object" ? p.wait : p) || 300, i = rr((...w) => f(...w), C, p == null ? void 0 : p.options), P = (w) => {
+      const j = er(w, b, e.showStateRules);
+      p !== void 0 ? i(j, w) : f(j, w);
+    }, E = X();
+    o(be(e.formMethods || [], E)), ar({
+      formState: d,
+      showState: b,
+      readonlyState: h,
+      disableState: m,
       elementMap: c,
-      formElementMap: d,
-      readonly: v,
-      columns: p,
-      formRef: T,
+      formElementMap: s,
+      readonly: g,
+      columns: S,
+      formRef: E,
       ...e.provideExtra
-    }), Vt({});
-    const K = [{
+    }), zt({});
+    const I = [{
       value: te.RESET,
       label: "\u91CD\u7F6E"
     }, {
@@ -882,79 +968,85 @@ const lt = () => ({
       extraProps: {
         type: "primary"
       }
-    }], R = () => {
-      var $, B;
-      if (($ = e.operate) != null && $.onReset) {
+    }], M = () => {
+      var w, j;
+      if ((w = e.operate) != null && w.onReset) {
         e.operate.onReset({
-          form: T.value
+          form: E.value
         });
         return;
       }
-      (B = T.value) == null || B.resetFields();
-    }, H = () => {
-      var $, B;
-      if (($ = e.operate) != null && $.onSubmit) {
+      (j = E.value) == null || j.resetFields();
+    }, k = () => {
+      var w, j;
+      if ((w = e.operate) != null && w.onSubmit) {
         e.operate.onSubmit({
-          form: T.value
+          form: E.value
         });
         return;
       }
-      (B = T.value) == null || B.submit();
-    }, M = () => {
-      var $, B;
-      (B = ($ = e.operate) == null ? void 0 : $.onContinue) == null || B.call($, {
-        form: T.value
+      (j = E.value) == null || j.submit();
+    }, Q = () => {
+      var w, j;
+      (j = (w = e.operate) == null ? void 0 : w.onContinue) == null || j.call(w, {
+        form: E.value
       });
-    }, I = {
-      [te.RESET]: R,
-      [te.SUBMIT]: H,
-      [te.CONTINUE]: M
-    }, L = N(() => {
-      const $ = e.operate, B = ($ == null ? void 0 : $.items) || K;
-      return F(B, (J) => !J.onClick && !m($ == null ? void 0 : $.itemState, [J.value, "onClick"]) ? {
-        ...J,
-        onClick: m(I, J.value)
-      } : J);
-    }), k = N(() => {
-      var $;
+    }, q = {
+      [te.RESET]: M,
+      [te.SUBMIT]: k,
+      [te.CONTINUE]: Q
+    }, $ = N(() => {
+      const w = e.operate, j = (w == null ? void 0 : w.items) || I;
+      return R(j, (G) => !G.onClick && !y(w == null ? void 0 : w.itemState, [G.value, "onClick"]) ? {
+        ...G,
+        onClick: y(q, G.value)
+      } : G);
+    }), A = N(() => {
+      var w;
       return {
         [te.SUBMIT]: {
           value: te.SUBMIT,
           loading: e.submitLoading
         },
-        ...($ = e.operate) == null ? void 0 : $.itemState
+        ...(w = e.operate) == null ? void 0 : w.itemState
       };
-    }), S = ($) => {
-      const B = ie($);
-      return B && t[B] ? t[B]($, i) : Qe(d, $);
-    }, g = N(() => e.row ? F(p.value, ($) => ({
-      rowKey: ie($),
-      vNode: S($),
-      col: m($, ["extra", "col"])
-    })) : F(p.value, ($) => S($))), D = [...z(lt()), ...z(he)], q = z(A(Se.props, "items")), ce = m(n, U.FormKey);
-    return () => ce ? s(ce, O({
-      ref: T,
+    }), v = (w) => {
+      const j = se(w);
+      return j && t[j] ? t[j](w, d) : jt(c, s, w);
+    }, T = N(() => {
+      const w = _(S.value, (j) => {
+        const G = se(j);
+        return !!y(b, G, !0);
+      });
+      return e.row ? R(w, (j) => ({
+        rowKey: se(j),
+        vNode: v(j),
+        col: y(j, ["extra", "col"])
+      })) : R(w, (j) => v(j));
+    }), F = [...H(ct()), ...H(ve)], L = H(O(ge.props, "items")), ue = y(n, B.FormKey);
+    return () => ue ? l(ue, x({
+      ref: E,
       class: e.clsName
-    }, A(r, "onFinish"), A(e, ...D, ...q, "onFinish", "operate"), {
-      model: i,
-      onFinish: C
+    }, O(a, "onFinish"), O(e, ...F, ...L, "onFinish", "operate"), {
+      model: d,
+      onFinish: P
     }), {
       default: () => {
-        var $, B, J;
-        return [($ = t.start) == null ? void 0 : $.call(t), d && _(p.value) > 0 && s(ae, null, [e.row ? s(Se, {
+        var w, j, G;
+        return [(w = t.start) == null ? void 0 : w.call(t), s && Y(S.value) > 0 && l(ie, null, [e.row ? l(ge, {
           row: e.row,
           col: e.col,
-          items: g.value
-        }, null) : g.value]), (B = t.default) == null ? void 0 : B.call(t), e.operate && s(Yt, O({
+          items: T.value
+        }, null) : T.value]), (j = t.default) == null ? void 0 : j.call(t), e.operate && l(Qt, x({
           class: `${e.clsName}-operate`
-        }, A(e.operate, "items", "itemState", "onReset", "onSubmit", "onContinue"), {
-          items: L.value,
-          itemState: k.value
-        }), null), (J = t.end) == null ? void 0 : J.call(t)];
+        }, O(e.operate, "items", "itemState", "onReset", "onSubmit", "onContinue"), {
+          items: $.value,
+          itemState: A.value
+        }), null), (G = t.end) == null ? void 0 : G.call(t)];
       }
     }) : null;
   }
-}), ta = {
+}), ra = {
   text: "\u8BF7\u8F93\u5165",
   digit: "\u8BF7\u8F93\u5165",
   select: "\u8BF7\u9009\u62E9",
@@ -966,10 +1058,10 @@ const lt = () => ({
   date: "\u8BF7\u9009\u62E9",
   time: "\u8BF7\u9009\u62E9"
 };
-let Le;
+let Ke;
 (function(e) {
   e.AUTO = "AUTO", e.MANUAL = "MANUAL";
-})(Le || (Le = {}));
+})(Ke || (Ke = {}));
 const st = () => ({
   initEmit: {
     type: Boolean,
@@ -977,7 +1069,7 @@ const st = () => ({
   },
   searchMode: {
     type: String,
-    default: Le.AUTO
+    default: Ke.AUTO
   },
   debounceKeys: {
     type: Array
@@ -990,7 +1082,7 @@ const st = () => ({
     type: Number,
     default: 800
   }
-}), na = w({
+}), aa = D({
   props: {
     ...st(),
     needRules: {
@@ -1000,46 +1092,46 @@ const st = () => ({
   },
   setup: (e, {
     slots: t,
-    expose: a
+    expose: r
   }) => {
-    const r = Q()(U.ProFormKey), n = e.model || Ne({}), u = new Set(e.debounceTypes), c = F(Y(e.columns, (l) => {
-      const h = Rt(l);
-      return u.has(h);
-    }), (l) => ie(l)), d = N(() => F(e.columns, (l) => ({
-      ...l,
-      formItemProps: A(l.formItemProps, "required")
-    }))), i = G(), P = e.formMethods || [];
-    a(ge(P, i));
-    const b = () => {
-      var l;
-      (l = i.value) == null || l.submit();
-    }, y = Pt(() => {
-      b();
+    const a = J()(B.ProFormKey), n = e.model || Ne({}), u = new Set(e.debounceTypes), c = R(_(e.columns, (f) => {
+      const p = Rt(f);
+      return u.has(p);
+    }), (f) => se(f)), s = N(() => R(e.columns, (f) => ({
+      ...f,
+      formItemProps: O(f.formItemProps, "required")
+    }))), d = X(), b = e.formMethods || [];
+    r(be(b, d));
+    const h = () => {
+      var f;
+      (f = d.value) == null || f.submit();
+    }, m = St(() => {
+      h();
     }, e.debounceTime);
-    ue(() => {
-      e.initEmit && b();
+    oe(() => {
+      e.initEmit && h();
     }, []);
-    const v = (l, h, E) => fe(E, (f) => m(l, f) !== m(h, f));
-    $t((l, h) => {
-      if (e.searchMode !== Le.AUTO)
+    const g = (f, p, C) => fe(C, (i) => y(f, i) !== y(p, i));
+    At((f, p) => {
+      if (e.searchMode !== Ke.AUTO)
         return;
-      const E = _(e.debounceKeys) > 0 ? e.debounceKeys : c;
-      if (_(E) > 0 && v(l, h, E)) {
-        y();
+      const C = Y(e.debounceKeys) > 0 ? e.debounceKeys : c;
+      if (Y(C) > 0 && g(f, p, C)) {
+        m();
         return;
       }
-      b();
-    }, () => dn(n));
-    const p = z(st());
-    return () => r ? s(r, O({
-      ref: i,
+      h();
+    }, () => fn(n));
+    const S = H(st());
+    return () => a ? l(a, x({
+      ref: d,
       class: "pro-search-form"
-    }, A(e, p, "columns"), {
-      columns: d.value,
+    }, O(e, S, "columns"), {
+      columns: s.value,
       model: n
     }), t) : null;
   }
-}), it = () => ({
+}), lt = () => ({
   readonly: {
     type: Boolean,
     default: void 0
@@ -1053,15 +1145,15 @@ const st = () => ({
   slots: {
     type: Object
   }
-}), ra = (e, t) => ({
-  InputComp: a,
+}), oa = (e, t) => ({
+  InputComp: r,
   valueType: o,
-  name: r
-}) => w({
-  name: r,
+  name: a
+}) => D({
+  name: a,
   props: {
     ...e.props,
-    ...it()
+    ...lt()
   },
   setup: (n, {
     slots: u
@@ -1069,100 +1161,106 @@ const st = () => ({
     const {
       formExtraMap: c
     } = ee(), {
-      formState: d,
-      showState: i,
-      readonlyState: P,
+      formState: s,
+      readonlyState: d,
       disableState: b,
-      readonly: y,
-      elementMap: v
-    } = Ht(), p = qt(), l = N(() => ve(n.readonly) ? n.readonly : ve(P[n.name]) ? P[n.name] : y.value), h = () => `${m(c == null ? void 0 : c.rulePrefixMap, o) || "\u8BF7\u8F93\u5165"}${n.label || ""}`, E = N(() => c != null && c.rulePrefixMap ? n.required === !0 && !n.rules ? [{
+      readonly: h
+    } = Wt(), m = Vt(), g = N(() => Ee(n.readonly) ? n.readonly : Ee(d[n.name]) ? d[n.name] : h.value), S = () => `${y(c == null ? void 0 : c.rulePrefixMap, o) || "\u8BF7\u8F93\u5165"}${n.label || ""}`, f = N(() => c != null && c.rulePrefixMap ? n.required === !0 && !n.rules ? [{
       required: !0,
-      message: h()
-    }] : n.rules ? F(n.rules, (R) => (R.required && !R.message && (R.message = h()), R)) : n.rules : n.rules), f = Ut(n.name), C = p != null && p.pathList ? [...p.pathList, ...f] : f, T = (R) => {
-      le(d, C, R);
-    }, K = z(it());
-    return () => {
-      const R = m(i, C);
-      if (ve(R) && !R)
-        return null;
-      const H = m(d, C), M = m(v, o);
-      return s(e, O(A(n, ...K, "name", "rules", "slots"), {
-        name: C,
-        rules: E.value
-      }), {
-        default: () => [l.value ? s(ae, null, [M ? s(M, O({
-          value: H
-        }, n.fieldProps, {
-          showProps: n.showProps
-        }), u) : s("span", null, [H])]) : s(a, O(t(H, T, m(b, C)), n.fieldProps), u)],
-        ...n.slots
-      });
+      message: S()
+    }] : n.rules ? R(n.rules, (M) => (M.required && !M.message && (M.message = S()), M)) : n.rules : n.rules), p = Bt(n.name), C = m != null && m.pathList ? [...m.pathList, ...p] : p, i = (M) => {
+      ce(s, C, M);
+    }, P = H(lt()), E = () => {
+      const M = y(s, C);
+      return u.renderShow ? u.renderShow({
+        value: M,
+        record: s,
+        path: C
+      }) : l("span", null, [M]);
+    }, I = () => {
+      const M = y(s, C), k = y(b, C);
+      return u.renderInput ? u.renderInput({
+        value: M,
+        setValue: i,
+        disabled: k,
+        record: s,
+        path: C
+      }) : l(r, x(t(M, i, k), n.fieldProps), u);
     };
+    return () => l(e, x({
+      class: "pro-form-item"
+    }, O(n, ...P, "name", "rules"), {
+      name: C,
+      rules: f.value
+    }), {
+      default: () => [g.value ? E() : I()],
+      ...n.slots
+    });
   }
-}), Wt = Dn("access", void 0, !0), rr = () => {
-  const [e, t] = Wt();
+}), Gt = Fn("access", void 0, !0), or = () => {
+  const [e, t] = Gt();
   return { access: e, setAccess: t, delAccess: () => {
     t(void 0);
   } };
-}, aa = () => {
-  const [e, t] = Wt();
+}, ua = () => {
+  const [e, t] = Gt();
   return [e, t, () => {
     t(void 0);
   }];
-}, Gt = Symbol("logon-user"), ar = () => ye(Gt), oa = w((e, { slots: t }) => {
-  const [a, o] = nt(), [r, n] = nt();
-  return me(Gt, { user: a, setUser: o, per: r, setPer: n, opts: {} }), () => {
+}, Xt = Symbol("logon-user"), ur = () => ye(Xt), ca = D((e, { slots: t }) => {
+  const [r, o] = tt(), [a, n] = tt();
+  return me(Xt, { user: r, setUser: o, per: a, setPer: n, opts: {} }), () => {
     var c;
     return (c = t.default) == null ? void 0 : c.call(t);
   };
-}), ua = w((e, { slots: t, emit: a }) => {
-  const { access: o } = rr(), r = N(() => o && o.token);
-  return ue(() => {
-    r.value || a("toLogin");
-  }, r), () => {
+}), sa = D((e, { slots: t, emit: r }) => {
+  const { access: o } = or(), a = N(() => o && o.token);
+  return oe(() => {
+    a.value || r("toLogin");
+  }, a), () => {
     var n;
-    return r.value ? (n = t.default) == null ? void 0 : n.call(t) : null;
+    return a.value ? (n = t.default) == null ? void 0 : n.call(t) : null;
   };
-}), ca = {
+}), la = {
   Add: "add",
   Edit: "edit",
   Delete: "delete"
-}, or = (e, t) => !e || !t ? !1 : W(t) ? fe(t, (a) => e[a]) : e[t], Xt = () => {
-  const { per: e } = ar() || { per: { menus: [], buttonMap: {} } }, t = Xe();
-  return (a, o) => {
-    if (!a)
+}, cr = (e, t) => !e || !t ? !1 : W(t) ? fe(t, (r) => e[r]) : e[t], _t = () => {
+  const { per: e } = ur() || { per: { menus: [], buttonMap: {} } }, t = Xe();
+  return (r, o) => {
+    if (!r)
       return !1;
-    let r = a;
+    let a = r;
     if (o != null && o.suffix) {
       const n = t.name ? t.name.toString() : "", u = (o == null ? void 0 : o.splitStr) || "_";
-      r = W(r) ? F(r, (c) => `${n}${u}${c}`) : `${n}${u}${r}`;
+      a = W(a) ? R(a, (c) => `${n}${u}${c}`) : `${n}${u}${a}`;
     }
-    return or(e.buttonMap, r);
+    return cr(e.buttonMap, a);
   };
-}, _t = () => {
-  const e = Xt();
-  return (t, a, o) => t ? e(t) : a ? e(a, { suffix: !0, splitStr: o }) : !0;
-}, ur = () => ({
+}, Yt = () => {
+  const e = _t();
+  return (t, r, o) => t ? e(t) : r ? e(r, { suffix: !0, splitStr: o }) : !0;
+}, sr = () => ({
   suffix: { type: [String, Array] },
   value: { type: [String, Array] },
   splitStr: { type: String }
-}), la = w({
+}), ia = D({
   inheritAttrs: !1,
   props: {
-    ...ur()
+    ...sr()
   },
   setup: (e, { slots: t }) => {
-    const a = Xt(), o = N(() => e.value ? a(e.value) : e.suffix ? a(e.suffix, { suffix: !0, splitStr: e.splitStr }) : !1);
+    const r = _t(), o = N(() => e.value ? r(e.value) : e.suffix ? r(e.suffix, { suffix: !0, splitStr: e.splitStr }) : !1);
     return () => {
-      var r;
-      return o.value ? (r = t.default) == null ? void 0 : r.call(t) : null;
+      var a;
+      return o.value ? (a = t.default) == null ? void 0 : a.call(t) : null;
     };
   }
 });
-function cr(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !Ce(e);
+function lr(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !pe(e);
 }
-const lr = () => ({
+const ir = () => ({
   clsName: {
     type: String,
     default: "pro-operate"
@@ -1175,48 +1273,48 @@ const lr = () => ({
   },
   elementKey: {
     type: String,
-    default: U.ButtonKey
+    default: B.ButtonKey
   },
   splitStr: {
     type: String
   }
-}), Yt = w({
+}), Qt = D({
   props: {
-    ...lr()
+    ...ir()
   },
   setup: (e, {
     slots: t
   }) => {
-    const a = _t(), o = N(() => {
-      const c = Y(e.items, (i) => a(i.per, i.perSuffix, e.splitStr) ? X(i.show) ? i.show() : ve(i.show) ? i.show : !0 : !1), d = F(c, (i) => He(e.itemState, i.value) ? {
-        ...i,
-        ...m(e.itemState, i.value)
-      } : i);
-      return pt(d, (i) => i.sort);
-    }), r = (c) => {
-      var d;
-      (d = c.onClick) == null || d.call(c, c.value);
-    }, n = Q(), u = e.elementKey ? n(e.elementKey) : void 0;
-    return () => s("div", {
+    const r = Yt(), o = N(() => {
+      const c = _(e.items, (d) => r(d.per, d.perSuffix, e.splitStr) ? V(d.show) ? d.show() : Ee(d.show) ? d.show : !0 : !1), s = R(c, (d) => He(e.itemState, d.value) ? {
+        ...d,
+        ...y(e.itemState, d.value)
+      } : d);
+      return Pt(s, (d) => d.sort);
+    }), a = (c) => {
+      var s;
+      (s = c.onClick) == null || s.call(c, c.value);
+    }, n = J(), u = e.elementKey ? n(e.elementKey) : void 0;
+    return () => l("div", {
       class: e.clsName
-    }, [F(o.value, (c) => {
-      const d = X(c.disabled) ? c.disabled() : c.disabled, i = X(c.loading) ? c.loading() : c.loading, P = X(c.label) ? c.label() : c.label, b = X(c.extraProps) ? c.extraProps() : c.extraProps, y = {
-        ...A(c, "show", "disabled", "element"),
-        disabled: d
+    }, [R(o.value, (c) => {
+      const s = V(c.disabled) ? c.disabled() : c.disabled, d = V(c.loading) ? c.loading() : c.loading, b = V(c.label) ? c.label() : c.label, h = V(c.extraProps) ? c.extraProps() : c.extraProps, m = {
+        ...O(c, "show", "disabled", "element"),
+        disabled: s
       };
-      return c.element && X(c.element) ? c.element(y) : t[c.value] ? t[c.value](y) : u ? s(u, O({
-        disabled: d,
-        loading: i,
-        onClick: () => r(c)
-      }, b), cr(P) ? P : {
-        default: () => [P]
-      }) : s("div", {
+      return c.element && V(c.element) ? c.element(m) : t[c.value] ? t[c.value](m) : u ? l(u, x({
+        disabled: s,
+        loading: d,
+        onClick: () => a(c)
+      }, h), lr(b) ? b : {
+        default: () => [b]
+      }) : l("div", {
         class: `${e.clsName}-item`,
-        onClick: () => r(c)
-      }, [P]);
+        onClick: () => a(c)
+      }, [b]);
     })]);
   }
-}), sr = () => ({
+}), dr = () => ({
   clsName: {
     type: String,
     default: "pro-table-toolbar-column"
@@ -1237,105 +1335,105 @@ const lr = () => ({
     type: Function,
     default: () => "\u5217\u8BBE\u7F6E"
   }
-}), ir = w({
+}), fr = D({
   props: {
-    ...sr()
+    ...dr()
   },
   setup: (e, {
     slots: t
   }) => {
-    const a = Q(), o = a(U.PopoverKey), r = a(U.CheckboxKey), {
+    const r = J(), o = r(B.PopoverKey), a = r(B.CheckboxKey), {
       originColumns: n,
       selectIdsRef: u
-    } = dr(), [c, d] = pn();
-    let i = {};
-    const P = (f) => {
-      i[f] = !1;
-    }, b = () => {
-      Z(u.value, (f) => {
-        i[f] = !0;
+    } = mr(), [c, s] = It();
+    let d = {};
+    const b = (i) => {
+      d[i] = !1;
+    }, h = () => {
+      Z(u.value, (i) => {
+        d[i] = !0;
       });
-    }, y = N(() => ne(u.value, (f, C) => ({
-      ...f,
-      [C]: !0
-    }), {})), v = (f) => Zn(f, e.signName);
-    ue(() => {
-      u.value = F(Y(n.value, (f) => {
-        var C;
-        return e.useSelectedStatus && He(i, f.dataIndex) ? i[f.dataIndex] : ((C = v(f)) == null ? void 0 : C.initShow) !== !1;
-      }), (f) => f.dataIndex);
-    }, n), $t(() => {
-      var f;
-      d(), b(), (f = e.onColumnSelectChange) == null || f.call(e, u.value);
+    }, m = N(() => ne(u.value, (i, P) => ({
+      ...i,
+      [P]: !0
+    }), {})), g = (i) => tr(i, e.signName);
+    oe(() => {
+      u.value = R(_(n.value, (i) => {
+        var P;
+        return e.useSelectedStatus && He(d, i.dataIndex) ? d[i.dataIndex] : ((P = g(i)) == null ? void 0 : P.initShow) !== !1;
+      }), (i) => i.dataIndex);
+    }, n), At(() => {
+      var i;
+      s(), h(), (i = e.onColumnSelectChange) == null || i.call(e, u.value);
     }, u);
-    const p = N(() => {
-      const f = fn(n.value, (T) => {
-        var K;
-        return (K = v(T)) != null && K.disabled ? !0 : m(y.value, T.dataIndex);
-      }), C = fe(n.value, (T) => {
-        var K;
-        return (K = v(T)) != null && K.disabled ? !0 : m(y.value, T.dataIndex);
+    const S = N(() => {
+      const i = mn(n.value, (E) => {
+        var I;
+        return (I = g(E)) != null && I.disabled ? !0 : y(m.value, E.dataIndex);
+      }), P = fe(n.value, (E) => {
+        var I;
+        return (I = g(E)) != null && I.disabled ? !0 : y(m.value, E.dataIndex);
       });
       return {
-        checked: f,
-        indeterminate: f ? !1 : C
+        checked: i,
+        indeterminate: i ? !1 : P
       };
-    }), l = (f) => {
-      var T;
-      (Ee(f) ? (T = f.target) == null ? void 0 : T.checked : f) ? u.value = F(n.value, (K) => K.dataIndex) : u.value = F(Y(n.value, (K) => {
-        var R;
-        return (R = v(K)) != null && R.disabled ? !0 : (P(K.dataIndex), !1);
-      }), (K) => K.dataIndex);
-    }, h = () => {
-      u.value = F(Y(n.value, (f) => {
-        var C;
-        return ((C = v(f)) == null ? void 0 : C.initShow) === !1 ? (P(f.dataIndex), !1) : !0;
-      }), (f) => f.dataIndex);
-    }, E = (f, C) => {
-      var K;
-      (Ee(C) ? (K = C.target) == null ? void 0 : K.checked : C) ? u.value = [...u.value, f.dataIndex] : u.value = Y(u.value, (R) => f.dataIndex === R ? (P(f.dataIndex), !1) : !0);
+    }), f = (i) => {
+      var E;
+      (Ce(i) ? (E = i.target) == null ? void 0 : E.checked : i) ? u.value = R(n.value, (I) => I.dataIndex) : u.value = R(_(n.value, (I) => {
+        var M;
+        return (M = g(I)) != null && M.disabled ? !0 : (b(I.dataIndex), !1);
+      }), (I) => I.dataIndex);
+    }, p = () => {
+      u.value = R(_(n.value, (i) => {
+        var P;
+        return ((P = g(i)) == null ? void 0 : P.initShow) === !1 ? (b(i.dataIndex), !1) : !0;
+      }), (i) => i.dataIndex);
+    }, C = (i, P) => {
+      var I;
+      (Ce(P) ? (I = P.target) == null ? void 0 : I.checked : P) ? u.value = [...u.value, i.dataIndex] : u.value = _(u.value, (M) => i.dataIndex === M ? (b(i.dataIndex), !1) : !0);
     };
-    return () => o ? s(o, O({
+    return () => o ? l(o, x({
       trigger: "click"
     }, e.popoverProps), {
       default: () => {
-        var f, C;
-        return [((f = t.default) == null ? void 0 : f.call(t)) || ((C = e.renderDom) == null ? void 0 : C.call(e))];
+        var i, P;
+        return [((i = t.default) == null ? void 0 : i.call(t)) || ((P = e.renderDom) == null ? void 0 : P.call(e))];
       },
-      content: () => s("div", {
+      content: () => l("div", {
         class: `${e.clsName}`
-      }, [s("div", {
+      }, [l("div", {
         class: `${e.clsName}-header`
-      }, [s(r, {
+      }, [l(a, {
         key: c.value,
-        checked: p.value.checked,
-        indeterminate: p.value.indeterminate,
-        onChange: l
+        checked: S.value.checked,
+        indeterminate: S.value.indeterminate,
+        onChange: f
       }, {
-        default: () => [tt("\u5217\u5C55\u793A")]
-      }), s("a", {
-        onClick: h
-      }, [tt("\u91CD\u7F6E")])]), s("div", {
+        default: () => [et("\u5217\u5C55\u793A")]
+      }), l("a", {
+        onClick: p
+      }, [et("\u91CD\u7F6E")])]), l("div", {
         key: c.value,
         class: `${e.clsName}-list`
-      }, [F(n.value, (f) => {
-        const C = v(f), T = m(y.value, f.dataIndex, !1);
-        return s(r, {
-          checked: T,
-          disabled: C == null ? void 0 : C.disabled,
-          onChange: (K) => {
-            E(f, K);
+      }, [R(n.value, (i) => {
+        const P = g(i), E = y(m.value, i.dataIndex, !1);
+        return l(a, {
+          checked: E,
+          disabled: P == null ? void 0 : P.disabled,
+          onChange: (I) => {
+            C(i, I);
           }
         }, {
-          default: () => [f.title]
+          default: () => [i.title]
         });
       })])]),
-      ...A(t, "default")
+      ...O(t, "default")
     }) : null;
   }
-}), Qt = Symbol("pro-table"), dr = () => ye(Qt), fr = (e) => {
-  me(Qt, e);
-}, dt = () => ({
+}), Jt = Symbol("pro-table"), mr = () => ye(Jt), yr = (e) => {
+  me(Jt, e);
+}, it = () => ({
   clsName: {
     type: String,
     default: "pro-table"
@@ -1369,148 +1467,153 @@ const lr = () => ({
   },
   tableMethods: {
     type: Array
+  },
+  mergeOpts: {
+    type: Object
+  },
+  dataSource: {
+    type: Array
   }
-}), sa = w({
+}), da = D({
   inheritAttrs: !1,
   props: {
-    ...he,
-    ...dt()
+    ...ve,
+    ...it()
   },
   setup: (e, {
     slots: t,
-    expose: a,
+    expose: r,
     attrs: o
   }) => {
     const {
-      elementMap: r
-    } = ee(), n = e.elementMap || r, u = m(r, U.TableKey), c = () => ({
+      elementMap: a
+    } = ee(), n = e.elementMap || a, u = y(a, B.TableKey), c = () => ({
       title: "\u5E8F\u53F7",
       dataIndex: "serialNumber",
       width: 80,
       ...e.column,
-      ...ve(e.serialNumber) ? void 0 : e.serialNumber,
+      ...Ee(e.serialNumber) ? void 0 : e.serialNumber,
       customRender: ({
-        index: M
+        index: $
       }) => {
-        var I, L;
-        return ((I = e.paginationState) == null ? void 0 : I.page) && ((L = e.paginationState) == null ? void 0 : L.pageSize) ? e.paginationState.pageSize * (e.paginationState.page - 1) + M + 1 : M + 1;
+        var A, v;
+        return ((A = e.paginationState) == null ? void 0 : A.page) && ((v = e.paginationState) == null ? void 0 : v.pageSize) ? e.paginationState.pageSize * (e.paginationState.page - 1) + $ + 1 : $ + 1;
       }
-    }), d = (M, I) => {
-      var L;
-      if (e.operateItemClickMap && e.operateItemClickMap[I.value]) {
-        e.operateItemClickMap[I.value](M, I);
+    }), s = ($, A) => {
+      var v;
+      if (e.operateItemClickMap && e.operateItemClickMap[A.value]) {
+        e.operateItemClickMap[A.value]($, A);
         return;
       }
-      (L = I.onClick) == null || L.call(I, M);
-    }, i = se(t, "operate"), P = () => {
-      const M = e.operate, I = F(M.items, (L) => ({
-        ...m(e.operateItemState, L.value),
-        ...L,
-        ...m(M.itemState, L.value)
+      (v = A.onClick) == null || v.call(A, $);
+    }, d = le(t, "operate"), b = () => {
+      const $ = e.operate, A = R($.items, (v) => ({
+        ...y(e.operateItemState, v.value),
+        ...v,
+        ...y($.itemState, v.value)
       }));
       return {
         ...e.column,
         title: "\u64CD\u4F5C",
         dataIndex: "operate",
         fixed: "right",
-        ...M.column,
+        ...$.column,
         customRender: ({
-          record: L
+          record: v
         }) => {
-          const k = F(I, (g) => ({
-            ...g,
-            show: X(g.show) ? g.show(L) : g.show,
-            disabled: X(g.disabled) ? g.disabled(L) : g.disabled,
-            loading: X(g.loading) ? g.loading(L) : g.loading,
-            extraProps: X(g.extraProps) ? g.extraProps(L) : g.extraProps,
-            element: X(g.element) ? () => g.element(L, g) : g.element,
-            onClick: () => d(L, g)
-          })), S = ne(z(i), (g, D) => ({
-            ...g,
-            [D]: (q) => {
-              var ce;
-              return (ce = i[D]) == null ? void 0 : ce.call(i, L, q);
+          const T = R(A, (L) => ({
+            ...L,
+            show: V(L.show) ? L.show(v) : L.show,
+            disabled: V(L.disabled) ? L.disabled(v) : L.disabled,
+            loading: V(L.loading) ? L.loading(v) : L.loading,
+            extraProps: V(L.extraProps) ? L.extraProps(v) : L.extraProps,
+            element: V(L.element) ? () => L.element(v, L) : L.element,
+            onClick: () => s(v, L)
+          })), F = ne(H(d), (L, ue) => ({
+            ...L,
+            [ue]: (w) => {
+              var j;
+              return (j = d[ue]) == null ? void 0 : j.call(d, v, w);
             }
           }), {});
-          return s(Yt, {
+          return l(Qt, {
             class: `${e.clsName}-operate`,
-            items: k,
-            elementKey: M.elementKey || U.TableOperateKey
-          }, S);
+            items: T,
+            elementKey: $.elementKey || B.TableOperateKey
+          }, F);
         }
       };
-    }, b = G([]), y = N(() => {
-      var M;
-      return !!((M = e.toolbar) != null && M.columnSetting);
-    }), v = nn(e, "columns");
-    N(() => {
-      if (!y.value)
+    }, h = X([]), m = N(() => {
+      var $;
+      return !!(($ = e.toolbar) != null && $.columnSetting);
+    }), g = rn(e, "columns"), S = N(() => {
+      if (!m.value)
         return e.columns;
-      const M = ne(b.value, (I, L) => ({
-        ...I,
-        [L]: !0
+      const $ = ne(h.value, (A, v) => ({
+        ...A,
+        [v]: !0
       }), {});
-      return Y(e.columns, (I) => m(M, I.dataIndex));
-    });
-    const p = (M) => F(M, (I) => {
-      const L = {
+      return _(e.columns, (A) => y($, A.dataIndex));
+    }), f = ($) => R($, (A) => {
+      const v = {
         ...e.column,
-        ...I
-      }, k = e.convertColumn ? e.convertColumn(L) : L;
-      return I.children && _(I.children) > 0 ? (k.children = p(I.children), k) : (I.customRender || (k.customRender = ({
-        text: S
-      }) => {
-        var D;
-        return Je(n, {
-          ...I,
-          showProps: {
-            ...I.showProps,
-            content: ((D = I.showProps) == null ? void 0 : D.content) || e.columnEmptyText
-          }
-        }, S) || S || e.columnEmptyText;
-      }), k);
-    }), l = N(() => {
-      const M = Fe(e.columns, e.columnState, e.columnState2), I = p(M);
-      return e.serialNumber && I.unshift(c()), e.operate && e.operate.items && fe(e.operate.items, (L) => L.show) && I.push(P()), I;
-    }), h = G();
-    fr({
-      columns: l,
-      originColumns: v,
-      selectIdsRef: b,
-      tableRef: h,
+        ...A
+      }, T = e.convertColumn ? e.convertColumn(v) : v;
+      return A.children && Y(A.children) > 0 ? (T.children = f(A.children), T) : (A.customRender || (T.customRender = ({
+        value: F
+      }) => typeof F > "u" || F === null || F === "" ? e.columnEmptyText : Qe(n, A, {
+        value: F
+      }, {
+        render: "tableRender"
+      }) || F), T);
+    }), p = N(() => {
+      const $ = Le(S.value, e.columnState, e.columnState2), A = f($);
+      return e.serialNumber && A.unshift(c()), e.operate && e.operate.items && fe(e.operate.items, (v) => v.show) && A.push(b()), A;
+    }), C = N(() => {
+      var A, v;
+      const $ = e.dataSource;
+      return $ && (((A = e.mergeOpts) == null ? void 0 : A.rowNames) || ((v = e.mergeOpts) == null ? void 0 : v.colNames)) && Cn($, e.mergeOpts), $;
+    }), i = X();
+    yr({
+      columns: p,
+      originColumns: g,
+      selectIdsRef: h,
+      tableRef: i,
       toolbar: e.toolbar,
       ...e.provideExtra
-    }), a(ge(e.tableMethods || [], h));
-    const E = G(), f = G(!1), C = G(), T = G(!1);
-    Ve(E, () => {
-      f.value = !!E.value.innerText;
-    }), Ve(C, () => {
-      T.value = !!C.value.innerText;
+    }), r(be(e.tableMethods || [], i));
+    const P = X(), E = X(!1), I = X(), M = X(!1);
+    Ve(P, () => {
+      E.value = !!P.value.innerText;
+    }), Ve(I, () => {
+      M.value = !!I.value.innerText;
     });
-    const K = N(() => T.value || f.value ? `${e.clsName}-toolbar-valid` : ""), R = z(dt()), H = se(t, "columnSetting");
+    const k = N(() => M.value || E.value ? `${e.clsName}-toolbar-valid` : ""), Q = H(it()), q = le(t, "columnSetting");
     return () => {
-      var I, L;
+      var A, v;
       if (!u)
         return null;
-      const M = y.value ? s(ir, (I = e.toolbar) == null ? void 0 : I.columnSetting, H) : null;
-      return s("div", O({
+      const $ = m.value ? l(fr, (A = e.toolbar) == null ? void 0 : A.columnSetting, q) : null;
+      return l("div", x({
         class: e.clsName
-      }, V(o, "class")), [s("div", {
-        class: `${e.clsName}-toolbar ${K.value}`
-      }, [s("div", {
-        ref: E,
+      }, z(o, "class")), [l("div", {
+        class: `${e.clsName}-toolbar ${k.value}`
+      }, [l("div", {
+        ref: P,
         class: `${e.clsName}-toolbar-start`
-      }, [(L = t.toolbar) == null ? void 0 : L.call(t)]), s("div", {
-        ref: C,
+      }, [(v = t.toolbar) == null ? void 0 : v.call(t)]), l("div", {
+        ref: I,
         class: `${e.clsName}-toolbar-extra`
-      }, [t.toolbarExtra ? t.toolbarExtra([M]) : s(ae, null, [M])])]), s(u, O({
-        ref: h
-      }, A(o, "class"), A(e, R), {
-        columns: l.value
+      }, [t.toolbarExtra ? t.toolbarExtra([$]) : l(ie, null, [$])])]), l(u, x({
+        ref: i
+      }, O(o, "class"), O(e, Q), {
+        mergeOpts: e.mergeOpts,
+        dataSource: C.value,
+        columns: p.value
       }), t)]);
     };
   }
-}), mr = () => ({
+}), vr = () => ({
   title: {
     type: String
   },
@@ -1529,41 +1632,41 @@ const lr = () => ({
     type: Function,
     default: () => "\u8FD4\u56DE"
   }
-}), Ue = w({
+}), Ue = D({
   props: {
-    ...mr()
+    ...vr()
   },
   setup: (e, {
     slots: t
   }) => {
-    const a = Ge(), o = () => {
-      var r;
+    const r = Ge(), o = () => {
+      var a;
       if (e.onBackClick) {
-        (r = e.onBackClick) == null || r.call(e);
+        (a = e.onBackClick) == null || a.call(e);
         return;
       }
-      a.back();
+      r.back();
     };
     return () => {
-      var n, u, c, d, i;
-      const r = e.hideWhileNoHistory && ((u = (n = window.history) == null ? void 0 : n.state) == null ? void 0 : u.back) || e.hideWhileNoHistory === !1;
-      return s("div", {
+      var n, u, c, s, d;
+      const a = e.hideWhileNoHistory && ((u = (n = window.history) == null ? void 0 : n.state) == null ? void 0 : u.back) || e.hideWhileNoHistory === !1;
+      return l("div", {
         class: "pro-page-header"
-      }, [e.showBack && r && s("div", {
+      }, [e.showBack && a && l("div", {
         class: "pro-page-header-back",
         onClick: o
-      }, [t.backIcon ? t.backIcon() : (c = e.renderBackIcon) == null ? void 0 : c.call(e)]), s("div", {
+      }, [t.backIcon ? t.backIcon() : (c = e.renderBackIcon) == null ? void 0 : c.call(e)]), l("div", {
         class: "pro-page-header-title"
-      }, [t.title ? t.title() : e.title]), s("div", {
+      }, [t.title ? t.title() : e.title]), l("div", {
         class: "pro-page-header-sub-title"
-      }, [t.subTitle ? t.subTitle() : e.subTitle]), s("div", {
+      }, [t.subTitle ? t.subTitle() : e.subTitle]), l("div", {
         class: "pro-page-header-space"
-      }, [(d = t.space) == null ? void 0 : d.call(t)]), s("div", {
+      }, [(s = t.space) == null ? void 0 : s.call(t)]), l("div", {
         class: "pro-page-header-extra"
-      }, [(i = t.extra) == null ? void 0 : i.call(t)])]);
+      }, [(d = t.extra) == null ? void 0 : d.call(t)])]);
     };
   }
-}), yr = () => ({
+}), hr = () => ({
   loading: {
     type: Boolean,
     default: !1
@@ -1573,37 +1676,37 @@ const lr = () => ({
     type: Boolean,
     default: !0
   }
-}), ia = w({
+}), fa = D({
   props: {
     ...Ue.props,
-    ...yr()
+    ...hr()
   },
   setup: (e, {
     slots: t
   }) => {
-    const o = Q()(U.LoadingKey), r = z(Ue.props);
+    const o = J()(B.LoadingKey), a = H(Ue.props);
     return () => {
-      var c, d, i;
+      var c, s, d;
       const n = e.title || t.title || e.subTitle || t.subTitle || t.extra, u = !!t.footer;
-      return s("div", {
+      return l("div", {
         class: `pro-page ${e.fillMode ? "pro-page-fill" : ""}`
-      }, [(c = t.start) == null ? void 0 : c.call(t), n && s(Ue, V(e, r), A(t, "start", "default", "footer")), s("div", {
+      }, [(c = t.start) == null ? void 0 : c.call(t), n && l(Ue, z(e, a), O(t, "start", "default", "footer")), l("div", {
         class: "pro-page-content"
-      }, [e.loading ? o ? s(o, O({
+      }, [e.loading ? o ? l(o, x({
         loading: !0
       }, e.loadingOpts), {
-        default: () => [s("div", {
+        default: () => [l("div", {
           class: "pro-loading-dom"
         }, null)]
-      }) : null : (d = t.default) == null ? void 0 : d.call(t)]), !e.loading && u && s("div", {
+      }) : null : (s = t.default) == null ? void 0 : s.call(t)]), !e.loading && u && l("div", {
         class: "pro-page-footer"
-      }, [(i = t.footer) == null ? void 0 : i.call(t)])]);
+      }, [(d = t.footer) == null ? void 0 : d.call(t)])]);
     };
   }
-}), vr = Object.freeze({
+}), br = Object.freeze({
   page: 1,
   pageSize: 10
-}), hr = () => ({
+}), gr = () => ({
   clsName: {
     type: String,
     default: "pro-list"
@@ -1637,43 +1740,43 @@ const lr = () => ({
   end: {
     type: Function
   }
-}), br = w({
+}), Sr = D({
   props: {
-    ...hr()
+    ...gr()
   },
   setup: (e, {
     slots: t,
-    emit: a
+    emit: r
   }) => {
-    const o = Q(), r = o(U.ProSearchFormKey), n = o(U.ProTableKey), u = o(U.PaginationKey), c = e.pageState || Ne({
-      ...vr
+    const o = J(), a = o(B.ProSearchFormKey), n = o(B.ProTableKey), u = o(B.PaginationKey), c = e.pageState || Ne({
+      ...br
     });
-    let d;
-    const i = () => {
-      a("search", {
-        ...d,
+    let s;
+    const d = () => {
+      r("search", {
+        ...s,
         ...c
       });
-    }, P = (l, h) => {
-      d = l, c.page = h || 1, i();
-    }, b = (l, h) => {
-      c.page = l, c.pageSize = h, i();
-    }, y = se(t, "search"), v = se(t, "table"), p = se(t, "pagination");
+    }, b = (f, p) => {
+      s = f, c.page = p || 1, d();
+    }, h = (f, p) => {
+      c.page = f, c.pageSize = p, d();
+    }, m = le(t, "search"), g = le(t, "table"), S = le(t, "pagination");
     return () => {
-      var h, E, f, C, T, K, R, H;
-      const l = t.search ? t.search({
-        executeSearchWithResetPage: P,
+      var p, C, i, P, E, I, M, k;
+      const f = t.search ? t.search({
+        executeSearchWithResetPage: b,
         pageState: c
-      }) : s(ae, null, [r && s(r, O({
+      }) : l(ie, null, [a && l(a, x({
         class: `${e.clsName}-search`
-      }, A(e.searchProps, "onFinish"), {
-        onFinish: (M) => P(M)
-      }), y)]);
-      return s("div", {
+      }, O(e.searchProps, "onFinish"), {
+        onFinish: (Q) => b(Q)
+      }), m)]);
+      return l("div", {
         class: e.clsName
-      }, [((h = t.start) == null ? void 0 : h.call(t)) || ((E = e.start) == null ? void 0 : E.call(e)), !e.searchInTable && l, ((f = t.divide) == null ? void 0 : f.call(t)) || ((C = e.divide) == null ? void 0 : C.call(e)), t.table ? t.table({
+      }, [((p = t.start) == null ? void 0 : p.call(t)) || ((C = e.start) == null ? void 0 : C.call(e)), !e.searchInTable && f, ((i = t.divide) == null ? void 0 : i.call(t)) || ((P = e.divide) == null ? void 0 : P.call(e)), t.table ? t.table({
         pageState: c
-      }) : s(ae, null, [n && s(n, O({
+      }) : l(ie, null, [n && l(n, x({
         class: `${e.clsName}-table`,
         paginationState: {
           page: c.page,
@@ -1681,21 +1784,21 @@ const lr = () => ({
         },
         pagination: !1
       }, e.tableProps), {
-        ...v,
-        toolbar: e.searchInTable ? () => v.toolbar ? v.toolbar(l) : l : v.toolbar
-      })]), ((T = t.divide2) == null ? void 0 : T.call(t)) || ((K = e.divide2) == null ? void 0 : K.call(e)), t.pagination ? t.pagination({
-        executePageChange: b,
+        ...g,
+        toolbar: e.searchInTable ? () => g.toolbar ? g.toolbar(f) : f : g.toolbar
+      })]), ((E = t.divide2) == null ? void 0 : E.call(t)) || ((I = e.divide2) == null ? void 0 : I.call(e)), t.pagination ? t.pagination({
+        executePageChange: h,
         pageState: c
-      }) : s(ae, null, [e.paginationProps !== !1 && u && s("div", {
+      }) : l(ie, null, [e.paginationProps !== !1 && u && l("div", {
         class: `${e.clsName}-pagination`
-      }, [s(u, O(A(ve(e.paginationProps) ? {} : e.paginationProps, "onChange"), {
+      }, [l(u, x(O(Ee(e.paginationProps) ? {} : e.paginationProps, "onChange"), {
         page: c.page,
         pageSize: c.pageSize,
-        onComposeChange: b
-      }), p)])]), ((R = t.end) == null ? void 0 : R.call(t)) || ((H = e.end) == null ? void 0 : H.call(e))]);
+        onComposeChange: h
+      }), S)])]), ((M = t.end) == null ? void 0 : M.call(t)) || ((k = e.end) == null ? void 0 : k.call(e))]);
     };
   }
-}), ft = () => ({
+}), dt = () => ({
   clsName: {
     type: String,
     default: "pro-desc"
@@ -1703,50 +1806,46 @@ const lr = () => ({
   model: {
     type: Object
   }
-}), gr = w({
+}), Pr = D({
   props: {
-    ...he,
-    ...ft()
+    ...ve,
+    ...dt()
   },
   setup: (e, {
     slots: t
   }) => {
     const {
-      elementMap: a
-    } = ee(), o = e.elementMap || a, r = Q(), n = r(U.DescriptionsKey), u = r(U.DescriptionsItemKey), c = N(() => Fe(e.columns, e.columnState, e.columnState2)), d = (b, y) => {
-      let v;
-      if (!!b.descRender)
-        return oe(b.descRender) ? v = m(b, b.descRender) : v = b.descRender, v == null ? void 0 : v({
-          value: y,
-          record: e.model,
-          column: A(b, "descRender")
-        });
-    }, i = z(he), P = z(ft());
-    return () => !n || !u ? null : s(n, O({
+      elementMap: r
+    } = ee(), o = e.elementMap || r, a = J(), n = a(B.DescriptionsKey), u = a(B.DescriptionsItemKey), c = N(() => Le(e.columns, e.columnState, e.columnState2)), s = H(ve), d = H(dt());
+    return () => !n || !u ? null : l(n, x({
       class: e.clsName
-    }, A(e, ...i, ...P, "model")), {
+    }, O(e, ...s, ...d, "model")), {
       default: () => {
-        var b, y;
-        return [(b = t.start) == null ? void 0 : b.call(t), F(c.value, (v) => {
-          const p = v.dataIndex, l = m(e.model, p);
-          return s(u, O({
+        var b, h;
+        return [(b = t.start) == null ? void 0 : b.call(t), R(c.value, (m) => {
+          const g = m.dataIndex, S = y(e.model, g);
+          return l(u, x({
             class: `${e.clsName}-item`
-          }, m(v.extra, "desc")), {
+          }, y(m.extra, "desc")), {
             default: () => {
-              var h;
-              return [((h = t.value) == null ? void 0 : h.call(t, l, v)) || d(v, l) || Je(o, v, l)];
+              var f, p;
+              return [((f = t[g]) == null ? void 0 : f.call(t, S, m)) || ((p = t.value) == null ? void 0 : p.call(t, S, m)) || Qe(o, m, {
+                value: S
+              }, {
+                render: "descRender"
+              })];
             },
             label: () => {
-              var h;
-              return ((h = t.label) == null ? void 0 : h.call(t, v)) || v.title;
+              var f;
+              return ((f = t.label) == null ? void 0 : f.call(t, m)) || m.title;
             }
           });
-        }), (y = t.default) == null ? void 0 : y.call(t)];
+        }), (h = t.default) == null ? void 0 : h.call(t)];
       },
       ...t
     });
   }
-}), Sr = () => ({
+}), pr = () => ({
   content: {
     type: [String, Number]
   },
@@ -1754,30 +1853,30 @@ const lr = () => ({
     type: [Object, Boolean]
   },
   popoverProps: Object
-}), Pr = w({
+}), Cr = D({
   inheritAttrs: !1,
   props: {
-    ...Sr()
+    ...pr()
   },
   setup: (e, {
     attrs: t
   }) => {
-    const o = Q()(U.PopoverKey), r = () => {
+    const o = J()(B.PopoverKey), a = () => {
       var n, u;
       return e.ellipsis ? e.ellipsis === !0 ? 1 : ((n = e.ellipsis) == null ? void 0 : n.rows) || ((u = e.ellipsis) == null ? void 0 : u.num) || 1 : "unset";
     };
     return () => {
-      const n = s("span", O({
+      const n = l("span", x({
         class: `pro-typography ${e.ellipsis ? "pro-typography-ellipsis" : ""}`,
-        style: `-webkit-line-clamp:${r()}`
+        style: `-webkit-line-clamp:${a()}`
       }, t), [e.content]);
-      return !e.popoverProps || !o ? n : s(o, e.popoverProps, {
+      return !e.popoverProps || !o ? n : l(o, e.popoverProps, {
         default: () => [n],
         content: () => e.content
       });
     };
   }
-}), Ae = {
+}), Oe = {
   value: {
     type: [String, Number]
   },
@@ -1787,27 +1886,27 @@ const lr = () => ({
   convert: {
     type: Function
   }
-}, Re = w({
+}, Re = D({
   inheritAttrs: !1,
   props: {
-    ...Ae
+    ...Oe
   },
   setup: (e, {
     attrs: t
   }) => {
-    const a = N(() => {
+    const r = N(() => {
       var n;
-      const o = (n = e.showProps) == null ? void 0 : n.content, r = e.value || gt(e.value) ? e.value : o;
-      return e.convert ? e.convert(r, e) : r;
+      const o = (n = e.showProps) == null ? void 0 : n.content, a = e.value || bt(e.value) ? e.value : o;
+      return e.convert ? e.convert(a, e) : a;
     });
-    return () => s(Pr, O(V(t, "style", "class"), A(e.showProps, "content"), {
-      content: a.value
+    return () => l(Cr, x(z(t, "style", "class"), O(e.showProps, "content"), {
+      content: r.value
     }), null);
   }
-}), da = w({
+}), ma = D({
   inheritAttrs: !1,
   props: {
-    ...Ae,
+    ...Oe,
     decimalFixed: {
       type: Number,
       default: 0
@@ -1820,19 +1919,19 @@ const lr = () => ({
   setup: (e, {
     attrs: t
   }) => {
-    const a = N(() => {
+    const r = N(() => {
       let o = e.value;
-      return o && e.decimalFixed && (o = Cn(o, e.decimalFixed || 2)), o && e.thousandDivision && (o = En(o)), e.convert ? e.convert(o, e) : o;
+      return o && e.decimalFixed && (o = En(o, e.decimalFixed || 2)), o && e.thousandDivision && (o = Mn(o)), e.convert ? e.convert(o, e) : o;
     });
-    return () => s(Re, O(V(t, "style", "class"), {
-      value: a.value,
+    return () => l(Re, x(z(t, "style", "class"), {
+      value: r.value,
       showProps: e.showProps
     }), null);
   }
-}), fa = w({
+}), ya = D({
   inheritAttrs: !1,
   props: {
-    ...Ae,
+    ...Oe,
     value: {
       type: [String, Number, Array]
     },
@@ -1848,21 +1947,21 @@ const lr = () => ({
   setup: (e, {
     attrs: t
   }) => {
-    const a = N(() => Mn(e.options, (n) => n.label), void 0), o = N(() => {
+    const r = N(() => Tn(e.options, (n) => n.label), void 0), o = N(() => {
       const n = e.value;
       let u = e.value;
-      return W(n) ? u = We(F(n, (c) => m(a.value, c, c)), e.splitStr) : u = m(a.value, n, e.value), e.convert ? e.convert(u, e) : u;
-    }), r = N(() => m(e.colorMap, e.value));
-    return () => s(Re, O(V(t, "style", "class"), {
-      style: `color:${r.value || ""}`,
+      return W(n) ? u = We(R(n, (c) => y(r.value, c, c)), e.splitStr) : u = y(r.value, n, e.value), e.convert ? e.convert(u, e) : u;
+    }), a = N(() => y(e.colorMap, e.value));
+    return () => l(Re, x(z(t, "style", "class"), {
+      style: `color:${a.value || ""}`,
       value: o.value,
       showProps: e.showProps
     }), null);
   }
-}), ma = w({
+}), va = D({
   inheritAttrs: !1,
   props: {
-    ...Ae,
+    ...Oe,
     value: {
       type: [String, Number, Array]
     },
@@ -1879,25 +1978,25 @@ const lr = () => ({
   setup: (e, {
     attrs: t
   }) => {
-    const a = N(() => {
-      const r = e.treeData || e.data || e.options, n = e.fieldNames || e.props;
-      return Tn(r, (u) => m(u, (n == null ? void 0 : n.label) || "label"), {
+    const r = N(() => {
+      const a = e.treeData || e.data || e.options, n = e.fieldNames || e.props;
+      return In(a, (u) => y(u, (n == null ? void 0 : n.label) || "label"), {
         value: "value",
         children: "children",
         ...n
       });
     }), o = N(() => {
-      let r = e.value;
-      return W(e.value) ? r = We(F(e.value, (n) => m(a.value, n, n)), e.splitStr) : r = m(a.value, e.value, e.value), e.convert ? e.convert(r, e) : r;
+      let a = e.value;
+      return W(e.value) ? a = We(R(e.value, (n) => y(r.value, n, n)), e.splitStr) : a = y(r.value, e.value, e.value), e.convert ? e.convert(a, e) : a;
     });
-    return () => s(Re, O(V(t, "style", "class"), {
+    return () => l(Re, x(z(t, "style", "class"), {
       value: o.value,
       showProps: e.showProps
     }), null);
   }
-}), ya = w({
+}), ha = D({
   props: {
-    ...Ae,
+    ...Oe,
     value: {
       type: [String, Number, Array]
     },
@@ -1917,31 +2016,31 @@ const lr = () => ({
   setup: (e, {
     attrs: t
   }) => {
-    const a = (r) => r && (e.isUnix ? ut.unix(r).format(e.format) : ut(r).format(e.format)), o = N(() => {
-      let r = e.value;
-      return W(e.value) ? r = We(F(e.value, (n) => a(n) || ""), e.splitStr) : r = a(e.value) || "", e.convert ? e.convert(r, e) : r;
+    const r = (a) => a && (e.isUnix ? ot.unix(a).format(e.format) : ot(a).format(e.format)), o = N(() => {
+      let a = e.value;
+      return W(e.value) ? a = We(R(e.value, (n) => r(n) || ""), e.splitStr) : a = r(e.value) || "", e.convert ? e.convert(a, e) : a;
     });
-    return () => s(Re, O(V(t, "style", "class"), {
+    return () => l(Re, x(z(t, "style", "class"), {
       value: o.value,
       showProps: e.showProps
     }), null);
   }
-}), Oe = w((e, {
+}), $e = D((e, {
   slots: t
 }) => {
-  const a = G(), o = G(0);
-  return Ve(a, (r) => {
+  const r = X(), o = X(0);
+  return Ve(r, (a) => {
     var u;
-    const n = (u = r[0]) == null ? void 0 : u.contentRect;
+    const n = (u = a[0]) == null ? void 0 : u.contentRect;
     o.value = n == null ? void 0 : n.width;
   }), () => {
-    var r, n, u;
-    return s("header", null, [(r = t.start) == null ? void 0 : r.call(t), t.menus && s("div", {
-      ref: a,
+    var a, n, u;
+    return l("header", null, [(a = t.start) == null ? void 0 : a.call(t), t.menus && l("div", {
+      ref: r,
       class: "pro-header-menus-wrapper"
     }, [t.menus(o.value)]), (n = t.default) == null ? void 0 : n.call(t), (u = t.end) == null ? void 0 : u.call(t)]);
   };
-}), pr = () => ({
+}), Er = () => ({
   clsName: {
     type: String,
     default: "pro-layout"
@@ -1979,116 +2078,120 @@ const lr = () => ({
   menuProps: {
     type: Object
   }
-}), va = w({
+}), ba = D({
   inheritAttrs: !1,
   props: {
-    ...pr()
+    ...Er()
   },
   setup: (e, {
     slots: t,
-    attrs: a
+    attrs: r
   }) => {
-    const r = Q()(U.MenusKey), {
+    const a = J()(B.MenusKey), {
       router: n,
       route: u
-    } = Lt(), c = N(() => {
-      var h;
-      return Nt(e.menus, (E) => {
-        var T, K;
-        const f = ((T = e.fieldNames) == null ? void 0 : T.value) || "value", C = ((K = e.fieldNames) == null ? void 0 : K.label) || "label";
+    } = Kt(), c = N(() => {
+      var p;
+      return Nt(e.menus, (C) => {
+        var E, I;
+        const i = ((E = e.fieldNames) == null ? void 0 : E.value) || "value", P = ((I = e.fieldNames) == null ? void 0 : I.label) || "label";
         return {
-          ...A(E, f, C),
-          value: m(E, f),
-          label: m(E, C)
+          ...O(C, i, P),
+          value: y(C, i),
+          label: y(C, P)
         };
       }, {
-        children: ((h = e.fieldNames) == null ? void 0 : h.children) || "children",
+        children: ((p = e.fieldNames) == null ? void 0 : p.children) || "children",
         childrenName: "children"
       });
-    }), d = N(() => In(c.value)), i = N(() => {
-      var E;
-      const h = mn(u.matched, (f) => !!m(d.value, f.name));
-      return h ? m(d.value, h.name) : (E = e.findCurrentTopName) == null ? void 0 : E.call(e, u, d.value);
-    }), P = N(() => i.value ? rt(c.value, (h) => h.value === i.value).target : null), b = N(() => {
-      var h;
-      return u.name && m(d.value, u.name) ? u.name : (h = e.findActiveKey) == null ? void 0 : h.call(e, u, d.value);
-    }), y = (h) => {
-      e.onMenuItemClick ? e.onMenuItemClick(h) : n.openMenu(h);
-    }, v = (h) => {
-      const E = rt(c.value, (f) => f.value === h.value).target;
-      y(E);
-    }, p = se(t, "header"), l = se(t, "menu");
+    }), s = N(() => Nn(c.value)), d = N(() => {
+      if (e.findCurrentTopName)
+        return e.findCurrentTopName(u, s.value);
+      const p = yn(u.matched, (C) => !!y(s.value, C.name));
+      if (p)
+        return y(s.value, p.name);
+    }), b = N(() => d.value ? nt(c.value, (p) => p.value === d.value).target : null), h = N(() => {
+      if (e.findActiveKey)
+        return e.findActiveKey(u, s.value);
+      if (u.name && y(s.value, u.name))
+        return u.name;
+    }), m = (p) => {
+      e.onMenuItemClick ? e.onMenuItemClick(p) : n.openMenu(p);
+    }, g = (p) => {
+      const C = nt(c.value, (i) => i.value === p.value).target;
+      m(C);
+    }, S = le(t, "header"), f = le(t, "menu");
     return () => {
-      var f, C, T, K, R, H, M, I, L, k;
-      if (!r)
+      var i, P, E, I, M, k, Q, q, $, A;
+      if (!a)
         return null;
-      const h = V(a, "class"), E = {
+      const p = z(r, "class"), C = {
         class: `${e.clsName}-menus`,
         options: c.value,
-        activeKey: b.value,
-        ...V(e, "convertSubMenuProps", "convertMenuItemProps"),
-        onMenuItemClick: y,
+        activeKey: h.value,
+        ...z(e, "convertSubMenuProps", "convertMenuItemProps"),
+        onMenuItemClick: m,
         ...e.menuProps
       };
-      return e.layout === "vertical" ? s("main", O(h, {
+      return e.layout === "vertical" ? l("main", x(p, {
         class: `${e.clsName} ${e.clsName}-${e.layout}`
-      }), [s(Oe, {
+      }), [l($e, {
         class: `${e.clsName}-header`
       }, {
-        menus: (S) => S ? s(r, O({
-          style: `width:${S}px`,
+        menus: (v) => v ? l(a, x({
+          style: `width:${v}px`,
           mode: "horizontal"
-        }, E), l) : null,
-        ...p
-      }), s("div", {
+        }, C), f) : null,
+        ...S
+      }), l("div", {
         class: `${e.clsName}-section`
-      }, [(f = t.default) == null ? void 0 : f.call(t)])]) : e.layout === "horizontal" ? s("main", O(h, {
+      }, [(i = t.default) == null ? void 0 : i.call(t)])]) : e.layout === "horizontal" ? l("main", x(p, {
         class: `${e.clsName} ${e.clsName}-${e.layout}`
-      }), [s("div", {
+      }), [l("div", {
         class: `${e.clsName}-menus-wrapper`
-      }, [(C = l.start) == null ? void 0 : C.call(l), s(r, E, l), (T = l.end) == null ? void 0 : T.call(l)]), s("div", {
+      }, [(P = f.start) == null ? void 0 : P.call(f), l(a, C, f), (E = f.end) == null ? void 0 : E.call(f)]), l("div", {
         class: `${e.clsName}-structure`
-      }, [s(Oe, {
+      }, [l($e, {
         class: `${e.clsName}-header`
-      }, p), s("div", {
+      }, S), l("div", {
         class: `${e.clsName}-section`
-      }, [(K = t.default) == null ? void 0 : K.call(t)])])]) : e.layout === "horizontal-v" ? s("main", O(h, {
+      }, [(I = t.default) == null ? void 0 : I.call(t)])])]) : e.layout === "horizontal-v" ? l("main", x(p, {
         class: `${e.clsName} ${e.clsName}-${e.layout}`
-      }), [s(Oe, {
+      }), [l($e, {
         class: `${e.clsName}-header`
-      }, p), s("div", {
+      }, S), l("div", {
         class: `${e.clsName}-structure`
-      }, [s("div", {
+      }, [l("div", {
         class: `${e.clsName}-menus-wrapper`
-      }, [(R = l.start) == null ? void 0 : R.call(l), s(r, E, l), (H = l.end) == null ? void 0 : H.call(l)]), s("div", {
+      }, [(M = f.start) == null ? void 0 : M.call(f), l(a, C, f), (k = f.end) == null ? void 0 : k.call(f)]), l("div", {
         class: `${e.clsName}-section`
-      }, [(M = t.default) == null ? void 0 : M.call(t)])])]) : s("main", O(h, {
+      }, [(Q = t.default) == null ? void 0 : Q.call(t)])])]) : l("main", x(p, {
         class: `${e.clsName} ${e.clsName}-${e.layout}`
-      }), [s(Oe, {
+      }), [l($e, {
         class: `${e.clsName}-header`
       }, {
-        menus: (S) => S ? s(r, O({
-          style: `width:${S}px`,
+        menus: (v) => v ? l(a, x({
+          style: `width:${v}px`,
           class: `${e.clsName}-menus`,
           mode: "horizontal",
-          options: F(c.value, (g) => A(g, "children")),
-          activeKey: i.value
-        }, V(e, "convertSubMenuProps", "convertMenuItemProps"), {
-          onMenuItemClick: v
-        }), l) : null,
-        ...p
-      }), s("div", {
+          options: R(c.value, (T) => O(T, "children")),
+          activeKey: d.value
+        }, z(e, "convertSubMenuProps", "convertMenuItemProps"), {
+          onMenuItemClick: g
+        }), f) : null,
+        ...S
+      }), l("div", {
         class: `${e.clsName}-structure`
-      }, [P.value && _(P.value.children) > 0 && s("div", {
+      }, [b.value && Y(b.value.children) > 0 && l("div", {
         class: `${e.clsName}-menus-wrapper`
-      }, [(I = l.start) == null ? void 0 : I.call(l), s(r, O({
-        options: P.value.children
-      }, A(E, "options")), l), (L = l.end) == null ? void 0 : L.call(l)]), s("div", {
+      }, [(q = f.start) == null ? void 0 : q.call(f), l(a, x({
+        options: b.value.children
+      }, O(C, "options")), f), ($ = f.end) == null ? void 0 : $.call(f)]), l("div", {
         class: `${e.clsName}-section`
-      }, [(k = t.default) == null ? void 0 : k.call(t)])])]);
+      }, [(A = t.default) == null ? void 0 : A.call(t)])])]);
     };
   }
-}), ha = w({
+}), ga = D({
   props: {
     fieldNames: {
       type: Object,
@@ -2104,41 +2207,41 @@ const lr = () => ({
   },
   setup: (e, {
     slots: t,
-    emit: a
+    emit: r
   }) => {
-    const r = Q()(U.UploaderKey), n = (i) => {
-      const P = At(i);
-      if (W(P)) {
-        const b = e.fieldNames;
-        return F(P, (y) => ({
-          ...A(y, b.id, b.name, b.size),
-          id: m(y, b.id),
-          name: m(y, b.name),
-          size: m(y, b.size)
+    const a = J()(B.UploaderKey), n = (d) => {
+      const b = Ot(d);
+      if (W(b)) {
+        const h = e.fieldNames;
+        return R(b, (m) => ({
+          ...O(m, h.id, h.name, h.size),
+          id: y(m, h.id),
+          name: y(m, h.name),
+          size: y(m, h.size)
         }));
       }
       return [];
-    }, u = N(() => n(e.value)), c = N(() => n(e.modelValue)), d = (i, P) => {
-      let b = "";
-      i && _(i) > 0 && (b = Nn(F(i, (y) => {
-        var l;
-        const v = e.fieldNames, p = {
-          [v.id]: y.id,
-          [v.name]: y.name,
-          [v.size || "size"]: y.size
+    }, u = N(() => n(e.value)), c = N(() => n(e.modelValue)), s = (d, b) => {
+      let h = "";
+      d && Y(d) > 0 && (h = An(R(d, (m) => {
+        var f;
+        const g = e.fieldNames, S = {
+          [g.id]: m.id,
+          [g.name]: m.name,
+          [g.size || "size"]: m.size
         };
-        return ((l = e.convertItem) == null ? void 0 : l.call(e, y)) || p;
-      }))), a(P, b);
+        return ((f = e.convertItem) == null ? void 0 : f.call(e, m)) || S;
+      }))), r(b, h);
     };
-    return () => r ? s(r, O({
+    return () => a ? l(a, x({
       class: "pro-uploader-text",
       value: u.value,
-      "onUpdate:value": (i) => d(i, "update:value"),
+      "onUpdate:value": (d) => s(d, "update:value"),
       modelValue: c.value,
-      "onUpdate:modelValue": (i) => d(i, "update:modelValue")
-    }, A(e, "value", "modelValue", "fieldNames")), t) : null;
+      "onUpdate:modelValue": (d) => s(d, "update:modelValue")
+    }, O(e, "value", "modelValue", "fieldNames")), t) : null;
   }
-}), ba = w({
+}), Sa = D({
   props: {
     value: [String, Array],
     fieldNames: {
@@ -2152,66 +2255,66 @@ const lr = () => ({
   },
   setup: (e, {
     slots: t,
-    emit: a
+    emit: r
   }) => {
     const o = (u) => {
       var c;
-      return !!m(u, ((c = e.fieldNames) == null ? void 0 : c.id) || "id");
-    }, r = N(() => {
+      return !!y(u, ((c = e.fieldNames) == null ? void 0 : c.id) || "id");
+    }, a = N(() => {
       let u = e.value;
-      return u && oe(u) && (u = At(u)), u && !W(u) && Ee(u) && o(u) && (u = [u]), W(u) ? F(Y(u, (c) => o(c)), (c) => {
-        var b, y, v;
-        const d = m(c, ((b = e.fieldNames) == null ? void 0 : b.id) || "id"), i = m(c, ((y = e.fieldNames) == null ? void 0 : y.name) || "name"), P = m(c, ((v = e.fieldNames) == null ? void 0 : v.name) || "size");
+      return u && ae(u) && (u = Ot(u)), u && !W(u) && Ce(u) && o(u) && (u = [u]), W(u) ? R(_(u, (c) => o(c)), (c) => {
+        var h, m, g;
+        const s = y(c, ((h = e.fieldNames) == null ? void 0 : h.id) || "id"), d = y(c, ((m = e.fieldNames) == null ? void 0 : m.name) || "name"), b = y(c, ((g = e.fieldNames) == null ? void 0 : g.name) || "size");
         return {
           ...c,
-          id: d,
-          size: P,
-          name: i || d
+          id: s,
+          size: b,
+          name: d || s
         };
       }) : [];
     }), n = (u) => {
-      a("titleClick", u);
+      r("titleClick", u);
     };
     return () => {
       var u, c;
-      return s("div", {
+      return l("div", {
         class: "pro-upload-list"
-      }, [(u = t.start) == null ? void 0 : u.call(t), F(r.value, (d) => {
-        var i;
-        return s("div", {
+      }, [(u = t.start) == null ? void 0 : u.call(t), R(a.value, (s) => {
+        var d;
+        return l("div", {
           class: "pro-upload-list-item"
-        }, [s("span", {
+        }, [l("span", {
           class: "pro-upload-list-item-title",
-          onClick: () => n(d)
-        }, [d.name]), (i = t.extra) == null ? void 0 : i.call(t, d)]);
+          onClick: () => n(s)
+        }, [s.name]), (d = t.extra) == null ? void 0 : d.call(t, s)]);
       }), (c = t.default) == null ? void 0 : c.call(t)]);
     };
   }
-}), Cr = (e, t) => {
-  !e || !t || St(t) || Ce(e) || Z(t, (a, o) => {
-    const r = Mt(o, e);
-    if (!Tt(r)) {
+}), Mr = (e, t) => {
+  !e || !t || gt(t) || pe(e) || Z(t, (r, o) => {
+    const a = Et(o, e);
+    if (!Mt(a)) {
       console.log("ConfigExtra\uFF1A\u8865\u5145\u5BF9\u8C61key\u8F6C\u6362\u5931\u8D25", e.elementId, o);
       return;
     }
-    if (!It(r, e)) {
-      console.log("ConfigExtra\uFF1A\u8865\u5145\u5BF9\u8C61key\u672A\u627E\u5230\u7236\u7EA7", e.elementId, o, "->", r);
+    if (!Tt(a, e)) {
+      console.log("ConfigExtra\uFF1A\u8865\u5145\u5BF9\u8C61key\u672A\u627E\u5230\u7236\u7EA7", e.elementId, o, "->", a);
       return;
     }
-    le(e, r, a);
+    ce(e, a, r);
   });
-}, Pe = (e, t) => {
-  Cr(e, m(t, e.elementId));
-  const a = m(e, ["highConfig$", "registerPropsTrans"]);
-  a && _(a) > 0 && Z(a, (o) => {
-    const r = m(e.elementProps, o.name);
-    W(r) ? Z(r, (n) => {
-      Pe(n, t);
-    }) : Pe(r, t);
-  }), e.children && _(e.children) > 0 && Z(e.children, (o) => {
-    Pe(o, t);
+}, Se = (e, t) => {
+  Mr(e, y(t, e.elementId));
+  const r = y(e, ["highConfig$", "registerPropsTrans"]);
+  r && Y(r) > 0 && Z(r, (o) => {
+    const a = y(e.elementProps, o.name);
+    W(a) ? Z(a, (n) => {
+      Se(n, t);
+    }) : Se(a, t);
+  }), e.children && Y(e.children) > 0 && Z(e.children, (o) => {
+    Se(o, t);
   });
-}, Er = w({
+}, Tr = D({
   props: {
     initExecuteList: {
       type: Array
@@ -2220,43 +2323,43 @@ const lr = () => ({
   setup: (e) => {
     const {
       execute: t
-    } = be();
-    return ue(() => {
+    } = he();
+    return oe(() => {
       e.initExecuteList && t(e.initExecuteList, []);
     }, []), () => null;
   }
-}), ga = ({
+}), Pa = ({
   actors: e,
   configData: t,
-  configDataExtra: a,
+  configDataExtra: r,
   Logic: o
-}) => w(() => {
-  const r = G(), n = (d) => {
-    const i = Ct(d);
-    return a && (W(i) ? Z(i, (P) => Pe(P, a)) : Pe(i, a)), i;
+}) => D(() => {
+  const a = X(), n = (s) => {
+    const d = pt(s);
+    return r && (W(d) ? Z(d, (b) => Se(b, r)) : Se(d, r)), d;
   };
-  ue(() => {
-    t && t.elementConfigs && (r.value = n(t.elementConfigs)), t != null && t.elementConfigs;
+  oe(() => {
+    t && t.elementConfigs && (a.value = n(t.elementConfigs)), t != null && t.elementConfigs;
   }, []);
-  const c = Q()(U.LoadingKey);
-  return () => r.value ? s(we, {
+  const c = J()(B.LoadingKey);
+  return () => a.value ? l(we, {
     initState: t == null ? void 0 : t.initState,
     storeKeys: t == null ? void 0 : t.storeKeys,
     actors: e,
     requests: t == null ? void 0 : t.requests,
-    elementConfigs: r.value
+    elementConfigs: a.value
   }, {
-    default: () => [s(Er, null, null), o && s(o, null, null)]
-  }) : c ? s(c, {
+    default: () => [l(Tr, null, null), o && l(o, null, null)]
+  }) : c ? l(c, {
     loading: !0
   }, {
-    default: () => [s("div", {
+    default: () => [l("div", {
       class: "pro-module-loading-dom"
     }, null)]
   }) : null;
-}), Jt = Symbol("pro-curd"), re = () => ye(Jt), Mr = (e) => me(Jt, e);
-var x = /* @__PURE__ */ ((e) => (e.LIST = "LIST", e.DETAIL = "DETAIL", e.ADD = "ADD", e.EDIT = "EDIT", e.DELETE = "DELETE", e))(x || {}), j = /* @__PURE__ */ ((e) => (e.EMIT = "EMIT", e.EXECUTE = "EXECUTE", e.PAGE = "PAGE", e.SUCCESS = "SUCCESS", e.FAIL = "FAIL", e))(j || {}), de = /* @__PURE__ */ ((e) => (e.ADD = "ADD", e.EDIT = "EDIT", e.DETAIL = "DETAIL", e))(de || {}), Ie = /* @__PURE__ */ ((e) => (e.NORMAL = "NORMAL", e.CONTINUE = "CONTINUE", e))(Ie || {});
-const Tr = () => ({
+}), Zt = Symbol("pro-curd"), re = () => ye(Zt), Ir = (e) => me(Zt, e);
+var K = /* @__PURE__ */ ((e) => (e.LIST = "LIST", e.DETAIL = "DETAIL", e.ADD = "ADD", e.EDIT = "EDIT", e.DELETE = "DELETE", e))(K || {}), U = /* @__PURE__ */ ((e) => (e.EMIT = "EMIT", e.EXECUTE = "EXECUTE", e.PAGE = "PAGE", e.SUCCESS = "SUCCESS", e.FAIL = "FAIL", e))(U || {}), de = /* @__PURE__ */ ((e) => (e.ADD = "ADD", e.EDIT = "EDIT", e.DETAIL = "DETAIL", e))(de || {}), Ie = /* @__PURE__ */ ((e) => (e.NORMAL = "NORMAL", e.CONTINUE = "CONTINUE", e))(Ie || {});
+const Nr = () => ({
   rowKey: {
     type: String,
     default: "id"
@@ -2279,327 +2382,325 @@ const Tr = () => ({
   modalProps: {
     type: Object
   }
-}), Zt = ["sendCurdEvent", "refreshList", "sendEvent", "sendRequest"], mt = w({
+}), en = ["sendCurdEvent", "refreshList", "sendEvent", "sendRequest"], ft = D({
   props: {
-    ...he,
-    ...Tr()
+    ...ve,
+    ...Nr()
   },
   setup: (e, {
     slots: t,
-    expose: a
+    expose: r
   }) => {
     const {
       elementMap: o,
-      state: r,
+      state: a,
       sendEvent: n,
       sendRequest: u
-    } = be(), c = N(() => Fe(e.columns, e.columnState, e.columnState2)), d = (M) => Qe(e.formElementMap, M), i = (M, I) => Je(o, M, I), P = (M, I) => {
-      const L = Y(c.value, (k) => {
-        const S = m(k, ["extra", M]) || m(k, M);
-        return I ? S !== !1 : S;
+    } = he(), c = N(() => Le(e.columns, e.columnState, e.columnState2)), s = (M, k) => {
+      const Q = _(c.value, (q) => {
+        const $ = y(q, ["extra", M]) || y(q, M);
+        return k ? $ !== !1 : $;
       });
-      return pt(L, (k) => m(k, ["extra", `${M}Sort`]) || m(k, `${M}Sort`));
-    }, b = N(() => P("form", !0)), y = N(() => P("detail", !0)), v = N(() => P("table", !0)), p = N(() => P("search"));
-    let l;
-    const h = (M) => {
-      u(x.LIST, {
-        ...l,
+      return Pt(Q, (q) => y(q, ["extra", `${M}Sort`]) || y(q, `${M}Sort`));
+    }, d = N(() => s("form", !0)), b = N(() => s("detail", !0)), h = N(() => s("table", !0)), m = N(() => s("search"));
+    let g;
+    const S = (M) => {
+      u(K.LIST, {
+        ...g,
         ...M
       });
-    }, E = (M) => {
+    }, f = (M) => {
       n({
         type: M.action,
-        payload: A(M, "action", "source"),
+        payload: O(M, "action", "source"),
         source: M.source
       });
     };
     Ye(({
       type: M,
-      payload: I,
-      source: L
+      payload: k,
+      source: Q
     }) => {
-      if (L)
+      if (Q)
         return;
-      let k = M, S = I == null ? void 0 : I.type;
-      k === Me.Success && (k = m(I, ["requestOpts", "action"]), S = j.SUCCESS);
+      let q = M, $ = k == null ? void 0 : k.type;
+      q === Me.Success && (q = y(k, ["requestOpts", "action"]), $ = U.SUCCESS);
       const {
-        values: g,
-        record: D
-      } = I;
-      switch (k) {
-        case x.LIST:
-          S === j.EMIT && (l = g, h());
+        values: A,
+        record: v
+      } = k;
+      switch (q) {
+        case K.LIST:
+          $ === U.EMIT && (g = A, S());
           return;
-        case x.ADD:
-          S === j.EXECUTE && u(x.ADD, g, r.detailData);
+        case K.ADD:
+          $ === U.EXECUTE && u(K.ADD, A, a.detailData);
           return;
-        case x.EDIT:
-          S === j.EXECUTE && u(x.EDIT, g, r.detailData);
+        case K.EDIT:
+          $ === U.EXECUTE && u(K.EDIT, A, a.detailData);
           return;
-        case x.DELETE:
-          S === j.EMIT ? u(x.DELETE, D, e.rowKey) : S === j.SUCCESS && h();
+        case K.DELETE:
+          $ === U.EMIT ? u(K.DELETE, v, e.rowKey) : $ === U.SUCCESS && S();
           return;
       }
-      k && M === j.EXECUTE && u(k, g);
+      q && M === U.EXECUTE && u(q, A);
     });
-    const f = ne(e.operates, (M, I) => ({
+    const p = ne(e.operates, (M, k) => ({
       ...M,
-      [I.action]: I
-    }), {}), C = (M) => m(f, M), T = N(() => e.listProps), K = N(() => e.formProps), R = N(() => e.descProps), H = N(() => e.modalProps);
-    return Mr({
+      [k.action]: k
+    }), {}), C = (M) => y(p, M), i = N(() => e.listProps), P = N(() => e.formProps), E = N(() => e.descProps), I = N(() => e.modalProps);
+    return Ir({
       columns: c,
-      getSignColumns: P,
-      getFormItemVNode: d,
-      getItemVNode: i,
+      getSignColumns: s,
       elementMap: o,
       formElementMap: e.formElementMap,
       rowKey: e.rowKey,
-      curdState: r,
-      formColumns: b,
-      descColumns: y,
-      tableColumns: v,
-      searchColumns: p,
-      sendCurdEvent: E,
+      curdState: a,
+      formColumns: d,
+      descColumns: b,
+      tableColumns: h,
+      searchColumns: m,
+      sendCurdEvent: f,
       operates: e.operates,
       getOperate: C,
-      refreshList: h,
-      listProps: T,
-      formProps: K,
-      descProps: R,
-      modalProps: H
-    }), a({
-      sendCurdEvent: E,
-      refreshList: h
+      refreshList: S,
+      listProps: i,
+      formProps: P,
+      descProps: E,
+      modalProps: I
+    }), r({
+      sendCurdEvent: f,
+      refreshList: S
     }), () => {
       var M;
       return (M = t.default) == null ? void 0 : M.call(t);
     };
   }
-}), ze = w({
+}), ze = D({
   props: {
-    ...A(we.props, "state", "requests"),
-    ...mt.props,
+    ...O(we.props, "state", "requests"),
+    ...ft.props,
     curdState: {
       type: Object
     }
   },
   setup: (e, {
     slots: t,
-    expose: a
+    expose: r
   }) => {
     const {
       elementMap: o,
-      formElementMap: r
-    } = ee(), n = G(), u = G(), c = e.curdState || Ne({
+      formElementMap: a
+    } = ee(), n = X(), u = X(), c = e.curdState || Ne({
       detailData: {}
-    }), d = {
-      [x.LIST]: {
-        convertParams: (y) => y,
-        convertData: (y) => {
-          var v;
-          return (v = y.res) == null ? void 0 : v.data;
+    }), s = {
+      [K.LIST]: {
+        convertParams: (m) => m,
+        convertData: (m) => {
+          var g;
+          return (g = m.res) == null ? void 0 : g.data;
         },
         loadingName: "listLoading",
         stateName: "listData"
       },
-      [x.DETAIL]: {
-        convertParams: (y, v) => V(y, v),
-        convertData: (y) => {
-          var v;
-          return (v = y.res) == null ? void 0 : v.data;
+      [K.DETAIL]: {
+        convertParams: (m, g) => z(m, g),
+        convertData: (m) => {
+          var g;
+          return (g = m.res) == null ? void 0 : g.data;
         },
         loadingName: "detailLoading",
         stateName: "detailData",
         label: "\u8BE6\u60C5"
       },
-      [x.ADD]: {
-        convertParams: (y, v) => ({
+      [K.ADD]: {
+        convertParams: (m, g) => ({
           body: {
-            ...v,
-            ...y
+            ...g,
+            ...m
           }
         }),
         loadingName: "operateLoading",
         label: "\u6DFB\u52A0"
       },
-      [x.EDIT]: {
-        convertParams: (y, v) => ({
+      [K.EDIT]: {
+        convertParams: (m, g) => ({
           body: {
-            ...v,
-            ...y
+            ...g,
+            ...m
           }
         }),
         loadingName: "operateLoading",
         label: "\u7F16\u8F91"
       },
-      [x.DELETE]: {
-        convertParams: (y, v) => V(y, v),
+      [K.DELETE]: {
+        convertParams: (m, g) => z(m, g),
         label: "\u5220\u9664"
       }
-    }, i = F(e.operates, (y) => {
-      var l;
-      const v = m(d, y.action), p = ((l = e.convertOperate) == null ? void 0 : l.call(e, y, v)) || y;
+    }, d = R(e.operates, (m) => {
+      var f;
+      const g = y(s, m.action), S = ((f = e.convertOperate) == null ? void 0 : f.call(e, m, g)) || m;
       return {
-        ...v,
-        ...p
+        ...g,
+        ...S
       };
-    }), P = Y(i, (y) => y.actor), b = z(A(we.props, "state", "requests"));
-    return a({
-      sendCurdEvent: (y) => {
-        var v;
-        (v = u.value) == null || v.sendCurdEvent(y);
+    }), b = _(d, (m) => m.actor), h = H(O(we.props, "state", "requests"));
+    return r({
+      sendCurdEvent: (m) => {
+        var g;
+        (g = u.value) == null || g.sendCurdEvent(m);
       },
-      refreshList: (y) => {
-        var v;
-        (v = u.value) == null || v.refreshList(y);
+      refreshList: (m) => {
+        var g;
+        (g = u.value) == null || g.refreshList(m);
       },
-      sendEvent: (y) => {
-        var v;
-        (v = n.value) == null || v.sendEvent(y);
+      sendEvent: (m) => {
+        var g;
+        (g = n.value) == null || g.sendEvent(m);
       },
-      sendRequest: (y, ...v) => {
-        var p;
-        (p = n.value) == null || p.sendRequest(y, ...v);
+      sendRequest: (m, ...g) => {
+        var S;
+        (S = n.value) == null || S.sendRequest(m, ...g);
       }
-    }), () => s(we, O({
+    }), () => l(we, x({
       ref: n
-    }, V(e, b), {
+    }, z(e, h), {
       elementMap: e.elementMap || o,
       state: c,
-      requests: P
+      requests: b
     }), {
-      default: () => [s(mt, O({
+      default: () => [l(ft, x({
         ref: u
-      }, A(e, ...b, "curdState", "operates", "convertOperate"), {
-        formElementMap: e.formElementMap || r,
-        operates: i
+      }, O(e, ...h, "curdState", "operates", "convertOperate"), {
+        formElementMap: e.formElementMap || a,
+        operates: d
       }), t)]
     });
   }
-}), Ir = () => ({
+}), Ar = () => ({
   defaultAddRecord: {
     type: Object
   }
-}), Be = w({
+}), Be = D({
   props: {
-    ...Ir()
+    ...Ar()
   },
   setup: (e) => {
-    var v;
+    var g;
     const {
       dispatch: t,
-      sendRequest: a
-    } = be(), {
+      sendRequest: r
+    } = he(), {
       rowKey: o,
-      curdState: r,
+      curdState: a,
       listProps: n,
       getOperate: u,
       refreshList: c
-    } = re(), d = (v = n == null ? void 0 : n.value) == null ? void 0 : v.pageState, i = (p) => {
-      const l = u(x.DETAIL);
-      l != null && l.actor ? a(x.DETAIL, p, o) : t({
+    } = re(), s = (g = n == null ? void 0 : n.value) == null ? void 0 : g.pageState, d = (S) => {
+      const f = u(K.DETAIL);
+      f != null && f.actor ? r(K.DETAIL, S, o) : t({
         type: "detailData",
-        payload: Ct(p)
+        payload: pt(S)
       });
-    }, P = (p, {
-      record: l
+    }, b = (S, {
+      record: f
     }) => {
-      p === j.EMIT && (t({
+      S === U.EMIT && (t({
         type: "mode",
         payload: de.DETAIL
-      }), i(l));
-    }, b = (p) => {
-      p === j.EMIT ? (t({
+      }), d(f));
+    }, h = (S) => {
+      S === U.EMIT ? (t({
         type: "mode",
         payload: de.ADD
       }), t({
         type: "detailData",
         payload: e.defaultAddRecord || {}
-      })) : p === j.SUCCESS && (d && (d.page = 1), c(), r.addAction === Ie.CONTINUE ? t({
+      })) : S === U.SUCCESS && (s && (s.page = 1), c(), a.addAction === Ie.CONTINUE ? t({
         type: "detailData",
         payload: e.defaultAddRecord || {}
       }) : t({
         type: "mode",
         payload: void 0
       }));
-    }, y = (p, {
-      record: l
+    }, m = (S, {
+      record: f
     }) => {
-      p === j.EMIT ? (t({
+      S === U.EMIT ? (t({
         type: "mode",
         payload: de.EDIT
-      }), i(l)) : p === j.SUCCESS && (t({
+      }), d(f)) : S === U.SUCCESS && (t({
         type: "mode",
         payload: void 0
       }), c());
     };
     return Ye(({
-      type: p,
-      payload: l,
-      source: h
+      type: S,
+      payload: f,
+      source: p
     }) => {
-      if (h)
+      if (p)
         return;
-      let E = p, f = l == null ? void 0 : l.type;
-      const C = l == null ? void 0 : l.record;
-      switch (E === Me.Success && (E = m(l, ["requestOpts", "action"]), f = j.SUCCESS), E) {
-        case x.DETAIL:
-          P(f, {
-            record: C
+      let C = S, i = f == null ? void 0 : f.type;
+      const P = f == null ? void 0 : f.record;
+      switch (C === Me.Success && (C = y(f, ["requestOpts", "action"]), i = U.SUCCESS), C) {
+        case K.DETAIL:
+          b(i, {
+            record: P
           });
           break;
-        case x.ADD:
-          b(f);
+        case K.ADD:
+          h(i);
           break;
-        case x.EDIT:
-          y(f, {
-            record: C
+        case K.EDIT:
+          m(i, {
+            record: P
           });
           break;
       }
     }), () => null;
   }
-}), Sa = w({
+}), pa = D({
   props: {
     ...ze.props,
     ...Be.props
   },
   setup: (e, {
     slots: t,
-    expose: a
+    expose: r
   }) => {
-    const o = G();
-    a(ge(Zt, o));
-    const r = z(Be.props), u = Q()(U.ProCurdKey);
-    return () => u ? s(u, O({
+    const o = X();
+    r(be(en, o));
+    const a = H(Be.props), u = J()(B.ProCurdKey);
+    return () => u ? l(u, x({
       ref: o
-    }, A(e, r)), {
+    }, O(e, a)), {
       default: () => {
         var c;
-        return [s(Be, V(e, r), null), (c = t.default) == null ? void 0 : c.call(t)];
+        return [l(Be, z(e, a), null), (c = t.default) == null ? void 0 : c.call(t)];
       }
     }) : null;
   }
-}), Nr = () => ({
+}), Or = () => ({
   defaultAddRecord: {
     type: Object
   },
   routeBack: {
     type: Function
   }
-}), qe = w({
+}), qe = D({
   props: {
-    ...Nr()
+    ...Or()
   },
   setup: (e) => {
-    const t = Ge(), a = Xe(), {
+    const t = Ge(), r = Xe(), {
       dispatch: o,
-      sendRequest: r
-    } = be(), {
+      sendRequest: a
+    } = he(), {
       rowKey: n,
       curdState: u
-    } = re(), c = (b) => {
-      b === j.PAGE && (o({
+    } = re(), c = (h) => {
+      h === U.PAGE && (o({
         type: "mode",
         payload: void 0
       }), o({
@@ -2612,120 +2713,120 @@ const Tr = () => ({
         type: "addAction",
         payload: void 0
       }));
-    }, d = (b, {
-      record: y
+    }, s = (h, {
+      record: m
     }) => {
-      b === j.EMIT ? t.push({
-        path: `${a.path}/detail`,
-        query: V(y, n)
-      }) : b === j.PAGE && (o({
+      h === U.EMIT ? t.push({
+        path: `${r.path}/detail`,
+        query: z(m, n)
+      }) : h === U.PAGE && (o({
         type: "mode",
         payload: de.DETAIL
-      }), r(x.DETAIL, a.query, n));
-    }, i = (b) => {
-      b === j.EMIT ? t.push({
-        path: `${a.path}/add`
-      }) : b === j.PAGE ? (o({
+      }), a(K.DETAIL, r.query, n));
+    }, d = (h) => {
+      h === U.EMIT ? t.push({
+        path: `${r.path}/add`
+      }) : h === U.PAGE ? (o({
         type: "mode",
         payload: de.ADD
       }), o({
         type: "detailData",
         payload: e.defaultAddRecord || {}
-      })) : b === j.SUCCESS && (u.addAction === Ie.CONTINUE ? o({
+      })) : h === U.SUCCESS && (u.addAction === Ie.CONTINUE ? o({
         type: "detailData",
         payload: e.defaultAddRecord || {}
-      }) : e.routeBack ? e.routeBack(x.ADD) : t.go(-1));
-    }, P = (b, {
-      record: y
+      }) : e.routeBack ? e.routeBack(K.ADD) : t.go(-1));
+    }, b = (h, {
+      record: m
     }) => {
-      b === j.EMIT ? t.push({
-        path: `${a.path}/edit`,
-        query: V(y, n)
-      }) : b === j.PAGE ? (o({
+      h === U.EMIT ? t.push({
+        path: `${r.path}/edit`,
+        query: z(m, n)
+      }) : h === U.PAGE ? (o({
         type: "mode",
         payload: de.EDIT
-      }), r(x.DETAIL, a.query, n)) : b === j.SUCCESS && (e.routeBack ? e.routeBack(x.EDIT) : t.go(-1));
+      }), a(K.DETAIL, r.query, n)) : h === U.SUCCESS && (e.routeBack ? e.routeBack(K.EDIT) : t.go(-1));
     };
     return Ye(({
-      type: b,
-      payload: y,
-      source: v
+      type: h,
+      payload: m,
+      source: g
     }) => {
-      if (v)
+      if (g)
         return;
-      let p = b, l = y == null ? void 0 : y.type;
-      const h = y == null ? void 0 : y.record;
-      switch (p === Me.Success && (p = m(y, ["requestOpts", "action"]), l = j.SUCCESS), p) {
-        case x.LIST:
-          c(l);
+      let S = h, f = m == null ? void 0 : m.type;
+      const p = m == null ? void 0 : m.record;
+      switch (S === Me.Success && (S = y(m, ["requestOpts", "action"]), f = U.SUCCESS), S) {
+        case K.LIST:
+          c(f);
           break;
-        case x.DETAIL:
-          d(l, {
-            record: h
+        case K.DETAIL:
+          s(f, {
+            record: p
           });
           break;
-        case x.ADD:
-          i(l);
+        case K.ADD:
+          d(f);
           break;
-        case x.EDIT:
-          P(l, {
-            record: h
+        case K.EDIT:
+          b(f, {
+            record: p
           });
           break;
       }
     }), () => null;
   }
-}), Pa = w({
+}), Ca = D({
   props: {
     ...ze.props,
     ...qe.props
   },
   setup: (e, {
     slots: t,
-    expose: a
+    expose: r
   }) => {
-    const o = G();
-    a(ge(Zt, o));
-    const r = z(qe.props);
-    return () => s(ze, O({
+    const o = X();
+    r(be(en, o));
+    const a = H(qe.props);
+    return () => l(ze, x({
       ref: o
-    }, A(e, r)), {
+    }, O(e, a)), {
       default: () => {
         var n;
-        return [s(qe, V(e, r), null), (n = t.default) == null ? void 0 : n.call(t)];
+        return [l(qe, z(e, a), null), (n = t.default) == null ? void 0 : n.call(t)];
       }
     });
   }
-}), yt = w({
+}), mt = D({
   props: {
     buttonProps: Object
   },
   setup: (e, {
     slots: t
   }) => {
-    const a = _t(), {
+    const r = Yt(), {
       getOperate: o,
-      sendCurdEvent: r
-    } = re(), n = o(x.ADD), u = () => {
+      sendCurdEvent: a
+    } = re(), n = o(K.ADD), u = () => {
       if (n != null && n.onClick) {
         n.onClick();
         return;
       }
-      r({
-        action: x.ADD,
-        type: j.EMIT
+      a({
+        action: K.ADD,
+        type: U.EMIT
       });
-    }, d = Q()(U.ButtonKey);
-    return () => !n || !a(n.per, n.perSuffix) || !(X(n.show) ? n.show({}) : n.show) ? null : n.element ? n.element({}, n) : t.default ? t.default(n, u) : d ? s(d, O({
+    }, s = J()(B.ButtonKey);
+    return () => !n || !r(n.per, n.perSuffix) || !(V(n.show) ? n.show({}) : n.show) ? null : n.element ? n.element({}, n) : t.default ? t.default(n, u) : s ? l(s, x({
       class: "pro-curd-add-button",
-      disabled: X(n.disabled) ? n.disabled() : n.disabled
+      disabled: V(n.disabled) ? n.disabled() : n.disabled
     }, e.buttonProps, {
       onClick: u
     }), {
       default: () => [n.label]
     }) : null;
   }
-}), vt = () => ({
+}), yt = () => ({
   addConfig: {
     type: Object,
     default: {
@@ -2736,136 +2837,136 @@ const Tr = () => ({
     type: Boolean,
     default: !0
   }
-}), $r = w({
+}), $r = D({
   props: {
-    ...br.props,
-    ...vt()
+    ...Sr.props,
+    ...yt()
   },
   setup: (e, {
     slots: t
   }) => {
     const {
-      elementMap: a,
+      elementMap: r,
       formElementMap: o,
-      curdState: r,
+      curdState: a,
       searchColumns: n,
       tableColumns: u,
       sendCurdEvent: c,
-      operates: d,
-      refreshList: i
-    } = re(), P = F(
-      Y(d, (f) => {
-        const C = f.action;
-        return C === x.DETAIL || C === x.EDIT || C === x.DELETE || f.tableOperate;
+      operates: s,
+      refreshList: d
+    } = re(), b = R(
+      _(s, (i) => {
+        const P = i.action;
+        return P === K.DETAIL || P === K.EDIT || P === K.DELETE || i.tableOperate;
       }),
-      (f) => {
-        const C = {
-          ...V(f, "label", "show", "disabled", "loading", "extraProps", "onClick", "element", "sort", "per", "perSuffix"),
-          value: f.action
+      (i) => {
+        const P = {
+          ...z(i, "label", "show", "disabled", "loading", "extraProps", "onClick", "element", "sort", "per", "perSuffix"),
+          value: i.action
         };
-        return C.onClick || (C.onClick = (T) => {
+        return P.onClick || (P.onClick = (E) => {
           c({
-            action: f.action,
-            type: j.EMIT,
-            record: T
+            action: i.action,
+            type: U.EMIT,
+            record: E
           });
-        }), C;
+        }), P;
       }
-    ), b = (f) => {
+    ), h = (i) => {
       c({
-        action: x.LIST,
-        type: j.EMIT,
-        values: f
+        action: K.LIST,
+        type: U.EMIT,
+        values: i
       });
     };
-    $n(() => {
-      e.activatedRefresh && i();
+    On(() => {
+      e.activatedRefresh && d();
     });
-    const y = N(() => ({
+    const m = N(() => ({
       formElementMap: o,
       columns: n.value,
       ...e.searchProps
-    })), v = N(() => {
-      var f, C;
+    })), g = N(() => {
+      var i, P;
       return {
-        elementMap: a,
+        elementMap: r,
         columns: u.value,
-        loading: r.listLoading,
-        dataSource: (f = r.listData) == null ? void 0 : f.dataSource,
-        ...A(e.tableProps, "operate"),
+        loading: a.listLoading,
+        dataSource: (i = a.listData) == null ? void 0 : i.dataSource,
+        ...O(e.tableProps, "operate"),
         operate: {
-          items: P,
-          ...(C = e.tableProps) == null ? void 0 : C.operate
+          items: b,
+          ...(P = e.tableProps) == null ? void 0 : P.operate
         }
       };
-    }), p = N(() => {
-      var f;
+    }), S = N(() => {
+      var i;
       return e.paginationProps === !1 ? !1 : {
-        total: (f = r.listData) == null ? void 0 : f.total,
+        total: (i = a.listData) == null ? void 0 : i.total,
         ...e.paginationProps
       };
-    }), l = z(vt()), E = Q()(U.ProListKey);
+    }), f = H(yt()), C = J()(B.ProListKey);
     return () => {
-      var f, C;
-      return E ? s(E, O({
+      var i, P;
+      return C ? l(C, x({
         class: "pro-curd-list"
-      }, A(e, ...l, "searchProps", "tableProps", "paginationProps"), {
-        searchProps: y.value,
-        tableProps: v.value,
-        paginationProps: p.value,
-        onSearch: b
+      }, O(e, ...f, "searchProps", "tableProps", "paginationProps"), {
+        searchProps: m.value,
+        tableProps: g.value,
+        paginationProps: S.value,
+        onSearch: h
       }), {
-        "search-end": (f = e.addConfig) != null && f.inSearch ? () => {
-          var T;
-          return s("div", {
+        "search-end": (i = e.addConfig) != null && i.inSearch ? () => {
+          var E;
+          return l("div", {
             class: "pro-curd-list-search-end"
-          }, [s(yt, (T = e.addConfig) == null ? void 0 : T.buttonProps, null)]);
+          }, [l(mt, (E = e.addConfig) == null ? void 0 : E.buttonProps, null)]);
         } : void 0,
-        "table-toolbarExtra": (C = e.addConfig) != null && C.inTable ? (T) => {
-          var K;
-          return s(ae, null, [s(yt, (K = e.addConfig) == null ? void 0 : K.buttonProps, null), T]);
+        "table-toolbarExtra": (P = e.addConfig) != null && P.inTable ? (E) => {
+          var I;
+          return l(ie, null, [l(mt, (I = e.addConfig) == null ? void 0 : I.buttonProps, null), E]);
         } : void 0,
         ...t,
-        search: t.search ? (T) => t.search(T, y.value) : void 0,
-        table: t.table ? (T) => t.table(T, v.value) : void 0,
-        pagination: t.pagination ? (T) => t.pagination(T, p.value) : void 0
+        search: t.search ? (E) => t.search(E, m.value) : void 0,
+        table: t.table ? (E) => t.table(E, g.value) : void 0,
+        pagination: t.pagination ? (E) => t.pagination(E, S.value) : void 0
       }) : null;
     };
   }
-}), pa = w(() => {
+}), Ea = D(() => {
   const {
     listProps: e
   } = re();
-  return () => s($r, A(e == null ? void 0 : e.value, "slots"), m(e == null ? void 0 : e.value, "slots"));
-}), Ar = () => ({
+  return () => l($r, O(e == null ? void 0 : e.value, "slots"), y(e == null ? void 0 : e.value, "slots"));
+}), wr = () => ({
   signName: {
     type: String
   }
-}), et = w({
+}), Ze = D({
   props: {
-    ...Ar()
+    ...wr()
   },
   setup: (e, {
     slots: t,
-    expose: a,
+    expose: r,
     attrs: o
   }) => {
     const {
-      elementMap: r,
+      elementMap: a,
       formElementMap: n,
       curdState: u,
       formColumns: c,
-      getSignColumns: d,
-      sendCurdEvent: i
-    } = re(), P = G();
-    a(ge(e.formMethods || [], P));
-    const b = N(() => e.signName ? d(e.signName) : c.value), y = () => {
-      var f;
-      u.addAction = Ie.NORMAL, (f = P.value) == null || f.submit();
-    }, v = () => {
-      var f;
-      u.addAction = Ie.CONTINUE, (f = P.value) == null || f.submit();
-    }, p = [
+      getSignColumns: s,
+      sendCurdEvent: d
+    } = re(), b = X();
+    r(be(e.formMethods || [], b));
+    const h = N(() => e.signName ? s(e.signName) : c.value), m = () => {
+      var i;
+      u.addAction = Ie.NORMAL, (i = b.value) == null || i.submit();
+    }, g = () => {
+      var i;
+      u.addAction = Ie.CONTINUE, (i = b.value) == null || i.submit();
+    }, S = [
       {
         value: te.RESET,
         label: "\u91CD\u7F6E"
@@ -2885,73 +2986,73 @@ const Tr = () => ({
         },
         show: !1
       }
-    ], l = (f) => {
-      o.onFinish || (u.mode === x.EDIT ? i({
-        action: x.EDIT,
-        type: j.EXECUTE,
-        values: f
-      }) : i({
-        action: x.ADD,
-        type: j.EXECUTE,
-        values: f
+    ], f = (i) => {
+      o.onFinish || (u.mode === K.EDIT ? d({
+        action: K.EDIT,
+        type: U.EXECUTE,
+        values: i
+      }) : d({
+        action: K.ADD,
+        type: U.EXECUTE,
+        values: i
       }));
-    }, E = Q()(U.ProFormKey);
-    return () => E ? s(E, O({
-      ref: P,
+    }, C = J()(B.ProFormKey);
+    return () => C ? l(C, x({
+      ref: b,
       class: "pro-curd-form"
-    }, A(e, "operate"), {
-      elementMap: e.elementMap || r,
+    }, O(e, "operate"), {
+      elementMap: e.elementMap || a,
       formElementMap: e.formElementMap || n,
-      columns: e.columns || b.value,
-      readonly: u.mode === x.DETAIL,
+      columns: e.columns || h.value,
+      readonly: u.mode === K.DETAIL,
       model: e.model || u.detailData,
-      hideRequiredMark: u.mode === x.DETAIL,
+      hideRequiredMark: u.mode === K.DETAIL,
       operate: e.operate ? {
-        items: p,
-        onSubmit: y,
-        onContinue: v,
+        items: S,
+        onSubmit: m,
+        onContinue: g,
         ...e.operate
       } : void 0,
-      onFinish: l
+      onFinish: f
     }), t) : null;
   }
-}), Ca = w(() => {
+}), Ma = D(() => {
   const {
     formProps: e
   } = re();
-  return () => s(et, A(e == null ? void 0 : e.value, "slots"), m(e == null ? void 0 : e.value, "slots"));
-}), Or = () => ({
+  return () => l(Ze, O(e == null ? void 0 : e.value, "slots"), y(e == null ? void 0 : e.value, "slots"));
+}), Dr = () => ({
   signName: {
     type: String
   }
-}), wr = w({
+}), Fr = D({
   props: {
-    ...Or()
+    ...Dr()
   },
   setup: (e, {
     slots: t
   }) => {
     const {
-      curdState: a,
+      curdState: r,
       descColumns: o,
-      getSignColumns: r
-    } = re(), n = N(() => e.signName ? r(e.signName) : o.value);
-    return () => s(gr, O(A(e, "signName", "model", "columns"), {
-      model: e.model || a.detailData,
+      getSignColumns: a
+    } = re(), n = N(() => e.signName ? a(e.signName) : o.value);
+    return () => l(Pr, x(O(e, "signName", "model", "columns"), {
+      model: e.model || r.detailData,
       columns: n.value
     }), t);
   }
-}), Ea = w(() => {
+}), Ta = D(() => {
   const {
     descProps: e
   } = re();
-  return () => s(wr, O({
+  return () => l(Fr, x({
     class: "pro-curd-desc"
-  }, A(e == null ? void 0 : e.value, "slots")), m(e == null ? void 0 : e.value, "slots"));
-}), ht = () => ({
+  }, O(e == null ? void 0 : e.value, "slots")), y(e == null ? void 0 : e.value, "slots"));
+}), vt = () => ({
   validMode: {
     type: Array,
-    default: [x.ADD, x.DETAIL, x.EDIT]
+    default: [K.ADD, K.DETAIL, K.EDIT]
   },
   loadingOpts: {
     type: Object
@@ -2959,48 +3060,48 @@ const Tr = () => ({
   overrideProps: {
     type: Object
   }
-}), en = w({
+}), tn = D({
   props: {
-    ...ht()
+    ...vt()
   },
   setup: (e, {
     slots: t
   }) => {
-    const a = Q(), o = a(U.ModalKey), r = a(U.LoadingKey), {
+    const r = J(), o = r(B.ModalKey), a = r(B.LoadingKey), {
       curdState: n,
       getOperate: u
     } = re(), c = () => {
-      n.mode = void 0, Et(n.detailData, {}), n.detailLoading = !1, n.addAction = void 0;
-    }, d = z(ht());
+      n.mode = void 0, Ct(n.detailData, {}), n.detailLoading = !1, n.addAction = void 0;
+    }, s = H(vt());
     return () => {
-      var P;
-      const i = n.mode;
-      return !fe(e.validMode, (b) => b === i) || !o ? null : s(o, O({
+      var b;
+      const d = n.mode;
+      return !fe(e.validMode, (h) => h === d) || !o ? null : l(o, x({
         class: "pro-curd-modal"
-      }, A(e, d), {
-        visible: fe(e.validMode, (b) => b === i),
-        title: e.title || ((P = u(n.mode)) == null ? void 0 : P.label),
+      }, O(e, s), {
+        visible: fe(e.validMode, (h) => h === d),
+        title: e.title || ((b = u(n.mode)) == null ? void 0 : b.label),
         confirmLoading: n.operateLoading,
-        maskClosable: n.mode === x.DETAIL,
-        footer: n.mode === x.DETAIL ? !1 : void 0
+        maskClosable: n.mode === K.DETAIL,
+        footer: n.mode === K.DETAIL ? !1 : void 0
       }, e.overrideProps, {
         onCancel: c
       }), {
         default: () => {
-          var b;
-          return [n.detailLoading && r ? s(r, O({
+          var h;
+          return [n.detailLoading && a ? l(a, x({
             loading: !0
           }, e.loadingOpts), {
-            default: () => [s("div", {
+            default: () => [l("div", {
               class: "pro-curd-modal-loading-dom"
             }, null)]
-          }) : (b = t.default) == null ? void 0 : b.call(t)];
+          }) : (h = t.default) == null ? void 0 : h.call(t)];
         },
-        ...A(t, "default")
+        ...O(t, "default")
       });
     };
   }
-}), Ma = w({
+}), Ia = D({
   props: {
     modalProps: Object,
     formProps: Object
@@ -3008,136 +3109,137 @@ const Tr = () => ({
   setup: (e, {
     slots: t
   }) => {
-    const a = G(), o = se(t, "modal"), r = se(t, "form");
-    return () => s(en, O(e.modalProps, {
+    const r = X(), o = le(t, "modal"), a = le(t, "form");
+    return () => l(tn, x(e.modalProps, {
       onOk: () => {
         var n;
-        (n = a.value) == null || n.submit();
+        (n = r.value) == null || n.submit();
       }
     }), {
-      default: () => [s(et, O({
-        ref: a
-      }, e.formProps), r)],
+      default: () => [l(Ze, x({
+        ref: r
+      }, e.formProps), a)],
       ...o
     });
   }
-}), Ta = w(() => {
+}), Na = D(() => {
   const {
     modalProps: e,
     formProps: t
-  } = re(), a = G();
-  return () => s(en, O(A(e == null ? void 0 : e.value, "slots"), {
+  } = re(), r = X();
+  return () => l(tn, x(O(e == null ? void 0 : e.value, "slots"), {
     onOk: () => {
       var o;
-      (o = a.value) == null || o.submit();
+      (o = r.value) == null || o.submit();
     }
   }), {
-    default: () => [s(et, O({
-      ref: a
-    }, A(t == null ? void 0 : t.value, "slots")), m(t == null ? void 0 : t.value, "slots"))],
-    ...m(e == null ? void 0 : e.value, "slots")
+    default: () => [l(Ze, x({
+      ref: r
+    }, O(t == null ? void 0 : t.value, "slots")), y(t == null ? void 0 : t.value, "slots"))],
+    ...y(e == null ? void 0 : e.value, "slots")
   });
 });
 export {
-  yt as AddButton,
-  ir as ColumnSetting,
-  x as CurdAction,
+  mt as AddButton,
+  fr as ColumnSetting,
+  K as CurdAction,
   Ie as CurdAddAction,
   de as CurdCurrentMode,
-  Zt as CurdMethods,
-  j as CurdSubAction,
-  U as ElementKeys,
+  en as CurdMethods,
+  U as CurdSubAction,
+  B as ElementKeys,
   te as FormAction,
-  ta as FormRulePrefixMap,
-  oa as LogonUser,
-  Gt as LogonUserKey,
-  ua as MustLogon,
-  ca as PerSuffix,
-  la as Permission,
-  Hr as ProConfig,
+  ra as FormRulePrefixMap,
+  ca as LogonUser,
+  Xt as LogonUserKey,
+  sa as MustLogon,
+  la as PerSuffix,
+  ia as Permission,
+  Gr as ProConfig,
   ze as ProCurd,
-  wr as ProCurdDesc,
-  Ea as ProCurdDescConnect,
-  et as ProCurdForm,
-  Ca as ProCurdFormConnect,
+  Fr as ProCurdDesc,
+  Ta as ProCurdDescConnect,
+  Ze as ProCurdForm,
+  Ma as ProCurdFormConnect,
   $r as ProCurdList,
-  pa as ProCurdListConnect,
-  en as ProCurdModal,
-  Ma as ProCurdModalForm,
-  Ta as ProCurdModalFormConnect,
-  gr as ProDesc,
-  ea as ProForm,
-  Zr as ProFormList,
-  Se as ProGrid,
-  va as ProLayout,
-  br as ProList,
-  Sa as ProModalCurd,
+  Ea as ProCurdListConnect,
+  tn as ProCurdModal,
+  Ia as ProCurdModalForm,
+  Na as ProCurdModalFormConnect,
+  Pr as ProDesc,
+  na as ProForm,
+  ta as ProFormList,
+  ge as ProGrid,
+  ba as ProLayout,
+  Sr as ProList,
+  pa as ProModalCurd,
   we as ProModule,
-  Yt as ProOperate,
-  ia as ProPage,
-  Pa as ProPageCurd,
-  na as ProSearchForm,
-  ya as ProShowDate,
-  da as ProShowDigit,
-  fa as ProShowOptions,
+  Qt as ProOperate,
+  fa as ProPage,
+  Ca as ProPageCurd,
+  aa as ProSearchForm,
+  ha as ProShowDate,
+  ma as ProShowDigit,
+  ya as ProShowOptions,
   Re as ProShowText,
-  ma as ProShowTree,
-  sa as ProTable,
-  Pr as ProTypography,
-  ba as ProUploadList,
-  ha as ProUploaderText,
+  va as ProShowTree,
+  da as ProTable,
+  Cr as ProTypography,
+  Sa as ProUploadList,
+  ga as ProUploaderText,
   Me as RequestAction,
-  kn as RouterMethods,
-  Le as SearchMode,
-  _n as Wrapper,
-  Ut as convertPathToList,
-  Rn as convertResData,
-  ge as createExpose,
-  Jr as createExposeObj,
-  ra as createFormItemCompFn,
-  ga as createModule,
-  Wr as createProConfig,
-  vr as defaultPage,
-  se as filterSlotsByPrefix,
-  ie as getColumnFormItemName,
+  Un as RouterMethods,
+  Ke as SearchMode,
+  Qn as Wrapper,
+  Bt as convertPathToList,
+  jn as convertResData,
+  be as createExpose,
+  ea as createExposeObj,
+  oa as createFormItemCompFn,
+  Pa as createModule,
+  Xr as createProConfig,
+  br as defaultPage,
+  le as filterSlotsByPrefix,
+  se as getColumnFormItemName,
   Rt as getColumnValueType,
-  Xn as getFirstPropName,
-  Qe as getFormItemEl,
-  Je as getItemEl,
-  Zn as getSignValue,
-  Jn as getValidValues,
-  Gn as isValidConfig,
-  Fe as mergeState,
-  Qr as mergeStateToList,
-  he as proBaseProps,
-  Mr as provideProCurd,
-  Vt as provideProFormList,
-  Hn as provideProModule,
+  Yn as getFirstPropName,
+  Xn as getRealRender,
+  tr as getSignValue,
+  er as getValidValues,
+  _n as isValidConfig,
+  Le as mergeState,
+  Zr as mergeStateToList,
+  ve as proBaseProps,
+  Ir as provideProCurd,
+  zt as provideProFormList,
+  Wn as provideProModule,
+  Qe as renderColumn,
   Te as renderElement,
-  Ze as renderElements,
-  rr as useAccess,
-  aa as useAccessMgr,
-  Fn as useComposeRequestActor,
-  _r as useDispatchMeta,
-  zn as useDispatchStore,
-  Gr as useDoneRequestActor,
-  Xr as useFailedRequestActor,
-  tr as useFormSubmit,
-  Q as useGetCompByKey,
-  Xt as useHasPer,
-  _t as useHasPer2,
-  ar as useLogonUser,
-  jn as useMetaRegister,
+  Je as renderElements,
+  jt as renderInputColumn,
+  or as useAccess,
+  ua as useAccessMgr,
+  Rn as useComposeRequestActor,
+  Qr as useDispatchMeta,
+  Hn as useDispatchStore,
+  _r as useDoneRequestActor,
+  Yr as useFailedRequestActor,
+  rr as useFormSubmit,
+  J as useGetCompByKey,
+  _t as useHasPer,
+  Yt as useHasPer2,
+  ur as useLogonUser,
+  kn as useMetaRegister,
   Ye as useModuleEvent,
   ee as useProConfig,
   re as useProCurd,
-  Ht as useProForm,
-  qt as useProFormList,
-  Vr as useProModal,
-  be as useProModule,
-  qr as useProMsg,
-  zr as useProNotify,
-  Lt as useProRouter,
-  dr as useProTable,
-  Yr as useReadStore
+  Wt as useProForm,
+  Vt as useProFormList,
+  Hr as useProModal,
+  he as useProModule,
+  zr as useProMsg,
+  Wr as useProNotify,
+  Kt as useProRouter,
+  mr as useProTable,
+  Jr as useReadStore
 };