Sfoglia il codice sorgente

bugfix: add tsc test and fix ts error

chenshuai2144 6 anni fa
parent
commit
71f6b235ff
4 ha cambiato i file con 19 aggiunte e 12 eliminazioni
  1. 15 9
      azure-pipelines.yml
  2. 1 0
      package.json
  3. 1 1
      src/layouts/BasicLayout.tsx
  4. 2 2
      src/layouts/SecurityLayout.tsx

+ 15 - 9
azure-pipelines.yml

@@ -11,7 +11,7 @@ jobs:
   - job: lintAndBuild
 
     pool:
-      vmImage: 'Ubuntu-16.04'
+      vmImage: "Ubuntu-16.04"
 
     steps:
       - checkout: self
@@ -20,6 +20,8 @@ jobs:
         displayName: install
       - script: npm run lint
         displayName: lint
+      - script: npm run tsc
+        displayName: tsc
       - script: npm run build
         env:
           PROGRESS: none
@@ -27,32 +29,34 @@ 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: yarn install
         displayName: install
       - script: npm run test:all
         env:
-           PROGRESS: none
-           UMI_UI: none
+          PROGRESS: none
+          UMI_UI: none
         displayName: test
 
   - job: Windows
     pool:
-      vmImage: 'vs2017-win2016'
+      vmImage: "vs2017-win2016"
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '11.x'
+          versionSpec: "11.x"
       - script: yarn install
         displayName: install
       - script: npm run lint
         displayName: lint
+      - script: npm run tsc
+        displayName: tsc
       - script: npm run test:all
         env:
           PROGRESS: none
@@ -65,15 +69,17 @@ jobs:
 
   - job: MacOS
     pool:
-      vmImage: 'macOS-10.13'
+      vmImage: "macOS-10.13"
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '11.x'
+          versionSpec: "11.x"
       - script: yarn install
         displayName: install
       - script: npm run lint
         displayName: lint
+      - script: npm run tsc
+        displayName: tsc
       - script: npm run
         env:
           PROGRESS: none

+ 1 - 0
package.json

@@ -33,6 +33,7 @@
     "start:no-mock": "cross-env MOCK=none umi dev",
     "start:no-ui": "cross-env UMI_UI=none umi dev",
     "test": "umi test",
+    "tsc": "tsc",
     "test:all": "node ./tests/run-tests.js",
     "test:component": "umi test ./src/components",
     "ui": "umi ui"

+ 1 - 1
src/layouts/BasicLayout.tsx

@@ -181,7 +181,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
       footerRender={footerRender}
       menuDataRender={menuDataRender}
       formatMessage={formatMessage}
-      rightContentRender={rightProps => <RightContent {...rightProps} />}
+      rightContentRender={() => <RightContent />}
       {...props}
       {...settings}
     >

+ 2 - 2
src/layouts/SecurityLayout.tsx

@@ -7,8 +7,8 @@ import { CurrentUser } from '@/models/user';
 import PageLoading from '@/components/PageLoading';
 
 interface SecurityLayoutProps extends ConnectProps {
-  loading: boolean;
-  currentUser: CurrentUser;
+  loading?: boolean;
+  currentUser?: CurrentUser;
 }
 
 interface SecurityLayoutState {