Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -200,7 +200,7 @@ class CommonWorkAppraise extends Component{
                     <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
                   </a>
                   <a href={item.url}
-                      className="mr12 color9B9B" length="58">
+                      className="mr12 color9B9B" length="58" title={`${item.title && item.title.length > 40 ? item.title : ''}`}>
                     {item.title}
                   </a>
                   <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -303,7 +303,7 @@ function buildColumns(that, student_works) {
       key: 'operation',
       dataIndex: 'operation',
       render: (operation, record) => (
-        record.work_status === 0 ? <span style={{ color: '#747A7F' }}>--</span>:
+        record.work_status === 0 && !isAdmin ? <span style={{ color: '#747A7F' }}>--</span>:
         <div>
           {/* 0 未提交 */}
           {/*<React.Fragment>*/}

public/react/src/modules/courses/busyWork/CommonWorkPost.js

@@ -633,7 +633,7 @@ render(){
       </p>
 
       <div style={{ width:'100%',height:'75px'}} >
-        <p className=" fl color-black mt25 summaryname">{homework_name}</p>
+        <p className=" fl color-black mt25 summaryname" title={homework_name}>{homework_name}</p>
         <a className="color-grey-6 fr font-16 ml30 mt10 mr20" onClick={this.goback}>返回</a>
       </div>
 

public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js

@@ -103,7 +103,7 @@ class WorkDetailPageHeader extends Component{
                 />
                
 
-                {category && <a className="color-grey-6 fr font-16 ml30 mt5 mr20" onClick={this.goback} style={{ marginRight: '26px'}}>返回</a>}
+                {category && <a className="color-grey-6 fr font-16 ml30 mt7 mr20" onClick={this.goback} style={{ marginRight: '26px'}}>返回</a>}
 
                 {this.props.update_atta &&
                 <React.Fragment>

public/react/src/modules/courses/busyWork/commonWork.js

@@ -219,7 +219,10 @@ class commonWork extends Component{
       return;
     }
     this.props.confirm({
-      content: `是否确认公开？`,
+      content: <div>
+        <div>设为公开后，非课堂成员也可以访问查看</div>
+        <div>是否确认设为公开？</div>
+      </div>,
       onOk: () => {
         let coursesId=this.props.match.params.coursesId;
         const url = `/courses/${coursesId}/homework_commons/set_public.json`

public/react/src/modules/courses/common/comments/CCommentItem.js

@@ -51,7 +51,7 @@ class CCommentItem extends Component{
           })
         .then((response) => {
           if (response.data.status == 0) {
-						this.showNotification('撤销成功')
+						this.props.showNotification('撤销成功')
 						this.props.replySuccess()
           }
         })
@@ -67,7 +67,7 @@ class CCommentItem extends Component{
 
     let { item, commentIndex }=this.props;
 	if (!this.state.secondReplyContent || !this.state.secondReplyContent.trim()) {
-		this.showNotification('内容不能为空')
+		this.props.showNotification('内容不能为空')
 		return;
 	}
 	if (this.state.show_reply) {
@@ -313,7 +313,7 @@ class CCommentItem extends Component{
 										{ item.is_invalid ? <span className="validate_area fr">失效</span> : 
 										<React.Fragment>
 											<WordsBtn style="blue" className="fr" onClick={this.state.show_reply ? this.cancelReply : this.showReply}>回复</WordsBtn>
-											{(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && <WordsBtn style="blue" className="fr mr5" onClick={this.state.show_appeal ? this.cancelAppeal : this.showAppeal}>申诉</WordsBtn>}
+											{(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && <WordsBtn style="blue" className="fr mr20" onClick={this.state.show_appeal ? this.cancelAppeal : this.showAppeal}>申诉</WordsBtn>}
 											
 											
 										</React.Fragment>

public/react/src/modules/courses/common/courseMessage.css

@@ -33,6 +33,10 @@
 .course-message .panel-comment_item .editor__resize {
   left: 47%;
 }
+.course-message .childrenCommentsView .comment_item_cont:first-child {
+  border-top: 1px solid #e3e3e3;
+  margin-top: 8px;
+}
 .course-message .comment_item_cont:last-child {
   /* 作品评阅需要 */
   border-bottom: none;

public/react/src/modules/courses/css/Courses.css

@@ -1,6 +1,12 @@
 i.iconfont {
     cursor: pointer;
 }
+.overflowHidden1{
+    overflow: hidden; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    display: inline-block;
+}
 
 /* BASICS */
 .editormd-preview ol li {

public/react/src/modules/courses/members/teacherList.js

@@ -34,24 +34,27 @@ function buildColumns(that) {
   const { course_groups } = that.state
   const columns = [{
     title: '序号',
-    width: 28,
-    // dataIndex: 'name',
+    dataIndex: 'name',
     key: 'index',
     render: (content, item, index) => {
-      return <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1}</a>
+      return <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1}　</a>
     }
   },{
     title: '用户ID',
-    width: 82,
+    width: 120,
     dataIndex: 'login',
-    key: 'login'
+    key: 'login',
+    render: (login, record) => {
+      return <span className="overflowHidden1" style={{ maxWidth: '110px'}} title={`${login.length > 8 ? login : ''}`}>{login}</span>
+    }
   }, {
     title: '姓名',
     dataIndex: 'name',
-    width: 140,
+    width: 120,
     key: 'name',
     render: (name, record) => {
-      return <a href={`/login/${record.login}`} target="_blank">{name}</a>
+      return <a href={`/login/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}} 
+          title={`${name.length > 4 ? name : ''}`}>{name}</a>
     }
   }, {
     title: '角色',

public/react/src/modules/paths/ShixunPaths.css

@@ -1,129 +1,129 @@
-.paragraph:hover .status_li a{
-  display: block;
-}
-
-.newedu-filter-btn{
-  display: block;
-  float: left;
-  padding: 0 9px;
-  height: 28px;
-  line-height: 28px;
-  border-radius: 14px;
-  background-color: #F5F5F5;
-  color: #666;
-  margin-right: 10px;
-  margin-bottom: 9px;
-}
-
-.edu-filter-btn29BD8B{
-  display: block;
-  float: left;
-  padding: 0 9px;
-  height: 28px;
-  line-height: 28px;
-  border-radius: 14px;
-  background-color: #29BD8B;
-  color: #FFF;
-  margin-right: 10px;
-  margin-bottom: 9px;
-}
-
-.lesson-saved-list-item{
-  border-bottom: none!important;
-  margin-bottom: 10px;
-  background-color: #fff;
-}
-
-.click_add{
-  border-top: none!important;
-}
-.white-panel li{border:1px solid #fafafa!important;}
-.white-panel li.active{border:1px solid #4CACFF!important;}
-
-/* 选择实训列表 */
-.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
-
-.mtf3{
-  margin-top:-3px;
-}
-
-.mtf5{
-  margin-top: -5px;
-}
-
-.color204{
-    color:rgba(204,204,204,1);
-}
-
-.lesson-saved-list-itemdrop{
-    height: 93px;
-    overflow: hidden;
-}
-
-.lesson-saved-list{
-    position: relative;
-}
-
-.itempositionleft{
-    position: absolute;
-}
-
-.itempositionright{
-    position: absolute;
-}
-
-.ant-input{
-  background-color: #fafafa!important;
-}
-.ant-input:focus{
-  background-color:#ffffff!important; 
-}
-
-.pathNavLine{bottom: -11px;}
-
-#shixun_operation:hover{
-    color:#fff !important;
-}
-
-.cursor{
-    cursor: pointer;
-}
-.paragraph_nameid:hover{
-    color:#4cacff !important;
-}
-/* 学习统计 */
-.statisticsNav{height: 100px;}
-.statisticsNav ul{margin-top: 35px;}
-.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
-.statisticsNav ul li a{color: #4D4D4D!important;}
-.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
-.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
-
-
-.next-loading{
-     width:100%;
- }
-
-.paddingleft22{
-    text-align: left;
-    padding-left: 22px;
-}
-
-.paddingl5{
-    padding-left: 5px;
-}
-
-.paddingl10{
-    padding-left: 10px;
-}
-
-.red{
-    color:red;
-}
-
-.pl38{
-    padding-left: 38px;
-}
-.ml37{
-    margin-left: 37px;
+.paragraph:hover .status_li a{
+  display: block;
+}
+
+.newedu-filter-btn{
+  display: block;
+  float: left;
+  padding: 0 9px;
+  /*height: 28px;*/
+  line-height: 28px;
+  border-radius: 14px;
+  background-color: #F5F5F5;
+  color: #666;
+  margin-right: 10px;
+  margin-bottom: 9px;
+}
+
+.edu-filter-btn29BD8B{
+  display: block;
+  float: left;
+  padding: 0 9px;
+  height: 28px;
+  line-height: 28px;
+  border-radius: 14px;
+  background-color: #29BD8B;
+  color: #FFF;
+  margin-right: 10px;
+  margin-bottom: 9px;
+}
+
+.lesson-saved-list-item{
+  border-bottom: none!important;
+  margin-bottom: 10px;
+  background-color: #fff;
+}
+
+.click_add{
+  border-top: none!important;
+}
+.white-panel li{border:1px solid #fafafa!important;}
+.white-panel li.active{border:1px solid #4CACFF!important;}
+
+/* 选择实训列表 */
+.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
+
+.mtf3{
+  margin-top:-3px;
+}
+
+.mtf5{
+  margin-top: -5px;
+}
+
+.color204{
+    color:rgba(204,204,204,1);
+}
+
+.lesson-saved-list-itemdrop{
+    height: 93px;
+    overflow: hidden;
+}
+
+.lesson-saved-list{
+    position: relative;
+}
+
+.itempositionleft{
+    position: absolute;
+}
+
+.itempositionright{
+    position: absolute;
+}
+
+.ant-input{
+  background-color: #fafafa!important;
+}
+.ant-input:focus{
+  background-color:#ffffff!important; 
+}
+
+.pathNavLine{bottom: -11px;}
+
+#shixun_operation:hover{
+    color:#fff !important;
+}
+
+.cursor{
+    cursor: pointer;
+}
+.paragraph_nameid:hover{
+    color:#4cacff !important;
+}
+/* 学习统计 */
+.statisticsNav{height: 100px;}
+.statisticsNav ul{margin-top: 35px;}
+.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
+.statisticsNav ul li a{color: #4D4D4D!important;}
+.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
+.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
+
+
+.next-loading{
+     width:100%;
+ }
+
+.paddingleft22{
+    text-align: left;
+    padding-left: 22px;
+}
+
+.paddingl5{
+    padding-left: 5px;
+}
+
+.paddingl10{
+    padding-left: 10px;
+}
+
+.red{
+    color:red;
+}
+
+.pl38{
+    padding-left: 38px;
+}
+.ml37{
+    margin-left: 37px;
 }

public/react/src/modules/tpm/component/TPMright.css

@@ -1,78 +1,78 @@
-/*b新标签*/
-.newedu-filter-btn{
-    display: block;
-    float: left;
-    padding: 0 9px;
-    height: 28px;
-    line-height: 28px;
-    border-radius: 14px;
-    background-color: #F5F5F5;
-    color: #666;
-    margin-right: 10px;
-    margin-bottom: 9px;
-}
-.newedbox{
-    /*flex-wrap:  wrap;*/
-    /*display: -webkit-flex; !* Safari *!*/
-    /*display: flex;*/
-    width: 340px;
-    position:relative;
-    overflow: hidden;
-}
-.newsubscript{
-    position: absolute;
-    right: 23px;
-    bottom: 38px;
-    cursor: pointer;
-}
-.newsubscript:hover{
-    color:deepskyblue;
-}
-.edu-filter-btn29BD8B{
-    display: block;
-    float: left;
-    padding: 0 9px;
-    height: 28px;
-    line-height: 28px;
-    border-radius: 14px;
-    background-color: #29BD8B;
-    color: #FFF;
-    margin-right: 10px;
-    margin-bottom: 9px;
-}
-.relative{
-    position:relative;
-}
-.newedboxheight{
-    max-height:181px;
-}
-.newminheight{
-    /*max-height: 670px;*/
-    max-height: 300px;
-    overflow: auto;
-}
-
-.delSubentry{
-    font-size:7px;
-    font-family:MicrosoftYaHei;
-    font-weight:400;
-    color:rgba(76,172,255,1);
-    line-height:9px;
-    cursor: pointer;
-}
-.operationalter .delSubentry{
-    font-size:15px !important;
-    line-height: 25px;
-}
-/*临时的tpi关闭按钮样式*/
-.headerRight a {
-    color: #1a3f5f;
-}
-/*实训做成弹窗a标签样式调整*/
-.-task-list-title a:link, .-task-list-title a:visited {color: #bcc6cd;}
-.-task-list-title a:hover{
-    color: #459be5;
-}
-.headerLeft .-header-right{
-    height: 32px;
+/*b新标签*/
+.newedu-filter-btn{
+    display: block;
+    float: left;
+    padding: 0 9px;
+    /*height: 28px;*/
+    line-height: 28px;
+    border-radius: 14px;
+    background-color: #F5F5F5;
+    color: #666;
+    margin-right: 10px;
+    margin-bottom: 9px;
+}
+.newedbox{
+    /*flex-wrap:  wrap;*/
+    /*display: -webkit-flex; !* Safari *!*/
+    /*display: flex;*/
+    width: 340px;
+    position:relative;
+    overflow: hidden;
+}
+.newsubscript{
+    position: absolute;
+    right: 23px;
+    bottom: 38px;
+    cursor: pointer;
+}
+.newsubscript:hover{
+    color:deepskyblue;
+}
+.edu-filter-btn29BD8B{
+    display: block;
+    float: left;
+    padding: 0 9px;
+    height: 28px;
+    line-height: 28px;
+    border-radius: 14px;
+    background-color: #29BD8B;
+    color: #FFF;
+    margin-right: 10px;
+    margin-bottom: 9px;
+}
+.relative{
+    position:relative;
+}
+.newedboxheight{
+    max-height:181px;
+}
+.newminheight{
+    /*max-height: 670px;*/
+    max-height: 300px;
+    overflow: auto;
+}
+
+.delSubentry{
+    font-size:7px;
+    font-family:MicrosoftYaHei;
+    font-weight:400;
+    color:rgba(76,172,255,1);
+    line-height:9px;
+    cursor: pointer;
+}
+.operationalter .delSubentry{
+    font-size:15px !important;
+    line-height: 25px;
+}
+/*临时的tpi关闭按钮样式*/
+.headerRight a {
+    color: #1a3f5f;
+}
+/*实训做成弹窗a标签样式调整*/
+.-task-list-title a:link, .-task-list-title a:visited {color: #bcc6cd;}
+.-task-list-title a:hover{
+    color: #459be5;
+}
+.headerLeft .-header-right{
+    height: 32px;
 }