isdata-customer-sdk 0.1.16 → 0.1.17

package/dist/index.js

@@ -4996,7 +4996,7 @@ const queryAssetById = (id, count = 200) => request.post(`/asset/getAssetData?as
  * @param {*} isPortalAction 
  * @returns 
  */
-const getPoratlAppID = isPortalAction => {
+const getPoratlAppID = (isPortalAction, appVariables) => {
   let portal_app_id = "";
   if (isPortalAction) {
     portal_app_id = window.appSdk.getAppId();
@@ -5004,7 +5004,7 @@ const getPoratlAppID = isPortalAction => {
     portal_app_id = window.sessionStorage.getItem("iportal_app_id");
     // 如果缓存中没有iportal_app_id，则从appVariables中获取
     if (!portal_app_id) {
-      undefined.vueProps.appVariables.forEach(item => {
+      appVariables.forEach(item => {
         if (item.name == "iPortal_app_id") {
           portal_app_id = item.default_value;
         }
@@ -5021,8 +5021,8 @@ const getPoratlAppID = isPortalAction => {
  * @param {*} isPortalAction 
  * @returns 
  */
-const getAppPortalMenuDatas = async (user_id, group_id, isPortalAction) => {
-  let portal_app_id = getPoratlAppID(isPortalAction);
+const getAppPortalMenuDatas = async (user_id, group_id, isPortalAction, appVariables) => {
+  let portal_app_id = getPoratlAppID(isPortalAction, appVariables);
   let roleList = await getRoleIDsByUserAndGroupID(user_id, portal_app_id, group_id);
   let portalMenuDatas = await getMenuDatasByGroupID(group_id, roleList);
   let app_id = window.appSdk.getAppId();
@@ -5118,12 +5118,13 @@ const transformPortalData = (datas, menuTypes, filterObjectMap) => {
     let id = data.id;
     let tempMenuData = {
       id: id,
+      index: data.menu_id,
       name: data.title,
       sort: data.sort,
       actionType: data.actionType,
       url: data.url,
       iconClass: data.image,
-      types: [],
+      children: [],
       app_id: data.app_id,
       menu_id: data.menu_id,
       beyond_type: data.menu_type ? data.menu_type : "RJVIEW-OTHERS",
@@ -5153,7 +5154,7 @@ const transformPortalData = (datas, menuTypes, filterObjectMap) => {
       let tempType = tempMenuData.beyond_type;
       // let tempType_sort =tempMenuData.beyond_type_sort;
       let tempParentMenu = menuMaps[parent_id];
-      let parentTypes = tempParentMenu.types;
+      let parentTypes = tempParentMenu.children;
       let parentType = parentTypes.find(tempTypeItem => {
         return tempTypeItem.id == tempType;
       });
@@ -5164,11 +5165,13 @@ const transformPortalData = (datas, menuTypes, filterObjectMap) => {
         let menuTypeObj = menuTypeMaps[tempType];
         let parentType = menuTypeObj ? {
           id: tempType,
+          index: tempType,
           name: menuTypeObj.title,
           children: [],
           sort: menuTypeObj.value
         } : {
           id: tempType,
+          index: tempType,
           name: "其他",
           children: [],
           sort: 999
@@ -5187,7 +5190,7 @@ const transformPortalData = (datas, menuTypes, filterObjectMap) => {
       let tempMenuData = menuMaps[data.id];
       //如果没有对应的菜单数据，则跳过
       if (!tempMenuData) continue;
-      let menuTypes = tempMenuData.types;
+      let menuTypes = tempMenuData.children;
       let count = 0;
       for (const menuType of menuTypes) {
         let type_childens = menuType.children;
@@ -5201,7 +5204,7 @@ const transformPortalData = (datas, menuTypes, filterObjectMap) => {
         continue;
       }
       menuList.push(tempMenuData);
-      let types = tempMenuData.types;
+      let types = tempMenuData.children;
       types.sort((data1, data2) => {
         if (Number.isNaN(data1.sort)) return 1;
         if (Number.isNaN(data2.sort)) return -1;