diff --git a/src/forge/Component/CopyTool.jsx b/src/forge/Component/CopyTool.jsx index df813c0ed..86fb32dab 100644 --- a/src/forge/Component/CopyTool.jsx +++ b/src/forge/Component/CopyTool.jsx @@ -6,6 +6,7 @@ CopyTool.defaultProps = { afterText: '复制成功', //点击后显示的文字 className: '', //传给svg的class inputId: 'copyText', //要复制的文本的ID + timeOut:true, //复制后将浮动的文字改为beforeText }; @@ -21,14 +22,11 @@ function CopyTool({ beforeText, afterText, className , inputId , timeOut }) { console.error("您的CopyTool未设置正确的inputId"); return; } - const range = document.createRange(); // 创造range - window.getSelection().removeAllRanges(); //清除页面中已有的selection - range.selectNode(copyEle); // 选中需要复制的节点 - window.getSelection().addRange(range); // 执行选中元素 - + copyEle.select(); // 执行选中元素 if (document.execCommand('copy')) { document.execCommand('copy'); } + setTitle(afterText); if(timeOut){ setTimeout(function(){ diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx index f2ba3d09b..48d90e136 100644 --- a/src/forge/Component/MemberCards.jsx +++ b/src/forge/Component/MemberCards.jsx @@ -53,7 +53,7 @@ export default (({ user , img, name, time, focusStatus, is_current_user, login , is_current_user ? : - + } diff --git a/src/forge/Component/PublicModal/Index.jsx b/src/forge/Component/PublicModal/Index.jsx index bbf10079d..c12e12b18 100644 --- a/src/forge/Component/PublicModal/Index.jsx +++ b/src/forge/Component/PublicModal/Index.jsx @@ -9,9 +9,9 @@ function Modals({title,children,btn,onCancel,visible}) { onCancel={onCancel} title={title} width={"520px"} - className="deleteBox" footer={btn} centered={true} + wrapClassName={"deleteBox"} > {children} diff --git a/src/forge/Component/PublicModal/Index.scss b/src/forge/Component/PublicModal/Index.scss index 99b7ac85e..1a0fbf31a 100644 --- a/src/forge/Component/PublicModal/Index.scss +++ b/src/forge/Component/PublicModal/Index.scss @@ -1,4 +1,5 @@ .deleteBox{ + z-index: 1033; .ant-modal-close-x{ font-size: 17px!important; } diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index d04f578ed..be36d6dbd 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -362,7 +362,7 @@ class NewHeader extends Component { }) } - // let search_url = settings && settings.common && settings.common.search; + let search_url = settings && settings.common && settings.common.search; let notice_url = settings && settings.common && settings.common.notice; return (
@@ -427,7 +427,7 @@ class NewHeader extends Component {
{/* {search_url ? this.SearchInput(openSearch,search_url):""} */} - + { search_url && } { current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)? diff --git a/src/forge/Main/sub/Invite.jsx b/src/forge/Main/sub/Invite.jsx index 844a49922..61fb40cfc 100644 --- a/src/forge/Main/sub/Invite.jsx +++ b/src/forge/Main/sub/Invite.jsx @@ -8,7 +8,7 @@ function Invite({code,className}) {
邀请码
- {code} + 可以通过邀请码邀请成员加入项目
点击复制邀请码。

} className="ml8 font-16" inputId="devitecode"/>
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index 1fcd1b44c..c1c8bdd06 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -114,7 +114,7 @@ class MilepostDetail extends Component { this.setState({ data: result.data, issues: result.data.issues, - search_count: result.data.search_count, + search_count: params.status_type ==="1" ? result.data.open_issues_count : result.data.close_issues_count, isSpin: false }) }