@vue-start/pro 0.5.32 → 0.5.34

package/dist/index.es.js

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