From a76c606f0b9ef60b483b9a080519f68b205627bf Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Tue, 18 Jul 2017 21:11:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/ProjectGroups/ProjectList/index.js | 10 +++++++--- client/reducer/group/project.js | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/containers/ProjectGroups/ProjectList/index.js b/client/containers/ProjectGroups/ProjectList/index.js index 4c230cb7..d8739105 100644 --- a/client/containers/ProjectGroups/ProjectList/index.js +++ b/client/containers/ProjectGroups/ProjectList/index.js @@ -1,14 +1,16 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import { Table, Button, Modal, Form, Input, Icon, Tooltip, Select } from 'antd'; +import { Table, Button, Modal, Form, Input, Icon, Tooltip, Select, Popconfirm } from 'antd'; import { addProject, fetchProjectList } from '../../../actions/project'; const { TextArea } = Input; const FormItem = Form.Item; const Option = Select.Option; import './ProjectList.scss' - +const confirm = (e) => { + console.log(e); +} const columns = [{ title: '项目名称', dataIndex: 'name', @@ -29,7 +31,9 @@ const columns = [{ 修改 - 删除 + + 删除 + ) }]; diff --git a/client/reducer/group/project.js b/client/reducer/group/project.js index 9bec0d01..5b8b9945 100644 --- a/client/reducer/group/project.js +++ b/client/reducer/group/project.js @@ -12,7 +12,8 @@ export default (state = initialState, action) => { case FETCH_PROJECT_LIST: { return { ...state, - projectList: action.payload.data.data + projectList: action.payload.data.data.list, + total: action.payload.data.data.total }; } case PROJECT_ADD: {