diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8a4e672b..da77c95c 100644 --- a/azure-pipelines.yml +++ b/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 diff --git a/package.json b/package.json index cfd25608..1d17adf6 100644 --- a/package.json +++ b/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" diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 596038a1..ca2a2415 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -181,7 +181,7 @@ const BasicLayout: React.FC = props => { footerRender={footerRender} menuDataRender={menuDataRender} formatMessage={formatMessage} - rightContentRender={rightProps => } + rightContentRender={() => } {...props} {...settings} > diff --git a/src/layouts/SecurityLayout.tsx b/src/layouts/SecurityLayout.tsx index b485b8c3..2981fc27 100644 --- a/src/layouts/SecurityLayout.tsx +++ b/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 {