Browse Source

bugfix: add tsc test and fix ts error

pull/5723/head
chenshuai2144 7 years ago
parent
commit
71f6b235ff
  1. 24
      azure-pipelines.yml
  2. 1
      package.json
  3. 2
      src/layouts/BasicLayout.tsx
  4. 4
      src/layouts/SecurityLayout.tsx

24
azure-pipelines.yml

@ -11,7 +11,7 @@ jobs:
- job: lintAndBuild - job: lintAndBuild
pool: pool:
vmImage: 'Ubuntu-16.04' vmImage: "Ubuntu-16.04"
steps: steps:
- checkout: self - checkout: self
@ -20,6 +20,8 @@ jobs:
displayName: install displayName: install
- script: npm run lint - script: npm run lint
displayName: lint displayName: lint
- script: npm run tsc
displayName: tsc
- script: npm run build - script: npm run build
env: env:
PROGRESS: none PROGRESS: none
@ -27,32 +29,34 @@ jobs:
- job: test - job: test
pool: pool:
vmImage: 'Ubuntu-16.04' vmImage: "Ubuntu-16.04"
container: container:
image: circleci/node:latest-browsers image: circleci/node:latest-browsers
options: '-u root' options: "-u root"
steps: steps:
- script: yarn install - script: yarn install
displayName: install displayName: install
- script: npm run test:all - script: npm run test:all
env: env:
PROGRESS: none PROGRESS: none
UMI_UI: none UMI_UI: none
displayName: test displayName: test
- job: Windows - job: Windows
pool: pool:
vmImage: 'vs2017-win2016' vmImage: "vs2017-win2016"
steps: steps:
- task: NodeTool@0 - task: NodeTool@0
inputs: inputs:
versionSpec: '11.x' versionSpec: "11.x"
- script: yarn install - script: yarn install
displayName: install displayName: install
- script: npm run lint - script: npm run lint
displayName: lint displayName: lint
- script: npm run tsc
displayName: tsc
- script: npm run test:all - script: npm run test:all
env: env:
PROGRESS: none PROGRESS: none
@ -65,15 +69,17 @@ jobs:
- job: MacOS - job: MacOS
pool: pool:
vmImage: 'macOS-10.13' vmImage: "macOS-10.13"
steps: steps:
- task: NodeTool@0 - task: NodeTool@0
inputs: inputs:
versionSpec: '11.x' versionSpec: "11.x"
- script: yarn install - script: yarn install
displayName: install displayName: install
- script: npm run lint - script: npm run lint
displayName: lint displayName: lint
- script: npm run tsc
displayName: tsc
- script: npm run - script: npm run
env: env:
PROGRESS: none PROGRESS: none

1
package.json

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

2
src/layouts/BasicLayout.tsx

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

4
src/layouts/SecurityLayout.tsx

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

Loading…
Cancel
Save