From 9ec8aa73b893c08aaf2d5454601c038d5f85acdc Mon Sep 17 00:00:00 2001
From: zwjamnsss <zwjamnsss@gmail.com>
Date: Thu, 21 Sep 2017 10:59:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=86=E7=BB=84=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/containers/Group/MemberList/MemberList.js | 10 +++++++++-
 server/controllers/group.js                      |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/containers/Group/MemberList/MemberList.js b/client/containers/Group/MemberList/MemberList.js
index d01a80b0..4ac75939 100755
--- a/client/containers/Group/MemberList/MemberList.js
+++ b/client/containers/Group/MemberList/MemberList.js
@@ -201,6 +201,7 @@ class MemberList extends Component {
               <Select value={ record.role+'-'+record.uid} className="select" onChange={this.changeUserRole}>
                 <Option value={ 'owner-'+record.uid}>组长</Option>
                 <Option value={'dev-'+record.uid}>开发者</Option>
+                <Option value={'guest-'+record.uid}>访客</Option>
               </Select>
               <Popconfirm placement="topRight" title="你确定要删除吗? " onConfirm={this.deleteConfirm(record.uid)} okText="确定" cancelText="">
                 <Button type="danger" icon="minus" className="btn-danger" />
@@ -213,6 +214,8 @@ class MemberList extends Component {
             return '组长';
           } else if (record.role === 'dev') {
             return '开发者';
+          } else if (record.role === 'guest') {
+            return '访客';
           } else {
             return '';
           }
@@ -222,6 +225,7 @@ class MemberList extends Component {
     let userinfo = this.state.userInfo;
     let ownerinfo = [];
     let devinfo = [];
+    let guestinfo = [];
     for(let i = 0;i<userinfo.length;i++){
       if(userinfo[i].role === "owner"){
         ownerinfo.push(userinfo[i]);
@@ -229,8 +233,11 @@ class MemberList extends Component {
       if(userinfo[i].role === "dev"){
         devinfo.push(userinfo[i]);
       }
+      if(userinfo[i].role === "guest"){
+        guestinfo.push(userinfo[i]);
+      }
     }
-    userinfo = [...ownerinfo,...devinfo];
+    userinfo = [...ownerinfo,...devinfo,...guestinfo];
     return (
       <div className="m-panel">
         <Modal
@@ -251,6 +258,7 @@ class MemberList extends Component {
               <Select size="large" defaultValue="dev" className="select" onChange={this.changeNewMemberRole}>
                 <Option value="owner">组长</Option>
                 <Option value="dev">开发者</Option>
+                <Option value="guest">访客</Option>
               </Select>
             </Col>
           </Row>
diff --git a/server/controllers/group.js b/server/controllers/group.js
index 67d0b002..c45ac6c3 100755
--- a/server/controllers/group.js
+++ b/server/controllers/group.js
@@ -127,7 +127,7 @@ class groupController extends baseController {
      * @foldnumber 10
      * @param {String} id 项目分组id
      * @param {String} member_uid 项目分组成员uid
-     * @param {String} role 成员角色，owner or dev
+     * @param {String} role 成员角色，owner or dev or guest
      * @returns {Object}
      * @example
      */
@@ -145,7 +145,7 @@ class groupController extends baseController {
             return ctx.body = yapi.commons.resReturn(null, 400, '分组id不能为空');
         }
 
-        params.role = params.role === 'owner' ? 'owner' : 'dev';
+        params.role = ['owner', 'dev', 'guest'].find(v => v === params.role) || 'dev';
 
         var check = await groupInst.checkMemberRepeat(params.id, params.member_uid);
         if (check > 0) {
@@ -197,7 +197,7 @@ class groupController extends baseController {
             return ctx.body = yapi.commons.resReturn(null, 405, '没有权限');
         }
 
-        params.role = params.role === 'owner' ? 'owner' : 'dev';
+        params.role = ['owner', 'dev', 'guest'].find(v => v === params.role) || 'dev';
 
         try {
             let result = await groupInst.changeMemberRole(params.id, params.member_uid, params.role);