@ditari/bsui 1.0.38 → 1.0.40

package/dist/cjs/components/menu/Menu.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),v=require("vue-router"),h=require("pinia"),b=require("../../store/modules/Menu.cjs.js"),K=require("../../store/modules/Settings.cjs.js");function U(o){return typeof o=="function"||Object.prototype.toString.call(o)==="[object Object]"&&!t.isVNode(o)}const j=t.defineComponent({name:"DMenu",setup(){const o=v.useRouter(),f=v.useRoute(),{componentName:s,prop:q}=t.inject("menuIcon"),g=b.useMenuStore(),{list:a,openMenusKeys:l,selectedMenuKeys:u}=h.storeToRefs(g),N=K.useSettingsStore(),{getCollapsed:S}=h.storeToRefs(N);t.watchEffect(()=>{const e=u.value.length>0?u.value[0]:"",n=i(a.value,e);l.value=n||[]});function i(e,n){for(let r=0;r<e.length;r++){if(e[r].url===n||n.startsWith(e[r].url))return[e[r].url];if(e[r].children&&e[r].children.length>0){const c=i(e[r].children,n);if(c)return[e[r].url,...c]}}return null}const m=({item:e,key:n,keyPath:r})=>{l.value=r,u.value=[n],f.path!==n&&o.push(n).then(c=>c?console.warn(c):null)},V=e=>t.createVNode(t.Fragment,null,[t.createVNode(t.resolveComponent("a-menu-item"),{key:e.url},{icon:()=>d(e),default:()=>e.title})]),M=["anticon","anticon-menu","ant-menu-item-icon"],d=e=>t.createVNode(t.Fragment,null,[e.icon?y(e.icon):t.withDirectives(t.createVNode("div",{className:M},[e.title.substring(0,1)]),[[t.vShow,S.value]])]),y=e=>s==="nativeHtml"?t.createVNode("span",{innerHTML:e},null):t.h(t.resolveComponent(s),{prop:e}),p=e=>t.createVNode(t.Fragment,null,[t.createVNode(t.resolveComponent("a-sub-menu"),{key:e.url},{title:()=>e.title,icon:()=>d(e),default:()=>e.children.map(n=>!n.children||n.children.length===0?C(n):p(n))})]),C=e=>t.createVNode(t.Fragment,null,[t.createVNode(t.resolveComponent("a-menu-item"),{key:e.url},{default:()=>e.title})]);return()=>{let e;return t.createVNode(t.Fragment,null,[l.value,t.createVNode(t.resolveComponent("a-menu"),{mode:"inline",theme:"dark",openKeys:l.value,"onUpdate:openKeys":n=>l.value=n,selectedKeys:u.value,"onUpdate:selectedKeys":n=>u.value=n,onClick:m},U(e=a.value.map(n=>{var r;return!n.children||((r=n.children)==null?void 0:r.length)===0?V(n):p(n)}))?e:{default:()=>[e]})])}}});exports.default=j;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),v=require("vue-router"),h=require("pinia"),b=require("../../store/modules/Menu.cjs.js"),K=require("../../store/modules/Settings.cjs.js");function U(o){return typeof o=="function"||Object.prototype.toString.call(o)==="[object Object]"&&!t.isVNode(o)}const j=t.defineComponent({name:"DMenu",setup(){const o=v.useRouter(),f=v.useRoute(),{componentName:s,prop:q}=t.inject("menuIcon"),g=b.useMenuStore(),{list:a,openMenusKeys:u,selectedMenuKeys:l}=h.storeToRefs(g),N=K.useSettingsStore(),{getCollapsed:S}=h.storeToRefs(N);t.watchEffect(()=>{const e=l.value.length>0?l.value[0]:"",n=i(a.value,e);u.value=n||[]});function i(e,n){for(let r=0;r<e.length;r++){if(e[r].url===n||n.startsWith(e[r].url))return[e[r].url];if(e[r].children&&e[r].children.length>0){const c=i(e[r].children,n);if(c)return[e[r].url,...c]}}return null}const m=({item:e,key:n,keyPath:r})=>{u.value=r,l.value=[n],f.path!==n&&o.push(n).then(c=>c?console.warn(c):null)},V=e=>t.createVNode(t.Fragment,null,[t.createVNode(t.resolveComponent("a-menu-item"),{key:e.url},{icon:()=>d(e),default:()=>e.title})]),M=["anticon","anticon-menu","ant-menu-item-icon"],d=e=>t.createVNode(t.Fragment,null,[e.icon?y(e.icon):t.withDirectives(t.createVNode("div",{className:M},[e.title.substring(0,1)]),[[t.vShow,S.value]])]),y=e=>s==="nativeHtml"?t.createVNode("span",{innerHTML:e},null):t.h(t.resolveComponent(s),{prop:e}),p=e=>t.createVNode(t.Fragment,null,[t.createVNode(t.resolveComponent("a-sub-menu"),{key:e.url},{title:()=>e.title,icon:()=>d(e),default:()=>e.children.map(n=>!n.children||n.children.length===0?C(n):p(n))})]),C=e=>t.createVNode(t.Fragment,null,[t.createVNode(t.resolveComponent("a-menu-item"),{key:e.url},{default:()=>e.title})]);return()=>{let e;return t.createVNode(t.Fragment,null,[t.createVNode(t.resolveComponent("a-menu"),{mode:"inline",theme:"dark",openKeys:u.value,"onUpdate:openKeys":n=>u.value=n,selectedKeys:l.value,"onUpdate:selectedKeys":n=>l.value=n,onClick:m},U(e=a.value.map(n=>{var r;return!n.children||((r=n.children)==null?void 0:r.length)===0?V(n):p(n)}))?e:{default:()=>[e]})])}}});exports.default=j;

