From 2ab5ffd699d2c7be3cdf753bd0674089c0ee30c6 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 11 Sep 2024 08:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=89=88=E6=9C=ACissue?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js               |  2 +-
 src/forge/Branch/Select.jsx    |  5 ++---
 src/forge/Main/tree/Index.jsx  |  2 +-
 src/forge/Merge/CreateMerge.js |  4 ++--
 src/forge/Newfile/m_editor.js  | 20 +++++++++-----------
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index e102edbe1..308ff1a6a 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  var proxy = "https://testforgeplus.trustie.net";
+  var proxy = "http://172.20.32.202:4000/";
   // var proxy = "https://www.gitlink.org.cn";
 
   //响应前的设置
diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx
index cc19439ea..a5f4d97c9 100644
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@@ -37,9 +37,8 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
 
   function ChangeB(params,type) {
     setVisible(false);
-    // let en = turnbar(params);
-    changeBranch(params);
-    setShowValue(type ? truncateCommitId(params) : params);
+    let en = turnbar(params);
+    changeBranch(en);
   }
 
   const menu = (
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 57cec0c87..ab9b9153d 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -303,7 +303,7 @@ function Index(props) {
           </div>
           <div>
             {isManager && <Link to={`/${owner}/${projectsId}/settings/branches`} className="btn-83" style={{width: '102px'}}><i className="iconfont icon-xuanzhongjibenshezhiicon font-14 mr5"></i>分支设置</Link>}
-            {(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) && <Button type='primary' onClick={addBranchBtn}>+ 新建分支</Button>}
+            {(projectDetail && projectDetail.type!==2) && <Button type='primary' onClick={addBranchBtn}>+ 新建分支</Button>}
           </div>
         </div>
         <Table
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index aadebd24c..9f83a55f4 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -275,8 +275,8 @@ class CreateMerge extends Component {
     let _url = `/${mergeOwner}/${projectId}/compare/`;
     // type为pull时，pullBranch取value，否则取原有值
     // type为pull时，mergeBranch取原有值，否则取value
-    let _pullBranch = type === 'pull' ? value : pullBranch;
-    let _mergeBranch = type === 'pull' ? mergeBranch : value;
+    let _pullBranch = type === 'pull' ? value : returnbar(pullBranch);
+    let _mergeBranch = type === 'pull' ? returnbar(mergeBranch) : value;
     if (pullOwner === mergeOwner) {
       // 如果仓库相同, compare/目标分支...源分支
       _url += `${turnbar(_mergeBranch)}...${turnbar(_pullBranch)}`;
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index b06994207..dfa18df59 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -1,9 +1,9 @@
 import React, { Component, Fragment } from "react";
-// import { UnControlled as CodeMirror } from 'react-codemirror2';
-// import 'codemirror/addon/selection/active-line.js';
-// import 'codemirror/mode/javascript/javascript.js';
-// import 'codemirror/mode/clike/clike';
-// import 'codemirror/mode/css/css';
+import { UnControlled as CodeMirror } from 'react-codemirror2';
+import 'codemirror/addon/selection/active-line.js';
+import 'codemirror/mode/javascript/javascript.js';
+import 'codemirror/mode/clike/clike';
+import 'codemirror/mode/css/css';
 import UserSubmitComponent from "./UserSubmitComponent";
 // import CloudIDE from "./cloudIDE";
 import Editor from "react-monaco-editor";
@@ -63,16 +63,13 @@ class m_editor extends Component {
     return (
       <Fragment>
         <div className="branchTable" style={{border:"1px solid #eee"}}>
-          <Editor
-            height="400px"
-            language={language ? language : "plaintext"}
-            theme={"vs-grey"}
+          <CodeMirror
             placeholder="请输入内容"
             value={editorValue}
             options={editor_options}
             onChange={this.changeEditor}
-            editorWillMount={this.editorWillMount}
-          />
+            readOnly={readOnly}
+          /> 
         </div>
         {!readOnly && (
           <div className="editorBorderSubmitBox" style={{ padding: "20px" }}>
@@ -88,6 +85,7 @@ class m_editor extends Component {
               onEmpty={onEmpty}
               empty={empty}
               filename={filename}
+              changeValueFlag={this.props.content !== changeValue}
             ></UserSubmitComponent>
           </div>
         )}