From d6b1da79719d69ed972ea68a868e6c4f33925dea Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 10 Jun 2020 17:19:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/edu-purge.css | 6 ++ src/forge/UsersList/common_users.js | 2 +- src/forge/UsersList/fork_users.js | 2 +- src/forge/UsersList/praise_users.js | 2 +- src/forge/users/Infos.js | 8 +- src/forge/users/InfosUser.js | 138 ++++++++++++++-------------- src/forge/users/common_lists.js | 2 +- src/forge/users/new_user.css | 2 +- src/forge/users/watch_users.js | 2 +- 9 files changed, 86 insertions(+), 78 deletions(-) diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 8ade015d6..8a6d4df97 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -2700,6 +2700,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/UsersList/common_users.js b/src/forge/UsersList/common_users.js index 8f996a7f8..d03e3acbe 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}
diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js index 84978dd8f..d4be602dd 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 dbd7a73b0..ed8bca595 100644 --- a/src/forge/UsersList/praise_users.js +++ b/src/forge/UsersList/praise_users.js @@ -21,7 +21,7 @@ class PraiseUsers extends Component { render() { const { projectId } = this.state; return ( -
+
{projectId && }
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index f943ac238..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()} > - + 组织 diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index 918368e19..2d31c9d72 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 (