package/dist/cjs/hooks/route/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue"),m=require("vue-router"),p=require("../../store/modules/Breadcrumb.cjs.js"),b=r=>{const{saveBreadcrumb:s}=p.useBreadcrumbStore(),e=l.ref(null),t=l.ref([]);return e.value=m.createRouterMatcher(r,{}),{flatRoutes:i(r,null),setMatched:(d,f)=>{var u;try{const c=((u=e.value)==null?void 0:u.resolve(d,f).matched)??[];t.value=c.reduce((a,n)=>{var h;return a.some(v=>v.path===n.path)||a.push({path:n.path,title:((h=n.meta)==null?void 0:h.title)??"未设置标题"}),a},[])}catch(c){console.log(c),t.value=[]}s(t.value)}}};function i(r,s){return r.reduce((e,t)=>{if(t.children&&e.push(...i(t.children,t)),t.component){const o=`${s==null?void 0:s.path}`+(t.path?"/"+t.path:"");e.push({...t,path:o})}return e},[])}exports.useDitariRoute=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("vue"),v=require("vue-router"),m=require("../../store/modules/Breadcrumb.cjs.js"),g=()=>{const{saveBreadcrumb:a}=m.useBreadcrumbStore(),e=d.ref(null);return{getRoutes:async c=>{const r=[];for await(const o of Object.values(c)){const u=await o();r.push(...u.default)}return e.value=v.createRouterMatcher(r,{}),f(r)},setMatched:(c,r)=>{var u;const o=d.ref([]);try{const n=((u=e.value)==null?void 0:u.resolve(c,r).matched)??[];o.value=n.reduce((h,i)=>{var l;return h.some(p=>p.path===i.path)||h.push({path:i.path,title:((l=i.meta)==null?void 0:l.title)??"未设置标题"}),h},[])}catch(n){console.log(n),o.value=[]}a(o.value)}}};function f(a,e=""){const s=[];for(const t of a)t.path===""?t.path=e:t.path.startsWith("/")||(t.path=`${e}/${t.path}`),t.children&&(s.push(...f(t.children,t.path)),delete t.children),s.push(t);return s}exports.useDitariRoute=g;

package/dist/cjs/hooks/route/index.d.ts

@@ -1,9 +1,8 @@
-import { RouteLocationNormalized, RouteRecordRaw } from "vue-router";
+import { RouteLocationNormalized } from "vue-router";
 /**
- * 路由管理
- * @param routes 未打平的路由
+ * 路由处理
  */
