Merge pull request #489 from leoendless/hotfix/codeEditor

fix: Add props upadte logic for code editor
kubesphere · Jun 24, 2020 · e2a6399 · e2a6399
2 parents 5a31e1d + 18fb0d9
commit e2a6399
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/components/Base/CodeEditor/index.jsx b/src/components/Base/CodeEditor/index.jsx
@@ -53,6 +53,19 @@ class CodeEditor extends PureComponent {
     }
   }
 
+  static getDerivedStateFromProps(props, state) {
+    const { value } = props
+
+    if (value !== state.originValue) {
+      return {
+        value: getValue(value),
+        originValue: value,
+      }
+    }
+
+    return null
+  }
+
   handleChange = value => {
     const { onChange } = this.props
     this.setState({ value }, () => onChange(value))

diff --git a/src/components/Forms/AppDeploy/AppConfig/index.jsx b/src/components/Forms/AppDeploy/AppConfig/index.jsx
@@ -77,12 +77,11 @@ export default class Services extends React.Component {
     set(
       formData,
       'conf',
-      getValue(
-        Object.assign({}, getValueObj(this.state.valuesYaml), {
-          Name: formData.name || '',
-          Description: formData.desc || '',
-        })
-      )
+      getValue({
+        ...getValueObj(this.state.valuesYaml),
+        Name: formData.name || '',
+        Description: formData.desc || '',
+      })
     )
   }