From 560411f316feecdd0506d438d0c3ad0019ecd9ca Mon Sep 17 00:00:00 2001 From: csmgoon Date: Wed, 12 Apr 2017 21:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96UI=E5=92=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- mock/meeting.js | 2 +- mock/members.js | 5 +- package.json | 1 + src/components/Common/PullScreen.less | 2 +- src/components/Index/DashBoard.js | 5 +- src/components/Meeting/BuildMeeting.js | 2 +- src/components/Meeting/MeetingFilter.js | 2 +- src/components/Meeting/MeetingPanel.js | 2 +- src/components/Member/AvatarUpload.less | 10 +- src/components/Member/MemberFilter.js | 2 +- src/components/Member/MemberInfo.js | 8 +- src/components/Member/MemberInfo.js.tmp | 256 ------------------------ src/components/Member/MemberInfo.less | 2 +- src/components/Member/MemberPanel.css | 1 - src/components/Member/MemberPanel.js | 1 + src/components/Member/MemberPanel.less | 9 +- src/components/Member/RecruitFilter.js | 2 +- src/components/Member/SearchForm.js | 2 +- src/components/Report/FillReport.js | 2 +- src/components/Report/FillReport.less | 8 +- src/components/Report/MyReport.js | 1 + src/components/Report/MyReport.less | 4 +- src/components/Report/ReportCard.less | 2 +- src/components/Report/ReviewReport.less | 4 +- src/components/Report/SearchForm.js | 4 +- src/components/Setting/ReportSetting.js | 2 +- src/components/Setting/Setting.less | 2 +- src/index.html | 11 +- src/index.js | 1 + src/models/member.js | 2 +- src/router.js | 2 + src/routes/IndexPage.js | 2 +- src/routes/Meeting.js | 2 +- src/services/members.js | 2 +- 35 files changed, 65 insertions(+), 306 deletions(-) delete mode 100644 src/components/Member/MemberInfo.js.tmp delete mode 100644 src/components/Member/MemberPanel.css diff --git a/README.md b/README.md index 10a3560..035029e 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -#react_antd +## react_antd + +- [文档&更新日志](https://doc.onlinedev.cn/index.php?s=/18&page_id=129) + + 文档中包含数据接口、组件使用文档、更新日志等等 \ No newline at end of file diff --git a/mock/meeting.js b/mock/meeting.js index 5bee97a..67a4bc7 100644 --- a/mock/meeting.js +++ b/mock/meeting.js @@ -5,7 +5,7 @@ let meetingData = {}; if (!global.meetingData) { const data1 = mockjs.mock({ 'data|10': [{ - 'id|+1': 1, + 'key|+1': 1, 'date|1': [ '2017-01-01', '2016-11-20' diff --git a/mock/members.js b/mock/members.js index 3dbaa2c..bd185b8 100755 --- a/mock/members.js +++ b/mock/members.js @@ -25,7 +25,7 @@ if (!global.membersData) { '男', '女' ], - 'class': '@cword(4, 15)', + 'major': '@cword(4, 15)', 'college': '@cword(4, 15)', 'phone|13100000000-18799999999': 1, 'qq|676767-2323232323': 1, @@ -35,7 +35,8 @@ if (!global.membersData) { ], 'avatar|1': [ 'http://online.hfut.edu.cn/online_logo.png', - 'http://online.hfut.edu.cn/images/service/paint.png' + 'http://online.hfut.edu.cn/images/service/paint.png', + 'default' ], 'role|1': ['成员', '部长', '行政', '总监/主 管'], 'status|1': [ diff --git a/package.json b/package.json index d942294..7a5d8d4 100755 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "dva": "^1.1.0", "md5": "^2.2.1", "moment": "^2.17.1", + "prop-types": "^15.5.6", "react": "^15.1.0", "react-custom-scrollbars": "^4.0.0", "react-dom": "^15.1.0" diff --git a/src/components/Common/PullScreen.less b/src/components/Common/PullScreen.less index 03bb485..b057c06 100644 --- a/src/components/Common/PullScreen.less +++ b/src/components/Common/PullScreen.less @@ -3,7 +3,7 @@ z-index: 1001; bottom: 0px; background-color: #fff; - box-shadow: 0px 0 15px rgba(0,0,0,.2); + box-shadow: 0px 0 16px rgba(0,0,0,.2); -webkit-transition: all 0.3s linear; -moz-transition: all 0.3s linear; -ms-transition: all 0.3s linear; diff --git a/src/components/Index/DashBoard.js b/src/components/Index/DashBoard.js index 54211a4..6f3a7d8 100644 --- a/src/components/Index/DashBoard.js +++ b/src/components/Index/DashBoard.js @@ -1,4 +1,7 @@ import React, { Component } from 'react'; + +import PropType from 'prop-types'; + import { Card, Collapse } from 'antd'; const Panel = Collapse.Panel; @@ -7,7 +10,7 @@ export default class DashBoard extends Component { renderTitle(item) { return(
- {item.time} + {item.time} {item.title}
); diff --git a/src/components/Meeting/BuildMeeting.js b/src/components/Meeting/BuildMeeting.js index c6a3a0c..cd6b4c9 100644 --- a/src/components/Meeting/BuildMeeting.js +++ b/src/components/Meeting/BuildMeeting.js @@ -86,7 +86,7 @@ export default class BuildMeeting extends Component { diff --git a/src/components/Meeting/MeetingFilter.js b/src/components/Meeting/MeetingFilter.js index 7c47831..edc1515 100644 --- a/src/components/Meeting/MeetingFilter.js +++ b/src/components/Meeting/MeetingFilter.js @@ -37,7 +37,7 @@ class MeetingFilter extends Component { }; return (
-
+ diff --git a/src/components/Meeting/MeetingPanel.js b/src/components/Meeting/MeetingPanel.js index bc45964..c9e7c90 100644 --- a/src/components/Meeting/MeetingPanel.js +++ b/src/components/Meeting/MeetingPanel.js @@ -5,7 +5,7 @@ import MeetingEdit from './MeetingEdit.js'; import React,{ Component,PropTypes } from 'react'; import { Popconfirm,message } from 'antd'; import SelectCell from '../Common/SelectCell.js'; -import MeetingFilter from '../meeting/MeetingFilter.js'; +import MeetingFilter from '../Meeting/MeetingFilter.js'; class MeetingPanel extends Component { constructor(props) { diff --git a/src/components/Member/AvatarUpload.less b/src/components/Member/AvatarUpload.less index ed28d6f..e704f06 100644 --- a/src/components/Member/AvatarUpload.less +++ b/src/components/Member/AvatarUpload.less @@ -8,8 +8,8 @@ .avatar_content { position: relative; - width: 100%; - height: 100%; + width: 136px; + height: 136px; } .avatar_img { @@ -18,8 +18,8 @@ } .avatar_text { - width: 100%; - height: 100%; + width: 136px; + height: 136px; display: block; background: #a7dfe3; color: black; @@ -36,7 +36,7 @@ bottom: 0px; margin: 0px auto; line-height: 30px; - width: 100%; + width: 136px; height: 30px; background-color: rgb(50, 50, 50); color: #fff; diff --git a/src/components/Member/MemberFilter.js b/src/components/Member/MemberFilter.js index de05faf..b5144bf 100644 --- a/src/components/Member/MemberFilter.js +++ b/src/components/Member/MemberFilter.js @@ -40,7 +40,7 @@ class MemberFilter extends Component { } return (
- + diff --git a/src/components/Member/MemberInfo.js b/src/components/Member/MemberInfo.js index a95df18..908c08a 100644 --- a/src/components/Member/MemberInfo.js +++ b/src/components/Member/MemberInfo.js @@ -29,11 +29,11 @@ class MemberInfoForm extends Component { const newMember = { key: member.key, name: member.name, - campus: member.campus, - class: member.class, + major: member.major, college: member.college, stuid: member.stuid, sex: member.sex, + campus: (type == 'campus') ? value : member.campus, avatar: (type == 'avatar') ? value : member.avatar, debitcard: (type == 'debitcard') ? value: member.debitcard, depart: (type == 'depart') ? value: member.depart, @@ -89,7 +89,7 @@ class MemberInfoForm extends Component { }; return(
- + @@ -119,7 +119,7 @@ class MemberInfoForm extends Component { - + diff --git a/src/components/Member/MemberInfo.js.tmp b/src/components/Member/MemberInfo.js.tmp deleted file mode 100644 index 2c4fbe8..0000000 --- a/src/components/Member/MemberInfo.js.tmp +++ /dev/null @@ -1,256 +0,0 @@ -import React, { Component, PropTypes } from 'react'; -import { Form, Input, Tooltip, Icon, Cascader, Select, Row, Col, Checkbox, Button } from 'antd'; -import Avatar from './Avatar.js'; -import style from './MemberInfo.less'; -const FormItem = Form.Item; -const Option = Select.Option; - -class MemberInfoForm extends Component { - constructor(props) { - super(props); - this.state = { - depart: props.member.depart, - role: props.member.role, - status: props.member.status - } - } - - componentWillReceiveProps(nextProps) { - this.setState({ - depart: nextProps.member.depart, - role: nextProps.member.role, - status: nextProps.member.status - }); - } - - changeDepart = (value) => { - this.setState({ - depart: value - }); - } - - changeRole = (value) => { - this.setState({ - role: value - }); - } - - changeStatus = (value) => { - this.setState({ - status: value - }); - } - - handleSubmit = (e) => { - e.preventDefault(); - this.props.form.validateFieldsAndScroll((err, values) => { - if (!err) { - Object.assign(values, this.state, {stuid: this.props.member.stuid}); - this.props.dispatch({ - type: 'member/updateMember', - payload: values - }); - } else { - console.log('err', error); - } - }); - } - - render() { - const { getFieldDecorator } = this.props.form; - const formItemLayout = { - labelCol: { span: 6 }, - wrapperCol: { span: 14 }, - }; - const tailFormItemLayout = { - wrapperCol: { - span: 12, - offset: 8, - }, - }; - return( -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{this.props.member.name}
- - - - - - - {getFieldDecorator('phone', { - rules: [{ - required: true, message: '连电话号码都舍不得给我吗？' - }], - })( - - )} - - - - - - - - {getFieldDecorator('qq', { - rules: [{ required: true, message: 'please把QQ号给我,' }], - })( - - )} - - - - - - - - {getFieldDecorator('email', { - rules: [{ - type: 'email', message: 'The input is not valid E-mail!', - }, { - required: true, message: '强烈建议你填一下邮箱地址', - }], - })( - - )} - - - - - - - - {getFieldDecorator('creditcode', { - rules: [{ - required: true, message: '没有卡号怎么发工资？' - }], - })( - - )} - - - - - - - - 密码  - - - - )} - hasFeedback - > - {getFieldDecorator('password', { - })( - - )} - - - - - - - - -
- ); - } -} - -const MemberInfo = Form.create()(MemberInfoForm); - -export default MemberInfo; \ No newline at end of file diff --git a/src/components/Member/MemberInfo.less b/src/components/Member/MemberInfo.less index 236f8a6..9c1f2b4 100644 --- a/src/components/Member/MemberInfo.less +++ b/src/components/Member/MemberInfo.less @@ -1,5 +1,5 @@ .memberinfo_container { - padding: 10px 20px; + padding: 8px 16px; } .memberinfo_name { diff --git a/src/components/Member/MemberPanel.css b/src/components/Member/MemberPanel.css deleted file mode 100644 index e0b78f6..0000000 --- a/src/components/Member/MemberPanel.css +++ /dev/null @@ -1 +0,0 @@ -.oa_ant_advanced_search_form{padding:5px 24px}.oa_form_title{font-size:1rem;padding-right:20px}.oa_member_table{border-radius:0} \ No newline at end of file diff --git a/src/components/Member/MemberPanel.js b/src/components/Member/MemberPanel.js index 6d0a4ab..9694f80 100644 --- a/src/components/Member/MemberPanel.js +++ b/src/components/Member/MemberPanel.js @@ -75,6 +75,7 @@ class MemberPanel extends Component { if (type == 'save') { const member = { + key: item.key, stuid: item.stuid, campus: (this.editing.campus) ? this.editing.campus : item.campus, depart: (this.editing.depart) ? this.editing.depart : item.depart, diff --git a/src/components/Member/MemberPanel.less b/src/components/Member/MemberPanel.less index 6ab592b..15deebd 100644 --- a/src/components/Member/MemberPanel.less +++ b/src/components/Member/MemberPanel.less @@ -1,17 +1,14 @@ .oa_ant_advanced_search_form { - padding: 8pt 24px; - /*background: #fbfbfb;*/ - /*border: 1px solid #d9d9d9;*/ + padding: 8pt 16px; } -.oa_form_title { +/*.oa_form_title { font-size: 1rem; padding-right: 20px; -} +}*/ .oa_member_table { border-radius: 0px; - /*max-height: 700px;*/ } .oa_member_filter_search { diff --git a/src/components/Member/RecruitFilter.js b/src/components/Member/RecruitFilter.js index 490bdbe..dce4230 100644 --- a/src/components/Member/RecruitFilter.js +++ b/src/components/Member/RecruitFilter.js @@ -44,7 +44,7 @@ class RecruitFilter extends Component { } return (
-
+ diff --git a/src/components/Member/SearchForm.js b/src/components/Member/SearchForm.js index 76fc3a7..3904e03 100644 --- a/src/components/Member/SearchForm.js +++ b/src/components/Member/SearchForm.js @@ -27,7 +27,7 @@ class SearchForm extends Component { const {getFieldDecorator} = this.props.form; return (
- + diff --git a/src/components/Report/FillReport.js b/src/components/Report/FillReport.js index f275ead..dfe4146 100644 --- a/src/components/Report/FillReport.js +++ b/src/components/Report/FillReport.js @@ -60,7 +60,7 @@ class FillReport extends Component {
- + { return ( diff --git a/src/components/Report/MyReport.less b/src/components/Report/MyReport.less index 144c4d0..b630d36 100644 --- a/src/components/Report/MyReport.less +++ b/src/components/Report/MyReport.less @@ -1,8 +1,8 @@ .report_list_wrap { - padding: 15px; + padding: 16px; } .report_list_wrap_loading { - padding: 15px; + padding: 16px; text-align: center; } \ No newline at end of file diff --git a/src/components/Report/ReportCard.less b/src/components/Report/ReportCard.less index 05d05f2..c418418 100644 --- a/src/components/Report/ReportCard.less +++ b/src/components/Report/ReportCard.less @@ -4,7 +4,7 @@ } .report_item_suggestion { - padding: 10px 0px 8px 0px; + padding: 8px 0px; border-bottom: 1px solid #f0f0f0; } diff --git a/src/components/Report/ReviewReport.less b/src/components/Report/ReviewReport.less index 144c4d0..b630d36 100644 --- a/src/components/Report/ReviewReport.less +++ b/src/components/Report/ReviewReport.less @@ -1,8 +1,8 @@ .report_list_wrap { - padding: 15px; + padding: 16px; } .report_list_wrap_loading { - padding: 15px; + padding: 16px; text-align: center; } \ No newline at end of file diff --git a/src/components/Report/SearchForm.js b/src/components/Report/SearchForm.js index ba64c44..fd5c815 100644 --- a/src/components/Report/SearchForm.js +++ b/src/components/Report/SearchForm.js @@ -56,8 +56,8 @@ class SearchForm extends Component { wrapperCol: { span: 24 } } return ( -
- +
+ diff --git a/src/components/Setting/ReportSetting.js b/src/components/Setting/ReportSetting.js index b269723..78507ab 100644 --- a/src/components/Setting/ReportSetting.js +++ b/src/components/Setting/ReportSetting.js @@ -70,7 +70,7 @@ class ReportSetting extends Component {
- + + ); }; diff --git a/src/routes/IndexPage.js b/src/routes/IndexPage.js index d90844e..02a58fe 100755 --- a/src/routes/IndexPage.js +++ b/src/routes/IndexPage.js @@ -1,4 +1,4 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'dva'; import Layout from '../components/Common/Layout.js'; import DashBoard from '../components/Index/DashBoard.js'; diff --git a/src/routes/Meeting.js b/src/routes/Meeting.js index 16ccaa9..37bbb4b 100644 --- a/src/routes/Meeting.js +++ b/src/routes/Meeting.js @@ -77,7 +77,7 @@ class Meeting extends Component { content: } ]; - const tabItems = user.role > 1 ? tabItems1:tabItems2; + const tabItems = user.role >= 1 ? tabItems1 : tabItems2; const pullScreen = this.state.pullScreen; return ( diff --git a/src/services/members.js b/src/services/members.js index b59623d..8eda9b5 100644 --- a/src/services/members.js +++ b/src/services/members.js @@ -9,7 +9,7 @@ export async function queryMembers(params) { } export async function updateMember(params) { - return request('/api/member/', { + return request('/api/member/' + params.key, { method: 'POST', mode: 'cors', credentials: 'include', -- Gitee