diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 17446b8c..914c0ce7 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -1,24 +1,26 @@
-'use strict';
+"use strict";
 
-const autoprefixer = require('autoprefixer');
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const getClientEnvironment = require('./env');
-const paths = require('./paths');
+const autoprefixer = require("autoprefixer");
+const path = require("path");
+const webpack = require("webpack");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const CaseSensitivePathsPlugin = require("case-sensitive-paths-webpack-plugin");
+const InterpolateHtmlPlugin = require("react-dev-utils/InterpolateHtmlPlugin");
+const WatchMissingNodeModulesPlugin = require("react-dev-utils/WatchMissingNodeModulesPlugin");
+const ModuleScopePlugin = require("react-dev-utils/ModuleScopePlugin");
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 
-const publicPath = '/';
-const env = getClientEnvironment('/');
+const getClientEnvironment = require("./env");
+
+const paths = require("./paths");
+
+const publicPath = "/";
+const env = getClientEnvironment("/");
 
 module.exports = {
   optimization: {
     splitChunks: {
-      chunks: 'async',
+      chunks: "async",
       // 大于30KB才单独分离成chunk
       minSize: 30000,
       maxAsyncRequests: 5,
@@ -30,24 +32,24 @@ module.exports = {
           reuseExistingChunk: true,
         },
         vendors: {
-          name: 'vendors',
+          name: "vendors",
           test: /[\\/]node_modules[\\/]/,
           priority: -10,
-          chunks: "all"
-        }
-      }
+          chunks: "all",
+        },
+      },
     },
-    runtimeChunk: true
+    runtimeChunk: true,
   },
-  mode: 'development',
+  mode: "development",
   // 开启调试
