chenshuai2144 пре 6 година
родитељ
комит
4e62a9f278
3 измењених фајлова са 9 додато и 9 уклоњено
  1. 7 7
      azure-pipelines.yml
  2. 1 1
      src/layouts/BasicLayout.tsx
  3. 1 1
      src/utils/utils.ts

+ 7 - 7
azure-pipelines.yml

@@ -11,7 +11,7 @@ jobs:
   - job: lintAndBuild
 
     pool:
-      vmImage: "Ubuntu-16.04"
+      vmImage: 'Ubuntu-16.04'
 
     steps:
       - checkout: self
@@ -29,11 +29,11 @@ jobs:
 
   - job: test
     pool:
-      vmImage: "Ubuntu-16.04"
+      vmImage: 'Ubuntu-16.04'
 
     container:
       image: circleci/node:latest-browsers
-      options: "-u root"
+      options: '-u root'
 
     steps:
       - script: npm install
@@ -46,11 +46,11 @@ jobs:
 
   - job: Windows
     pool:
-      vmImage: "win1803"
+      vmImage: 'win1803'
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "11.x"
+          versionSpec: '11.x'
       - script: npm install
         displayName: install
       - script: npm run lint
@@ -69,11 +69,11 @@ jobs:
 
   - job: MacOS
     pool:
-      vmImage: "macOS-latest"
+      vmImage: 'macOS-latest'
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "11.x"
+          versionSpec: '11.x'
       - script: npm install
         displayName: install
       - script: npm run lint

+ 1 - 1
src/layouts/BasicLayout.tsx

@@ -155,7 +155,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
       )}
       onCollapse={handleMenuCollapse}
       menuItemRender={(menuItemProps, defaultDom) => {
-        if (menuItemProps.isUrl || menuItemProps.children) {
+        if (menuItemProps.isUrl || menuItemProps.children || !menuItemProps.path) {
           return defaultDom;
         }
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;

+ 1 - 1
src/utils/utils.ts

@@ -30,7 +30,7 @@ export const getPageQuery = () => parse(window.location.href.split('?')[1]);
  * @param router [{}]
  * @param pathname string
  */
-export const getAuthorityFromRouter = <T extends { path: string }>(
+export const getAuthorityFromRouter = <T extends { path?: string }>(
   router: T[] = [],
   pathname: string,
 ): T | undefined => {