diff --git a/client/App.js b/client/App.js
index 79321f06..903b0e8e 100644
--- a/client/App.js
+++ b/client/App.js
@@ -55,7 +55,6 @@ class App extends Component {
}
componentDidMount() {
- console.log('app.js init')
axios.get('/user/status').then((res) => {
if (res.data.errcode === 0 && res.data.data._id > 0) {
this.setState({
@@ -70,17 +69,13 @@ class App extends Component {
this.setState({
login: GUEST_STATUS
})
- console.log(err.message)
+ console.log(err)
})
}
render() {
- console.log(MEMBER_STATUS)
- console.log(this.route(this.state.login))
return this.route(this.state.login)
-
-
}
}
diff --git a/client/actions/addInterFace.js b/client/actions/addInterFace.js
index 29eeacec..4675fb63 100644
--- a/client/actions/addInterFace.js
+++ b/client/actions/addInterFace.js
@@ -6,7 +6,6 @@ import {
DELETE_INTERFACE_SEQ_HEADER,
GET_INTERFACE_REQ_PARAMS,
GET_INTERFACE_RES_PARAMS,
- // SAVE_INTERFACE_FORMS,
PUSH_INTERFACE_NAME,
PUSH_INTERFACE_METHOD
} from '../constants/action-types.js'
@@ -60,13 +59,6 @@ export function getResParams (value) {
};
}
-// export function saveForms (value) {
-// return {
-// type: SAVE_INTERFACE_FORMS,
-// payload: value
-// };
-// }
-
export function pushInterfaceName (value) {
return {
type: PUSH_INTERFACE_NAME,
@@ -80,5 +72,3 @@ export function pushInterfaceMethod (value) {
payload: value
}
}
-
-
diff --git a/client/actions/addInterface.js b/client/actions/addInterface.js
index 29eeacec..4675fb63 100644
--- a/client/actions/addInterface.js
+++ b/client/actions/addInterface.js
@@ -6,7 +6,6 @@ import {
DELETE_INTERFACE_SEQ_HEADER,
GET_INTERFACE_REQ_PARAMS,
GET_INTERFACE_RES_PARAMS,
- // SAVE_INTERFACE_FORMS,
PUSH_INTERFACE_NAME,
PUSH_INTERFACE_METHOD
} from '../constants/action-types.js'
@@ -60,13 +59,6 @@ export function getResParams (value) {
};
}
-// export function saveForms (value) {
-// return {
-// type: SAVE_INTERFACE_FORMS,
-// payload: value
-// };
-// }
-
export function pushInterfaceName (value) {
return {
type: PUSH_INTERFACE_NAME,
@@ -80,5 +72,3 @@ export function pushInterfaceMethod (value) {
payload: value
}
}
-
-
diff --git a/client/actions/interfaceAction.js b/client/actions/interfaceAction.js
index 7a8e4702..196feff1 100644
--- a/client/actions/interfaceAction.js
+++ b/client/actions/interfaceAction.js
@@ -1,33 +1,11 @@
import {
FETCH_INTERFACE_DATA,
LIST_INTERFACE_CLICK,
- PROJECT_MEMBER_INTERFACE
+ PROJECT_MEMBER_INTERFACE,
+ DELETE_INTERFACE_DATA
} from '../constants/action-types.js'
export function fetchInterfaceData (value) {
- // const data = [{
- // key: '1',
- // name: 'John Brown',
- // age: 32,
- // address: 'New York No. 1 Lake Park',
- // date: '2015-11-11 13:00:15',
- // features: '3'
- // }, {
- // key: '2',
- // name: 'Jim Green',
- // age: 42,
- // address: 'London No. 1 Lake Park',
- // date: '2015-11-11 13:00:15',
- // features: '3'
- // }, {
- // key: '3',
- // name: 'Joe Black',
- // age: 32,
- // address: 'Sidney No. 1 Lake Park',
- // date: '2015-11-11 13:00:15',
- // features: '3'
- // }]
-
return {
type: FETCH_INTERFACE_DATA,
payload: value
@@ -45,3 +23,10 @@ export function closeProjectMember () {
type: PROJECT_MEMBER_INTERFACE
}
}
+
+export function deleteInterfaceData (value) {
+ return {
+ type: DELETE_INTERFACE_DATA,
+ payload: value
+ }
+}
diff --git a/client/app.js b/client/app.js
index 79321f06..903b0e8e 100644
--- a/client/app.js
+++ b/client/app.js
@@ -55,7 +55,6 @@ class App extends Component {
}
componentDidMount() {
- console.log('app.js init')
axios.get('/user/status').then((res) => {
if (res.data.errcode === 0 && res.data.data._id > 0) {
this.setState({
@@ -70,17 +69,13 @@ class App extends Component {
this.setState({
login: GUEST_STATUS
})
- console.log(err.message)
+ console.log(err)
})
}
render() {
- console.log(MEMBER_STATUS)
- console.log(this.route(this.state.login))
return this.route(this.state.login)
-
-
}
}
diff --git a/client/components/Header/Header.js b/client/components/Header/Header.js
index b4350708..d4a6f98f 100644
--- a/client/components/Header/Header.js
+++ b/client/components/Header/Header.js
@@ -43,8 +43,7 @@ class HeaderCom extends Component {
location: PropTypes.object
}
componentDidMount() {
- const { router } = this.props;
- console.log(router);
+ // const { router } = this.props;
}
linkTo = (e) =>{
this.setState({
diff --git a/client/constants/action-types.js b/client/constants/action-types.js
index 1ee684b2..37d4978a 100644
--- a/client/constants/action-types.js
+++ b/client/constants/action-types.js
@@ -3,6 +3,7 @@ export const FETCH_INTERFACE_DATA = 'FETCH_INTERFACE_DATA'
export const LIST_INTERFACE_CLICK = 'LIST_INTERFACE_CLICK'
export const PROJECT_MEMBER_INTERFACE = 'PROJECT_MEMBER_INTERFACE'
export const PUSH_INTERFACE_NAME = 'PUSH_INTERFACE_NAME'
+export const DELETE_INTERFACE_DATA = 'DELETE_INTERFACE_DATA'
// addInterFace
export const FETCH_ADD_INTERFACE_INPUT = 'FETCH_ADD_INTERFACE_INPUT'
@@ -12,7 +13,6 @@ export const ADD_INTERFACE_SEQ_HEADER = 'ADD_INTERFACE_SEQ_HEADER'
export const DELETE_INTERFACE_SEQ_HEADER = 'DELETE_INTERFACE_SEQ_HEADER'
export const GET_INTERFACE_REQ_PARAMS = 'GET_INTERFACE_REQ_PARAMS'
export const GET_INTERFACE_RES_PARAMS = 'GET_INTERFACE_RES_PARAMS'
-// export const SAVE_INTERFACE_FORMS = 'SAVE_INTERFACE_FORMS'
export const PUSH_INTERFACE_METHOD = 'PUSH_INTERFACE_METHOD'
// group
diff --git a/client/containers/AddInterface/AddInterface.js b/client/containers/AddInterface/AddInterface.js
index 604ec438..4e278f53 100644
--- a/client/containers/AddInterface/AddInterface.js
+++ b/client/containers/AddInterface/AddInterface.js
@@ -10,7 +10,14 @@ import ReqHeader from './ReqHeader/ReqHeader.js'
import ReqParams from './ReqParams/ReqParams.js'
import ResParams from './ResParams/ResParams.js'
import Result from './Result/Result.js'
-import { saveForms } from '../../actions/addInterface.js'
+import {
+ saveForms,
+ getResParams,
+ getReqParams,
+ addReqHeader,
+ pushInputValue,
+ pushInterfaceName
+} from '../../actions/addInterface.js'
@connect(
state => {
@@ -19,35 +26,128 @@ import { saveForms } from '../../actions/addInterface.js'
resParams: state.addInterface.resParams,
method: state.addInterface.method,
url: state.addInterface.url,
+ seqGroup: state.addInterface.seqGroup,
interfaceName: state.addInterface.interfaceName
}
},
{
- saveForms
+ saveForms,
+ getReqParams,
+ getResParams,
+ addReqHeader,
+ pushInputValue,
+ pushInterfaceName
}
)
class AddInterface extends Component {
static propTypes = {
+ url: PropTypes.string,
+ method: PropTypes.string,
reqParams: PropTypes.string,
resParams: PropTypes.string,
- method: PropTypes.string,
- url: PropTypes.string,
+ seqGroup: PropTypes.array,
interfaceName: PropTypes.string,
- saveForms: PropTypes.func
+ saveForms: PropTypes.func,
+ addReqHeader: PropTypes.func,
+ getReqParams: PropTypes.func,
+ getResParams: PropTypes.func,
+ pushInputValue: PropTypes.func,
+ pushInterfaceName: PropTypes.func
}
constructor (props) {
super(props)
+ this.state = {
+ isLoading: ''
+ }
+ }
+
+ componentDidMount () {
+ const ifTrue = this.verificationURL()
+ let interfaceId = undefined
+ if (ifTrue) {
+ interfaceId = this.getInterfaceId()
+ this.initInterfaceData(interfaceId)
+ } else {
+ const props = this.props
+ props.pushInputValue('')
+ props.pushInterfaceName('')
+ props.getReqParams('')
+ props.getResParams('')
+ props.addReqHeader([
+ {
+ id: 0,
+ name: '',
+ value: ''
+ }
+ ])
+ }
+ }
+
+ getInterfaceId () {
+ const value = location.hash.match(/\d+/g)
+ return value ? value[0] : ''
+ }
+
+ verificationURL () {
+ const dir = 'AddInterface/edit'
+ const url = location.href
+ if (url.includes(dir)) {
+ return true
+ }
+ }
+
+ editState (data) {
+ const props = this.props
+ const { path, title, req_params_other, res_body, req_headers} = data
+ props.pushInputValue(path)
+ props.pushInterfaceName(title)
+ props.getReqParams(req_params_other)
+ props.getResParams(res_body)
+ props.addReqHeader(req_headers)
+ }
+
+ initInterfaceData (interfaceId) {
+ const params = { id: interfaceId }
+
+ axios.get('/interface/get', {params: params})
+ .then(result => {
+ result = result.data.data
+ result.req_headers.map((value, key) => {
+ value.id = key
+ return value
+ })
+ this.editState(result)
+ })
+ .catch(e => {
+ console.log(e)
+ })
+ }
+
+ setLoading (boolean) {
+ this.setState({
+ isLoading: boolean ? 'is-loading' : ''
+ })
+ }
+
+ routerPage () {
+ const origin = location.origin
+ const pathname = location.pathname
+ location.href = `${origin}${pathname}#/interface`
}
@autobind
saveForms () {
- const { interfaceName, url, reqParams, resParams } = this.props
+ let postURL = undefined
+ const { interfaceName, url, seqGroup, reqParams, resParams } = this.props
+ const ifTrue = this.verificationURL()
+ const interfaceId = this.getInterfaceId()
const params = {
title: interfaceName,
path: url,
method: 'POST',
+ req_headers: seqGroup,
project_id: 558,
req_params_type: 'json',
req_params_other: reqParams,
@@ -55,9 +155,19 @@ class AddInterface extends Component {
res_body: resParams
}
- axios.post('/interface/add', params)
- .then(data => {
- console.log('data', data)
+ if (ifTrue) {
+ params.id = interfaceId
+ postURL = '/interface/up'
+ } else {
+ postURL = '/interface/add'
+ }
+
+ this.setLoading(true)
+
+ axios.post(postURL, params)
+ .then(() => {
+ this.setLoading()
+ this.routerPage()
})
.catch(e => {
console.log(e)
@@ -66,6 +176,7 @@ class AddInterface extends Component {
render () {
const TabPane = Tabs.TabPane
+ const isLoading = this.state.isLoading
return (
@@ -75,7 +186,7 @@ class AddInterface extends Component {
-
+
@@ -83,6 +194,7 @@ class AddInterface extends Component {
测试
+
)
}
diff --git a/client/containers/AddInterface/AddInterface.scss b/client/containers/AddInterface/AddInterface.scss
index b4b8e5c2..a8d90761 100644
--- a/client/containers/AddInterface/AddInterface.scss
+++ b/client/containers/AddInterface/AddInterface.scss
@@ -139,6 +139,22 @@
}
}
}
+
+ .loading {
+ display: none;
+ width: 100%;
+ height: 100px;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0, 0, 0, 0.5);
+ background-size: 30%;
+ z-index: 10000;
+ }
+ .is-loading {
+ display: block;
+ }
}
#container {
diff --git a/client/containers/AddInterface/ReqHeader/ReqHeader.js b/client/containers/AddInterface/ReqHeader/ReqHeader.js
index 219fb730..bb69af71 100644
--- a/client/containers/AddInterface/ReqHeader/ReqHeader.js
+++ b/client/containers/AddInterface/ReqHeader/ReqHeader.js
@@ -11,8 +11,9 @@ import {
// 重新渲染页面
const getReqList = function (self) {
const [reqList, seqGroup] = [[], self.props.seqGroup]
+ console.log('seqGroup', seqGroup)
seqGroup.map((value, key) => {
- reqList.push()
+ reqList.push()
})
return reqList
}
@@ -45,8 +46,8 @@ class ReqHeader extends Component {
let id = seqGroup[seqGroup.length-1].id
let list = {
id: ++id,
- tag: '',
- content: ''
+ value: '',
+ name: ''
}
seqGroup.push(list)
newSeqGroup.push(...seqGroup)
diff --git a/client/containers/AddInterface/ReqHeader/ReqList.js b/client/containers/AddInterface/ReqHeader/ReqList.js
index e7323439..8e1ae13c 100644
--- a/client/containers/AddInterface/ReqHeader/ReqList.js
+++ b/client/containers/AddInterface/ReqHeader/ReqList.js
@@ -13,8 +13,6 @@ import {
state => {
return {
seqGroup: state.addInterface.seqGroup,
- tagValue: state.addInterface.tagValue,
- headerValue: state.addInterface.headerValue,
reqTagValue: state.addInterface.reqTagValue,
reqHeaderValue: state.addInterface.reqHeaderValue
}
@@ -28,13 +26,13 @@ import {
class ReqList extends Component {
static propTypes = {
- headerValue: PropTypes.string,
seqGroup: PropTypes.array,
- tagValue: PropTypes.string,
reqTagValue: PropTypes.func,
reqHeaderValue: PropTypes.func,
deleteReqHeader: PropTypes.func,
- dataNum: PropTypes.number
+ _id: PropTypes.number,
+ dataNum: PropTypes.number,
+ value: PropTypes.object
}
constructor(props) {
@@ -43,22 +41,32 @@ class ReqList extends Component {
@autobind
handleChange (value) {
- this.props.reqTagValue(value)
+ const dir = 'AddInterface/edit'
+ const url = location.href
+ if (url.includes(dir)) {
+ const { seqGroup, value: { id } } = this.props
+ seqGroup[id].name = value
+ } else {
+ const { seqGroup, dataNum } = this.props
+ seqGroup[dataNum].name = value
+ }
}
@autobind
handleBlur (e) {
const value = e.target.value
- this.props.reqHeaderValue(value)
+ const { seqGroup, value: { id } } = this.props
+ seqGroup[id].value = value
}
@autobind
- deleteReqHeader (e) {
+ deleteReqHeader () {
let newSeqGroup = []
let seqGroup = this.props.seqGroup
- let dataNum = e.target.getAttribute('data-num')
+ let id = this.props.value.id
+ console.log(this.props)
seqGroup.map(value => {
- if (+dataNum !== value.id) {
+ if (+id !== value.id) {
newSeqGroup.push(value)
}
})
@@ -66,22 +74,24 @@ class ReqList extends Component {
}
render () {
+ const propsValue = this.props.value
const Option = Select.Option
- const dataNum = this.props.dataNum
+ const value = propsValue.value
+ const name = propsValue.name || 'Accept'
return (
- 头部标签 {this.props.tagValue} {this.props.headerValue}
-
)
}
diff --git a/client/containers/AddInterface/ReqMethod/ReqMethod.js b/client/containers/AddInterface/ReqMethod/ReqMethod.js
index 01d11cfb..3e838275 100644
--- a/client/containers/AddInterface/ReqMethod/ReqMethod.js
+++ b/client/containers/AddInterface/ReqMethod/ReqMethod.js
@@ -57,7 +57,7 @@ class ReqMethod extends Component {
render () {
const { Option } = Select
-
+ const { url, interfaceName } = this.props
return (
diff --git a/client/containers/AddInterface/ReqParams/ReqParams.js b/client/containers/AddInterface/ReqParams/ReqParams.js
index 108a5365..f5e2b0b5 100644
--- a/client/containers/AddInterface/ReqParams/ReqParams.js
+++ b/client/containers/AddInterface/ReqParams/ReqParams.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import wangEditor from 'wangeditor'
import { getReqParams } from '../../../actions/addInterface.js'
-
+const editor = new wangEditor('#req-cover')
@connect(
state => {
return {
@@ -25,16 +25,23 @@ class ReqParams extends Component {
super(props)
}
+ initParams () {
+ const { reqParams } = this.props
+ if (reqParams) {
+ editor.txt.html(reqParams)
+ }
+ }
+
componentDidMount () {
const reg = /()|(<\/p>)| |(
)|\s+/g
- const E = wangEditor
- const editor = new E('#req-cover')
editor.customConfig.menus = []
editor.customConfig.onchange = html => {
html = html.replace(reg, '')
- console.log(html)
this.props.getReqParams(html)
}
+ setTimeout(() => {
+ this.initParams()
+ }, 200)
editor.create()
}
diff --git a/client/containers/AddInterface/ResParams/ResParams.js b/client/containers/AddInterface/ResParams/ResParams.js
index 80b69b4c..b27b935d 100644
--- a/client/containers/AddInterface/ResParams/ResParams.js
+++ b/client/containers/AddInterface/ResParams/ResParams.js
@@ -4,6 +4,8 @@ import { connect } from 'react-redux'
import wangEditor from 'wangeditor'
import { getResParams } from '../../../actions/addInterface.js'
+const editor = new wangEditor('#res-cover')
+
@connect(
state => {
return {
@@ -25,15 +27,23 @@ class ResParams extends Component {
super(props)
}
+ initResParams () {
+ const { resParams } = this.props
+ if (resParams) {
+ editor.txt.html(resParams)
+ }
+ }
+
componentDidMount () {
const reg = /(
)|(<\/p>)| |(
)|\s+/g
- const E = wangEditor
- const editor = new E('#res-cover')
editor.customConfig.menus = []
editor.customConfig.onchange = html => {
html = html.replace(reg, '')
this.props.getResParams(html)
}
+ setTimeout(() => {
+ this.initResParams()
+ }, 200)
editor.create()
}
diff --git a/client/containers/Interface/Interface.js b/client/containers/Interface/Interface.js
index 2a823af8..88852848 100644
--- a/client/containers/Interface/Interface.js
+++ b/client/containers/Interface/Interface.js
@@ -6,7 +6,7 @@ import axios from 'axios'
import InterfaceList from './InterfaceList/InterfaceList.js'
import InterfaceTable from './InterfaceTable/InterfaceTable.js'
import InterfaceMode from './InterfaceMode/InterfaceMode.js'
-
+import moment from 'moment'
import {
fetchInterfaceData,
projectMember,
@@ -43,7 +43,6 @@ class Interface extends Component {
componentWillMount () {
// 558 665 704 743
- this.props.fetchInterfaceData()
const params = {
params: {
project_id: 558
@@ -51,8 +50,13 @@ class Interface extends Component {
}
axios.get('/interface/list', params)
- .then(data => {
- console.log(data)
+ .then(result => {
+ result = result.data.data
+ result.map(value => {
+ value.add_time = moment(value.add_time).format('YYYY-MM-DD HH:mm:ss')
+ return value
+ })
+ this.props.fetchInterfaceData(result)
})
.catch(e => {
console.log(e)
@@ -61,7 +65,6 @@ class Interface extends Component {
render () {
const { interfaceData, projectMember, modalVisible } = this.props
-
return (
@@ -74,4 +77,4 @@ class Interface extends Component {
}
}
-export default Interface
\ No newline at end of file
+export default Interface
diff --git a/client/containers/Interface/InterfaceTable/InterfaceTable.js b/client/containers/Interface/InterfaceTable/InterfaceTable.js
index 6288fe03..def13166 100644
--- a/client/containers/Interface/InterfaceTable/InterfaceTable.js
+++ b/client/containers/Interface/InterfaceTable/InterfaceTable.js
@@ -1,41 +1,81 @@
import React, { Component } from 'react'
import { Table, Button } from 'antd'
import PropTypes from 'prop-types'
+import axios from 'axios'
+import { connect } from 'react-redux'
+import { Link } from 'react-router-dom'
+import { deleteInterfaceData } from '../../../actions/interfaceAction.js'
+
+@connect(
+ state => {
+ return {
+ interfaceData: state.Interface.interfaceData
+ }
+ },
+ {
+ deleteInterfaceData
+ }
+)
class InterfaceTable extends Component {
static propTypes = {
- data: PropTypes.array
+ interfaceData: PropTypes.array,
+ data: PropTypes.array,
+ deleteInterfaceData: PropTypes.func
}
constructor(props) {
super(props)
}
+ deleteInterfaceData (interfaceId) {
+ let interfaceArr = []
+ let { interfaceData } = this.props
+ interfaceData.forEach(value => {
+ if (value._id !== interfaceId) {
+ interfaceArr.push(value)
+ }
+ })
+ this.props.deleteInterfaceData(interfaceArr)
+ }
+
+ deleteInterface (interfaceId) {
+ const params = {
+ id: interfaceId
+ }
+ axios.post('/interface/del', params)
+ .then(() => {
+ this.deleteInterfaceData(interfaceId)
+ })
+ .catch(err => {
+ console.log(err)
+ })
+ }
+
render () {
const columns = [{
title: '接口名称',
- dataIndex: 'name',
- key: 'name'
+ dataIndex: 'title',
+ key: 'title'
}, {
title: '接口URL',
- dataIndex: 'age',
- key: 'age'
- }, {
- title: '操作者',
- dataIndex: 'address',
- key: 'address'
- }, {
+ dataIndex: 'path',
+ key: 'path'
+ },{
title: '更新日期',
- dataIndex: 'date',
- key: 'date'
+ dataIndex: 'add_time',
+ key: 'add_time'
}, {
title: '功能',
'key': 'action',
- render: () => {
+ render: (data) => {
+ const deleteInterface = this.deleteInterface.bind(this, data._id)
return (
-
-
+
+
)
}
diff --git a/client/containers/User/User.js b/client/containers/User/User.js
index f5a19197..9be25f22 100755
--- a/client/containers/User/User.js
+++ b/client/containers/User/User.js
@@ -1,7 +1,7 @@
import './index.scss'
import React, { Component } from 'react'
import { connect } from 'react-redux'
-import { Route, Redirect} from 'react-router-dom'
+import { Route } from 'react-router-dom'
import LeftMenu from './LeftMenu.js'
import List from './List.js'
import PropTypes from 'prop-types'
diff --git a/client/images/loading.gif b/client/images/loading.gif
new file mode 100644
index 00000000..915c1984
Binary files /dev/null and b/client/images/loading.gif differ
diff --git a/client/reducer/Interface/InterfaceReducer.js b/client/reducer/Interface/InterfaceReducer.js
index 0eb53e74..a522dfd6 100644
--- a/client/reducer/Interface/InterfaceReducer.js
+++ b/client/reducer/Interface/InterfaceReducer.js
@@ -1,11 +1,12 @@
import {
FETCH_INTERFACE_DATA,
LIST_INTERFACE_CLICK,
- PROJECT_MEMBER_INTERFACE
+ PROJECT_MEMBER_INTERFACE,
+ DELETE_INTERFACE_DATA
} from '../../constants/action-types.js'
const initialState = {
- interfaceData: null,
+ interfaceData: [],
modalVisible: false,
interfaceName: ''
}
@@ -27,6 +28,11 @@ export default (state = initialState, action) => {
...state,
modalVisible: false
}
+ case DELETE_INTERFACE_DATA:
+ return {
+ ...state,
+ interfaceData: action.payload
+ }
default:
return state
}
diff --git a/client/reducer/addInterface/addInterface.js b/client/reducer/addInterface/addInterface.js
index 847abd48..a8e06a25 100644
--- a/client/reducer/addInterface/addInterface.js
+++ b/client/reducer/addInterface/addInterface.js
@@ -6,7 +6,6 @@ import {
DELETE_INTERFACE_SEQ_HEADER,
GET_INTERFACE_REQ_PARAMS,
GET_INTERFACE_RES_PARAMS,
- // SAVE_INTERFACE_FORMS,
PUSH_INTERFACE_NAME,
PUSH_INTERFACE_METHOD
} from '../../constants/action-types.js'
@@ -14,15 +13,13 @@ import {
const initialState = {
interfaceName: '',
url: '',
- tagValue: '',
- headerValue: '',
method: '',
// 默认请求头部有一条数据
seqGroup: [
{
id: 0,
- tag: '',
- content: ''
+ name: '',
+ value: ''
}
],
reqParams: '',
@@ -66,11 +63,6 @@ export default (state = initialState, action) => {
...state,
resParams: action.payload
}
- // case SAVE_INTERFACE_FORMS:
- // return {
- // ...state,
- // resParams: action.payload
- // }
case PUSH_INTERFACE_NAME:
return {
...state,
diff --git a/client/reducer/interface/InterfaceReducer.js b/client/reducer/interface/InterfaceReducer.js
index 0eb53e74..a522dfd6 100644
--- a/client/reducer/interface/InterfaceReducer.js
+++ b/client/reducer/interface/InterfaceReducer.js
@@ -1,11 +1,12 @@
import {
FETCH_INTERFACE_DATA,
LIST_INTERFACE_CLICK,
- PROJECT_MEMBER_INTERFACE
+ PROJECT_MEMBER_INTERFACE,
+ DELETE_INTERFACE_DATA
} from '../../constants/action-types.js'
const initialState = {
- interfaceData: null,
+ interfaceData: [],
modalVisible: false,
interfaceName: ''
}
@@ -27,6 +28,11 @@ export default (state = initialState, action) => {
...state,
modalVisible: false
}
+ case DELETE_INTERFACE_DATA:
+ return {
+ ...state,
+ interfaceData: action.payload
+ }
default:
return state
}
diff --git a/client/reducer/news/news.js b/client/reducer/news/news.js
index 3762f200..503cb9ee 100644
--- a/client/reducer/news/news.js
+++ b/client/reducer/news/news.js
@@ -16,7 +16,6 @@ export default (state = initialState, action) => {
};
}
case FETCH_MORE_NEWS: {
- // console.log(action.payload);
return {
newsData: {
...state.newsData,
diff --git a/server/controllers/interface.js b/server/controllers/interface.js
index 8302af7f..f5677b5c 100644
--- a/server/controllers/interface.js
+++ b/server/controllers/interface.js
@@ -209,7 +209,7 @@ class interfaceController extends baseController{
return ctx.body = yapi.commons.resReturn(null, 400, '接口id不能为空');
}
- let data = await this.Model.get(params.id);
+ let data = await this.Model.get(ctx.request.body.id);
if(data.uid != this.getUid()){
if(await this.jungeProjectAuth(data.project_id) !== true){
@@ -221,7 +221,7 @@ class interfaceController extends baseController{
let result = await this.Model.del(id);
ctx.body = yapi.commons.resReturn(result)
}catch(err){
- ctx.body = yapi.commons.resReturn(null, 402, e.message)
+ ctx.body = yapi.commons.resReturn(null, 402, err.message)
}
}
}
diff --git a/server_dist/controllers/interface.js b/server_dist/controllers/interface.js
index 46584cb0..3a8b11c1 100644
--- a/server_dist/controllers/interface.js
+++ b/server_dist/controllers/interface.js
@@ -450,7 +450,7 @@ var interfaceController = function (_baseController) {
case 4:
_context5.next = 6;
- return this.Model.get(params.id);
+ return this.Model.get(ctx.request.body.id);
case 6:
data = _context5.sent;
@@ -488,7 +488,7 @@ var interfaceController = function (_baseController) {
_context5.prev = 19;
_context5.t1 = _context5['catch'](0);
- ctx.body = _yapi2.default.commons.resReturn(null, 402, e.message);
+ ctx.body = _yapi2.default.commons.resReturn(null, 402, _context5.t1.message);
case 22:
case 'end':