-  devtool: "source-map",  // 开启调试
+  devtool: "source-map", // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
   entry: [
     // We ship a few polyfills by default:
-    require.resolve('./polyfills'),
+    require.resolve("./polyfills"),
     // Include an alternative client for WebpackDevServer. A client's job is to
     // connect to WebpackDevServer by a socket and get notified about changes.
     // When you save a file, the client will either apply hot updates (in case
@@ -58,7 +60,7 @@ module.exports = {
     // the line below with these two lines if you prefer the stock client:
     // require.resolve('webpack-dev-server/client') + '?/',
     // require.resolve('webpack/hot/dev-server'),
-    require.resolve('react-dev-utils/webpackHotDevClient'),
+    require.resolve("react-dev-utils/webpackHotDevClient"),
     // Finally, this is your app's code:
     paths.appIndexJs,
     // We include the app code last so that if there is a runtime error during
@@ -68,25 +70,25 @@ module.exports = {
   output: {
     // Add /* filename */ comments to generated require()s in the output.
     pathinfo: true,
-    globalObject: 'this',
+    globalObject: "this",
     // This does not produce a real file. It's just the virtual path that is
     // served by WebpackDevServer in development. This is the JS bundle
     // containing code from all our entry points, and the Webpack runtime.
-    filename: 'static/js/bundle.js',
+    filename: "static/js/bundle.js",
     // There are also additional JS chunk files if you use code splitting.
-    chunkFilename: 'static/js/[name].chunk.js',
+    chunkFilename: "static/js/[name].chunk.js",
     // This is the URL that app is served from. We use "/" in development.
     publicPath,
     // Point sourcemap entries to original disk location (format as URL on Windows)
-    devtoolModuleFilenameTemplate: info =>
-      path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
+    devtoolModuleFilenameTemplate: (info) =>
+      path.resolve(info.absoluteResourcePath).replace(/\\/g, "/"),
   },
   resolve: {
     // This allows you to set a fallback for where Webpack should look for modules.
     // We placed these paths second because we want `node_modules` to "win"
     // if there are any conflicts. This matches Node resolution mechanism.
     // https://github.com/facebookincubator/create-react-app/issues/253
-    modules: ['node_modules', paths.appNodeModules].concat(
+    modules: ["node_modules", paths.appNodeModules].concat(
       // It is guaranteed to exist because we tweak it in `env.js`
       process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
     ),
@@ -96,13 +98,12 @@ module.exports = {
     // https://github.com/facebookincubator/create-react-app/issues/290
     // `web` extension prefixes have been added for better support
     // for React Native Web.
-    extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
+    extensions: [".web.js", ".mjs", ".js", ".json", ".web.jsx", ".jsx"],
     alias: {
-
-      "educoder": __dirname + "/../src/common/educoder.js",
+      educoder: __dirname + "/../src/common/educoder.js",
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
+      "react-native": "react-native-web",
     },
     plugins: [
       // Prevents users from importing files from outside of src/ (or node_modules/).
@@ -126,10 +127,10 @@ module.exports = {
           // A missing `test` is equivalent to a match.
           {
             test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-            loader: require.resolve('url-loader'),
+            loader: require.resolve("url-loader"),
             options: {
               limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
+              name: "static/media/[name].[hash:8].[ext]",
             },
           },
           // Process JS with Babel.
@@ -137,19 +138,22 @@ module.exports = {
             test: /\.(js|jsx|mjs)$/,
             include: paths.appSrc,
             exclude: /node_modules/,
-            loader: require.resolve('babel-loader'),
+            loader: require.resolve("babel-loader"),
             options: {
               // This is a feature of `babel-loader` for webpack (not Babel itself).
               // It enables caching results in ./node_modules/.cache/babel-loader/
               // directory for faster rebuilds.
               cacheDirectory: true,
-              "plugins": [
-                ["import", {
-                  "libraryName": "antd",
-                  "libraryDirectory": "es",
-                  "style": "css"
-                }]
-              ]
+              plugins: [
+                [
+                  "import",
+                  {
+                    libraryName: "antd",
+                    libraryDirectory: "es",
+                    style: "css",
+                  },
+                ],
+              ],
             },
           },
           // "postcss" loader applies autoprefixer to our CSS.
@@ -160,29 +164,29 @@ module.exports = {
           {
             test: /\.css$/,
             use: [
-              require.resolve('style-loader'),
+              require.resolve("style-loader"),
               {
-                loader: require.resolve('css-loader'),
+                loader: require.resolve("css-loader"),
                 options: {
                   importLoaders: 1,
                 },
               },
               {
-                loader: require.resolve('postcss-loader'),
+                loader: require.resolve("postcss-loader"),
                 options: {
                   // Necessary for external CSS imports to work
                   // https://github.com/facebookincubator/create-react-app/issues/2677
-                  ident: 'postcss',
+                  ident: "postcss",
                   plugins: () => [
-                    require('postcss-flexbugs-fixes'),
+                    require("postcss-flexbugs-fixes"),
                     autoprefixer({
                       browsers: [
-                        '>1%',
-                        'last 4 versions',
-                        'Firefox ESR',
-                        'not ie < 9', // React doesn't support IE8 anyway
+                        ">1%",
+                        "last 4 versions",
+                        "Firefox ESR",
+                        "not ie < 9", // React doesn't support IE8 anyway
                       ],
-                      flexbox: 'no-2009',
+                      flexbox: "no-2009",
                     }),
                   ],
                 },
@@ -192,7 +196,7 @@ module.exports = {
           {
             test: /\.scss$/,
             use: [
-              require.resolve('style-loader'),
+              require.resolve("style-loader"),
               {
                 loader: require.resolve("css-loader"),
                 options: {
@@ -200,8 +204,8 @@ module.exports = {
                 },
               },
               {
-                loader: require.resolve("sass-loader")
-              }
+                loader: require.resolve("sass-loader"),
+              },
             ],
           },
           // "file" loader makes sure those assets get served by WebpackDevServer.
@@ -215,9 +219,9 @@ module.exports = {
             // Also exclude `html` and `json` extensions so they get processed
             // by webpacks internal loaders.
             exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
-            loader: require.resolve('file-loader'),
+            loader: require.resolve("file-loader"),
             options: {
-              name: 'static/media/[name].[hash:8].[ext]',
+              name: "static/media/[name].[hash:8].[ext]",
             },
           },
         ],
@@ -261,17 +265,18 @@ module.exports = {
     // You can remove this if you don't use Moment.js:
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
     new MonacoWebpackPlugin({
-      features: ['!gotoSymbol'],
-    })
+      features: ["coreCommands", "find"],
+      languages: ['plaintext','apex', 'azcli', 'bat', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dockerfile', 'fsharp', 'go', 'handlebars', 'html', 'ini', 'java', 'javascript', 'json', 'less', 'lua', 'markdown', 'msdax', 'mysql', 'objective', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'r', 'razor', 'redis', 'redshift', 'ruby', 'rust', 'sb', 'scheme', 'scss', 'shell', 'solidity', 'sql', 'st', 'swift', 'typescript', 'vb', 'xml', 'yaml']
+    }),
   ],
   // Some libraries import Node modules but don't use them in the browser.
   // Tell Webpack to provide empty mocks for them so importing them works.
   node: {
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty',
+    dgram: "empty",
+    fs: "empty",
+    net: "empty",
+    tls: "empty",
+    child_process: "empty",
   },
   // Turn off performance hints during development because we don't do any
   // splitting or minification in interest of speed. These warnings become
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 1fc0f0ca..838da647 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -1,25 +1,25 @@
-'use strict';
-const autoprefixer = require('autoprefixer');
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
-const eslintFormatter = require('react-dev-utils/eslintFormatter');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
+"use strict";
+const autoprefixer = require("autoprefixer");
+const path = require("path");
+const webpack = require("webpack");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const ManifestPlugin = require("webpack-manifest-plugin");
+const InterpolateHtmlPlugin = require("react-dev-utils/InterpolateHtmlPlugin");
+const SWPrecacheWebpackPlugin = require("sw-precache-webpack-plugin");
+const eslintFormatter = require("react-dev-utils/eslintFormatter");
+const ModuleScopePlugin = require("react-dev-utils/ModuleScopePlugin");
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 
-const TerserJSPlugin = require('terser-webpack-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const TerserJSPlugin = require("terser-webpack-plugin");
+const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 
-const paths = require('./paths');
-const getClientEnvironment = require('./env');
+const paths = require("./paths");
+const getClientEnvironment = require("./env");
 
 // Some apps do not use client-side routing with pushState.
 // For these, "homepage" can be set to "." to enable relative asset paths.
-let publicPath = '/react/build/';
+let publicPath = "/react/build/";
 // let nodeEnv = process.env.NODE_ENV
 // if (nodeEnv === 'testBuild') {
 // 	publicPath = 'https://testforgeplus.trustie.net/react/build/';
@@ -28,7 +28,7 @@ let publicPath = '/react/build/';
 // 	publicPath = 'https://forgeplus.trustie.net/react/build/';
 // }
 const publicUrl = publicPath.slice(0, -1);
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
 const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
@@ -36,296 +36,301 @@ const env = getClientEnvironment(publicPath);
 // The development configuration is different and lives in a separate file.
 // 上线用的
 module.exports = {
-	optimization: {
-		minimizer: [new TerserJSPlugin({}), new OptimizeCSSAssetsPlugin({})],
-		splitChunks: {
-			chunks: 'async',
-			// 大于30KB才单独分离成chunk
-			minSize: 30000,
-			maxAsyncRequests: 5,
-			maxInitialRequests: 3,
-			name: true,
-			cacheGroups: {
-				default: {
-					minChunks: 2,
-					priority: -20,
-					reuseExistingChunk: true,
-				},
-				// vendors: {
-				// 	name: 'vendors',
-				// 	test: /[\\/]node_modules[\\/]/,
-				// 	priority: -10,
-				// 	chunks: "all"
-				// }
-			}
-		},
-		runtimeChunk: true
-	},
-	bail: true,
-	mode: 'production',
-	devtool: false,//测试版
-	entry: [require.resolve('./polyfills'), paths.appIndexJs],
-	output: {
-		path: paths.appBuild,
-		globalObject: 'this',
-		filename: './static/js/[name].[contenthash:8].js',
-		chunkFilename: './static/js/[name].[contenthash:8].chunk.js',
-		publicPath,
+  optimization: {
+    minimizer: [new TerserJSPlugin({}), new OptimizeCSSAssetsPlugin({})],
+    splitChunks: {
+      chunks: "async",
+      // 大于30KB才单独分离成chunk
+      minSize: 30000,
+      maxAsyncRequests: 5,
+      maxInitialRequests: 3,
+      name: true,
+      cacheGroups: {
+        default: {
+          minChunks: 2,
+          priority: -20,
+          reuseExistingChunk: true,
+        },
+        // vendors: {
+        // 	name: 'vendors',
+        // 	test: /[\\/]node_modules[\\/]/,
+        // 	priority: -10,
+        // 	chunks: "all"
+        // }
+      },
+    },
+    runtimeChunk: true,
+  },
+  bail: true,
+  mode: "production",
+  devtool: false, //测试版
+  entry: [require.resolve("./polyfills"), paths.appIndexJs],
+  output: {
+    path: paths.appBuild,
+    globalObject: "this",
+    filename: "./static/js/[name].[contenthash:8].js",
+    chunkFilename: "./static/js/[name].[contenthash:8].chunk.js",
+    publicPath,
 
-		// Point sourcemap entries to original disk location (format as URL on Windows)
-		devtoolModuleFilenameTemplate: info =>
-			path
-				.relative(paths.appSrc, info.absoluteResourcePath)
-				.replace(/\\/g, '/'),
-	},
-	resolve: {
-		// This allows you to set a fallback for where Webpack should look for modules.
-		// We placed these paths second because we want `node_modules` to "win"
-		// if there are any conflicts. This matches Node resolution mechanism.
-		// https://github.com/facebookincubator/create-react-app/issues/253
-		modules: ['node_modules', paths.appNodeModules].concat(
-			// It is guaranteed to exist because we tweak it in `env.js`
-			process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
-		),
-		// These are the reasonable defaults supported by the Node ecosystem.
-		// We also include JSX as a common component filename extension to support
-		// some tools, although we do not recommend using it, see:
-		// https://github.com/facebookincubator/create-react-app/issues/290
-		// `web` extension prefixes have been added for better support
-		// for React Native Web.
-		extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
-		alias: {
-			"educoder": __dirname + "/../src/common/educoder.js",
-			// Support React Native Web
-			// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-			'react-native': 'react-native-web',
-		},
-		plugins: [
-			// Prevents users from importing files from outside of src/ (or node_modules/).
-			// This often causes confusion because we only process files within src/ with babel.
-			// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-			// please link the files into your node_modules/ and let module-resolution kick in.
-			// Make sure your source files are compiled, as they will not be processed in any way.
-			new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-		],
-	},
-	module: {
-		strictExportPresence: true,
-		rules: [
-			{
-				test: /\.(js|jsx|mjs)$/,
-				enforce: 'pre',
-				use: [
-					{
-						options: {
-							formatter: eslintFormatter,
-							eslintPath: require.resolve('eslint'),
+    // Point sourcemap entries to original disk location (format as URL on Windows)
+    devtoolModuleFilenameTemplate: (info) =>
+      path
+        .relative(paths.appSrc, info.absoluteResourcePath)
+        .replace(/\\/g, "/"),
+  },
+  resolve: {
+    // This allows you to set a fallback for where Webpack should look for modules.
+    // We placed these paths second because we want `node_modules` to "win"
+    // if there are any conflicts. This matches Node resolution mechanism.
+    // https://github.com/facebookincubator/create-react-app/issues/253
+    modules: ["node_modules", paths.appNodeModules].concat(
+      // It is guaranteed to exist because we tweak it in `env.js`
+      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
+    ),
+    // These are the reasonable defaults supported by the Node ecosystem.
+    // We also include JSX as a common component filename extension to support
+    // some tools, although we do not recommend using it, see:
+    // https://github.com/facebookincubator/create-react-app/issues/290
+    // `web` extension prefixes have been added for better support
+    // for React Native Web.
+    extensions: [".web.js", ".mjs", ".js", ".json", ".web.jsx", ".jsx"],
+    alias: {
+      educoder: __dirname + "/../src/common/educoder.js",
+      // Support React Native Web
+      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
+      "react-native": "react-native-web",
+    },
+    plugins: [
+      // Prevents users from importing files from outside of src/ (or node_modules/).
+      // This often causes confusion because we only process files within src/ with babel.
+      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+      // please link the files into your node_modules/ and let module-resolution kick in.
+      // Make sure your source files are compiled, as they will not be processed in any way.
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
+    ],
+  },
+  module: {
+    strictExportPresence: true,
+    rules: [
+      {
+        test: /\.(js|jsx|mjs)$/,
+        enforce: "pre",
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve("eslint"),
+            },
+            loader: require.resolve("eslint-loader"),
+          },
+        ],
+        include: paths.appSrc,
+      },
+      {
+        // "oneOf" will traverse all following loaders until one will
+        // match the requirements. When no loader matches it will fall
+        // back to the "file" loader at the end of the loader list.
+        oneOf: [
+          // "url" loader works just like "file" loader but it also embeds
+          // assets smaller than specified size as data URLs to avoid requests.
+          {
+            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+            loader: require.resolve("url-loader"),
+            options: {
+              limit: 10000,
+              name: "static/media/[name].[hash:8].[ext]",
+            },
+          },
+          // Process JS with Babel.
+          {
+            test: /\.(js|jsx|mjs)$/,
+            include: paths.appSrc,
+            exclude: /node_modules/,
+            loader: require.resolve("babel-loader"),
+            options: {
+              compact: true,
+              plugins: [
+                [
+                  "import",
+                  {
+                    libraryName: "antd",
+                    libraryDirectory: "es",
+                    style: "css",
+                  },
+                ],
+              ],
+            },
+          },
 
-						},
-						loader: require.resolve('eslint-loader'),
-					},
-				],
-				include: paths.appSrc,
-			},
-			{
-				// "oneOf" will traverse all following loaders until one will
-				// match the requirements. When no loader matches it will fall
-				// back to the "file" loader at the end of the loader list.
-				oneOf: [
-					// "url" loader works just like "file" loader but it also embeds
-					// assets smaller than specified size as data URLs to avoid requests.
-					{
-						test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-						loader: require.resolve('url-loader'),
-						options: {
-							limit: 10000,
-							name: 'static/media/[name].[hash:8].[ext]',
-						},
-					},
-					// Process JS with Babel.
-					{
-						test: /\.(js|jsx|mjs)$/,
-						include: paths.appSrc,
-						exclude: /node_modules/,
-						loader: require.resolve('babel-loader'),
-						options: {
-							compact: true,
-							"plugins": [
-								["import", {
-									"libraryName": "antd",
-									"libraryDirectory": "es",
-									"style": "css"
-								}]
-							]
-						},
-					},
+          {
+            test: /\.css$/,
 
-					{
-						test: /\.css$/,
+            use: [
+              {
+                loader: MiniCssExtractPlugin.loader,
+                options: {
+                  publicPath,
+                },
+              },
+              {
+                loader: require.resolve("css-loader"),
+                options: {
+                  importLoaders: 1,
+                  sourceMap: shouldUseSourceMap,
+                },
+              },
+              {
+                loader: require.resolve("postcss-loader"),
+                options: {
+                  ident: "postcss",
+                  plugins: () => [
+                    require("postcss-flexbugs-fixes"),
+                    autoprefixer({
+                      browsers: [
+                        ">1%",
+                        "last 4 versions",
+                        "Firefox ESR",
+                        "not ie < 9", // React doesn't support IE8 anyway
+                      ],
+                      flexbox: "no-2009",
+                    }),
+                  ],
+                },
+              },
+            ],
+          },
+          {
+            test: /\.scss$/,
+            use: [
+              {
+                loader: MiniCssExtractPlugin.loader,
+                options: {
+                  publicPath,
+                },
+              },
+              {
+                loader: require.resolve("css-loader"),
+                options: {
+                  importLoaders: 1,
+                  sourceMap: shouldUseSourceMap,
+                },
+              },
+              {
+                loader: require.resolve("sass-loader"),
+              },
+            ],
+          },
+          // "file" loader makes sure assets end up in the `build` folder.
+          // When you `import` an asset, you get its filename.
+          // This loader doesn't use a "test" so it will catch all modules
+          // that fall through the other loaders.
+          {
+            loader: require.resolve("file-loader"),
+            // Exclude `js` files to keep "css" loader working as it injects
+            // it's runtime that would otherwise processed through "file" loader.
+            // Also exclude `html` and `json` extensions so they get processed
+            // by webpacks internal loaders.
+            exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
+            options: {
+              name: "static/media/[name].[contenthash:8].[ext]",
+            },
+          },
+          // ** STOP ** Are you adding a new loader?
+          // Make sure to add the new loader(s) before the "file" loader.
+        ],
+      },
+    ],
+  },
+  plugins: [
+    // Makes some environment variables available in index.html.
+    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    // In production, it will be an empty string unless you specify "homepage"
+    // in `package.json`, in which case it will be the pathname of that URL.
+    // Generates an `index.html` file with the <script> injected.
+    new HtmlWebpackPlugin({
+      inject: false,
+      template: paths.appHtml,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeRedundantAttributes: true,
+        useShortDoctype: true,
+        removeEmptyAttributes: true,
+        removeStyleLinkTypeAttributes: true,
+        keepClosingSlash: true,
+        minifyJS: true,
+        minifyCSS: true,
+        minifyURLs: true,
+      },
+    }),
+    new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
+    // Makes some environment variables available to the JS code, for example:
+    // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
+    // It is absolutely essential that NODE_ENV was set to production here.
+    // Otherwise React will be compiled in the very slow development mode.
+    new webpack.DefinePlugin(env.stringified),
 
-						use: [{
-							loader: MiniCssExtractPlugin.loader,
-							options: {
-								publicPath
-							},
-						},
-						{
-							loader: require.resolve("css-loader"),
-							options: {
-								importLoaders: 1,
-								sourceMap: shouldUseSourceMap,
-							},
-						},
-						{
-							loader: require.resolve('postcss-loader'),
-							options: {
-								ident: 'postcss',
-								plugins: () => [
-									require('postcss-flexbugs-fixes'),
-									autoprefixer({
-										browsers: [
-											'>1%',
-											'last 4 versions',
-											'Firefox ESR',
-											'not ie < 9', // React doesn't support IE8 anyway
-										],
-										flexbox: 'no-2009',
-									}),
-								],
-							},
-						}
-						]
-					},
-					{
-						test: /\.scss$/,
-						use: [{
-							loader: MiniCssExtractPlugin.loader,
-							options: {
-								publicPath
-							},
-						},
-						{
-							loader: require.resolve("css-loader"),
-							options: {
-								importLoaders: 1,
-								sourceMap: shouldUseSourceMap,
-							},
-						},
-						{
-							loader: require.resolve("sass-loader")
-						}
-						],
-					},
-					// "file" loader makes sure assets end up in the `build` folder.
-					// When you `import` an asset, you get its filename.
-					// This loader doesn't use a "test" so it will catch all modules
-					// that fall through the other loaders.
-					{
-						loader: require.resolve('file-loader'),
-						// Exclude `js` files to keep "css" loader working as it injects
-						// it's runtime that would otherwise processed through "file" loader.
-						// Also exclude `html` and `json` extensions so they get processed
-						// by webpacks internal loaders.
-						exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
-						options: {
-							name: 'static/media/[name].[contenthash:8].[ext]',
-						},
-					},
-					// ** STOP ** Are you adding a new loader?
-					// Make sure to add the new loader(s) before the "file" loader.
-				],
-			},
-		],
-	},
-	plugins: [
-		// Makes some environment variables available in index.html.
-		// The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-		// <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-		// In production, it will be an empty string unless you specify "homepage"
-		// in `package.json`, in which case it will be the pathname of that URL.
-		// Generates an `index.html` file with the <script> injected.
-		new HtmlWebpackPlugin({
-			inject: false,
-			template: paths.appHtml,
-			minify: {
-				removeComments: true,
-				collapseWhitespace: true,
-				removeRedundantAttributes: true,
-				useShortDoctype: true,
-				removeEmptyAttributes: true,
-				removeStyleLinkTypeAttributes: true,
-				keepClosingSlash: true,
-				minifyJS: true,
-				minifyCSS: true,
-				minifyURLs: true,
-			},
-		}),
-		new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
-		// Makes some environment variables available to the JS code, for example:
-		// if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-		// It is absolutely essential that NODE_ENV was set to production here.
-		// Otherwise React will be compiled in the very slow development mode.
-		new webpack.DefinePlugin(env.stringified),
-
-		new MiniCssExtractPlugin({
-			filename: 'static/css/[name].[contenthash:8].css',
-			chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
-		}),
-		// Generate a manifest file which contains a mapping of all asset filenames
-		// to their corresponding output file so that tools can pick it up without
-		// having to parse `index.html`.
-		new ManifestPlugin({
-			fileName: 'asset-manifest.json',
-		}),
-		// Generate a service worker script that will precache, and keep up to date,
-		// the HTML & assets that are part of the Webpack build.
-		new SWPrecacheWebpackPlugin({
-			// By default, a cache-busting query parameter is appended to requests
-			// used to populate the caches, to ensure the responses are fresh.
-			// If a URL is already hashed by Webpack, then there is no concern
-			// about it being stale, and the cache-busting can be skipped.
-			dontCacheBustUrlsMatching: /\.\w{8}\./,
-			filename: 'service-worker.js',
-			logger(message) {
-				if (message.indexOf('Total precache size is') === 0) {
-					// This message occurs for every build and is a bit too noisy.
-					return;
-				}
-				if (message.indexOf('Skipping static resource') === 0) {
-					// This message obscures real errors so we ignore it.
-					// https://github.com/facebookincubator/create-react-app/issues/2612
-					return;
-				}
-				// console.log(message);
-			},
-			minify: true,
-			// For unknown URLs, fallback to the index page
-			navigateFallback: publicUrl + '/index.html',
-			// Ignores URLs starting from /__ (useful for Firebase):
-			// https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
-			navigateFallbackWhitelist: [/^(?!\/__).*/],
-			// Don't precache sourcemaps (they're large) and build asset manifest:
-			staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
-		}),
-		// Moment.js is an extremely popular library that bundles large locale files
-		// by default due to how Webpack interprets its code. This is a practical
-		// solution that requires the user to opt into importing specific locales.
-		// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-		// You can remove this if you don't use Moment.js:
-		new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-		new MonacoWebpackPlugin({
-			features: ['!gotoSymbol'],
-		}),
-		new webpack.NamedChunksPlugin(),
-		new webpack.HashedModuleIdsPlugin()
-	],
-	// Some libraries import Node modules but don't use them in the browser.
-	// Tell Webpack to provide empty mocks for them so importing them works.
-	node: {
-		dgram: 'empty',
-		fs: 'empty',
-		net: 'empty',
-		tls: 'empty',
-		child_process: 'empty',
-	},
+    new MiniCssExtractPlugin({
+      filename: "static/css/[name].[contenthash:8].css",
+      chunkFilename: "static/css/[name].[contenthash:8].chunk.css",
+    }),
+    // Generate a manifest file which contains a mapping of all asset filenames
+    // to their corresponding output file so that tools can pick it up without
+    // having to parse `index.html`.
+    new ManifestPlugin({
+      fileName: "asset-manifest.json",
+    }),
+    // Generate a service worker script that will precache, and keep up to date,
+    // the HTML & assets that are part of the Webpack build.
+    new SWPrecacheWebpackPlugin({
+      // By default, a cache-busting query parameter is appended to requests
+      // used to populate the caches, to ensure the responses are fresh.
+      // If a URL is already hashed by Webpack, then there is no concern
+      // about it being stale, and the cache-busting can be skipped.
+      dontCacheBustUrlsMatching: /\.\w{8}\./,
+      filename: "service-worker.js",
+      logger(message) {
+        if (message.indexOf("Total precache size is") === 0) {
+          // This message occurs for every build and is a bit too noisy.
+          return;
+        }
+        if (message.indexOf("Skipping static resource") === 0) {
+          // This message obscures real errors so we ignore it.
+          // https://github.com/facebookincubator/create-react-app/issues/2612
+          return;
+        }
+        // console.log(message);
+      },
+      minify: true,
+      // For unknown URLs, fallback to the index page
+      navigateFallback: publicUrl + "/index.html",
+      // Ignores URLs starting from /__ (useful for Firebase):
+      // https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
+      navigateFallbackWhitelist: [/^(?!\/__).*/],
+      // Don't precache sourcemaps (they're large) and build asset manifest:
+      staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
+    }),
+    // Moment.js is an extremely popular library that bundles large locale files
+    // by default due to how Webpack interprets its code. This is a practical
+    // solution that requires the user to opt into importing specific locales.
+    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
+    // You can remove this if you don't use Moment.js:
+    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+    new MonacoWebpackPlugin({
+      features: ["coreCommands", "find"],
+      languages: ['plaintext','apex', 'azcli', 'bat', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dockerfile', 'fsharp', 'go', 'handlebars', 'html', 'ini', 'java', 'javascript', 'json', 'less', 'lua', 'markdown', 'msdax', 'mysql', 'objective', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'r', 'razor', 'redis', 'redshift', 'ruby', 'rust', 'sb', 'scheme', 'scss', 'shell', 'solidity', 'sql', 'st', 'swift', 'typescript', 'vb', 'xml', 'yaml']
+    }),
+    new webpack.NamedChunksPlugin(),
+    new webpack.HashedModuleIdsPlugin(),
+  ],
+  // Some libraries import Node modules but don't use them in the browser.
+  // Tell Webpack to provide empty mocks for them so importing them works.
+  node: {
+    dgram: "empty",
+    fs: "empty",
+    net: "empty",
+    tls: "empty",
+    child_process: "empty",
+  },
 };
diff --git a/package-lock.json b/package-lock.json
index 95a91464..390c5e7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14904,20 +14904,13 @@
       }
     },
     "react-monaco-editor": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/react-monaco-editor/-/react-monaco-editor-0.25.1.tgz",
-      "integrity": "sha512-VLksQjt8fmeIZoET9fQgmR0sdCCBFaiss92MwW5JvgO3JfrnhHtrLBqrSQRjtbUmef1EmEKi4gZp5Mh0oidvVg==",
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/react-monaco-editor/-/react-monaco-editor-0.36.0.tgz",
+      "integrity": "sha512-JVA5SZhOoYZ0DCdTwYgagtRb3jHo4KN7TVFiJauG+ZBAJWfDSTzavPIrwzWbgu8ahhDqDk4jUcYlOJL2BC/0UA==",
       "requires": {
-        "@types/react": "*",
-        "monaco-editor": "^0.16.0",
+        "@types/react": "^16.x",
+        "monaco-editor": "*",
         "prop-types": "^15.7.2"
-      },
-      "dependencies": {
-        "monaco-editor": {
-          "version": "0.16.2",
-          "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz",
-          "integrity": "sha512-NtGrFzf54jADe7qsWh3lazhS7Kj0XHkJUGBq9fA/Jbwc+sgVcyfsYF6z2AQ7hPqDC+JmdOt/OwFjBnRwqXtx6w=="
-        }
       }
     },
     "react-onclickoutside": {
diff --git a/package.json b/package.json
index 071c266b..397d4ee5 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,8 @@
     "katex": "^0.11.1",
     "lodash": "^4.17.15",
     "loglevel": "^1.6.8",
-    "material-ui": "^1.0.0-beta.40",
     "marked": "^1.0.0",
+    "material-ui": "^1.0.0-beta.40",
     "md5": "^2.2.1",
     "mini-css-extract-plugin": "^0.9.0",
     "moment": "^2.23.0",
@@ -72,10 +72,10 @@
     "rc-tree": "^1.15.3",
     "rc-upload": "^2.9.4",
     "react": "^16.13.1",
-    "react-color": "^2.18.0",
     "react-beautiful-dnd": "^10.0.4",
     "react-codemirror": "^1.0.0",
     "react-codemirror2": "^6.0.1",
+    "react-color": "^2.18.0",
     "react-content-loader": "^3.1.1",
     "react-cookies": "^0.1.1",
     "react-datepicker": "^2.14.1",
@@ -84,7 +84,7 @@
     "react-hot-loader": "^4.12.20",
     "react-infinite-scroller": "^1.2.4",
     "react-loadable": "^5.3.1",
-    "react-monaco-editor": "^0.25.1",
+    "react-monaco-editor": "0.36",
     "react-player": "^1.15.3",
     "react-redux": "5.0.7",
     "react-router": "^4.2.0",
@@ -194,4 +194,4 @@
     "webpack": "^4.42.1",
     "webpack-bundle-analyzer": "^3.7.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 62d4f0cd..42ac4c23 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -98,9 +98,9 @@ export function initAxiosInterceptors(props) {
 
   // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
   // TODO 读取到package.json中的配置？
-  var proxy = "http://localhost:3000"
-  proxy = "https://pre-newweb.educoder.net"
-  proxy = "https://testforgeplus.trustie.net/"
+  // var proxy = "http://localhost:3000"
+  // proxy = "https://pre-newweb.educoder.net"
+  var proxy = "https://testforgeplus.trustie.net/"
 
   // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
   // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index 172959ad..54a13b20 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -1,75 +1,82 @@
-import React , { Component } from "react";
-import { Popconfirm } from 'antd';
-import './list.css';
-import axios from 'axios';
-import Meditor from "../Newfile/m_editor"
+import React, { Component } from "react";
+import { Popconfirm, Select } from "antd";
+import "./list.css";
+import axios from "axios";
+import Meditor from "../Newfile/m_editor";
 
 function bytesToSize(bytes) {
-  if (bytes === 0) return '0 B';
+  if (bytes === 0) return "0 B";
   let k = 1024,
-  sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
-  i = Math.floor(Math.log(bytes) / Math.log(k));
-  return (bytes / Math.pow(k, i)). toFixed(2) + ' ' + sizes[i];
+    sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"],
+    i = Math.floor(Math.log(bytes) / Math.log(k));
+  return (bytes / Math.pow(k, i)).toFixed(2) + " " + sizes[i];
 }
-class CoderRootFileDetail extends Component{
-  constructor(props){
+class CoderRootFileDetail extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      readOnly:true,
-      value:undefined
-    }
+    this.state = {
+      readOnly: true,
+      value: undefined,
+      language: undefined,
+    };
   }
 
-  componentDidMount=()=>{
+  componentDidMount = () => {
     const { detail, readOnly } = this.props;
 
     this.setState({
       value: detail.content,
-      readOnly: readOnly
-    })
-  }
-
-  EditFile=()=>{
+      readOnly: readOnly,
+    });
+  };
+  select_language = (e) => {
+    console.log(e);
     this.setState({
-      readOnly:false
-    })
-  }
-  CancelEdit=()=>{
+      language: e,
+    });
+  };
+  EditFile = () => {
     this.setState({
-      readOnly:true
-    })
-  }
+      readOnly: false,
+    });
+  };
+  CancelEdit = () => {
+    this.setState({
+      readOnly: true,
+    });
+  };
 
   // 编辑文件
 
-  changeMmirror=(e,e1,value)=>{
+  changeMmirror = (e, e1, value) => {
     this.setState({
-      value
-    })
-  }
+      value,
+    });
+  };
 
