From c71d8512dfd67b2495d7e92df1e98b93dfe8a03c Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 2 Feb 2021 09:49:03 +0800
Subject: [PATCH] issue

---
 src/forge/DevOps/Dispose.jsx              | 14 ++++++--------
 src/forge/DevOps/Dispose/PipelineName.jsx |  4 +++-
 src/forge/users/CIList.jsx                |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
index 4c8ca9ca7..88714d218 100644
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@@ -73,20 +73,18 @@ function Dispose(props){
       let eventA = event.split(",");
       let l = {pipeline_name,id,branch,event:eventA}
       setUpdateInfo(l);
+    }else{
+      setUpdateInfo(undefined);
     }
   }
 
   function onOk(pipeline_name,updateId,branch,event){
     if(pipeline_name){
       let eventStr = "";
-      if(event.indexOf(",")>-1){
-        for(var i = 0;i<event.length;i++){
-          eventStr +=event[i]+",";
-        }
-        eventStr = eventStr.substring(0,eventStr.length-1);
-      }else{
-        eventStr = event;
+      for(var i = 0;i<event.length;i++){
+        eventStr +=event[i]+",";
       }
+      eventStr = eventStr.substring(0,eventStr.length-1);
       if(!updateId){
         // 新增
         const url = `/ci/pipelines.json`;
@@ -136,7 +134,7 @@ function Dispose(props){
 
   // 模板管理
   function toModalManage(){
-    props.history.push(`/projects/cxt/DevOps-mo/devops/mould`);
+    props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
   }
 
   const operate = current_user && (permission && permission !== "Reporter");
diff --git a/src/forge/DevOps/Dispose/PipelineName.jsx b/src/forge/DevOps/Dispose/PipelineName.jsx
index 8826aee3f..3cf7f96ab 100644
--- a/src/forge/DevOps/Dispose/PipelineName.jsx
+++ b/src/forge/DevOps/Dispose/PipelineName.jsx
@@ -6,7 +6,7 @@ const EVENT = ["push","pull_request","tag","cron","custom","promote","rollback"]
 function PipelineName({visible,onCancel,onOk,value ,branchList}){
   const [ name , setName ] = useState(undefined);
   const [ branchValue , setBranchValue ] = useState(undefined);
-  const [ eventValue , setEventValue ] = useState(EVENT[0]);
+  const [ eventValue , setEventValue ] = useState([EVENT[0]]);
 
   useEffect(()=>{
     if(branchList && branchList.length>0){
@@ -19,6 +19,8 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
       setName(value.pipeline_name);
       setBranchValue(value.branch);
       setEventValue(value.event);
+    }else{
+      setName(undefined);
     }
   },[value])
 
diff --git a/src/forge/users/CIList.jsx b/src/forge/users/CIList.jsx
index 7d678b931..a4e0331ca 100644
--- a/src/forge/users/CIList.jsx
+++ b/src/forge/users/CIList.jsx
@@ -62,7 +62,7 @@ function CIList(props){
                 return(
                   <li key={key}>
                     <span>
-                      <Link to={`/projects/${item.author && item.author.login}/${item.identifier}${ item.open_devops ? "/devops/list":""}`}>{item.name}</Link>
+                      <Link to={`/projects/${item.author && item.author.login}/${item.identifier}${ item.open_devops ? "/devops/dispose":""}`}>{item.name}</Link>
                       { item.open_devops ? 
                         <span className="authTag green ml20">已激活</span>
                         :