diff --git a/client/Application.js b/client/Application.js index 72855d8a..85f86772 100644 --- a/client/Application.js +++ b/client/Application.js @@ -45,7 +45,7 @@ export default class App extends Component {
- + diff --git a/client/actions/news.js b/client/actions/news.js index 24a1fcb6..9d4da1fc 100644 --- a/client/actions/news.js +++ b/client/actions/news.js @@ -21,10 +21,12 @@ export function fetchNewsData (uid,page,limit) { page: page, limit: variable.PAGE_LIMIT?variable.PAGE_LIMIT:limit } - console.log(param); + // console.log(param); return { type: FETCH_NEWS_DATA, - payload: axios.get('/log/list',param) + payload: axios.get('/log/list',{ + params: param + }) }; } diff --git a/client/constants/variable.js b/client/constants/variable.js index e0ad6b4e..a9265d45 100644 --- a/client/constants/variable.js +++ b/client/constants/variable.js @@ -1,3 +1,7 @@ export default { - PAGE_LIMIT: 10 // 默认每页展示10条数据 + PAGE_LIMIT: 10, // 默认每页展示10条数据 + + // layout + ROW_MIN_WIDTH: '9.7rem', // 适应小屏幕分辨率 + ROW_MAX_WIDTH: '11.7rem' // 适应大屏幕分辨率 } diff --git a/client/containers/News/News.js b/client/containers/News/News.js index df5bb797..540324ae 100644 --- a/client/containers/News/News.js +++ b/client/containers/News/News.js @@ -38,7 +38,7 @@ class News extends Component { } componentWillMount(){ console.log(this.props.uid); - this.props.fetchNewsData(1,1,10).then(function(data){ + this.props.fetchNewsData(107,1,10).then(function(data){ console.log(data); }) } diff --git a/client/containers/ProjectGroups/GroupList/GroupList.js b/client/containers/ProjectGroups/GroupList/GroupList.js index f5f265f8..8cbc73ae 100644 --- a/client/containers/ProjectGroups/GroupList/GroupList.js +++ b/client/containers/ProjectGroups/GroupList/GroupList.js @@ -4,7 +4,8 @@ import { connect } from 'react-redux' import { Button, Icon, Modal, Input, message, Menu, Row, Col } from 'antd' import { autobind } from 'core-decorators'; import axios from 'axios'; - +import { withRouter } from 'react-router'; +const { TextArea } = Input; const Search = Input.Search; const confirm = Modal.confirm; const TYPE_EDIT = 'edit'; @@ -28,6 +29,7 @@ import './GroupList.scss' setGroupList } ) +@withRouter export default class GroupList extends Component { static propTypes = { @@ -35,7 +37,9 @@ export default class GroupList extends Component { currGroup: PropTypes.object, fetchGroupList: PropTypes.func, setCurrGroup: PropTypes.func, - setGroupList: PropTypes.func + setGroupList: PropTypes.func, + match: PropTypes.object, + history: PropTypes.object } state = { @@ -53,8 +57,19 @@ export default class GroupList extends Component { } componentWillMount() { + const groupName = this.props.match.params.groupName; this.props.fetchGroupList().then(() => { - const currGroup = this.props.groupList[0] || { group_name: '', group_desc: '' }; + let currGroup = this.props.groupList[0] || { group_name: '', group_desc: '' }; + if(this.props.groupList.length && groupName){ + for(let i = 0;i { return +group._id === +groupId }); this.props.setCurrGroup(currGroup); + this.props.history.replace(`${currGroup.group_name}`); } @autobind @@ -229,7 +245,7 @@ export default class GroupList extends Component {
简介：
- + diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/ProjectGroups/GroupList/GroupList.scss index 25291395..c6cb57fc 100644 --- a/client/containers/ProjectGroups/GroupList/GroupList.scss +++ b/client/containers/ProjectGroups/GroupList/GroupList.scss @@ -23,6 +23,7 @@ } .group-operate { height: 48px; + min-width: 263px; padding: 10px 6px; background: #fff; .search { diff --git a/client/containers/ProjectGroups/ProjectList/UpDateModal.js b/client/containers/ProjectGroups/ProjectList/UpDateModal.js index b82131bf..06514cbd 100644 --- a/client/containers/ProjectGroups/ProjectList/UpDateModal.js +++ b/client/containers/ProjectGroups/ProjectList/UpDateModal.js @@ -50,7 +50,8 @@ class UpDateModal extends Component { constructor(props) { super(props); this.state = { - protocol: 'http:\/\/' + protocol: 'http:\/\/', + envProtocolChange: 'http:\/\/' } } static propTypes = { @@ -84,18 +85,19 @@ class UpDateModal extends Component { e.preventDefault(); const { form, updateProject, changeUpdateModal, currGroup, projectList, handleUpdateIndex, fetchProjectList, changeTableLoading } = this.props; form.validateFields((err, values) => { - console.log(err); + console.log(values); if (!err) { - console.log(projectList[handleUpdateIndex]); + // console.log(projectList[handleUpdateIndex]); let assignValue = Object.assign(projectList[handleUpdateIndex], values); values.protocol = this.state.protocol.split(':')[0]; assignValue.env = assignValue.envs.map((item, index) => { + console.log(values['envs-protocol-'+index]); return { name: values['envs-name-'+index], - domain: values['envs-domain-'+index] + domain: values['envs-protocol-'+index] + values['envs-domain-'+index] } }); - console.log(assignValue); + // console.log(assignValue); changeTableLoading(true); updateProject(assignValue).then((res) => { @@ -119,6 +121,13 @@ class UpDateModal extends Component { }); } + envProtocolChange = (value) => { + console.log(value); + // this.setState({ + // envProtocolChange: value + // }) + } + // 项目的修改操作 - 删除一项环境配置 remove = (id) => { const { form } = this.props; @@ -174,7 +183,7 @@ class UpDateModal extends Component { getFieldDecorator('envs', { initialValue: envMessage }); const envs = getFieldValue('envs'); const formItems = envs.map((k, index) => { - console.log(k); + // console.log(k); const secondIndex = 'next' + index; // 为保证key的唯一性 return ( @@ -220,7 +229,7 @@ class UpDateModal extends Component { > {getFieldDecorator(`envs-domain-${index}`, { validateTrigger: ['onChange', 'onBlur'], - initialValue: envMessage.length !== 0 ? k.domain : '', + initialValue: envMessage.length !== 0 ? k.domain.split('\/\/')[1] : '', rules: [{ required: false, whitespace: true, @@ -240,7 +249,18 @@ class UpDateModal extends Component { } }] })( - + + + + + )}/> )} diff --git a/client/reducer/Login/login.js b/client/reducer/Login/login.js index 775a863c..858d36bb 100644 --- a/client/reducer/Login/login.js +++ b/client/reducer/Login/login.js @@ -2,7 +2,8 @@ import { LOGIN, LOGIN_OUT, LOGIN_TYPE, - GET_LOGIN_STATE + GET_LOGIN_STATE, + REGISTER } from '../../constants/action-types'; const LOADING_STATUS = 0; @@ -13,8 +14,8 @@ const initialState = { isLogin: false, userName: null, uid: null, - loginState:LOADING_STATUS, - loginWrapActiveKey:"1" + loginState: LOADING_STATUS, + loginWrapActiveKey: "1" }; export default (state = initialState, action) => { @@ -51,6 +52,15 @@ export default (state = initialState, action) => { loginWrapActiveKey: action.index }; } + case REGISTER: { + return { + ...state, + isLogin: true, + loginState: MEMBER_STATUS, + uid: action.payload.data.data.uid, + userName: action.payload.data.data.username + }; + } default: return state; } diff --git a/client/reducer/login/login.js b/client/reducer/login/login.js index 775a863c..858d36bb 100644 --- a/client/reducer/login/login.js +++ b/client/reducer/login/login.js @@ -2,7 +2,8 @@ import { LOGIN, LOGIN_OUT, LOGIN_TYPE, - GET_LOGIN_STATE + GET_LOGIN_STATE, + REGISTER } from '../../constants/action-types'; const LOADING_STATUS = 0; @@ -13,8 +14,8 @@ const initialState = { isLogin: false, userName: null, uid: null, - loginState:LOADING_STATUS, - loginWrapActiveKey:"1" + loginState: LOADING_STATUS, + loginWrapActiveKey: "1" }; export default (state = initialState, action) => { @@ -51,6 +52,15 @@ export default (state = initialState, action) => { loginWrapActiveKey: action.index }; } + case REGISTER: { + return { + ...state, + isLogin: true, + loginState: MEMBER_STATUS, + uid: action.payload.data.data.uid, + userName: action.payload.data.data.username + }; + } default: return state; } diff --git a/client/routes.js b/client/routes.js index da1220bb..f2e0ccdc 100644 --- a/client/routes.js +++ b/client/routes.js @@ -9,7 +9,7 @@ export default () => {
- +