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

public/react/src/modules/courses/coursesPublic/HomeworkModal.js

@@ -241,6 +241,7 @@ class HomeworkModal extends Component{
                               className="task-hide edu-txt-left"
                               name="shixun_homework[]"
                               value={item.id}
+															key={item.id}
                             >
                               <span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.name}</span>
                             </Checkbox>

public/react/src/modules/courses/coursesPublic/SelectResource.js

@@ -351,6 +351,7 @@ class Selectresource extends Component{
 															<li className="fl" style={{width:'220px'}}>
 																<Checkbox
 																	value={item.id}
+																	key={item.id}
 																	className="fl task-hide edu-txt-left"
 																	style={{"width":"220px"}}
 																	name="shixun_homework[]"

public/react/src/modules/courses/coursesPublic/SendToFilesModal.js

@@ -198,7 +198,7 @@ class  Sendtofilesmodal extends Component{
 								{ course_lists && course_lists.map( course => {
 									return (
 										<p className="clearfix mb7" key={course.id}>
-											<Checkbox className="fl" value={course.id} ></Checkbox>
+											<Checkbox className="fl" value={course.id}  key={course.id} ></Checkbox>
 											<span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
 										</p>
 									)

public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js

@@ -208,7 +208,7 @@ class CheckCodeModal extends Component{
                 { candidates && candidates.map( candidate => {
                   return (
                     <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} ></Checkbox>
+                      <Checkbox className="fl" value={candidate.id} key={candidate.id}></Checkbox>
                       <span className="fl with25">
                         <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
                           <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.name}</label>

public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js

@@ -182,7 +182,7 @@ class SendToCourseModal extends Component{
                 { course_lists && course_lists.map( course => {
                   return (
                     <p className="clearfix mb7" key={course.id}>
-                      <Checkbox className="fl" value={course.id} ></Checkbox>
+                      <Checkbox className="fl" value={course.id} key={course.id}></Checkbox>
                       <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
                     </p>
                   )

public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js

@@ -286,7 +286,9 @@ class ShixunModal extends Component{
 														<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
 															<li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide">
 																<Checkbox
-																	id={"shixun_input_"+item.shixun_id} value={item.shixun_id}
+																	id={"shixun_input_"+item.shixun_id}
+																	value={item.shixun_id}
+																	key={item.shixun_id}
 																	className=" task-hide edu-txt-left newtaskhide"
 																	style={{"width":"280px"}}
 																	name="shixun_homework[]"

public/react/src/modules/courses/exercise/question/multiple.js

@@ -51,7 +51,7 @@ class Multiple extends Component{
 
               return(
                 <p className="clearfix mb15 df">
-                  <Checkbox className="fl lineh-15 df mr8 mt2" value={item.choice_id}>{prefix}</Checkbox>
+                  <Checkbox className="fl lineh-15 df mr8 mt2" value={item.choice_id} key={item.choice_id}>{prefix}</Checkbox>
                   {/* <span class="fl lineh-20 mt1"></span> */}
                   {/* <span style={{display:"inline-block"}} className="markdown-body " dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */}
                   <MarkdownToHtml content={item.choice_text} selector={'multiple_' + (this.props.index + 1) + (key + 1)}

public/react/src/modules/courses/members/modal/AddStudentModal.js

@@ -237,7 +237,7 @@ class AddStudentModal extends Component{
                 { users.map( candidate => {
                   return (
                     <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} disabled={candidate.added}></Checkbox>
+                      <Checkbox className="fl" value={candidate.id} key={candidate.id} disabled={candidate.added}></Checkbox>
                       <span className="fl with25">
                         <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
                           <label className="task-hide fl" style={{"maxWidth":"208px;"}}>

public/react/src/modules/courses/members/modal/AddTeacherModal.js

@@ -281,7 +281,7 @@ class AddTeacherModal extends Component{
                 { candidates && candidates.map( candidate => {
                   return (
                     <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} ></Checkbox>
+                      <Checkbox className="fl" value={candidate.id} key={candidate.id}></Checkbox>
                       <span className="fl with25">
                       {/* "color":"#4c4c4c" */}
                         <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>

public/react/src/modules/courses/poll/PollDetailTabThird.js

@@ -108,8 +108,8 @@ class PollDetailTabThird extends Component{
                       {
                         item.question.answers.map((index,k)=>{
                           return(
-                            <li className="df">
+                            <li className="df" key={k}>
-                              <Checkbox className="fl mr8" value={index.answer_id}></Checkbox>
+                              <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
                               <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
                               {
                                 index.answer_text=="其他" ? <p className="textLine"></p>:""

public/react/src/modules/courses/poll/PollInfo.js

@@ -445,7 +445,7 @@ class PollInfo extends Component{
                             item.question.answers &&  item.question.answers.map((i,k)=>{
                               return(
                                 <li className={i.answer_text=="其他"?"df clearfix":"clearfix"}>
-                                  <Checkbox className="fl mr8" value={i.answer_id}></Checkbox>
+                                  <Checkbox className="fl mr8" value={i.answer_id} key={i.answer_id}></Checkbox>
                                   <span className="break-word fl" style={{maxWidth:"1116px"}}>{i.answer_text}</span>
                                   {
                                     i.answer_text=="其他"?

public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js

@@ -288,6 +288,7 @@ class ShixunWorkModal extends Component{
 																className="fl task-hide edu-txt-left"
 																name="shixun_homework[]"
 																value={item=== undefined?"":item.id}
+																key={item=== undefined?"":item.id}
 															>
 																<label style={{"textAlign": "left", "color": "#05101A"}}
 																			 className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -1161,7 +1161,7 @@ class ShixunHomework extends Component{
                     isStudent={this.props.isStudent()}
                     isNotMember={this.props.isNotMember()}
 										isClassManagement={this.props.isClassManagement()}
-                    checkBox={this.props.isAdmin()?<Checkbox value={item.homework_id}></Checkbox>:""}
+                    checkBox={this.props.isAdmin()?<Checkbox value={item.homework_id} key={item.homework_id}></Checkbox>:""}
                     match={this.props.match}
                     coursedata={this.props.coursedata}
                     coursupdata={()=>this.homeworkupdatalist(Coursename,page,order)}

public/react/src/modules/paths/ShixunPathSearch.js

@@ -139,8 +139,8 @@ class ShixunPathSearch extends Component{
           <div className="mt20 educontent mb20 clearfix">
             {/*<a href="javascript:void(0)" className={ order == "publish_time" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("publish_time")}>全部</a>*/}
             {/*<a href="javascript:void(0)" className={ order == "mine" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("mine")}>我的</a>*/}
-            <a className={ order == "updated_at" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("updated_at")}>最新</a>
+            <span className={ order == "updated_at" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("updated_at")}>最新</span>
-            <a className={ order == "myshixun_count" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("myshixun_count")}>最热</a>
+            <span className={ order == "myshixun_count" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("myshixun_count")}>最热</span>
             {/*<div className="fr mr5 search-new">*/}
               {/*/!* <Search*/}
               {/*placeholder="请输入路径名称进行搜索"*/}

public/react/src/modules/user/usersInfo/InfosBank.js

@@ -211,7 +211,7 @@ class InfosBank extends Component{
               return(
                 <div className="dataBank_Item clearfix" key={key}>
                   <div className="fl dataItemLeft">
-                    <Checkbox value={item.id}></Checkbox>
+                    <Checkbox value={item.id} key={item.id}></Checkbox>
                   </div>
                   <div className="fr dataItemRight bank_item">
                     <p className="mb10 clearfix">