From 31d5e0ccc2217ebfcf5419e1e8a1801fddb07be6 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 10 Oct 2019 17:13:21 +0800
Subject: [PATCH] tea

---
 .../modules/courses/members/ChangeRolePop.js  |  0
 .../modules/courses/members/studentsList.js   |  2 +-
 .../modules/courses/members/teacherList.js    | 37 ++++++++++++++-----
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 public/react/src/modules/courses/members/ChangeRolePop.js

diff --git a/public/react/src/modules/courses/members/ChangeRolePop.js b/public/react/src/modules/courses/members/ChangeRolePop.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 1b0b19d6f..cba7dbf54 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu ,Spin, Tooltip , Divider } from "antd";
+import { Input,Checkbox,Table, Pagination, Modal,Menu ,Spin, Tooltip , Divider, Popconfirm } from "antd";
 import ClipboardJS from 'clipboard'
 import '../css/Courses.css'
 import '../css/members.css'
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 86ae7aa0b..d3f4521b3 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { Input,Checkbox,Table, Divider, Tooltip,Spin, Menu } from "antd";
+import { Input,Checkbox,Table, Divider, Tooltip,Spin, Menu, Popconfirm } from "antd";
 
 import CourseLayoutcomponent from '../common/CourseLayoutComponent'
 import NoneData from "../coursesPublic/NoneData"
@@ -150,15 +150,34 @@ function buildColumns(that) {
             </span> )
         } else {
           return (
-            <span>
-              {record.role != ROLE_ADMIN && <WordsBtn onClick={() => that.onDelete(record)} style={'grey'}>删除</WordsBtn>}
-              {(record.role == ROLE_TEACHER || record.role == ROLE_TEACHER_ASSISTANT || isAdminOrCreator) && record.role != ROLE_ADMIN
-                   && <Divider type="vertical" />}
-              { record.role == ROLE_TEACHER ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToAssistant(record)}>变更为助教</a> : '' }
-              { record.role == ROLE_TEACHER_ASSISTANT ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToTeacher(record)}>变更为教师</a> : '' }
-              { record.role == ROLE_ADMIN  && isAdminOrCreator ? <a style={{color: '#4CACFF', marginLeft: '44px'}} onClick={() => that.showChangeAdminModal(record)}>更换管理员</a> : '' }
+            <React.Fragment>
+              <WordsBtn>删除</WordsBtn>              
+              <Popconfirm 
+                placement="right"
+                icon={null}
+                title={
+                  <React.Fragment>
+                    <Checkbox >管理员</Checkbox>
+                    <Checkbox >助教</Checkbox>
+                    <Checkbox >学生</Checkbox>
+                  </React.Fragment>
+                }
+              >
+                <WordsBtn>修改角色</WordsBtn>
+              </Popconfirm>
+            </React.Fragment>
+
+
+            // <span>
+            //   {record.role != ROLE_ADMIN && <WordsBtn onClick={() => that.onDelete(record)} style={'grey'}>删除</WordsBtn>}
+            //   {(record.role == ROLE_TEACHER || record.role == ROLE_TEACHER_ASSISTANT || isAdminOrCreator) && record.role != ROLE_ADMIN
+            //        && <Divider type="vertical" />}
+            //   { record.role == ROLE_TEACHER ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToAssistant(record)}>变更为助教</a> : '' }
+            //   { record.role == ROLE_TEACHER_ASSISTANT ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToTeacher(record)}>变更为教师</a> : '' }
+            //   { record.role == ROLE_ADMIN  && isAdminOrCreator ? <a style={{color: '#4CACFF', marginLeft: '44px'}} onClick={() => that.showChangeAdminModal(record)}>更换管理员</a> : '' }
               
-            </span> )
+            // </span> 
+            )
         }
         
       },