diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3dc0f93f..61d31f3f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,7 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: '11.x' + versionSpec: '12.x' - script: yarn displayName: install - script: npm run lint @@ -73,7 +73,7 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: '11.x' + versionSpec: '12.x' - script: yarn displayName: install - script: npm run lint diff --git a/src/components/NoticeIcon/index.tsx b/src/components/NoticeIcon/index.tsx index c4b001fc..f91740e0 100644 --- a/src/components/NoticeIcon/index.tsx +++ b/src/components/NoticeIcon/index.tsx @@ -69,6 +69,7 @@ const NoticeIcon: React.FC & { panes.push( & { showClear={showClear} showViewMore={showViewMore} title={title} - {...child.props} /> , ); diff --git a/src/models/global.ts b/src/models/global.ts index 3bdfaeb2..5d4c4e40 100644 --- a/src/models/global.ts +++ b/src/models/global.ts @@ -116,8 +116,8 @@ const GlobalModel: GlobalModelType = { }, saveClearedNotices(state = { notices: [], collapsed: true }, { payload }): GlobalModelState { return { - collapsed: false, ...state, + collapsed: false, notices: state.notices.filter((item): boolean => item.type !== payload), }; },