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

public/react/src/modules/tpm/TPMBanner.js

@@ -311,6 +311,7 @@ class TPMBanner extends Component {
       console.log(error)
     });
   }
+
   cancel_publish = () => {
     this.setState({
       Modalstype: true,
@@ -971,7 +972,7 @@ class TPMBanner extends Component {
 
                 </Modal>
 
-                {shixunsDetails.shixun_status === 1 && this.props.identity < 5 ?
+                {shixunsDetails.shixun_status === 2 && shixunsDetails.public===0 && this.props.identity < 5 ?
                   <a onClick={this.cancel_publish} className="fr user_default_btn user_blue_btn mr20 font-18 height39"
                      id="challenge_begin">撤销发布</a> : ""
                 }

public/react/src/modules/tpm/TPMsettings/Configuration.js

@@ -69,7 +69,7 @@ export default class Shixuninformation extends Component {
   }
 
   componentDidMount() {
-    if (this.props.data.shixun) {
+    if (this.props.data&&this.props.data.shixun) {
 
       this.setState({
         can_copy:this.props.data.shixun && this.props.data.shixun.can_copy === undefined ? false : this.props.data.shixun&&this.props.data.shixun.can_copy,

public/react/src/modules/tpm/TPMsettings/LearningSettings.js

@@ -34,7 +34,7 @@ export default class Shixuninformation extends Component {
 
 
   componentDidMount() {
-    if (this.props.data.shixun) {
+    if (this.props.data&&this.props.data.shixun) {
 
       this.setState({
         vnc: this.props.data && this.props.data.shixun.vnc,

public/react/src/modules/tpm/TPMsettings/Shixuninformation.js

@@ -55,7 +55,7 @@ class Shixuninformation extends Component {
 
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.data != this.props.data) {
-      if (this.props.data) {
+      if (this.props.data&&this.props.data.shixun) {
         this.setState({
           shixunName: this.props.data.shixun&&this.props.data.shixun.name,
           trainee:this.props.data.shixun&&this.props.data.shixun.trainee,