Merge pull request #60 from quick123official/hotfix/2.4.1

Hotfix/2.4.1
quick123official · Oct 31, 2021 · 8f9e033 · 8f9e033
2 parents 731e495 + 6d8e128
commit 8f9e033
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/config-overrides.js b/config-overrides.js
@@ -23,9 +23,18 @@ const path = require("path");
 function resolve(dir) {
     return path.join(__dirname, ".", dir);
 }
+/**
+ * add monaco-editor-webpack-plugin
+ */
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 module.exports = function override(config, env) {
     config.resolve.alias = {
         "@": resolve("src"),
     };
+    config.plugins.push(
+        new MonacoWebpackPlugin({
+            languages: ["json"],
+        })
+    );
     return config;
-};
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "QuickRedis",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "private": true,
     "description": "QuickRedis",
     "author": "https://quick123.net/",
@@ -86,6 +86,7 @@
         "global": "^4.4.0",
         "less": "^3.10.3",
         "less-loader": "^5.0.0",
+        "monaco-editor-webpack-plugin": "^5.0.0",
         "node-uuid": "^1.4.8",
         "react": "^16.13.1",
         "react-app-rewired": "^2.1.8",

diff --git a/src/components/QuickMonacoEditor/index.js b/src/components/QuickMonacoEditor/index.js
@@ -116,7 +116,7 @@ class QuickMonacoEditor extends React.Component {
                                 <MonacoEditor
                                     ref="monacoEditor"
                                     height={this.props.height}
-                                    language="javascript"
+                                    language="json"
                                     theme="vs"
                                     value={this.props.value}
                                     defaultValue=""

diff --git a/src/pages/HostKeyList/index.js b/src/pages/HostKeyList/index.js
@@ -415,8 +415,8 @@ class HostKeyList extends Component {
                     onCancel={this.handleModalCancel.bind(this)}
                     okButtonProps={{ disabled: this.state.modal.type === 1 }}
                     forceRender={this.state.modal.forceRender}
-                    width={"90%"}
-                    height={"80%"}
+                    width={"60%"}
+                    height={"40%"}
                 >
                     <Form
                         {...this.layout}

diff --git a/src/pages/HostKeySet/index.js b/src/pages/HostKeySet/index.js
@@ -448,8 +448,8 @@ class HostKeySet extends Component {
                     onCancel={this.handleModalCancel.bind(this)}
                     okButtonProps={{ disabled: this.state.modal.type === 1 }}
                     forceRender={this.state.modal.forceRender}
-                    width={"90%"}
-                    height={"80%"}
+                    width={"60%"}
+                    height={"40%"}
                 >
                     <Form
                         {...this.layout}

diff --git a/yarn.lock b/yarn.lock
@@ -8618,6 +8618,13 @@ moment@^2.24.0, moment@^2.25.3:
   resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=
 
+monaco-editor-webpack-plugin@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/monaco-editor-webpack-plugin/download/monaco-editor-webpack-plugin-5.0.0.tgz#796c50fb4ce3f75f45bf18dfa3c31f85dc9a05da"
+  integrity sha1-eWxQ+0zj919Fvxjfo8MfhdyaBdo=
+  dependencies:
+    loader-utils "^2.0.0"
+
 monaco-editor@*:
   version "0.29.1"
   resolved "https://registry.npmmirror.com/monaco-editor/download/monaco-editor-0.29.1.tgz#6ee93d8a5320704d48fd7058204deed72429c020"