fix: interface del

This commit is contained in:
suxiaoxin 2017-08-28 18:01:28 +08:00
parent c2c551f3b1
commit 1813a3a92b
5 changed files with 32 additions and 17 deletions

View File

@ -36,15 +36,9 @@ export default class App extends Component {
loginState: PropTypes.number
};
// componentWillMount() {
// if( !this.props.isAuthenticated ){
// this.props.history.push('/');
// this.props.changeMenuItem('/');
// }
// }
componentDidMount() {
message.warning('YApi平台正在公测发布正式版会删除所有公测数据', 5)
message.warning('YApi平台正在公测发布正式版会删除所有公测数据', 10)
this.props.checkLoginState();
}
@ -66,10 +60,6 @@ export default class App extends Component {
<Route path="/follow" component={requireAuthentication(Follows)} />
<Route path="/add-project" component={requireAuthentication(AddProject)} />
<Route path="/login" component={Login} />
{
// <Route path="/news" component={requireAuthentication(News)} />
// <Route path="/add-interface" component={requireAuthentication(AddInterface)} />
}
</div>
</div>
<Footer />

View File

@ -1,5 +1,7 @@
import interfaceModel from '../models/interface.js';
import interfaceCatModel from '../models/interfaceCat.js';
import interfaceCaseModel from '../models/interfaceCase.js'
import baseController from './base.js';
import yapi from '../yapi.js';
import userModel from '../models/user.js';
@ -11,6 +13,7 @@ class interfaceController extends baseController {
this.Model = yapi.getInst(interfaceModel);
this.catModel = yapi.getInst(interfaceCatModel);
this.projectModel = yapi.getInst(projectModel);
this.caseModel = yapi.getInst(interfaceCaseModel);
}
/**
@ -404,7 +407,7 @@ class interfaceController extends baseController {
let inter = await this.Model.get(id);
let result = await this.Model.del(id);
await this.caseModel.delByInterfaceId(id);
let username = this.getUsername();
this.catModel.get(inter.catid).then((cate)=>{
yapi.commons.saveLog({

View File

@ -75,6 +75,12 @@ class interfaceCase extends baseModel {
})
}
delByInterfaceId(id){
return this.model.deleteMany({
interface_id: id
})
}
delByCol(id) {
return this.model.deleteMany({
col_id: id

View File

@ -40,6 +40,10 @@ var _interfaceCat = require('../models/interfaceCat.js');
var _interfaceCat2 = _interopRequireDefault(_interfaceCat);
var _interfaceCase = require('../models/interfaceCase.js');
var _interfaceCase2 = _interopRequireDefault(_interfaceCase);
var _base = require('./base.js');
var _base2 = _interopRequireDefault(_base);
@ -69,6 +73,7 @@ var interfaceController = function (_baseController) {
_this.Model = _yapi2.default.getInst(_interface2.default);
_this.catModel = _yapi2.default.getInst(_interfaceCat2.default);
_this.projectModel = _yapi2.default.getInst(_project2.default);
_this.caseModel = _yapi2.default.getInst(_interfaceCase2.default);
return _this;
}
@ -801,6 +806,10 @@ var interfaceController = function (_baseController) {
case 18:
result = _context7.sent;
_context7.next = 21;
return this.caseModel.delByInterfaceId(id);
case 21:
username = this.getUsername();
this.catModel.get(inter.catid).then(function (cate) {
@ -814,21 +823,21 @@ var interfaceController = function (_baseController) {
});
ctx.body = _yapi2.default.commons.resReturn(result);
_context7.next = 27;
_context7.next = 29;
break;
case 24:
_context7.prev = 24;
case 26:
_context7.prev = 26;
_context7.t0 = _context7['catch'](0);
ctx.body = _yapi2.default.commons.resReturn(null, 402, _context7.t0.message);
case 27:
case 29:
case 'end':
return _context7.stop();
}
}
}, _callee7, this, [[0, 24]]);
}, _callee7, this, [[0, 26]]);
}));
function del(_x7) {

View File

@ -118,6 +118,13 @@ var interfaceCase = function (_baseModel) {
project_id: id
});
}
}, {
key: 'delByInterfaceId',
value: function delByInterfaceId(id) {
return this.model.deleteMany({
interface_id: id
});
}
}, {
key: 'delByCol',
value: function delByCol(id) {