From 35110b7db4b8f46e0a8b652cd567dd8abaa4d12e Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Fri, 15 Oct 2021 14:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=A1=B5=E9=9D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Activity/Activity.js |  4 ++--
 src/forge/Main/Index.scss      |  6 +++---
 src/forge/Newfile/m_editor.js  | 13 +++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 99eaa332..a0538552 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -143,11 +143,11 @@ class Activity extends Component{
           <ul className="percentBox">
             <li>
               <span className="purple">{data && data.pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","close")}>已处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","delay")}>已处理的合并请求</span>
             </li>
             <li>
               <span className="green">{data && data.new_pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","create")}>未处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","not_delay")}>未处理的合并请求</span>
             </li>
             <li>
               <span className="red">{data && data.close_issues_count}</span>
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 4ec6a7cb..5f369292 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -480,7 +480,7 @@
   }
 }
 .ant-anchor-wrapper{
-  padding-left: 2px;
+  padding-left: 2px!important;
   .ant-anchor-ink::before{
     background-color: #fff;
   }
@@ -490,8 +490,8 @@
   margin:0px auto;
 }
 .griditemAnchor{
-  margin-left: 0px;
-  padding: 0px;
+  margin-left: 0px!important;
+  padding: 0px!important;
   border-bottom: 1px solid #ddd;
   .ant-anchor{
     display: flex;
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 242f7e0d..13d2ec46 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -1,5 +1,7 @@
 import React, { Component } from "react";
 import Editor from "react-monaco-editor";
+// import {UnControlled as CodeMirror} from 'react-codemirror2'
+
 import UserSubmitComponent from "./UserSubmitComponent";
 
 import "./index.css";
@@ -103,6 +105,17 @@ class m_editor extends Component {
             editorWillMount={this.editorWillMount}
             editorDidMount={handleEditorMount}
           />
+          {/* <CodeMirror
+            value={editorValue}
+            options={{
+              theme: 'monokai',
+              mode: 'JavaScript',
+              extraKeys: {"Ctrl": "autocomplete"},//ctrl可以弹出提示
+              styleActiveLine: true,
+              lineNumbers: true,
+              readOnly:true
+            }}
+          /> */}
         </div>
         {!readOnly && (
           <div className="editorBorderSubmitBox" style={{marginTop:"20px",padding:"20px"}}>