From 6412fd6c35252ed1bc7cfdb6efe99bff37f60b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 23 Mar 2020 17:38:44 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20dependency:=20up=20prettier=20packa?= =?UTF-8?q?ge.json=20(#6184)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/listTableList.ts | 8 ++++---- package.json | 4 ++-- src/components/Authorized/CheckPermissions.tsx | 4 ++-- src/components/GlobalHeader/NoticeIconView.tsx | 8 ++++---- src/components/GlobalHeader/RightContent.tsx | 2 +- src/components/HeaderSearch/index.tsx | 4 ++-- src/components/NoticeIcon/NoticeList.tsx | 2 +- src/components/NoticeIcon/index.tsx | 2 +- src/components/SelectLang/index.tsx | 4 ++-- src/e2e/baseLayout.e2e.js | 8 ++++---- src/global.tsx | 12 ++++++------ src/layouts/BasicLayout.tsx | 4 ++-- src/layouts/UserLayout.tsx | 2 +- src/models/global.ts | 8 ++++---- src/models/setting.ts | 2 +- src/pages/ListTableList/components/CreateForm.tsx | 2 +- src/pages/ListTableList/components/UpdateForm.tsx | 2 +- src/pages/ListTableList/index.tsx | 10 +++++----- src/pages/document.ejs | 11 +++++++++-- .../user/login/components/Login/LoginItem.tsx | 8 ++++---- src/pages/user/login/components/Login/LoginTab.tsx | 6 +++--- src/pages/user/login/components/Login/index.tsx | 14 +++++++------- src/pages/user/login/index.tsx | 4 ++-- src/service-worker.js | 4 ++-- src/utils/utils.ts | 2 +- tests/run-tests.js | 6 +++--- 26 files changed, 75 insertions(+), 68 deletions(-) diff --git a/mock/listTableList.ts b/mock/listTableList.ts index c5784681..efc3224b 100644 --- a/mock/listTableList.ts +++ b/mock/listTableList.ts @@ -57,7 +57,7 @@ function getRule(req: Request, res: Response, u: string) { let filterDataSource: TableListItem[] = []; status.forEach((s: string) => { filterDataSource = filterDataSource.concat( - dataSource.filter(item => { + dataSource.filter((item) => { if (parseInt(`${item.status}`, 10) === parseInt(s.split('')[0], 10)) { return true; } @@ -69,7 +69,7 @@ function getRule(req: Request, res: Response, u: string) { } if (params.name) { - dataSource = dataSource.filter(data => data.name.includes(params.name || '')); + dataSource = dataSource.filter((data) => data.name.includes(params.name || '')); } const result = { data: dataSource, @@ -94,7 +94,7 @@ function postRule(req: Request, res: Response, u: string, b: Request) { switch (method) { /* eslint no-case-declarations:0 */ case 'delete': - tableListDataSource = tableListDataSource.filter(item => key.indexOf(item.key) === -1); + tableListDataSource = tableListDataSource.filter((item) => key.indexOf(item.key) === -1); break; case 'post': (() => { @@ -123,7 +123,7 @@ function postRule(req: Request, res: Response, u: string, b: Request) { case 'update': (() => { let newRule = {}; - tableListDataSource = tableListDataSource.map(item => { + tableListDataSource = tableListDataSource.map((item) => { if (item.key === key) { newRule = { ...item, desc, name }; return { ...item, desc, name }; diff --git a/package.json b/package.json index 8555832f..12d2f7bd 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@types/react": "^16.9.17", "@types/react-dom": "^16.8.4", "@types/react-helmet": "^5.0.13", - "@umijs/fabric": "^2.0.2", + "@umijs/fabric": "^2.0.5", "@umijs/plugin-blocks": "^2.0.5", "@umijs/preset-ant-design-pro": "^1.0.1", "@umijs/preset-react": "^1.3.0", @@ -99,7 +99,7 @@ "jsdom-global": "^3.0.2", "lint-staged": "^10.0.0", "mockjs": "^1.0.1-beta3", - "prettier": "^1.19.1", + "prettier": "^2.0.1", "pro-download": "1.0.1", "stylelint": "^13.0.0" }, diff --git a/src/components/Authorized/CheckPermissions.tsx b/src/components/Authorized/CheckPermissions.tsx index caa15a38..ff35f60f 100644 --- a/src/components/Authorized/CheckPermissions.tsx +++ b/src/components/Authorized/CheckPermissions.tsx @@ -32,7 +32,7 @@ const checkPermissions = ( // 数组处理 if (Array.isArray(authority)) { if (Array.isArray(currentAuthority)) { - if (currentAuthority.some(item => authority.includes(item))) { + if (currentAuthority.some((item) => authority.includes(item))) { return target; } } else if (authority.includes(currentAuthority)) { @@ -43,7 +43,7 @@ const checkPermissions = ( // string 处理 if (typeof authority === 'string') { if (Array.isArray(currentAuthority)) { - if (currentAuthority.some(item => authority === item)) { + if (currentAuthority.some((item) => authority === item)) { return target; } } else if (authority === currentAuthority) { diff --git a/src/components/GlobalHeader/NoticeIconView.tsx b/src/components/GlobalHeader/NoticeIconView.tsx index 7658896a..3c10eb1d 100644 --- a/src/components/GlobalHeader/NoticeIconView.tsx +++ b/src/components/GlobalHeader/NoticeIconView.tsx @@ -61,7 +61,7 @@ class GlobalHeaderRight extends Component { return {}; } - const newNotices = notices.map(notice => { + const newNotices = notices.map((notice) => { const newNotice = { ...notice }; if (newNotice.datetime) { @@ -100,7 +100,7 @@ class GlobalHeaderRight extends Component { const unreadMsg: { [key: string]: number; } = {}; - Object.keys(noticeData).forEach(key => { + Object.keys(noticeData).forEach((key) => { const value = noticeData[key]; if (!unreadMsg[key]) { @@ -108,7 +108,7 @@ class GlobalHeaderRight extends Component { } if (Array.isArray(value)) { - unreadMsg[key] = value.filter(item => !item.read).length; + unreadMsg[key] = value.filter((item) => !item.read).length; } }); return unreadMsg; @@ -122,7 +122,7 @@ class GlobalHeaderRight extends Component { { + onItemClick={(item) => { this.changeReadState(item as NoticeItem); }} loading={fetchingNotices} diff --git a/src/components/GlobalHeader/RightContent.tsx b/src/components/GlobalHeader/RightContent.tsx index 90e4dcb9..a8e536fe 100644 --- a/src/components/GlobalHeader/RightContent.tsx +++ b/src/components/GlobalHeader/RightContent.tsx @@ -20,7 +20,7 @@ const ENVTagColor = { pre: '#87d068', }; -const GlobalHeaderRight: React.SFC = props => { +const GlobalHeaderRight: React.SFC = (props) => { const { theme, layout } = props; let className = styles.right; diff --git a/src/components/HeaderSearch/index.tsx b/src/components/HeaderSearch/index.tsx index e09cf5b7..290d4313 100644 --- a/src/components/HeaderSearch/index.tsx +++ b/src/components/HeaderSearch/index.tsx @@ -20,7 +20,7 @@ export interface HeaderSearchProps { value?: string; } -const HeaderSearch: React.FC = props => { +const HeaderSearch: React.FC = (props) => { const { className, defaultValue, @@ -86,7 +86,7 @@ const HeaderSearch: React.FC = props => { defaultValue={defaultValue} aria-label={placeholder} placeholder={placeholder} - onKeyDown={e => { + onKeyDown={(e) => { if (e.key === 'Enter') { if (restProps.onSearch) { restProps.onSearch(value); diff --git a/src/components/NoticeIcon/NoticeList.tsx b/src/components/NoticeIcon/NoticeList.tsx index 54e03543..7c1b6abb 100644 --- a/src/components/NoticeIcon/NoticeList.tsx +++ b/src/components/NoticeIcon/NoticeList.tsx @@ -97,7 +97,7 @@ const NoticeList: React.SFC = ({ ) : null} {showViewMore ? (
{ + onClick={(e) => { if (onViewMore) { onViewMore(e); } diff --git a/src/components/NoticeIcon/index.tsx b/src/components/NoticeIcon/index.tsx index 3c940948..c4b001fc 100644 --- a/src/components/NoticeIcon/index.tsx +++ b/src/components/NoticeIcon/index.tsx @@ -42,7 +42,7 @@ export interface NoticeIconProps { const NoticeIcon: React.FC & { Tab: typeof NoticeList; -} = props => { +} = (props) => { const getNotificationBox = (): React.ReactNode => { const { children, diff --git a/src/components/SelectLang/index.tsx b/src/components/SelectLang/index.tsx index b23b5eb0..f96282b5 100644 --- a/src/components/SelectLang/index.tsx +++ b/src/components/SelectLang/index.tsx @@ -11,7 +11,7 @@ interface SelectLangProps { className?: string; } -const SelectLang: React.FC = props => { +const SelectLang: React.FC = (props) => { const { className } = props; const selectedLang = getLocale(); @@ -32,7 +32,7 @@ const SelectLang: React.FC = props => { }; const langMenu = ( - {locales.map(locale => ( + {locales.map((locale) => ( {languageIcons[locale]} diff --git a/src/e2e/baseLayout.e2e.js b/src/e2e/baseLayout.e2e.js index 21dc245d..e8a79354 100644 --- a/src/e2e/baseLayout.e2e.js +++ b/src/e2e/baseLayout.e2e.js @@ -8,7 +8,7 @@ const getBrowser = require('./getBrowser'); function formatter(routes, parentPath = '') { const fixedParentPath = parentPath.replace(/\/{1,}/g, '/'); let result = []; - routes.forEach(item => { + routes.forEach((item) => { if (item.path) { result.push(`${fixedParentPath}/${item.path}`.replace(/\/{1,}/g, '/')); } @@ -18,7 +18,7 @@ function formatter(routes, parentPath = '') { ); } }); - return uniq(result.filter(item => !!item)); + return uniq(result.filter((item) => !!item)); } let browser; @@ -37,7 +37,7 @@ beforeEach(async () => { }); describe('Ant Design Pro E2E test', () => { - const testPage = path => async () => { + const testPage = (path) => async () => { await page.goto(`${BASE_URL}${path}`); await page.waitForSelector('footer', { timeout: 2000, @@ -49,7 +49,7 @@ describe('Ant Design Pro E2E test', () => { }; const routers = formatter(RouterConfig); - routers.forEach(route => { + routers.forEach((route) => { it(`test pages ${route}`, testPage(route)); }); }); diff --git a/src/global.tsx b/src/global.tsx index 21d4138a..f7620c4e 100644 --- a/src/global.tsx +++ b/src/global.tsx @@ -25,7 +25,7 @@ if (pwa) { // Send skip-waiting event to waiting SW with MessageChannel await new Promise((resolve, reject) => { const channel = new MessageChannel(); - channel.port1.onmessage = msgEvent => { + channel.port1.onmessage = (msgEvent) => { if (msgEvent.data.error) { reject(msgEvent.data.error); } else { @@ -62,20 +62,20 @@ if (pwa) { // unregister service worker const { serviceWorker } = navigator; if (serviceWorker.getRegistrations) { - serviceWorker.getRegistrations().then(sws => { - sws.forEach(sw => { + serviceWorker.getRegistrations().then((sws) => { + sws.forEach((sw) => { sw.unregister(); }); }); } - serviceWorker.getRegistration().then(sw => { + serviceWorker.getRegistration().then((sw) => { if (sw) sw.unregister(); }); // remove all caches if (window.caches && window.caches.keys) { - caches.keys().then(keys => { - keys.forEach(key => { + caches.keys().then((keys) => { + keys.forEach((key) => { caches.delete(key); }); }); diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index e3d4e9c3..6f50b5fa 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -51,7 +51,7 @@ export type BasicLayoutContext = { [K in 'location']: BasicLayoutProps[K] } & { */ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] => - menuList.map(item => { + menuList.map((item) => { const localItem = { ...item, children: item.children ? menuDataRender(item.children) : [] }; return Authorized.check(item.authority, localItem, null) as MenuDataItem; }); @@ -82,7 +82,7 @@ const defaultFooterDom = ( /> ); -const BasicLayout: React.FC = props => { +const BasicLayout: React.FC = (props) => { const { dispatch, children, diff --git a/src/layouts/UserLayout.tsx b/src/layouts/UserLayout.tsx index 81fd9b4b..5e386350 100644 --- a/src/layouts/UserLayout.tsx +++ b/src/layouts/UserLayout.tsx @@ -13,7 +13,7 @@ export interface UserLayoutProps extends Partial { }; } -const UserLayout: React.FC = props => { +const UserLayout: React.FC = (props) => { const { route = { routes: [], diff --git a/src/models/global.ts b/src/models/global.ts index 3200a7fa..3bdfaeb2 100644 --- a/src/models/global.ts +++ b/src/models/global.ts @@ -47,7 +47,7 @@ const GlobalModel: GlobalModelType = { payload: data, }); const unreadCount: number = yield select( - (state: ConnectState) => state.global.notices.filter(item => !item.read).length, + (state: ConnectState) => state.global.notices.filter((item) => !item.read).length, ); yield put({ type: 'user/changeNotifyCount', @@ -64,7 +64,7 @@ const GlobalModel: GlobalModelType = { }); const count: number = yield select((state: ConnectState) => state.global.notices.length); const unreadCount: number = yield select( - (state: ConnectState) => state.global.notices.filter(item => !item.read).length, + (state: ConnectState) => state.global.notices.filter((item) => !item.read).length, ); yield put({ type: 'user/changeNotifyCount', @@ -76,7 +76,7 @@ const GlobalModel: GlobalModelType = { }, *changeNoticeReadState({ payload }, { put, select }) { const notices: NoticeItem[] = yield select((state: ConnectState) => - state.global.notices.map(item => { + state.global.notices.map((item) => { const notice = { ...item }; if (notice.id === payload) { notice.read = true; @@ -94,7 +94,7 @@ const GlobalModel: GlobalModelType = { type: 'user/changeNotifyCount', payload: { totalCount: notices.length, - unreadCount: notices.filter(item => !item.read).length, + unreadCount: notices.filter((item) => !item.read).length, }, }); }, diff --git a/src/models/setting.ts b/src/models/setting.ts index 59fa70a6..37a4ea7c 100644 --- a/src/models/setting.ts +++ b/src/models/setting.ts @@ -9,7 +9,7 @@ export interface SettingModelType { }; } -const updateColorWeak: (colorWeak: boolean) => void = colorWeak => { +const updateColorWeak: (colorWeak: boolean) => void = (colorWeak) => { const root = document.getElementById('root'); if (root) { root.className = colorWeak ? 'colorWeak' : ''; diff --git a/src/pages/ListTableList/components/CreateForm.tsx b/src/pages/ListTableList/components/CreateForm.tsx index 817922a2..2d8b2164 100644 --- a/src/pages/ListTableList/components/CreateForm.tsx +++ b/src/pages/ListTableList/components/CreateForm.tsx @@ -6,7 +6,7 @@ interface CreateFormProps { onCancel: () => void; } -const CreateForm: React.FC = props => { +const CreateForm: React.FC = (props) => { const { modalVisible, onCancel } = props; return ( diff --git a/src/pages/ListTableList/components/UpdateForm.tsx b/src/pages/ListTableList/components/UpdateForm.tsx index 2c20df39..3e9830ca 100644 --- a/src/pages/ListTableList/components/UpdateForm.tsx +++ b/src/pages/ListTableList/components/UpdateForm.tsx @@ -33,7 +33,7 @@ const formLayout = { wrapperCol: { span: 13 }, }; -const UpdateForm: React.FC = props => { +const UpdateForm: React.FC = (props) => { const [formVals, setFormVals] = useState({ name: props.values.name, desc: props.values.desc, diff --git a/src/pages/ListTableList/index.tsx b/src/pages/ListTableList/index.tsx index 22e15b6c..f91e4969 100644 --- a/src/pages/ListTableList/index.tsx +++ b/src/pages/ListTableList/index.tsx @@ -60,7 +60,7 @@ const handleRemove = async (selectedRows: TableListItem[]) => { if (!selectedRows) return true; try { await removeRule({ - key: selectedRows.map(row => row.key), + key: selectedRows.map((row) => row.key), }); hide(); message.success('删除成功，即将刷新'); @@ -163,7 +163,7 @@ const TableList: React.FC<{}> = () => { { + onClick={async (e) => { if (e.key === 'remove') { await handleRemove(selectedRows); action.reload(); @@ -190,13 +190,13 @@ const TableList: React.FC<{}> = () => {
)} - request={params => queryRule(params)} + request={(params) => queryRule(params)} columns={columns} rowSelection={{}} /> handleModalVisible(false)} modalVisible={createModalVisible}> - onSubmit={async value => { + onSubmit={async (value) => { const success = await handleAdd(value); if (success) { handleModalVisible(false); @@ -213,7 +213,7 @@ const TableList: React.FC<{}> = () => { {stepFormValues && Object.keys(stepFormValues).length ? ( { + onSubmit={async (value) => { const success = await handleUpdate(value); if (success) { handleModalVisible(false); diff --git a/src/pages/document.ejs b/src/pages/document.ejs index 45b16b8b..9af4adb5 100644 --- a/src/pages/document.ejs +++ b/src/pages/document.ejs @@ -182,7 +182,14 @@ }
logo
@@ -193,7 +200,7 @@ >
-
+
= props => { +const LoginItem: React.FC = (props) => { const [count, setCount] = useState(props.countDown || 0); const [timing, setTiming] = useState(false); // 这么写是为了防止restProps中 带入 onChange, defaultValue, rules props tabUtil @@ -89,7 +89,7 @@ const LoginItem: React.FC = props => { const { countDown } = props; if (timing) { interval = window.setInterval(() => { - setCount(preSecond => { + setCount((preSecond) => { if (preSecond <= 1) { setTiming(false); clearInterval(interval); @@ -148,11 +148,11 @@ const LoginItem: React.FC = props => { const LoginItems: Partial = {}; -Object.keys(ItemMap).forEach(key => { +Object.keys(ItemMap).forEach((key) => { const item = ItemMap[key]; LoginItems[key] = (props: LoginItemProps) => ( - {context => ( + {(context) => ( = props => { +const LoginTab: React.FC = (props) => { useEffect(() => { const uniqueId = generateId('login-tab-'); const { tabUtil } = props; @@ -32,9 +32,9 @@ const LoginTab: React.FC = props => { const WrapContext: React.FC & { typeName: string; -} = props => ( +} = (props) => ( - {value => } + {(value) => } ); diff --git a/src/pages/user/login/components/Login/index.tsx b/src/pages/user/login/components/Login/index.tsx index 8e9f680b..c0ea0c59 100644 --- a/src/pages/user/login/components/Login/index.tsx +++ b/src/pages/user/login/components/Login/index.tsx @@ -30,7 +30,7 @@ interface LoginType extends React.FC { Captcha: React.FunctionComponent; } -const Login: LoginType = props => { +const Login: LoginType = (props) => { const { className } = props; const [tabs, setTabs] = useState([]); const [active, setActive] = useState({}); @@ -57,14 +57,14 @@ const Login: LoginType = props => { { + addTab: (id) => { setTabs([...tabs, id]); }, - removeTab: id => { - setTabs(tabs.filter(currentId => currentId !== id)); + removeTab: (id) => { + setTabs(tabs.filter((currentId) => currentId !== id)); }, }, - updateActive: activeItem => { + updateActive: (activeItem) => { if (!active) return; if (active[type]) { active[type].push(activeItem); @@ -78,7 +78,7 @@ const Login: LoginType = props => {
{ + onFinish={(values) => { if (props.onSubmit) { props.onSubmit(values as LoginParamsType); } @@ -90,7 +90,7 @@ const Login: LoginType = props => { animated={false} className={styles.tabs} activeKey={type} - onChange={activeKey => { + onChange={(activeKey) => { setType(activeKey); }} > diff --git a/src/pages/user/login/index.tsx b/src/pages/user/login/index.tsx index 5502e7c9..024c418d 100644 --- a/src/pages/user/login/index.tsx +++ b/src/pages/user/login/index.tsx @@ -29,7 +29,7 @@ const LoginMessage: React.FC<{ /> ); -const Login: React.FC = props => { +const Login: React.FC = (props) => { const { userLogin = {}, submitting } = props; const { status, type: loginType } = userLogin; const [autoLogin, setAutoLogin] = useState(true); @@ -104,7 +104,7 @@ const Login: React.FC = props => { />
- setAutoLogin(e.target.checked)}> + setAutoLogin(e.target.checked)}> 自动登录 { +addEventListener('message', (event) => { const replyPort = event.ports[0]; const message = event.data; if (replyPort && message && message.type === 'skip-waiting') { @@ -60,7 +60,7 @@ addEventListener('message', event => { replyPort.postMessage({ error: null, }), - error => + (error) => replyPort.postMessage({ error, }), diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 9ba73c20..e0afc31e 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -45,7 +45,7 @@ export const getAuthorityFromRouter = ( export const getRouteAuthority = (path: string, routeData: Route[]) => { let authorities: string[] | string | undefined; - routeData.forEach(route => { + routeData.forEach((route) => { // match prefix if (pathRegexp(`${route.path}/(.*)`).test(`${path}/`)) { if (route.authority) { diff --git a/tests/run-tests.js b/tests/run-tests.js index 93ee8d62..3aa080da 100644 --- a/tests/run-tests.js +++ b/tests/run-tests.js @@ -17,7 +17,7 @@ const startServer = spawn(/^win/.test(process.platform) ? 'npm.cmd' : 'npm', ['s env, }); -startServer.stderr.on('data', data => { +startServer.stderr.on('data', (data) => { // eslint-disable-next-line console.log(data.toString()); }); @@ -27,7 +27,7 @@ startServer.on('exit', () => { }); console.log('Starting development server for e2e tests...'); -startServer.stdout.on('data', data => { +startServer.stdout.on('data', (data) => { console.log(data.toString()); // hack code , wait umi if ( @@ -44,7 +44,7 @@ startServer.stdout.on('data', data => { stdio: 'inherit', }, ); - testCmd.on('exit', code => { + testCmd.on('exit', (code) => { startServer.kill(); process.exit(code); });