@duxweb/dvha-core 1.0.47 → 1.0.48

package/dist/cjs/hooks/menu.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("lodash-es"),q=require("pinia"),t=require("vue"),L=require("vue-router"),S=require("../stores/route.cjs");require("../utils/bus.cjs");const l=require("../utils/tree.cjs");function x(u){const M=S.useRouteStore(),{routes:p}=q.storeToRefs(M),v=(e=!0)=>y.cloneDeep(p.value)?.filter(n=>!!n?.name).filter(n=>!e||n.hidden===void 0||n.hidden===!1),d=t.computed(()=>{const e=v(!1);return l.arrayToTree(e,{idKey:"name",parentKey:"parent",childrenKey:"children",sortKey:"sort"},void 0)}),a=t.computed(()=>{const e=v();return l.arrayToTree(e,{idKey:"name",parentKey:"parent",childrenKey:"children",sortKey:"sort"},void 0)}),o=L.useRoute(),h=t.ref(o.name),r=t.ref(o.name),s=t.ref(o.name),K=t.computed(()=>u?.doubleMenu?a.value:y.cloneDeep(a.value)?.map(n=>(delete n.children,n))),f=t.computed(()=>u?.doubleMenu?[]:a.value?.find(n=>n.name===r.value)?.children||[]),g=t.computed(()=>l.searchTree(d.value,n=>n?.name===o.name));t.watch(()=>u?.doubleMenu,()=>{if(u?.doubleMenu){const e=l.searchTree(a.value,n=>n?.name===r.value);r.value=e?.[0]?.name,s.value=e?.[e.length-1]?.name}else{const e=l.searchTree(a.value,n=>n?.name===s.value);r.value=e?.[e.length-1]?.name,s.value=e?.[e.length-1]?.name}},{immediate:!0});const T=t.computed(()=>u?.doubleMenu?u?.doubleMenu||f.value.length>0:!0);return t.watch([o,d,()=>u?.doubleMenu],()=>{const e=l.searchTree(d.value,c=>c.name===o.name),m=(c=>{let b=-1;for(let i=c.length-1;i>=0;i--)if(c[i].hidden===!1||c[i].hidden===void 0){b=i;break}return b})(e);h.value=e?.[m]?.name,u?.doubleMenu?(r.value=e?.[m]?.name,s.value=e?.[m]?.name):(r.value=e?.[0]?.name,s.value=e?.[m]?.name)},{immediate:!0}),{data:a,originalData:d,getMenu:v,mainMenu:K,subMenu:f,isSubMenu:T,crumbs:g,active:h,appActive:r,subActive:s}}exports.useMenu=x;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("lodash-es"),q=require("pinia"),t=require("vue"),L=require("vue-router"),S=require("../stores/route.cjs");require("../utils/bus.cjs");const c=require("../utils/tree.cjs");function x(u){const p=S.useRouteStore(),{routes:M}=q.storeToRefs(p),v=(e=!0)=>y.cloneDeep(M.value)?.filter(n=>!!n?.name).filter(n=>!e||n.hidden===void 0||n.hidden===!1),d=t.computed(()=>{const e=v(!1);return c.arrayToTree(e,{idKey:"name",parentKey:"parent",childrenKey:"children",sortKey:"sort"},void 0)}),a=t.computed(()=>{const e=v();return c.arrayToTree(e,{idKey:"name",parentKey:"parent",childrenKey:"children",sortKey:"sort"},void 0)}),o=L.useRoute(),h=t.ref(o.name),r=t.ref(o.name),s=t.ref(o.name),K=t.computed(()=>u?.doubleMenu?y.cloneDeep(a.value)?.map(n=>(delete n.children,n)):a.value),f=t.computed(()=>u?.doubleMenu?a.value?.find(n=>n.name===r.value)?.children||[]:[]),g=t.computed(()=>c.searchTree(d.value,n=>n?.name===o.name));t.watch(()=>u?.doubleMenu,()=>{if(u?.doubleMenu){const e=c.searchTree(a.value,n=>n?.name===r.value);r.value=e?.[0]?.name,s.value=e?.[e.length-1]?.name}else{const e=c.searchTree(a.value,n=>n?.name===s.value);r.value=e?.[e.length-1]?.name,s.value=e?.[e.length-1]?.name}},{immediate:!0});const T=t.computed(()=>u?.doubleMenu?f.value.length>0:!0);return t.watch([o,d,()=>u?.doubleMenu],()=>{const e=c.searchTree(d.value,i=>i.name===o.name),m=(i=>{let b=-1;for(let l=i.length-1;l>=0;l--)if(i[l].hidden===!1||i[l].hidden===void 0){b=l;break}return b})(e);h.value=e?.[m]?.name,u?.doubleMenu?(r.value=e?.[0]?.name,s.value=e?.[m]?.name):(r.value=e?.[m]?.name,s.value=e?.[m]?.name)},{immediate:!0}),{data:a,originalData:d,getMenu:v,mainMenu:K,subMenu:f,isSubMenu:T,crumbs:g,active:h,appActive:r,subActive:s}}exports.useMenu=x;

package/dist/esm/hooks/menu.js

@@ -1,12 +1,12 @@
-import { cloneDeep as p } from "lodash-es";
+import { cloneDeep as y } from "lodash-es";
 import { storeToRefs as R } from "pinia";
