20260728173026

code/fms/fms-vue/src/stores/permissions.js

@@ -84,23 +84,17 @@ export const usePermissionStore = defineStore("permissions", () => {
     return request;
   }
 
-  function resolvePageId(code, expectedType) {
+  function resolvePageId(code) {
     const module = moduleByCode.value.get(String(code || ""));
-    if (!module || (expectedType && module.b_module_type !== expectedType)) return "";
+    if (!module) return "";
     if (module.b_module_type === "page") return String(module.b_id || "");
     if (module.b_module_type === "data") return String(module.b_parent_id || "");
     return "";
   }
 
-  function canModule(moduleCode) {
-    if (isG3soft.value || !moduleCode) return true;
-    const pageId = resolvePageId(moduleCode);
-    return !!pageId && grantedPageSet.value.has(pageId);
-  }
-
-  function canData(dataCode) {
-    if (isG3soft.value || !dataCode) return true;
-    const pageId = resolvePageId(dataCode, "data");
+  function canAccess(moduleId) {
+    if (isG3soft.value || !moduleId) return true;
+    const pageId = resolvePageId(moduleId);
     return !!pageId && grantedPageSet.value.has(pageId);
   }
 
@@ -130,8 +124,7 @@ export const usePermissionStore = defineStore("permissions", () => {
 
   return {
     load,
-    canModule,
-    canData,
+    canAccess,
     canPower,
     clear,
     grantedPageIds,