From 0e2cc884a74e5869ff7b74351fc8b885c8bcb12e Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 13 Aug 2020 10:38:18 +0800
Subject: [PATCH 1/2] Fix: Add New File Language Api Wrong

---
 src/forge/Newfile/Index.js | 152 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 148 insertions(+), 4 deletions(-)

diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js
index 3df1614f..a9644a64 100644
--- a/src/forge/Newfile/Index.js
+++ b/src/forge/Newfile/Index.js
@@ -1,8 +1,94 @@
+// import React, { Component } from "react";
+// import Meditor from "./m_editor";
+// import "./index.css";
+// import { Input } from "antd";
+// import FileLanguage from '../Component/FileLanguage';
+
+// class Index extends Component {
+//   constructor(props) {
+//     super(props);
+//     this.state = {
+//       editorValue: "",
+//       filename: "",
+//       language: undefined
+//     };
+//   }
+
+//   // 命名文件
+//   changeFileName = (e) => {
+//     this.setState({
+//       filename: e.target.value,
+//     });
+//   };
+//   // 取消，弹框询问
+//   CancelAddFile = () => {
+//     this.props.history.goBack();
+//   };
+
+//   select_language = (e) => {
+//     console.log(e)
+//     this.setState({
+//       language: e
+//     })
+
+//   }
+
+//   render() {
+//     const { pathname } = this.props.location;
+//     const { filename, language } = this.state;
+//     const urlroot = pathname.split("newfile")[1];
+//     const file_path = `${urlroot}/${filename}`;
+//     const { projectDetail } = this.props;
+    
+//     return (
+//       <React.Fragment>
+//         <div className="main">
+//           <p className="pb15 bor-bottom-greyE font-16 color-grey-3 mb20">
+//             新建文件
+//           </p>
+//           <div>
+//             <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">
+//                 <FileLanguage  language={language} select_language={this.select_language}></FileLanguage>
+//               </div>
+//             </div>
+//             <Meditor
+//               {...this.props}
+//               {...this.state}
+//               filepath={`${file_path}`}
+//               language = {language}
+//               content={undefined}
+//               readOnly={false}
+//               editorType="new"
+//             ></Meditor>
+//           </div>
+//         </div>
+//       </React.Fragment>
+//     );
+//   }
+// }
+// export default Index;
+
 import React, { Component } from "react";
 import Meditor from "./m_editor";
+import Top from "../Main/DetailTop";
 import "./index.css";
