diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 1e03b3e0d..1d8cf9c50 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -2696,6 +2696,12 @@ a.edu-txt-w80, .minH-560 { min-height: 560px; } +.minH-650{ + min-height: 650px; +} +.minH-670{ + min-height: 670px; +} /*超出高度出现滚动条--纵向*/ diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index e5b619312..a67b06893 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -376,7 +376,7 @@ class CoderRootDirectory extends Component { {lastCommitAuthor.login ? ( { if (submitType === "1") { @@ -216,10 +215,10 @@ class UserSubmitComponent extends Component { -
+
@@ -494,21 +492,7 @@ class order_form extends Component { )} - - {getFieldDecorator("done_ratio", { - rules: [ - { - required: true, - message: "请选择完成度", - }, - ], - initialValue: done_ratio, - })( - - )} - + {getFieldDecorator("fixed_version_id", { rules: [], @@ -571,6 +555,16 @@ class order_form extends Component { onChange={this.changeEndTime} /> + + {getFieldDecorator("done_ratio", { + rules: [], + initialValue: done_ratio, + })( + + )} + {/* { attachments ? -
+
{ attachments.map((item,key)=>{ return( diff --git a/src/forge/UsersList/common_users.js b/src/forge/UsersList/common_users.js index c724de63c..c81bbd511 100644 --- a/src/forge/UsersList/common_users.js +++ b/src/forge/UsersList/common_users.js @@ -85,7 +85,7 @@ class CommonUsers extends Component { ); return (
-
+
{type_title}
@@ -93,7 +93,7 @@ class CommonUsers extends Component { {count === 0 ? ( ) : ( - + )}
diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js index 84978dd8f..88b1dc6dc 100644 --- a/src/forge/UsersList/fork_users.js +++ b/src/forge/UsersList/fork_users.js @@ -121,7 +121,7 @@ class ForkUsers extends Component { }; return (
-
+
Fork列表
diff --git a/src/forge/UsersList/praise_users.js b/src/forge/UsersList/praise_users.js index 22c9a8071..ed8bca595 100644 --- a/src/forge/UsersList/praise_users.js +++ b/src/forge/UsersList/praise_users.js @@ -21,8 +21,8 @@ class PraiseUsers extends Component { render() { const { projectId } = this.state; return ( -
- {projectId && } +
+ {projectId && }
); diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js index c6e6c9f57..0e53f88dd 100644 --- a/src/forge/UsersList/user_list.js +++ b/src/forge/UsersList/user_list.js @@ -1,7 +1,7 @@ import React, { Component } from "react"; -import { Link } from "react-router-dom"; import { getImageUrl } from "educoder"; import FocusButton from "./focus_button"; +import { Button } from "antd"; import "./list.css"; class UserList extends Component { constructor(props) { @@ -9,7 +9,7 @@ class UserList extends Component { } render() { - const { users, userClass } = this.props; + const { users, userClass, current_user } = this.props; const renderList = () => { if (users && users.length > 0) { return users.map((item, key) => { @@ -41,7 +41,12 @@ class UserList extends Component { 加入时间：{item.format_time}
- + { + current_user && current_user.login === item.login ? + + : + + }
diff --git a/src/forge/UsersList/watch_users.js b/src/forge/UsersList/watch_users.js index 6c477ddb6..7817d639a 100644 --- a/src/forge/UsersList/watch_users.js +++ b/src/forge/UsersList/watch_users.js @@ -20,9 +20,10 @@ class WatchUsers extends Component { render() { const { projectId } = this.state; + console.log("watcher_users", this.props.current_user) return (
- {projectId && } + {projectId && }
); diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js index 5d5e3d80e..2fa321658 100644 --- a/src/forge/comments/children_comments.js +++ b/src/forge/comments/children_comments.js @@ -121,7 +121,7 @@ class children_comments extends Component { const renderList = (item) => { return (
-
+
- - - - {item && item.user_name} - - {item.created_at} - - - - {current_user && - (current_user.admin || - current_user.login === item.user_login) ? ( - this.deleteorder(item.id)} - > - - - ) : ( - "" - )} - - + + {item && item.user_name} +
-
+
{this.commentCtx(item.content)} {item && item.attachments && item.attachments.length > 0 ? ( + {item.created_at} + + {current_user && + (current_user.admin || + current_user.login === item.user_login) ? ( + this.deleteorder(item.id)} + > + + + ) : ( + "" + )} + +
); @@ -188,7 +186,7 @@ class children_comments extends Component { return (
{search_count > 0 && ( -
+
); + // const comment_meditor = ( + + // ) + const new_comment = (is_reply, item_id) => { return ( -
- {(current_user && current_user.login) ? ( -
-
- - - - - {current_user && current_user.real_name} - -
- -

- {quillFlag && 请输入评论内容} -

- - } - size={100} - showNotification={this.props.showNotification} - /> -

- {is_reply && ( - - )} - -

-
- ) : ( -
- - - - {/* this.loginModal()}> - 登录 - 并参与到对话中 */} -
- )} +
+ + + +
+ +

+ {quillFlag && 请输入评论内容} +

+ + } + size={100} + showNotification={this.props.showNotification} + /> +

+ + +

+
); }; @@ -403,7 +375,7 @@ class comments extends Component { const renderList = (item) => { return (
-
+
- - - - {item && item.user_name} - - {item.created_at} - - - - {current_user && - (current_user.admin || - current_user.login === item.user_login) ? ( - this.deleteorder(item.id)} - > - - - ) : ( - "" - )} - - + + {item && item.user_name} +
-
+
{item.content ? ( this.commentCtx(item.content) ) : ( @@ -466,6 +413,46 @@ class comments extends Component { ) : ( "" )} +
+ {item.created_at} + + {current_user && + (current_user.admin || + current_user.login === item.user_login) ? ( + this.deleteorder(item.id)} + > + + + ) : ( + "" + )} + + +
+ {current_user && ( +
+ {is_reply && reply_id && reply_id === item.id ? ( +
{new_comment(is_reply, item.id)}
+ ) : ( + "" + )} +
+ )}
- - {current_user && ( -
- {is_reply && reply_id && reply_id === item.id ? ( -
{new_comment(is_reply, item.id)}
- ) : ( -
- - - - - - -
- )} -
- )}
); }; return ( -
-
- {journalsdata && journalsdata.journals_total_count > 0 ? ( - 回复({journalsdata.journals_total_count})
} - dataSource={journalsdata.issue_journals} - renderItem={(item) => {renderList(item)}} - /> - ) : ( -
-
回复({search_count})
-
- )} +
+
+ + + 评论 + {search_count > 0 && ( + {search_count} + )} + + } + key="1" + > +
+ {is_reply && !reply_id ? ( +
{new_comment(is_reply, undefined)}
+ ) : ( +
+ + + + +
+ )} +
+ {journalsdata && journalsdata.journals_total_count > 0 && ( + ( + {renderList(item)} + )} + /> + )} + + {Paginations} -
{new_comment()}
); diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index bf9df3a5f..37172aa40 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -191,7 +191,7 @@ class Infos extends Component {

this.undo_link()}> - + 待办事项 @@ -204,10 +204,10 @@ class Infos extends Component { )}

    -
  • this.change_project_type(undefined)}> +
  • this.change_project_type(undefined)}> 项目类型 - +
  • this.change_project_type("common")}>

    @@ -230,7 +230,7 @@ class Infos extends Component {

    this.organize_link()} > - + 组织 @@ -287,22 +287,6 @@ class Infos extends Component { )}

    -
    - - { - return ; - }} - > - {/* { - return ; - }} - > */} - -
); diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index 918368e19..4180402af 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -29,10 +29,10 @@ class InfosUser extends Component { }; componentDidUpdate = (prevProps) => { - if (prevProps.project_type!= this.props.project_type) { - this.get_projects(); - } - } + if (prevProps.project_type != this.props.project_type) { + this.get_projects(); + } + }; get_projects = () => { const { user, project_type } = this.props; @@ -49,7 +49,7 @@ class InfosUser extends Component { search, sort_by, category, - project_type + project_type, }, }) .then((result) => { @@ -112,37 +112,37 @@ class InfosUser extends Component { ); - const button_lists = - user && current_user && user.login === current_user.login ? - [ - { type: undefined, name: "所有" }, - { type: "manage", name: "我自己的" }, - { type: "join", name: "我参与的" }, - { type: "watched", name: "我关注的" }, - { type: "forked", name: "我Fork的" }, - { type: "public", name: "公开的" }, - { type: "private", name: "私有的" } - ] - : [ { type: undefined, name: "所有" }, - { type: "manage", name: "TA自己的" }, - { type: "join", name: "TA参与的" }, - { type: "watched", name: "TA关注的" }, - { type: "forked", name: "TAFork的" }, - { type: "public", name: "公开的" }] + const button_lists = + user && current_user && user.login === current_user.login + ? [ + { type: undefined, name: "所有" }, + { type: "manage", name: "我自己的" }, + { type: "join", name: "我参与的" }, + { type: "watched", name: "我关注的" }, + { type: "forked", name: "我Fork的" }, + { type: "public", name: "公开的" }, + { type: "private", name: "私有的" }, + ] + : [ + { type: undefined, name: "所有" }, + { type: "manage", name: "TA自己的" }, + { type: "join", name: "TA参与的" }, + { type: "watched", name: "TA关注的" }, + { type: "forked", name: "TAFork的" }, + { type: "public", name: "公开的" }, + ]; const category_button = button_lists.map((item, key) => { return (