Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

db/migrate/20190729095722_delete_error_myshixun_from_myshxiuns.rb

@@ -0,0 +1,11 @@
+class DeleteErrorMyshixunFromMyshxiuns < ActiveRecord::Migration[5.2]
+  def change
+    myshixuns = Myshixun.where("created_at > '2019-07-26 00:00:00' and repo_name is null")
+    myshixuns.find_each do |myshixun|
+      if myshixun.games.blank?
+        puts("###########user_login: #{User.find(myshixun.user_id).login}")
+        myshixun.destroy!
+      end
+    end
+  end
+end

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

@@ -384,7 +384,7 @@ class CommonWorkDetailIndex extends Component{
                     {/* 作品列表 */}
                     <Route exact path="/courses/:coursesId/group_homeworks/:workId/list"
                         render={
-                        (props) => (<CommonWorkList {...this.props} {...props} {...this.state} {...commonHandler}/>)
+                        (props) => (<CommonWorkList triggerRef={this.bindRef} {...this.props} {...props} {...this.state}  {...commonHandler}/>)
                         }
                     ></Route>
 

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

@@ -400,8 +400,13 @@ class CommonWorkList extends Component{
   componentDidMount() {
     this.fetchList()
     on('commonwork_fetch_all', this.fetchAllListener)
-    $("html").animate({ scrollTop: $('html').scrollTop() - 100 })
-    this.props.triggerRef(this);
+    $("html").animate({ scrollTop: $('html').scrollTop() - 100 });
+    try {
+      this.props.triggerRef(this);
+    }catch (e) {
+
+    }
+
   }
   componentWillUnmount() {
     off('commonwork_fetch_all', this.fetchAllListener)  

public/react/src/modules/courses/exercise/Exercisetablesmubu.js

@@ -52,7 +52,7 @@ class Exercisetablesmubus extends Component {
 			 dataIndex: 'commit_percent',
 			 key: 'commit_percent',
 			 render: (text, record, index) => {
-				const _content = <span style={{color:text.type===true? "#29BD8B":'#333333'}}>
+				const _content = <span style={{color:text.type===true? "#29BD8B":'#333333', width: '100%'}}>
 					{text.value!="有效填写量"&&text.value!="wrong" && 
 						<MarkdownToHtml content={text.value} selector={(tableNum+1) + '' + (index+1)}></MarkdownToHtml>
 						}

public/react/src/modules/user/LoginRegisterComponent.js

@@ -678,63 +678,6 @@ class LoginRegisterComponent extends Component {
     }
     //失去焦点判断
     inputOnBlur = (e, id) => {
-        // debugger
-        // // this.isCorrectname(e.target.value, id);
-        // // this.Emailphonenumberverification(e.target.value, id);
-        // if (e.target.value.length === 0) {
-        //     this.setState({
-        //         Phonenumberisnotco: undefined,
-        //         Phonenumberisnotcobool: false,
-        //     })
-        //     return;
-        // }
-        // // var telephone = $("#telephoneAdd.tianjia_phone").val();
-        // var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
-        // // var email = $("#add_email.tianjia_email").val();
-        // var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
-        //
-        // // [1]手机号开头必须是1    [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
-        // var stringdata = undefined;
-        // if (!regph.test(e.target.value)) {
-        //     stringdata = "手机号格式不正确";
-        //     this.setState({
-        //         Phonenumberisnotco: stringdata,
-        //         Phonenumberisnotcobool: true,
-        //         dragOk:false,
-        //         Whethertoverify:this.state.Whethertoverify===true?false:true,
-        //     })
-        // } else {
-        //     console.log("706");
-        //     this.setState({
-        //         Phonenumberisnotco: undefined,
-        //         Phonenumberisnotcobool: false,
-        //     })
-        //     return
-        // }
-        //
-        // if (!regemail.test(e.target.value)) {
-        //     if ((e.target.value.indexOf("@") != -1) === true) {
-        //         stringdata = "邮箱格式不正确";
-        //     } else {
-        //         stringdata = "手机号格式不正确";
-        //
-        //     }
-        //     this.setState({
-        //         Phonenumberisnotco: stringdata,
-        //         Phonenumberisnotcobool: true,
-        //         dragOk:false,
-        //         Whethertoverify:this.state.Whethertoverify===true?false:true,
-        //     })
-        //     return
-        // } else {
-        //     console.log("729");
-        //     this.setState({
-        //         Phonenumberisnotco: undefined,
-        //         Phonenumberisnotcobool: false,
-        //     })
-        //     this.Emailphonenumberverification(e.target.value, 1);
-        //     return
-        // }
         this.Emailphonenumberverification(e.target.value, 1);
     }
     inputOnBlurzhuche = (e, id) => {