@lambo-design/shared 1.0.0-beta.361 → 1.0.0-beta.362

package/utils/menu/generatorDynamicRouter.js

@@ -1,301 +1,304 @@
-import config from "../../config/config"
-import { deepCopy } from '../assist'
-import { getUrlParams } from '../platform'
-
-const ROUTE_PERMISSION_TYPES = new Set([1, 2, 4])
-
-function isAppMatched(itemAppId, appIds) {
-  if (!appIds) {
-    return true
-  }
-  if (itemAppId === appIds) {
-    return true
-  }
-  if (Array.isArray(appIds)) {
-    return appIds.indexOf(itemAppId) > -1
-  }
-  if (typeof appIds === 'string') {
-    return appIds.indexOf(itemAppId) > -1
-  }
-  return false
-}
-
-function shouldIncludePermission(item, appIds, generateType) {
-  const appIdCondition = isAppMatched(item.appId, appIds)
-  if (generateType === 'menu') {
-    const hideInMenuCondition = !(Object.prototype.hasOwnProperty.call(item, 'hideInMenu') && item.hideInMenu)
-    return appIdCondition && hideInMenuCondition
-  }
-  if (generateType && generateType === 'router') {
-    return appIdCondition
-  }
-  return false
-}
-
-function buildChildrenMap(permissionList, appIds, generateType) {
-  const childrenMap = new Map()
-
-  permissionList.forEach((item) => {
-    if (!item || !ROUTE_PERMISSION_TYPES.has(item.type)) {
-      return
-    }
-    if (!shouldIncludePermission(item, appIds, generateType)) {
-      return
-    }
-
-    const pid = item.pid
-    if (!childrenMap.has(pid)) {
-      childrenMap.set(pid, [])
-    }
-    childrenMap.get(pid).push(item)
-  })
-
-  return childrenMap
-}
-
-function createCrumb(item) {
-  return {
-    icon: item.icon,
-    name: item.name,
-    title: item.label,
-    type: item.type
-  }
-}
-
-function buildMenuTree(childrenMap, parentId, crumbs, root, pageChildren) {
-  const siblings = childrenMap.get(parentId) || []
-  const menuTree = []
-
-  siblings.forEach((item) => {
-    if (item.type === 1 || item.type === 2) {
-      const node = {
-        meta: {
-          data: deepCopy(item),
-          appId: item.appId,
-          title: item.label,
-          icon: item.icon,
-          crumbs: [...crumbs],
-          activeName: item.name,
-          notCache: Boolean(item.notCache),
-          hideInMenu: Boolean(item.hideInMenu)
-        },
-        permissionId: item.permissionId,
-        type: item.type,
-        pid: item.pid,
-        component: item.name,
-        name: item.name,
-        uri: item.uri,
-        children: []
-      }
-
-      node.meta.crumbs.push(createCrumb(item))
-
-      if (item.type === 1) {
-        node.component = root ? 'Main' : 'parentView'
-      }
-
-      node.children = buildMenuTree(childrenMap, item.permissionId, node.meta.crumbs, false, pageChildren)
-      if (!node.children.length) {
-        delete node.children
-      }
-
-      menuTree.push(node)
-      return
-    }
-
-    if (item.type === 4) {
-      const child = {
-        meta: {
-          data: deepCopy(item),
-          appId: item.appId,
-          title: item.label,
-          hideInMenu: true,
-          notCache: true,
-          crumbs: [...crumbs],
-          type: item.type
-        },
-        permissionId: item.permissionId,
-        type: item.type,
-        pid: item.pid,
-        component: item.name,
-        name: item.name,
-        uri: item.uri
-      }
-
-      child.meta.crumbs.push(createCrumb(item))
-      pageChildren.push(child)
-    }
-  })
-
-  return menuTree
-}
-
-export function generatorMenuRouter(permissionList, appIds, generateType = 'router') {
-  const pageNode = {
-    path: '/page',
-    name: 'page',
-    meta: {
-      hideInMenu: true,
-      notCache: true
-    },
-    component: 'Main',
-    children: []
-  }
-
-  const childrenMap = buildChildrenMap(permissionList || [], appIds, generateType)
-  const menuData = buildMenuTree(childrenMap, '0', [], true, pageNode.children)
-  return { menuData, pageNode }
-}
-
-function generator(menuData, constantRouterComponents) {
-  for (const item of menuData) {
-    if (item.component && typeof item.component === 'string') {
-      const target = constantRouterComponents[item.component]
-      if (target) {
-        if (target.component) {
-          if (typeof target.component === 'string') {
-            try {
-              item.component = resolve =>
-                require(['@/view/' + target.component], data => {
-                  data.default.name = item.name
-                  resolve(data)
-                })
-            } catch (e) {
-              delete item.component
-            }
-          } else {
-            item.component = target.component
-          }
-        }
-        if (target.url) {
-          let path = target.url
-          let query = {}
-          if (path.indexOf('?') > -1) {
-            query = getUrlParams(path.substr(path.indexOf('?')))
-            item.query = query
-            path = path.substr(0, path.indexOf('?'))
-          }
-          item.path = path
-        }
-        if (item.uri) {
-          item.meta.uriParam = item.uri
-        }
-        if (target.notCache) {
-          item.meta.notCache = target.notCache
-        }
-        if (target.hideInMenu) {
-          item.meta.hideInMenu = target.hideInMenu
-        }
-      }
-      if (item.uri) {
-        if (item.uri.startsWith('/')) {
-          item.uri = item.uri.substr(1)
-        }
-        let uri = item.uri
-        if (uri.startsWith(config.routerBase + '/')) {
-          uri = uri.replace(config.routerBase + '/', '')
-        }
-        if (uri.startsWith('dida/')) {
-          item.meta.notCache = true
-          let path = uri
-          let query = {}
-          if (path.indexOf('?') > -1) {
-            query = getUrlParams(path.substr(path.indexOf('?')))
-            item.query = query
-            path = path.substr(0, path.indexOf('?'))
-          }
-          try {
-            item.component = resolve => {
-              require(['@/view/dida/dida-page'], data => {
-                data.default.name = item.name
-                resolve(data)
-              })
-            }
-          } catch (e) {
-            delete item.component
-          }
-          item.path = '/' + path
-        } else if (uri.startsWith('dareport/')) {
-          item.meta.notCache = true
-          let path = uri
-          let query = {}
-          if (path.indexOf('?') > -1) {
-            query = getUrlParams(path.substr(path.indexOf('?')))
-            item.query = query
-            path = path.substr(0, path.indexOf('?'))
-          }
-          try {
-            item.component = resolve => {
-              require(['@/view/dida/dida-page'], data => {
-                data.default.name = item.name
-                resolve(data)
-              })
-            }
-          } catch (e) {
-            delete item.component
-          }
-          item.path = '/' + path
-        } else {
-          try {
-            let path = item.uri
-            if (item.uri.startsWith(config.routerBase + '/')) {
-              path = path.replace(config.routerBase + '/', '')
-            }
-            let query = {}
-            if (path.indexOf('?') > -1) {
-              query = getUrlParams(path.substr(path.indexOf('?')))
-              path = path.substr(0, path.indexOf('?'))
-            }
-            if (target && target.component) {
-              // target.component already overrides uri-based component resolution.
-            } else {
-              const component = require('@/view/' + path)
-              if (component) {
-                item.component = resolve => {
-                  require(['@/view/' + path], data => {
-                    data.default.name = item.name
-                    resolve(data)
-                  })
-                }
-              } else {
-                delete item.component
-              }
-            }
-            if (target && target.url) {
-              // target.url already overrides uri-based path/query resolution.
-            } else {
-              item.path = '/' + path
-              item.query = query
-            }
-          } catch (e) {
-            delete item.component
-          }
-        }
-      }
-      if (item.path == null) {
-        item.path = ''
-      }
-      if (item.component && typeof item.component === 'string') {
-        delete item.component
-      }
-      if (item.children && item.children.length > 0) {
-        generator(item.children, constantRouterComponents)
-      }
-    }
-  }
-  return menuData
-}
-
-export function generatorDynamicRouter(permissionList, constantRouterComponents, appIds = null, generateType = 'router') {
-  const allMenu = generatorMenuRouter(permissionList, appIds, generateType)
-  const menuData = allMenu.menuData
-  const pageNode = allMenu.pageNode
-
-  if (menuData && pageNode && pageNode.children.length > 0) {
-    menuData.push(pageNode)
-  }
-
-  return generator(menuData, constantRouterComponents)
-}
-
-export default generatorDynamicRouter
+import config from "../../config/config"
+import { deepCopy } from '../assist'
+import { getUrlParams } from '../platform'
+
+const ROUTE_PERMISSION_TYPES = new Set([1, 2, 4])
+
+function isAppMatched(itemAppId, appIds) {
+  if (!appIds) {
+    return true
+  }
+  if (itemAppId === appIds) {
+    return true
+  }
+  if (Array.isArray(appIds)) {
+    return appIds.indexOf(itemAppId) > -1
+  }
+  if (typeof appIds === 'string') {
+    return appIds.indexOf(itemAppId) > -1
+  }
+  return false
+}
+
+function shouldIncludePermission(item, appIds, generateType) {
+  const appIdCondition = isAppMatched(item.appId, appIds)
+  if (generateType === 'menu') {
+    const hideInMenuCondition = !(Object.prototype.hasOwnProperty.call(item, 'hideInMenu') && item.hideInMenu)
+    return appIdCondition && hideInMenuCondition
+  }
+  if (generateType && generateType === 'router') {
+    return appIdCondition
+  }
+  return false
+}
+
+function buildChildrenMap(permissionList, appIds, generateType) {
+  const childrenMap = new Map()
+
+  permissionList.forEach((item) => {
+    if (!item || !ROUTE_PERMISSION_TYPES.has(item.type)) {
+      return
+    }
+    if (!shouldIncludePermission(item, appIds, generateType)) {
+      return
+    }
+
+    const pid = item.pid
+    if (!childrenMap.has(pid)) {
+      childrenMap.set(pid, [])
+    }
+    childrenMap.get(pid).push(item)
+  })
+
+  return childrenMap
+}
+
+function createCrumb(item) {
+  return {
+    icon: item.icon,
+    name: item.name,
+    title: item.label,
+    type: item.type
+  }
+}
+
+function buildMenuTree(childrenMap, parentId, crumbs, root, pageChildren) {
+  const siblings = childrenMap.get(parentId) || []
+  const menuTree = []
+
+  siblings.forEach((item) => {
+    if (item.type === 1 || item.type === 2) {
+      const node = {
+        meta: {
+          data: deepCopy(item),
+          appId: item.appId,
+          title: item.label,
+          icon: item.icon,
+          crumbs: [...crumbs],
+          activeName: item.name,
+          notCache: Boolean(item.notCache),
+          hideInMenu: Boolean(item.hideInMenu)
+        },
+        permissionId: item.permissionId,
+        type: item.type,
+        pid: item.pid,
+        component: item.name,
+        name: item.name,
+        uri: item.uri,
+        children: []
+      }
+
+      node.meta.crumbs.push(createCrumb(item))
+
+      if (item.type === 1) {
+        node.component = root ? 'Main' : 'parentView'
+      }
+
+      node.children = buildMenuTree(childrenMap, item.permissionId, node.meta.crumbs, false, pageChildren)
+      if (!node.children.length) {
+        delete node.children
+      }
+
+      menuTree.push(node)
+      return
+    }
+
+    if (item.type === 4) {
+      const child = {
+        meta: {
+          data: deepCopy(item),
+          appId: item.appId,
+          title: item.label,
+          hideInMenu: true,
+          notCache: true,
+          crumbs: [...crumbs],
+          type: item.type
+        },
+        permissionId: item.permissionId,
+        type: item.type,
+        pid: item.pid,
+        component: item.name,
+        name: item.name,
+        uri: item.uri
+      }
+
+      child.meta.crumbs.push(createCrumb(item))
+      pageChildren.push(child)
+    }
+  })
+
+  return menuTree
+}
+
+export function generatorMenuRouter(permissionList, appIds, generateType = 'router') {
+  const pageNode = {
+    path: '/page',
+    name: 'page',
+    meta: {
+      hideInMenu: true,
+      notCache: true
+    },
+    component: 'Main',
+    children: []
+  }
+
+  const childrenMap = buildChildrenMap(permissionList || [], appIds, generateType)
+  const menuData = buildMenuTree(childrenMap, '0', [], true, pageNode.children)
+  return { menuData, pageNode }
+}
+
+function generator(menuData, constantRouterComponents) {
+  for (const item of menuData) {
+    if (item.component && typeof item.component === 'string') {
+      const target = constantRouterComponents[item.component]
+      if (target) {
+        if (target.component) {
+          if (typeof target.component === 'string') {
+            try {
+              item.component = resolve =>
+                require(['@/view/' + target.component], data => {
+                  data.default.name = item.name
+                  resolve(data)
+                })
+            } catch (e) {
+              delete item.component
+            }
+          } else {
+            item.component = target.component
+          }
+        }
+        if (target.url) {
+          let path = target.url
+          let query = {}
+          if (path.indexOf('?') > -1) {
+            query = getUrlParams(path.substr(path.indexOf('?')))
+            item.query = query
+            path = path.substr(0, path.indexOf('?'))
+          }
+          item.path = path
+        }
+        if (item.uri) {
+          item.meta.uriParam = item.uri
+        }
+        if (target.notCache) {
+          item.meta.notCache = target.notCache
+        }
+        if (target.hideInMenu) {
+          item.meta.hideInMenu = target.hideInMenu
+        }
+      }
+      if (item.uri) {
+        if (item.uri.startsWith('/')) {
+          item.uri = item.uri.substr(1)
+        }
+        let uri = item.uri
+        if (uri.startsWith(config.routerBase + '/')) {
+          uri = uri.replace(config.routerBase + '/', '')
+        }
+        if (uri.startsWith('dida/')) {
+          item.meta.notCache = true
+          let path = uri
+          let query = {}
+          if (path.indexOf('?') > -1) {
+            query = getUrlParams(path.substr(path.indexOf('?')))
+            item.query = query
+            path = path.substr(0, path.indexOf('?'))
+          }
+          try {
+            item.component = resolve => {
+              require(['@/view/dida/dida-page'], data => {
+                data.default.name = item.name
+                resolve(data)
+              })
+            }
+          } catch (e) {
+            delete item.component
+          }
+          item.path = '/' + path
+        } else if (uri.startsWith('dareport/')) {
+          item.meta.notCache = true
+          let path = uri
+          let query = {}
+          if (path.indexOf('?') > -1) {
+            query = getUrlParams(path.substr(path.indexOf('?')))
+            item.query = query
+            path = path.substr(0, path.indexOf('?'))
+          }
+          try {
+            item.component = resolve => {
+              require(['@/view/dida/dida-page'], data => {
+                data.default.name = item.name
+                resolve(data)
+              })
+            }
+          } catch (e) {
+            delete item.component
+          }
+          item.path = '/' + path
+        } else {
+          try {
+            let path = item.uri
+            /*if (item.uri.startsWith(config.routerBase + '/')) {
+              path = path.replace(config.routerBase + '/', '')
+            }*/
+            if (item.uri.indexOf(config.routerBase + "/") > -1) {
+              path = path.substr(item.uri.indexOf(config.routerBase + "/") + (config.routerBase + "/").length)
+            }
+            let query = {}
+            if (path.indexOf('?') > -1) {
+              query = getUrlParams(path.substr(path.indexOf('?')))
+              path = path.substr(0, path.indexOf('?'))
+            }
+            if (target && target.component) {
+              // target.component already overrides uri-based component resolution.
+            } else {
+              const component = require('@/view/' + path)
+              if (component) {
+                item.component = resolve => {
+                  require(['@/view/' + path], data => {
+                    data.default.name = item.name
+                    resolve(data)
+                  })
+                }
+              } else {
+                delete item.component
+              }
+            }
+            if (target && target.url) {
+              // target.url already overrides uri-based path/query resolution.
+            } else {
+              item.path = '/' + path
+              item.query = query
+            }
+          } catch (e) {
+            delete item.component
+          }
+        }
+      }
+      if (item.path == null) {
+        item.path = ''
+      }
+      if (item.component && typeof item.component === 'string') {
+        delete item.component
+      }
+      if (item.children && item.children.length > 0) {
+        generator(item.children, constantRouterComponents)
+      }
+    }
+  }
+  return menuData
+}
+
+export function generatorDynamicRouter(permissionList, constantRouterComponents, appIds = null, generateType = 'router') {
+  const allMenu = generatorMenuRouter(permissionList, appIds, generateType)
+  const menuData = allMenu.menuData
+  const pageNode = allMenu.pageNode
+
+  if (menuData && pageNode && pageNode.children.length > 0) {
+    menuData.push(pageNode)
+  }
+
+  return generator(menuData, constantRouterComponents)
+}
+
+export default generatorDynamicRouter