-import { computed as l, ref as f, watch as y } from "vue";
+import { computed as l, ref as f, watch as M } from "vue";
 import { useRoute as S } from "vue-router";
 import { useRouteStore as A } from "../stores/route.js";
 import "../utils/bus.js";
 import { arrayToTree as K, searchTree as c } from "../utils/tree.js";
 function C(t) {
-  const g = A(), { routes: x } = R(g), v = (e = !0) => p(x.value)?.filter((n) => !!n?.name).filter((n) => !e || n.hidden === void 0 || n.hidden === !1), d = l(() => {
+  const g = A(), { routes: x } = R(g), v = (e = !0) => y(x.value)?.filter((n) => !!n?.name).filter((n) => !e || n.hidden === void 0 || n.hidden === !1), d = l(() => {
     const e = v(!1);
     return K(e, {
       idKey: "name",
@@ -14,7 +14,7 @@ function C(t) {
       childrenKey: "children",
       sortKey: "sort"
     }, void 0);
-  }), a = l(() => {
+  }), u = l(() => {
     const e = v();
     return K(e, {
       idKey: "name",
@@ -22,30 +22,30 @@ function C(t) {
       childrenKey: "children",
       sortKey: "sort"
     }, void 0);
-  }), r = S(), h = f(r.name), u = f(r.name), o = f(r.name), L = l(() => t?.doubleMenu ? a.value : p(a.value)?.map((n) => (delete n.children, n))), b = l(() => t?.doubleMenu ? [] : a.value?.find((n) => n.name === u.value)?.children || []), T = l(() => c(d.value, (n) => n?.name === r.name));
-  y(() => t?.doubleMenu, () => {
+  }), r = S(), h = f(r.name), a = f(r.name), o = f(r.name), L = l(() => t?.doubleMenu ? y(u.value)?.map((n) => (delete n.children, n)) : u.value), b = l(() => t?.doubleMenu ? u.value?.find((n) => n.name === a.value)?.children || [] : []), T = l(() => c(d.value, (n) => n?.name === r.name));
+  M(() => t?.doubleMenu, () => {
     if (t?.doubleMenu) {
-      const e = c(a.value, (n) => n?.name === u.value);
-      u.value = e?.[0]?.name, o.value = e?.[e.length - 1]?.name;
+      const e = c(u.value, (n) => n?.name === a.value);
+      a.value = e?.[0]?.name, o.value = e?.[e.length - 1]?.name;
     } else {
-      const e = c(a.value, (n) => n?.name === o.value);
-      u.value = e?.[e.length - 1]?.name, o.value = e?.[e.length - 1]?.name;
+      const e = c(u.value, (n) => n?.name === o.value);
+      a.value = e?.[e.length - 1]?.name, o.value = e?.[e.length - 1]?.name;
     }
   }, { immediate: !0 });
-  const I = l(() => t?.doubleMenu ? t?.doubleMenu || b.value.length > 0 : !0);
-  return y([r, d, () => t?.doubleMenu], () => {
+  const I = l(() => t?.doubleMenu ? b.value.length > 0 : !0);
+  return M([r, d, () => t?.doubleMenu], () => {
     const e = c(d.value, (i) => i.name === r.name), m = ((i) => {
-      let M = -1;
+      let p = -1;
       for (let s = i.length - 1; s >= 0; s--)
         if (i[s].hidden === !1 || i[s].hidden === void 0) {
-          M = s;
+          p = s;
           break;
         }
-      return M;
+      return p;
     })(e);
-    h.value = e?.[m]?.name, t?.doubleMenu ? (u.value = e?.[m]?.name, o.value = e?.[m]?.name) : (u.value = e?.[0]?.name, o.value = e?.[m]?.name);
+    h.value = e?.[m]?.name, t?.doubleMenu ? (a.value = e?.[0]?.name, o.value = e?.[m]?.name) : (a.value = e?.[m]?.name, o.value = e?.[m]?.name);
   }, { immediate: !0 }), {
-    data: a,
+    data: u,
     originalData: d,
     getMenu: v,
     mainMenu: L,
@@ -53,7 +53,7 @@ function C(t) {
     isSubMenu: I,
     crumbs: T,
     active: h,
-    appActive: u,
+    appActive: a,
     subActive: o
   };
 }

package/dist/types/hooks/menu.d.ts

@@ -8,7 +8,7 @@ export declare function useMenu(props?: UseMenuProps): {
     getMenu: (hidden?: boolean) => IMenu[];
     mainMenu: import("vue").ComputedRef<any>;
     subMenu: import("vue").ComputedRef<any>;
-    isSubMenu: import("vue").ComputedRef<true>;
+    isSubMenu: import("vue").ComputedRef<boolean>;
     crumbs: import("vue").ComputedRef<any>;
     active: import("vue").Ref<import("vue-router").RouteRecordNameGeneric, import("vue-router").RouteRecordNameGeneric>;
     appActive: import("vue").Ref<import("vue-router").RouteRecordNameGeneric, import("vue-router").RouteRecordNameGeneric>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-core",
   "type": "module",
-  "version": "1.0.47",
+  "version": "1.0.48",
   "author": "DuxWeb",
   "license": "MIT",
   "repository": {