wanghongkai hace 5 años
padre
commit
8f95a99b45
Se han modificado 1 ficheros con 10 adiciones y 2 borrados
  1. 10 2
      src/pages/app/[id]/environment/[environmentId].js

+ 10 - 2
src/pages/app/[id]/environment/[environmentId].js

@@ -151,6 +151,14 @@ export default class AppEnvironment extends PureComponent {
   componentWillReceiveProps(props) {
     if (this.props.match.params.environmentId != props.match.params.environmentId ) {
       this.fetchData(props.match.params.environmentId);
+      if (this.interval) {
+        clearInterval(this.interval);
+        this.interval = null;
+      }
+      if (this.logInterval) {
+        clearInterval(this.logInterval);
+        this.logInterval = null;
+      }
     }
   }
   showEnvConfig() {
@@ -474,13 +482,13 @@ export default class AppEnvironment extends PureComponent {
                 visible={this.state.showConfigModal}
                 onOk={this.updateEnvConfig.bind(this)}
                 onCancel={this.hideEnvConfig.bind(this)}
-                config={this.state.currentEnvironment?.config}
+                config={this.state.currentEnvironment?.config || this.props.environment.currentEnvironment?.config}
               ></ConfigModal>
               <EnvironmentModal
                 visible={this.state.showEnvironmentModal}
                 onOk={this.updateEnv.bind(this)}
                 onCancel={this.hideEnvUpdate.bind(this)}
-                environment={this.state.currentEnvironment}
+                environment={this.state.currentEnvironment || this.props.environment.currentEnvironment}
               >
               </EnvironmentModal>
             </PageHeader> :