package/utils/menu/index.js

@@ -329,8 +329,11 @@ const generator = (menuData,constantRouterComponents) => {
                 } else {
                     try{
                         let path = item.uri;
-                        if (item.uri.startsWith(config.routerBase + "/")) {
+                        /*if (item.uri.startsWith(config.routerBase + "/")) {
                             path = path.replace(config.routerBase + "/","")
+                        }*/
+                        if (item.uri.indexOf(config.routerBase + "/") > -1) {
+                            path = path.substr(item.uri.indexOf(config.routerBase + "/") + (config.routerBase + "/").length)
                         }
                         let query = {};
                         if (path.indexOf("?") > -1) {

package/config/themes/atrovirens/var.css

@@ -1,29 +0,0 @@
-/*
-vxe-table
-*/
-/*font*/
-/*size*/
-/*icon*/
-/*color*/
-/*input/radio/checkbox*/
-/*popup*/
-/*table*/
-/*filter*/
-/*menu*/
-/*loading*/
-/*validate*/
-/*grid*/
-/*toolbar*/
-/*tooltip*/
-/*pager*/
-/*modal*/
-/*checkbox*/
-/*radio*/
-/*button*/
-/*input*/
-/*textarea*/
-/*form*/
-/*select*/
-/*switch*/
-/*pulldown*/
-/*# sourceMappingURL=var.css.map */

package/config/themes/atrovirens/var.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"var.css"}