@keyblade/pro-components 1.15.0-alpha.2 → 1.15.0-alpha.3

package/es/pro-layout/hooks.js

@@ -2,36 +2,36 @@ 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 = (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(c, i, s[i]);
+var J = (s, c, i) => c in s ? V(s, c, { enumerable: !0, configurable: !0, writable: !0, value: i }) : s[c] = i, w = (s, c) => {
+  for (var i in c || (c = {}))
+    Z.call(c, i) && J(s, i, c[i]);
   if (x)
-    for (var i of x(s))
-      $.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) => {
+    for (var i of x(c))
+      $.call(c, i) && J(s, i, c[i]);
+  return s;
+}, O = (s, c) => X(s, Y(c));
+var L = (s, c, i) => new Promise((K, g) => {
+  var p = (u) => {
     try {
-      u(i.next(r));
+      r(i.next(u));
     } catch (d) {
       g(d);
     }
-  }, M = (r) => {
+  }, M = (u) => {
     try {
-      u(i.throw(r));
+      r(i.throw(u));
     } catch (d) {
       g(d);
     }
-  }, u = (r) => r.done ? K(r.value) : Promise.resolve(r.value).then(p, M);
-  u((i = i.apply(c, s)).next());
+  }, r = (u) => u.done ? K(u.value) : Promise.resolve(u.value).then(p, M);
+  r((i = i.apply(s, c)).next());
 });
 import { ref as v, computed as _, watch as A } from "vue";
 import { useRoute as I, useRouter as m } from "vue-router";
 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) => {
+const te = (s) => {
+  const c = I(), i = m(), K = v([]), g = v([]), p = v([]), M = v([]), r = v(), u = v([]), d = v({}), k = v([]), f = v([]), P = v([]), T = v([]), y = v([]), b = _(() => {
+    const e = [...s.menuItems], a = (t) => {
       t.forEach((l) => {
         if (l != null && l.children && l.children.length > 0) {
           if ((l == null ? void 0 : l.topChildrenMenu) !== void 0)
@@ -44,7 +44,7 @@ const te = (c) => {
         }
       });
     };
-    return c.layout === E.mix && a(e), e;
+    return s.layout === E.mix && a(e), e;
   }), W = (e) => {
     var a;
     if (K.value = [e.name], !(e != null && e.children) || ((a = e == null ? void 0 : e.children) == null ? void 0 : a.length) === 0)
@@ -53,14 +53,14 @@ const te = (c) => {
       if (typeof e.redirect == "string")
         i == null || i.push({ path: e.redirect });
       else if (typeof e.redirect == "function") {
-        const t = e.redirect(s);
+        const t = e.redirect(c);
         i == null || i.push(t);
       } 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 }), g.value = [e.name];
   }, D = (e, a) => L(null, null, function* () {
-    if (a != null && a.path && !(c != null && c.onMenuItemClick && !(yield c.onMenuItemClick(a)))) {
+    if (a != null && a.path && !(s != null && s.onMenuItemClick && !(yield s.onMenuItemClick(a)))) {
       if (a.path.startsWith("http") || a.path.startsWith("https")) {
         window.open(a.path);
         return;
@@ -74,63 +74,57 @@ const te = (c) => {
       var l;
       for (const n in t) {
         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))
+        if (o.name === ((l = r == null ? void 0 : r.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(b.value))), r.value = e;
+    a(JSON.parse(JSON.stringify(b.value))), u.value = e;
   }, q = () => {
     var a, t, l;
-    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 : [];
+    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 }));
+    k.value = (t = r.value) != null && t.breadcrumbs ? (l = r.value) == null ? void 0 : l.breadcrumbs : e.length !== 0 ? e : [];
   };
   function z() {
-    if (!u.value || u.value.noAffix) {
+    if (!r.value || r.value.noAffix) {
       f.value.forEach((n) => {
         n.active = !1;
       });
       return;
     }
-    const { name: e, title: a } = u.value;
-    let t = -1;
-    f.value.forEach((n, o) => {
-      n.active = !1, n.name === e && (t = o);
+    const { name: e, title: a } = r.value;
+    f.value.forEach((n) => {
+      n.active = !1;
     });
-    const l = {
+    const t = {
       name: e,
-      parentNames: r.value.map((n) => n.name),
+      parentNames: u.value.map((n) => n.name),
       title: a != null ? a : e,
-      fullPath: s.fullPath,
+      fullPath: c.fullPath,
       active: !0
-    };
-    if (~t) {
-      const n = f.value[t];
-      n.fullPath === s.fullPath ? (n.active = !0, n.fullPath = s.fullPath) : (f.value.splice(t, 1), setTimeout(() => {
-        f.value.push(l);
-      }));
-    } else
-      f.value.push(l);
+    }, l = f.value.findIndex((n) => n.fullPath === c.fullPath);
+    ~l ? f.value[l].active = !0 : f.value.push(t);
   }
   const F = (e) => {
-    const a = f.value.findIndex((l) => l.name === e), t = f.value[a];
-    i.push(t.fullPath);
+    const a = f.value.find((t) => t.fullPath === e);
+    a && i.push(a.fullPath);
   }, G = (e) => {
     let a = -1, t = -1;
     if (f.value.forEach((n, o) => {
-      n.name === e && (t = o), n.active && (a = o);
-    }), a === t) {
+      n.fullPath === e && (t = o), n.active && (a = o);
+    }), t === -1) return;
+    if (a === t) {
       let n;
-      t === 0 ? n = f.value[t + 1] : n = f.value[t - 1], n.active = !0, i.push(n.fullPath);
+      t === 0 ? n = f.value[t + 1] : n = f.value[t - 1], n && (n.active = !0, i.push(n.fullPath));
     }
     const l = f.value.splice(t, 1);
     U(l[0]);
   }, Q = () => {
     var a;
-    if (c != null && c.disableKeepAlive || (a = s == null ? void 0 : s.meta) != null && a.ignoreCache)
+    if (s != null && s.disableKeepAlive || (a = c == null ? void 0 : c.meta) != null && a.ignoreCache)
       return;
     const e = new Set(P.value);
-    r.value.forEach((t) => {
+    u.value.forEach((t) => {
       t.name && e.add(t.name);
     }), P.value = Array.from(e.values());
   }, U = (e) => {
@@ -151,27 +145,27 @@ const te = (c) => {
       });
     };
     a(JSON.parse(JSON.stringify(b.value))), d.value = e;
-  }, { immediate: !0 }), A(() => [c.layout, b.value], () => {
+  }, { immediate: !0 }), A(() => [s.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)
+    if (T.value = [], y.value = [], p.value = [...((e = s.menuProps) == null ? void 0 : e.defaultOpenKeys) || [], ...p.value], M.value = [...((a = s.menuProps) == null ? void 0 : a.defaultOpenKeys) || [], ...M.value], s.layout === E.side)
       y.value = b.value;
-    else if (c.layout === E.mix) {
+    else if (s.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 }), A(() => s == null ? void 0 : s.name, () => {
+  }, { immediate: !0 }), A(() => c == null ? void 0 : c.name, () => {
     var t, l, n;
-    const e = s == null ? void 0 : s.name;
-    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 e = c == null ? void 0 : c.name;
+    r.value = d.value[e], j();
+    const a = u.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 = r != null && r.value ? [...a.map((o) => o.name), ...((l = r.value) == null ? void 0 : l.activatedKeys) || []] : [], g.value = r != null && r.value ? [r.value.name, ...((n = r.value) == null ? void 0 : n.activatedKeys) || []] : [], r.value) {
+      const o = u.value.filter((h, C) => C < u.value.length - 1), S = o.filter((h) => h.topMenu).map((h) => h.name), N = o.filter((h) => !h.topMenu).map((h) => h.name);
+      r.value.activatedKeys && r.value.activatedKeys.length > 0 && r.value.activatedKeys.forEach((h) => {
         const C = d.value[h];
         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(), c.hideTabs || z(), Q();
+    q(), s.hideTabs || z(), Q();
   }, { immediate: !0 }), {
     topMenuItems: T,
     siderMenuItems: y,
@@ -179,7 +173,7 @@ const te = (c) => {
     siderMenuSelectedKeys: g,
     topMenuOpenKeys: p,
     siderMenuOpenKeys: M,
-    activeMenuItem: u,
+    activeMenuItem: r,
     menuItemMap: d,
     breadcrumbItems: k,
     tabs: f,

package/es/pro-reuse-tabs/pro-reuse-tabs.vue.js

@@ -1,6 +1,6 @@
-import { defineComponent as m, computed as y, createElementBlock as d, openBlock as n, normalizeClass as f, createVNode as p, unref as l, withCtx as k, Fragment as g, renderList as h, createBlock as v } from "vue";
+import { defineComponent as f, computed as y, createElementBlock as n, openBlock as i, normalizeClass as m, createVNode as p, unref as d, withCtx as k, Fragment as g, renderList as h, createBlock as v } from "vue";
 import { Tabs as S, TabPane as T } from "@arco-design/web-vue";
-const z = "keyblade-pro-reuse-tabs", x = /* @__PURE__ */ m({
+const z = "keyblade-pro-reuse-tabs", q = /* @__PURE__ */ f({
   __name: "pro-reuse-tabs",
   props: {
     tabs: {
@@ -30,31 +30,31 @@ const z = "keyblade-pro-reuse-tabs", x = /* @__PURE__ */ m({
     "tab-delete": (e) => !0
   },
   setup(e, { emit: s }) {
-    const o = e, i = s, c = y(() => {
+    const o = e, l = s, u = y(() => {
       var t, r;
-      return (r = (t = o.tabs.find((a) => a.active)) == null ? void 0 : t.name) != null ? r : void 0;
-    }), u = (t) => {
-      i("tab-click", String(t));
+      return (r = (t = o.tabs.find((a) => a.active)) == null ? void 0 : t.fullPath) != null ? r : void 0;
+    }), c = (t) => {
+      l("tab-click", String(t));
     }, b = (t) => {
-      i("tab-delete", String(t));
+      l("tab-delete", String(t));
     };
-    return (t, r) => (n(), d("div", {
-      class: f(z)
+    return (t, r) => (i(), n("div", {
+      class: m(z)
     }, [
-      p(l(S), {
-        "active-key": c.value,
+      p(d(S), {
+        "active-key": u.value,
         size: e.tabsSize,
         type: e.tabsType,
         "header-padding": e.tabsHeaderPadding,
         editable: e.tabs.length > 1,
         "hide-content": "",
         "destroy-on-hide": "",
-        onTabClick: u,
+        onTabClick: c,
         onDelete: b
       }, {
         default: k(() => [
-          (n(!0), d(g, null, h(e.tabs, (a) => (n(), v(l(T), {
-            key: a.name,
+          (i(!0), n(g, null, h(e.tabs, (a) => (i(), v(d(T), {
+            key: a.fullPath,
             title: a.title
           }, null, 8, ["title"]))), 128))
         ]),
@@ -64,5 +64,5 @@ const z = "keyblade-pro-reuse-tabs", x = /* @__PURE__ */ m({
   }
 });
 export {
-  x as default
+  q as default
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@keyblade/pro-components",
   "description": "KeyBlade Pro Components",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.15.0-alpha.02",
+  "version": "1.15.0-alpha.03",
   "private": false,
   "type": "module",
   "main": "es/index.js",