From 7a06e219339d881361059a285dff3995e19ee5f7 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Thu, 30 Sep 2021 19:47:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7issue=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Newfile/m_editor.js | 106 ++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 50 deletions(-)

diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 3b8a92052..de4b8289e 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -52,68 +52,74 @@ class m_editor extends Component {
 
     const handleEditorMount = (editor, monaco) => {
       editor.onDidChangeModelDecorations(() => {
-        updateEditorHeight(); // typing
-        requestAnimationFrame(updateEditorHeight); //folding
+          updateEditorHeight(); // typing
+          requestAnimationFrame(updateEditorHeight); // folding
       });
 
       const updateEditorHeight = () => {
-        const editorElement = editor.getDomNode();
+          const editorElement = editor.getDomNode();
 
-        if (!editorElement) {
-          return;
-        }
+          if (!editorElement) {
+              return;
+          }
 
-        const padding = 40;
+          const padding = 40;
 
-        const lineHeight = editor.getOption(
-          monaco.editor.EditorOption.lineHeight
-        );
-        const lineCount = editor.getModel().getLineCount() || 1;
-        const height = 
-            editor.getTopForLineNumber(lineCount + 1) +
-            lineHeight +
-            padding;
-            
-            if (this.state.prevHeight !== height) {
-              this.setState({
-                prevHeight:height
-              })
+          const lineHeight = editor.getOption(
+              monaco.editor.EditorOption.lineHeight
+          );
+
+          const lineCount = editor.getModel().getLineCount() || 1;
+          const height =
+              editor.getTopForLineNumber(lineCount + 1) +
+              lineHeight +
+              padding;
+
+          if (this.state.prevHeight !== height) {
+            this.setState({
+              prevHeight:height
+            })
               // setPrevHeight(height);
               editorElement.style.height = `${height}px`;
               editor.layout();
-            }
+          }
       };
-    };
+  };
+
 
     return (
-      <div>
-        <div className="">
-          <Editor
-            height="400px"
-            language={language ? language : "plaintext"}
-            theme={"vs-grey"}
-            placeholder="请输入内容"
-            value={editorValue}
-            options={editor_options}
-            onChange={this.changeEditor}
-            editorWillMount={this.editorWillMount}
-            editorDidMount={handleEditorMount}
-          />
-        </div>
-        {!readOnly && (
-          <div style={{marginTop:"20px",padding:"20px"}}>
-            <UserSubmitComponent
-              {...this.props}
-              {...this.state}
-              filepath={`${this.props.filepath}`}
-              content={editorValue}
-              editor_type={editorType}
-              currentBranch={currentBranch}
-              descName={descName}
-            ></UserSubmitComponent>
-            </div>
-        )}
-      </div>
+
+
+      <React.Fragment>
+        <div>
+          <div className="">
+            <Editor
+              // height={this.state.x}
+              language={language ? language : "plaintext"}
+              theme={"vs-grey"}
+              placeholder="请输入内容"
+              value={editorValue}
+              options={editor_options}
+              onChange={this.changeEditor}
+              editorWillMount={this.editorWillMount}
+              editorDidMount={handleEditorMount}
+            />
+          </div>
+            {!readOnly && (
+              <div style={{marginTop:"20px",padding:"20px"}}>
+                <UserSubmitComponent
+                  {...this.props}
+                  {...this.state}
+                  filepath={`${this.props.filepath}`}
+                  content={editorValue}
+                  editor_type={editorType}
+                  currentBranch={currentBranch}
+                  descName={descName}
+                ></UserSubmitComponent>
+                </div>
+            )}
+          </div>
+      </React.Fragment>
     );
   }
 }

From 30acf6ed34517e23f5dbcbea0890d57ce145375a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 30 Sep 2021 20:30:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E5=8F=91=E8=A1=8C=E7=89=88=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?,=E4=BB=A3=E7=A0=81=E5=BA=93=E9=A1=B5=E9=9D=A2=E5=8F=91?=
 =?UTF-8?q?=E8=A1=8C=E7=89=88=E5=8F=8A=E6=97=B6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepot.jsx     | 21 +++++++++++++++++----
 src/forge/Main/version/version.js |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 2efec3940..6c47afa5c 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -67,6 +67,7 @@ function CoderDepot(props){
   const [ editReadme , setEditReadme ] = useState(false);
   const [ pullsFlag , setPullsFlag ] = useState(true);
   const [ issuesFlag , setIssuesFlag ] = useState(true);
+  const [ releaseVersions , setReleaseVersions] = useState(undefined);
 
   const owner = props.match.params.owner;
   const projectsId = props.match.params.projectsId;
@@ -130,6 +131,18 @@ function CoderDepot(props){
     } 
   },[projectsId,owner,pathname,defaultBranch])
 
+  useEffect(()=>{
+    axios.get(`/${owner}/${projectsId}/releases.json`).then((result)=>{
+      if(result && result.data){
+        const release = {
+          "list":result.data.releases,
+          "total_count":result.data.releases.length
+        }
+        setReleaseVersions(release);
+      }
+    })
+  },[])
+
   // 获取readme信息
   function getReadmeInfo(path, ref) {
     axios.get(`/${owner}/${projectsId}/readme.json`, { 
@@ -542,13 +555,13 @@ function CoderDepot(props){
                     }
                     {/* 发布 */}
                     {
-                      projectDetail && projectDetail.release_versions &&
+                      releaseVersions &&
                       <React.Fragment>
                         <Divider />
                         <Releases 
-                          owner={owner}
-                          projectsId={projectsId}
-                          releaseVersions={projectDetail.release_versions}
+                          owner={owner} 
+                          projectsId={projectsId} 
+                          releaseVersions={releaseVersions} 
                           history={props.history}
                           distribution={distribution}
                         />
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
index c28cc4b85..6c13a809d 100644
--- a/src/forge/Main/version/version.js
+++ b/src/forge/Main/version/version.js
@@ -63,7 +63,7 @@ function version(props) {
           <span className={`${item.draft === "稳定" ?"versionTag green":"versionTag orange"}`}>{item.draft}</span>
           <span className="color-grey-3 mt15 font-12">
             <i className="iconfont icon-biaoqianicon mr3 font-14"></i>
-            <Link className="hover" to={`/${owner}/${projectsId}/tree/${item.name}`} >{item.tag_name}</Link>
+            <Link className="hover" to={`/${owner}/${projectsId}/tree/${item.tag_name}`} >{item.tag_name}</Link>
           </span>
           <span className="color-grey-3 font-12">
             <img src={Tree} width="16px" color="#333333" className="mr3"/>