diff --git a/.gitignore b/.gitignore index 363794d7685b59dbde7ef07d215263694b34c85e..7f0586f420c1a3a5ef5fa15ce00c87eb45a81f2f 100755 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies -node_modules +**/node_modules # roadhog-api-doc ignore /src/utils/request-temp.js _roadhog-api-doc diff --git a/.stylelintrc.json b/.stylelintrc.json index c4d3198f56f74ebde1a7024ec3a848b02a9206c3..84f30327570c23218bb9d39604d7a4d58f34fa43 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -13,6 +13,7 @@ "function-parentheses-newline-inside": null, "function-max-empty-lines": null, "function-whitespace-after": null, + "no-missing-end-of-source-newline": null, "number-leading-zero": null, "number-no-trailing-zeros": null, "rule-empty-line-before": null, diff --git a/README.md b/README.md index fe990de32f4623c29887c39307bdab9444943752..08a4a9503542c9343356f93488a4b28a83bb2eaf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -English | [简体中文](./README.zh-CN.md) +[Русский](./README.ru-RU.md) | English | [简体中文](./README.zh-CN.md) # Ant Design Pro @@ -86,10 +86,14 @@ $ pro new More instructions at [documentation](http://pro.ant.design/docs/getting-started). -## Compatibility +## Browsers support Modern browsers and IE11. +| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| --------- | --------- | --------- | --------- | --------- | +| IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions + ## Contributing Any type of contribution is welcome, here are some examples of how you may contribute to this project: diff --git a/README.ru-RU.md b/README.ru-RU.md new file mode 100644 index 0000000000000000000000000000000000000000..6110c1abdc5e3f9deefa6d1353dfd99702a853fa --- /dev/null +++ b/README.ru-RU.md @@ -0,0 +1,103 @@ +Русский | [English](./README.md) | [简体中文](./README.zh-CN.md) + +# Ant Design Pro + +[![](https://img.shields.io/travis/ant-design/ant-design-pro/master.svg?style=flat-square)](https://travis-ci.org/ant-design/ant-design-pro) +[![Build status](https://ci.appveyor.com/api/projects/status/67fxu2by3ibvqtat/branch/master?svg=true)](https://ci.appveyor.com/project/afc163/ant-design-pro/branch/master) +[![Dependencies](https://img.shields.io/david/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro) +[![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro#info=devDependencies&view=list) +[![Gitter](https://badges.gitter.im/ant-design/ant-design-pro.svg)](https://gitter.im/ant-design/ant-design-pro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) + +UI-решение "из коробки" для корпоративных приложений как React boilerplate + +![](https://gw.alipayobjects.com/zos/rmsportal/xEdBqwSzvoSapmnSnYjU.png) + +- Демо: http://preview.pro.ant.design +- Домашняя страница: http://pro.ant.design +- Документация: http://pro.ant.design/docs/getting-started +- История изменений: http://pro.ant.design/docs/changelog +- FAQ: http://pro.ant.design/docs/faq +- Китайское зеркало сайта: http://ant-design-pro.gitee.io + +## Поиск переводчиков :loudspeaker: + +Нам нужна ваша помощь: https://github.com/ant-design/ant-design-pro/issues/120 + +## Возможности + +- :gem: **Аккуратный дизайн**: Посмотрите [спецификацию Ant Design](http://ant.design/) +- :triangular_ruler: **Общие шаблоны**: Стандартные шаблоны для корпоративных приложений +- :rocket: **Разработка, как искусство**: Новейший стек технологий React/dva/antd +- :iphone: **Отзывчивая верстка**: Создан для экранов разных размеров +- :art: **Темизация**: Возможность изменения темы с помощью конфигурации +- :globe_with_meridians: **Мультиязычность**: Встроенное i18n решение +- :gear: **Лучшие практики**: Надежные процессы для хорошего кода +- :1234: **Разработка по шиблону**: Простое в использовании решение для разработки +- :white_check_mark: **UI тесты**: Разрабатывайте безопасно с юнит и e2e тестами + +## Шаблоны + +``` +- Dashboard + - Analytic + - Monitor + - Workspace +- Form + - Basic Form + - Step Form + - Advanced From +- List + - Standard Table + - Standard List + - Card List + - Search List (Project/Applications/Article) +- Profile + - Simple Profile + - Advanced Profile +- Result + - Success + - Failed +- Exception + - 403 + - 404 + - 500 +- User + - Login + - Register + - Register Result +``` + +## Использование + +```bash +$ git clone https://github.com/ant-design/ant-design-pro.git --depth=1 +$ cd ant-design-pro +$ npm install +$ npm start # visit http://localhost:8000 +``` + +Также можно использовать инструмент командной строки: [ant-design-pro-cli](https://github.com/ant-design/ant-design-pro-cli) + +```bash +$ npm install ant-design-pro-cli -g +$ mkdir pro-demo && cd pro-demo +$ pro new +``` + +Больше информации в [документации](http://pro.ant.design/docs/getting-started). + +## Совместимость + +Современные браузеры и IE11. + +| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| --------- | --------- | --------- | --------- | --------- | +| IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions + +## Распространение + +Любые варианты распространения приветствуются! Вот несколько примероы того, как вы можете помочь распространению проекта: + +- Использовать Ant Design Pro в ежедневной работе. +- Создавать [задачи](http://github.com/ant-design/ant-design-pro/issues) заводить баги или отвечать на вопросы. +- Делать [pull-реквесты](http://github.com/ant-design/ant-design-pro/pulls) для совершенствования нашего кода. diff --git a/README.zh-CN.md b/README.zh-CN.md index 030d506c65e6d5bf4d0f66361f740027e2851002..c309441e7e48c9012d81c4b60654be71556edbfd 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,4 +1,4 @@ -[English](./README.md) | 简体中文 +[Русский](./README.ru-RU.md) | [English](./README.md) | 简体中文 # Ant Design Pro @@ -82,10 +82,14 @@ $ pro new 更多信息请参考 [使用文档](http://pro.ant.design/docs/getting-started)。 -## 兼容性 +## 支持环境 现代浏览器及 IE11。 +| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| --------- | --------- | --------- | --------- | --------- | +| IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions + ## 参与贡献 我们非常欢迎你的贡献，你可以通过以下方式和我们一起共建 :smiley:： diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000000000000000000000000000000000000..ec949f06c920aba9ef41713ff201b8a3ff170186 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,3 @@ +module.exports = { + testURL: 'http://localhost:8000', +}; diff --git a/package.json b/package.json index 3b598c6f292b88d8edf7a556ab76517a0d1a4aa3..ba4818f345329aa561fe6cb0b33dc4d44865aff3 100755 --- a/package.json +++ b/package.json @@ -23,8 +23,9 @@ "prettier": "prettier --write ./src/**/**/**/*" }, "dependencies": { - "@antv/data-set": "^0.8.9", - "antd": "^3.7.3", + "@antv/data-set": "^0.9.0", + "@babel/polyfill": "^7.0.0-beta.36", + "antd": "^3.8.0", "bizcharts": "^3.1.10", "bizcharts-plugin-slider": "^2.0.3", "classnames": "^2.2.6", @@ -35,9 +36,10 @@ "moment": "^2.22.2", "numeral": "^2.0.6", "omit.js": "^1.0.0", - "path-to-regexp": "^2.2.1", - "prop-types": "^15.6.2", - "qs": "^6.5.2", + "path-to-regexp": "^2.1.0", + "prop-types": "^15.5.10", + "qs": "^6.5.0", + "react": "^16.4.1", "react-container-query": "^0.11.0", "react-copy-to-clipboard": "^5.0.1", "react-document-title": "^2.0.3", @@ -60,8 +62,8 @@ "babel-runtime": "^6.9.2", "cross-env": "^5.1.1", "cross-port-killer": "^1.0.1", - "enzyme": "^3.1.0", - "eslint": "^5.1.0", + "enzyme": "^3.4.1", + "eslint": "^5.0.0", "eslint-config-airbnb": "^17.0.0", "eslint-config-prettier": "^2.9.0", "eslint-config-umi": "^0.1.4", diff --git a/src/components/Charts/TimelineChart/index.d.ts b/src/components/Charts/TimelineChart/index.d.ts index d9312fe6966dcbf72ab9a491001374c996930517..40b94325a9833e9479846b323387e6515160fb7e 100644 --- a/src/components/Charts/TimelineChart/index.d.ts +++ b/src/components/Charts/TimelineChart/index.d.ts @@ -1,11 +1,11 @@ import * as React from 'react'; export interface ITimelineChartProps { data: Array<{ - x: string; - y1: string; - y2: string; + x: number; + y1: number; + y2?: number; }>; - titleMap: { y1: string; y2: string }; + titleMap: { y1: string; y2?: string }; padding?: [number, number, number, number]; height?: number; style?: React.CSSProperties; diff --git a/src/components/Ellipsis/index.js b/src/components/Ellipsis/index.js index 6b5a5d76f92c2c2f41e9d9ca0240743e3ae3e47f..460361ef008787e6b3bf15b1df656a52335b7099 100644 --- a/src/components/Ellipsis/index.js +++ b/src/components/Ellipsis/index.js @@ -137,11 +137,15 @@ export default class Ellipsis extends Component { if (sh <= th) { shadowNode.innerHTML = text.substring(0, mid + 1) + suffix; sh = shadowNode.offsetHeight; - if (sh > th) { + if (sh > th || mid === begin) { return mid; } else { begin = mid; - mid = Math.floor((end - begin) / 2) + begin; + if (end - begin === 1) { + mid = 1 + begin; + } else { + mid = Math.floor((end - begin) / 2) + begin; + } return this.bisection(th, mid, begin, end, text, shadowNode); } } else { diff --git a/src/components/HeaderSearch/index.js b/src/components/HeaderSearch/index.js index a01abeb4024dd9b9036e6ff7a308b9b4c9c83532..f207e96eac07f2aa2904f23ff9a3a4e7e5694a15 100644 --- a/src/components/HeaderSearch/index.js +++ b/src/components/HeaderSearch/index.js @@ -81,7 +81,7 @@ export default class HeaderSearch extends PureComponent { }) debouncePressEnter() { const { onPressEnter } = this.props; - const value = this.state; + const { value } = this.state; onPressEnter(value); } diff --git a/src/components/Login/LoginItem.js b/src/components/Login/LoginItem.js index 46de926e61b42269348fbcfa35ff506e4627406d..c9a1a4f1332a8997c802a795f0cd6dc1140a18f0 100644 --- a/src/components/Login/LoginItem.js +++ b/src/components/Login/LoginItem.js @@ -79,6 +79,7 @@ class WarpFormItem extends Component { defaultValue, rules, name, + buttonText, updateActive, type, ...restProps @@ -103,7 +104,7 @@ class WarpFormItem extends Component { size="large" onClick={this.onGetCaptcha} > - {count ? `${count} s` : '获取验证码'} + {count ? `${count} s` : buttonText} diff --git a/src/components/Login/index.d.ts b/src/components/Login/index.d.ts index cd88a8b693d7f219221decc278329ffcbe4db60e..9c072867710ec785c44a525e260e3d844c5f1371 100644 --- a/src/components/Login/index.d.ts +++ b/src/components/Login/index.d.ts @@ -19,6 +19,7 @@ export interface LoginItemProps { style?: React.CSSProperties; onGetCaptcha?: () => void; placeholder?: string; + buttonText?: React.ReactNode; } export class LoginItem extends React.Component {} diff --git a/src/components/Login/index.en-US.md b/src/components/Login/index.en-US.md index c1fbc5186ea737e31d26f592ef9c87377d5f6756..3b5992e28de312daba880f4ce9f834c61c626d40 100644 --- a/src/components/Login/index.en-US.md +++ b/src/components/Login/index.en-US.md @@ -40,6 +40,7 @@ Property | Description | Type | Default ----|------|-----|------ onGetCaptcha | callback on getting a new Captcha | () => (void \| false \| Promise) | - countDown | count down | number |- +buttonText | text on getting a new Captcha | ReactNode | '获取验证码' Apart from the above properties, _Login.Captcha_ support the same properties with _Login.UserName_. diff --git a/src/components/Login/index.zh-CN.md b/src/components/Login/index.zh-CN.md index bf9fb7fed37212641cebee6dac19142658a270bc..a869e96c323ab2cb9861121e4278f65d08b3e167 100644 --- a/src/components/Login/index.zh-CN.md +++ b/src/components/Login/index.zh-CN.md @@ -32,8 +32,7 @@ name | 控件标记，提交数据中同样以此为 key | String | - rules | 校验规则，同 Form getFieldDecorator(id, options) 中 [option.rules 的规则](getFieldDecorator(id, options)) | object[] | - 除上述属性以外，Login.UserName 还支持 antd.Input 的所有属性，并且自带默认的基础配置，包括 `placeholder` `size` `prefix` 等，这些基础配置均可被覆盖。 - -### Login.Password、Login.Mobile 同 Login.UserName +## Login.Password、Login.Mobile 同 Login.UserName ### Login.Captcha @@ -41,6 +40,7 @@ rules | 校验规则，同 Form getFieldDecorator(id, options) 中 [option.rules ----|------|-----|------ onGetCaptcha | 点击获取校验码的回调 | () => (void \| false \| Promise) | - countDown | 倒计时 | number |- +buttonText | 点击获取校验码的说明文字 | ReactNode | '获取验证码' 除上述属性以外，Login.Captcha 支持的属性与 Login.UserName 相同。 diff --git a/src/components/NoticeIcon/index.d.ts b/src/components/NoticeIcon/index.d.ts index 25d426230a53bf7b34fc0497456a8d7a491317f1..e29d5587615bdfff3906c42e7897b75db7f1f5e5 100644 --- a/src/components/NoticeIcon/index.d.ts +++ b/src/components/NoticeIcon/index.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import * as React from 'react'; import NoticeIconTab, { INoticeIconData } from './NoticeIconTab'; export interface INoticeIconProps { diff --git a/src/components/PageHeader/index.js b/src/components/PageHeader/index.js index 1c7daa3f50480377383bcae8fbc390bed2f6a445..ec12b89112d68e0ef40f554ddaa54adc283be9bc 100644 --- a/src/components/PageHeader/index.js +++ b/src/components/PageHeader/index.js @@ -218,17 +218,18 @@ export default class PageHeader extends PureComponent { - {tabList && - tabList.length && ( - - {tabList.map(item => )} - - )} + {tabList && tabList.length ? ( + + {tabList.map(item => ( + + ))} + + ) : null} ); } diff --git a/src/components/Trend/index.md b/src/components/Trend/index.md index eb78b96e2969e885412d0b14782e5ac03b19b8a1..3e3ac07a57cf8c20b71ccf8fe21ed27820db2804 100644 --- a/src/components/Trend/index.md +++ b/src/components/Trend/index.md @@ -19,4 +19,4 @@ order: 14 |----------|------------------------------------------|-------------|-------| | colorful | 是否彩色标记 | Boolean | true | | flag | 上升下降标识：`up|down` | string | - | -| reverseColor | 颜色反转 | Boolean | true | +| reverseColor | 颜色反转 | Boolean | false | diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js new file mode 100644 index 0000000000000000000000000000000000000000..4fcdac680e46ab593c28dab791b01615f87833a0 --- /dev/null +++ b/src/layouts/BasicLayout.js @@ -0,0 +1,309 @@ +import React, { Fragment } from 'react'; +import PropTypes from 'prop-types'; +import { Layout, Icon, message } from 'antd'; +import DocumentTitle from 'react-document-title'; +import { connect } from 'dva'; +import { Route, Redirect, Switch, routerRedux } from 'dva/router'; +import { ContainerQuery } from 'react-container-query'; +import classNames from 'classnames'; +import pathToRegexp from 'path-to-regexp'; +import { enquireScreen, unenquireScreen } from 'enquire-js'; +import GlobalHeader from '../components/GlobalHeader'; +import GlobalFooter from '../components/GlobalFooter'; +import SiderMenu from '../components/SiderMenu'; +import NotFound from '../routes/Exception/404'; +import { getRoutes } from '../utils/utils'; +import Authorized from '../utils/Authorized'; +import { getMenuData } from '../common/menu'; +import logo from '../assets/logo.svg'; + +const { Content, Header, Footer } = Layout; +const { AuthorizedRoute, check } = Authorized; + +/** + * 根据菜单取得重定向地址. + */ +const redirectData = []; +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}`, + }); + item.children.forEach(children => { + getRedirect(children); + }); + } + } +}; +getMenuData().forEach(getRedirect); + +/** + * 获取面包屑映射 + * @param {Object} menuData 菜单配置 + * @param {Object} routerData 路由配置 + */ +const getBreadcrumbNameMap = (menuData, routerData) => { + const result = {}; + const childResult = {}; + for (const i of menuData) { + if (!routerData[i.path]) { + result[i.path] = i; + } + if (i.children) { + Object.assign(childResult, getBreadcrumbNameMap(i.children, routerData)); + } + } + return Object.assign({}, routerData, result, childResult); +}; + +const query = { + 'screen-xs': { + maxWidth: 575, + }, + 'screen-sm': { + minWidth: 576, + maxWidth: 767, + }, + 'screen-md': { + minWidth: 768, + maxWidth: 991, + }, + 'screen-lg': { + minWidth: 992, + maxWidth: 1199, + }, + 'screen-xl': { + minWidth: 1200, + maxWidth: 1599, + }, + 'screen-xxl': { + minWidth: 1600, + }, +}; + +let isMobile; +enquireScreen(b => { + isMobile = b; +}); + +@connect(({ user, global = {}, loading }) => ({ + currentUser: user.currentUser, + collapsed: global.collapsed, + fetchingNotices: loading.effects['global/fetchNotices'], + notices: global.notices, +})) +export default class BasicLayout extends React.PureComponent { + static childContextTypes = { + location: PropTypes.object, + breadcrumbNameMap: PropTypes.object, + }; + + state = { + isMobile, + }; + + getChildContext() { + const { location, routerData } = this.props; + return { + location, + breadcrumbNameMap: getBreadcrumbNameMap(getMenuData(), routerData), + }; + } + + componentDidMount() { + this.enquireHandler = enquireScreen(mobile => { + this.setState({ + isMobile: mobile, + }); + }); + const { dispatch } = this.props; + dispatch({ + type: 'user/fetchCurrent', + }); + } + + componentWillUnmount() { + unenquireScreen(this.enquireHandler); + } + + getPageTitle() { + const { routerData, location } = this.props; + const { pathname } = location; + let title = 'Ant Design Pro'; + let currRouterData = null; + // match params path + Object.keys(routerData).forEach(key => { + if (pathToRegexp(key).test(pathname)) { + currRouterData = routerData[key]; + } + }); + if (currRouterData && currRouterData.name) { + title = `${currRouterData.name} - Ant Design Pro`; + } + return title; + } + + getBaseRedirect = () => { + // According to the url parameter to redirect + // 这里是重定向的,重定向到 url 的 redirect 参数所示地址 + const urlParams = new URL(window.location.href); + + const redirect = urlParams.searchParams.get('redirect'); + // Remove the parameters in the url + if (redirect) { + urlParams.searchParams.delete('redirect'); + window.history.replaceState(null, 'redirect', urlParams.href); + } else { + const { routerData } = this.props; + // get the first authorized route path in routerData + const authorizedPath = Object.keys(routerData).find( + item => check(routerData[item].authority, item) && item !== '/' + ); + return authorizedPath; + } + return redirect; + }; + + handleMenuCollapse = collapsed => { + const { dispatch } = this.props; + dispatch({ + type: 'global/changeLayoutCollapsed', + payload: collapsed, + }); + }; + + handleNoticeClear = type => { + message.success(`清空了${type}`); + const { dispatch } = this.props; + dispatch({ + type: 'global/clearNotices', + payload: type, + }); + }; + + handleMenuClick = ({ key }) => { + const { dispatch } = this.props; + if (key === 'triggerError') { + dispatch(routerRedux.push('/exception/trigger')); + return; + } + if (key === 'logout') { + dispatch({ + type: 'login/logout', + }); + } + }; + + handleNoticeVisibleChange = visible => { + const { dispatch } = this.props; + if (visible) { + dispatch({ + type: 'global/fetchNotices', + }); + } + }; + + render() { + const { + currentUser, + collapsed, + fetchingNotices, + notices, + routerData, + match, + location, + } = this.props; + const { isMobile: mb } = this.state; + const baseRedirect = this.getBaseRedirect(); + const layout = ( + + + +
+ +
+ + + {redirectData.map(item => ( + + ))} + {getRoutes(match.path, routerData).map(item => ( + + ))} + + + + +
+ , + href: 'https://github.com/ant-design/ant-design-pro', + blankTarget: true, + }, + { + key: 'Ant Design', + title: 'Ant Design', + href: 'http://ant.design', + blankTarget: true, + }, + ]} + copyright={ + + Copyright 2018 蚂蚁金服体验技术部出品 + + } + /> +
+ + + ); + + return ( + + + {params =>
{layout}
} + + + ); + } +} diff --git a/src/pages/Forms/AdvancedForm.js b/src/pages/Forms/AdvancedForm.js index 49f7d70a8fa9d1324e42f69edc6d6857a9ff6446..126d0e912cbbd20b21b04f650359167c85765383 100644 --- a/src/pages/Forms/AdvancedForm.js +++ b/src/pages/Forms/AdvancedForm.js @@ -57,7 +57,12 @@ const tableData = [ }, ]; -class AdvancedForm extends PureComponent { +@connect(({ global, loading }) => ({ + collapsed: global.collapsed, + submitting: loading.effects['form/submitAdvancedForm'], +})) +@Form.create() +export default class AdvancedForm extends PureComponent { state = { width: '100%', }; @@ -303,8 +308,3 @@ class AdvancedForm extends PureComponent { ); } } - -export default connect(({ global, loading }) => ({ - collapsed: global.collapsed, - submitting: loading.effects['form/submitAdvancedForm'], -}))(Form.create()(AdvancedForm)); diff --git a/src/pages/Forms/StepForm/Step1.js b/src/pages/Forms/StepForm/Step1.js index 5082c1a31c428b8dc88975687e36fb57d685df82..03062009d2fe6435f9d8122a229ee1c4644d1b5d 100644 --- a/src/pages/Forms/StepForm/Step1.js +++ b/src/pages/Forms/StepForm/Step1.js @@ -15,8 +15,11 @@ const formItemLayout = { }, }; +@connect(({ form }) => ({ + data: form.step, +})) @Form.create() -class Step1 extends React.PureComponent { +export default class Step1 extends React.PureComponent { render() { const { form, dispatch, data } = this.props; const { getFieldDecorator, validateFields } = form; @@ -108,7 +111,3 @@ class Step1 extends React.PureComponent { ); } } - -export default connect(({ form }) => ({ - data: form.step, -}))(Step1); diff --git a/src/pages/Forms/StepForm/Step3.js b/src/pages/Forms/StepForm/Step3.js index b529d6a41c1baad997b862f3a39766a4a4fb8ac1..2438d82e73648710d1b1f1f7c213cb607e61c4d3 100644 --- a/src/pages/Forms/StepForm/Step3.js +++ b/src/pages/Forms/StepForm/Step3.js @@ -5,7 +5,10 @@ import { routerRedux } from 'dva/router'; import Result from 'components/Result'; import styles from './style.less'; -class Step3 extends React.PureComponent { +@connect(({ form }) => ({ + data: form.step, +})) +export default class Step3 extends React.PureComponent { render() { const { dispatch, data } = this.props; const onFinish = () => { @@ -67,7 +70,3 @@ class Step3 extends React.PureComponent { ); } } - -export default connect(({ form }) => ({ - data: form.step, -}))(Step3); diff --git a/src/pages/List/List.js b/src/pages/List/List.js index 8a68c9dd67516384d5811f9017de6482003b7ea0..a9f96d93e2e63430f8393dc29e9672d38c7f4c65 100644 --- a/src/pages/List/List.js +++ b/src/pages/List/List.js @@ -30,12 +30,12 @@ export default class SearchList extends Component { tab: '文章', }, { - key: 'Applications', - tab: '应用', + key: 'projects', + tab: '项目', }, { - key: 'Projects', - tab: '项目', + key: 'applications', + tab: '应用', }, ]; diff --git a/src/pages/List/TableList.js b/src/pages/List/TableList.js index bda9c9dae2ddf5bd2c3560d8b33245b96b5ab4ea..f764834ca9f3c9d9e3b770283b78fbf851cf3e51 100644 --- a/src/pages/List/TableList.js +++ b/src/pages/List/TableList.js @@ -587,7 +587,7 @@ export default class TableList extends PureComponent {
- +
@@ -597,7 +597,7 @@ export default class TableList extends PureComponent { 收起 - +
); diff --git a/src/pages/List/TableList.less b/src/pages/List/TableList.less index 60405f26ced2760dc3787bbbe987ce21f6b6b540..f3d627ea7c231b56045ac18209b15d8f74d8acbf 100644 --- a/src/pages/List/TableList.less +++ b/src/pages/List/TableList.less @@ -30,6 +30,7 @@ } } .submitButtons { + display: block; white-space: nowrap; margin-bottom: 24px; } diff --git a/src/routes/List/BasicList.js b/src/routes/List/BasicList.js new file mode 100644 index 0000000000000000000000000000000000000000..fbad8af2e194be16bc865c43d7741cdbcf57ad1a --- /dev/null +++ b/src/routes/List/BasicList.js @@ -0,0 +1,159 @@ +import React, { PureComponent } from 'react'; +import moment from 'moment'; +import { connect } from 'dva'; +import { + List, + Card, + Row, + Col, + Radio, + Input, + Progress, + Button, + Icon, + Dropdown, + Menu, + Avatar, +} from 'antd'; + +import PageHeaderLayout from '../../layouts/PageHeaderLayout'; + +import styles from './BasicList.less'; + +const RadioButton = Radio.Button; +const RadioGroup = Radio.Group; +const { Search } = Input; + +const ListContent = ({ data: { owner, createdAt, percent, status } }) => ( +
+
+ Owner +

{owner}

+
+
+ 开始时间 +

{moment(createdAt).format('YYYY-MM-DD HH:mm')}

+
+
+ +
+
+); + +@connect(({ list, loading }) => ({ + list, + loading: loading.models.list, +})) +export default class BasicList extends PureComponent { + componentDidMount() { + const { dispatch } = this.props; + dispatch({ + type: 'list/fetch', + payload: { + count: 5, + }, + }); + } + + render() { + const { + list: { list }, + loading, + } = this.props; + + const Info = ({ title, value, bordered }) => ( +
+ {title} +

{value}

+ {bordered && } +
+ ); + + const extraContent = ( +
+ + 全部 + 进行中 + 等待中 + + ({})} /> +
+ ); + + const paginationProps = { + showSizeChanger: true, + showQuickJumper: true, + pageSize: 5, + total: 50, + }; + + const menu = ( + + + 编辑 + + + 删除 + + + ); + + const MoreBtn = () => ( + + + 更多 + + + ); + + return ( + +
+ + + + + + + + + + + + + + + + + ( + 编辑, ]}> + } + title={{item.title}} + description={item.subDescription} + /> + + + )} + /> + +
+ + ); + } +}