@pubinfo/module-rbac 2.0.0-beta.27 → 2.0.0-beta.29

package/dist/views/watermark_setting/index.vue.d.ts

@@ -1,16 +1,16 @@
-declare const _default: import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').DefineComponent<{}, {}, {}, {}, {}, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').ComponentOptionsMixin, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').ComponentOptionsMixin, {}, string, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').ComponentProvideOptions, true, {
-    animateItem: import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').CreateComponentPublicInstanceWithMixins<Readonly<{
+declare const _default: import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').DefineComponent<{}, {}, {}, {}, {}, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').ComponentOptionsMixin, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').ComponentOptionsMixin, {}, string, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').ComponentProvideOptions, true, {
+    animateItem: import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').CreateComponentPublicInstanceWithMixins<Readonly<{
         lightAnimationData: string;
         darkAnimationData: string;
     }> & Readonly<{}>, {
         play: () => void;
         stop: () => void;
-    }, {}, {}, {}, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').ComponentOptionsMixin, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').ComponentOptionsMixin, {}, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').PublicProps, {
+    }, {}, {}, {}, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').ComponentOptionsMixin, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').ComponentOptionsMixin, {}, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').PublicProps, {
         lightAnimationData: string;
         darkAnimationData: string;
-    }, false, {}, {}, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').GlobalComponents, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').GlobalDirectives, string, {
+    }, false, {}, {}, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').GlobalComponents, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').GlobalDirectives, string, {
         AnimationRef: HTMLDivElement;
-    }, HTMLDivElement, import('../../../../../node_modules/.pnpm/vue@3.5.13_typescript@5.8.2/node_modules/vue').ComponentProvideOptions, {
+    }, HTMLDivElement, import('../../../../../node_modules/.pnpm/vue@3.5.16_typescript@5.8.3/node_modules/vue').ComponentProvideOptions, {
         P: {};
         B: {};
         D: {};

package/dist/{xitongpeizhifuwu-B3Lw-Lq9.js → xitongpeizhifuwu-BIR2CVXp.js}

@@ -1,4 +1,4 @@
-import { i as o } from "./index-BmWUEWpu.js";
+import { i as o } from "./index-BOEO9CRp.js";
 function s(t, i) {
   return o.Post("/sysconfig/addOrEidtSysThemeStyleConfig", t, {
     headers: {

package/dist/{zidianfuwu-BbhoWOZI.js → zidianfuwu-B137v_q7.js}

@@ -1,4 +1,4 @@
-import { i as e } from "./index-BmWUEWpu.js";
+import { i as e } from "./index-BOEO9CRp.js";
 function s(t, i) {
   const { id: n, ...o } = t;
   return e.Delete(

package/dist/{ziyuanjiekou-CypA4O57.js → ziyuanjiekou-j9nd-oaF.js}

@@ -1,4 +1,4 @@
-import { i as r } from "./index-BmWUEWpu.js";
+import { i as r } from "./index-BOEO9CRp.js";
 function t(e, o) {
   return r.Post("/rbac/resource/addResource", e, {
     headers: {

package/dist/{zuzhijiaosebiaokongzhiqi-DhdCTnmx.js → zuzhijiaosebiaokongzhiqi-DPbRg7Qd.js}

@@ -1,4 +1,4 @@
-import { i as r } from "./index-BmWUEWpu.js";
+import { i as r } from "./index-BOEO9CRp.js";
 function t(o, e) {
   return r.Get("/rbac/orgRole/getByOrgId", {
     params: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/module-rbac",
   "type": "module",
-  "version": "2.0.0-beta.27",
+  "version": "2.0.0-beta.29",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -18,30 +18,30 @@
   ],
   "peerDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@pubinfo/pro-components": "^1.7.0",
-    "alova": "^3.2.10",
+    "@pubinfo/pro-components": "^1.7.1",
+    "alova": "^3.2.13",
     "ant-design-vue": "^4.2.6",
-    "pubinfo": "2.0.0-beta.27"
+    "pubinfo": "2.0.0-beta.29"
   },
   "dependencies": {
     "@pubinfo/headlessui": "^1.5.1",
-    "@vueuse/core": "^13.0.0",
+    "@vueuse/core": "^13.3.0",
     "dayjs": "^1.11.13",
     "lodash-es": "^4.17.21",
-    "lottie-web": "^5.12.2",
+    "lottie-web": "^5.13.0",
     "vxe-table": "4.6.10"
   },
   "devDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
     "@pubinfo/openapi": "^0.8.4",
     "@pubinfo/preset-openapi": "^0.8.4",
-    "@pubinfo/pro-components": "^1.7.0",
+    "@pubinfo/pro-components": "^1.7.1",
     "@types/lodash-es": "^4.17.12",
-    "alova": "^3.2.10",
+    "alova": "^3.2.13",
     "ant-design-vue": "^4.2.6",
-    "type-fest": "^4.36.0",
-    "vite-plugin-dts": "^4.5.3",
-    "pubinfo": "2.0.0-beta.27"
+    "type-fest": "^4.41.0",
+    "vite-plugin-dts": "^4.5.4",
+    "pubinfo": "2.0.0-beta.29"
   },
   "scripts": {
     "dev": "pubinfo build -w",

package/src/index.ts

@@ -1,28 +1,22 @@
 import type { ModuleOptions } from 'pubinfo';
 import type { RbacOptions } from './interface';
-import { defineAsyncRoutes, pubinfoInjectionKey } from 'pubinfo';
+import { defineAsyncRoutes, loadIconsFromGlob } from 'pubinfo';
 import { filterPages } from './routes';
 
 import './assets/styles/vxe-table.css';
 import 'uno.css';
 
 export function rbac(options: RbacOptions = {}): ModuleOptions {
-  const { pages } = options;
+  const { pages, sort } = options;
 
-  // TODO 考虑路由注册顺序
   const asyncRoutes = filterPages({ pages });
-  defineAsyncRoutes(asyncRoutes);
+  defineAsyncRoutes(asyncRoutes, { sort });
 
   return {
     name: 'pubinfo:rbac',
-    setup({ app }) {
-      app.provide(pubinfoInjectionKey, {
-        loadIcon(name?: string) {
-          const modules = (import.meta as any).glob('./assets/icons/*', { eager: true });
-          const path = `./assets/icons/${name}.svg`;
-          return modules[path]?.default;
-        },
-      });
+    setup({ iconRegistry }) {
+      const iconMap = loadIconsFromGlob(import.meta.glob('./assets/icons/*.svg', { eager: true }));
+      iconRegistry.register(iconMap);
     },
   };
 }

package/src/interface.ts

@@ -3,6 +3,9 @@ import type { RouteRecordRaw } from 'vue-router';
 export interface RbacOptions {
   /** 替换或隐藏页面，为空时默认展示所有页面 */
   pages?: RbacPages
+
+  /** 路由排序 */
+  sort?: number
 }
 
 export interface RbacPages {

package/src/routes/index.ts

@@ -93,7 +93,7 @@ export function filterPages(options: { pages?: RbacPages }) {
 function filterRoutesByMap(routes: RouteRecordRaw[], pageMap: RbacPages) {
   function filterRecursive(routeList: RouteRecordRaw[], map: Record<string, any>): RouteRecordRaw[] {
     return routeList
-      .map(route => {
+      .map((route) => {
         if (!route.name || !(route.name in map)) {
           return null;
         }