From 06e4184c8b2b9a4c0ad40cce977cb8e5d3f88b0c Mon Sep 17 00:00:00 2001 From: "gaoxiaolin.gao" Date: Tue, 24 Jul 2018 11:45:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B1=80mock?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Project/Interface/InterfaceList/View.js | 4 +- .../Project/Setting/ProjectMock/index.js | 49 +++++-------------- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/client/containers/Project/Interface/InterfaceList/View.js b/client/containers/Project/Interface/InterfaceList/View.js index 08a977f0..6cd37076 100755 --- a/client/containers/Project/Interface/InterfaceList/View.js +++ b/client/containers/Project/Interface/InterfaceList/View.js @@ -429,8 +429,10 @@ class View extends Component { Mock地址: - + + {this.props.currProject.is_mock_open && (全局mock已开启) } window.open( location.protocol + diff --git a/client/containers/Project/Setting/ProjectMock/index.js b/client/containers/Project/Setting/ProjectMock/index.js index c8a44358..f0c2daac 100644 --- a/client/containers/Project/Setting/ProjectMock/index.js +++ b/client/containers/Project/Setting/ProjectMock/index.js @@ -1,13 +1,8 @@ import React, { Component } from 'react'; -// import { connect } from 'react-redux' import { connect } from 'react-redux'; -// import axios from 'axios' import PropTypes from 'prop-types'; -// import { withRouter } from 'react-router-dom'; -import { Form, Switch, Button, Icon, Tooltip,message } from 'antd'; -// import mockEditor from 'client/components/AceEditor/mockEditor'; +import { Form, Switch, Button, Icon, Tooltip, message } from 'antd'; import AceEditor from '../../../../components/AceEditor/AceEditor'; -// import constants from '../../client/constants/variable.js' const FormItem = Form.Item; import { updateProjectMock, getProject } from '../../../../reducer/modules/project'; @connect( @@ -45,10 +40,10 @@ export default class ProjectMock extends Component { id: this.props.projectId, project_mock_script: this.state.project_mock_script, is_mock_open: this.state.is_mock_open - } - + }; + let result = await this.props.updateProjectMock(params); - + if (result.payload.data.errcode === 0) { message.success('保存成功'); await this.props.getProject(this.props.projectId); @@ -58,33 +53,10 @@ export default class ProjectMock extends Component { }; componentWillMount() { - // this.getAdvMockData(); this.setState({ is_mock_open: this.props.projectMsg.is_mock_open, project_mock_script: this.props.projectMsg.project_mock_script - }) - } - - async getAdvMockData() { - // let interfaceId = this.props.match.params.actionId; - // let result = await axios.get('/api/plugin/advmock/get?interface_id=' + interfaceId); - // if (result.data.errcode === 0) { - // let mockData = result.data.data; - // this.setState({ - // enable: mockData.enable, - // mock_script: mockData.mock_script - // }) - // } - // let that = this; - // mockEditor({ - // container: 'global-mock-script', - // data: that.state.mock_script, - // onChange: function(d) { - // that.setState({ - // mock_script: d.text - // }); - // } - // }); + }); } // 是否开启 @@ -124,7 +96,7 @@ export default class ProjectMock extends Component { - 是否开启  + 是否开启  @@ -141,8 +113,11 @@ export default class ProjectMock extends Component { /> - - +