-
+ { !update &&
+ {i.image_url && }
+ {
+ colorFlag ?
+ (
+ colorFlag === "2" ?
+
+ {i.name}
+
+ :
+ {i.name}
+ )
+ :
+ {i.name}
+ }
+ { !colorFlag && removeFlag && removeValueFunc(i.id)}>}
+ { colorFlag && removeFlag && removeValueFunc(i.id)} style={{display:'block',right:"19px",position:"absolute"}}>}
+
+ {
+ double && saveList && saveList.length>0?
+
+ :
+ -
+ {
+ saveList.map((i,k)=>{
+ return(
+
- + {i.name} + removeSaveFunc(i.id)}> + + ) + }) + } +
+
+ }
+ {
+ menus && menus.length >0?
+
+ :
+
+
+ }
+ {searchValue ? 暂无{placeholder}“{searchValue}”: `暂无${placeholder}`}
+
+
+ {
+ double &&
+
+ { onAdd &&
+ {setContent(true)}}>
+ 创建标记
+ }
+
+ {
+ double && (count<0 ?
+ 最多添加{double}个{placeholder}！
+ : +还可添加{double - count}个{placeholder}！
+ ) + } +
+
+
+
+ }
+ 0 ? "operatevalue color-grey-3":"operatevalue"} style={{display:colorFlag?"flex":"block"}}>{renderNames(selectValueList)}
+
+ ;
+ };
+
+ // 删除评论内容
+ function deleteComment(id){
+ axios.delete(`/v1/${owner}/${projectsId}/issues/${index}/journals/${id}`).then(res=>{
+ if(res && res.data && !res.data.status){
+ reloadComment();
+ message.success('删除成功');
+ }
+ })
+ }
+
+ // markdown 取消操作
+ function cancelMd(){
+ setShowEdit(false);
+ }
+
+ return(
+
+ )
+}
+export default IssueCommentList;
\ No newline at end of file
diff --git a/src/forge/Issues/Component/comments/list.scss b/src/forge/Issues/Component/comments/list.scss
new file mode 100644
index 000000000..be95b6e3d
--- /dev/null
+++ b/src/forge/Issues/Component/comments/list.scss
@@ -0,0 +1,205 @@
+.typeActionBox{
+ padding: 10px 20px 4px;
+ background-color:rgba(241, 243, 252, 0.55);
+ border-radius:4px;
+ .typeActionRadio{
+ color: #333;
+ display: inline-flex;
+ align-items: center;
+ margin-right: 25px;
+ &.ant-radio-wrapper-checked{
+ color: $primary-color;
+ }
+ }
+ .journalsCount{
+ color:#5e6685;
+ background-color:rgba(70, 106, 255, 0.09);
+ border-radius:10px;
+ display: inline-block;
+ padding: 0px 6px;
+ }
+}
+.commentUserImg{
+ height: 28px;
+ width: 28px;
+ border-radius: 50%;
+ object-fit: cover;
+}
+.issueCommentsBox{
+ .iconBackBox{
+ display: inline-block;
+ width:24px;
+ height:24px;
+ border-radius: 50%;
+ line-height: 24px;
+ text-align: center;
+ background-color:#f2f3f5;
+ }
+ .operationLog, .commentContentBox{
+ position: relative;
+ min-height: 62px;
+ display: flex;
+ >.flexCenter, >a{
+ z-index: 2;
+ }
+ &::before, &::after{
+ content: '';
+ width: 1px;
+ height: 50%;
+ position: absolute;
+ background: #eee;
+ left: 12px;
+ z-index: 1;
+ }
+ &::after{
+ background: #eee;
+ top: 50%;
+ }
+ }
+ .commentContentBox+.operationLog .operationCommentBor, .operationLog+.commentContentBox .commentOperationBor{
+ border-top: 1px solid #eee;
+ width: 98.5%;
+ position: absolute;
+ left: 12px;
+ }
+ .operationLog+.commentContentBox{
+ &>a, &>.commentContentRight{
+ margin-top: 25px;
+ }
+ }
+ .timeAgo{
+ color:#acb0bf;
+ }
+ .operationLog:last-child::after, .operationLog:first-child::before, .commentContentBox:last-child::after, &.justComment .commentContentBox::before, &.justComment .commentContentBox::after{
+ display: none;
+ }
+ .operationLog:first-child, .commentContentBox+.operationLog{
+ margin-top: -15px;
+ }
+ .commentContentBox:last-child::before{
+ height: 35%;
+ }
+ .flexCenter{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .commentRenderHtml.markdown-body p{
+ font-size: 14px !important;
+ }
+ .commentReply{
+ padding: 15px 0 0 20px;
+ background-color: rgba(238, 240, 246, 0.41);
+ &>div{
+ padding-bottom: 5px;
+ }
+ &+.commentReply>div{
+ margin-top: -15px;
+ padding-top: 15px;
+ border-top: 1px dashed #eee;
+ }
+ }
+ .opBox{
+ justify-content: flex-start;
+ // flex: 1;
+ // width: 100%;
+ }
+ .commentContentBox{
+ display: flex;
+ align-items: flex-start;
+ }
+ .commentContentRight{
+ flex: 1;
+ background-color:#fafafc;
+ border:1px solid rgba(42, 97, 255, 0.23);
+ border-radius:6px;
+ position: relative;
+ top: -6px;
+ padding: 10px 15px 16px;
+ width: 0;
+ &::before{
+ content: '';
+ display: block;
+ position: absolute;
+ top: 13px;
+ left: -14px;
+ width: 0;
+ height: 0;
+ overflow: hidden;
+ font-size: 0;
+ line-height: 0;
+ border: 7px;
+ border-style: solid;
+ border-color: transparent rgba(42, 97, 255, 0.23) transparent transparent;
+ }
+ &::after{
+ content: '';
+ display: block;
+ width: 0;
+ height: 0;
+ overflow: hidden;
+ font-size: 0;
+ line-height: 0;
+ border: 6px;
+ border-style: solid;
+ border-color: transparent #fafafc transparent transparent;
+ position: absolute;
+ top: 14px;
+ left: -11px;
+ }
+ }
+}
+.primaryColor, .primaryColor:link{
+ color: $primary-color;
+}
+.attachmentBox{
+ margin-top: -8px;
+}
+.color-grey-89{
+ color: #898d9d;
+}
+// 添加评论样式
+.unLoginComment{
+ height:58px;
+ line-height: 58px;
+ background-color:rgba(241, 243, 252, 0.55);
+ border-radius:4px;
+ color: rgba(84, 87, 103, 1);
+ .loginBtn{
+ color: $primary-color;
+ }
+}
+.quillFlagBox{
+ color: red;
+ margin-bottom: 5px !important;
+ height: 28px;
+}
+.addComments{
+ display: flex;
+ align-items: center;
+ background-color:rgba(241, 243, 252, 0.55);
+ border-radius:4px;
+ padding:7px 10px;
+ &>img{
+ height: 28px;
+ width: 28px;
+ border-radius: 50%;
+ margin-right: 13px;
+ }
+}
+.addCommentBox{
+ width: 100%;
+ height: 30px;
+ border: none;
+}
+.paginationIssueComment{
+ text-align: center;
+}
+.gotoComment{
+ background-color:rgba(241, 243, 252, 0.55);
+ border-radius:4px;
+ color: rgba(172, 176, 191, 1);
+ padding: 8px 20px;
+ margin-top: -10px;
+ &>a{color: rgba(70, 106, 255, 1);}
+}
\ No newline at end of file
diff --git a/src/forge/Issues/Component/copy.jsx b/src/forge/Issues/Component/copy.jsx
new file mode 100644
index 000000000..c10bf90e8
--- /dev/null
+++ b/src/forge/Issues/Component/copy.jsx
@@ -0,0 +1,22 @@
+import React ,{ useState } from 'react';
+import { Tooltip } from 'antd';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+
+
+function Copy({ children , value }){
+ const [ title , setTitle ] = useState("点击复制链接");
+ let host = window.location.hostname === "localhost" ? "testforgeplus.trustie.net" : window.location.hostname;
+ let protocol = window.location.protocol;
+ return(
+
+
+
+ {displayColorPicker ? (
+ {textcolor}
+
+
+ )
+}
+export default ColorCard;
\ No newline at end of file
diff --git a/src/forge/Issues/Component/comments/editComment.jsx b/src/forge/Issues/Component/comments/editComment.jsx
new file mode 100644
index 000000000..a0083d2fb
--- /dev/null
+++ b/src/forge/Issues/Component/comments/editComment.jsx
@@ -0,0 +1,165 @@
+import React from 'react';
+import { Button, message } from 'antd';
+import { getImageUrl } from 'educoder';
+import MDEditor from "../../../../modules/tpm/challengesnew/tpm-md-editor";
+import Upload from "../../../../forge/Upload/Index";
+import Attachments from "../../../../forge/Upload/attachment";
+import UploadImg from "../../../../forge/Images/upload.png";
+import './list.scss';
+import '../../../../forge/Order/order.scss';
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+
+function EditComment(props){
+ const {owner, projectsId, index} = props.match.params;
+ const {current_user, current_user:{login}, showLoginDialog, showNotification, reloadComment, cancelMd, parentId, replyId, updateId, showUserImg=true} = props;
+ const [content, setContent] = useState(props.content);
+ const [quillFlag, setQuillFlag] = useState(false);
+ // 确认评论按钮loading效果
+ const [journalSpin, setJournalSpin] = useState(false);
+ const [atWhoLoginList, setAtWhoLoginList] = useState(undefined);
+ const [fileList, setFileList] = useState(undefined);
+ const [attachmentClean, setAttachmentClean] = useState(true);
+ const [ save , setSave ] = useState(undefined);
+
+ useState(()=>{
+ setSave(props.defaultFileList);
+ },[props.defaultFileList])
+
+ // 评论点击函数
+ function addJournals(){
+ if(!content){
+ setQuillFlag(true);
+ return
+ }
+ setJournalSpin(true);
+ if(updateId){
+ // 修改评论
+ axios.patch(`/v1/${owner}/${projectsId}/issues/${index}/journals/${updateId}`,{
+ notes: content,
+ attachment_ids: fileList,
+ receivers_login:atWhoLoginList
+ }).then(res=>{
+ if(res && res.data){
+ // 刷新评论列表
+ reloadComment();
+ message.success('评论成功');
+ cancelMd();
+ setContent(undefined);
+ }
+ setJournalSpin(false);
+ })
+ }else{
+ // 新建评论
+ const params = {
+ parent_id: parentId,
+ reply_id: replyId,
+ notes: content,
+ attachment_ids: fileList,
+ receivers_login:atWhoLoginList
+ }
+ axios.post(`/v1/${owner}/${projectsId}/issues/${index}/journals`, params).then(res=>{
+ if(res && res.data){
+ // 刷新评论列表
+ reloadComment();
+ message.success('评论成功');
+ cancelMd();
+ setContent(undefined);
+ }
+ setJournalSpin(false);
+ })
+ }
+ };
+ function deleteLoad(id){
+ let arr = [];
+ let list = save;
+ if(list && list.length>0 ){
+ arr = list.filter(i=>i.id !== id);
+ }
+ setFileList(arr.map(i=>{return i.id}));
+ setSave(arr);
+ }
+ function UploadFunc(f){
+ let list = [];
+ let arr = [];
+ if(save && save.length>0 ){
+ arr = save.map(i=>{return i.id});
+ }
+ list = arr && arr.length>0 ? f.concat(arr) : f ;
+ setFileList(list);
+ };
+
+ return(
+ {setDisplayColorPicker(false)}} />
+
+ ) : null}
+
+
+ 
+
+
+ )
+}
+export default EditComment;
\ No newline at end of file
diff --git a/src/forge/Issues/Component/comments/list.jsx b/src/forge/Issues/Component/comments/list.jsx
new file mode 100644
index 000000000..afabf21a2
--- /dev/null
+++ b/src/forge/Issues/Component/comments/list.jsx
@@ -0,0 +1,242 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Popconfirm, Radio, Input, message, Tooltip, Spin, Pagination } from 'antd';
+import axios from 'axios';
+import { getImageUrl, timeAgo } from 'educoder';
+import RenderHtml from '../../../../components/render-html';
+import Attachment from '../../../Upload/attachment';
+import EditComment from './editComment';
+import Nodata from '../../../Nodata';
+import CheckProfile from '../../../Component/ProfileModal/Profile';
+import './list.scss';
+import { Link } from 'react-router-dom';
+
+function IssueCommentList(props){
+ const{history, history: {location}, reload, reloadComment, showNotification, current_user:{login, admin, image_url, user_id}, isManager, showLoginDialog, issueInfo:{author}} = props;
+ const {owner, projectsId, index} = props.match.params;
+ const [category, setCategory] = useState('comment');
+ const [journals, setJournals] = useState(undefined);
+ // 是否展示新建/编辑评论markdown部分新建评论1 编辑父级评论2 回复评论3 编辑回复内容4 回复子机评论5
+ const [showEdit, setShowEdit] = useState(false);
+ const [parentId, setParentId] = useState(undefined);
+ const [replyId, setReplyId] = useState(undefined);
+ // 修改评论id
+ const [updateId, setUpdateId] = useState(undefined);
+ // 操作日志展开效果
+ const [open, setOpen] = useState(undefined);
+ // 加载中效果（缓冲css 线条效果）
+ const [spin, setSpin] = useState(false);
+ // issue 评论总数
+ const [journalsCount, setJournalsCount] = useState(undefined);
+ // 分页
+ const limit = 50;
+ const [page, setPage] = useState(1);
+ const [totalCount, setTotalCount] = useState(undefined);
+ // 操作记录 icon
+ const journalsIcon ={
+ 'issue': 'icon-chuangjianqianbao',
+ 'branch_name': 'icon-fenzhi3',
+ 'assigner': 'icon-chengyuan2',
+ 'status_id': 'icon-xiugaibaobiaomoban',
+ 'fixed_version_id': 'icon-lichengbeiicon2',
+ 'due_date': 'icon-riqi',
+ 'issue_tag': 'icon-biaoji2',
+ 'description': 'icon-xiugaibaobiaomoban',
+ 'subject': 'icon-xiugaibaobiaomoban',
+ 'start_date': 'icon-riqi',
+ 'priority_id': 'icon-youxian',
+ 'attachment': 'icon-xiugaibaobiaomoban'
+ }
+
+ useEffect(()=>{
+ setSpin(true);
+ axios.get(`/v1/${owner}/${projectsId}/issues/${index}/journals`,{params:{
+ category,
+ page,
+ limit
+ }}).then(res=>{
+ if(res && res.data){
+ const {journals, total_comment_journals_count, total_count} = res.data;
+ if(category === 'all'){
+ const array = [];
+ let start = undefined;
+ let isJournalCount = 0;
+ journals.map((item, index)=>{
+ !isJournalCount && (start = index)
+ item.is_journal_detail && (isJournalCount++)
+ if(!item.is_journal_detail && isJournalCount < 10){
+ isJournalCount = 0;
+ return
+ }
+ if(isJournalCount >= 10 && (!item.is_journal_detail || journals.length-1 === index)){
+ array.push({start, count: isJournalCount});
+ isJournalCount = 0;
+ }
+ })
+ array.map((item, i)=>{
+ journals[item.start].numCount = item.count-1;
+ for (let index = 0; index < item.count; index++) {
+ journals[item.start+index].start = journals[item.start].id;
+ journals[item.start+index].closeAndSpan = true;
+ }
+ })
+ }
+ setTotalCount(total_count);
+ setJournalsCount(total_comment_journals_count);
+ setJournals(journals);
+ setSpin(false)
+ }
+ })
+ }, [reload, category, page])
+
+ function commentCtx(v){
+ return
+ {setQuillFlag(false);setContent(value);}}
+ isCanAtme = {true}
+ isQuoteIssue={true}
+ changeAtWhoLoginList = {(loginList)=>{setAtWhoLoginList(loginList); setAttachmentClean(true)}}
+ owner = {owner}
+ projectsId = {projectsId}
+ >
+
+ + {quillFlag && 请输入评论内容} +
++ + +
+
+ {/* 全部 / 评论 / 操作日志 */}
+
+
+
+ {totalCount>limit && 0 && 'pb15'}`}>
+
+ {/* 评论快速入口-仅有评论且登录时展示 */}
+ {login && category !== 'operate' && journalsCount > 0 &&
+ {setSpin(true);setPage(1);setCategory(e.target.value);history.push(history.pathname)}} value={category}>
+ 评论{journalsCount}
+ 操作日志
+ 全部
+
+
+ 0 && 'pt15'}`}>
}
+ {/* 评论/操作日志 展示列表 */}
+ 点击添加评论
+ {journals && (journals.length > 0 && journals.map(item=>{return item.is_journal_detail ? (!item.closeAndSpan || item.id === item.start || open === item.start) ?
: '' :
+ {/* 操作日志 */}
+
+
+
+
+ {(item.closeAndSpan && item.id === item.start) && {setOpen(open === item.id ? undefined : item.id)}}>{open === item.id ? `点击收起操作日志` : `已折叠${item.numCount}条, 点击查看`}}
+
+
+
+ {timeAgo(item.created_at)}
+
+ })
+ {item.user.name}
+ {(item.user.name.length + item.operate_content.length) > 62 ? {item.user.name}
}> : }
+
+ {/* 评论 */}
+
+
+
}))}
+
+ {/* 判断是否是编辑状态 */}
+ {(showEdit === 2 && updateId === item.id) ?
+
+
}
+ {showEdit === 3 && replyId === item.id &&
+
+
+
+
+ {item.user.name}
+ {timeAgo(item.created_at)}
+
+ {login &&
+ {/* 平台管理员/仓库管理员/发布评论者/issue创建者 */}
+ {(admin || isManager || login === item.user.login || user_id === author.id) && 0 ? '子评论也将被一起删除。' : ''}`}
+ okText="是"
+ cancelText="否"
+ onConfirm={() => deleteComment(item.id)}
+ >
+
+ }
+ {/* 仅评论者可修改 */}
+ {login === item.user.login && }
+ {setParentId(item.id); setReplyId(item.id); setShowEdit(3)}}>
+
}
+ {commentCtx(item.notes)}
+ {item && item.attachments && item.attachments.length > 0 &&
+ {(showEdit === 4 && updateId === i.id) ?
})}
+
+
}
+ {showEdit === 5 && replyId === i.id &&
+
+
+ })
+ {i.user.name}
+ {i.reply_user && 回复}
+ {i.reply_user && i.reply_user.name}
+ {timeAgo(i.created_at)}
+
+ {login &&
+ {/* 平台管理员/仓库管理员/发布评论者/回复评论者/issue创建者 */}
+ {(admin || isManager || login === i.user.login || (i.reply_user && login === i.reply_user.login) || user_id === author.id) && deleteComment(i.id)}
+ >
+
+ }
+ {/* 仅回复评论者可修改 */}
+ {login === i.user.login && }
+ {setParentId(item.id);setReplyId(i.id); setShowEdit(5)}}>
+
+
+
}
+ {commentCtx(i.notes)}
+ {i && i.attachments && i.attachments.length > 0 &&
+ setPage(page)}/>
+
}
+ {/* 添加评论 */}
+ {category !== 'operate' &&
+ {login ? showEdit === 1 ? :
}
+
+ })
+
:
+ {setShowEdit(1)}}>
+
+
+
+
+ {/* 未登录用户 */}
+ {showLoginDialog()}}>登录并参与评论与回复
+
}
+
+
+ )
+}
+export default Datas;
\ No newline at end of file
diff --git a/src/forge/Issues/Component/date.jsx b/src/forge/Issues/Component/date.jsx
new file mode 100644
index 000000000..bd4f00a9a
--- /dev/null
+++ b/src/forge/Issues/Component/date.jsx
@@ -0,0 +1,149 @@
+import React,{useRef,useEffect, useState , forwardRef } from 'react';
+import { Dropdown , Calendar , Select, Radio, Col, Row } from 'antd';
+import { findDOMNode } from 'react-dom';
+import moment from 'moment';
+const { Group , Button } = Radio;
+
+function Date({name , today , setDate , editFlag},ref){
+ const [ visible , setVisible ] = useState(false);
+ const [ time , setTime ] = useState();
+
+ useEffect(()=>{
+ if(today){
+ setTime(today);
+ }
+ },[today])
+
+ const refFa = useRef(null);
+ const refBox = useRef(null);
+
+ useEffect(()=>{
+ if(!visible && !editFlag && (time && time !== today)){
+ setDate(time);
+ }
+ },[visible,editFlag,time])
+
+
+ useEffect(() => {
+ document.addEventListener('click', clickMe , false);
+ }, [])
+
+ const clickMe = ({ target }) => {
+ // 查找父组件
+ const faComponent = findDOMNode(refFa.current);
+ const boxComponent = findDOMNode(refBox.current);
+ if (faComponent && boxComponent) {
+ const isChild = faComponent.contains(target);
+ const isBox = boxComponent.contains(target);
+ let role = target.getAttribute("role");
+ if(!isChild && !isBox && !(role && role === "option")){
+ setVisible(false);
+ }
+ }
+ }
+ function onSelect(t){
+ setTime(moment(t).format('YYYY-MM-DD'));
+ setDate(moment(t).format('YYYY-MM-DD'));
+ setVisible(false);
+ }
+ const overlay=(
+
+ {checkbox}
+
+
+
+
+ {item.priority_name}
+ {/* 
*/}
+ {item.subject}
+ {
+ item.tags && item.tags.length>0?
+ item.tags.map((i,k)=>{
+ return(
+ {i.name}
+ )
+ })
+ :""
+ }
+
+
+
+
+ 
{item.blockchain_token_num}}
+ {item.milestone_name &&
+ {window.scrollTo(0,0)}} style={{maxWidth:item.blockchain_token_num ? "261px":"340px",color:"#898d9d"}} title={item.milestone_name} className="task-hide mr20">
+
+ {item.milestone_name}
+
+ }
+ {item.test_case}
+
+
+ { item.project_issues_index &&
+ #{item.project_issues_index}
+ }
+
+
+ {item.author && item.author.name}
+ {item.created_at} 发布
+ {item.updated_at}更新
+ {item.blockchain_token_num &&
+ {
+ item.assigners && item.assigners.length > 0 ?
+
+
+ :""
+ }
+
+ 1 ?"principal hovers":"principal"}>
+ {/* {
+ item.assigners.map((i,k)=>{
+ return(
+ k<5 && })
+ )
+ })
+ } */}
+ {renderName(item.assigners)}
+
+ {item.status_name}
+
+ {item.comment_journals_count}
+
+
+ {
+ const start = 0;
+ const end = 12;
+ const monthOptions = [];
+ const current = value.clone();
+ const localeData = value.localeData();
+ const months = [];
+ for (let i = 0; i < 12; i++) {
+ current.month(i);
+ months.push(localeData.monthsShort(current));
+ }
+
+ for (let index = start; index < end; index++) {
+ monthOptions.push(
+
+ {months[index]}
+ ,
+ );
+ }
+ const month = value.month();
+
+ const year = value.year();
+ const options = [];
+ for (let i = year - 10; i < year + 10; i += 1) {
+ options.push(
+
+ {i}
+ ,
+ );
+ }
+ return (
+
+ )
+ return(
+
+
+
+ {console.log("typyCHange:",e);onTypeChange(e.target.value)}} value={type}>
+
+
+
+
+
+
+ );
+ }}
+ onSelect={onSelect}
+ />
+ {time || "未设置"}
+
+
+
+ { content ?
+ content
+ :
+
+ }
+
+
+ 您确定要删除所有选中的疑修？
此操作将清空所有已选中的疑修，请谨慎操作
+ {i.image_url && }
+ {
+ colorFlag ?
+ (
+ colorFlag === "2" ?
+ {i.name}
+ :
+ {i.name}
+ )
+ :
+ {i.name}
+ }
+ { removeFlag && showRemoveFunc(i.id || i.name)}>}
+
+
+ }
+ {
+ menus && menus.length >0?
+
+ :
+
+
+ }
+ { onAdd && }
+
+ }>
+ {searchValue ? 暂无{placeholder}“{searchValue}”: `暂无${placeholder}`}
+ 0 ? "operatevalue color-grey-3":"operatevalue"}>{renderNames(selectValueList)}
+
+ { size !== "small" &&
+ searchFunc(e.target.value)}/>
+ }
+ {
+ data && data.length>0 ?
+
+ :
+
+ }
+ return(
+ 暂无{ids ? '{name}': name}
+ }
+
+
+
+
+
+
+
+
+ 您确定要删除当前疑修？
+
+ :
+
+
+ }
+
+
+
+
+
+
+ {
+ details.user_permission &&
+
+ {details.priority && { details.priority.name } }
+
+ {details.subject}
+
+
+
+ #{details.project_issues_index}
+
+ {
+ details.author &&
+
+ })
{details.author.name}
+ 添加于{details.created_at}
+
+ }
+ -
+
- setEdit(true)}>编辑 +
- 复制 +
- setDelVisible(true)}>删除 +
+ {desc ?
+
+
+ {setCommentReload(Math.random())}}/>
+
+
+ {orderId && {setCharge(value)}}
+ headImg
+ selectValueList={assigner_choose}
+ editFlag={editFlag}
+ chooseFunc={(list)=>{setAssigner_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(l);}}
+ double={5}
+ removeFlag={!editFlag}
+ />
+ {setStatus_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,l);}}
+ />
+ {setPrioritie_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,l);}}
+ />
+ {setTag(value)}}
+ selectValueList={tag_choose}
+ chooseFunc={(list)=>{setTag_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,undefined,l);}}
+ double={3}
+ colorFlag="2"
+ removeFlag={!editFlag}
+ editFlag={editFlag}
+ onAdd={permission && permission !== "Reporter" ? ()=>{getSign();} :false}
+ owner={owner}
+ projectsId={projectsId}
+ />
+ {setMillstone(value)}}
+ selectValueList={millstone_choose}
+ editFlag={editFlag}
+ auto
+ chooseFunc={(list)=>{setMillstone_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,undefined,undefined,l);}}
+ />
+ {setBranch(value)}}
+ selectValueList={branch_choose}
+ editFlag={editFlag}
+ chooseFunc={(list)=>{setBranch_choose(list);let l = list && list.length>0 ?list.map(i=>{return i.id || i.name}):[];saveForeach(undefined,undefined,undefined,undefined,undefined,l);}}
+ />
+ {
+ open_blockchain &&
+
+
+ 悬赏金额
+ {/* {!editFlag && } */}
+
+
+ }
+ setCaseValue(v)} onBlur={(v)=>saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,undefined,undefined,undefined,v)}/>
+ {setStartDate(date);saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,date)}} editFlag={editFlag}/>
+ {setDueDate(date);saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,undefined,date)}} editFlag={editFlag}/>
+
+
+ setVisible(false)} onSuccess={onSuccess}/>
+
+ )
+}
+export default List;
\ No newline at end of file
diff --git a/src/forge/Issues/Pages/new.jsx b/src/forge/Issues/Pages/new.jsx
new file mode 100644
index 000000000..b40307380
--- /dev/null
+++ b/src/forge/Issues/Pages/new.jsx
@@ -0,0 +1,306 @@
+import React , { useEffect , useState , forwardRef , useRef } from 'react';
+import { Form , InputNumber } from 'antd';
+import { Box , LongWidth } from '../../Component/layout';
+import DropMenu from '../Component/dropMenu';
+import ChooseMenu from '../Component/chooseMenu';
+import AddTagsBox from '../Component/addTagsBox';
+import Date from '../Component/date';
+import NewPanel from '../Component/newPanel';
+import axios from 'axios';
+import CaseDrop from '../Component/caseDrop';
+
+function New(props){
+ // history search 是否含有意见反馈标识
+ const {location:{search}, projectDetail} = props;
+ const feedBack = search && search.indexOf('type=feedback') !== -1;
+ // 里程碑id
+ const milepostId = props.match.params.milepostId;
+
+
+ const [ statusList , setStatusList ] = useState([]);
+ const [ prioritiesList , setPrioritiesList ] = useState([]);
+ const [ chargeList , setChargeList ] = useState([]);
+ const [ charge , setCharge ] = useState(undefined);
+ const [ millstoneList , setMillstoneList ] = useState([]);
+ const [ millstone , setMillstone ] = useState(undefined);
+ const [ tagList , setTagList ] = useState(undefined);
+ const [ tag , setTag ] = useState(undefined);
+ const [ branchList , setBranchList ] = useState(undefined);
+ const [ branch , setBranch ] = useState(undefined);
+
+
+ const [ assigner_choose , setAssigner_choose ] = useState([]);
+ const [ prioritie_choose , setPrioritie_choose ] = useState([]);
+ const [ status_choose , setStatus_choose ] = useState([]);
+ const [ tag_choose , setTag_choose ] = useState([]);
+ const [ millstone_choose , setMillstone_choose ] = useState([]);
+ const [ branch_choose , setBranch_choose ] = useState([]);
+ const [ caseValue, setCaseValue ] = useState(undefined);
+
+ const [ start_date, setStartDate ] = useState("");//moment().format('YYYY-MM-DD')
+ const [ due_date, setDueDate ] = useState("");
+
+ const [ rewardAmount , setRewardAmount ] = useState(undefined);
+
+ const owner = props.match.params.owner;
+ const projectsId = props.match.params.projectsId;
+ const permission = props && props.projectDetail && props.projectDetail.permission;
+ const { open_blockchain } = props;
+ const ref = useRef(null);
+
+ useEffect(()=>{
+ if(projectDetail){
+ if(feedBack){
+ document.title = `意见反馈`;
+ return;
+ }
+ const { author, name} = projectDetail;
+ document.title = `新建疑修-${author.name}/${name}`
+ }
+ },[projectDetail, feedBack])
+
+ useEffect(()=>{
+ if(milepostId){
+ getMillstone(milepostId);
+ }
+ },[milepostId])
+
+
+ // 获取状态列表
+ useEffect(()=>{
+ getStatus();
+ },[])
+ function getStatus(){
+ const url = `/v1/${owner}/${projectsId}/issue_statues`;
+ axios.get(url).then(result=>{
+ if(result && result.data){
+ let status = result.data.statues;
+ setStatusList(status);
+ if(status && status.length>0){
+ setStatus_choose(status.filter(i=>i.id === 1));
+ }
+ }
+ })
+ }
+ // 获取优先级列表
+ useEffect(()=>{
+ getPriorities();
+ },[])
+
+ function getPriorities(){
+ const url = `/v1/${owner}/${projectsId}/issue_priorities`;
+ axios.get(url).then(result=>{
+ if(result && result.data){
+ let priorities = result.data.priorities;
+ let array =[];
+ let colors = ["#1abcb1","#28be6c","#e67e22","#db3d1d"];
+ if(priorities && priorities.length>0){
+ array = priorities.map((i,k)=>{
+ let arr = {...i,color:colors[k]}
+ return arr;
+ })
+ }
+ setPrioritiesList(array);
+ setPrioritie_choose(array.filter(i=>i.id === 2));
+ }
+ })
+ }
+
+ // 获取负责人列表
+ useEffect(()=>{
+ getCharge();
+ },[charge])
+
+ function getCharge(){
+ const url = `/v1/${owner}/${projectsId}/collaborators`;
+ axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{
+ if(result && result.data){
+ setChargeList(result.data.collaborators);
+ if(feedBack && !charge){
+ // 指定指派成员-意见反馈
+ const {collaborators} = result.data;
+ const id = collaborators.filter(item=>item.id === 86107);
+ setAssigner_choose(id.length === 0 ? [collaborators[0]] : id)
+ }
+ }
+ })
+ }
+ // 获取里程碑列表
+ useEffect(()=>{
+ getMillstone(millstone);
+ },[millstone])
+
+ function getMillstone(keyword){
+ const url = `/v1/${owner}/${projectsId}/milestones`;
+ axios.get(url,{params:{keyword,only_name:true}}).then(result=>{
+ if(result && result.data){
+ let milestones = result.data.milestones;
+ if(milepostId && milepostId === keyword){
+ setMillstone_choose(milestones);
+ }else{
+ setMillstoneList(milestones);
+ }
+ }
+ })
+ }
+ // 获取标记列表
+ useEffect(()=>{
+ getSign();
+ },[tag])
+ function getSign(){
+ const url = `/v1/${owner}/${projectsId}/issue_tags`;
+ axios.get(url,{params:{keyword:tag,only_name:true}}).then(result=>{
+ if(result && result.data){
+ setTagList(result.data.issue_tags);
+ }
+ })
+ }
+ // 获取标记列表
+ useEffect(()=>{
+ getBranch(branch);
+ },[branch])
+ function getBranch(branch){
+ if(branch){
+ let b = [...branchList];
+ let l = b.filter(i=>i.name.indexOf(branch)>-1);
+ setBranchList(l);
+ return ;
+ }
+ const url = `/${owner}/${projectsId}/branches.json`;
+ axios.get(url,{params:{keyword:tag}}).then(result=>{
+ if(result && result.data){
+ setBranchList(result.data);
+ }
+ })
+ }
+
+
+ // 创建
+ function createFunc(values,fileList,receivers_login,description){
+ const { subject } = values;
+ const url = `/v1/${owner}/${projectsId}/issues`;
+ let b = branch_choose && branch_choose.length>0 ? branch_choose.map(i=>{return i.name}) :undefined;
+ let t = tag_choose && tag_choose.length>0 ? tag_choose.map(i=>{return i.id}) :undefined;
+ let a = assigner_choose && assigner_choose.length>0 ? assigner_choose.map(i=>{return i.id}) :undefined;
+ let m = millstone_choose && millstone_choose.length>0 ? millstone_choose.map(i=>{return i.id}) :undefined;
+ let p = prioritie_choose && prioritie_choose.length>0 ? prioritie_choose.map(i=>{return i.id}) :undefined;
+ let s = status_choose && status_choose.length>0 ? status_choose.map(i=>{return i.id}) :undefined;
+ axios.post(url,{
+ description,subject,
+ branch_name:b && b.join(","),
+ status_id:s && s.join(","),
+ priority_id:p && p.join(","),
+ milestone_id:m && m.join(","),
+ issue_tag_ids:t,
+ assigner_ids:a,
+ attachment_ids:fileList,
+ start_date,due_date,receivers_login,
+ blockchain_token_num:rewardAmount,
+ test_case:caseValue
+ }).then(result=>{
+ if(result && result.data && result.data.project_issues_index){
+ window.scrollTo(0,0);
+ props.showNotification("任务创建成功！");
+ props.history.push(`/${owner}/${projectsId}/issues/${result.data.project_issues_index}`);
+ }
+ }).catch(error=>{})
+ }
+
+
+ function changeAmount(value){
+ if(value && value > 0){
+ setRewardAmount(value);
+ }
+ if(!value){
+ setRewardAmount(value);
+ }
+ }
+ return(
+
+
+
+ {
+ (current_user && current_user.login) &&
+
+
+ {aboutMe === "all" ? "全部":aboutMe === "aboutme"?"与我相关":aboutMe === "assignedme"?"我负责的":aboutMe === "authoredme"?"我创建的":"@我的"}
+
+ }
+ setKeyword(value)}
+ style={{ width: 354 , height : 32 }}
+ allowClear
+ />
+ {
+ clearFlag &&
+
+ 清除筛选条件
+ }
+
+
+
+ {
+ permission && permission !== "Reporter" &&
+ 
标记管理
+ }
+ {props.history.push(`/${owner}/${projectsId}/issues/new`)}} checklogin className="operateButton ml20">创建疑修
+
+
+ 
+ )
+ }
+ {
+ total > 0 &&
+
+
+
+ {
+ total > defaultLimit &&
+
+ }
+ {total === undefined &&
+
+
+ {
+ total === 0 &&
+ (!has_created_issues ?
+
+
+ -
+
- {changeCategory("all")}}>全部{issueTotal} +
- {changeCategory("opened")}}>开启中{openedCount} +
- {changeCategory("closed")}}>已关闭{closedCount} +
+ 0}
+ owner={owner}
+ projectsId={projectsId}
+ chooseFunc={chooseFunc}
+ defaultNames={names}
+ defaultIds={allValue && allValue.length>0 ? undefined : updateIds}
+ open_blockchain={open_blockchain}
+ />
+ {
+ allValue && allValue.length>0 ?
+
+
+
+
+
+
+ :""
+ }
+
+ 
+
+ :
+ 欢迎使用疑修(Issue)
+疑修用于记录与跟踪待办事项、项目bug、功能需求等。在使用之前，请您先
+ {issueList.map((item,key)=>{
+ return(
+ }
+ item={item}
+ owner={owner}
+ projectsId={projectsId}
+ />
+ )
+ })
+ }
+
+
+
+ }
+
+
+
+ {/* 意见反馈初始化内容 */}
+
+
+
+ )
+}
+export default Form.create()(forwardRef(New));
\ No newline at end of file
diff --git a/src/forge/Issues/Pages/sign.jsx b/src/forge/Issues/Pages/sign.jsx
new file mode 100644
index 000000000..be3abaf0e
--- /dev/null
+++ b/src/forge/Issues/Pages/sign.jsx
@@ -0,0 +1,267 @@
+import React , { useEffect , useState } from 'react';
+import create from '../Img/create.png';
+import { Menu , Dropdown , Icon, Input, Button , Spin , Pagination } from 'antd';
+import ColorCard from '../Component/colorCard';
+import DelBox from '../Component/delBox';
+import axios from 'axios';
+import {Link} from 'react-router-dom';
+const limit = 15;
+function Sign(props){
+ const [ edit , setEdit ] = useState(false);
+ const [ colors , setColors ] = useState(undefined);
+ const [ delVisible , setDelVisible ] = useState(false);
+ const [ editId , setEditId ] = useState(undefined);
+ const [ list , setList ] = useState(undefined);
+ const [ total , setTotal ] = useState(undefined);
+ const [ page , setPage ] = useState(1);
+
+ const [ name , setName ] = useState(undefined);
+ const [ desc , setDesc ] = useState(undefined);
+ const [ order_name , setOrderName ] = useState(undefined);
+ const [ order_type , setOrderType ] = useState(undefined);
+ const [ nameFlag , setNameFlag ] = useState(undefined);
+ const [ defaultColor , setDefaultColor ]= useState(undefined);
+
+ const [ arrayName , setArrayName ] = useState("标记");
+ const [ key , setKey ] = useState("0");
+ const owner = props.match.params.owner;
+ const projectsId = props.match.params.projectsId;
+ const { projectDetail } = props;
+ const permission = projectDetail && props.projectDetail.permission;
+
+
+ useEffect(()=>{
+ if(permission !== undefined){
+ if(!permission || (permission && permission === "Reporter")){
+ window.location.href = "/403";
+ }
+ }
+ },[permission])
+
+ useEffect(()=>{
+ if(projectDetail){
+ const { author, name } = projectDetail;
+ document.title = `项目标记-${author.name}/${name}`;
+ }
+ },[projectDetail])
+
+ useEffect(()=>{
+ Init();
+ },[page,order_name,order_type])
+
+ function Init(){
+ const url = `/v1/${owner}/${projectsId}/issue_tags`;
+ axios.get(url,{
+ params:{
+ page,limit,sort_by:order_name,sort_direction:order_type
+ }
+ }).then(result=>{
+ if(result && result.data){
+ setList(result.data.issue_tags);
+ setTotal(result.data.total_count);
+ }
+ })
+ }
+
+ function arrayList(e){
+ const { eventKey , value , children , createName } = e.item.props;
+ setPage(1);
+ if(value === order_type && createName === order_name){
+ setOrderName(undefined);
+ setOrderType(undefined);
+ setArrayName("标记");
+ setKey("0");
+ }else{
+ setOrderName(createName);
+ setOrderType(value);
+ setArrayName(children);
+ setKey(eventKey);
+ }
+ }
+
+ const menu = (
+
+ );
+
+ function getColor(colors){
+ setColors(colors);
+ }
+
+ function deleteFunc(){
+ if(editId){
+ const url = `/v1/${owner}/${projectsId}/issue_tags/${editId}`;
+ axios.delete(url).then(result=>{
+ if(result){
+ props.showNotification("项目标记删除成功!");
+ if(list && list.length === 1 && page>1){
+ setPage(page-1);
+ }else{
+ Init();
+ }
+ setDelVisible(false);
+ }
+ }).catch(error=>{})
+ }
+ }
+
+ function sureSave(){
+ if(!name){
+ setNameFlag(true);
+ }else{
+ setNameFlag(false);
+ if(editId){
+ // 编辑
+ const url = `/v1/${owner}/${projectsId}/issue_tags/${editId}`;
+ axios.patch(url,{
+ color: colors || defaultColor,
+ description: desc,
+ name
+ }).then(result=>{
+ if(result){
+ props.showNotification("标记编辑成功！");
+ Init();
+ cancel();
+ }
+ }).catch(error=>{})
+ }else{
+ // 保存
+ const url = `/v1/${owner}/${projectsId}/issue_tags`;
+ axios.post(url,{
+ color: colors || defaultColor,
+ description: desc,
+ name
+ }).then(result=>{
+ if(result){
+ props.showNotification("标记新增成功！");
+ Init();
+ cancel();
+ }
+ }).catch(error=>{})
+ }
+ }
+ }
+
+ function cancel(){
+ setNameFlag(false);
+ setName(undefined);
+ setEdit(false);
+ setDesc(undefined);
+ }
+
+ function editFunc(i){
+ setEditId(i.id);
+ setDefaultColor(i.color);
+ setName(i.name);
+ setDesc(i.description);
+ setEdit(true);
+ }
+
+ function onChangeValue(e){
+ setName(e.target.value);
+ if(e.target.value){
+ setNameFlag(false);
+ }else{
+ setNameFlag(true);
+ }
+ }
+
+ function createSign(){
+ const c = Math.random().toString(16).substr(-6);
+ c && setDefaultColor(`#${c}`);
+ setEdit(true);
+ }
+ return(
+ 新建疑修
+
+ {setCharge(value)}}
+ headImg
+ selectValueList={assigner_choose}
+ chooseFunc={(list)=>{setAssigner_choose(list);}}
+ double={5}
+ removeFlag
+ />
+ {setStatus_choose(list);}}
+ />
+ {setPrioritie_choose(list);}}
+ />
+ {setTag(value)}}
+ selectValueList={tag_choose}
+ chooseFunc={(list)=>{setTag_choose(list);}}
+ double={3}
+ colorFlag="2"
+ removeFlag
+ onAdd={permission && permission !== "Reporter" ? ()=>{getSign();} :false}
+ owner={owner}
+ projectsId={projectsId}
+ />
+ {setMillstone(value)}}
+ selectValueList={millstone_choose}
+ editFlag={milepostId ? true : false}
+ chooseFunc={(list)=>{setMillstone_choose(list);}}
+ />
+ {setBranch(value)}}
+ selectValueList={branch_choose}
+ chooseFunc={(list)=>{setBranch_choose(list);}}
+ />
+ {
+ open_blockchain &&
+
+
+ 悬赏金额
+ {/* {!(milepostId ? true : false) && } */}
+
+
+ }
+ {console.log("case:",v);setCaseValue(v)}}/>
+ setStartDate(date)}/>
+ setDueDate(date)}/>
+
+
+ setDelVisible(false)}
+ onSuccess={deleteFunc}
+ title="删除标记"
+ content={}
+ />
+
+ )
+}
+export default Sign;
\ No newline at end of file
diff --git a/src/forge/Issues/index.jsx b/src/forge/Issues/index.jsx
new file mode 100644
index 000000000..a3bb5dfd4
--- /dev/null
+++ b/src/forge/Issues/index.jsx
@@ -0,0 +1,80 @@
+import React,{useEffect} from 'react';
+import { Route, Switch } from "react-router-dom";
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import './index.scss';
+
+const List = Loadable({
+ loader: () => import("./Pages/list"),
+ loading: Loading,
+});
+const Detail = Loadable({
+ loader: () => import("./Pages/details"),
+ loading: Loading,
+});
+const Sign = Loadable({
+ loader: () => import("./Pages/sign"),
+ loading: Loading,
+});
+const New = Loadable({
+ loader: () => import("./Pages/new"),
+ loading: Loading,
+});
+
+function Index(props){
+ const pathname = props.history.location.pathname;
+ const { project } = props;
+ const open_blockchain = project && project.open_blockchain;
+
+ useEffect(() => {
+ if (document) { // 可以排除不需要置顶的页面
+ if (document.documentElement || document.body) {
+ document.documentElement.scrollTop = document.body.scrollTop = 0; // 切换路由时手动置顶
+ }
+ }
+ }, [pathname]);
+ return(
+ 您确定要删除当前标记？
+ 疑修 / 项目标记
+ 
创建标记
+
+ {
+ edit &&
+
+
+ }
+
+
+ { nameFlag &&
+ setDesc(e.target.value)} placeholder="描述30字以内"/>
+ 请输入标记名称
} +
+ 项目标记({total || 0})
+
+ {arrayName}
+
+ {
+ list && list.length > 0 ?
+ -
+ {
+ list.map((i,k)=>{
+ return(
+
-
+
+ + + {i.name} +
+{i.description}
++ {i.issues_count || 0} 疑修 + {i.pull_requests_count || 0} 合并请求 +
++ editFunc(i)}>编辑 + {setEditId(i.id);setDelVisible(true);}}>删除 +
+
+ )
+ })
+ }
+
+ setPage(p)} pageSize={limit}/>
+
+ }
+ {total === undefined &&
+
+ (
+
+ )}
+ >
+ {/* 里程碑创建issue */}
+ (
+
+ )}
+ >
+ (
+
+ )}
+ >
+ (
+
+ )}
+ >
+ (
+
+ )}
+ >
+ (
+
+
+
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/Issues/index.scss b/src/forge/Issues/index.scss
new file mode 100644
index 000000000..7a5541822
--- /dev/null
+++ b/src/forge/Issues/index.scss
@@ -0,0 +1,870 @@
+.borderNo.ant-input,.borderNo .ant-input-number-input,.borderNo,.borderNo.ant-input-number-focused{
+ border:none!important;
+ padding:4px 0px!important;
+ background-color: transparent!important;
+ box-shadow: none!important;
+ .ant-input-number-handler-wrap{
+ display: none;
+ }
+ &:focus{
+ border:none!important;
+ box-shadow: none!important;
+ }
+}
+
+.pagebox{
+ width: 1200px;
+ margin:0px auto;
+}
+// 删除issue弹框
+.deldesc{
+ justify-content: center;
+ .red{
+ color: #DF0002;
+ }
+}
+// 可公用样式（在issue的页面中）
+// 可点击(有向下箭头且点击出现下拉框，移入灰色背景加深)的灰色按钮样式
+.dorpdownButton{
+ padding:0px 15px;
+ height:32px;
+ color: #333333!important;
+ cursor: pointer;
+ line-height: 32px;
+ background-color:#fafbfc;
+ border:1px solid #d0d0d0;
+ border-radius: 4px;
+ display: flex;
+ align-items: center;
+ min-width: 107px;
+ box-sizing: border-box;
+ &>span{
+ display: block;
+ width: 56px;
+ text-align: center;
+ }
+ &:hover{
+ background-color: #f3f4f6;
+ }
+}
+// flex-左右，上下居中
+.between{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+// 蓝色背景操作栏
+.bluebar{
+ height:50px;
+ background-color:#fafcff;
+ border:1px solid rgba(42, 97, 255, 0.23);
+ border-radius:4px 4px 0px 0px;
+ padding:0px 26px;
+}
+// 按钮样式
+.ant-btn-background-ghost{
+ border-color:#acb0bf;
+ color: #acb0bf;
+ background-color: #fff!important;
+ &.ant-btn-primary{
+ color: #466aff;
+ border-color: #466aff;
+ background-color: #fff!important;
+ }
+ &.ant-btn-danger{
+ color: #f60011;
+ border-color: #f60011;
+ background-color:rgba(196, 0, 14, 0.09)!important;
+ }
+}
+.lists{
+ margin-bottom: 50px;
+}
+.dataempty{
+ height: 420px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid;
+ border-color: #d9d9d9;
+ border-radius: 0px 0px 4px 4px;
+ border-top: none;
+}
+// 列表为空样式
+.listempty{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ background-color:#fafcff;
+ border:1px solid rgba(42, 97, 255, 0.23);
+ border-top: none;
+ border-radius:0px 0px 4px 4px;
+ height: 344px;
+ padding-top: 62px;
+ color: #333;
+}
+// 列表页面样式
+.pageheader{
+ display: flex;
+ justify-content: space-between;
+ padding:30px 0px;
+ align-items: center;
+ &>div{
+ display: flex;
+ align-items: center;
+ }
+}
+.listheader{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height:50px;
+ background-color:#fafcff;
+ border:1px solid;
+ border-color:rgba(42, 97, 255, 0.23);
+ border-radius:4px 4px 0px 0px;
+ padding-left: 18px;
+ .menusul{
+ display: flex;
+ align-items: center;
+ }
+ ul{
+ display: flex;
+ align-items: center;
+ &.statusul{
+ li{
+ width: 106px;
+ font-size: 15px;
+ &>span{
+ height:19px;
+ line-height: 17px;
+ color: #666;
+ background-color:rgba(70, 106, 255, 0.09);
+ border-radius:10px;
+ margin-left: 5px;
+ padding:0px 6px;
+ font-size: 13px;
+ display: block;
+ border:1px solid ;
+ border-color: rgba(70, 106, 255, 0.01);
+ min-width: 30px;
+ text-align: center;
+ }
+ }
+ }
+ li{
+ color: #898d9d;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ &.active{
+ color: #466aff;
+ // font-weight: 500;
+ &>span{
+ font-weight: normal;
+ color: #466aff;
+ border-color: #466aff;
+ background-color: #fff;
+ }
+ }
+ }
+ }
+ .dropboxul{
+ padding-right: 20px;
+ li.minwidth{
+ min-width: 70px;
+ }
+ li{
+ min-width:88px;
+ display: flex;
+ justify-content: flex-end;
+ cursor: default;
+ margin-left: 12px;
+ .dropspan{
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ &>span{
+ max-width: 80px;
+ display: inline-block;
+ text-align: right;
+ }
+ }
+ }
+ }
+
+}
+// issue列表
+.listdatas{
+ border:1px solid #d0d0d0;
+ border-top: none;
+ border-radius: 0px 0px 2px 2px;
+ &>div:not(.none_panels){
+ padding:20px 18px;
+ border-bottom: 1px solid #eee;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ &:hover{
+ background-color:rgba(231, 233, 242, 0.26);
+ }
+ &:last-child{
+ border-bottom: none;
+ }
+ .issuedetail{
+ display: flex;
+ align-items: flex-start;
+ flex:1;
+ }
+ }
+ .idetails{
+ display: flex;
+ align-items: center;
+ &>a{
+ color: #40424a;
+ margin-right: 10px;
+ font-size: 15px;
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 375px;
+ white-space: nowrap;
+ }
+ .tagscolor{
+ padding:0px 6px;
+ border-radius: 2px;
+ height: 20px;
+ line-height: 20px;
+ max-width: 108px;
+ font-size: 13px;
+ cursor: default;
+ color: #fff;
+ }
+ }
+ .infos{
+ display: flex;
+ align-items: center;
+ color: #898d9d;
+ margin-top: 12px;
+ font-size: 13px;
+ // img{
+ // height: 22px;
+ // width: 22px;
+ // margin-right: 4px;
+ // border-radius: 50%;
+ // }
+ }
+ .issuecondition{
+ display: flex;
+ align-items: center;
+ color: #40424a;
+ .principal{
+ position: relative;
+ display: flex;
+ justify-content: flex-end;
+ width: 150px;
+ text-align: justify;
+ // &.hovers:hover{
+ // a{
+ // position:initial;
+ // }
+ // }
+ // a{
+ // position: absolute;
+ // right: 0px;
+ // transition: 0.6s;
+ // }
+ // img,span{
+ // width: 22px;
+ // height: 22px;
+ // border-radius: 50%;
+ // }
+ // span{
+ // background-color:#ced5ef;
+ // text-align: center;
+ // line-height: 12px;
+ // color:#000000;
+ // z-index: 6;
+ // }
+ }
+ &>div{
+ width: 90px;
+ text-align: right;
+ }
+ .commentnum{
+ padding-right: 5px;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ }
+ }
+}
+// 状态样式-公用
+
+.status{
+ display: block;
+ height:22px;
+ border-radius:6px;
+ text-align: center;
+ margin-right: 10px;
+ line-height: 20px;
+ width: 45px;
+ font-size: 14px;
+ border:1px solid #fff;
+ &.normals{
+ border-color:#28be6c;
+ color:#28be6c;
+ }
+ &.hight{
+ border-color: #e67e22;
+ color: #e67e22;
+ }
+ &.urgent{
+ border-color: #db3d1d;
+ color: #db3d1d;
+ }
+ &.low{
+ border-color: #1abcb1;
+ color: #1abcb1;
+ }
+}
+.ilog{
+ min-width: 45px;
+ margin-right: 10px;
+ clear: both;
+ .number{
+ background-color:rgba(213, 220, 246, 0.36);
+ border-radius:4px;
+ height: 19px;
+ line-height: 19px;
+ color: #666666;
+ text-align: center;
+ float: left;
+ padding:0px 4px;
+ cursor: pointer;
+ font-size: 13px;
+ }
+}
+// colorCard
+.color{
+ width: 20px;
+ height: 20px;
+ border-radius: 2px;
+}
+.swatch{
+ padding: 5px;
+ background: #fff;
+ border-radius: 1px;
+ width: 92px;
+ height: 28px;
+ line-height: 20px;
+ box-shadow: 0 0 0 1px rgba(0,0,0,.1);
+ display: flex;
+ cursor: pointer;
+}
+.popover {
+ position: absolute;
+ z-index: 2;
+}
+.cover {
+ position: fixed;
+ top: 0px;
+ right: 0px;
+ bottom: 0px;
+ left: 0px;
+}
+.modalcolor {
+ width: 20px;
+ height: 20px;
+ border-radius: 2px;
+}
+// 标记管理页面
+.editbar{
+ padding:18px 20px;
+ background-color:rgba(218, 225, 251, 0.24);
+ display: flex;
+ align-items: center;
+ margin-bottom: 30px;
+ justify-content: space-between;
+ &>div{
+ position: relative;
+ .inputred{
+ border-color: red;
+ }
+ .red{
+ position: absolute;
+ left: 166px;
+ width: 100%;
+ top: 2px;
+ color: red;
+ }
+ }
+}
+.signlist{
+ padding:10px 0px;
+ margin-bottom: 40px!important;
+ &>li{
+ display: flex;
+ margin-bottom: 5px;
+ padding:10px 20px;
+ &>p{
+ flex:1;
+ color: 40424a;
+ &:first-child{
+ flex:1.2;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ }
+ &:last-child{
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ justify-content: flex-end;
+ }
+ .square{
+ display: block;
+ width: 22px;
+ height: 15px;
+ border-radius:2px;
+ }
+ .line{
+ position: relative;
+ padding-left: 13px;
+ &::before{
+ position: absolute;
+ height:13px;
+ width: 1px;
+ left: 0px;
+ top:7px;
+ background-color:#d5d5d5;
+ content: "";
+ }
+ }
+ }
+ }
+}
+// 新建页面样式
+.shortwidth{
+ width: 330px;
+ padding-left: 50px;
+ &>li{
+ border-bottom: 1px solid rgba(172, 176, 191, 0.17);
+ padding-bottom: 8px;
+ margin-bottom: 22px!important;
+ &>span{
+ font-size: 15px;
+ position: relative;
+ color: #40424a;
+ display: flex;
+ width: 100%;
+ height: 20px;
+ line-height: 20px;
+ font-weight: 600;
+ a{
+ position: absolute;
+ right: 0px;
+ }
+ }
+ .operatevalue{
+ line-height: 30px;
+ color: #acb0bf;
+ margin-top: 10px;
+ display: flex;
+ flex-wrap: wrap;
+ .colorsborder{
+ padding: 0px 8px;
+ height: 20px;
+ line-height: 18px;
+ border-radius: 4px;
+ text-align: center;
+ border:1px solid ;
+ font-size: 13px;
+ }
+ .colorsquare{
+ padding: 0px 8px;
+ height: 20px;
+ line-height: 20px;
+ border-radius: 4px;
+ text-align: center;
+ color: #fff;
+ font-size: 13px;
+ }
+ &>p{
+ margin-top: 5px!important;
+ position: relative;
+ padding-right: 15px;
+ &.removeFlag>span{
+ max-width: 230px;
+ }
+ .removeicon{
+ display: none;
+ }
+ }
+ .removeFlag:hover{
+ border-radius:2px;
+ .removeicon{
+ display: block;
+ }
+ }
+ &>p:first-child{
+ margin-top: 0px;
+ }
+ }
+ }
+}
+.addTags_form{
+ .ant-row.ant-form-item{
+ margin-bottom: 12px;
+ }
+ .manageTitle{
+ margin-bottom: 20px!important;
+ padding-bottom: 15px;
+ line-height: 22px;
+ color:#5f6872;
+ font-size:16px;
+ border-bottom:1px solid #e1e3e8;
+ }
+ .inline{
+ display: flex;
+ align-items: flex-start;
+ }
+}
+.addTagsModal{
+ .ant-modal-content{
+ background-image:linear-gradient(359.37deg,#ebf3ff 0%,#f8fbff 55.01%,#f1f5ff 100%);
+ }
+ .ant-modal-header{
+ background-color: unset;
+ padding:0px 24px;
+ height: 50px;
+ line-height: 50px;
+ .ant-modal-title{
+ text-align: left;
+ color:#333333;
+ font-size:17px;
+ font-weight: normal!important;
+ height: 50px;
+ line-height: 50px!important;
+ }
+ }
+ .ant-modal-close{
+ top:0px !important;
+ }
+ .popover{
+ left: 94px;
+ top:0px;
+ }
+}
+.menusEmpty{
+ padding:12px 20px 10px 16px;
+ &>p{
+ padding:10px 16px;
+ }
+ &>a{
+ padding:10px 16px;
+ display: block;
+ border-top: 1px solid rgba(172, 176, 191, 0.17);
+ }
+}
+.piecemenu{
+ li{
+ display: flex;
+ align-items: center;
+ }
+}
+.colorpiece{
+ display: block;
+ width: 22px!important;
+ height: 15px;
+ margin-right: 9px;
+ border-radius:2px;
+}
+.overlayStyle{
+ background-color:#ffffff;
+ border-radius:6px;
+ box-shadow:0px 0px 10px rgba(24, 54, 181, 0.17);
+ max-width: 280px;
+ z-index: 100;
+ .searchbox{
+ padding:12px 20px 0px 16px;
+ }
+ .ant-menu{
+ padding:10px 16px 10px 16px;
+ max-height: 324px;
+ overflow-y: auto;
+ li{
+ padding:0px 16px;
+ height: 38px;
+ line-height: 38px;
+ border-bottom: none;
+ color:#898d9d;
+ position: relative;
+ width: 100%;
+ box-sizing: border-box;
+ &:hover,&.ant-menu-item-selected{
+ background-color:rgba(70, 106, 255, 0.07);
+ color:#40424a;
+ }
+ &.ant-menu-item-selected::before{
+ content:"✓";
+ position: absolute;
+ right: 15px;
+ color: #acb0bf;
+ top: 0px;
+ }
+ }
+ }
+}
+//详情页面
+.editpanel{
+ padding:20px;
+ margin-top: 25px;
+ border:1px solid rgba(42, 97, 255, 0.23);
+ border-radius: 2px;
+}
+.detailbanner{
+ // margin-top: 25px;
+ // height:82px;
+ // background-color:#fafcff;
+ // border:1px solid rgba(42, 97, 255, 0.23);
+ // border-radius:4px;
+ // padding:12px 25px 12px 20px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .detailtitle{
+ flex: 1;
+ &>div{
+ display: flex;
+ align-items: flex-start;
+ }
+ .name{
+ font-size: 16px;
+ font-weight: 700;
+ color:#333;
+ line-height: 22px;
+ max-width: 580px;
+ word-break: break-all;
+ }
+ .author{
+ img{
+ width: 26px;
+ height: 26px;
+ margin-right: 4px;
+ border-radius: 50%;
+ }
+ color: #466aff;
+ }
+ }
+ .detailoperate{
+ display: flex;
+ align-items: center;
+ }
+}
+.descPanel{
+ margin-top:30px;
+ // padding:20px;
+ // background-color: #f7f8fd;
+ // border:1px solid #c9d8ff;
+ // border-radius: 2px;
+}
+// 新建页面
+.explain{
+ .ant-form-explain{
+ position: absolute;
+ }
+}
+
+
+.overlaydrop{
+ &.large{
+ width: 260px;
+ }
+ &.small{
+ width: 120px;
+ padding:12px 0px!important;
+ }
+ padding:18px 15px;
+ position: relative;
+ border-radius:6px;
+ box-shadow:0px 0px 10px rgba(24, 54, 181, 0.17);
+ background-color: #fff;
+ .ant-menu{
+ max-height: 305px;
+ overflow-y: auto;
+ li{
+ height: 38px;
+ line-height: 38px;
+ border-bottom: none!important;
+ display: flex;
+ align-items: center;
+ padding-left: 6px;
+ padding-right: 0px;
+ img{
+ width: 24px;
+ height: 24px;
+ border-radius: 50%;
+ }
+ span{
+ display: block;
+ width:100%;
+ margin-left: 10px;
+ padding-right: 25px;
+ }
+ &:hover,&.ant-menu-item-selected{
+ background-color:rgba(70, 106, 255, 0.07);
+ color:#40424a;
+ }
+ &.ant-menu-item-selected::before{
+ content:"✓";
+ position: absolute;
+ right: 15px;
+ color: #acb0bf;
+ top: 0px;
+ }
+ }
+ }
+}
+
+// 声明
+.claimpart{
+ padding-bottom: 15px;
+ border-bottom: 1px solid #eee;
+ margin-bottom: 20px;
+}
+
+// issue版本2
+.overlayChooseStyle{
+ width: 636px;
+ background-color:#ffffff;
+ border-radius:6px;
+ box-shadow:0px 0px 10px rgba(24, 54, 181, 0.17);
+ z-index: 100;
+ padding:30px 20px;
+ .choosedul{
+ display: flex;
+ flex-wrap: wrap;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #e4e4e6;
+ margin-bottom: 20px!important;
+ li{
+ height:24px;
+ background-color:#eff2ff;
+ border:1px solid;
+ border-color:#466aff;
+ border-radius:2px;
+ color:#466aff;
+ font-size:14px;
+ margin-right: 15px;
+ margin-bottom: 10px!important;
+ padding:0px 7px;
+ display: flex;
+ align-items: center;
+ span{
+ display: block;
+ max-width:120px ;
+ }
+ }
+ }
+ .counttips{
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ }
+ .ant-menu{
+ display: flex;
+ flex-wrap: wrap;
+ padding:20px 0px 5px 0px;
+ box-sizing: border-box;
+ max-height: 307px;
+ overflow-y: auto;
+ &.piecemenu li{
+ width: auto;
+ &>span{
+ display: flex;
+ }
+ span.task-hide{
+ max-width: unset;
+ }
+ &:nth-child(5n){
+ margin-right: 24px!important;
+ }
+ }
+ li{
+ width: 98px;
+ height:32px;
+ line-height:30px;
+ text-align: center;
+ font-size:14px;
+ border-radius:2px;
+ margin-right: 24px!important;
+ margin-bottom: 15px!important;
+ border:1px solid!important;
+ border-color: #f4f6fe!important;
+ padding:0px 5px;
+ &.commonli{
+ background-color:#f4f6fe!important;
+ }
+ .removeicon{
+ display: block;
+ }
+ span.task-hide{
+ color: #3f455b;
+ margin:0px auto;
+ position: relative;
+ color:#3f455b;
+ max-width: 80px;
+ display: inline-block;
+ }
+ span{
+ position: relative;
+ margin:0px auto;
+ }
+ &.colorli{
+ border-color: transparent!important;
+ span{
+ color: #fff;
+ position: relative;
+ margin:0px auto;
+ }
+ }
+ &.commonli.ant-menu-item-selected{
+ background-color:#e2e8ff!important;
+ color:#3f5097;
+ border-color:#466aff!important;
+ }
+ &.colorli.ant-menu-item-selected{
+ border-color: transparent!important;
+ }
+ &.colorli.ant-menu-item-selected{
+ &>span::before{
+ content:"✓";
+ position: absolute;
+ right: -12px;
+ color: #fff;
+ top: -16px;
+ }
+ }
+ &:nth-child(5n){
+ margin-right: 0px!important;
+ }
+ }
+ }
+}
+
+.boxStyles{
+ margin-top: 10px!important;
+ width: 100%;
+ input,input[class~="ant-input"]:focus{
+ border:none!important;
+ padding:0px;
+ }
+ div[class~='ant-select-selection__placeholder']{
+ margin-left: 0px!important;
+ margin-right: 0px!important;
+ }
+ span[class~='ant-select-arrow']{
+ opacity: 0;
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 213d891c8..e52be3a40 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -32,7 +32,7 @@ const OrderDetail = Loadable({
loading: Loading,
})
const OrderIndex = Loadable({
- loader: () => import('../Order/order'),
+ loader: () => import('../Issues/index'),
loading: Loading,
})
const CoderRootIndex = Loadable({
@@ -93,7 +93,7 @@ const UpdateMerge = Loadable({
})
const MilepostDetail = Loadable({
- loader: () => import('../Order/MilepostDetail'),
+ loader: () => import('../Order/MilepostDetail.jsx'),
loading: Loading,
})
const WatchUsers = Loadable({
@@ -711,11 +711,11 @@ class Detail extends Component {
}
>
{/* 标签列表 */}
- -
+ )}
+ >
+ {
+ txt && txt.committer && txt.committer.id?
+
+ 
+ {txt && txt.committer && txt.committer.name}
+
+ :
+
+
+ {txt && txt.committer && txt.committer.name}
+
+ }
+ 更新于{txt && txt.time_ago}
+
+ )
+ }
+ },
+ {
+ title: "commit信息",
+ dataIndex: "commit_id",
+ key: 4,
+ ellipsis: true,
+ width: "250px",
+ render: (txt, item) => {
+ return
+
+ }
+ },
+ {
+ title: "分支类型",
+ dataIndex: "default_branch",
+ key: 5,
+ width: "150px",
+ render: (txt, item) => {
+ return isManager ? txt === item.name ? 默认分支 : : txt === item.name ? '默认分支' : '普通分支'
+ }
+ },
+ {
+ title: "操作",
+ dataIndex: "name",
+ key: 6,
+ align: "center",
+ width: "320px",
+ className: "branchActionColumn",
+ render: (txt, item) => {
+ return (
+
+
+ 
+ {truncateCommitId(txt)}
+
+
+
+
+
+ {
+ (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
+ + 合并请求
+ }
+
+ 下载
+
+ {isManager && (txt === item.default_branch ?
+ )
+ }
+ }
+ ];
+
function getList() {
const url = `/${owner}/${projectsId}/branches_slice.json`;
Axios.get(url).then(result=>{
@@ -39,10 +175,121 @@ function Index(props) {
}).catch(error=>{setIsSpin(false);})
}
+ // 删除分支确认函数
+ function deleteLabel(){
+ Axios.delete(`/v1/${owner}/${projectsId}/branches/${visible.name}.json`).then(res=>{
+ if(res && res.data){
+ if(current>1 && (list && list.length===1)){
+ setCurrent(current-1);
+ }else{
+ setReload(Math.random());
+ }
+ setVisible(false);
+ !res.data.status && message.success('删除成功');
+ }
+ })
+ }
+
+ // 新建分支确认函数
+ function createBranch(){
+ setNewBranchError(undefined);
+ if(!newBranchName){
+ setNewBranchError("请输入新建分支名称");
+ }else{
+ Axios.post(`/v1/${owner}/${projectsId}/branches.json`, {
+ new_branch_name: newBranchName,
+ old_branch_name: newFormBranchName
+ }).then(res=>{
+ if(res && res.data){
+ // 重新请求仓库详情接口，更新分支总数信息
+ getDetail();
+ setReload(Math.random());
+ setAddBranch(false);
+ message.success('新建分支成功');
+ }
+ })
+ }
+ }
+
+ // 新建分支名检查格式
+ function checkNewBranchName(e) {
+ setNewBranchError(undefined);
+ const value = e.target.value;
+ if (value) {
+ const str = '^*';
+ let reg = /\\/g;
+ if(reg.test(value)){
+ setNewBranchError('分支名不能包含下列任何字符：^ * \\ ');
+ }else{
+ for(var i=0;i
- {
+
+
+ {/* {
list && list.length>0 && list.map((item,key)=>{
return(
@@ -86,7 +333,12 @@ function Index(props) {
{setVisible(false)}}
+ visible={Boolean(visible)}
+ width="456px"
+ btn={
+
+ {setAddBranch(false)}}
+ visible={addBranch}
+ width="388px"
+ footer={
+
+ }
+ className="createNewBranchModal"
+ >
+
)
}
diff --git a/src/forge/Main/tree/Index.scss b/src/forge/Main/tree/Index.scss
index f65a1c68f..1c31ea8f1 100644
--- a/src/forge/Main/tree/Index.scss
+++ b/src/forge/Main/tree/Index.scss
@@ -1,3 +1,98 @@
+.treeinfo{
+ .branchLastUpdateUserImage{
+ height: 20px;
+ width: 20px;
+ margin-right: 5px;
+ }
+}
+.f6_bor_but, .f6_bor_but:focus{
+ color:#f60011;
+ background-color:rgba(196, 0, 14, 0.09);
+ border:1px solid #f60011;
+ border-radius:5px;
+ &:hover{
+ color:#f60011;
+ background-color:rgba(196, 0, 14, 0.18);
+ border-color:#ff727c;
+ }
+ &:active{
+ color:#f60011;
+ background-color:rgba(196, 0, 14, 0.22);
+ border-color:#f60011;
+ }
+}
+.branchListTable{
+ .ant-table-thead > tr > th{
+ border-top: 1px solid rgba(42, 97, 255, 0.23);
+ border-bottom: 1px solid rgba(42, 97, 255, 0.23) !important;
+ background-color:#fafcff;
+ }
+ .ant-table-column-title{
+ color:#40424a;
+ }
+ .ant-table-thead > tr:first-child > th:last-child{
+ border-right: 1px solid rgba(42, 97, 255, 0.23);
+ }
+ .ant-table-thead > tr:first-child > th:first-child{
+ border-left: 1px solid rgba(42, 97, 255, 0.23);
+ }
+ .ant-table-tbody > tr > td{
+ border-color: #eeeeee;
+ padding: 18.5px 16px;
+ }
+ .branchNameColumn{
+ border-left: 1px solid #d0d0d0;
+ }
+ .branchActionColumn{
+ border-right: 1px solid #d0d0d0;
+ }
+ .task-hide{
+ color: $primary-color;
+ }
+ .ant-table-empty .ant-table-placeholder{
+ border-left: 1px solid #d0d0d0;
+ border-right: 1px solid #d0d0d0;
+ }
+}
+.branchListActionBox{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin: 20px 0 30px;
+}
+.createNewBranchModal{
+ .ant-modal-title{
+ text-align: left;
+ color:#333333;
+ font-size:17px;
+ font-weight: normal !important;
+ }
+ .ant-modal-header{
+ border-bottom: none;
+ background-color:rgba(70, 106, 255, 0.05);
+ }
+ .ant-modal-close{right: 5px;}
+ .ant-modal-close-x{font-size: 26px;}
+ .ant-modal-footer{
+ border-top: none;
+ text-align: center;
+ padding-bottom: 53px;
+ }
+ .ant-modal-content{
+ background-image:linear-gradient(359.37deg,#ebf3ff 0%,#f8fbff 55.01%,#f1f5ff 100%);
+ }
+ .createBranchLabel{
+ color:#27282d;
+ margin-bottom: 12px;
+ }
+ .createBranchInput, .createBranchInput .ant-select-selection{
+ border-color:#9eaacb;
+ background-color: transparent !important;
+ }
+ .newBranchError{
+ color:#df0002;
+ }
+}
.branchSort{
font-weight: 500;
color: #333333;
@@ -49,14 +144,16 @@
}
.treecopy{
flex:1;
- display: flex;
- justify-content: center;
+ display: flex;
+ // justify-content: center;
+ &>div:not(.treeCopyBox){
+ position: relative;
+ }
&>div{
height: 32px;
background: #FAFBFC;
border-radius: 4px;
border: 1px solid #D0D0D0;
- position: relative;
z-index: 1;
display: flex;
align-items: center;
@@ -64,6 +161,7 @@
padding:0px 15px;
border-right: 1px solid rgba(153, 153, 153, 0.4);
height: 100%;
+ width: 140px;
img{
margin-right: 4px;
}
diff --git a/src/forge/Order/AmplifyImg.js b/src/forge/Order/AmplifyImg.js
index 568ac7f92..114fa7e6a 100644
--- a/src/forge/Order/AmplifyImg.js
+++ b/src/forge/Order/AmplifyImg.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Modal } from 'antd';
-import './order.css';
+import './order.scss';
function AmplifyImg(props) {
return (
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 4e6c92a29..e76c24451 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -1,4 +1,4 @@
-import React, { Component, useRef } from "react";
+import React, { Component } from "react";
import { Link } from "react-router-dom";
import axios from "axios";
@@ -8,7 +8,7 @@ import Attachments from "../Upload/attachment";
import RenderHtml from "../../components/render-html";
import Comments from "../comments/comments";
import Claims from "../claims/claims"
-import "./order.css";
+import "./order.scss";
class Detail extends Component {
constructor(props) {
@@ -44,6 +44,20 @@ class Detail extends Component {
this.getDetail();
};
+ componentDidUpdate=()=>{
+ this.updateDocumentTitle();
+ }
+
+ // 更新网页标题
+ updateDocumentTitle(){
+ const {projectDetail} = this.props;
+ const {data} = this.state;
+ if(projectDetail && data){
+ const { author, name} = projectDetail;
+ document.title = `${data.subject}-疑修-${author.name}/${name}`;
+ }
+ }
+
getDetail = () => {
const { projectsId, orderId, owner } = this.props.match.params;
const url = `/${owner}/${projectsId}/issues/${orderId}.json`;
@@ -55,11 +69,6 @@ class Detail extends Component {
data: result.data,
isSpins: false
});
- const {projectDetail} = this.props;
- if(projectDetail){
- const { author, name} = projectDetail;
- document.title = `${result.data && result.data.subject}-疑修-${author.name}/${name}`;
- }
}
})
.catch((error) => {
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index a6f0c3cb6..e228dd452 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -1,54 +1,49 @@
import React, { Component } from 'react';
import { Link } from 'react-router-dom';
-import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm, Spin } from 'antd';
-import NoneData from '../Nodata';
+import { Dropdown, Icon, Menu, Pagination, Popconfirm, Spin, Button, Tooltip } from 'antd';
+import emp from '../../forge/Issues/Img/emp.png';
import axios from 'axios';
-import './order.css';
-import CheckProfile from '../Component/ProfileModal/Profile';
-
-const { Text } = Typography;
-
+import './milepost.scss';
class Milepost extends Component {
constructor(props) {
super(props);
this.state = {
data: undefined,
- limit: 15,
+ limit: 10,
page: 1,
order_type: undefined,
- //新建标签区域是否显示 none 隐藏 block 显示
- display: 'none',
+ // 里程碑 开启/关闭 状态
status: 'open',
- openselect: 1,
- closeselect: undefined,
order_name: undefined,
-
- spinings: true
+ spinings: true,
+ // tooltip显隐
+ visible: false
}
}
+ componentDidUpdate(){
+ this.updateDocumentTitle();
+ }
componentDidMount = () => {
- this.getList(1, this.state.status, 'desc');
- }
- componentDidUpdate = () => {
+ this.getList(1, this.state.limit, this.state.status);
this.updateDocumentTitle();
}
+
// 更新网页标题
updateDocumentTitle(){
const {projectDetail} = this.props;
if(projectDetail){
const { author, name} = projectDetail;
- document.title = `新建合并请求-${author.name}/${name}`;
+ document.title = `里程碑-${author.name}/${name}`;
}
}
- getList = (page, status, order_type, order_name) => {
+ getList = (page, limit, category, sort_by, sort_direction) => {
const { projectsId ,owner } = this.props.match.params;
- const { limit } = this.state;
- const url = `/${owner}/${projectsId}/milestones.json`;
+ const url = `/v1/${owner}/${projectsId}/milestones.json`;
axios.get(url, {
params: {
- projectsId, page, limit, status, order_type, order_name
+ page, limit: limit, category, sort_by, sort_direction
}
}).then((result) => {
if (result) {
@@ -63,45 +58,24 @@ class Milepost extends Component {
}
opneMilelist = (type) => {
- const { order_name } = this.state;
if (type) {
- const { current_user } = this.props;
- if (type === 1) {
- this.setState({
- status: 'open',
- openselect: current_user.user_id,
- closeselect: undefined,
-
- })
- this.getList(1, 'open', 'desc', order_name);
- } else {
- this.setState({
- status: 'closed',
- openselect: undefined,
- closeselect: current_user.user_id
- })
- this.getList(1, 'closed', 'desc', order_name);
- }
+ this.setState({
+ status: type === 1 ? 'open' : 'closed'
+ })
+ this.getList(1, this.state.limit, type === 1 ? 'open' : 'closed', this.state.order_name, this.state.order_type);
}
-
}
updatestatusemile = (status, arr) => {
const { projectsId , owner } = this.props.match.params;
const url = `/${owner}/${projectsId}/milestones/${arr.id}/update_status.json`;
- const { current_user } = this.props;
axios.post(url, {
project_id: projectsId,
id: arr.id,
status: status
}).then(result => {
if (result) {
- this.setState({
- status: status,
- closeselect: status === "closed" ? current_user.user_id : undefined,
- openselect: status === "closed" ? undefined : current_user.user_id
- })
- this.getList(1, status, 'desc');
+ this.getList(1, this.state.limit, this.state.status, this.state.order_name, this.state.order_type);
const { getDetail } = this.props;
getDetail && getDetail();
}
@@ -120,7 +94,7 @@ class Milepost extends Component {
}
}).then((result) => {
if (result) {
- this.getList(1, this.state.status, 'desc');
+ this.getList(1, this.state.limit, this.state.status, this.state.order_name, this.state.order_type);
const { getDetail } = this.props;
getDetail && getDetail();
}
@@ -134,39 +108,44 @@ class Milepost extends Component {
this.setState({
page
})
- const { status } = this.state;
- this.getList( page , status );
+ this.getList(page, this.state.limit, this.state.status, this.state.order_name, this.state.order_type);
}
// 排序
arrayList = (e) => {
+ const name = e.key !== 'order' ? e.key : undefined;
+ const type = e.item.props.value !== 'order' ? e.item.props.value : undefined;
this.setState({
- order_name: e.key,
- order_type: e.item.props.value
+ order_name: name,
+ order_type: type
})
- this.getList(1, this.state.status, e.item.props.value, e.key);
+ this.getList(1, this.state.limit, this.state.status, name, type);
}
-
- //控制新建标签页是否显示
- newshow = () => {
+ // 分页组件
+ onShowSizeChange = (current, pageSize) =>{
this.setState({
- display: 'block'
- });
-
- };
- newclose = () => {
- this.setState({
- display: 'none'
- });
- };
+ page: 1,
+ limit: pageSize
+ })
+ this.getList(1, pageSize, this.state.status, this.state.order_name, this.state.order_type);
+ }
+ // tooltip判断是否显示
+ // onVisibleChange = (visible, value) => {
+ // console.log('visible, value', visible, value);
+ // this.setState({
+ // visible: value.length >24 ? visible : false
+ // })
+ // }
render() {
- const { data, limit, page, openselect, closeselect, spinings } = this.state;
+ const { data, limit, page, spinings, status, order_name, order_type, visible } = this.state;
const { projectsId , owner } = this.props.match.params;
+ const { isManager, isDeveloper} = this.props;
const menu = (
-
+ {setCurrent(1);setName(value)}} allowClear/>
+
+
+ {isManager && 分支设置}
+ {(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) && }
+
+
{
(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
- + 合并请求
+ + 合并请求
}
下载
@@ -101,11 +353,47 @@ function Index(props) {
)
})
- }
- {
- list && list.length === 0 &&
+
+
+
+
+ }
+ >
+
+
+
+ 确定删除{visible.name}分支?
+
+
+ 分支名称
+
+ {newBranchError}
+ 分支起点
+
+