@lambo-design/shared 1.0.0-beta.150 → 1.0.0-beta.151

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.150",
+  "version": "1.0.0-beta.151",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/utils/menu/index.js

@@ -215,9 +215,9 @@ const generator = (menuData,constantRouterComponents) => {
                 if (typeof target.component == "string") {
                     // 解决路由name与组件name不一致导致的keeplive不生效的问题
                     try {
-                        let componentPath = '@/view/' + target.component;
+                        //let componentPath = '@/view/' + target.component;
                         item.component = resolve =>
-                            require([`${componentPath}`], data => {
+                            require(['@/view/'+ target.component], data => {
                                 data.default.name = item.name;
                                 resolve(data);
                             });
@@ -253,9 +253,9 @@ const generator = (menuData,constantRouterComponents) => {
                 if (item.uri.startsWith("dida/")) {
                     item.meta.notCache = true;
                     try{
-                        let path = '@/view/dida/dida-page';
+                        //let path = '@/view/dida/dida-page';
                         item.component = resolve => {
-                            require([`${path}`], data => {
+                            require(['@/view/dida/dida-page'], data => {
                                 data.default.name = item.name;
                                 resolve(data);
                             });
@@ -276,11 +276,11 @@ const generator = (menuData,constantRouterComponents) => {
                             item.query = query;
                             path = path.substr(0,path.indexOf("?"));
                         }
-                        let componentPath = '@/view/' + path;
-                        let component = require(`${componentPath}`);
+                        //let componentPath = '@/view/' + path;
+                        let component = require('@/view/' + path);
                         if (component) {
                             item.component = resolve => {
-                                require([`${componentPath}`], data => {
+                                require(['@/view/' + path], data => {
                                     data.default.name = item.name;
                                     resolve(data);
                                 });

package/utils/platform.js

@@ -416,12 +416,12 @@ export const routeHasExist = (tagNavList, routeItem) => {
 export const scrollTop = (el, from = 0, to, duration = 500, endCallback) => {
   if (!window.requestAnimationFrame) {
     window.requestAnimationFrame = (
-      window.webkitRequestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      window.msRequestAnimationFrame ||
-      function (callback) {
-        return window.setTimeout(callback, 1000 / 60)
-      }
+        window.webkitRequestAnimationFrame ||
+        window.mozRequestAnimationFrame ||
+        window.msRequestAnimationFrame ||
+        function (callback) {
+          return window.setTimeout(callback, 1000 / 60)
+        }
     )
   }
   const difference = Math.abs(from - to)
@@ -700,14 +700,15 @@ export const getMobileAppList = (appList) => {
  * @param appType
  * @returns {*[]}
  */
-export const buildNavListByMenu = (permissionList,appType) => {
+export const buildNavListByMenu = (permissionList,appInfo,appType) => {
   let navList = []
-  if (permissionList) {
-    let permissions = permissionList.filter(item => item.hasOwnProperty('pid') && item.pid == '0')
+  if (permissionList && appInfo && appInfo.appId) {
+    let permissions = permissionList.filter(item => item.hasOwnProperty('pid') && item.pid == '0' && item.appId == appInfo.appId)
     for (let per of permissions) {
       if (appType && appType == 'sc') {
         let nav = {
           "data" : deepCopy(per),
+          "appInfo" : deepCopy(appInfo),
           "orderNo": per.orders,
           "application": {
             "extendProps": per.extension ? JSON.parse(per.extension) : "",
@@ -715,7 +716,7 @@ export const buildNavListByMenu = (permissionList,appType) => {
             "appBizCode": per.permissionValue,
             "appName": per.title,
             "appDesc": per.description,
-            "appUrl": per.uri,
+            "appUrl": appInfo.basepath,
             "icon": per.icon,
             "appStatus": 1,
             "manageUnitId": "",
@@ -741,7 +742,7 @@ export const buildNavListByMenu = (permissionList,appType) => {
             "authType": "1",
             "isLower": null
           },
-          "basepath": per.uri,
+          "basepath": appInfo.basepath,
           "appId": per.permissionId,
           "icon": per.icon,
           "name": per.name,
@@ -754,13 +755,14 @@ export const buildNavListByMenu = (permissionList,appType) => {
       } else {
         let nav = {
           "data" : deepCopy(per),
+          "appInfo" : deepCopy(appInfo),
           "id": per.id,
           "appId": per.permissionId,
           "systemId": per.systemId,
           "icon": per.icon,
           "banner": null,
           "theme": null,
-          "basepath": per.uri,
+          "basepath": appInfo.basepath,
           "status": 1,
           "name": per.name,
           "title": per.type,
@@ -787,8 +789,8 @@ export const buildNavListByMenu = (permissionList,appType) => {
  */
 export const isChildPermission = (permissionList, pid, per) => {
   if (permissionList && pid && per && per.pid) {
-    let res = permissionList.find(item => item.hasOwnProperty('permissionId') && per.hasOwnProperty('pid') && item.permissionId == per.pid)
-    if (res && res.permissionId && per.permissionId == pid) {
+    let res = permissionList.find(item => item.hasOwnProperty('permissionId') && item.permissionId == per.pid)
+    if (res && res.permissionId && res.permissionId == pid) {
       return true;
     } else {
       return isChildPermission(permissionList, pid, res)
@@ -801,18 +803,76 @@ export const isChildPermission = (permissionList, pid, per) => {
  * @param permissionList
  * @param pid
  */
-export const getChildPermissions = (permissionList, pid) => {
+export const getChildPermissions = (permissionList, pid, appInfo) => {
   let res = []
   if (permissionList && pid) {
     for (let permission of permissionList) {
-        if (isChildPermission(permissionList, pid, permission)) {
-          res.push(permission);
+      if (isChildPermission(permissionList, pid, permission)) {
+        let per2 = deepCopy(permission);
+        per2.appId = pid;
+        if (per2.pid == pid) {
+          per2.pid = "0";
         }
+        per2.appInfo = deepCopy(appInfo)
+        res.push(per2);
+      }
     }
   }
   return res;
 }
+/**
+ * 恢复权限的原始信息
+ * @param permission
+ */
+export const getOriginalPermission = (permission) => {
+  if (permission && permission.meta && permission.meta.data && permission.meta.data.appInfo) {
+    let per2 = deepCopy(permission);
+    if (per2.hasOwnProperty('pid') && per2.pid == '0') {
+      per2.pid = per2.meta.data.appId;
+      per2.meta.data.pid = per2.meta.data.appId;
+    }
+    per2.meta.appId = permission.meta.data.appInfo.appId;
+    per2.meta.data.appId = permission.meta.data.appInfo.appId;
+    return per2;
+  }
+  return permission
+}
 
+/**
+ * 单应用时修改源权限信息
+ * @param permissionList
+ * @param menu
+ * @param appInfo
+ * @returns {*}
+ */
+export const buildSinglePermission = (permissionList, menu) => {
+  let permission = permissionList.find(item => item.permissionId == menu.permissionId && item.appId == menu.appId)
+  let rootPermission = getRootPermission(permissionList, permission)
+  menu.appInfo = {
+    appId: menu.appId
+  }
+  menu.appId = rootPermission.permissionId;
+  return menu;
+}
+/**
+ * 获取菜单根节点
+ * @param permissionList
+ * @param permission
+ * @returns {*|{pid}|{}}
+ */
+export const getRootPermission = (permissionList, permission) => {
+  if (permissionList, permission) {
+    if (!permission.hasOwnProperty('pid')) {
+      return permission
+    } else if (permission.pid == '0') {
+      return permission
+    } else {
+      let parentPermission = permissionList.find(item => item.permissionId == permission.pid && item.appId == permission.appId)
+      return getRootPermission(permissionList, parentPermission);
+    }
+  }
+  return permission;
+}
 /**
  * getPreviousTagIndex
  * @param tagList