From 3b8262599ee72317c1fff0c86c547b6f342998e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Thu, 15 Feb 2018 09:18:59 +0800 Subject: [PATCH 01/11] add meun test and Modify part of the logic (#917) --- src/common/menu.js | 2 +- src/components/PageHeader/index.js | 115 +++++++++-------- src/components/PageHeader/index.test.js | 28 +---- src/components/SiderMenu/SiderMenu.js | 133 ++++++++++---------- src/components/SiderMenu/SilderMenu.test.js | 36 ++++++ src/components/utils/pathTools.js | 7 ++ src/components/utils/pathTools.test.js | 20 +++ 7 files changed, 198 insertions(+), 143 deletions(-) create mode 100644 src/components/SiderMenu/SilderMenu.test.js create mode 100644 src/components/utils/pathTools.js create mode 100644 src/components/utils/pathTools.test.js diff --git a/src/common/menu.js b/src/common/menu.js index 21b58d7a..50f8a464 100644 --- a/src/common/menu.js +++ b/src/common/menu.js @@ -115,7 +115,7 @@ const menuData = [{ }], }]; -function formatter(data, parentPath = '', parentAuthority) { +function formatter(data, parentPath = '/', parentAuthority) { return data.map((item) => { let { path } = item; if (!isUrl(path)) { diff --git a/src/components/PageHeader/index.js b/src/components/PageHeader/index.js index df514874..22dac870 100644 --- a/src/components/PageHeader/index.js +++ b/src/components/PageHeader/index.js @@ -4,7 +4,7 @@ import pathToRegexp from 'path-to-regexp'; import { Breadcrumb, Tabs } from 'antd'; import classNames from 'classnames'; import styles from './index.less'; - +import { urlToList } from '../utils/pathTools'; const { TabPane } = Tabs; export function getBreadcrumb(breadcrumbNameMap, url) { @@ -19,14 +19,6 @@ export function getBreadcrumb(breadcrumbNameMap, url) { return breadcrumb || {}; } -// /userinfo/2144/id => ['/userinfo','/useinfo/2144,'/userindo/2144/id'] -export function urlToList(url) { - const urllist = url.split('/').filter(i => i); - return urllist.map((urlItem, index) => { - return `/${urllist.slice(0, index + 1).join('/')}`; - }); -} - export default class PageHeader extends PureComponent { static contextTypes = { routes: PropTypes.array, @@ -44,29 +36,35 @@ export default class PageHeader extends PureComponent { routes: this.props.routes || this.context.routes, params: this.props.params || this.context.params, routerLocation: this.props.location || this.context.location, - breadcrumbNameMap: this.props.breadcrumbNameMap || this.context.breadcrumbNameMap, + breadcrumbNameMap: + this.props.breadcrumbNameMap || this.context.breadcrumbNameMap, }; }; // Generated according to props - conversionFromProps= () => { + conversionFromProps = () => { const { - breadcrumbList, breadcrumbSeparator, linkElement = 'a', + breadcrumbList, + breadcrumbSeparator, + linkElement = 'a', } = this.props; return ( - + {breadcrumbList.map(item => ( - {item.href ? (createElement(linkElement, { - [linkElement === 'a' ? 'href' : 'to']: item.href, - }, item.title)) : item.title} + {item.href + ? createElement( + linkElement, + { + [linkElement === 'a' ? 'href' : 'to']: item.href, + }, + item.title, + ) + : item.title} - ))} + ))} ); - } + }; conversionFromLocation = (routerLocation, breadcrumbNameMap) => { const { breadcrumbSeparator, linkElement = 'a' } = this.props; // Convert the url to an array @@ -74,7 +72,8 @@ export default class PageHeader extends PureComponent { // Loop data mosaic routing const extraBreadcrumbItems = pathSnippets.map((url, index) => { const currentBreadcrumb = getBreadcrumb(breadcrumbNameMap, url); - const isLinkable = (index !== pathSnippets.length - 1) && currentBreadcrumb.component; + const isLinkable = + index !== pathSnippets.length - 1 && currentBreadcrumb.component; return currentBreadcrumb.name && !currentBreadcrumb.hideInBreadcrumb ? ( {createElement( @@ -88,26 +87,33 @@ export default class PageHeader extends PureComponent { // Add home breadcrumbs to your head extraBreadcrumbItems.unshift( - {createElement(linkElement, { - [linkElement === 'a' ? 'href' : 'to']: '/' }, '首页')} - + {createElement( + linkElement, + { + [linkElement === 'a' ? 'href' : 'to']: '/', + }, + '首页', + )} + , ); return ( - + {extraBreadcrumbItems} ); - } + }; /** * 将参数转化为面包屑 * Convert parameters into breadcrumbs */ conversionBreadcrumbList = () => { const { breadcrumbList, breadcrumbSeparator } = this.props; - const { routes, params, routerLocation, breadcrumbNameMap } = this.getBreadcrumbProps(); + const { + routes, + params, + routerLocation, + breadcrumbNameMap, + } = this.getBreadcrumbProps(); if (breadcrumbList && breadcrumbList.length) { return this.conversionFromProps(); } @@ -130,24 +136,37 @@ export default class PageHeader extends PureComponent { return this.conversionFromLocation(routerLocation, breadcrumbNameMap); } return null; - } + }; // 渲染Breadcrumb 子节点 // Render the Breadcrumb child node itemRender = (route, params, routes, paths) => { const { linkElement = 'a' } = this.props; const last = routes.indexOf(route) === routes.length - 1; - return (last || !route.component) - ? {route.breadcrumbName} - : createElement(linkElement, { - href: paths.join('/') || '/', - to: paths.join('/') || '/', - }, route.breadcrumbName); - } + return last || !route.component ? ( + {route.breadcrumbName} + ) : ( + createElement( + linkElement, + { + href: paths.join('/') || '/', + to: paths.join('/') || '/', + }, + route.breadcrumbName, + ) + ); + }; render() { const { - title, logo, action, content, extraContent, - tabList, className, tabActiveKey, tabBarExtraContent, + title, + logo, + action, + content, + extraContent, + tabList, + className, + tabActiveKey, + tabBarExtraContent, } = this.props; const clsString = classNames(styles.pageHeader, className); @@ -175,12 +194,13 @@ export default class PageHeader extends PureComponent {
{content &&
{content}
} - {extraContent &&
{extraContent}
} + {extraContent && ( +
{extraContent}
+ )}
- { - tabList && + {tabList && tabList.length && ( - { - tabList.map(item => ) - } + {tabList.map(item => )} - ) - } + )} ); } diff --git a/src/components/PageHeader/index.test.js b/src/components/PageHeader/index.test.js index 385a3d31..d9aaa000 100644 --- a/src/components/PageHeader/index.test.js +++ b/src/components/PageHeader/index.test.js @@ -1,23 +1,5 @@ -import { getBreadcrumb, urlToList } from './index'; - -describe('test urlToList', () => { - it('A path', () => { - expect(urlToList('/userinfo')).toEqual(['/userinfo']); - }); - it('Secondary path', () => { - expect(urlToList('/userinfo/2144')).toEqual([ - '/userinfo', - '/userinfo/2144', - ]); - }); - it('Three paths', () => { - expect(urlToList('/userinfo/2144/addr')).toEqual([ - '/userinfo', - '/userinfo/2144', - '/userinfo/2144/addr', - ]); - }); -}); +import { getBreadcrumb } from './index'; +import { urlToList } from '../utils/pathTools'; const routerData = { '/dashboard/analysis': { @@ -36,17 +18,17 @@ const routerData = { describe('test getBreadcrumb', () => { it('Simple url', () => { expect(getBreadcrumb(routerData, '/dashboard/analysis').name).toEqual( - '分析页' + '分析页', ); }); it('Parameters url', () => { expect(getBreadcrumb(routerData, '/userinfo/2144').name).toEqual( - '用户信息' + '用户信息', ); }); it('The middle parameter url', () => { expect(getBreadcrumb(routerData, '/userinfo/2144/addr').name).toEqual( - '收货订单' + '收货订单', ); }); it('Loop through the parameters', () => { diff --git a/src/components/SiderMenu/SiderMenu.js b/src/components/SiderMenu/SiderMenu.js index 4811894d..df3bb488 100644 --- a/src/components/SiderMenu/SiderMenu.js +++ b/src/components/SiderMenu/SiderMenu.js @@ -3,6 +3,7 @@ import { Layout, Menu, Icon } from 'antd'; import pathToRegexp from 'path-to-regexp'; import { Link } from 'dva/router'; import styles from './index.less'; +import { urlToList } from '../utils/pathTools'; const { Sider } = Layout; const { SubMenu } = Menu; @@ -21,10 +22,17 @@ const getIcon = (icon) => { return icon; }; +export const getMeunMatcheys = (flatMenuKeys, path) => { + return flatMenuKeys.filter((item) => { + return pathToRegexp(item).test(path); + }); +}; + export default class SiderMenu extends PureComponent { constructor(props) { super(props); this.menus = props.menuData; + this.flatMenuKeys = this.getFlatMenuKeys(props.menuData); this.state = { openKeys: this.getDefaultCollapsedSubMenus(props), }; @@ -43,30 +51,11 @@ export default class SiderMenu extends PureComponent { */ getDefaultCollapsedSubMenus(props) { const { location: { pathname } } = props || this.props; - // eg. /list/search/articles = > ['','list','search','articles'] - let snippets = pathname.split('/'); - // Delete the end - // eg. delete 'articles' - snippets.pop(); - // Delete the head - // eg. delete '' - snippets.shift(); - // eg. After the operation is completed, the array should be ['list','search'] - // eg. Forward the array as ['list','list/search'] - snippets = snippets.map((item, index) => { - // If the array length > 1 - if (index > 0) { - // eg. search => ['list','search'].join('/') - return snippets.slice(0, index + 1).join('/'); - } - // index 0 to not do anything - return item; - }); - snippets = snippets.map((item) => { - return this.getSelectedMenuKeys(`/${item}`)[0]; - }); - // eg. ['list','list/search'] - return snippets; + return urlToList(pathname) + .map((item) => { + return getMeunMatcheys(this.flatMenuKeys, item)[0]; + }) + .filter(item => item); } /** * Recursively flatten the data @@ -77,29 +66,17 @@ export default class SiderMenu extends PureComponent { let keys = []; menus.forEach((item) => { if (item.children) { - keys.push(item.path); keys = keys.concat(this.getFlatMenuKeys(item.children)); - } else { - keys.push(item.path); } + keys.push(item.path); }); return keys; } /** - * Get selected child nodes - * /user/chen => ['user','/user/:id'] + * 判断是否是http链接.返回 Link 或 a + * Judge whether it is http link.return a or Link + * @memberof SiderMenu */ - getSelectedMenuKeys = (path) => { - const flatMenuKeys = this.getFlatMenuKeys(this.menus); - return flatMenuKeys.filter((item) => { - return pathToRegexp(`/${item}(.*)`).test(path); - }); - } - /** - * 判断是否是http链接.返回 Link 或 a - * Judge whether it is http link.return a or Link - * @memberof SiderMenu - */ getMenuItemPath = (item) => { const itemPath = this.conversionPath(item.path); const icon = getIcon(item.icon); @@ -108,7 +85,8 @@ export default class SiderMenu extends PureComponent { if (/^https?:\/\//.test(itemPath)) { return ( - {icon}{name} + {icon} + {name} ); } @@ -117,16 +95,23 @@ export default class SiderMenu extends PureComponent { to={itemPath} target={target} replace={itemPath === this.props.location.pathname} - onClick={this.props.isMobile ? () => { this.props.onCollapse(true); } : undefined} + onClick={ + this.props.isMobile + ? () => { + this.props.onCollapse(true); + } + : undefined + } > - {icon}{name} + {icon} + {name} ); - } + }; /** * get SubMenu or Item */ - getSubMenuOrItem=(item) => { + getSubMenuOrItem = (item) => { if (item.children && item.children.some(child => child.name)) { return ( {item.name} - ) : item.name - } + ) : ( + item.name + ) + } key={item.path} > {this.getNavMenuItems(item.children)} @@ -145,16 +132,14 @@ export default class SiderMenu extends PureComponent { ); } else { return ( - - {this.getMenuItemPath(item)} - + {this.getMenuItemPath(item)} ); } - } + }; /** - * 获得菜单子节点 - * @memberof SiderMenu - */ + * 获得菜单子节点 + * @memberof SiderMenu + */ getNavMenuItems = (menusData) => { if (!menusData) { return []; @@ -162,49 +147,57 @@ export default class SiderMenu extends PureComponent { return menusData .filter(item => item.name && !item.hideInMenu) .map((item) => { + // make dom const ItemDom = this.getSubMenuOrItem(item); return this.checkPermissionItem(item.authority, ItemDom); }) - .filter(item => !!item); - } + .filter(item => item); + }; + // Get the currently selected menu + getSelectedMenuKeys = () => { + const { location: { pathname } } = this.props; + return urlToList(pathname).map(itemPath => + getMeunMatcheys(this.flatMenuKeys, itemPath).pop(), + ); + }; // conversion Path // 转化路径 - conversionPath=(path) => { + conversionPath = (path) => { if (path && path.indexOf('http') === 0) { return path; } else { return `/${path || ''}`.replace(/\/+/g, '/'); } - } + }; // permission to check checkPermissionItem = (authority, ItemDom) => { if (this.props.Authorized && this.props.Authorized.check) { const { check } = this.props.Authorized; - return check( - authority, - ItemDom - ); + return check(authority, ItemDom); } return ItemDom; - } + }; handleOpenChange = (openKeys) => { const lastOpenKey = openKeys[openKeys.length - 1]; const isMainMenu = this.menus.some( - item => lastOpenKey && (item.key === lastOpenKey || item.path === lastOpenKey) + item => + lastOpenKey && (item.key === lastOpenKey || item.path === lastOpenKey), ); this.setState({ openKeys: isMainMenu ? [lastOpenKey] : [...openKeys], }); - } + }; render() { - const { logo, collapsed, location: { pathname }, onCollapse } = this.props; + const { logo, collapsed, onCollapse } = this.props; const { openKeys } = this.state; // Don't show popup menu when it is been collapsed - const menuProps = collapsed ? {} : { - openKeys, - }; + const menuProps = collapsed + ? {} + : { + openKeys, + }; // if pathname can't match, use the nearest parent's key - let selectedKeys = this.getSelectedMenuKeys(pathname); + let selectedKeys = this.getSelectedMenuKeys(); if (!selectedKeys.length) { selectedKeys = [openKeys[openKeys.length - 1]]; } diff --git a/src/components/SiderMenu/SilderMenu.test.js b/src/components/SiderMenu/SilderMenu.test.js new file mode 100644 index 00000000..e6f1f55a --- /dev/null +++ b/src/components/SiderMenu/SilderMenu.test.js @@ -0,0 +1,36 @@ +import { getMeunMatcheys } from './SiderMenu'; + +const meun = [ + '/dashboard', + '/userinfo', + '/dashboard/name', + '/userinfo/:id', + '/userinfo/:id/info', +]; + +describe('test meun match', () => { + it('simple path', () => { + expect(getMeunMatcheys(meun, '/dashboard')).toEqual(['/dashboard']); + }); + it('error path', () => { + expect(getMeunMatcheys(meun, '/dashboardname')).toEqual([]); + }); + + it('Secondary path', () => { + expect(getMeunMatcheys(meun, '/dashboard/name')).toEqual([ + '/dashboard/name', + ]); + }); + + it('Parameter path', () => { + expect(getMeunMatcheys(meun, '/userinfo/2144')).toEqual([ + '/userinfo/:id', + ]); + }); + + it('three parameter path', () => { + expect(getMeunMatcheys(meun, '/userinfo/2144/info')).toEqual([ + '/userinfo/:id/info', + ]); + }); +}); diff --git a/src/components/utils/pathTools.js b/src/components/utils/pathTools.js new file mode 100644 index 00000000..7d49400a --- /dev/null +++ b/src/components/utils/pathTools.js @@ -0,0 +1,7 @@ +// /userinfo/2144/id => ['/userinfo','/useinfo/2144,'/userindo/2144/id'] +export function urlToList(url) { + const urllist = url.split('/').filter(i => i); + return urllist.map((urlItem, index) => { + return `/${urllist.slice(0, index + 1).join('/')}`; + }); +} diff --git a/src/components/utils/pathTools.test.js b/src/components/utils/pathTools.test.js new file mode 100644 index 00000000..4daf28b4 --- /dev/null +++ b/src/components/utils/pathTools.test.js @@ -0,0 +1,20 @@ +import { urlToList } from './pathTools'; + +describe('test urlToList', () => { + it('A path', () => { + expect(urlToList('/userinfo')).toEqual(['/userinfo']); + }); + it('Secondary path', () => { + expect(urlToList('/userinfo/2144')).toEqual([ + '/userinfo', + '/userinfo/2144', + ]); + }); + it('Three paths', () => { + expect(urlToList('/userinfo/2144/addr')).toEqual([ + '/userinfo', + '/userinfo/2144', + '/userinfo/2144/addr', + ]); + }); +}); From 74f50288554cf9ffff782384e956e57b9a078245 Mon Sep 17 00:00:00 2001 From: Alexius Lee Date: Sun, 25 Feb 2018 07:41:16 +0800 Subject: [PATCH 02/11] bugfix (#970) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原代码错用 location 变量作为判断，会一直读取 window.location --- src/components/PageHeader/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/PageHeader/index.js b/src/components/PageHeader/index.js index 22dac870..d85e7165 100644 --- a/src/components/PageHeader/index.js +++ b/src/components/PageHeader/index.js @@ -132,7 +132,7 @@ export default class PageHeader extends PureComponent { } // 根据 location 生成 面包屑 // Generate breadcrumbs based on location - if (location && location.pathname) { + if (routerLocation && routerLocation.pathname) { return this.conversionFromLocation(routerLocation, breadcrumbNameMap); } return null; From 27266c56c2099bebdcdf6147a26c0301d03ffb08 Mon Sep 17 00:00:00 2001 From: jim Date: Mon, 26 Feb 2018 10:31:08 +0800 Subject: [PATCH 03/11] fix #972 delete extra / --- src/common/router.js | 2 +- src/layouts/BasicLayout.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/router.js b/src/common/router.js index 5df24776..882196a9 100644 --- a/src/common/router.js +++ b/src/common/router.js @@ -175,7 +175,7 @@ export const getRouterData = (app) => { // Regular match item name // eg. router /user/:id === /user/chen const pathRegexp = pathToRegexp(path); - const menuKey = Object.keys(menuData).find(key => pathRegexp.test(`/${key}`)); + const menuKey = Object.keys(menuData).find(key => pathRegexp.test(`${key}`)); let menuItem = {}; // If menuKey is not empty if (menuKey) { diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 062198c1..e1534d05 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -27,8 +27,8 @@ const getRedirect = (item) => { if (item && item.children) { if (item.children[0] && item.children[0].path) { redirectData.push({ - from: `/${item.path}`, - to: `/${item.children[0].path}`, + from: `${item.path}`, + to: `${item.children[0].path}`, }); item.children.forEach((children) => { getRedirect(children); From 42bfd964bf181025d88b1a008a47e26bc8e96028 Mon Sep 17 00:00:00 2001 From: jim Date: Mon, 26 Feb 2018 11:06:32 +0800 Subject: [PATCH 04/11] fix CountDown Unknown event warning --- src/components/CountDown/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CountDown/index.js b/src/components/CountDown/index.js index e1e85bc2..5b512c83 100644 --- a/src/components/CountDown/index.js +++ b/src/components/CountDown/index.js @@ -96,7 +96,7 @@ class CountDown extends Component { } render() { - const { format = this.defaultFormat, ...rest } = this.props; + const { format = this.defaultFormat, onEnd, ...rest } = this.props; const { lastTime } = this.state; const result = format(lastTime); From cec0f45a8d84109638eb8996c71dde978093af84 Mon Sep 17 00:00:00 2001 From: ddcat1115 Date: Mon, 26 Feb 2018 18:23:30 +0800 Subject: [PATCH 05/11] improve SiderMenu --- src/components/SiderMenu/SiderMenu.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/SiderMenu/SiderMenu.js b/src/components/SiderMenu/SiderMenu.js index df3bb488..072f5cea 100644 --- a/src/components/SiderMenu/SiderMenu.js +++ b/src/components/SiderMenu/SiderMenu.js @@ -177,14 +177,17 @@ export default class SiderMenu extends PureComponent { } return ItemDom; }; - handleOpenChange = (openKeys) => { - const lastOpenKey = openKeys[openKeys.length - 1]; - const isMainMenu = this.menus.some( + isMainMenu = (key) => { + return this.menus.some( item => - lastOpenKey && (item.key === lastOpenKey || item.path === lastOpenKey), + key && (item.key === key || item.path === key), ); + } + handleOpenChange = (openKeys) => { + const lastOpenKey = openKeys[openKeys.length - 1]; + const moreThanOne = openKeys.filter(openKey => this.isMainMenu(openKey)).length > 1; this.setState({ - openKeys: isMainMenu ? [lastOpenKey] : [...openKeys], + openKeys: moreThanOne ? [lastOpenKey] : [...openKeys], }); }; render() { From 6e51cbadab4f3b8bb94ee713f7075685c9c00769 Mon Sep 17 00:00:00 2001 From: ddcat1115 Date: Mon, 26 Feb 2018 19:21:43 +0800 Subject: [PATCH 06/11] fix #948 --- src/routes/List/Applications.less | 3 +++ src/routes/List/CardList.less | 6 ++++++ src/routes/List/Projects.js | 5 +++-- src/routes/List/Projects.less | 6 ++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/routes/List/Applications.less b/src/routes/List/Applications.less index 7c7747ea..bbfe9cf6 100644 --- a/src/routes/List/Applications.less +++ b/src/routes/List/Applications.less @@ -14,6 +14,9 @@ .ant-card-actions { background: #f7f9fa; } + .ant-list .ant-list-item-content-single { + max-width: 100%; + } } .cardInfo { .clearfix(); diff --git a/src/routes/List/CardList.less b/src/routes/List/CardList.less index a635a88f..c4c2e573 100644 --- a/src/routes/List/CardList.less +++ b/src/routes/List/CardList.less @@ -25,6 +25,12 @@ .item { height: 64px; } + + :global { + .ant-list .ant-list-item-content-single { + max-width: 100%; + } + } } .extraImg { diff --git a/src/routes/List/Projects.js b/src/routes/List/Projects.js index 3c0c9e1b..48e83c8f 100644 --- a/src/routes/List/Projects.js +++ b/src/routes/List/Projects.js @@ -6,6 +6,7 @@ import { Row, Col, Form, Card, Select, List } from 'antd'; import StandardFormRow from '../../components/StandardFormRow'; import TagSelect from '../../components/TagSelect'; import AvatarList from '../../components/AvatarList'; +import Ellipsis from '../../components/Ellipsis'; import styles from './Projects.less'; @@ -54,7 +55,7 @@ export default class CoverCardList extends PureComponent { ( @@ -65,7 +66,7 @@ export default class CoverCardList extends PureComponent { > {item.title}} - description={item.subDescription} + description={{item.subDescription}} />
{moment(item.updatedAt).fromNow()} diff --git a/src/routes/List/Projects.less b/src/routes/List/Projects.less index 129bb17d..890a1ad2 100644 --- a/src/routes/List/Projects.less +++ b/src/routes/List/Projects.less @@ -46,4 +46,10 @@ .cardList { margin-top: 24px; } + + :global { + .ant-list .ant-list-item-content-single { + max-width: 100%; + } + } } From f6516602a92f98f4e52596ab32612e0c97bafad8 Mon Sep 17 00:00:00 2001 From: Haoliang Gao Date: Wed, 28 Feb 2018 10:26:11 +0800 Subject: [PATCH 07/11] deps: move rollbar to dependencies (#990) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 51bf8abe..ca25c73f 100755 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "react-document-title": "^2.0.3", "react-dom": "^16.2.0", "react-fittext": "^1.0.0", + "rollbar": "^2.3.4", "url-polyfill": "^1.0.10" }, "devDependencies": { @@ -72,7 +73,6 @@ "regenerator-runtime": "^0.11.1", "roadhog": "^2.1.0", "roadhog-api-doc": "^0.3.4", - "rollbar": "^2.3.4", "stylelint": "^8.4.0", "stylelint-config-standard": "^18.0.0" }, From 69cb402f9d4ca72933eafbc9294a860fb1d62991 Mon Sep 17 00:00:00 2001 From: guowenfh Date: Wed, 28 Feb 2018 10:36:08 +0800 Subject: [PATCH 08/11] fix Authorized Promise render recreating (#987) * fix Authorized Promise render * fix style Authorized blank line --- src/components/Authorized/PromiseRender.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/Authorized/PromiseRender.js b/src/components/Authorized/PromiseRender.js index 22f1fcb7..43a4fa9e 100644 --- a/src/components/Authorized/PromiseRender.js +++ b/src/components/Authorized/PromiseRender.js @@ -6,9 +6,17 @@ export default class PromiseRender extends React.PureComponent { component: null, }; componentDidMount() { - const ok = this.checkIsInstantiation(this.props.ok); - const error = this.checkIsInstantiation(this.props.error); - this.props.promise + this.setRenderComponent(this.props); + } + componentWillReceiveProps(nextProps) { + // new Props enter + this.setRenderComponent(nextProps); + } + // set render Component : ok or error + setRenderComponent(props) { + const ok = this.checkIsInstantiation(props.ok); + const error = this.checkIsInstantiation(props.error); + props.promise .then(() => { this.setState({ component: ok, From b00289b4e4b1f5dceb056c0b0c2e0a5b102300d5 Mon Sep 17 00:00:00 2001 From: jim Date: Thu, 1 Mar 2018 10:58:28 +0800 Subject: [PATCH 09/11] fix #984 add step-form title --- src/common/router.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/router.js b/src/common/router.js index 882196a9..c27e9d4d 100644 --- a/src/common/router.js +++ b/src/common/router.js @@ -92,12 +92,15 @@ export const getRouterData = (app) => { component: dynamicWrapper(app, ['form'], () => import('../routes/Forms/StepForm')), }, '/form/step-form/info': { + name: '分步表单（填写转账信息）', component: dynamicWrapper(app, ['form'], () => import('../routes/Forms/StepForm/Step1')), }, '/form/step-form/confirm': { + name: '分步表单（确认转账信息）', component: dynamicWrapper(app, ['form'], () => import('../routes/Forms/StepForm/Step2')), }, '/form/step-form/result': { + name: '分步表单（完成）', component: dynamicWrapper(app, ['form'], () => import('../routes/Forms/StepForm/Step3')), }, '/form/advanced-form': { From cb88864b4e44b2311225d88c435e983f5ad0a63b Mon Sep 17 00:00:00 2001 From: valleykid Date: Thu, 1 Mar 2018 12:11:03 +0800 Subject: [PATCH 10/11] Fast finish for ci --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index ee06d65c..22ae1886 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,10 @@ environment: nodejs_version: "8" +# this is how to allow failing jobs in the matrix +matrix: + fast_finish: true # set this flag to immediately finish build once one of the jobs fails. + # Install scripts. (runs after repo cloning) install: # Get the latest stable version of Node.js or io.js From ebd6f2ffc8b0c7cd7a6c8959ca73ba02017504d2 Mon Sep 17 00:00:00 2001 From: ddcat1115 Date: Thu, 1 Mar 2018 19:01:50 +0800 Subject: [PATCH 11/11] fix Countdown error format and invalid initial time, close #1009 --- src/components/CountDown/index.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/CountDown/index.js b/src/components/CountDown/index.js index 5b512c83..f7aa6e08 100644 --- a/src/components/CountDown/index.js +++ b/src/components/CountDown/index.js @@ -51,9 +51,8 @@ class CountDown extends Component { } lastTime = targetTime - new Date().getTime(); - return { - lastTime, + lastTime: lastTime < 0 ? 0 : lastTime, }; } // defaultFormat = time => ( @@ -63,11 +62,11 @@ class CountDown extends Component { const hours = 60 * 60 * 1000; const minutes = 60 * 1000; - const h = fixedZero(Math.floor(time / hours)); - const m = fixedZero(Math.floor((time - (h * hours)) / minutes)); - const s = fixedZero(Math.floor((time - (h * hours) - (m * minutes)) / 1000)); + const h = Math.floor(time / hours); + const m = Math.floor((time - (h * hours)) / minutes); + const s = Math.floor((time - (h * hours) - (m * minutes)) / 1000); return ( - {h}:{m}:{s} + {fixedZero(h)}:{fixedZero(m)}:{fixedZero(s)} ); } tick = () => { @@ -98,7 +97,6 @@ class CountDown extends Component { render() { const { format = this.defaultFormat, onEnd, ...rest } = this.props; const { lastTime } = this.state; - const result = format(lastTime); return ({result});