@pubinfo/module-rbac 2.0.0-rc.2 → 2.0.0-rc.3

package/dist/watermark_setting.css

@@ -1 +1 @@
-.item_ani[data-v-7eda9079]{background-color:var(--g-bg);border:1px solid var(--g-tabbar-tab-hover-bg);border-radius:.5rem;flex-direction:column;place-items:center;padding-top:26px;display:flex}.item_ani .jb[data-v-7eda9079]{background:linear-gradient(180deg,var(--g-container-bg)0%,#fff0 100%)}.bar-header[data-v-7eda9079]{background:var(--g-bg)}
+.item_ani[data-v-89565948]{background-color:var(--g-bg);border:1px solid var(--g-tabbar-tab-hover-bg);border-radius:.5rem;flex-direction:column;place-items:center;padding-top:26px;display:flex}.item_ani .jb[data-v-89565948]{background:linear-gradient(180deg,var(--g-container-bg)0%,#fff0 100%)}.bar-header[data-v-89565948]{background:var(--g-bg)}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/module-rbac",
   "type": "module",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -18,10 +18,10 @@
   ],
   "peerDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@pubinfo/pro-components": "^1.7.1",
+    "@pubinfo/pro-components": "^1.7.3",
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
-    "pubinfo": "2.0.0-rc.2"
+    "pubinfo": "2.0.0-rc.3"
   },
   "dependencies": {
     "@destyler/popover": "^0.1.0",
@@ -36,15 +36,15 @@
   },
   "devDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@pubinfo/openapi": "^0.8.4",
-    "@pubinfo/preset-openapi": "^0.8.4",
-    "@pubinfo/pro-components": "^1.7.1",
+    "@pubinfo/openapi": "^0.9.0",
+    "@pubinfo/preset-openapi": "^0.9.0",
+    "@pubinfo/pro-components": "^1.7.3",
     "@types/file-saver": "^2.0.7",
     "@types/lodash-es": "^4.17.12",
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
     "type-fest": "^4.41.0",
-    "pubinfo": "2.0.0-rc.2"
+    "pubinfo": "2.0.0-rc.3"
   },
   "scripts": {
     "dev": "pubinfo build -w --sourcemap",

package/src/composables/useWebSocketManager.ts

@@ -0,0 +1,104 @@
+import { useViewStore } from '@/stores/view';
+
+// WebSocket 消息类型定义
+interface WebSocketMessage {
+  type: 'custom'
+  event: 'pubinfo-resolver:update'
+  data: {
+    action: 'add' | 'unlink'
+    file: string
+    timestamp: number
+    data: {
+      icons: string[]
+      layouts: string[]
+      pages: string[]
+    }
+  }
+}
+
+/**
+ * WebSocket 管理器
+ */
+export function useWebSocketManager() {
+  const viewStore = useViewStore();
+  let isInitialized = false;
+
+  /**
+   * 初始化 WebSocket 监听
+   */
+  function initializeWebSocket() {
+    if (isInitialized) {
+      return;
+    }
+
+    try {
+      // @ts-expect-error 全局 WebSocket 对象
+      const ws = globalThis.__PUBINFO_WEBSOCKET__;
+
+      if (!ws) {
+        console.warn('WebSocket 连接不可用');
+        return;
+      }
+
+      // 设置连接状态
+      viewStore.setWebSocketConnected(true);
+
+      // 监听 pubinfo-resolver:update 事件
+      ws.on('pubinfo-resolver:update', (data: WebSocketMessage['data']) => {
+        // 构造完整的消息对象
+        const message: WebSocketMessage = {
+          type: 'custom',
+          event: 'pubinfo-resolver:update',
+          data,
+        };
+
+        // 传递给 viewStore 处理
+        viewStore.handleFileChange(message);
+      });
+
+      // 监听 WebSocket 连接状态变化
+      ws.on('connect', () => {
+        viewStore.setWebSocketConnected(true);
+      });
+
+      ws.on('disconnect', () => {
+        viewStore.setWebSocketConnected(false);
+      });
+
+      isInitialized = true;
+    }
+    catch (error) {
+      console.error('WebSocket Manager: 初始化失败', error);
+      viewStore.setWebSocketConnected(false);
+    }
+  }
+
+  /**
+   * 清理 WebSocket 监听
+   */
+  function cleanupWebSocket() {
+    try {
+      // @ts-expect-error 全局 WebSocket 对象
+      const ws = globalThis.__PUBINFO_WEBSOCKET__;
+
+      if (ws) {
+        // 移除事件监听器
+        ws.off('pubinfo-resolver:update');
+        ws.off('connect');
+        ws.off('disconnect');
+      }
+
+      viewStore.setWebSocketConnected(false);
+      isInitialized = false;
+    }
+    catch (error) {
+      console.error('WebSocket Manager: 清理失败', error);
+    }
+  }
+
+  return {
+    initializeWebSocket,
+    cleanupWebSocket,
+    isInitialized: () => isInitialized,
+  };
+}

package/src/index.ts

@@ -2,6 +2,8 @@ import type { ModuleOptions } from 'pubinfo';
 import type { RbacOptions } from './interface';
 import { defineAsyncRoutes, defineIconModule, defineRouteModule } from 'pubinfo';
 import modules from 'virtual:pubinfo-resolver';
+import { useWebSocketManager } from '@/composables/useWebSocketManager';
+import { useViewStore } from '@/stores/view';
 import { ctx } from './context';
 import { filterPages } from './routes';
 import './assets/styles/vxe-table.css';
@@ -27,8 +29,28 @@ export function rbac(options: RbacOptions): ModuleOptions {
 
   return {
     name: 'pubinfo:rbac',
+    setup() {
+      const viewStore = useViewStore();
+      const wsManager = useWebSocketManager();
+
+      viewStore.initializeRouteData();
+      wsManager.initializeWebSocket(); ;
+
+      // 在模块设置时初始化路由系统
+      import('./utils/routeSystem').then(({ initializeRouteSystem }) => {
+        try {
+          initializeRouteSystem();
+        }
+        catch (error) {
+          console.error('RBAC 模块路由系统初始化失败:', error);
+        }
+      });
+    },
   };
 }
 
 export * from './components/OrgUserSelector';
+export * from './composables/useWebSocketManager';
 export * from './interface';
+export * from './stores/view';
+export * from './utils/routeSystem';

package/src/stores/view.ts

@@ -0,0 +1,292 @@
+import { acceptHMRUpdate, defineStore } from 'pinia';
+import { getAllRouteModules, readProjectModules } from 'pubinfo';
+
+// WebSocket 消息类型定义
+export interface WebSocketMessage {
+  type: 'custom'
+  event: 'pubinfo-resolver:update'
+  data: {
+    action: 'add' | 'unlink'
+    file: string
+    timestamp: number
+  }
+}
+
+// 路由树节点接口
+export interface RouteTreeNode {
+  title: string
+  key: string
+  root?: boolean
+  module?: boolean
+  children?: RouteTreeNode[]
+  isLeaf?: boolean
+  value?: string
+  scope?: string
+}
+
+// 模块信息接口
+interface ModuleInfo {
+  id: string
+  pages: Record<string, string>
+}
+
+export const useViewStore = defineStore('view', () => {
+  // 主项目页面路径数据
+  const projectPages = ref<Record<string, string>>({});
+
+  // 模块页面路径数据
+  const modulePages = ref<Map<string, Record<string, string>>>(new Map()); // 路由树数据
+  const routeTree = ref<RouteTreeNode[]>([]);
+
+  // 最后更新时间
+  const lastUpdateTime = ref<number>(0);
+
+  // WebSocket 连接状态
+  const wsConnected = ref<boolean>(false);
+
+  /**
+   * 初始化路由树数据
+   */
+  function initializeRouteData() {
+    // 获取主项目的 pages - 只存储路径
+    const projectStructure = readProjectModules();
+    const rawProjectPages = projectStructure?.pages || {};
+    projectPages.value = Object.keys(rawProjectPages).reduce((acc, key) => {
+      acc[key] = key; // 存储路径本身
+      return acc;
+    }, {} as Record<string, string>);
+
+    // 获取所有模块的 pages - 只存储路径
+    const routeModuleMap = getAllRouteModules();
+    const modulePageMap = new Map<string, Record<string, string>>();
+    for (const [id, moduleMap] of routeModuleMap) {
+      const pathMap = Object.keys(moduleMap).reduce((acc, key) => {
+        acc[key] = key; // 存储路径本身
+        return acc;
+      }, {} as Record<string, string>);
+      modulePageMap.set(id, pathMap);
+    }
+    modulePages.value = modulePageMap;
+
+    // 构建路由树
+    buildRouteTree();
+  }
+
+  /**
+   * 构建路由树结构
+   */
+  function buildRouteTree() {
+    const treeNodes: RouteTreeNode[] = [];
+
+    // 构建本地项目节点
+    if (Object.keys(projectPages.value).length > 0) {
+      const localPaths = Object.keys(projectPages.value);
+
+      treeNodes.push(
+        buildTreeNode('本地', 'local', localPaths),
+      );
+    }
+
+    // 构建模块节点
+    for (const [id, moduleMap] of modulePages.value) {
+      if (Object.keys(moduleMap).length > 0) {
+        treeNodes.push(
+          buildTreeNode(id, `module:${id}`, Object.keys(moduleMap), id),
+        );
+      }
+    }
+
+    routeTree.value = treeNodes;
+  }
+
+  /**
+   * 从扁平路径数组构建树节点
+   */
+  function buildTreeNode(
+    label: string,
+    keyPrefix: string,
+    paths: string[],
+    scope?: string,
+  ): RouteTreeNode {
+    const root: RouteTreeNode = {
+      title: label,
+      key: keyPrefix,
+      root: true,
+      module: keyPrefix !== 'local',
+      children: [],
+    };
+
+    const findOrCreate = (parent: RouteTreeNode, title: string, key: string) => {
+      if (!parent.children) {
+        parent.children = [];
+      }
+      let node = parent.children.find(n => n.title === title && !n.isLeaf);
+      if (!node) {
+        node = { title, key, children: [] };
+        parent.children.push(node);
+      }
+      return node;
+    };
+
+    for (const p of paths) {
+      const segs = p.split('/').filter(Boolean);
+      let current = root;
+      let acc = keyPrefix;
+
+      for (let i = 0; i < segs.length; i++) {
+        const seg = segs[i];
+        acc = acc ? `${acc}/${seg}` : seg;
+        const isLast = i === segs.length - 1;
+
+        if (isLast) {
+          // 叶子节点
+          current.children = current.children || [];
+          current.children.push({
+            title: seg,
+            key: acc,
+            isLeaf: true,
+            value: p,
+            scope,
+          });
+        }
+        else {
+          current = findOrCreate(current, seg, acc);
+        }
+      }
+    }
+
+    return root;
+  }
+
+  /**
+   * 处理 WebSocket 文件变化事件
+   */
+  function handleFileChange(message: WebSocketMessage) {
+    const { action, file, timestamp } = message.data;
+
+    // 更新时间戳
+    lastUpdateTime.value = timestamp;
+
+    // 根据操作类型处理
+    if (action === 'add') {
+      handleFileAdd(file);
+    }
+    else if (action === 'unlink') {
+      handleFileRemove(file);
+    }
+
+    // 重新构建路由树
+    buildRouteTree();
+  }
+
+  /**
+   * 处理文件添加
+   */
+  function handleFileAdd(filePath: string) {
+    // 检查是否是 views 目录下的 .vue 文件
+    const relativePath = filePath.replace(/^.*\/src\//, 'src/');
+
+    if (relativePath.startsWith('src/views/') && relativePath.endsWith('.vue')) {
+      // 添加到主项目页面数据
+      projectPages.value = {
+        ...projectPages.value,
+        [relativePath]: relativePath,
+      };
+    }
+  }
+
+  /**
+   * 处理文件删除
+   */
+  function handleFileRemove(filePath: string) {
+    // 检查是否是 views 目录下的 .vue 文件
+    const relativePath = filePath.replace(/^.*\/src\//, 'src/');
+    if (relativePath.startsWith('src/views/') && relativePath.endsWith('.vue')) {
+      // 从主项目页面数据中移除
+      const newProjectPages = { ...projectPages.value };
+      delete newProjectPages[relativePath];
+      projectPages.value = newProjectPages;
+    }
+  }
+
+  /**
+   * 设置 WebSocket 连接状态
+   */
+  function setWebSocketConnected(connected: boolean) {
+    wsConnected.value = connected;
+  }
+
+  /**
+   * 获取路由树数据（用于组件）
+   */
+  function getRouteTreeData() {
+    return routeTree.value;
+  }
+
+  /**
+   * 刷新路由树数据
+   */
+  function refreshRouteTree() {
+    initializeRouteData();
+  }
+
+  /**
+   * 根据搜索条件过滤树数据
+   */
+  function filterRouteTree(searchQuery: string): RouteTreeNode[] {
+    if (!searchQuery.trim()) {
+      return routeTree.value;
+    }
+
+    const q = searchQuery.trim().toLowerCase();
+
+    const filterNodes = (nodes: RouteTreeNode[]): RouteTreeNode[] => {
+      const result: RouteTreeNode[] = [];
+
+      for (const node of nodes) {
+        const title = node.title.toLowerCase();
+        const value = (node.value || '').toLowerCase();
+        const key = node.key.toLowerCase();
+        const selfMatch = title.includes(q) || value.includes(q) || key.includes(q);
+
+        let filteredChildren: RouteTreeNode[] | undefined;
+        if (node.children && node.children.length > 0) {
+          filteredChildren = filterNodes(node.children);
+        }
+
+        if (selfMatch || (filteredChildren && filteredChildren.length > 0)) {
+          const cloned = { ...node };
+          if (filteredChildren) {
+            cloned.children = filteredChildren;
+          }
+          result.push(cloned);
+        }
+      }
+
+      return result;
+    };
+
+    return filterNodes(routeTree.value);
+  }
+
+  return {
+    // 状态
+    projectPages: readonly(projectPages),
+    modulePages: readonly(modulePages),
+    routeTree: readonly(routeTree),
+    lastUpdateTime: readonly(lastUpdateTime),
+    wsConnected: readonly(wsConnected),
+
+    // 方法
+    initializeRouteData,
+    handleFileChange,
+    setWebSocketConnected,
+    getRouteTreeData,
+    refreshRouteTree,
+    filterRouteTree,
+  };
+});
+
+if (import.meta.hot) {
+  import.meta.hot.accept(acceptHMRUpdate(useViewStore, import.meta.hot));
+}

package/src/utils/routeSystem.ts

@@ -0,0 +1,53 @@
+import { useWebSocketManager } from '@/composables/useWebSocketManager';
+import { useViewStore } from '@/stores/view';
+
+/**
+ * 应用启动时的路由数据初始化
+ */
+export function initializeRouteSystem() {
+  const viewStore = useViewStore();
+  const wsManager = useWebSocketManager();
+
+  try {
+    // 初始化路由数据
+    viewStore.initializeRouteData();
+
+    // 初始化 WebSocket 管理器
+    wsManager.initializeWebSocket();
+
+    return {
+      viewStore,
+      wsManager,
+    };
+  }
+  catch (error) {
+    console.error('[RBAC] 路由系统初始化失败:', error);
+    throw error;
+  }
+}
+
+/**
+ * 应用关闭时的清理逻辑
+ */
+export function cleanupRouteSystem() {
+  try {
+    const wsManager = useWebSocketManager();
+    wsManager.cleanupWebSocket();
+  }
+  catch (error) {
+    console.error('[RBAC] 路由系统清理失败:', error);
+  }
+}
+
+/**
+ * 手动刷新路由数据
+ */
+export function refreshRouteSystem() {
+  try {
+    const viewStore = useViewStore();
+    viewStore.refreshRouteTree();
+  }
+  catch (error) {
+    console.error('[RBAC] 路由系统数据刷新失败:', error);
+  }
+}

package/src/views/region/index.vue

@@ -116,7 +116,7 @@ async function request() {
   const res = await getRegionGetListByParentId({
     ...query.value,
   });
-  if (Object.keys(chilData.value).length > 0) {
+  if (chilData.value && Object.keys(chilData.value).length > 0) {
     const length = res.data!.length;
     if (length > 0) {
       chilData.value.children = res.data?.map((e: API.PubRegion) => {