isdata-customer-sdk 0.2.29 → 0.2.31

package/dist/index.common.js

@@ -30040,18 +30040,32 @@ const getLoginPortalAccountKey = async (loginName, groupID) => {
  * @param {*} menu_id 
  * @returns 
  */
-const getPlatformBortherMenusByMenuID = async menu_id => {
+const getPlatformBortherMenusByMenuID = async (menu_id, role_ids, group_id) => {
   let queryData_groupData = {
     "param": {
       "menu_id": menu_id
     }
   };
   let result = await request.post(`/dataservice/rest/orchestration/getPlatformBortherMenusByMenuID`, queryData_groupData);
-  let mappingDatas = result.data.menuDatas;
+  let sysMenuDatas = result.data.menuDatas;
+
+  //获取当前角色下对应的角色菜单权限的映射信息
+  let roleMenuMappingDatas = await getPlatformMenuMappingsByRoleIDs(role_ids, group_id);
+  let roleMenuMappingMap = {};
+  for (const mappingData of roleMenuMappingDatas) {
+    let menu_mapping_id = mappingData.menu_id;
+    roleMenuMappingMap[menu_mapping_id] = mappingData;
+  }
   let menuMaps = {};
   //缓存所有菜单信息
-  for (const item of mappingDatas) {
+  for (const item of sysMenuDatas) {
     let id = item.id;
+    let leaf_flag = item.leaf_flag;
+    //如果是叶子节点 并且当前菜单ID在角色菜单映射信息中不存在，则跳过
+    if (leaf_flag === 1 && !roleMenuMappingMap[id]) {
+      continue;
+    }
+    // 如果当前菜单ID在角色菜单映射信息中存在，则表示该角色有权限访问该菜单
     if (!menuMaps[id]) {
       let icon = item.icon;
       let iconClass = "el-icon-menu";
@@ -30075,12 +30089,16 @@ const getPlatformBortherMenusByMenuID = async menu_id => {
       menuMaps[id] = tempItem;
     }
   }
-  for (const item of mappingDatas) {
+  for (const item of sysMenuDatas) {
     let parent_id = item.parent_id;
     if (!parent_id) continue;
     let parentItem = menuMaps[parent_id];
     if (parentItem) {
-      parentItem.children.push(menuMaps[item.id]);
+      let menuItem = menuMaps[item.id];
+      if (!menuItem) {
+        continue;
+      }
+      parentItem.children.push(menuItem);
     }
   }
   let menuDatas = [];
@@ -30090,7 +30108,16 @@ const getPlatformBortherMenusByMenuID = async menu_id => {
       menuDatas.push(item);
     }
   }
-  //  console.log("getPlatformBortherMenusByMenuID",menuDatas);
+  //如果没有数据，说明只有一级节点父亲
+  if (menuDatas.length == 0) {
+    for (const key in menuMaps) {
+      let item = menuMaps[key];
+      if (item) {
+        menuDatas.push(item);
+      }
+    }
+  }
+  console.log("getPlatformBortherMenusByMenuID", menuDatas);
   //获取菜单数据
   return menuDatas;
 };
@@ -32412,12 +32439,12 @@ const logoutAccount = async endside_type => {
     window.sessionStorage.clear();
     return {
       code: resultCode,
-      message: response.message
+      message: `$L{${response.message}}`
     };
   } else {
     return {
       code: resultCode,
-      message: response.message
+      message: `$L{${response.message}}`
     };
   }
 };
@@ -32457,7 +32484,7 @@ const switchPortalLogin = async (data, appid, endside_type) => {
   } else {
     return {
       code: resultCode,
-      message: message
+      message: `$L{${message}}`
     };
   }
 };
@@ -32528,7 +32555,7 @@ const loginAccount = async (data, appid) => {
       } else {
         return {
           code: code,
-          message: response.message
+          message: `$L{${response.message}}`
         };
       }
     } else {
@@ -32540,7 +32567,7 @@ const loginAccount = async (data, appid) => {
   }
   return {
     code: code,
-    message: result.data.message
+    message: `$L{${result.data.message}}`
   };
 };