From 3f7abc4cc9094f932de9379ecbf482b594da71b8 Mon Sep 17 00:00:00 2001 From: qitmac000249 Date: Wed, 23 Aug 2017 12:23:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containers/Project/Activity/Activity.scss | 53 +++++++++++++++++-- .../Project/Activity/Timeline/Timeline.js | 21 +++++--- .../Project/Interface/InterfaceList/View.js | 6 +-- .../Project/Interface/InterfaceList/View.scss | 5 ++ 4 files changed, 73 insertions(+), 12 deletions(-) diff --git a/client/containers/Project/Activity/Activity.scss b/client/containers/Project/Activity/Activity.scss index 2f4b2fbf..076a84b7 100644 --- a/client/containers/Project/Activity/Activity.scss +++ b/client/containers/Project/Activity/Activity.scss @@ -48,14 +48,61 @@ .logbidden{ color: #c0c1c1; cursor: default; - line-height: 30px; - padding-left: 30px; + padding: 8px !important; } .loggetMore{ line-height: 30px; - padding-left: 30px; color: #4eaef3; } + + .ant-timeline-item{ + &:after{ + content: ""; + width: 0px; + height: 0px; + display: block; + clear: both; + } + + .ant-timeline-item-content{ + background-color: #ececec; + float: left; + width: auto; + margin-left: 40px; + padding: 0px; + padding-bottom: 16px; + min-width: 300px; + border-radius: 8px; + + .logMesHeade{ + color: white; + padding: 16px 8px 8px 8px; + background-color: gray; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + } + .logoTimeago{ + left: -120px; + } + .logcontent{ + text-indent: 2em; + line-height: 1.5em; + margin-top: 16px; + } + } + + } + .ant-timeline-item-pending{ + padding: 0px; + .ant-timeline-item-content{ + padding: 0px; + min-width: auto; + .loggetMore{ + margin: 0px; + padding: 8px; + } + } + } } .logHead{ height: 80px; diff --git a/client/containers/Project/Activity/Timeline/Timeline.js b/client/containers/Project/Activity/Timeline/Timeline.js index 69531050..099369ac 100644 --- a/client/containers/Project/Activity/Timeline/Timeline.js +++ b/client/containers/Project/Activity/Timeline/Timeline.js @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import { Timeline, Spin, Avatar } from 'antd' +import { Timeline, Spin, Avatar,Icon } from 'antd' import PropTypes from 'prop-types' import { connect } from 'react-redux' import { formatTime } from '../../../../common.js'; @@ -57,7 +57,6 @@ function timeago(timestamp) { @connect( state => { - console.log(state); return { newsData: state.news.newsData, curpage: state.news.curpage, @@ -112,14 +111,24 @@ class TimeTree extends Component { render() { let data = this.props.newsData ? this.props.newsData.list : []; + let logType = { + project: "项目", + group: "分组", + interface: "接口", + interface_col: "接口集", + user: "用户", + other: "其他" + }; if (data && data.length) { data = data.map(function (item, i) { return (} key={i}> - {timeago(item.add_time)} - {item.username} - {item.type} - {formatTime(item.add_time)} +
+ {timeago(item.add_time)} + {item.username} + {logType[item.type]}动态 + {formatTime(item.add_time)} +
{item.content} ); }); diff --git a/client/containers/Project/Interface/InterfaceList/View.js b/client/containers/Project/Interface/InterfaceList/View.js index f9365a81..646397fe 100644 --- a/client/containers/Project/Interface/InterfaceList/View.js +++ b/client/containers/Project/Interface/InterfaceList/View.js @@ -33,7 +33,7 @@ class View extends Component { if(req_body_type === 'json'){ return
请求Body： -
+
}else if(req_body_type === 'form'){ @@ -89,7 +89,7 @@ class View extends Component { if(res_body_type === 'json'){ return
返回Body： -
+
}else if(res_body_type === 'raw'){ return
@@ -238,7 +238,7 @@ class View extends Component {
Mock地址： - {location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}/yourPath`} + {location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}/${this.props.curData.path}`}
{this.props.curData.desc?
接口描述： diff --git a/client/containers/Project/Interface/InterfaceList/View.scss b/client/containers/Project/Interface/InterfaceList/View.scss index ab1fded8..718922dc 100644 --- a/client/containers/Project/Interface/InterfaceList/View.scss +++ b/client/containers/Project/Interface/InterfaceList/View.scss @@ -35,6 +35,10 @@ padding-bottom: 0px; } } + .colDesc{ + margin-bottom: 0px; + padding-bottom: 0px; + } .ant-table-thead { th{ color: #6d6c6c; @@ -75,6 +79,7 @@ .colMockUrl{ margin-bottom: 0px; padding-bottom: 0px; + line-height: 1.5em; } .colDesc{ line-height: 1.5em; From d55485b56a858752d8d722c726af4f7e7a4cef03 Mon Sep 17 00:00:00 2001 From: suxiaoxin Date: Wed, 23 Aug 2017 14:28:27 +0800 Subject: [PATCH 2/4] feat: add project init env col cat --- server/controllers/project.js | 129 +++++++++++++++++------------ server_dist/controllers/project.js | 45 ++++++++-- 2 files changed, 113 insertions(+), 61 deletions(-) diff --git a/server/controllers/project.js b/server/controllers/project.js index 5a4bf9a1..e79a2d4a 100644 --- a/server/controllers/project.js +++ b/server/controllers/project.js @@ -106,11 +106,32 @@ class projectController extends baseController { icon: params.icon, color: params.color, add_time: yapi.commons.time(), - up_time: yapi.commons.time() + up_time: yapi.commons.time(), + env: [{ name: 'local', domain: 'http://127.0.0.1' }] }; try { let result = await this.Model.save(data); + let colInst = yapi.getInst(interfaceColModel); + let catInst = yapi.getInst(interfaceCatModel); + if (result._id) { + await colInst.save({ + name: '公共测试集', + project_id: result._id, + desc: '公共测试集', + uid: this.getUid(), + add_time: yapi.commons.time(), + up_time: yapi.commons.time() + }) + await catInst.save({ + name: '公共分类', + project_id: result._id, + desc: '公共分类', + uid: this.getUid(), + add_time: yapi.commons.time(), + up_time: yapi.commons.time() + }) + } let username = this.getUsername(); yapi.commons.saveLog({ content: `用户${username}添加了项目${params.name}`, @@ -160,7 +181,7 @@ class projectController extends baseController { params.role = params.role === 'owner' ? 'owner' : 'dev'; let userdata = await this.getUserdata(params.member_uid, params.role); - if(userdata === null){ + if (userdata === null) { return ctx.body = yapi.commons.resReturn(null, 400, '成员uid不存在') } @@ -217,7 +238,7 @@ class projectController extends baseController { let result = await this.Model.delMember(params.id, params.member_uid); let username = this.getUsername(); let project = await this.Model.get(params.id); - let member = await yapi.getInst(userModel).findById(params.member_uid); + let member = await yapi.getInst(userModel).findById(params.member_uid); yapi.commons.saveLog({ content: `用户${username}删除了项目${project.name}中的成员${member.username}`, type: 'project', @@ -234,11 +255,11 @@ class projectController extends baseController { } - async getUserdata(uid, role){ + async getUserdata(uid, role) { role = role || 'dev'; let userInst = yapi.getInst(userModel); let userData = await userInst.findById(uid); - if(!userData){ + if (!userData) { return null; } return { @@ -292,7 +313,7 @@ class projectController extends baseController { } try { let result = await this.Model.getBaseInfo(params.id); - if(!result){ + if (!result) { return ctx.body = yapi.commons.resReturn(null, 400, '不存在的项目'); } result = result.toObject(); @@ -324,19 +345,19 @@ class projectController extends baseController { return ctx.body = yapi.commons.resReturn(null, 400, '项目分组id不能为空'); } - let auth =await this.checkAuth(group_id, 'group', 'edit') + let auth = await this.checkAuth(group_id, 'group', 'edit') try { let result = await this.Model.list(group_id, auth); let follow = await this.followModel.list(this.getUid()); let uids = []; result.forEach((item, index) => { result[index] = item.toObject(); - let f = _.find(follow, (fol)=>{ + let f = _.find(follow, (fol) => { return fol.projectid === item._id }) - if(f){ + if (f) { result[index].follow = true; - }else{ + } else { result[index].follow = false; } if (uids.indexOf(item.uid) === -1) { @@ -404,7 +425,7 @@ class projectController extends baseController { * @returns {Object} * @example */ - async changeMemberRole(ctx){ + async changeMemberRole(ctx) { let params = ctx.request.body; let projectInst = yapi.getInst(projectModel); if (!params.member_uid) { @@ -454,23 +475,23 @@ class projectController extends baseController { * @returns {Object} * @example ./api/project/upset */ - async upSet(ctx){ + async upSet(ctx) { let id = ctx.request.body.id; let data = {}; data.color = ctx.request.body.color; data.icon = ctx.request.body.icon; - if(!id){ + if (!id) { return ctx.body = yapi.commons.resReturn(null, 405, '项目id不能为空'); } - try{ + try { let result = await this.Model.up(id, data); ctx.body = yapi.commons.resReturn(result); - }catch(e){ + } catch (e) { ctx.body = yapi.commons.resReturn(null, 402, e.message); } - try{ - this.followModel.updateById(this.getUid(),id,data).then(); - }catch(e){ + try { + this.followModel.updateById(this.getUid(), id, data).then(); + } catch (e) { yapi.commons.log(e, 'error'); // eslint-disable-line } } @@ -535,12 +556,12 @@ class projectController extends baseController { if (params.name) data.name = params.name; if (params.desc) data.desc = params.desc; - if (params.basepath ) { + if (params.basepath) { data.basepath = params.basepath; } if (params.env) data.env = params.env; - if(params.color) data.color = params.color; - if(params.icon) data.icon = params.icon; + if (params.color) data.color = params.color; + if (params.icon) data.icon = params.icon; let result = await this.Model.up(id, data); let username = this.getUsername(); yapi.commons.saveLog({ @@ -556,37 +577,37 @@ class projectController extends baseController { } } - /** - * 修改项目头像 - * @interface /project/upset - * @method POST - * @category project - * @foldnumber 10 - * @param {Number} id - * @param {String} color - * @param {String} icon - * @return {Object} - */ - async upSet(ctx){ - let id = ctx.request.body.id; - let data = {}; - data.color = ctx.request.body.color; - data.icon = ctx.request.body.icon; - if(!id){ - return ctx.body = yapi.commons.resReturn(null, 405, '项目id不能为空'); - } - try{ - let result = await this.Model.up(id, data); - ctx.body = yapi.commons.resReturn(result); - }catch(e){ - ctx.body = yapi.commons.resReturn(null, 402, e.message); - } - try{ - this.followModel.updateById(this.getUid(),id,data).then(); - }catch(e){ - yapi.commons.log(e, 'error'); // eslint-disable-line - } - } + /** + * 修改项目头像 + * @interface /project/upset + * @method POST + * @category project + * @foldnumber 10 + * @param {Number} id + * @param {String} color + * @param {String} icon + * @return {Object} + */ + async upSet(ctx) { + let id = ctx.request.body.id; + let data = {}; + data.color = ctx.request.body.color; + data.icon = ctx.request.body.icon; + if (!id) { + return ctx.body = yapi.commons.resReturn(null, 405, '项目id不能为空'); + } + try { + let result = await this.Model.up(id, data); + ctx.body = yapi.commons.resReturn(result); + } catch (e) { + ctx.body = yapi.commons.resReturn(null, 402, e.message); + } + try { + this.followModel.updateById(this.getUid(), id, data).then(); + } catch (e) { + yapi.commons.log(e, 'error'); // eslint-disable-line + } + } /** * 模糊搜索项目名称或者组名称 @@ -663,7 +684,7 @@ class projectController extends baseController { return ctx.body = yapi.commons.resReturn(null, 401, '项目id不存在'); } - const arr = JSON.stringify(count.map(function(item) { + const arr = JSON.stringify(count.map(function (item) { // 返回的json模板数据: item.res_body const mockData = Mock.mock( yapi.commons.json_parse(item.res_body) @@ -704,7 +725,7 @@ class projectController extends baseController { }); } module.exports = run;` - .trim(); + .trim(); return ctx.body = res; } } diff --git a/server_dist/controllers/project.js b/server_dist/controllers/project.js index 52dee6a9..a7c3592e 100644 --- a/server_dist/controllers/project.js +++ b/server_dist/controllers/project.js @@ -149,7 +149,7 @@ var projectController = function (_baseController) { key: 'add', value: function () { var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { - var params, checkRepeat, data, result, username; + var params, checkRepeat, data, result, colInst, catInst, username; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { @@ -233,7 +233,8 @@ var projectController = function (_baseController) { icon: params.icon, color: params.color, add_time: _yapi2.default.commons.time(), - up_time: _yapi2.default.commons.time() + up_time: _yapi2.default.commons.time(), + env: [{ name: 'local', domain: 'http://127.0.0.1' }] }; _context.prev = 20; _context.next = 23; @@ -241,6 +242,36 @@ var projectController = function (_baseController) { case 23: result = _context.sent; + colInst = _yapi2.default.getInst(_interfaceCol2.default); + catInst = _yapi2.default.getInst(_interfaceCat2.default); + + if (!result._id) { + _context.next = 31; + break; + } + + _context.next = 29; + return colInst.save({ + name: '公共测试集', + project_id: result._id, + desc: '公共测试集', + uid: this.getUid(), + add_time: _yapi2.default.commons.time(), + up_time: _yapi2.default.commons.time() + }); + + case 29: + _context.next = 31; + return catInst.save({ + name: '公共分类', + project_id: result._id, + desc: '公共分类', + uid: this.getUid(), + add_time: _yapi2.default.commons.time(), + up_time: _yapi2.default.commons.time() + }); + + case 31: username = this.getUsername(); _yapi2.default.commons.saveLog({ @@ -254,21 +285,21 @@ var projectController = function (_baseController) { icon: params.icon }); ctx.body = _yapi2.default.commons.resReturn(result); - _context.next = 32; + _context.next = 39; break; - case 29: - _context.prev = 29; + case 36: + _context.prev = 36; _context.t1 = _context['catch'](20); ctx.body = _yapi2.default.commons.resReturn(null, 402, _context.t1.message); - case 32: + case 39: case 'end': return _context.stop(); } } - }, _callee, this, [[20, 29]]); + }, _callee, this, [[20, 36]]); })); function add(_x) { From d9289ad184c6f095662a6c61bea80e13910d4a56 Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Wed, 23 Aug 2017 15:25:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=A4=B4=E5=83=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/common.js | 15 +++++ client/components/ProjectCard/ProjectCard.js | 4 +- client/constants/variable.js | 58 ++++++++++++++++++- client/containers/AddProject/AddProject.js | 4 ++ .../Setting/ProjectMessage/ProjectMessage.js | 53 ++++++++++++----- .../containers/Project/Setting/Setting.scss | 29 +++++++++- client/reducer/modules/project.js | 17 +++++- 7 files changed, 158 insertions(+), 22 deletions(-) diff --git a/client/common.js b/client/common.js index 088b8195..710eb860 100644 --- a/client/common.js +++ b/client/common.js @@ -7,6 +7,8 @@ exports.formatTime = (timestamp) => { return moment.unix(timestamp).format("YYYY-MM-DD HH:mm:ss") } +// 获取 YAPI LOGO 的 SVG +// 参数 length 为 svg 的直径。 exports.logoSVG = (length) => ( Icon Created with Sketch. @@ -38,6 +40,10 @@ exports.logoSVG = (length) => ( ); +// 防抖函数，减少高频触发的函数执行的频率 +// 请在 constructor 里使用: +// import { debounce } from '$/common'; +// this.func = debounce(this.func, 400); exports.debounce = (func, wait) => { let timeout; return function() { @@ -45,3 +51,12 @@ exports.debounce = (func, wait) => { timeout = setTimeout(func, wait); }; }; + +// 从 Javascript 对象中选取随机属性 +exports.pickRandomProperty = (obj) => { + let result; + let count = 0; + for (let prop in obj) + if (Math.random() < 1/++count) result = prop; + return result; +} diff --git a/client/components/ProjectCard/ProjectCard.js b/client/components/ProjectCard/ProjectCard.js index 6a53faaf..f82740b9 100644 --- a/client/components/ProjectCard/ProjectCard.js +++ b/client/components/ProjectCard/ProjectCard.js @@ -7,6 +7,7 @@ import { delFollow, addFollow } from '../../reducer/modules/follow'; import PropTypes from 'prop-types'; import { withRouter } from 'react-router'; import { debounce } from '../../common'; +import constants from '../../constants/variable.js'; @connect( state => { @@ -57,7 +58,6 @@ class ProjectCard extends Component { color: projectData.color } this.props.addFollow(param).then((res) => { - console.log(res); if (res.payload.data.errcode === 0) { this.props.callbackResult(); // message.success('已添加关注！'); // 星号已做出反馈 无需重复提醒用户 @@ -70,7 +70,7 @@ class ProjectCard extends Component { return (
this.props.history.push('/project/' + projectData._id)}> - +

{projectData.name || projectData.projectname}
diff --git a/client/constants/variable.js b/client/constants/variable.js index c31da6e0..1ba2459a 100644 --- a/client/constants/variable.js +++ b/client/constants/variable.js @@ -22,7 +22,59 @@ export default { 'PATCH': { request_body: true } - } + }, + PROJECT_COLOR: { + blue: '#2395f1', + green: '#57cf27', + yellow: '#fac200', + red: '#ff561b', + pink: '#f5317f', + cyan: '#00a2ae', + gray: '#bfbfbf', + purple: '#7265e6' + }, + PROJECT_ICON: [ + 'code-o', + 'swap', + 'clock-circle-o', + 'unlock', + 'calendar', + 'play-circle-o', + 'file-text', + 'desktop', + 'hdd', + 'appstore-o', + 'line-chart', + 'mail', + 'mobile', + 'notification', + 'picture', + 'poweroff', + 'search', + 'setting', + 'share-alt', + 'shopping-cart', + 'tag-o', + 'video-camera', + 'cloud-o', + 'star-o', + 'environment-o', + 'camera-o', + 'team', + 'customer-service', + 'pay-circle-o', + 'rocket', + 'database', + 'tool', + 'wifi', + 'idcard', + 'medicine-box', + 'coffee', + 'safety', + 'global', + 'api', + 'fork', + 'android-o', + 'apple-o' + ] } - - diff --git a/client/containers/AddProject/AddProject.js b/client/containers/AddProject/AddProject.js index edcf5d35..cc9f2135 100644 --- a/client/containers/AddProject/AddProject.js +++ b/client/containers/AddProject/AddProject.js @@ -9,6 +9,8 @@ const { TextArea } = Input; const FormItem = Form.Item; const Option = Select.Option; const RadioGroup = Radio.Group; +import { pickRandomProperty } from '../../common'; +import constants from '../../constants/variable.js'; import { withRouter } from 'react-router'; import './Addproject.scss'; @@ -62,6 +64,8 @@ class ProjectList extends Component { if (!err) { values.group_id = values.group.split(':')[0]; values.group_name = values.group.split(':')[1]; + values.icon = constants.PROJECT_ICON[0]; + values.color = pickRandomProperty(constants.PROJECT_COLOR); delete values.group; addProject(values).then((res) => { if (res.payload.data.errcode == 0) { diff --git a/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js b/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js index 5a26f9fc..a6da7e95 100644 --- a/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js +++ b/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js @@ -1,7 +1,7 @@ import React, { Component } from 'react' import { Form, Input, Icon, Tooltip, Select, Button, Row, Col, message, Card, Radio, Alert, Modal, Popover } from 'antd'; import PropTypes from 'prop-types'; -import { updateProject, delProject, getProjectMsg } from '../../../../reducer/modules/project'; +import { updateProject, delProject, getProjectMsg, upsetProject } from '../../../../reducer/modules/project'; import { fetchGroupMsg } from '../../../../reducer/modules/group'; import { connect } from 'react-redux'; const { TextArea } = Input; @@ -9,9 +9,10 @@ import { withRouter } from 'react-router'; const FormItem = Form.Item; const Option = Select.Option; const RadioGroup = Radio.Group; +const RadioButton = Radio.Button; +import constants from '../../../../constants/variable.js'; const confirm = Modal.confirm; import '../Setting.scss'; - // layout const formItemLayout = { labelCol: { @@ -39,7 +40,8 @@ let uuid = 0; // 环境配置的计数 updateProject, delProject, getProjectMsg, - fetchGroupMsg + fetchGroupMsg, + upsetProject } ) @withRouter @@ -60,6 +62,7 @@ class ProjectMessage extends Component { getProjectMsg: PropTypes.func, history: PropTypes.object, fetchGroupMsg: PropTypes.func, + upsetProject: PropTypes.func, projectList: PropTypes.array, projectMsg: PropTypes.object } @@ -166,6 +169,25 @@ class ProjectMessage extends Component { }); } + // 修改项目头像的背景颜色 + changeProjectColor = (e) => { + const { _id, color, icon } = this.props.projectMsg; + this.props.upsetProject({ id: _id, color: e.target.value || color, icon }).then((res) => { + if (res.payload.data.errcode === 0) { + this.props.getProjectMsg(this.props.projectId); + } + }); + } + // 修改项目头像的图标 + changeProjectIcon = (e) => { + const { _id, color, icon } = this.props.projectMsg; + this.props.upsetProject({ id: _id, color, icon: e.target.value || icon }).then((res) => { + if (res.payload.data.errcode === 0) { + this.props.getProjectMsg(this.props.projectId); + } + }); + } + async componentWillMount() { await this.props.getProjectMsg(this.props.projectId); const groupMsg = await this.props.fetchGroupMsg(this.props.projectMsg.group_id); @@ -177,7 +199,6 @@ class ProjectMessage extends Component { render () { const { getFieldDecorator, getFieldValue } = this.props.form; const { projectMsg } = this.props; - console.log(projectMsg); let initFormValues = {}; let envMessage = []; const { name, basepath, desc, env, project_type } = projectMsg; @@ -285,19 +306,23 @@ class ProjectMessage extends Component { ); }); - - const colorSelector = ( - - - - + const colorArr = Object.entries(constants.PROJECT_COLOR); + const colorSelector = ( + {colorArr.map((item, index) => { + return ({item[0] === projectMsg.color ? : null}); + })} + ); + const iconSelector = ( + {constants.PROJECT_ICON.map((item) => { + return (); + })} ); return (
- - + + @@ -400,9 +425,9 @@ class ProjectMessage extends Component { - + >保存 diff --git a/client/containers/Project/Setting/Setting.scss b/client/containers/Project/Setting/Setting.scss index ff4b8d16..db28792e 100644 --- a/client/containers/Project/Setting/Setting.scss +++ b/client/containers/Project/Setting/Setting.scss @@ -83,10 +83,37 @@ width: 1rem; height: 1rem; border-radius: 50%; - font-size: .6rem; + font-size: .5rem; color: #fff; background-color: #2395f1; line-height: 1rem; box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08); } } + +.change-project-container { + max-width: 320px; + .ant-popover-inner { + text-align: center; + } + .ant-popover-title { + padding: 8px .16rem; + height: auto; + } + .ant-radio-button-wrapper { + font-size: 16px; + border: none; + &:first-child { + border: none; + } + &:not(:first-child)::before { + display: none !important; + } + } + .ant-radio-button-wrapper-checked { + box-shadow: none; + color: #fff; + background-color: #2395f1; + border-radius: 4px; + } +} diff --git a/client/reducer/modules/project.js b/client/reducer/modules/project.js index 13857da2..254eebd9 100644 --- a/client/reducer/modules/project.js +++ b/client/reducer/modules/project.js @@ -8,6 +8,7 @@ const PROJECT_ADD = 'yapi/project/PROJECT_ADD'; const PROJECT_DEL = 'yapi/project/PROJECT_DEL'; // const CHANGE_TABLE_LOADING = 'yapi/project/CHANGE_TABLE_LOADING'; const PROJECT_UPDATE = 'yapi/project/PROJECT_UPDATE'; +const PROJECT_UPSET = 'yapi/project/PROJECT_UPSET'; const GET_CURR_PROJECT = 'yapi/project/GET_CURR_PROJECT' const GET_PEOJECT_MEMBER = 'yapi/project/GET_PEOJECT_MEMBER'; const ADD_PROJECT_MEMBER = 'yapi/project/ADD_PROJECT_MEMBER'; @@ -139,7 +140,7 @@ export function getProjectMemberList(id) { // } export function addProject(data) { - const { name, prd_host, basepath, desc, group_id, group_name, protocol } = data; + const { name, prd_host, basepath, desc, group_id, group_name, protocol, icon, color } = data; const param = { name, prd_host, @@ -147,7 +148,9 @@ export function addProject(data) { basepath, desc, group_id, - group_name + group_name, + icon, + color }; return { type: PROJECT_ADD, @@ -155,6 +158,7 @@ export function addProject(data) { }; } +// 修改项目 export function updateProject(data) { const { name, project_type, basepath, desc, _id, env } = data; const param = { @@ -171,6 +175,15 @@ export function updateProject(data) { }; } +// 修改项目头像 +export function upsetProject(param) { + return { + type: PROJECT_UPSET, + payload: axios.post('/api/project/upset', param) + }; +} + +// 删除项目 export function delProject(id) { const param = { id }; return { From 92bdac485dee9ec299be7003b58f7e93198a8e56 Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Wed, 23 Aug 2017 15:28:56 +0800 Subject: [PATCH 4/4] fix: merge --- server_dist/app.js | 2 +- server_dist/controllers/base.js | 10 ++++----- server_dist/controllers/follow.js | 6 +++--- server_dist/controllers/group.js | 22 +++++++++---------- server_dist/controllers/interface.js | 22 +++++++++---------- server_dist/controllers/interfaceCol.js | 18 ++++++++-------- server_dist/controllers/log.js | 2 +- server_dist/controllers/project.js | 28 ++++++++++++------------- server_dist/controllers/user.js | 28 ++++++++++++------------- server_dist/middleware/mockServer.js | 2 +- server_dist/router.js | 2 +- server_dist/websocket.js | 2 +- 12 files changed, 72 insertions(+), 72 deletions(-) diff --git a/server_dist/app.js b/server_dist/app.js index 8de77454..d4ab0560 100644 --- a/server_dist/app.js +++ b/server_dist/app.js @@ -65,7 +65,7 @@ app.use(_router2.default.allowedMethods()); (0, _websocket2.default)(app); app.use(function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx, next) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx, next) { return _regenerator2.default.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { diff --git a/server_dist/controllers/base.js b/server_dist/controllers/base.js index 37b0c525..6db7043c 100644 --- a/server_dist/controllers/base.js +++ b/server_dist/controllers/base.js @@ -59,7 +59,7 @@ var baseController = function () { (0, _createClass3.default)(baseController, [{ key: 'init', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var ignoreRouter; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -103,7 +103,7 @@ var baseController = function () { }, { key: 'checkLogin', value: function () { - var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) { var token, uid, userInst, result, decoded; return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { @@ -170,7 +170,7 @@ var baseController = function () { }, { key: 'getLoginStatus', value: function () { - var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) { var result; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { @@ -222,7 +222,7 @@ var baseController = function () { }, { key: 'getProjectRole', value: function () { - var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(id, type) { + var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(id, type) { var _this = this; var result, interfaceInst, interfaceData, projectInst, projectData, memberData, groupInst, groupData, groupMemberData; @@ -379,7 +379,7 @@ var baseController = function () { }, { key: 'checkAuth', value: function () { - var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(id, type, action) { + var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(id, type, action) { var role; return _regenerator2.default.wrap(function _callee5$(_context5) { while (1) { diff --git a/server_dist/controllers/follow.js b/server_dist/controllers/follow.js index e4f66759..b889b806 100644 --- a/server_dist/controllers/follow.js +++ b/server_dist/controllers/follow.js @@ -69,7 +69,7 @@ var followController = function (_baseController) { (0, _createClass3.default)(followController, [{ key: 'list', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var uid, page, limit, result; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -134,7 +134,7 @@ var followController = function (_baseController) { }, { key: 'del', value: function () { - var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) { var params, uid, checkRepeat, result; return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { @@ -212,7 +212,7 @@ var followController = function (_baseController) { }, { key: 'add', value: function () { - var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) { var params, uid, checkRepeat, data, result; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { diff --git a/server_dist/controllers/group.js b/server_dist/controllers/group.js index 7ad45555..d6d2cc01 100644 --- a/server_dist/controllers/group.js +++ b/server_dist/controllers/group.js @@ -88,7 +88,7 @@ var groupController = function (_baseController) { (0, _createClass3.default)(groupController, [{ key: 'get', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var params, groupInst, result; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -160,7 +160,7 @@ var groupController = function (_baseController) { }, { key: 'add', value: function () { - var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) { var params, groupUserdata, groupInst, checkRepeat, data, result; return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { @@ -272,7 +272,7 @@ var groupController = function (_baseController) { }, { key: 'getUserdata', value: function () { - var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(uid, role) { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(uid, role) { var userInst, userData; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { @@ -333,7 +333,7 @@ var groupController = function (_baseController) { }, { key: 'addMember', value: function () { - var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(ctx) { + var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx) { var params, groupInst, check, groupUserdata, result; return _regenerator2.default.wrap(function _callee4$(_context4) { while (1) { @@ -446,7 +446,7 @@ var groupController = function (_baseController) { }, { key: 'changeMemberRole', value: function () { - var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(ctx) { + var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx) { var params, groupInst, check, result; return _regenerator2.default.wrap(function _callee5$(_context5) { while (1) { @@ -547,7 +547,7 @@ var groupController = function (_baseController) { }, { key: 'getMemberList', value: function () { - var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) { + var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx) { var params, groupInst, group; return _regenerator2.default.wrap(function _callee6$(_context6) { while (1) { @@ -611,7 +611,7 @@ var groupController = function (_baseController) { }, { key: 'delMember', value: function () { - var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee7(ctx) { + var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx) { var params, groupInst, check, result; return _regenerator2.default.wrap(function _callee7$(_context7) { while (1) { @@ -709,7 +709,7 @@ var groupController = function (_baseController) { }, { key: 'list', value: function () { - var _ref8 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee8(ctx) { + var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx) { var groupInst, result; return _regenerator2.default.wrap(function _callee8$(_context8) { while (1) { @@ -762,7 +762,7 @@ var groupController = function (_baseController) { }, { key: 'del', value: function () { - var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee10(ctx) { + var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx) { var _this2 = this; var groupInst, projectInst, interfaceInst, interfaceColInst, interfaceCaseInst, _id, projectList, result; @@ -802,7 +802,7 @@ var groupController = function (_baseController) { projectList = _context10.sent; projectList.forEach(function () { - var _ref10 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(p) { + var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(p) { return _regenerator2.default.wrap(function _callee9$(_context9) { while (1) { switch (_context9.prev = _context9.next) { @@ -881,7 +881,7 @@ var groupController = function (_baseController) { }, { key: 'up', value: function () { - var _ref11 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee11(ctx) { + var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(ctx) { var groupInst, _id2, data, result; return _regenerator2.default.wrap(function _callee11$(_context11) { diff --git a/server_dist/controllers/interface.js b/server_dist/controllers/interface.js index f9ddd516..35d40d7b 100644 --- a/server_dist/controllers/interface.js +++ b/server_dist/controllers/interface.js @@ -105,7 +105,7 @@ var interfaceController = function (_baseController) { (0, _createClass3.default)(interfaceController, [{ key: 'add', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var params, checkRepeat, data, result, username, cate; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -259,7 +259,7 @@ var interfaceController = function (_baseController) { }, { key: 'get', value: function () { - var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) { var params, result; return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { @@ -321,7 +321,7 @@ var interfaceController = function (_baseController) { }, { key: 'list', value: function () { - var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) { var project_id, result; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { @@ -371,7 +371,7 @@ var interfaceController = function (_baseController) { }, { key: 'listByCat', value: function () { - var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(ctx) { + var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx) { var catid, result; return _regenerator2.default.wrap(function _callee4$(_context4) { while (1) { @@ -421,7 +421,7 @@ var interfaceController = function (_baseController) { }, { key: 'listByMenu', value: function () { - var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(ctx) { + var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx) { var project_id, result, newResult, i, item, list, j; return _regenerator2.default.wrap(function _callee5$(_context5) { while (1) { @@ -526,7 +526,7 @@ var interfaceController = function (_baseController) { }, { key: 'up', value: function () { - var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) { + var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx) { var params, id, interfaceData, checkRepeat, data, result, username, cate, inter; return _regenerator2.default.wrap(function _callee6$(_context6) { while (1) { @@ -728,7 +728,7 @@ var interfaceController = function (_baseController) { }, { key: 'del', value: function () { - var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee7(ctx) { + var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx) { var id, data, inter, result, username, cate; return _regenerator2.default.wrap(function _callee7$(_context7) { while (1) { @@ -822,7 +822,7 @@ var interfaceController = function (_baseController) { }, { key: 'solveConflict', value: function () { - var _ref8 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee8(ctx) { + var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx) { var _this2 = this; var id, result, userInst, userinfo, data; @@ -905,7 +905,7 @@ var interfaceController = function (_baseController) { }, { key: 'addCat', value: function () { - var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(ctx) { + var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx) { var params, result, username; return _regenerator2.default.wrap(function _callee9$(_context9) { while (1) { @@ -986,7 +986,7 @@ var interfaceController = function (_baseController) { }, { key: 'upCat', value: function () { - var _ref10 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee10(ctx) { + var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx) { var params, result, username, cate; return _regenerator2.default.wrap(function _callee10$(_context10) { while (1) { @@ -1045,7 +1045,7 @@ var interfaceController = function (_baseController) { }, { key: 'delCat', value: function () { - var _ref11 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee11(ctx) { + var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(ctx) { var id, catData, auth, cate, result, r, username; return _regenerator2.default.wrap(function _callee11$(_context11) { while (1) { diff --git a/server_dist/controllers/interfaceCol.js b/server_dist/controllers/interfaceCol.js index dec2a29a..5e197acc 100644 --- a/server_dist/controllers/interfaceCol.js +++ b/server_dist/controllers/interfaceCol.js @@ -74,7 +74,7 @@ var interfaceColController = function (_baseController) { (0, _createClass3.default)(interfaceColController, [{ key: 'list', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var id, result, i; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -149,7 +149,7 @@ var interfaceColController = function (_baseController) { }, { key: 'addCol', value: function () { - var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) { var params, result; return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { @@ -233,7 +233,7 @@ var interfaceColController = function (_baseController) { }, { key: 'getCaseList', value: function () { - var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) { var id, inst, result; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { @@ -297,7 +297,7 @@ var interfaceColController = function (_baseController) { }, { key: 'addCase', value: function () { - var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(ctx) { + var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx) { var params, result; return _regenerator2.default.wrap(function _callee4$(_context4) { while (1) { @@ -390,7 +390,7 @@ var interfaceColController = function (_baseController) { }, { key: 'getCase', value: function () { - var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(ctx) { + var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx) { var id, result; return _regenerator2.default.wrap(function _callee5$(_context5) { while (1) { @@ -444,7 +444,7 @@ var interfaceColController = function (_baseController) { }, { key: 'upCol', value: function () { - var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) { + var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx) { var params, result; return _regenerator2.default.wrap(function _callee6$(_context6) { while (1) { @@ -501,7 +501,7 @@ var interfaceColController = function (_baseController) { }, { key: 'upCaseIndex', value: function () { - var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee7(ctx) { + var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx) { var _this2 = this; var params; @@ -560,7 +560,7 @@ var interfaceColController = function (_baseController) { }, { key: 'delCol', value: function () { - var _ref8 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee8(ctx) { + var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx) { var id, colData, auth, result; return _regenerator2.default.wrap(function _callee8$(_context8) { while (1) { @@ -637,7 +637,7 @@ var interfaceColController = function (_baseController) { }, { key: 'delCase', value: function () { - var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(ctx) { + var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx) { var caseid, caseData, auth, result; return _regenerator2.default.wrap(function _callee9$(_context9) { while (1) { diff --git a/server_dist/controllers/log.js b/server_dist/controllers/log.js index bfb878e7..2ab32e45 100644 --- a/server_dist/controllers/log.js +++ b/server_dist/controllers/log.js @@ -75,7 +75,7 @@ var logController = function (_baseController) { (0, _createClass3.default)(logController, [{ key: 'list', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var typeid, page, limit, type, result, count; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { diff --git a/server_dist/controllers/project.js b/server_dist/controllers/project.js index a7c3592e..4e69b760 100644 --- a/server_dist/controllers/project.js +++ b/server_dist/controllers/project.js @@ -148,7 +148,7 @@ var projectController = function (_baseController) { }, { key: 'add', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var params, checkRepeat, data, result, colInst, catInst, username; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -323,7 +323,7 @@ var projectController = function (_baseController) { }, { key: 'addMember', value: function () { - var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) { var params, check, userdata, result, username, project; return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { @@ -453,7 +453,7 @@ var projectController = function (_baseController) { }, { key: 'delMember', value: function () { - var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) { var params, check, result, username, project, member; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { @@ -559,7 +559,7 @@ var projectController = function (_baseController) { }, { key: 'getUserdata', value: function () { - var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(uid, role) { + var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(uid, role) { var userInst, userData; return _regenerator2.default.wrap(function _callee4$(_context4) { while (1) { @@ -617,7 +617,7 @@ var projectController = function (_baseController) { }, { key: 'getMemberList', value: function () { - var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(ctx) { + var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx) { var params, project; return _regenerator2.default.wrap(function _callee5$(_context5) { while (1) { @@ -679,7 +679,7 @@ var projectController = function (_baseController) { }, { key: 'get', value: function () { - var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) { + var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx) { var params, result, catInst, cat; return _regenerator2.default.wrap(function _callee6$(_context6) { while (1) { @@ -764,7 +764,7 @@ var projectController = function (_baseController) { }, { key: 'list', value: function () { - var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee7(ctx) { + var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx) { var group_id, auth, result, follow, uids, _users, users; return _regenerator2.default.wrap(function _callee7$(_context7) { @@ -864,7 +864,7 @@ var projectController = function (_baseController) { }, { key: 'del', value: function () { - var _ref8 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee8(ctx) { + var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx) { var id, interfaceInst, interfaceColInst, interfaceCaseInst, result; return _regenerator2.default.wrap(function _callee8$(_context8) { while (1) { @@ -957,7 +957,7 @@ var projectController = function (_baseController) { }, { key: 'changeMemberRole', value: function () { - var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(ctx) { + var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx) { var params, projectInst, check, result, username, project, member; return _regenerator2.default.wrap(function _callee9$(_context9) { while (1) { @@ -1079,7 +1079,7 @@ var projectController = function (_baseController) { }, { key: 'upSet', value: function () { - var _ref10 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee10(ctx) { + var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx) { var id, data, result; return _regenerator2.default.wrap(function _callee10$(_context10) { while (1) { @@ -1158,7 +1158,7 @@ var projectController = function (_baseController) { }, { key: 'up', value: function () { - var _ref11 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee11(ctx) { + var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(ctx) { var id, params, projectData, checkRepeat, data, result, username; return _regenerator2.default.wrap(function _callee11$(_context11) { while (1) { @@ -1305,7 +1305,7 @@ var projectController = function (_baseController) { }, { key: 'upSet', value: function () { - var _ref12 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee12(ctx) { + var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(ctx) { var id, data, result; return _regenerator2.default.wrap(function _callee12$(_context12) { while (1) { @@ -1378,7 +1378,7 @@ var projectController = function (_baseController) { }, { key: 'search', value: function () { - var _ref13 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee13(ctx) { + var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(ctx) { var q, projectList, groupList, projectRules, groupRules, queryList; return _regenerator2.default.wrap(function _callee13$(_context13) { while (1) { @@ -1453,7 +1453,7 @@ var projectController = function (_baseController) { }, { key: 'download', value: function () { - var _ref14 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee14(ctx) { + var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(ctx) { var project_id, interfaceInst, count, arr, fileName, res; return _regenerator2.default.wrap(function _callee14$(_context14) { while (1) { diff --git a/server_dist/controllers/user.js b/server_dist/controllers/user.js index 74413cf4..297f3965 100644 --- a/server_dist/controllers/user.js +++ b/server_dist/controllers/user.js @@ -99,7 +99,7 @@ var userController = function (_baseController) { (0, _createClass3.default)(userController, [{ key: 'login', value: function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var userInst, email, password, result; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -190,7 +190,7 @@ var userController = function (_baseController) { }, { key: 'logout', value: function () { - var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) { return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { switch (_context2.prev = _context2.next) { @@ -248,7 +248,7 @@ var userController = function (_baseController) { }, { key: 'loginByToken', value: function () { - var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) { var config, token, ret, login; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { @@ -300,7 +300,7 @@ var userController = function (_baseController) { }, { key: 'handleThirdLogin', value: function () { - var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(email, username) { + var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(email, username) { var user, data, passsalt, userInst; return _regenerator2.default.wrap(function _callee4$(_context4) { while (1) { @@ -384,7 +384,7 @@ var userController = function (_baseController) { }, { key: 'changePassword', value: function () { - var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(ctx) { + var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx) { var params, userInst, user, passsalt, data, result; return _regenerator2.default.wrap(function _callee5$(_context5) { while (1) { @@ -512,7 +512,7 @@ var userController = function (_baseController) { }, { key: 'reg', value: function () { - var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) { + var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx) { var userInst, params, checkRepeat, passsalt, data, user; return _regenerator2.default.wrap(function _callee6$(_context6) { while (1) { @@ -636,7 +636,7 @@ var userController = function (_baseController) { }, { key: 'list', value: function () { - var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee7(ctx) { + var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx) { var page, limit, userInst, user, count; return _regenerator2.default.wrap(function _callee7$(_context7) { while (1) { @@ -694,7 +694,7 @@ var userController = function (_baseController) { }, { key: 'findById', value: function () { - var _ref8 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee8(ctx) { + var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx) { var userInst, id, result; return _regenerator2.default.wrap(function _callee8$(_context8) { while (1) { @@ -770,7 +770,7 @@ var userController = function (_baseController) { }, { key: 'del', value: function () { - var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(ctx) { + var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx) { var userInst, id, result; return _regenerator2.default.wrap(function _callee9$(_context9) { while (1) { @@ -846,7 +846,7 @@ var userController = function (_baseController) { }, { key: 'update', value: function () { - var _ref10 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee10(ctx) { + var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx) { var params, userInst, id, data, checkRepeat, result; return _regenerator2.default.wrap(function _callee10$(_context10) { while (1) { @@ -952,7 +952,7 @@ var userController = function (_baseController) { }, { key: 'uploadAvatar', value: function () { - var _ref11 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee11(ctx) { + var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(ctx) { var basecode, pngPrefix, jpegPrefix, type, strLength, avatarInst, result; return _regenerator2.default.wrap(function _callee11$(_context11) { while (1) { @@ -1054,7 +1054,7 @@ var userController = function (_baseController) { }, { key: 'avatar', value: function () { - var _ref12 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee12(ctx) { + var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(ctx) { var uid, avatarInst, data, dataBuffer, type; return _regenerator2.default.wrap(function _callee12$(_context12) { while (1) { @@ -1118,7 +1118,7 @@ var userController = function (_baseController) { }, { key: 'search', value: function () { - var _ref13 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee13(ctx) { + var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(ctx) { var q, queryList, rules, filteredRes; return _regenerator2.default.wrap(function _callee13$(_context13) { while (1) { @@ -1190,7 +1190,7 @@ var userController = function (_baseController) { }, { key: 'project', value: function () { - var _ref14 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee14(ctx) { + var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(ctx) { var _ctx$request$query, id, type, result, interfaceInst, interfaceData, projectInst, projectData, ownerAuth, devAuth, groupInst, groupData, _ownerAuth, _devAuth; return _regenerator2.default.wrap(function _callee14$(_context14) { diff --git a/server_dist/middleware/mockServer.js b/server_dist/middleware/mockServer.js index 245b5999..32d3e604 100644 --- a/server_dist/middleware/mockServer.js +++ b/server_dist/middleware/mockServer.js @@ -47,7 +47,7 @@ function matchApi(apiPath, apiRule) { } module.exports = function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx, next) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx, next) { var hostname, config, path, paths, projectId, projectInst, project, interfaceData, newData, newpath, interfaceInst, _newData, findInterface, res; return _regenerator2.default.wrap(function _callee$(_context) { diff --git a/server_dist/router.js b/server_dist/router.js index f972e119..6057eb16 100644 --- a/server_dist/router.js +++ b/server_dist/router.js @@ -351,7 +351,7 @@ function createAction(controller, action, path, method) { var _this = this; router[method]("/api" + INTERFACE_CONFIG[controller].prefix + path, function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var inst; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { diff --git a/server_dist/websocket.js b/server_dist/websocket.js index 8a26b94b..d2966657 100644 --- a/server_dist/websocket.js +++ b/server_dist/websocket.js @@ -26,7 +26,7 @@ function websocket(app) { return next(ctx); }); router.get('/api/interface/solve_conflict', function () { - var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) { var inst; return _regenerator2.default.wrap(function _callee$(_context) { while (1) {