-import { Input } from "antd";
-import FileLanguage from '../Component/FileLanguage';
+import { Input, Select } from "antd";
 
 class Index extends Component {
   constructor(props) {
@@ -39,9 +125,62 @@ class Index extends Component {
     const urlroot = pathname.split("newfile")[1];
     const file_path = `${urlroot}/${filename}`;
     const { projectDetail } = this.props;
-    
+    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} />
         <div className="main">
           <p className="pb15 bor-bottom-greyE font-16 color-grey-3 mb20">
             新建文件
@@ -64,7 +203,12 @@ class Index extends Component {
                 </a>
               </div>
               <div  className="text-right">
-                <FileLanguage  language={language} select_language={this.select_language}></FileLanguage>
+              <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>
             <Meditor

From c30c270371f594870f40c44384a77eabaadedf99 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 13 Aug 2020 10:51:24 +0800
Subject: [PATCH 2/2] Fix: Add New File Language Api Wrong

---
 src/forge/Component/FileLanguage.jsx |  29 +++--
 src/forge/Newfile/Index.js           | 152 +--------------------------
 2 files changed, 18 insertions(+), 163 deletions(-)

diff --git a/src/forge/Component/FileLanguage.jsx b/src/forge/Component/FileLanguage.jsx
index 177449c4..7bfa617b 100644
--- a/src/forge/Component/FileLanguage.jsx
+++ b/src/forge/Component/FileLanguage.jsx
@@ -57,28 +57,27 @@ const LANGUAGE = [
 
 export default (({ language , select_language })=>{
   const [ languages , setLanguage ] = useState(undefined);
-
-  useEffect(()=>{
-    const url = '/dev_ops/languages.json';
-    axios.get(url).then(result=>{
-      if(result){
-        setLanguage(result.data);
-      }
-    }).catch(error=>{
-      console.log(error);
-    })
-  },[])
+  // useEffect(()=>{
+  //   const url = '/dev_ops/languages.json';
+  //   axios.get(url).then(result=>{
+  //     if(result){
+  //       setLanguage(result.data);
+  //     }
+  //   }).catch(error=>{
+  //     console.log(error);
+  //   })
+  // },[])
 
   function changelanguage(value){
-    let array = value ? languages.filter(item=>item.name === value) :undefined;
-    select_language(value,array && array[0]);
+    // let array = value ? languages.filter(item=>item.name === value) :undefined;
+    select_language(value);
   }
 
   return(
     <Select showSearch={true} placeholder={"请选择文本语言"} style={{ width: 200 }} value={language} onChange={changelanguage}>
       <Option value={undefined}>请选择文本语言</Option>
-      {languages && languages.map((item, key) => {
-        return <Option value={item.name}>{item.name}</Option>;
+      {LANGUAGE && LANGUAGE.map((item, key) => {
+        return <Option value={item}>{item}</Option>;
       })}
     </Select>
   )
diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js
index a9644a64..3df1614f 100644
--- a/src/forge/Newfile/Index.js
+++ b/src/forge/Newfile/Index.js
@@ -1,94 +1,8 @@
-// import React, { Component } from "react";
-// import Meditor from "./m_editor";
-// import "./index.css";
-// import { Input } from "antd";
-// import FileLanguage from '../Component/FileLanguage';
-
-// class Index extends Component {
-//   constructor(props) {
-//     super(props);
-//     this.state = {
-//       editorValue: "",
-//       filename: "",
-//       language: undefined
-//     };
-//   }
-
-//   // 命名文件
-//   changeFileName = (e) => {
-//     this.setState({
-//       filename: e.target.value,
-//     });
-//   };
-//   // 取消，弹框询问
-//   CancelAddFile = () => {
-//     this.props.history.goBack();
-//   };
-
-//   select_language = (e) => {
-//     console.log(e)
-//     this.setState({
-//       language: e
-//     })
-
-//   }
-
-//   render() {
-//     const { pathname } = this.props.location;
-//     const { filename, language } = this.state;
-//     const urlroot = pathname.split("newfile")[1];
-//     const file_path = `${urlroot}/${filename}`;
-//     const { projectDetail } = this.props;
-    
-//     return (
-//       <React.Fragment>
-//         <div className="main">
-//           <p className="pb15 bor-bottom-greyE font-16 color-grey-3 mb20">
-//             新建文件
-//           </p>
-//           <div>
-//             <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">
-//                 <FileLanguage  language={language} select_language={this.select_language}></FileLanguage>
-//               </div>
-//             </div>
-//             <Meditor
-//               {...this.props}
-//               {...this.state}
-//               filepath={`${file_path}`}
-//               language = {language}
-//               content={undefined}
-//               readOnly={false}
-//               editorType="new"
-//             ></Meditor>
-//           </div>
-//         </div>
-//       </React.Fragment>
-//     );
-//   }
-// }
-// export default Index;
-
 import React, { Component } from "react";
 import Meditor from "./m_editor";
-import Top from "../Main/DetailTop";
 import "./index.css";
-import { Input, Select } from "antd";
+import { Input } from "antd";
+import FileLanguage from '../Component/FileLanguage';
 
 class Index extends Component {
   constructor(props) {
@@ -125,62 +39,9 @@ class Index extends Component {
     const urlroot = pathname.split("newfile")[1];
     const file_path = `${urlroot}/${filename}`;
     const { projectDetail } = this.props;
-    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} />
         <div className="main">
           <p className="pb15 bor-bottom-greyE font-16 color-grey-3 mb20">
             新建文件
@@ -203,12 +64,7 @@ class Index extends Component {
                 </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>
+                <FileLanguage  language={language} select_language={this.select_language}></FileLanguage>
               </div>
             </div>
             <Meditor