@keyblade/pro-components 1.14.2 → 1.14.4

package/es/pro-layout/hooks.js

@@ -2,54 +2,54 @@ var V = Object.defineProperty, X = Object.defineProperties;
 var Y = Object.getOwnPropertyDescriptors;
 var x = Object.getOwnPropertySymbols;
 var Z = Object.prototype.hasOwnProperty, $ = Object.prototype.propertyIsEnumerable;
-var J = (o, s, i) => s in o ? V(o, s, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[s] = i, w = (o, s) => {
+var J = (c, s, i) => s in c ? V(c, s, { enumerable: !0, configurable: !0, writable: !0, value: i }) : c[s] = i, w = (c, s) => {
   for (var i in s || (s = {}))
-    Z.call(s, i) && J(o, i, s[i]);
+    Z.call(s, i) && J(c, i, s[i]);
   if (x)
     for (var i of x(s))
-      $.call(s, i) && J(o, i, s[i]);
-  return o;
-}, A = (o, s) => X(o, Y(s));
-var L = (o, s, i) => new Promise((T, y) => {
-  var b = (u) => {
+      $.call(s, i) && J(c, i, s[i]);
+  return c;
+}, O = (c, s) => X(c, Y(s));
+var L = (c, s, i) => new Promise((K, g) => {
+  var p = (r) => {
     try {
-      c(i.next(u));
+      u(i.next(r));
     } catch (d) {
-      y(d);
+      g(d);
     }
-  }, g = (u) => {
+  }, M = (r) => {
     try {
-      c(i.throw(u));
+      u(i.throw(r));
     } catch (d) {
-      y(d);
+      g(d);
     }
-  }, c = (u) => u.done ? T(u.value) : Promise.resolve(u.value).then(b, g);
-  c((i = i.apply(o, s)).next());
+  }, u = (r) => r.done ? K(r.value) : Promise.resolve(r.value).then(p, M);
+  u((i = i.apply(c, s)).next());
 });
-import { ref as v, computed as _, watch as E } from "vue";
+import { ref as v, computed as _, watch as A } from "vue";
 import { useRoute as I, useRouter as m } from "vue-router";
-import { ProLayoutMode as k, ProLayoutMenuType as R } from "./enum.js";
-const te = (o) => {
-  const s = I(), i = m(), T = v([]), y = v([]), b = v([]), g = v([]), c = v(), u = v([]), d = v({}), N = v([]), f = v([]), K = v([]), P = v([]), p = v([]), M = _(() => {
-    const e = [...o.menuItems], a = (t) => {
+import { ProLayoutMode as E, ProLayoutMenuType as R } from "./enum.js";
+const te = (c) => {
+  const s = I(), i = m(), K = v([]), g = v([]), p = v([]), M = v([]), u = v(), r = v([]), d = v({}), k = v([]), f = v([]), P = v([]), T = v([]), y = v([]), b = _(() => {
+    const e = [...c.menuItems], a = (t) => {
       t.forEach((l) => {
         if (l != null && l.children && l.children.length > 0) {
           if ((l == null ? void 0 : l.topChildrenMenu) !== void 0)
-            l.children = l.children.map((n) => A(w({}, n), { topMenu: l == null ? void 0 : l.topChildrenMenu }));
+            l.children = l.children.map((n) => O(w({}, n), { topMenu: l == null ? void 0 : l.topChildrenMenu }));
           else {
-            const n = l.children.find((r) => r.topMenu !== void 0);
-            n && (l.topChildrenMenu = n.topMenu, l.children = l.children.map((r) => A(w({}, r), { topMenu: n.topMenu })));
+            const n = l.children.find((o) => o.topMenu !== void 0);
+            n && (l.topChildrenMenu = n.topMenu, l.children = l.children.map((o) => O(w({}, o), { topMenu: n.topMenu })));
           }
           a(l.children);
         }
       });
     };
-    return o.layout === k.mix && a(e), e;
+    return c.layout === E.mix && a(e), e;
   }), W = (e) => {
     var a;
-    if (T.value = [e.name], !(e != null && e.children) || ((a = e == null ? void 0 : e.children) == null ? void 0 : a.length) === 0)
-      p.value = [], i == null || i.push({ path: e.path });
-    else if (p.value = e.children, e != null && e.redirect)
+    if (K.value = [e.name], !(e != null && e.children) || ((a = e == null ? void 0 : e.children) == null ? void 0 : a.length) === 0)
+      y.value = [], i == null || i.push({ path: e.path });
+    else if (y.value = e.children, e != null && e.redirect)
       if (typeof e.redirect == "string")
         i == null || i.push({ path: e.redirect });
       else if (typeof e.redirect == "function") {
@@ -58,9 +58,9 @@ const te = (o) => {
       } else
         i == null || i.push(e.redirect);
   }, B = (e) => {
-    e != null && e.name ? i == null || i.push({ name: e.name }) : i == null || i.push({ path: e.path }), y.value = [e.name];
+    e != null && e.name ? i == null || i.push({ name: e.name }) : i == null || i.push({ path: e.path }), g.value = [e.name];
   }, D = (e, a) => L(null, null, function* () {
-    if (a != null && a.path && !(o != null && o.onMenuItemClick && !(yield o.onMenuItemClick(a)))) {
+    if (a != null && a.path && !(c != null && c.onMenuItemClick && !(yield c.onMenuItemClick(a)))) {
       if (a.path.startsWith("http") || a.path.startsWith("https")) {
         window.open(a.path);
         return;
@@ -68,38 +68,38 @@ const te = (o) => {
       e === R.top ? W(a) : B(a);
     }
   }), H = (e, a) => {
-    e === R.top ? b.value = a : g.value = a;
+    e === R.top ? p.value = a : M.value = a;
   }, j = () => {
     const e = [], a = (t) => {
       var l;
       for (const n in t) {
-        const r = t[n];
-        if (r.name === ((l = c == null ? void 0 : c.value) == null ? void 0 : l.name) || r.children && r.children.length > 0 && a(r.children))
-          return e.unshift(r), !0;
+        const o = t[n];
+        if (o.name === ((l = u == null ? void 0 : u.value) == null ? void 0 : l.name) || o.children && o.children.length > 0 && a(o.children))
+          return e.unshift(o), !0;
       }
       return !1;
     };
-    a(JSON.parse(JSON.stringify(M.value))), u.value = e;
+    a(JSON.parse(JSON.stringify(b.value))), r.value = e;
   }, q = () => {
     var a, t, l;
-    const e = (a = u.value) == null ? void 0 : a.map((n) => ({ path: n == null ? void 0 : n.path, label: n == null ? void 0 : n.title }));
-    N.value = (t = c.value) != null && t.breadcrumbs ? (l = c.value) == null ? void 0 : l.breadcrumbs : e.length !== 0 ? e : [];
+    const e = (a = r.value) == null ? void 0 : a.map((n) => ({ path: n == null ? void 0 : n.path, label: n == null ? void 0 : n.title }));
+    k.value = (t = u.value) != null && t.breadcrumbs ? (l = u.value) == null ? void 0 : l.breadcrumbs : e.length !== 0 ? e : [];
   };
   function z() {
-    if (!c.value || c.value.noAffix) {
+    if (!u.value || u.value.noAffix) {
       f.value.forEach((n) => {
         n.active = !1;
       });
       return;
     }
-    const { name: e, title: a } = c.value;
+    const { name: e, title: a } = u.value;
     let t = -1;
-    f.value.forEach((n, r) => {
-      n.active = !1, n.name === e && (t = r);
+    f.value.forEach((n, o) => {
+      n.active = !1, n.name === e && (t = o);
     });
     const l = {
       name: e,
-      parentNames: u.value.map((n) => n.name),
+      parentNames: r.value.map((n) => n.name),
       title: a != null ? a : e,
       fullPath: s.fullPath,
       active: !0
@@ -117,8 +117,8 @@ const te = (o) => {
     i.push(t.fullPath);
   }, G = (e) => {
     let a = -1, t = -1;
-    if (f.value.forEach((n, r) => {
-      n.name === e && (t = r), n.active && (a = r);
+    if (f.value.forEach((n, o) => {
+      n.name === e && (t = o), n.active && (a = o);
     }), a === t) {
       let n;
       t === 0 ? n = f.value[t + 1] : n = f.value[t - 1], n.active = !0, i.push(n.fullPath);
@@ -127,14 +127,14 @@ const te = (o) => {
     U(l[0]);
   }, Q = () => {
     var a;
-    if (o != null && o.disableKeepAlive || (a = s == null ? void 0 : s.meta) != null && a.ignoreCache)
+    if (c != null && c.disableKeepAlive || (a = s == null ? void 0 : s.meta) != null && a.ignoreCache)
       return;
-    const e = new Set(K.value);
-    u.value.forEach((t) => {
+    const e = new Set(P.value);
+    r.value.forEach((t) => {
       t.name && e.add(t.name);
-    }), K.value = Array.from(e.values());
+    }), P.value = Array.from(e.values());
   }, U = (e) => {
-    const a = new Set(K.value);
+    const a = new Set(P.value);
     e.parentNames.forEach((t) => {
       a.delete(t);
     }), f.value.forEach((t) => {
@@ -142,48 +142,48 @@ const te = (o) => {
         const n = d.value[l];
         n && (n != null && n.ignoreCache || a.add(n.name));
       });
-    }), K.value = Array.from(a.values());
+    }), P.value = Array.from(a.values());
   };
-  return E(() => M.value, () => {
+  return A(() => b.value, () => {
     const e = {}, a = (t) => {
       t.forEach((l) => {
         l.children && l.children.length > 0 && a(l.children), delete l.children, e[l.name] = l;
       });
     };
-    a(JSON.parse(JSON.stringify(M.value))), d.value = e;
-  }, { immediate: !0 }), E(() => [o.layout, M.value], () => {
-    var e;
-    if (P.value = [], p.value = [], o.layout === k.side)
-      p.value = M.value;
-    else if (o.layout === k.mix) {
-      const a = (e = M.value) == null ? void 0 : e.filter((t) => t.topMenu);
-      (a == null ? void 0 : a.length) === 0 ? p.value = M.value : P.value = a;
+    a(JSON.parse(JSON.stringify(b.value))), d.value = e;
+  }, { immediate: !0 }), A(() => [c.layout, b.value], () => {
+    var e, a, t;
+    if (T.value = [], y.value = [], p.value = [...((e = c.menuProps) == null ? void 0 : e.defaultOpenKeys) || [], ...p.value], M.value = [...((a = c.menuProps) == null ? void 0 : a.defaultOpenKeys) || [], ...M.value], c.layout === E.side)
+      y.value = b.value;
+    else if (c.layout === E.mix) {
+      const l = (t = b.value) == null ? void 0 : t.filter((n) => n.topMenu);
+      (l == null ? void 0 : l.length) === 0 ? y.value = b.value : T.value = l;
     }
-  }, { immediate: !0 }), E(() => s == null ? void 0 : s.name, () => {
+  }, { immediate: !0 }), A(() => s == null ? void 0 : s.name, () => {
     var t, l, n;
     const e = s == null ? void 0 : s.name;
-    c.value = d.value[e], j();
-    const a = u.value.filter((r) => r.topMenu);
-    if (a.length > 0 && P.value.length > 0 && (p.value = ((t = a[a.length - 1]) == null ? void 0 : t.children) || []), T.value = c != null && c.value ? [...a.map((r) => r.name), ...((l = c.value) == null ? void 0 : l.activatedKeys) || []] : [], y.value = c != null && c.value ? [c.value.name, ...((n = c.value) == null ? void 0 : n.activatedKeys) || []] : [], c.value) {
-      const r = u.value.filter((h, C) => C < u.value.length - 1), S = r.filter((h) => h.topMenu).map((h) => h.name), O = r.filter((h) => !h.topMenu).map((h) => h.name);
-      c.value.activatedKeys && c.value.activatedKeys.length > 0 && c.value.activatedKeys.forEach((h) => {
+    u.value = d.value[e], j();
+    const a = r.value.filter((o) => o.topMenu);
+    if (a.length > 0 && T.value.length > 0 && (y.value = ((t = a[a.length - 1]) == null ? void 0 : t.children) || []), K.value = u != null && u.value ? [...a.map((o) => o.name), ...((l = u.value) == null ? void 0 : l.activatedKeys) || []] : [], g.value = u != null && u.value ? [u.value.name, ...((n = u.value) == null ? void 0 : n.activatedKeys) || []] : [], u.value) {
+      const o = r.value.filter((h, C) => C < r.value.length - 1), S = o.filter((h) => h.topMenu).map((h) => h.name), N = o.filter((h) => !h.topMenu).map((h) => h.name);
+      u.value.activatedKeys && u.value.activatedKeys.length > 0 && u.value.activatedKeys.forEach((h) => {
         const C = d.value[h];
-        C && (C.topMenu ? S.push(h) : O.push(h));
-      }), b.value = Array.from(/* @__PURE__ */ new Set([...b.value, ...S])), g.value = Array.from(/* @__PURE__ */ new Set([...g.value, ...O]));
+        C && (C.topMenu ? S.push(h) : N.push(h));
+      }), p.value = Array.from(/* @__PURE__ */ new Set([...p.value, ...S])), M.value = Array.from(/* @__PURE__ */ new Set([...M.value, ...N]));
     }
-    q(), o.hideTabs || z(), Q();
+    q(), c.hideTabs || z(), Q();
   }, { immediate: !0 }), {
-    topMenuItems: P,
-    siderMenuItems: p,
-    topMenuSelectedKeys: T,
-    siderMenuSelectedKeys: y,
-    topMenuOpenKeys: b,
-    siderMenuOpenKeys: g,
-    activeMenuItem: c,
+    topMenuItems: T,
+    siderMenuItems: y,
+    topMenuSelectedKeys: K,
+    siderMenuSelectedKeys: g,
+    topMenuOpenKeys: p,
+    siderMenuOpenKeys: M,
+    activeMenuItem: u,
     menuItemMap: d,
-    breadcrumbItems: N,
+    breadcrumbItems: k,
     tabs: f,
-    keepAliveInclude: K,
+    keepAliveInclude: P,
     onProMenuItemClick: D,
     onProMenuOpenKeysChange: H,
     onTabClick: F,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@keyblade/pro-components",
   "description": "KeyBlade Pro Components",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "private": false,
   "type": "module",
   "main": "es/index.js",
@@ -26,7 +26,7 @@
     "vue-global-config": "^0.6.3",
     "dayjs": "^1.11.18",
     "es-toolkit": "^1.41.0",
-    "@keyblade/one-travel": "^3.0.4"
+    "@keyblade/one-travel": "^3.0.5"
   },
   "peerDependencies": {
     "vue": "^3.4.27",