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

app/models/trustie_hackathon.rb

@@ -1,5 +1,5 @@
 class TrustieHackathon < ApplicationRecord
-  validates_length_of :description, maximum: 500
+  #validates_length_of :description, maximum: 10000
   has_many :trustie_hacks, :dependent => :destroy
 
 end

public/react/src/modules/osshackathon/Osshackathonmd.js

@@ -32,7 +32,7 @@ class Osshackathonmd extends Component{
 				this.setState({
 					title_value:result.data.name
 				})
-				this.contentMdRef.current.setValue(result.data.description);
+				this.contentMdRef.current.setValue(result.data.description === null ? "" : result.data.description);
 			}
 		})
 	}
@@ -83,15 +83,16 @@ class Osshackathonmd extends Component{
 					<Form.Item label="标题">
 						<Input placeholder="请输入标题"
 									 value={this.state.title_value}
-									  onInput={this.changeTitle}
+									 onInput={this.changeTitle}
 									 className="searchView searchViewAfter h45input" style={{"width": "100%"}} maxLength="60"
-									 addonAfter={String(this.state.title_value===undefined?0:this.state.title_value.length)+"/60"}
+									 addonAfter={String(this.state.title_value === undefined || this.state.title_value === null ? 0 : this.state.title_value.length) + "/60"}
 						/>
 					</Form.Item>
 
 					<Form.Item label="描述">
 						<TPMMDEditor ref={this.contentMdRef} placeholder="请输入描述" mdID={'courseContentMD'} refreshTimeout={1500}
-												 className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
+												 className="courseMessageMD"
+												 initValue={this.state.description === null ? "" : this.state.description}></TPMMDEditor>
 					</Form.Item>
 				</Form>
 
@@ -108,4 +109,4 @@ class Osshackathonmd extends Component{
 		)
 	}
 }
-export default Osshackathonmd;
+export default Osshackathonmd;

public/react/src/modules/osshackathon/Osshackathonmodel.js

@@ -185,8 +185,8 @@ class Osshackathonmodel extends Component{
 										 value={this.state.title_value}
 										 onInput={(e)=>this.changeTitle(e)}
 										 className={"Osshackathonmodelinput"}
-									   style={{"width": "100%"}} maxLength="60"
+										 style={{"width": "100%"}} maxLength="60"
-										 addonAfter={String(this.state.title_value===undefined?0:this.state.title_value.length)+"/60"}
+										 addonAfter={String(this.state.title_value === undefined || this.state.title_value === null ? 0 : this.state.title_value.length) + "/60"}
 							/>
 
 							<p className={"font mt10 mb10 ml10"}>
@@ -214,4 +214,4 @@ class Osshackathonmodel extends Component{
 		)
 	}
 }
-export default Osshackathonmodel;
+export default Osshackathonmodel;