From 131d8fa81ccef44dd26908881079feb2fa4a1e0d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 29 Nov 2021 14:01:23 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/AddProjectModal.jsx | 144 ++++++++++++++---------------
 src/forge/Head/header.scss         |   3 +
 src/forge/Main/tree/Index.jsx      |   2 +-
 src/forge/users/InfosUser.js       |   2 +-
 src/modules/tpm/TPMIndex.css       |   2 +-
 5 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/src/forge/Head/AddProjectModal.jsx b/src/forge/Head/AddProjectModal.jsx
index 81f1d27c..3dcb2d95 100644
--- a/src/forge/Head/AddProjectModal.jsx
+++ b/src/forge/Head/AddProjectModal.jsx
@@ -2,84 +2,82 @@ import React, { useState , forwardRef, useEffect } from 'react';
 import { Form , Modal , Input , Radio } from 'antd';
 import Axios from 'axios';
 import CheckProfile from '../Component/ProfileModal/Profile';
+function AddProjectModal(props){
+  const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
+  const [ visible , setVisible ] = useState(false);
 
-export default Form.create()(
-  forwardRef((props)=>{
-    const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
-    const [ visible , setVisible ] = useState(false);
-
-    useEffect(()=>{
-      if(!visible){
-        setFieldsValue({
-          code:undefined,
-          role:"developer"
-        })
-      }
-    },[visible])
-
-    function onOk() {
-      validateFields((error,values)=>{
-        if(!error){
-          const url = `/applied_projects.json`;
-          Axios.post(url,{
-            applied_project:{
-              ...values
-            }
-          }).then(result=>{
-            if(result && result.data){
-              setVisible(false);
-              props.showNotification("申请加入项目成功，等待审核!");
-            }
-          }).catch(error=>{})
-        }
+  useEffect(()=>{
+    if(!visible){
+      setFieldsValue({
+        code:undefined,
+        role:"developer"
       })
     }
-    function checkValue(rule, value, callback){
-      if(!value){
-        callback();
+  },[visible])
+
+  function onOk() {
+    validateFields((error,values)=>{
+      if(!error){
+        const url = `/applied_projects.json`;
+        Axios.post(url,{
+          applied_project:{
+            ...values
+          }
+        }).then(result=>{
+          if(result && result.data){
+            setVisible(false);
+            props.showNotification("申请加入项目成功，等待审核!");
+          }
+        }).catch(error=>{})
       }
+    })
+  }
+  function checkValue(rule, value, callback){
+    if(!value){
+      callback("请输入6位数的邀请码");
+    }else{
       if(value.length < 6 || value.length > 6){
         callback("请输入6位数的邀请码");
       }
-      callback();
-    }       
+    }
+  }       
 
-    return(
-      <React.Fragment>
-        <Modal
-          title="加入项目"
-          width="480px"
-          visible={visible}
-          centered={true}
-          onOk={onOk}
-          onCancel={()=>setVisible(false)}
-        >
-          <Form layout={'inline'} className="inviteForm">
-            <Form.Item label="项目邀请码">
-              {getFieldDecorator("code",{
-                rules:[
-                  {required:true,message:"请输入6位项目邀请码"},
-                  {validator:checkValue}
-                ]
-              })(
-                <Input placeholder="请输入6位项目邀请码" autoComplete={"off"} maxLength="6" style={{width:"300px"}}/>
-              )}
-            </Form.Item>
-            <Form.Item label="选择角色">
-              {getFieldDecorator("role",{
-                rules:[{required:true,message:"请选择角色"}]
-              })(
-                <Radio.Group defaultValue={"developer"}>
-                  <Radio value="manager">管理员</Radio>
-                  <Radio value="developer">开发者</Radio>
-                  <Radio value="reporter">报告者</Radio>
-                </Radio.Group>
-              )}
-            </Form.Item>
-          </Form>
-        </Modal>
-        <CheckProfile {...props} sureFunc={()=>setVisible(true)}>加入项目</CheckProfile>
-      </React.Fragment>
-    )
-  })
-)
\ No newline at end of file
+  return(
+    <React.Fragment>
+      <Modal
+        title="加入项目"
+        width="480px"
+        visible={visible}
+        centered={true}
+        onOk={onOk}
+        onCancel={()=>setVisible(false)}
+      >
+        <Form layout={'inline'} className="inviteForm">
+          <Form.Item label="项目邀请码">
+            {getFieldDecorator("code",{
+              rules:[
+                {required:true,message:" "},
+                {validator:checkValue}
+              ]
+            })(
+              <Input placeholder="请输入6位项目邀请码" autoComplete={"off"} maxLength={6} style={{width:"300px"}}/>
+            )}
+          </Form.Item>
+          <Form.Item label="选择角色">
+            {getFieldDecorator("role",{
+              rules:[{required:true,message:"请选择角色"}]
+            })(
+              <Radio.Group>
+                <Radio value="manager">管理员</Radio>
+                <Radio value="developer">开发者</Radio>
+                <Radio value="reporter">报告者</Radio>
+              </Radio.Group>
+            )}
+          </Form.Item>
+        </Form>
+      </Modal>
+      <CheckProfile {...props} sureFunc={()=>setVisible(true)}>加入项目</CheckProfile>
+    </React.Fragment>
+  )
+}
+export default Form.create()(forwardRef(AddProjectModal));
\ No newline at end of file
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index dbe640d5..bcdb9499 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -127,6 +127,9 @@
     width: 110px;
     text-align: right;
   }
+  .ant-form-explain{
+    position: absolute;
+  }
 }
 
 // 右上角小铃铛单独样式
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 2fc57434..714bf353 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -46,7 +46,7 @@ function Index(props) {
 
   return(
     <Spin spinning={isSpin}>
-      <div style={{paddingTop:"10px",minHeight:"400px"}}>
+      <div style={{paddingTop:"10px",minHeight:"400px",paddingBottom:"30px"}}>
         {
           list && list.length>0 && list.map((item,key)=>{
             return(
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index bcfd75ff..fff3685e 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -147,7 +147,7 @@ class InfosUser extends Component {
 
       let list = button_lists.map((item, key) => {
         return (
-          <span key={key} className="pr15">
+          <span key={key} className={`pr15`}>
             <Button
               type={
                 (category && category === item.type) || (!category && !item.type)
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index 4e2aceab..8701a8aa 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -19,7 +19,7 @@ body>.-task-title {
   min-width: 1200px;
   max-width: unset;
   height: 100%;
-  min-height: 100%;
+  min-height: 70vh;
   overflow: hidden;
 }
 .newHeaders{

From 8b4fc88b1d6e1666fab8a2561a2e34478b45c711 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Mon, 1 Nov 2021 14:11:39 +0800
Subject: [PATCH 2/5] =?UTF-8?q?merge=20=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98=E2=80=98=20=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Newfile/index.css   | 14 ++++++++++++-
 src/forge/Newfile/m_editor.js | 37 +++++++++++++++++------------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/forge/Newfile/index.css b/src/forge/Newfile/index.css
index 746febe5..0bda4711 100644
--- a/src/forge/Newfile/index.css
+++ b/src/forge/Newfile/index.css
@@ -1,3 +1,11 @@
+.editorBorderBox .CodeMirror
+{
+  height: unset;
+}
+.editorBorderBox .CodeMirror .CodeMirror-scroll{
+  min-height: 300px;
+}
+
 .setInputAddon{
   width: 350px;
   margin-right: 20px;
@@ -9,12 +17,16 @@
   border-right: none!important;
 }
 .editorBorder .editorBorderBox{
-  border:1px solid #eee;
+  border:1px solid #d0d0d0;
   border-radius: 2px;
+  border-bottom: none;
 }
 .editorBorder .editorBorderSubmitBox{
   padding:20px 0px!important;
 }
+.editorBorderSubmitBox{
+  border-top: 1px solid #d0d0d0;
+}
 .userScrew{
   margin:20px 0px;
   border:1px solid #f4f4f4;
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 13d2ec46..8e90d51f 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -1,6 +1,10 @@
 import React, { Component } from "react";
 import Editor from "react-monaco-editor";
-// import {UnControlled as CodeMirror} from 'react-codemirror2'
+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";
 
@@ -12,6 +16,7 @@ class m_editor extends Component {
     super(props);
     this.state = {
       editorValue: this.props.content,
+      changeValue:this.props.content,
       prevHeight:0
     };
   }
@@ -22,14 +27,14 @@ class m_editor extends Component {
       })
     }
   }
-  changeEditor = (editorValue) => {
+  changeEditor = (editorValue,data) => {
     this.setState({
-      editorValue,
+      changeValue:editorValue.getValue(),
     });
   };
 
   render() {
-    const { editorValue } = this.state;
+    const { editorValue , changeValue } = this.state;
     const { readOnly, editorType, language , currentBranch , descName } = this.props;
     const editor_options = {
       lineNumbers: "on",
@@ -91,11 +96,10 @@ class m_editor extends Component {
       updateEditorHeight(); // typing
   };
 
-
     return (
       <React.Fragment>
         <div className="editorBorderBox">
-          <Editor
+          {/* <Editor
             language={language ? language : "plaintext"}
             theme={"vs-grey"}
             placeholder="请输入内容"
@@ -104,26 +108,21 @@ class m_editor extends Component {
             onChange={this.changeEditor}
             editorWillMount={this.editorWillMount}
             editorDidMount={handleEditorMount}
-          />
-          {/* <CodeMirror
-            value={editorValue}
-            options={{
-              theme: 'monokai',
-              mode: 'JavaScript',
-              extraKeys: {"Ctrl": "autocomplete"},//ctrl可以弹出提示
-              styleActiveLine: true,
-              lineNumbers: true,
-              readOnly:true
-            }}
           /> */}
+          <CodeMirror
+            placeholder="请输入内容"
+            value={editorValue}
+            options={editor_options}
+            onChange={this.changeEditor}
+          />
         </div>
         {!readOnly && (
-          <div className="editorBorderSubmitBox" style={{marginTop:"20px",padding:"20px"}}>
+          <div className="editorBorderSubmitBox" style={{padding:"20px"}}>
             <UserSubmitComponent
               {...this.props}
               {...this.state}
               filepath={`${this.props.filepath}`}
-              content={editorValue}
+              content={changeValue}
               editor_type={editorType}
               currentBranch={currentBranch}
               descName={descName}

From a3b943f74430f962527578b63aa92e6fbf1c39b3 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Mon, 1 Nov 2021 17:08:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8C=E4=B8=8A-=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E9=80=89=E4=B8=AD=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 8e90d51f..d4446e3f 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -1,5 +1,4 @@
 import React, { Component } from "react";
-import Editor from "react-monaco-editor";
 import {UnControlled as CodeMirror} from 'react-codemirror2';
 import 'codemirror/addon/selection/active-line.js';
 import 'codemirror/mode/javascript/javascript.js';
@@ -35,10 +34,10 @@ class m_editor extends Component {
 
   render() {
     const { editorValue , changeValue } = this.state;
-    const { readOnly, editorType, language , currentBranch , descName } = this.props;
+    const { readOnly, editorType, currentBranch , descName } = this.props;
     const editor_options = {
       lineNumbers: "on",
-      wordWrap: true, //强制换行
+      lineWrapping: true, //强制换行
       selectOnLineNumbers: true,
       lineHeight: 24,
       renderLineHighlight: "line",
@@ -51,64 +50,15 @@ class m_editor extends Component {
       automaticLayout: true, // 自适应布局
       overviewRulerBorder: false, // 不要滚动条的边框
       scrollBeyondLastLine: false, // 取消代码后面一大段空白
+      styleActiveLine:true,//光标代码高亮
       minimap: {
         // 不要小地图
         enabled: false,
       },
     };
-
-    const handleEditorMount = (editor, monaco) => {
-      editor.onDidChangeModelDecorations(() => {
-          requestAnimationFrame(updateEditorHeight); // folding
-      });
-
-      const updateEditorHeight = () => {
-          const editorElement = editor.getDomNode();
-
-          if (!editorElement) {
-              return;
-          }
-
-          const padding = 40;
-
-          const lineHeight = editor.getOption(
-              monaco.editor.EditorOption.lineHeight
-          );
-
-          const lineCount = editor.getModel().getLineCount() || 1;
-          let height =
-              editor.getTopForLineNumber(lineCount + 1) +
-              lineHeight +
-              padding ;
-
-          if(height<400){height = 400;} 
-
-          if (this.state.prevHeight !== height) {
-            this.setState({
-              prevHeight:height
-            })
-              // setPrevHeight(height);
-              editorElement.style.height = `${height}px`;
-              editor.layout();
-          }
-      };
-
-      updateEditorHeight(); // typing
-  };
-
     return (
       <React.Fragment>
         <div className="editorBorderBox">
-          {/* <Editor
-            language={language ? language : "plaintext"}
-            theme={"vs-grey"}
-            placeholder="请输入内容"
-            value={editorValue}
-            options={editor_options}
-            onChange={this.changeEditor}
-            editorWillMount={this.editorWillMount}
-            editorDidMount={handleEditorMount}
-          /> */}
           <CodeMirror
             placeholder="请输入内容"
             value={editorValue}

From 2f8822738843bf4db635774189ebeb2a14851548 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 29 Nov 2021 14:35:05 +0800
Subject: [PATCH 4/5] devops-name update

---
 src/forge/DevOps/About.jsx | 4 ++--
 src/forge/users/Infos.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index 31ced220..e23a82c3 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -171,10 +171,10 @@ function About(props, ref) {
           <div className="noOperation">DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。</div>:""
         }
         <a href={"https://forum.trustie.net/forums/3110/detail"} target="_blank" style={{ color: "#5091FF"}}>
-          了解什么是DevOps？
+          了解什么是引擎？
         </a>
         <a href={"https://forum.trustie.net/forums/3080/detail"} target="_blank" style={{ color: "#5091FF"}}>
-          如何使用DevOps？
+        如何使用引擎（Engine）功能？
         </a>
         {
           AuthorLogin === CurrentLogin ?
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 0df0d910..00b03310 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -297,7 +297,7 @@ class Infos extends Component {
                   }
                   {
                     current_user && current_user.login && current_user.login === username ?
-                    <Menu.Item key="4"><Link to={`/${user && user.login}/devops/CIService`}><i className="iconfont icon-gongzuoliu1"></i>DevOps工作流</Link></Menu.Item>
+                    <Menu.Item key="4"><Link to={`/${user && user.login}/devops/CIService`}><i className="iconfont icon-gongzuoliu1"></i>DevOps引擎</Link></Menu.Item>
                     :""
                   }
                   <Menu.Item key="5">

From d6b0eee0672209b80dd2d7003f9cdd5615a4b220 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 29 Nov 2021 16:25:55 +0800
Subject: [PATCH 5/5] update

---
 src/forge/Main/CoderDepot.jsx  | 2 +-
 src/forge/Order/order.js       | 1 +
 src/forge/Settings/new_tags.js | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index a00deb20..f104d711 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -340,7 +340,7 @@ function CoderDepot(props){
 
   function createIssue(){
     if(baseOper){
-      window.open(`/${owner}/${projectsId}/issues/new`,'_blank');
+      props.history.push(`/${owner}/${projectsId}/issues/new`);
     }else{
       props.showLoginDialog(`/${owner}/${projectsId}/issues/new`);
     }
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 3508b282..5b4458f1 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -226,6 +226,7 @@ class order extends Component {
 
   // 翻页
   ChangePage = (page) => {
+    window.scrollTo(0,0);
     this.setState({
       isSpin: true,
       checkedValue: [],
diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js
index ed9269cb..1c91a0ac 100644
--- a/src/forge/Settings/new_tags.js
+++ b/src/forge/Settings/new_tags.js
@@ -445,7 +445,7 @@ class NewTags extends Component {
                         message: "请填写标记名字",
                       },
                     ],
-                  })(<Input placeholder="名称，10字以内" maxLength="10" />)}
+                  })(<Input placeholder="名称，15字以内" maxLength="15" />)}
                 </Form.Item>
 
                 <Form.Item className="inputcount">