-export declare const useDitariRoute: (routes: RouteRecordRaw[]) => {
-    flatRoutes: any[];
+export declare const useDitariRoute: () => {
+    getRoutes: (routeFiles: Record<string, () => Promise<unknown>>) => Promise<any>;
     setMatched: (to: RouteLocationNormalized, from: RouteLocationNormalized) => void;
 };

package/dist/esm/components/menu/Menu.esm.js

@@ -1,4 +1,4 @@
-import { defineComponent as w, inject as j, watchEffect as k, createVNode as r, Fragment as i, resolveComponent as s, isVNode as N, withDirectives as I, vShow as R, h as D } from "vue";
+import { defineComponent as w, inject as j, watchEffect as k, createVNode as r, Fragment as c, resolveComponent as i, isVNode as N, withDirectives as I, vShow as R, h as D } from "vue";
 import { useRouter as H, useRoute as O } from "vue-router";
 import { storeToRefs as v } from "pinia";
 import { useMenuStore as T } from "../../store/modules/Menu.esm.js";
@@ -14,23 +14,23 @@ const q = /* @__PURE__ */ w({
       prop: x
     } = j("menuIcon"), g = T(), {
       list: d,
-      openMenusKeys: o,
-      selectedMenuKeys: u
+      openMenusKeys: s,
+      selectedMenuKeys: o
     } = v(g), S = V(), {
       getCollapsed: y
     } = v(S);
     k(() => {
-      const e = u.value.length > 0 ? u.value[0] : "", t = p(d.value, e);
-      o.value = t || [];
+      const e = o.value.length > 0 ? o.value[0] : "", t = p(d.value, e);
+      s.value = t || [];
     });
     function p(e, t) {
       for (let n = 0; n < e.length; n++) {
         if (e[n].url === t || t.startsWith(e[n].url))
           return [e[n].url];
         if (e[n].children && e[n].children.length > 0) {
-          const c = p(e[n].children, t);
-          if (c)
-            return [e[n].url, ...c];
+          const u = p(e[n].children, t);
+          if (u)
+            return [e[n].url, ...u];
         }
       }
       return null;
@@ -40,19 +40,19 @@ const q = /* @__PURE__ */ w({
       key: t,
       keyPath: n
     }) => {
-      o.value = n, u.value = [t], m.path !== t && l.push(t).then((c) => c ? console.warn(c) : null);
-    }, b = (e) => r(i, null, [r(s("a-menu-item"), {
+      s.value = n, o.value = [t], m.path !== t && l.push(t).then((u) => u ? console.warn(u) : null);
+    }, b = (e) => r(c, null, [r(i("a-menu-item"), {
       key: e.url
     }, {
       icon: () => f(e),
       default: () => e.title
-    })]), C = ["anticon", "anticon-menu", "ant-menu-item-icon"], f = (e) => r(i, null, [e.icon ? K(e.icon) : I(r("div", {
+    })]), C = ["anticon", "anticon-menu", "ant-menu-item-icon"], f = (e) => r(c, null, [e.icon ? K(e.icon) : I(r("div", {
       className: C
     }, [e.title.substring(0, 1)]), [[R, y.value]])]), K = (e) => a === "nativeHtml" ? r("span", {
       innerHTML: e
-    }, null) : D(s(a), {
+    }, null) : D(i(a), {
       prop: e
-    }), h = (e) => r(i, null, [r(s("a-sub-menu"), {
+    }), h = (e) => r(c, null, [r(i("a-sub-menu"), {
       key: e.url
     }, {
       title: () => e.title,
@@ -61,20 +61,20 @@ const q = /* @__PURE__ */ w({
         (t) => !t.children || t.children.length === 0 ? U(t) : h(t)
         // 递归调用
       )
-    })]), U = (e) => r(i, null, [r(s("a-menu-item"), {
+    })]), U = (e) => r(c, null, [r(i("a-menu-item"), {
       key: e.url
     }, {
       default: () => e.title
     })]);
     return () => {
       let e;
-      return r(i, null, [o.value, r(s("a-menu"), {
+      return r(c, null, [r(i("a-menu"), {
         mode: "inline",
         theme: "dark",
-        openKeys: o.value,
-        "onUpdate:openKeys": (t) => o.value = t,
-        selectedKeys: u.value,
-        "onUpdate:selectedKeys": (t) => u.value = t,
+        openKeys: s.value,
+        "onUpdate:openKeys": (t) => s.value = t,
+        selectedKeys: o.value,
+        "onUpdate:selectedKeys": (t) => o.value = t,
         onClick: M
       }, _(e = d.value.map((t) => {
         var n;

package/dist/esm/hooks/route/index.d.ts

@@ -1,9 +1,8 @@
-import { RouteLocationNormalized, RouteRecordRaw } from "vue-router";
+import { RouteLocationNormalized } from "vue-router";
 /**
- * 路由管理
- * @param routes 未打平的路由
+ * 路由处理
  */
-export declare const useDitariRoute: (routes: RouteRecordRaw[]) => {
-    flatRoutes: any[];
+export declare const useDitariRoute: () => {
+    getRoutes: (routeFiles: Record<string, () => Promise<unknown>>) => Promise<any>;
     setMatched: (to: RouteLocationNormalized, from: RouteLocationNormalized) => void;
 };

package/dist/esm/hooks/route/index.esm.js

@@ -1,42 +1,44 @@
 import { ref as f } from "vue";
-import { createRouterMatcher as u } from "vue-router";
+import { createRouterMatcher as m } from "vue-router";
 import { useBreadcrumbStore as v } from "../../store/modules/Breadcrumb.esm.js";
-const y = (a) => {
-  const { saveBreadcrumb: s } = v(), e = f(null), t = f([]);
-  return e.value = u(a, {}), {
-    flatRoutes: i(a, null),
-    setMatched: (m, d) => {
-      var n;
+const w = () => {
+  const { saveBreadcrumb: c } = v(), e = f(null);
+  return {
+    getRoutes: async (u) => {
+      const o = [];
+      for await (const r of Object.values(u)) {
+        const a = await r();
+        o.push(...a.default);
+      }
+      return e.value = m(o, {}), p(o);
+    },
+    setMatched: (u, o) => {
+      var a;
+      const r = f([]);
       try {
-        const c = ((n = e.value) == null ? void 0 : n.resolve(m, d).matched) ?? [];
-        t.value = c.reduce((h, o) => {
-          var l;
+        const n = ((a = e.value) == null ? void 0 : a.resolve(u, o).matched) ?? [];
+        r.value = n.reduce((h, l) => {
+          var i;
           return h.some(
-            (p) => p.path === o.path
+            (d) => d.path === l.path
           ) || h.push({
-            path: o.path,
-            title: ((l = o.meta) == null ? void 0 : l.title) ?? "未设置标题"
+            path: l.path,
+            title: ((i = l.meta) == null ? void 0 : i.title) ?? "未设置标题"
           }), h;
         }, []);
-      } catch (c) {
-        console.log(c), t.value = [];
+      } catch (n) {
+        console.log(n), r.value = [];
       }
-      s(t.value);
+      c(r.value);
     }
   };
 };
-function i(a, s) {
-  return a.reduce((e, t) => {
-    if (t.children && e.push(...i(t.children, t)), t.component) {
-      const r = `${s == null ? void 0 : s.path}` + (t.path ? "/" + t.path : "");
-      e.push({
-        ...t,
-        path: r
-      });
-    }
-    return e;
-  }, []);
+function p(c, e = "") {
+  const s = [];
+  for (const t of c)
+    t.path === "" ? t.path = e : t.path.startsWith("/") || (t.path = `${e}/${t.path}`), t.children && (s.push(...p(t.children, t.path)), delete t.children), s.push(t);
+  return s;
 }
 export {
-  y as useDitariRoute
+  w as useDitariRoute
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "files": [
     "dist/**",
     "src"

package/src/components/menu/Menu.jsx

@@ -154,7 +154,6 @@ export default defineComponent({
 
     return () => (
       <>
-        {openMenusKeys.value}
         <a-menu
           mode="inline"
           theme="dark"

package/src/hooks/route/index.ts

@@ -10,29 +10,19 @@ import {
 import { useBreadcrumbStore } from "../../store/modules/Breadcrumb";
 
 /**
- * 路由管理
- * @param routes 未打平的路由
+ * 路由处理
  */
-export const useDitariRoute = (routes: RouteRecordRaw[]) => {
+export const useDitariRoute = () => {
   const { saveBreadcrumb } = useBreadcrumbStore();
   // 路由匹配器
   const routerMatcher = ref<RouterMatcher | null>(null);
-  // 匹配到的路由数据
-  const matched = ref<RouteLocationMatched[]>([]);
-  //创建匹配器
-  routerMatcher.value = createRouterMatcher(routes, {});
-  // 保存打平后的路由
-  const flatRoutes = flattenRoutes(routes, null);
 
-  /**
-   * 进行匹配
-   * @param to
-   * @param from
-   */
   const setMatched = (
     to: RouteLocationNormalized,
     from: RouteLocationNormalized
   ) => {
+    // 匹配到的路由数据
+    const matched = ref<RouteLocationMatched[]>([]);
     try {
       const rs = routerMatcher.value?.resolve(to, from).matched ?? [];
       matched.value = rs.reduce((preValue: any[], curValue) => {
@@ -51,34 +41,121 @@ export const useDitariRoute = (routes: RouteRecordRaw[]) => {
       console.log(e);
       matched.value = [];
     }
-    // 匹配到的数据保存到route store
+    // 匹配到的数据保存到面包屑store
     saveBreadcrumb(matched.value);
   };
 
+  /**
+   * 获取路由信息
+   * @param routeFiles 路由文件
+   */
+  const getRoutes = async (
+    routeFiles: Record<string, () => Promise<unknown>>
+  ) => {
+    const routes: any[] = [];
+    // 遍历路由文件并将路由合并到 routes 数组中
+    for await (const routeFile of Object.values(routeFiles)) {
+      const routeModule: any = await routeFile();
+      routes.push(...routeModule.default);
+    }
+    // 创建路由匹配器
+    routerMatcher.value = createRouterMatcher(routes, {});
+    // 数组打平返回
+    return flattenRoutes(routes);
+  };
+
   return {
-    flatRoutes,
+    getRoutes,
     setMatched
   };
 };
 
-function flattenRoutes(
-  routes: RouteRecordRaw[],
-  parentRoute: RouteRecordRaw | null
-) {
-  return routes.reduce((acc: any[], route) => {
-    if (route.children) {
-      acc.push(...flattenRoutes(route.children, route));
+// export const useDitariRoute = (routes: RouteRecordRaw[]) => {
+//   const { saveBreadcrumb } = useBreadcrumbStore();
+//   // 路由匹配器
+//   const routerMatcher = ref<RouterMatcher | null>(null);
+//   // 匹配到的路由数据
+//   const matched = ref<RouteLocationMatched[]>([]);
+//   //创建匹配器
+//   routerMatcher.value = createRouterMatcher(routes, {});
+//   // 保存打平后的路由
+//   const flatRoutes = flattenRoutes(routes, null);
+//
+//   /**
+//    * 进行匹配
+//    * @param to
+//    * @param from
+//    */
+//   const setMatched = (
+//     to: RouteLocationNormalized,
+//     from: RouteLocationNormalized
+//   ) => {
+//     try {
+//       const rs = routerMatcher.value?.resolve(to, from).matched ?? [];
+//       matched.value = rs.reduce((preValue: any[], curValue) => {
+//         const flag = preValue.some(
+//           (item: RouteRecord) => item.path === curValue.path
+//         );
+//         if (!flag) {
+//           preValue.push({
+//             path: curValue.path,
+//             title: curValue.meta?.title ?? "未设置标题"
+//           });
+//         }
+//         return preValue;
+//       }, []);
+//     } catch (e) {
+//       console.log(e);
+//       matched.value = [];
+//     }
+//     // 匹配到的数据保存到route store
+//     saveBreadcrumb(matched.value);
+//   };
+//
+//   return {
+//     flatRoutes,
+//     setMatched
+//   };
+// };
+
+// function flattenRoutes(
+//   routes: RouteRecordRaw[],
+//   parentRoute: RouteRecordRaw | null
+// ) {
+//   return routes.reduce((acc: any[], route) => {
+//     if (route.children) {
+//       acc.push(...flattenRoutes(route.children, route));
+//     }
+//     // 只有有组件的route才加入数组
+//     if (route.component) {
+//       // 路径 如果当前路径为空，则说明是父组件重定向的地址 则追加为""空字符串
+//       const path =
+//         `${parentRoute?.path}` + (route.path ? "/" + route.path : "");
+//       acc.push({
+//         ...route,
+//         path: path
+//       });
+//     }
+//     return acc;
+//   }, []);
+// }
+
+function flattenRoutes(routes: any[], parentPath = ""): any {
+  const result = [];
+  for (const route of routes) {
+    if (route.path === "") {
+      // 如果path为空，则使用父级的path
+      route.path = parentPath;
+    } else if (!route.path.startsWith("/")) {
+      // 如果path不为空，但是不以/开头，则需要拼接父级的path
+      route.path = `${parentPath}/${route.path}`;
     }
-    // 只有有组件的route才加入数组
-    if (route.component) {
-      // 路径 如果当前路径为空，则说明是父组件重定向的地址 则追加为""空字符串
-      const path =
-        `${parentRoute?.path}` + (route.path ? "/" + route.path : "");
-      acc.push({
-        ...route,
-        path: path
-      });
+    if (route.children) {
+      // 如果有子路由，则递归处理
+      result.push(...flattenRoutes(route.children, route.path));
+      delete route.children;
     }
-    return acc;
-  }, []);
+    result.push(route);
+  }
+  return result;
 }