fixed the chinese json field can't read error

diff --git a/package-lock.json b/package-lock.json
index 2e356db..70a0de0 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1241,12 +1241,9 @@
       "integrity": "sha1-ZZbHq0D2Y3OTMjqwvIDQZPxjBJg="
     },
     "brace": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/brace/-/brace-0.8.0.tgz",
-      "integrity": "sha1-6CbG1QVMrl9getexyBI23SzwGXg=",
-      "requires": {
-        "w3c-blob": "0.0.1"
-      }
+      "version": "0.11.1",
+      "resolved": "http://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
+      "integrity": "sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg="
     },
     "brace-expansion": {
       "version": "1.1.11",
@@ -1977,6 +1974,11 @@
         "repeating": "2.0.1"
       }
     },
+    "diff-match-patch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz",
+      "integrity": "sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="
+    },
     "doctrine": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
@@ -4220,6 +4222,11 @@
       "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
       "dev": true
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -5242,12 +5249,15 @@
       }
     },
     "react-ace": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-3.5.0.tgz",
-      "integrity": "sha1-uFr198l9C4zfs4U3OyS35B/e9kQ=",
-      "requires": {
-        "brace": "0.8.0",
-        "lodash.isequal": "4.5.0"
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-6.2.0.tgz",
+      "integrity": "sha512-Cr27xFNZV2wlQi+mFjgUWfd3yPZV84Sf7XVrEXkDBZmQ5I/oY3x4KvtBjX6ImN7SCWu3sU6z9F3Zh6jH3/jtzw==",
+      "requires": {
+        "brace": "0.11.1",
+        "diff-match-patch": "1.0.4",
+        "lodash.get": "4.4.2",
+        "lodash.isequal": "4.5.0",
+        "prop-types": "15.6.2"
       }
     },
     "react-autosuggest": {
@@ -6927,11 +6937,6 @@
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
       "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
     },
-    "w3c-blob": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-blob/-/w3c-blob-0.0.1.tgz",
-      "integrity": "sha1-sM01KhpQ9RVWNCD/1YYflQ8dhbg="
-    },
     "warning": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",

diff --git a/package.json b/package.json
index 3140a85..132691b 100644 (file)
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "pluralize": "~3.0.0",
     "prop-types": "^15.6.2",
     "react": "~15.5.0",
-    "react-ace": "~3.5.0",
+    "react-ace": "~6.2.0",
     "react-autosuggest": "~9.4.2",
     "react-bootstrap": "~0.30.3",
     "react-dom": "~15.5.0",

diff --git a/src/features/shared/components/JsonField/JsonField.jsx b/src/features/shared/components/JsonField/JsonField.jsx
index 3d257b7..2983f4a 100644 (file)
--- a/src/features/shared/components/JsonField/JsonField.jsx
+++ b/src/features/shared/components/JsonField/JsonField.jsx
@@ -52,6 +52,11 @@ class JsonField extends React.Component {
     const editorStyles = [styles.editorWrapper]
     if (showError) { editorStyles.push(styles.editorError) }
 
+    const aceOnBlur = (onBlur) => (event, editor) => {
+      const value = editor.getValue()
+      onBlur(value)
+    }
+
     return (
       <div className='form-group'>
         {this.props.title && <FieldLabel>{this.props.title}</FieldLabel>}
@@ -59,6 +64,7 @@ class JsonField extends React.Component {
           <AceEditor
             {...fieldProps}
             {...displayProps}
+            onBlur={aceOnBlur(fieldProps.onBlur)}
             onLoad={onLoad}
           />
         </div>