-  deleteFile=()=>{
-    const { branch , detail }= this.props;
+  deleteFile = () => {
+    const { branch, detail } = this.props;
     const { projectsId } = this.props.match.params;
 
-    const url =  `/repositories/${projectsId}/delete_file.json`;
-    axios.delete(url,{
-      params:{
-        filepath:detail.path,
-        branch,
-        sha:detail.sha
-      }
-    }).then(result=>{
-      if(result){
-        this.props.showNotification("删除成功!");
-        this.props.history.push(`/projects/${projectsId}`);
-      }
-    }).catch(error=>{
-      console.log(error);
-    })
-  }
-
-
+    const url = `/repositories/${projectsId}/delete_file.json`;
+    axios
+      .delete(url, {
+        params: {
+          filepath: detail.path,
+          branch,
+          sha: detail.sha,
+        },
+      })
+      .then((result) => {
+        if (result) {
+          this.props.showNotification("删除成功!");
+          this.props.history.push(`/projects/${projectsId}`);
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
 
   // // 确认修改文件
   // UpdateFile=()=>{
@@ -93,70 +100,144 @@ class CoderRootFileDetail extends Component{
   //     console.log(error);
   //   })
   // }
-  updateCode=(value)=> {
-		this.setState({
-			value,
-		});
-	}
+  updateCode = (value) => {
+    this.setState({
+      value,
+    });
+  };
 
-  render(){
-    const { detail , current_user , isManager , isDeveloper } = this.props;
-    const { readOnly } = this.state;
+  render() {
+    const { detail, current_user, isManager, isDeveloper } = this.props;
+    const { readOnly, language } = this.state;
     let flag = current_user && current_user.login && (isManager || isDeveloper);
-    // var options = {
-		// 	lineNumbers: true,
-    //   mode: 'javascript',
-    //   readOnly:readOnly?'nocursor':false,
-    //   autofocus:readOnly?false:true,
-    //   styleActiveLine:true
-		// };
-    return(
+    const Option = Select.Option;
+    const languages = [
+      "apex",
+      "azcli",
+      "bat",
+      "clojure",
+      "coffee",
+      "cpp",
+      "csharp",
+      "csp",
+      "css",
+      "dockerfile",
+      "fsharp",
+      "go",
+      "handlebars",
+      "html",
+      "ini",
+      "java",
+      "javascript",
+      "json",
+      "less",
+      "lua",
+      "markdown",
+      "msdax",
+      "mysql",
+      "objective",
+      "perl",
+      "pgsql",
+      "php",
+      "postiats",
+      "powerquery",
+      "powershell",
+      "pug",
+      "python",
+      "r",
+      "razor",
+      "redis",
+      "redshift",
+      "ruby",
+      "rust",
+      "sb",
+      "scheme",
+      "scss",
+      "shell",
+      "solidity",
+      "sql",
+      "st",
+      "swift",
+      "typescript",
+      "vb",
+      "xml",
+      "yaml",
+    ];
+    return (
       <div className="mb20">
-        <div className="">
-          <p className="branchTitle f-wrap-alignCenter f-wrap-between">
-            <span>{bytesToSize(detail && detail.size)}</span>
-            {
-              flag &&
-              <span>
-                {
-                  readOnly ?
-                    <a onClick={this.EditFile} className="ml20"><i className="iconfont icon-bianji1 font-15 color-grey-6"></i></a>
-                    :
-                    <React.Fragment>
-                      <button type="button" className="ant-btn ant-btn-sm mr10" onClick={this.CancelEdit}><span>取 消</span>
-                      </button>
-                      {/* <button type="button" className="ant-btn ant-btn-primary ant-btn-sm" onClick={this.UpdateFile}><span>确 定</span>
+        <div className="grid-item branchTitle">
+          <div className="grid-item">
+            <span className="ml20 color-grey-6 font-16">{bytesToSize(detail && detail.size)}</span>
+          </div>
+          <p className="text-right">
+            {flag && (
+              <div>
+                {readOnly ? (
+                  <a onClick={this.EditFile} className="ml20">
+                    <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+                  </a>
+                ) : (
+                  <React.Fragment>
+                    <Select
+                      showSearch={true}
+                      placeholder={"请选择文本语言"}
+                      style={{ width: 200 }}
+                      value={language}
+                      onChange={this.select_language}
+                    >
+                      <Option value={undefined}>请选择文本语言</Option>
+                      {languages.map((item, key) => {
+                        return <Option value={item}>{item}</Option>;
+                      })}
+                    </Select>
+                    <button
+                      type="button"
+                      className="ant-btn ant-btn-sm ml20"
+                      onClick={this.CancelEdit}
+                    >
+                      <span>取 消</span>
+                    </button>
+                    {/* <button type="button" className="ant-btn ant-btn-primary ant-btn-sm" onClick={this.UpdateFile}><span>确 定</span>
                       </button> */}
-                    </React.Fragment>
-                }
+                  </React.Fragment>
+                )}
 
-                <Popconfirm title="确认删除这个文件？" className="ml20" okText="确定" cancelText="取消" onConfirm={this.deleteFile}>
-                  <a><i className="iconfont icon-shanchu font-15 color-grey-6"></i></a>
+                <Popconfirm
+                  title="确认删除这个文件？"
+                  className="ml20"
+                  okText="确定"
+                  cancelText="取消"
+                  onConfirm={this.deleteFile}
+                >
+                  <a>
+                    <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
+                  </a>
                 </Popconfirm>
-              </span>
-            }
+              </div>
+            )}
           </p>
         </div>
         <div>
-          {
-            detail.direct_download ?
-              <div className="text-center">
-                <a href={detail.download_url} className="color-blue font-15">下载原始文件</a>
-              </div>
-              :
-              <Meditor  
-            {...this.props} 
-            {...this.state} 
-            filepath={`/${detail.path}`}
-            content={detail.content}
-            readOnly={readOnly}
-            editorType="update"
-            >
-            </Meditor>
-          }
+          {detail.direct_download ? (
+            <div className="text-center">
+              <a href={detail.download_url} className="color-blue font-15">
+                下载原始文件
+              </a>
+            </div>
+          ) : (
+            <Meditor
+              {...this.props}
+              {...this.state}
+              language={language ? language : "javascript"}
+              filepath={`/${detail.path}`}
+              content={detail.content}
+              readOnly={readOnly}
+              editorType="update"
+            ></Meditor>
+          )}
         </div>
       </div>
-    )
+    );
   }
 }
 
diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js
index 421fb347..1c09015d 100644
--- a/src/forge/Newfile/Index.js
+++ b/src/forge/Newfile/Index.js
@@ -1,60 +1,145 @@
-import React , { Component } from "react";
-import Meditor from "./m_editor"
-import Top from '../Main/DetailTop';
-import './index.css';
-import { Input } from 'antd';
+import React, { Component } from "react";
+import Meditor from "./m_editor";
+import Top from "../Main/DetailTop";
+import "./index.css";
+import { Input, Select } from "antd";
 
-class Index extends Component{
-  constructor(props){
+class Index extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      editorValue:"",
-      filename:""
-    }
+    this.state = {
+      editorValue: "",
+      filename: "",
+      language: undefined
+    };
   }
 
-    // 命名文件
-    changeFileName=(e)=>{
-      this.setState({
-        filename:e.target.value
-      })
-    }
-    // 取消，弹框询问
-    CancelAddFile=()=>{
-      this.props.history.goBack();
-    }
+  // 命名文件
+  changeFileName = (e) => {
+    this.setState({
+      filename: e.target.value,
+    });
+  };
+  // 取消，弹框询问
+  CancelAddFile = () => {
+    this.props.history.goBack();
+  };
 
-  render(){
+  select_language = (e) => {
+    console.log(e)
+    this.setState({
+      language: e
+    })
+
+  }
+
+  render() {
     const { pathname } = this.props.location;
-    const { filename } = this.state;
+    const { filename, language } = this.state;
     const urlroot = pathname.split("newfile")[1];
-    const file_path = `${urlroot}/${filename}`
+    const file_path = `${urlroot}/${filename}`;
     const { projectDetail } = this.props;
-    return(
+    const Option = Select.Option;
+    const languages = [
+      "apex",
+      "azcli",
+      "bat",
+      "clojure",
+      "coffee",
+      "cpp",
+      "csharp",
+      "csp",
+      "css",
+      "dockerfile",
+      "fsharp",
+      "go",
+      "handlebars",
+      "html",
+      "ini",
+      "java",
+      "javascript",
+      "json",
+      "less",
+      "lua",
+      "markdown",
+      "msdax",
+      "mysql",
+      "objective",
+      "perl",
+      "pgsql",
+      "php",
+      "postiats",
+      "powerquery",
+      "powershell",
+      "pug",
+      "python",
+      "r",
+      "razor",
+      "redis",
+      "redshift",
+      "ruby",
+      "rust",
+      "sb",
+      "scheme",
+      "scss",
+      "shell",
+      "solidity",
+      "sql",
+      "st",
+      "swift",
+      "typescript",
+      "vb",
+      "xml",
+      "yaml",
+    ];
+    return (
       <React.Fragment>
-        <Top {...this.props} {...this.state}/>
+        <Top {...this.props} {...this.state} />
         <div className="main">
-          <p className="pb15 bor-bottom-greyE font-16 color-grey-3 mb20">新建文件</p>
+          <p className="pb15 bor-bottom-greyE font-16 color-grey-3 mb20">
+            新建文件
+          </p>
           <div>
-          <div className="f-wrap-alignCenter mb20">
-            <div className="setInputAddon">
-              <Input addonBefore={`/${projectDetail && projectDetail.identifier}${urlroot}/`} value={filename} onChange={this.changeFileName} placeholder="命名文件..."/>
+            <div className="grid-item mb20">
+              <div className="grid-item">
+                <div className="setInputAddon">
+                  <Input
+                    addonBefore={`/${
+                      projectDetail && projectDetail.identifier
+                    }${urlroot}/`}
+                    value={filename}
+                    onChange={this.changeFileName}
+                    placeholder="命名文件..."
+                  />
+                </div>
+                <a onClick={this.CancelAddFile} className="color-blue">
+                  取消
+                </a>
+              </div>
+              <div  className="text-right">
+              <Select showSearch={true} placeholder={"请选择文本语言"} style={{ width: 200 }} value={language} onChange={this.select_language}>
+                <Option value={undefined}>请选择文本语言</Option>
+                {languages.map((item, key) => {
+                  return <Option value={item}>{item}</Option>;
+                })}
+              </Select>
+              </div>
+
+
             </div>
-            <a onClick={this.CancelAddFile} className="color-blue">取消</a>
-          </div>
-            <Meditor  
-            {...this.props} 
-            {...this.state} 
-            filepath={`${file_path}`}
-            content={""}
-            readOnly={false}
-            editorType="new"
-            >
-            </Meditor>
+            <Meditor
+              {...this.props}
+              {...this.state}
+              filepath={`${file_path}`}
+              language = {language}
+              content={undefined}
+              readOnly={false}
+              editorType="new"
+            ></Meditor>
           </div>
         </div>
       </React.Fragment>
-    )
+    );
   }
 }
-export default Index;
\ No newline at end of file
+export default Index;
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index b02eb12d..6618fc15 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -10,7 +10,7 @@ class UserSubmitComponent extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      submitType: "0"
+      submitType: "0",
     };
   }
 
