From 11053da351bb8ccfaf4240d3877235daa526bd63 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 30 Sep 2021 15:59:54 +0800
Subject: [PATCH 1/2] style

---
 src/forge/Main/Index.scss    |  4 ++--
 src/forge/Main/tag/Index.jsx | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 6e0c300c..9a0bf539 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -189,13 +189,13 @@
     flex-wrap: wrap;
     padding-bottom: 2px;
     a{
-      margin: 0px 17px 0px 0px;
+      margin: 0px 17px 10px 0px;
       img{
         border-radius: 50%;
         width: 40px;
         height: 40px;
       }
-      &:nth-child(6){
+      &:nth-child(5){
         margin-right: 0px;
       }
     }
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 54586b14..7ab02ac4 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -6,20 +6,29 @@ import { Link } from 'react-router-dom';
 import { truncateCommitId } from '../../common/util';
 import './Index.scss';
 import Tree from '../img/tree.png'
+import Pagination from 'rc-pagination';
 
+const limit = 15;
 
 function Tags(props) {
 
-  const [ source , setSource ] = useState([]);
+  const [ source , setSource ] = useState([]); 
+  const [ total ,setTotal ] = useState(0);
+  const [ page , setPage ] = useState(1);
 
   const { projectsId , owner } = props.match.params;
 
   useEffect(() => {
     if (projectsId) {
       const url = `/${owner}/${projectsId}/tags.json`;
-      axios.get(url).then((result) => {
+      axios.get(url,{
+        // params:{
+        //   limit
+        // }
+      }).then((result) => {
         if (result) {
           setSource(result.data);
+          setTotal(result.data.total_count);
         }
       }).catch(error => {})
     }
@@ -97,6 +106,10 @@ function Tags(props) {
     <div>
       <SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
       <Table className="tagTable" dataSource={source} columns={columns} pagination={false}></Table>
+      {
+        total > limit &&
+        <Pagination current={page} pageSize={limit} onChange={(p)=>setPage(p)}/>
+      }
     </div>
   )
 }

From 1a5f81887a285a9a13952936a81550748c274dd1 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 30 Sep 2021 16:51:53 +0800
Subject: [PATCH 2/2] issue

---
 src/forge/Main/CoderDepot.jsx |  4 +--
 src/forge/Newfile/m_editor.js | 63 ++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 1ba95120..a7e13691 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -128,7 +128,7 @@ function CoderDepot(props){
 
   useEffect(()=>{
     axios.get(`/${owner}/${projectsId}/releases.json`).then((result)=>{
-      if(result && result.data && result.data.releases){
+      if(result && result.data){
         const release = {
           "list":result.data.releases,
           "total_count":result.data.releases.length
@@ -136,7 +136,7 @@ function CoderDepot(props){
         setReleaseVersions(release);
       }
     })
-  },[releaseVersions])
+  },[])
 
   // 获取主目录列表
   function getDirInfo(branch){
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 3c890bfc..3b8a9205 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -4,7 +4,6 @@ import UserSubmitComponent from "./UserSubmitComponent";
 
 import "./index.css";
 import "./editor.css";
-import { edit } from "marked/src/helpers";
 
 class m_editor extends Component {
   constructor(props) {
@@ -76,7 +75,7 @@ class m_editor extends Component {
             padding;
             
             if (this.state.prevHeight !== height) {
-              this.serState({
+              this.setState({
                 prevHeight:height
               })
               // setPrevHeight(height);
@@ -87,38 +86,34 @@ class m_editor extends Component {
     };
 
     return (
-
-
-      <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>
+      <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>
     );
   }
 }