@@ -52,35 +52,40 @@ class UserSubmitComponent extends Component {
     });
   };
 
-
   // 确认修改文件
-  UpdateFile=()=>{
-    const { branch , detail,content,filepath}= this.props;
+  UpdateFile = () => {
+    const { branch, detail, content, filepath } = this.props;
     const { projectsId } = this.props.match.params;
     const { submitType } = this.state;
-    const url =`/repositories/${projectsId}/update_file.json`;
+    const url = `/repositories/${projectsId}/update_file.json`;
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        axios.put(url,{
-          filepath:detail.path,
-          branch: branch,
-          new_branch: submitType === "1" ? values.branchname : undefined,
-          content:content,
-          sha:detail.sha,
-        }).then(result=>{
-          if(result){
-            const url = `/projects/${projectsId}/coders?url=${detail.path.split("/")[0]}`;
+        axios
+          .put(url, {
+            filepath: detail.path,
+            branch: branch,
+            new_branch: submitType === "1" ? values.branchname : undefined,
+            content: content,
+            sha: detail.sha,
+            message: values.desc,
+          })
+          .then((result) => {
+            if (result && result.data.status === 1) {
+              // const url = `/projects/${projectsId}/coders?url=${detail.path.split("/")[0]}`;
+              //   this.props.history.push(url);
+              const url = values.branchname
+                ? `/projects/${projectsId}/coders?branch=${values.branchname}`
+                : `/projects/${projectsId}/coders`;
               this.props.history.push(url);
-            this.props.showNotification("修改成功!");
-
-          }
-        }).catch(error=>{
-          console.log(error);
-        })
+              this.props.showNotification("修改成功!");
+            }
+          })
+          .catch((error) => {
+            console.log(error);
+          });
       }
-    })
-
-  }
+    });
+  };
 
   render() {
     const { submitType } = this.state;
@@ -89,7 +94,7 @@ class UserSubmitComponent extends Component {
     const { branch, projectsId } = this.props.match.params;
 
     const { current_user, filepath, projectDetail } = this.props;
-    const {editor_type} = this.props
+    const { editor_type } = this.props;
 
     const changeSubmitBranch = () => {
       if (submitType === "1") {
@@ -128,7 +133,7 @@ class UserSubmitComponent extends Component {
               alt=""
               className="screwImg"
             />
-            <span className="color-grey-3">
+            <span className="color-grey-3 ver-middle">
               {current_user && current_user.username}：
             </span>
           </Link>
@@ -138,7 +143,7 @@ class UserSubmitComponent extends Component {
         <div className="userScrew">
           <div className="screwPanel">
             <Form>
-              <Form.Item>
+              <Form.Item style={{display: "none"}}>
                 {getFieldDecorator("path", {
                   rules: [],
                 })(
@@ -155,12 +160,12 @@ class UserSubmitComponent extends Component {
                   rules: [
                     {
                       required: true,
-                      message: "请输入合并请求的描述内容",
+                      message: "请添加描述信息",
                     },
                   ],
                 })(
                   <TextArea
-                    placeholder={`请输入合并请求的描述,(必填)`}
+                    placeholder={`必填,描述主要修改类型和内容`}
                     authSize={{ minRows: 3, maxRows: 5 }}
                   />
                 )}
@@ -181,7 +186,11 @@ class UserSubmitComponent extends Component {
           </div>
         </div>
         <div className="mt50 text-center">
-          <Button type="primary" onClick={editor_type==="new" ? this.subMitFrom : this.UpdateFile} className="mr30">
+          <Button
+            type="primary"
+            onClick={editor_type === "new" ? this.subMitFrom : this.UpdateFile}
+            className="mr30"
+          >
             提交变更
           </Button>
           <Button
diff --git a/src/forge/Newfile/editor.css b/src/forge/Newfile/editor.css
index 1bc44a0e..05dff4f9 100644
--- a/src/forge/Newfile/editor.css
+++ b/src/forge/Newfile/editor.css
@@ -5,4 +5,4 @@
 .monaco-editor .margin-view-overlays .current-line{
   background-color: rgba(48,232,132,0.15);
 }
-.branchTable .margin-view-overlays{width: 35px !important;}
\ No newline at end of file
+.branchTable .margin-view-overlays{border-right: none !important; background-color: #fcfcfc !important;}
\ No newline at end of file
diff --git a/src/forge/Newfile/index.css b/src/forge/Newfile/index.css
index 593efeea..7a8ae788 100644
--- a/src/forge/Newfile/index.css
+++ b/src/forge/Newfile/index.css
@@ -75,4 +75,6 @@
     width: 100%;
     margin-right: 0px;
   }
-}
\ No newline at end of file
+}
+.grid-item{display: grid; align-items: center; grid-template-columns: max-content 1fr;}
+.text-right{text-align: right;}
\ No newline at end of file
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index dc58012c..86c75e14 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -1,60 +1,72 @@
-import React , { Component } from "react";
+import React, { Component } from "react";
 import Editor from "react-monaco-editor";
 
-import UserSubmitComponent from './UserSubmitComponent';
+import UserSubmitComponent from "./UserSubmitComponent";
 
-import './index.css';
-import "./editor.css"
+import "./index.css";
+import "./editor.css";
 
-class m_editor extends Component{
-  constructor(props){
+class m_editor extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      editorValue:this.props.content,
-    }
+    this.state = {
+      editorValue: this.props.content,
+    };
   }
-  changeEditor=(editorValue)=>{
+  changeEditor = (editorValue) => {
     this.setState({
-      editorValue
-    })
-  }
+      editorValue,
+    });
+  };
 
-  render(){
+  render() {
     const { editorValue } = this.state;
-    const { readOnly, editorType } = this.props;
+    const { readOnly, editorType, language } = this.props;
     const editor_options = {
       lineNumbers: "on",
       selectOnLineNumbers: true,
       lineHeight: 24,
+      renderLineHighlight: "line",
       revealHorizontalRightPadding: 5,
-      lineNumbersMinChars: 2,
       readOnly: readOnly,
-      cursorStyle: readOnly ? "underline-thin" : "line"
-    }
-    return(
+      cursorStyle: readOnly ? "underline-thin" : "line",
+      folding: true,
+      foldingStrategy: "indentation", // 代码可分小段折叠
+      automaticLayout: true, // 自适应布局
+      overviewRulerBorder: false, // 不要滚动条的边框
+      scrollBeyondLastLine: false, // 取消代码后面一大段空白
+      minimap: {
+        // 不要小地图
+        enabled: false,
+      },
+    };
+    return (
       <React.Fragment>
         <div>
           <div className="branchTable">
             <Editor
               height="320px"
+              language={language ? language : "plaintext"}
               theme={"vs-grey"}
+              defaultValue="请输入内容"
               value={editorValue}
               options={editor_options}
               onChange={this.changeEditor}
+              editorWillMount={this.editorWillMount}
             />
           </div>
-          {!readOnly && <UserSubmitComponent 
-            {...this.props} 
-            {...this.state} 
-            filepath={`${this.props.filepath}`}
-            content={editorValue}
-            editor_type={editorType}
-          ></UserSubmitComponent>
-          }
-          
+          {!readOnly && (
+            <UserSubmitComponent
+              {...this.props}
+              {...this.state}
+              filepath={`${this.props.filepath}`}
+              content={editorValue}
+              editor_type={editorType}
+            ></UserSubmitComponent>
+          )}
         </div>
       </React.Fragment>
-    )
+    );
   }
 }
-export default m_editor;
\ No newline at end of file
+export default m_editor;
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index c82273f7..3051f17d 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -1,8 +1,8 @@
 import React, { Component } from "react";
-import { Input, Dropdown, Menu, Icon, Pagination, Spin, Button} from "antd";
+import { Input, Dropdown, Menu, Icon, Pagination, Spin, Button, DatePicker } from "antd";
 import "./order.css";
 
-// const { RangePicker } = DatePicker;
+const { RangePicker } = DatePicker;
 import NoneData from "../Nodata";
 import OrderItem from "./OrderItem";
 
@@ -379,20 +379,20 @@ class order extends Component {
       <div className="main">
         <div className="topWrapper"  style={{ borderBottom: "none", padding: "0" }}>
           <div>
-          <span className="mr30">
+          <span className="mr40">
             <span className="mr8 color-grey">所有:</span>
-            <Button size="small" type={status_type==="0" ? "primary" : ""} ghost={status_type==="0" ? true : false} onClick={() => this.openorder("0")}>{data && data.all_count}</Button>
+            <Button size="small">{data && data.all_count}</Button>
           </span>
-          <span className="mr30">
+          <span className="mr40">
             <span className="mr8 color-grey">开启中:</span>
-            <Button size="small" type={status_type==="1" ? "primary" : ""} ghost={status_type==="1" ? true : false} onClick={() => this.openorder("1")}>{data && data.open_count}</Button>
+            <Button size="small">{data && data.open_count}</Button>
           </span>
           <span>
             <span className="mr8 color-grey">已关闭:</span>
-            <Button size="small" type={status_type==="2" ? "primary" : ""} ghost={status_type==="2" ? true : false} onClick={() => this.openorder("2")}>{data && data.close_count}</Button>
+            <Button size="small">{data && data.close_count}</Button>
           </span>
           </div>
-          <Button type="primary" onClick={() => this.islogin()} ghost><Icon type="plus" size="16"></Icon>创建任务</Button>
+          <Button type="primary" onClick={() => this.islogin()}><Icon type="plus" size="16"></Icon>创建任务</Button>
           
         </div>
         <div className="topWrapper" style={{ borderBottom: "none" }}>
@@ -404,14 +404,14 @@ class order extends Component {
                 style={{ width: 350 }}
               />
             </div>
-            {/* <DatePicker showTime onChange={onChange} onOk={onOk} /> */}
-    {/* <br /> */}
-    {/* <RangePicker
+            <DatePicker showTime onChange={onChange} onOk={onOk} />
+    <br />
+    <RangePicker
       showTime={{ format: 'HH:mm' }}
       format="YYYY-MM-DD HH:mm"
       onChange={onChange}
       onOk={onOk}
-    /> */}
+    />
           {/* <p className="topWrapper_type">
             <li
               className={status_type === "1" ? "active" : ""}
diff --git a/src/forge/css/index.css b/src/forge/css/index.css
index b28ae9fd..5065fac3 100644
--- a/src/forge/css/index.css
+++ b/src/forge/css/index.css
@@ -113,3 +113,6 @@ ul,ol,dl{
     width: 100%;
   }
 }
+.ver-middle{
+  vertical-align: middle;
+}
\ No newline at end of file