ADD 成果库模块功

# Conflicts:
#	src/forge/DevOps/Index.jsx
#	src/forge/Index.js
#	src/forge/Main/Detail.js
#	src/forge/Merge/MessageCount.js
#	src/forge/Settings/Collaborator.js
#	src/forge/Settings/CollaboratorMember.jsx
#	src/forge/users/watch_users.js
#	src/modules/tpm/NewHeader.js

.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

LICENSE

@@ -1,124 +0,0 @@
-木兰宽松许可证， 第2版
-
-2020年1月 http://license.coscl.org.cn/MulanPSL2
-
-您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
-
-0.   定义
-
-“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
-
-“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
-
-“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
-
-“法人实体” 是指提交贡献的机构及其“关联实体”。
-
-“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
-
-1.   授予版权许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
-
-2.   授予专利许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
-
-3.   无商标许可
-
-“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
-
-4.   分发限制
-
-您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
-
-5.   免责声明与责任限制
-
-“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
-
-6.   语言
-
-“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
-
-条款结束
-
-如何将木兰宽松许可证，第2版，应用到您的软件
-
-如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
-
-1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
-
-2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
-
-3， 请将如下声明文本放入每个源文件的头部注释中。
-
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.
-Mulan Permissive Software License，Version 2
-Mulan Permissive Software License，Version 2 (Mulan PSL v2)
-
-January 2020 http://license.coscl.org.cn/MulanPSL2
-
-Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
-
-0. Definition
-
-Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
-
-Contribution means the copyrightable work licensed by a particular Contributor under this License.
-
-Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
-
-Legal Entity means the entity making a Contribution and all its Affiliates.
-
-Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
-
-1. Grant of Copyright License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
-
-2. Grant of Patent License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
-
-3. No Trademark License
-
-No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
-
-4. Distribution Restriction
-
-You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
-
-5. Disclaimer of Warranty and Limitation of Liability
-
-THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-6. Language
-
-THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
-
-END OF THE TERMS AND CONDITIONS
-
-How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
-
-To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
-
-Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
-Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
-Attach the statement to the appropriate annotated syntax at the beginning of each source file.
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.

config/webpack.config.prod.js

@@ -19,8 +19,7 @@ const getClientEnvironment = require("./env");
 
 let publicPath = "/react/build/";
 const publicUrl = publicPath.slice(0, -1);
-// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
-const shouldUseSourceMap = process.env.NODE_ENV !== "production";
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
 const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
@@ -55,8 +54,7 @@ module.exports = {
   },
   bail: true,
   mode: "production",
-  // devtool: false, //测试版
-  devtool: shouldUseSourceMap?'source-map':false,
+  devtool: false, //测试版
   entry: [require.resolve("./polyfills"), paths.appIndexJs],
   output: {
     path: paths.appBuild,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge",
-  "version": "3.0.0",
+  "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@monaco-editor/react": "^2.3.0",
@@ -14,7 +14,6 @@
     "babel-jest": "20.0.3",
     "babel-loader": "7.1.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-react-app": "^3.1.1",
     "babel-runtime": "6.26.0",
     "bizcharts": "^3.5.8",
@@ -22,17 +21,15 @@
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "classnames": "^2.2.5",
-    "clipboard": "^2.0.8",
+    "clipboard": "^2.0.6",
     "code-prettify": "^0.1.0",
     "codemirror": "^5.53.0",
     "connected-react-router": "4.4.1",
-    "cross-env": "^7.0.3",
     "css-loader": "^3.5.2",
     "dompurify": "^2.0.15",
     "dotenv": "4.0.0",
     "dotenv-expand": "4.2.0",
-    "echarts": "^4.9.0",
-    "echarts-wordcloud": "^2.0.0",
+    "echarts": "^4.7.0",
     "editor.md": "^1.5.0",
     "eslint": "4.10.0",
     "eslint-config-react-app": "^2.1.0",
@@ -49,7 +46,6 @@
     "install": "^0.12.2",
     "jest": "20.0.4",
     "js-base64": "^2.5.2",
-    "js2wordcloud": "^1.1.12",
     "katex": "^0.11.1",
     "lodash": "^4.17.15",
     "loglevel": "^1.6.8",
@@ -66,7 +62,7 @@
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.6.1",
-    "qrcode.react": "^1.0.1",
+    "qrcode.react": "^1.0.0",
     "qs": "^6.9.3",
     "quill": "^1.3.7",
     "quill-delta-to-html": "^0.11.0",
@@ -91,12 +87,12 @@
     "react-infinite-scroller": "^1.2.4",
     "react-loadable": "^5.3.1",
     "react-monaco-editor": "0.37",
+    "react-pdf": "^4.2.0",
     "react-player": "^1.15.3",
     "react-redux": "5.0.7",
     "react-resizable": "^1.10.1",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
-    "react-slick": "^0.28.1",
     "react-split-pane": "^0.1.91",
     "react-url-query": "^1.5.0",
     "react-zmage": "^0.8.5-beta.31",
@@ -104,11 +100,9 @@
     "redux-thunk": "2.3.0",
     "rsuite": "^4.3.4",
     "sass-loader": "7.3.1",
-    "save-dev": "0.0.1-security",
     "scroll-into-view": "^1.14.2",
     "showdown": "^1.9.1",
     "showdown-katex": "^0.8.0",
-    "slick-carousel": "^1.8.1",
     "store": "^2.0.12",
     "style-loader": "0.19.0",
     "styled-components": "^4.4.1",
@@ -118,14 +112,12 @@
     "webpack-dev-server": "^3.10.3",
     "webpack-manifest-plugin": "^2.2.0",
     "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20",
-    "xterm": "4.8.1",
-    "xterm-addon-fit": "0.4.0"
+    "wrap-md-editor": "^0.2.20"
   },
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",
-    "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
-    "test-build": "cross-env NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
+    "build": "NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
     "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
     "ana": "webpack-bundle-analyzer ./stats.json",
@@ -187,7 +179,7 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "http://localhost:3001",
+  "proxy": "http://localhost:3000",
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
@@ -195,7 +187,6 @@
     "babel-core": "^6.26.0",
     "babel-plugin-import": "^1.13.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
@@ -206,7 +197,6 @@
     "node-sass": "^4.12.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "purgecss": "^2.1.2",
-    "react-json-view": "^1.21.3",
     "reqwest": "^2.0.5",
     "resize-observer-polyfill": "^1.5.1",
     "terser-webpack-plugin": "^2.3.5",

public/css/edu-all.css

@@ -1,6 +1,5 @@
 /*头部导航条样式---2018-03-19--by-cs*/
 .newHeader {
-  background: #24292D !important;
   width: 100%;
   height: 60px !important;
   min-width: 1200px;
@@ -38,6 +37,78 @@
   box-sizing: border-box;
 }
 
+.head-nav ul#header-nav li {
+  float: left;
+  height: 60px;
+  line-height: 60px;
+  margin-right: 30px;
+  cursor: pointer;
+  position: relative;
+  font-size: 16px
+}
+
+.head-nav ul#header-nav li a {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li a:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li:last-child {
+  margin-right: 0px
+}
+
+.head-nav ul#header-nav li.active a {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li.active p {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li p:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li p {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li.active div ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active div ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active:after {
+  content: '';
+  position: absolute;
+  left: 0px;
+  top: auto;
+  bottom: 10px;
+  right: auto;
+  height: 2px;
+  width: 14px;
+  background-color: #459be5;
+}
+
 .nav-img {
   position: absolute;
   top: 2px;

public/css/edu-common.css

@@ -114,6 +114,14 @@ a:visited {
   color: #898989;
 }
 
+a:hover {
+  color: #FF7500;
+}
+
+a:hover.fa {
+  color: #FF7500;
+}
+
 input,
 textarea,
 select {

public/css/edu-main.css

@@ -97,6 +97,10 @@ a:visited {
   color: #05101a;
 }
 
+a:hover {
+  color: #459be5;
+}
+
 ol,
 ul,
 li {

public/css/edu-purge.css

@@ -1,4 +1,3 @@
-@charset "utf-8";
 /* 头部 */
 .header {
   width: 100%;
@@ -1272,7 +1271,7 @@ html body {
   font-size: 14px;
   line-height: 2.0;
   background: #fafafa;
-  font-family: "Microsoft YaHei", "SimSun";
+  font-family: "微软雅黑", "宋体";
   color: #05101a;
   height: 100%;
   position: relative;
@@ -1308,7 +1307,6 @@ td,
 span {
   margin: 0;
   padding: 0;
-  margin-bottom: 0px!important;
 }
 
 table,
@@ -1365,6 +1363,10 @@ a:visited {
   color: #05101a;
 }
 
+a:hover {
+  color: #459be5;
+}
+
 ol,
 ul,
 li {
@@ -1471,7 +1473,7 @@ a.edu-txt-w80,
 
 /*隐藏*/
 .none {
-  display: none!important;
+  display: none
 }
 
 .block {
@@ -1520,15 +1522,7 @@ a.edu-txt-w80,
 .font-16 {
   font-size: 16px !important;
 }
-.weight400{
-  font-weight: 400;
-}
-.weight500{
-  font-weight: 500;
-}
-.weight{
-  font-weight: bold;
-}
+
 .font-17 {
   font-size: 17px !important;
 }
@@ -1548,9 +1542,6 @@ a.edu-txt-w80,
 .font-25 {
   font-size: 25px !important;
 }
-.font-26 {
-  font-size: 26px !important;
-}
 
 .font-24 {
   font-size: 24px !important;
@@ -1572,9 +1563,6 @@ a.edu-txt-w80,
   font-size: 36px !important;
 }
 
-.font-40 {
-  font-size: 40px !important;
-}
 .font-50 {
   font-size: 50px !important;
 }
@@ -1760,20 +1748,12 @@ a.decoration {
   margin-bottom: 10px;
 }
 
-.mb12 {
-  margin-bottom: 12px;
-}
-
-.mb13 {
-  margin-bottom: 13px;
-}
-
 .mb14 {
   margin-bottom: 14px;
 }
 
 .mb15 {
-  margin-bottom: 15px!important;
+  margin-bottom: 15px;
 }
 
 .mb16 {
@@ -2366,6 +2346,7 @@ input::-ms-clear {
 /*中间部分宽度固定为1200*/
 .newMain {
   margin: 0 auto;
+  padding-bottom: 110px;
   min-width: 1200px;
 }
 
@@ -2444,23 +2425,13 @@ input::-ms-clear {
 .color-grey-c {
   color: #ccc !important;
 }
-a.hoverLine:hover{
-  text-decoration: underline;
-}
+
 .color-grey-cd {
   color: #cdcdcd !important;
 }
-.color-grey-d {
-  color: #ddd;
-}
-
 
 .color-grey-9 {
-  color: #999 !important;
-}
-
-a:hover{
-  color: #466AFF !important;
+  color: #999999 !important;
 }
 
 .color-grey-98 {
@@ -2495,23 +2466,33 @@ a:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover,a.color-ooo:hover {
-  color: #2A61FF !important;
+a.color-grey-3:hover {
+  color: #4cacff !important;
+}
+
+a.color-grey-9:hover,
+a.color-grey-8:hover,
+a.color-grey-c:hover {
+  color: #111C24 !important;
 }
 
 /*蓝色*/
 .color-blue {
-  color: #2A61FF !important;
-}
-.color-blue-file {
-  color: #4598FA!important;
+  color: #4CACFF !important;
 }
 /* 绿色 */
+.color-green-file{
+  color: #28BD6C;
+}
 /*主*/
 .color-blue_4C {
   color: #4CACFF !important;
 }
 
+a.color-blue:hover,
+a.color-blue_4C:hover {
+  color: #459BE6 !important;
+}
 
 /*橙色*/
 .color-orange {
@@ -3429,7 +3410,7 @@ a.user_bluebg_btn {
 }
 
 .cdefault {
-  cursor: default!important;
+  cursor: default
 }
 
 
@@ -3604,6 +3585,42 @@ a.user_bluebg_btn {
   margin-right: 5px;
 }
 
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+  position: fixed;
+  width: 40px;
+  height: 180px;
+  right: 0;
+  bottom: 80px;
+  z-index: 10;
+}
+
+.-task-sidebar div {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+  width: 40px;
+  background: #4CACFF;
+  color: #fff;
+  font-size: 20px;
+  text-align: center;
+  margin-bottom: 5px;
+  border-radius: 4px;
+}
+
+.-task-sidebar div i {
+  color: #fff;
+}
+
+.-task-sidebar div i:hover {
+  color: #fff !important;
+}
+
+.gotop {
+  background-color: rgba(208, 207, 207, 0.5) !important;
+  padding: 0px !important;
+}
+
 
 /***** loading ******/
 /*****载入中******/
@@ -3928,21 +3945,11 @@ html>body #ajax-indicator {
   max-height: 340px;
 }/*头部导航条样式---2018-03-19--by-cs*/
 
-.privateTag{
-  display: block;
-  padding:0px 6px;
-  border-radius: 12px;
-  border:1px solid #2FC25B;
-  height: 18px;
-  line-height: 18px;
-  font-size: 12px;
-  margin-left: 10px;
-  color: #2FC25B;
-}
 .head-nav {
   text-align: center;
   height: 70px;
   box-sizing: border-box;
+  min-width: 780px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -3964,7 +3971,7 @@ html>body #ajax-indicator {
   cursor: pointer;
   position: relative;
   font-size: 16px;
-  padding-right:40px;
+  padding:0px 20px;
 }
 
 .head-nav ul#header-nav li a {
@@ -4101,6 +4108,21 @@ em.vertical-line {
 
 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/
 
+/*底部*/
+.newFooter {
+  max-height: 110px;
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+}
 
 .footercon {
   border-bottom: 1px solid #47494d;
@@ -6696,19 +6718,4 @@ ul.count_ul li:not(:last-child):after {
 }
 input.ant-input-lg::placeholder{
 font-size: 14px !important;
-}
-p{
-  margin-bottom: 0px!important;
-}
-.toprightNum{
-  position: absolute;
-  right: 0px;
-  top:4px;
-  color: #999;
-}
-.ant-input, .ant-input .ant-input-suffix{
-  background-color: #fff!important;
-}
-.has-error .ant-input{
-  background-color: #FEF1F0!important;
 }

public/css/iconfont.json

@@ -5,965 +5,6 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
-    {
-      "icon_id": "24656750",
-      "name": "文件",
-      "font_class": "wenjian7",
-      "unicode": "e8e0",
-      "unicode_decimal": 59616
-    },
-    {
-      "icon_id": "630094",
-      "name": "向右箭头",
-      "font_class": "xiangyoujiantou",
-      "unicode": "e8de",
-      "unicode_decimal": 59614
-    },
-    {
-      "icon_id": "630095",
-      "name": "向左箭头",
-      "font_class": "xiangzuojiantou",
-      "unicode": "e8df",
-      "unicode_decimal": 59615
-    },
-    {
-      "icon_id": "24600282",
-      "name": "浏览icon@2x",
-      "font_class": "a-liulanicon2x",
-      "unicode": "e8dd",
-      "unicode_decimal": 59613
-    },
-    {
-      "icon_id": "24567893",
-      "name": "文件icon",
-      "font_class": "wenjianicon",
-      "unicode": "e8dc",
-      "unicode_decimal": 59612
-    },
-    {
-      "icon_id": "24527422",
-      "name": "圆圈@2x",
-      "font_class": "a-yuanquan2x",
-      "unicode": "e8db",
-      "unicode_decimal": 59611
-    },
-    {
-      "icon_id": "24378423",
-      "name": "项目标签",
-      "font_class": "xiangmubiaoqian",
-      "unicode": "e8da",
-      "unicode_decimal": 59610
-    },
-    {
-      "icon_id": "24368060",
-      "name": "icon",
-      "font_class": "icon",
-      "unicode": "e8ce",
-      "unicode_decimal": 59598
-    },
-    {
-      "icon_id": "24368061",
-      "name": "tar",
-      "font_class": "tar",
-      "unicode": "e8cf",
-      "unicode_decimal": 59599
-    },
-    {
-      "icon_id": "24289113",
-      "name": "复制 (2)",
-      "font_class": "a-fuzhi2",
-      "unicode": "e8d0",
-      "unicode_decimal": 59600
-    },
-    {
-      "icon_id": "24289114",
-      "name": "附件",
-      "font_class": "fujian1",
-      "unicode": "e8d1",
-      "unicode_decimal": 59601
-    },
-    {
-      "icon_id": "24289115",
-      "name": "编 辑",
-      "font_class": "a-bianji1",
-      "unicode": "e8d2",
-      "unicode_decimal": 59602
-    },
-    {
-      "icon_id": "24289116",
-      "name": "版本icon",
-      "font_class": "banbenicon",
-      "unicode": "e8d3",
-      "unicode_decimal": 59603
-    },
-    {
-      "icon_id": "24289117",
-      "name": "删除icon",
-      "font_class": "shanchuicon2",
-      "unicode": "e8d4",
-      "unicode_decimal": 59604
-    },
-    {
-      "icon_id": "24289118",
-      "name": "垃圾桶_icon@3x",
-      "font_class": "a-lajitong_icon3x",
-      "unicode": "e8d5",
-      "unicode_decimal": 59605
-    },
-    {
-      "icon_id": "24289119",
-      "name": "下拉按钮",
-      "font_class": "xialaanniu2",
-      "unicode": "e8d6",
-      "unicode_decimal": 59606
-    },
-    {
-      "icon_id": "24289120",
-      "name": "下载-icon",
-      "font_class": "xiazai-icon",
-      "unicode": "e8d7",
-      "unicode_decimal": 59607
-    },
-    {
-      "icon_id": "24289121",
-      "name": "master_icon",
-      "font_class": "master_icon1",
-      "unicode": "e8d8",
-      "unicode_decimal": 59608
-    },
-    {
-      "icon_id": "24289122",
-      "name": "上传icon",
-      "font_class": "shangchuanicon",
-      "unicode": "e8d9",
-      "unicode_decimal": 59609
-    },
-    {
-      "icon_id": "24059956",
-      "name": "个人资料",
-      "font_class": "gerenziliao1",
-      "unicode": "e8c7",
-      "unicode_decimal": 59591
-    },
-    {
-      "icon_id": "24059409",
-      "name": "里程碑icon",
-      "font_class": "lichengbeiicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
-    {
-      "icon_id": "24059410",
-      "name": "仓库设置icon",
-      "font_class": "cangkushezhiicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
-    {
-      "icon_id": "24059411",
-      "name": "动态icon",
-      "font_class": "dongtaiicon",
-      "unicode": "e88a",
-      "unicode_decimal": 59530
-    },
-    {
-      "icon_id": "24059412",
-      "name": "工作流icon",
-      "font_class": "gongzuoliuicon",
-      "unicode": "e88b",
-      "unicode_decimal": 59531
-    },
-    {
-      "icon_id": "24059413",
-      "name": "易修icon",
-      "font_class": "yixiuicon1",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
-    {
-      "icon_id": "24059414",
-      "name": "wiki icon",
-      "font_class": "a-wikiicon1",
-      "unicode": "e8c6",
-      "unicode_decimal": 59590
-    },
-    {
-      "icon_id": "24047186",
-      "name": "代码库icon",
-      "font_class": "daimakuicon1",
-      "unicode": "e8c5",
-      "unicode_decimal": 59589
-    },
-    {
-      "icon_id": "24047189",
-      "name": "我的通知",
-      "font_class": "wodetongzhi",
-      "unicode": "e8c8",
-      "unicode_decimal": 59592
-    },
-    {
-      "icon_id": "24047190",
-      "name": "通知管理",
-      "font_class": "tongzhiguanli",
-      "unicode": "e8c9",
-      "unicode_decimal": 59593
-    },
-    {
-      "icon_id": "24047191",
-      "name": "选中",
-      "font_class": "xuanzhong3",
-      "unicode": "e8ca",
-      "unicode_decimal": 59594
-    },
-    {
-      "icon_id": "24047192",
-      "name": "系统通知icon",
-      "font_class": "xitongtongzhiicon",
-      "unicode": "e8cb",
-      "unicode_decimal": 59595
-    },
-    {
-      "icon_id": "24047193",
-      "name": "消息",
-      "font_class": "xiaoxi2",
-      "unicode": "e8cc",
-      "unicode_decimal": 59596
-    },
-    {
-      "icon_id": "24047194",
-      "name": "ssh密钥",
-      "font_class": "sshmiyue",
-      "unicode": "e8cd",
-      "unicode_decimal": 59597
-    },
-    {
-      "icon_id": "24014152",
-      "name": "个人资料",
-      "font_class": "gerenziliao",
-      "unicode": "e8c4",
-      "unicode_decimal": 59588
-    },
-    {
-      "icon_id": "23655968",
-      "name": "新手指引",
-      "font_class": "xinshouzhiyin",
-      "unicode": "e8e4",
-      "unicode_decimal": 59620
-    },
-    {
-      "icon_id": "23655969",
-      "name": "新建项目",
-      "font_class": "xinjianxiangmu",
-      "unicode": "e8e6",
-      "unicode_decimal": 59622
-    },
-    {
-      "icon_id": "23658111",
-      "name": "加入课堂",
-      "font_class": "jiaruketang1",
-      "unicode": "e8e9",
-      "unicode_decimal": 59625
-    },
-    {
-      "icon_id": "23791639",
-      "name": "项目公告",
-      "font_class": "xiangmugonggao",
-      "unicode": "e8c2",
-      "unicode_decimal": 59586
-    },
-    {
-      "icon_id": "23791640",
-      "name": "成果",
-      "font_class": "chengguo",
-      "unicode": "e8c3",
-      "unicode_decimal": 59587
-    },
-    {
-      "icon_id": "23791410",
-      "name": "成交公告",
-      "font_class": "chengjiaogonggao",
-      "unicode": "e8c0",
-      "unicode_decimal": 59584
-    },
-    {
-      "icon_id": "23791411",
-      "name": "技术资产",
-      "font_class": "jishuzichan",
-      "unicode": "e8c1",
-      "unicode_decimal": 59585
-    },
-    {
-      "icon_id": "23790928",
-      "name": "废标公告",
-      "font_class": "feibiaogonggao",
-      "unicode": "e8bc",
-      "unicode_decimal": 59580
-    },
-    {
-      "icon_id": "23790929",
-      "name": "中标公告",
-      "font_class": "zhongbiaogonggao",
-      "unicode": "e8bd",
-      "unicode_decimal": 59581
-    },
-    {
-      "icon_id": "23790930",
-      "name": "更正公告",
-      "font_class": "gengzhenggonggao",
-      "unicode": "e8be",
-      "unicode_decimal": 59582
-    },
-    {
-      "icon_id": "23790931",
-      "name": "招标公告",
-      "font_class": "zhaobiaogonggao",
-      "unicode": "e8bf",
-      "unicode_decimal": 59583
-    },
-    {
-      "icon_id": "23732532",
-      "name": "文件",
-      "font_class": "wenjian6",
-      "unicode": "e8ba",
-      "unicode_decimal": 59578
-    },
-    {
-      "icon_id": "23732533",
-      "name": "文件夹",
-      "font_class": "wenjianjia4",
-      "unicode": "e8bb",
-      "unicode_decimal": 59579
-    },
-    {
-      "icon_id": "23642443",
-      "name": "取消关注",
-      "font_class": "quxiaoguanzhu",
-      "unicode": "e89a",
-      "unicode_decimal": 59546
-    },
-    {
-      "icon_id": "23642444",
-      "name": "点赞_icon",
-      "font_class": "dianzan_icon",
-      "unicode": "e8a2",
-      "unicode_decimal": 59554
-    },
-    {
-      "icon_id": "23639530",
-      "name": "文件",
-      "font_class": "wenjian5",
-      "unicode": "e896",
-      "unicode_decimal": 59542
-    },
-    {
-      "icon_id": "23639533",
-      "name": "文件夹",
-      "font_class": "wenjianjia3",
-      "unicode": "e8a9",
-      "unicode_decimal": 59561
-    },
-    {
-      "icon_id": "23639440",
-      "name": "复制icon",
-      "font_class": "fuzhiicon",
-      "unicode": "e886",
-      "unicode_decimal": 59526
-    },
-    {
-      "icon_id": "23639422",
-      "name": "主页-fill",
-      "font_class": "zhuye-fill",
-      "unicode": "e876",
-      "unicode_decimal": 59510
-    },
-    {
-      "icon_id": "23639423",
-      "name": "代码库icon",
-      "font_class": "daimakuicon",
-      "unicode": "e884",
-      "unicode_decimal": 59524
-    },
-    {
-      "icon_id": "23572260",
-      "name": "新建",
-      "font_class": "xinjian2",
-      "unicode": "e8b0",
-      "unicode_decimal": 59568
-    },
-    {
-      "icon_id": "23567674",
-      "name": "协议icon",
-      "font_class": "xieyiicon",
-      "unicode": "e870",
-      "unicode_decimal": 59504
-    },
-    {
-      "icon_id": "23567675",
-      "name": "内存icon",
-      "font_class": "neicunicon",
-      "unicode": "e891",
-      "unicode_decimal": 59537
-    },
-    {
-      "icon_id": "23567676",
-      "name": "自述文件_icon",
-      "font_class": "zishuwenjian_icon",
-      "unicode": "e8a6",
-      "unicode_decimal": 59558
-    },
-    {
-      "icon_id": "23472253",
-      "name": "标签icon",
-      "font_class": "biaoqianicon",
-      "unicode": "e882",
-      "unicode_decimal": 59522
-    },
-    {
-      "icon_id": "23472254",
-      "name": "编 辑",
-      "font_class": "a-bianji",
-      "unicode": "e883",
-      "unicode_decimal": 59523
-    },
-    {
-      "icon_id": "23472258",
-      "name": "链接icon",
-      "font_class": "lianjieicon",
-      "unicode": "e887",
-      "unicode_decimal": 59527
-    },
-    {
-      "icon_id": "23472259",
-      "name": "合并请求icon",
-      "font_class": "hebingqingqiuicon",
-      "unicode": "e888",
-      "unicode_decimal": 59528
-    },
-    {
-      "icon_id": "23472263",
-      "name": "默认点赞_icon",
-      "font_class": "morendianzan_icon",
-      "unicode": "e88e",
-      "unicode_decimal": 59534
-    },
-    {
-      "icon_id": "23472265",
-      "name": "目录icon",
-      "font_class": "muluicon",
-      "unicode": "e894",
-      "unicode_decimal": 59540
-    },
-    {
-      "icon_id": "23472267",
-      "name": "设 置",
-      "font_class": "a-shezhi",
-      "unicode": "e899",
-      "unicode_decimal": 59545
-    },
-    {
-      "icon_id": "23472269",
-      "name": "提交icon",
-      "font_class": "tijiaoicon",
-      "unicode": "e89e",
-      "unicode_decimal": 59550
-    },
-    {
-      "icon_id": "23472270",
-      "name": "默认关注_ICON",
-      "font_class": "morenguanzhu_ICON",
-      "unicode": "e89f",
-      "unicode_decimal": 59551
-    },
-    {
-      "icon_id": "23472272",
-      "name": "下拉按钮",
-      "font_class": "xialaanniu1",
-      "unicode": "e8a4",
-      "unicode_decimal": 59556
-    },
-    {
-      "icon_id": "23472276",
-      "name": "左滑icon",
-      "font_class": "zuohuaicon",
-      "unicode": "e8b5",
-      "unicode_decimal": 59573
-    },
-    {
-      "icon_id": "23472277",
-      "name": "master_icon",
-      "font_class": "master_icon",
-      "unicode": "e8b6",
-      "unicode_decimal": 59574
-    },
-    {
-      "icon_id": "23472278",
-      "name": "默认复刻_icon",
-      "font_class": "morenfuke_icon",
-      "unicode": "e8b7",
-      "unicode_decimal": 59575
-    },
-    {
-      "icon_id": "23472279",
-      "name": "wiki icon",
-      "font_class": "a-wikiicon",
-      "unicode": "e8b8",
-      "unicode_decimal": 59576
-    },
-    {
-      "icon_id": "23472280",
-      "name": "易修icon",
-      "font_class": "yixiuicon",
-      "unicode": "e8b9",
-      "unicode_decimal": 59577
-    },
-    {
-      "icon_id": "23436350",
-      "name": "缩放",
-      "font_class": "suofang",
-      "unicode": "e87f",
-      "unicode_decimal": 59519
-    },
-    {
-      "icon_id": "23436351",
-      "name": "放大icon",
-      "font_class": "fangdaicon",
-      "unicode": "e881",
-      "unicode_decimal": 59521
-    },
-    {
-      "icon_id": "23384231",
-      "name": "搜索_icon",
-      "font_class": "sousuo_icon1",
-      "unicode": "e873",
-      "unicode_decimal": 59507
-    },
-    {
-      "icon_id": "23384232",
-      "name": "欢迎_icon",
-      "font_class": "huanying_icon",
-      "unicode": "e878",
-      "unicode_decimal": 59512
-    },
-    {
-      "icon_id": "23384233",
-      "name": "文件夹",
-      "font_class": "wenjianjia2",
-      "unicode": "e879",
-      "unicode_decimal": 59513
-    },
-    {
-      "icon_id": "23384234",
-      "name": "删除icon",
-      "font_class": "shanchuicon1",
-      "unicode": "e87a",
-      "unicode_decimal": 59514
-    },
-    {
-      "icon_id": "23261798",
-      "name": "请求icon",
-      "font_class": "qingqiuicon",
-      "unicode": "e871",
-      "unicode_decimal": 59505
-    },
-    {
-      "icon_id": "23261799",
-      "name": "响应icon",
-      "font_class": "xiangyingicon",
-      "unicode": "e87c",
-      "unicode_decimal": 59516
-    },
-    {
-      "icon_id": "23144143",
-      "name": "多选选中",
-      "font_class": "duoxuanxuanzhong",
-      "unicode": "e88f",
-      "unicode_decimal": 59535
-    },
-    {
-      "icon_id": "23144144",
-      "name": "错误icon",
-      "font_class": "cuowuicon",
-      "unicode": "e890",
-      "unicode_decimal": 59536
-    },
-    {
-      "icon_id": "23144146",
-      "name": "成功icon",
-      "font_class": "chenggongicon",
-      "unicode": "e892",
-      "unicode_decimal": 59538
-    },
-    {
-      "icon_id": "23144147",
-      "name": "未选中响应icon",
-      "font_class": "weixuanzhongxiangyingicon",
-      "unicode": "e893",
-      "unicode_decimal": 59539
-    },
-    {
-      "icon_id": "23144149",
-      "name": "必填icon",
-      "font_class": "bitianicon",
-      "unicode": "e895",
-      "unicode_decimal": 59541
-    },
-    {
-      "icon_id": "23144151",
-      "name": "未选中项目标签icon",
-      "font_class": "weixuanzhongxiangmubiaoqianicon",
-      "unicode": "e897",
-      "unicode_decimal": 59543
-    },
-    {
-      "icon_id": "23144152",
-      "name": "列表icon",
-      "font_class": "liebiaoicon",
-      "unicode": "e898",
-      "unicode_decimal": 59544
-    },
-    {
-      "icon_id": "23144158",
-      "name": "协作者管理icon",
-      "font_class": "xiezuozheguanliicon",
-      "unicode": "e8a1",
-      "unicode_decimal": 59553
-    },
-    {
-      "icon_id": "23144160",
-      "name": "选中分支icon",
-      "font_class": "xuanzhongfenzhiicon",
-      "unicode": "e8a3",
-      "unicode_decimal": 59555
-    },
-    {
-      "icon_id": "23144162",
-      "name": "选中基本设置icon",
-      "font_class": "xuanzhongjibenshezhiicon",
-      "unicode": "e8a5",
-      "unicode_decimal": 59557
-    },
-    {
-      "icon_id": "23144165",
-      "name": "选中项目标签icon",
-      "font_class": "xuanzhongxiangmubiaoqianicon",
-      "unicode": "e8aa",
-      "unicode_decimal": 59562
-    },
-    {
-      "icon_id": "23144167",
-      "name": "选中webhook icon",
-      "font_class": "a-xuanzhongwebhookicon",
-      "unicode": "e8af",
-      "unicode_decimal": 59567
-    },
-    {
-      "icon_id": "23046290",
-      "name": "shanchu_tc_icon",
-      "font_class": "shanchu_tc_icon",
-      "unicode": "e88c",
-      "unicode_decimal": 59532
-    },
-    {
-      "icon_id": "23046293",
-      "name": "wiki_icon",
-      "font_class": "wiki_icon",
-      "unicode": "e88d",
-      "unicode_decimal": 59533
-    },
-    {
-      "icon_id": "23046244",
-      "name": "导入模版_icon",
-      "font_class": "daorumoban_icon",
-      "unicode": "e86f",
-      "unicode_decimal": 59503
-    },
-    {
-      "icon_id": "23046252",
-      "name": "错误",
-      "font_class": "cuowu",
-      "unicode": "e872",
-      "unicode_decimal": 59506
-    },
-    {
-      "icon_id": "23046255",
-      "name": "更多_icon",
-      "font_class": "gengduo_icon",
-      "unicode": "e874",
-      "unicode_decimal": 59508
-    },
-    {
-      "icon_id": "23046258",
-      "name": "复层关闭_icon",
-      "font_class": "fucengguanbi_icon",
-      "unicode": "e875",
-      "unicode_decimal": 59509
-    },
-    {
-      "icon_id": "23046268",
-      "name": "删除icon",
-      "font_class": "shanchuicon",
-      "unicode": "e877",
-      "unicode_decimal": 59511
-    },
-    {
-      "icon_id": "23046273",
-      "name": "搜索_删除icon",
-      "font_class": "sousuo_shanchuicon",
-      "unicode": "e87b",
-      "unicode_decimal": 59515
-    },
-    {
-      "icon_id": "23046275",
-      "name": "搜索_icon",
-      "font_class": "sousuo_icon",
-      "unicode": "e87d",
-      "unicode_decimal": 59517
-    },
-    {
-      "icon_id": "23046276",
-      "name": "文档预览_icon",
-      "font_class": "wendangyulan_icon",
-      "unicode": "e87e",
-      "unicode_decimal": 59518
-    },
-    {
-      "icon_id": "23046278",
-      "name": "下拉按钮",
-      "font_class": "xialaanniu",
-      "unicode": "e880",
-      "unicode_decimal": 59520
-    },
-    {
-      "icon_id": "22906287",
-      "name": "二次确认_icon",
-      "font_class": "erciqueren_icon",
-      "unicode": "e867",
-      "unicode_decimal": 59495
-    },
-    {
-      "icon_id": "22906288",
-      "name": "选中ssh_icon",
-      "font_class": "xuanzhongssh_icon",
-      "unicode": "e868",
-      "unicode_decimal": 59496
-    },
-    {
-      "icon_id": "22906289",
-      "name": "未选中安全设置_icon",
-      "font_class": "weixuanzhonganquanshezhi_icon",
-      "unicode": "e869",
-      "unicode_decimal": 59497
-    },
-    {
-      "icon_id": "22906290",
-      "name": "未选中ssh_icon",
-      "font_class": "weixuanzhongssh_icon",
-      "unicode": "e86a",
-      "unicode_decimal": 59498
-    },
-    {
-      "icon_id": "22906291",
-      "name": "选中安全设置_icon",
-      "font_class": "xuanzhonganquanshezhi_icon",
-      "unicode": "e86b",
-      "unicode_decimal": 59499
-    },
-    {
-      "icon_id": "22906292",
-      "name": "删除_icon",
-      "font_class": "shanchu_icon",
-      "unicode": "e86c",
-      "unicode_decimal": 59500
-    },
-    {
-      "icon_id": "22906293",
-      "name": "列表ssh_icon",
-      "font_class": "liebiaossh_icon",
-      "unicode": "e86e",
-      "unicode_decimal": 59502
-    },
-    {
-      "icon_id": "17575494",
-      "name": "file-submodule",
-      "font_class": "file-submodule",
-      "unicode": "e866",
-      "unicode_decimal": 59494
-    },
-    {
-      "icon_id": "7539612",
-      "name": "nv",
-      "font_class": "nv1",
-      "unicode": "e864",
-      "unicode_decimal": 59492
-    },
-    {
-      "icon_id": "7539613",
-      "name": "nan",
-      "font_class": "nan1",
-      "unicode": "e865",
-      "unicode_decimal": 59493
-    },
-    {
-      "icon_id": "21936935",
-      "name": "邮箱",
-      "font_class": "youxiang",
-      "unicode": "e8b2",
-      "unicode_decimal": 59570
-    },
-    {
-      "icon_id": "21936924",
-      "name": "单位",
-      "font_class": "danwei",
-      "unicode": "e8a7",
-      "unicode_decimal": 59559
-    },
-    {
-      "icon_id": "21936925",
-      "name": "待办事项",
-      "font_class": "daibanshixiang",
-      "unicode": "e8a8",
-      "unicode_decimal": 59560
-    },
-    {
-      "icon_id": "21936928",
-      "name": "概览",
-      "font_class": "gailan",
-      "unicode": "e8ab",
-      "unicode_decimal": 59563
-    },
-    {
-      "icon_id": "21936929",
-      "name": "男",
-      "font_class": "nan",
-      "unicode": "e8ac",
-      "unicode_decimal": 59564
-    },
-    {
-      "icon_id": "21936930",
-      "name": "女",
-      "font_class": "nv",
-      "unicode": "e8ad",
-      "unicode_decimal": 59565
-    },
-    {
-      "icon_id": "21936931",
-      "name": "工作流",
-      "font_class": "gongzuoliu1",
-      "unicode": "e8ae",
-      "unicode_decimal": 59566
-    },
-    {
-      "icon_id": "21936934",
-      "name": "数据统计",
-      "font_class": "shujutongji",
-      "unicode": "e8b1",
-      "unicode_decimal": 59569
-    },
-    {
-      "icon_id": "21936936",
-      "name": "项目",
-      "font_class": "xiangmu",
-      "unicode": "e8b3",
-      "unicode_decimal": 59571
-    },
-    {
-      "icon_id": "21936937",
-      "name": "组织",
-      "font_class": "zuzhi",
-      "unicode": "e8b4",
-      "unicode_decimal": 59572
-    },
-    {
-      "icon_id": "14835599",
-      "name": "右箭头",
-      "font_class": "arrowRight",
-      "unicode": "e863",
-      "unicode_decimal": 59491
-    },
-    {
-      "icon_id": "21151489",
-      "name": "箭头镂空-左",
-      "font_class": "jiantouloukong-zuo",
-      "unicode": "e861",
-      "unicode_decimal": 59489
-    },
-    {
-      "icon_id": "21151557",
-      "name": "箭头镂空-右",
-      "font_class": "jiantouloukong-you",
-      "unicode": "e862",
-      "unicode_decimal": 59490
-    },
-    {
-      "icon_id": "21568989",
-      "name": "分享",
-      "font_class": "fenxiang1",
-      "unicode": "e89c",
-      "unicode_decimal": 59548
-    },
-    {
-      "icon_id": "21568990",
-      "name": "回到顶部",
-      "font_class": "huidaodingbu1",
-      "unicode": "e89d",
-      "unicode_decimal": 59549
-    },
-    {
-      "icon_id": "21568993",
-      "name": "帮助",
-      "font_class": "bangzhu",
-      "unicode": "e8a0",
-      "unicode_decimal": 59552
-    },
-    {
-      "icon_id": "991344",
-      "name": "提交",
-      "font_class": "tijiao",
-      "unicode": "e860",
-      "unicode_decimal": 59488
-    },
-    {
-      "icon_id": "1852052",
-      "name": "数据库",
-      "font_class": "dataBase",
-      "unicode": "e85a",
-      "unicode_decimal": 59482
-    },
-    {
-      "icon_id": "4165948",
-      "name": "文件",
-      "font_class": "wenjian4",
-      "unicode": "e85b",
-      "unicode_decimal": 59483
-    },
-    {
-      "icon_id": "17165148",
-      "name": "链接",
-      "font_class": "lianjie2",
-      "unicode": "e85c",
-      "unicode_decimal": 59484
-    },
-    {
-      "icon_id": "17463741",
-      "name": "分支",
-      "font_class": "fenzhi2",
-      "unicode": "e85d",
-      "unicode_decimal": 59485
-    },
-    {
-      "icon_id": "17972521",
-      "name": "分支-3",
-      "font_class": "fenzhi-3",
-      "unicode": "e85e",
-      "unicode_decimal": 59486
-    },
-    {
-      "icon_id": "18682391",
-      "name": "天平",
-      "font_class": "tianping",
-      "unicode": "e85f",
-      "unicode_decimal": 59487
-    },
     {
       "icon_id": "1770896",
       "name": "撤销",
@@ -5146,7 +4187,7 @@
     {
       "icon_id": "1004630",
       "name": "点赞2",
-      "font_class": "dianzaned",
+      "font_class": "dianzan1",
       "unicode": "e639",
       "unicode_decimal": 58937
     },

public/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh-CN" class="notranslate translated-ltr" translate="no">
+<html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name=”Keywords” Content=”trustie,trustieforge,forge,确实让创建更美好,协同开发平台″>

public/js/editormd/editormd.min.js

@@ -3319,9 +3319,9 @@
                     text = text.replace(emailReg, function ($1, $2, $3, $4) {
                         return $1.replace(/@/g, "_#_@_#_");
                     });
-                    // " + editormd.urls.atLinkBase + "" + $2 + "
+
                     text = text.replace(atLinkReg, function ($1, $2) {
-                        return "<span title=\"&#64;" + $2 + "\" class=\"at-link\"> " + $1 + " </span>";
+                        return "<a href=\"" + editormd.urls.atLinkBase + "" + $2 + "\" title=\"&#64;" + $2 + "\" class=\"at-link\">" + $1 + "</a>";
                     }).replace(/_#_&#64;_#_/g, "@");
                 }
 

src/App.css

@@ -60,13 +60,12 @@ body {
 .ant-progress-textno {
   color: #f5222d;
 }
-.CodeMirror pre.CodeMirror-line{
-  font-size: 16px!important;
-}
+
 /* md多空格 */
 .markdown-body p {
   margin:10px 0px!important;
   font-size: 16px !important;
+  line-height: 2 !important;
   white-space: pre-wrap;
 }
 
@@ -88,10 +87,6 @@ body {
   border-left: 1px solid rgb(221, 221, 221);
   /* 某些情况下，被cm盖住了 */
   z-index: 99;
-  padding:8px 8px 50px;
-}
-.editormd-preview .markdown-body{
-  padding:0px !important;
 }
 
 /* 图片点击放大的场景，隐藏图片链接 */

src/App.js

@@ -3,7 +3,7 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	// BrowserRouter as Router,
+	BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
@@ -17,9 +17,10 @@ import marked from './common/marked';
 import moment from 'moment'
 
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
-import SiderBar from './forge/Component/SiderBar'
 
-import { SnackbarHOC } from 'educoder';
+import history from './history';
+
+import { SnackbarHOC } from 'educoder'
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@@ -39,16 +40,6 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
-// forge项目详情
-const ProjectDetail = Loadable({
-  loader: () => import("./forge/Main/DetailAdaptor"),
-  loading: Loading,
-});
-//forge安全设置
-const Security = Loadable({
-	loader: () => import('./forge/SecuritySetting/Index'),
-	loading: Loading,
-})
 //forge项目-devOps详情
 const OpsDetail = Loadable({
 	loader: () => import('./forge/DevOps/opsDetail'),
@@ -83,28 +74,18 @@ const EducoderLogin = Loadable({
 	loader: () => import('./modules/login/EducoderLogin'),
 	loading: Loading,
 })
-const Search = Loadable({
-	loader: () => import('./modules/search/'),
+
+// 成果库
+const Achieve = Loadable({
+	loader: () => import('./achieveRequirement/achieve'),
 	loading: Loading,
 })
-const WikiPreview = Loadable({
-	loader: () => import('./forge/Wiki/Preview'),
+// 需求管理
+const Requirement = Loadable({
+	loader: () => import('./achieveRequirement/requirement'),
 	loading: Loading,
 })
 
-const ProjectIndex = Loadable({
-	loader: () => import("./forge/Index"),
-	loading: Loading,
-});
-
-// const CreateMerge = Loadable({
-//   loader: () => import('./forge/Merge/NewMerge'),
-//   loading: Loading,
-// })
-
-// 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
-const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
-
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -114,51 +95,6 @@ class App extends Component {
 			mydisplay: false,
 			occupation: 0,
 			mygetHelmetapi: null,
-			pathType: null,
-			pathName: null,
-		}
-	}
-
-	UNSAFE_componentWillMount() {
-		initAxiosInterceptors(this.props);
-		let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
-		pathname && this.getPathnameType(pathname);
-
-		// 添加路由监听，决定组织还是个人
-		this.unlisten = this.props.history.listen((location) => {
-			let newPathname = location.pathname.split('/')[1];
-			if (this.state.pathName !== newPathname) {
-				// this.setState({ pathType: '' });
-				newPathname && this.getPathnameType(newPathname);
-			}
-		});
-	}
-
-	shouldComponentUpdate(nextProps, nextState) {
-		// (!keyWord.includes(this.props.location.pathname.split('/')[1])) &&
-		if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	getPathnameType = (pathname) => {
-		if (!keyWord.includes(pathname)) {
-			let url = `/owners/${pathname}.json`;
-			axios.get(url).then((response) => {
-				if (response && response.status === 200) {
-					this.setState({
-						pathType: response.data.type || '404',
-						pathName: pathname,
-					})
-				}
-			});
-		}else{
-			this.setState({
-				pathType: pathname,
-				pathName: pathname,
-			});
 		}
 	}
 
@@ -175,22 +111,43 @@ class App extends Component {
 			Addcoursestypes: false
 		})
 	};
+	ModalCancelsy = () => {
+		this.setState({
+			mydisplay: false,
+		})
+		window.location.href = "/";
+	};
+	ModalshowCancelsy = () => {
+		this.setState({
+			mydisplay: true,
+		})
+	};
 
+	disableVideoContextMenu = () => {
+		window.$("body").on("mousedown", "video", function (event) {
+			if (event.which === 3) {
+				window.$('video').bind('contextmenu', function () { return false; });
+			} else {
+				window.$('video').unbind('contextmenu');
+			}
+		});
+	}
 	componentDidMount() {
 		document.title = "loading...";
+		this.disableVideoContextMenu();
+		history.listen(() => {
+			this.forceUpdate()
+			const $ = window.$
+			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
+		});
 
+		initAxiosInterceptors(this.props);
 		this.getAppdata();
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
-
 	}
-
-	componentWillUnmount() {
-		this.unlisten && this.unlisten(); // 执行解绑
-	}
-
 	//修改登录方法
 	Modifyloginvalue = () => {
 		this.setState({
@@ -261,139 +218,95 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi, pathType} = this.state;
-		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-						<SiderBar />
-						{/* <Router> */}
-						<Switch>
-							{/* wiki预览 */}
-							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
-								(props) => {
-									return (<WikiPreview {...this.props} {...props} {...this.state} />)
-								}
-							} />
-
-							{/* 项目PR */}
-							<Route path="/:owner/:projectsId/compare"
-								render={
-									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
-								}
-							></Route>
-
-							{/*项目*/}
-							<Route
-								path={"/:owner/:projectId/devops/:opsId/detail"}
-								render={
-									(props) => {
-										return (<OpsDetail {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-							<Route
-								path={"/settings"}
-								render={
-									(props) => {
-										return (<Security {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-
-							<Route
-								path="/register"
-								render={
-									(props) => {
-										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-									}
-								}
-							/>
-							{/*403*/}
-							<Route path="/403" component={Shixunauthority} />
-
-							<Route path="/500" component={http500} />
-
-							{/*404*/}
-							<Route path="/nopage" component={Shixunnopage} />
-
-							{/* 查询 */}
-							<Route path="/search" component={Search} />
-
-							<Route exact path="/explore"
-								render={
-									(props) => (
-											<ProjectIndex {...this.props} {...props} />
-									)
-								}
-							/>
-
-
-							{/* 组织 */}
-							<Route path={"/organize"}
-								render={
-									(props) => {
-										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-									}
-								}>
-							</Route>
-							
-							{/*新建项目等*/}
-							<Route
-								path={"/projects"}
-								render={
-									(props) => {
-										return (<Projects {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-
-							{/* 判断为用户/组织，并进入对应页面 */}
-							{
-								pathType === 'User' ?
-									<Route exact path="/:username"
-										render={
-											(props) => {
-												return (<InfosIndex {...this.props} {...this.state} />)
-											}
+						<Router>
+							<Switch>
+								{/*项目*/}
+								<Route
+									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
+									render={
+										(props) => {
+											return (<OpsDetail {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
+								{/*项目*/}
+								<Route
+									path={"/projects"}
+									render={
+										(props) => {
+											return (<Projects {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
+								<Route
+									path="/register"
+									render={
+										(props) => {
+											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 										}
-									/> : pathType === 'Organization' ? <Route path={"/:OIdentifier"}
-										render={
-											(props) => {
-												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-											}
-										}>
-									</Route> : pathType === '404' ? <Route component={Shixunnopage} />:
-										<Route exact path="/"
-											render={
-												(props) => (
-													personal && personal.length > 0 ?
-														<InfosIndex {...this.props} {...props} />
-														:
-														<ProjectIndex {...this.props} {...props} />
-												)
-											}
-										/>
-								// <Route path="/" component={Loading} />
-								// <Route path="/" component={Shixunnopage} /> 
-							}
-
-
-
-							{/* 个人主页 */}
-							<Route path="/:username"
-								render={
-									(props) => {
-										return (<InfosIndex {...this.props} {...this.state} />)
 									}
-								}></Route>
+								/>
+								{/*403*/}
+								<Route path="/403" component={Shixunauthority} />
+
+								<Route path="/500" component={http500} />
+								<Route path={"/organize"}
+									render={
+										(props) => {
+											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+										}
+									}>
+								</Route>
+								{/*404*/}
+								<Route path="/nopage" component={Shixunnopage} />
+								{/* 个人主页 */}
+								<Route path="/users/:username"
+									render={
+										(props) => {
+											return (<InfosIndex {...this.props} {...this.state} />)
+										}
+									}></Route>
+
+								{/*成果库*/}
+								<Route
+									path={"/achieve"}
+									render={
+										(props) => {
+											return (<Achieve {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
+
+								{/*需求管理/创客行动*/}
+								<Route
+									path={"/requirement"}
+									render={
+										(props) => {
+											return (<Requirement {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
+
+								<Route exact path="/"
+									render={
+										(props) => (
+											<Projects {...this.props} {...props} {...this.state}></Projects>
+										)
+									}
+								/>
 
 
-							<Route component={Shixunnopage} />
-						</Switch>
-						{/* </Router> */}
+
+								<Route component={Shixunnopage} />
+
+
+							</Switch>
+						</Router>
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>

src/AppConfig.js

@@ -2,17 +2,17 @@ import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
 import { broadcastChannelOnmessage, isDev, queryString } from 'educoder';
 import { notification } from 'antd';
-
+import cookie from 'react-cookies';
 import './index.css';
-
 let message501 = false;
+
 broadcastChannelOnmessage('refreshPage', () => {
-  window.location.reload();
+  window.location.reload()
 })
 
 function locationurl(list) {
   if (window.location.port !== "3007") {
-  window.location.href = list
+    window.location.href = list
   }
 }
 // TODO 开发期多个身份切换
@@ -24,22 +24,55 @@ if (isDev) {
     parsed = queryString.parse(_search);
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
-  window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+    window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 's'
 }                 
+function clearAllCookie() {
+  cookie.remove('_educoder_session', { path: '/' });
+  cookie.remove('autologin_trustie', { path: '/' });
+  setpostcookie()
+}
+// clearAllCookie();
+function setpostcookie() {
+  const str = window.location.pathname;
+  if (str.indexOf("/wxcode") !== -1) {
+    cookie.remove('_educoder_session', { path: '/' });
+    cookie.remove('autologin_trustie', { path: '/' });
+    const _params = window.location.search;
+    if (_params) {
+      let _search = _params.split('?')[1];
+      let _educoder_sessions = _search.split('&')[0].split('=');
+      cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
+      let autologin_trusties = _search.split('&')[1].split('=');
+      cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
+    }
+  }
+}
+setpostcookie();
+
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
-  // 判断网络是否连接
-  initOnlineOfflineListener();
+  initOnlineOfflineListener()
+  // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
+  var
+    proxy = "http://localhost:3000";
+    proxy = "http://117.50.100.12:49999";
 
-  var proxy = "https://testforgeplus.trustie.net";
+  const requestMap = {};
+  window.setfalseInRequestMap = function (keyName) {
+    requestMap[keyName] = false;
+  }
   //响应前的设置
   axios.interceptors.request.use(
     config => {
-      if(config.url.indexOf("http") !== -1) {
+      setpostcookie()
+      clearAllCookie()
+
+      if (config.url.indexOf(proxy) !== -1 || config.url.indexOf("http") !== -1) {
         return config
       }
-      requestProxy(config);
+      requestProxy(config)
+
       let url = `/api${config.url}`;
 
       if (`${config[0]}` !== `true`) {
@@ -53,12 +86,17 @@ export function initAxiosInterceptors(props) {
         } else {
           config.url = url;
         }
+        setpostcookie();
+      }
+      if (config.url.indexOf('update_file') === -1) {
+        requestMap[config.url] = true;
+        window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
       }
       return config;
     },
     err => {
       return Promise.reject(err);
-  });
+    });
 
   axios.interceptors.response.use(function (response) {
     if (response === undefined) {
@@ -85,10 +123,7 @@ export function initAxiosInterceptors(props) {
     }
 
     if (response.data.status === 404) {
-      let responseURL = response.request ? response.request.responseURL:'';
-      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
-        locationurl('/nopage');
-      }
+      locationurl('/nopage');
     }
 
     if (response.data.status === 500) {
@@ -110,6 +145,8 @@ export function initAxiosInterceptors(props) {
         message501 = false
       }, 2000);
     }
+    requestMap[response.config.url] = false;
+    setpostcookie();
     return response;
   }, function (error) {
     return Promise.reject(error);

src/Loading.js

@@ -9,7 +9,20 @@ class Loading extends Component {
 	}
 
 	render() {
-		return ""
+		return (
+			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
+				<style>
+					{
+						`
+						 .margintop{
+						   margin-top:20%;
+						 }
+						`
+					}
+				</style>
+				<Spin size="large" className={"margintop"} />
+			</div>
+		);
 	}
 }
 

src/achieveRequirement/achieve.js

@@ -0,0 +1,97 @@
+import React, { Component } from "react";
+
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
+import Loadable from "react-loadable";
+import Loading from "../Loading";
+import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
+import './index.scss';
+
+const AchieveIndex = Loadable({
+  loader: () => import("./achieve/achieveList"),
+  loading: Loading,
+});
+const AchieveDetail = Loadable({
+  loader: () => import("./achieve/achieveDetail"),
+  loading: Loading,
+});
+const AchieveMine = Loadable({
+  loader: () => import("./achieve/achieveMine"),
+  loading: Loading,
+});
+const AchieveAdd = Loadable({
+  loader: () => import("./achieve/achieveEdit"),
+  loading: Loading,
+});
+const AchieveEdit = Loadable({
+  loader: () => import("./achieve/achieveEdit"),
+  loading: Loading,
+});
+
+class Index extends Component {
+  render() {
+    return (
+      <div className="newMain clearfix">
+        <Switch {...this.props}>
+
+          <Route
+            path="/achieve/achieveDetail/:achieveId"
+            render={(props) => (
+              <AchieveDetail {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/achieve/achieveMine"
+            render={(props) => (
+              <AchieveMine {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/achieve/achieveAdd"
+            render={(props) => (
+              <AchieveAdd {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/achieve/achieveEdit/:achieveId"
+            render={(props) => (
+              <AchieveEdit {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/achieve"
+            render={(props) => (
+              <AchieveIndex {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/"
+            render={(props) => (
+              <AchieveIndex {...this.props} {...props} />
+            )}
+          ></Route>
+
+          {/* <Route
+            exact
+            path="/"
+            render={(props) => (
+              this.props.current_user && this.props.current_user.login ?
+              <Infos {...this.props} {...props} />
+              :
+              <AchieveIndex {...this.props} {...props} />
+            )}
+          ></Route> */}
+        </Switch>
+      </div>
+    );
+  }
+}
+export default withRouter(
+  ImageLayerOfCommentHOC({
+    imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+    parentSelector: ".newMain",
+  })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
+);

src/achieveRequirement/achieve/achieveDetail/index.jsx

@@ -0,0 +1,142 @@
+import React, { useEffect, useState } from 'react';
+import { Descriptions, Modal } from 'antd';
+import { Document, Page, pdfjs } from 'react-pdf';
+import DelModal from '../../components/DelModal';
+import { httpUrl } from '../../../fetch';
+import { deleteAchieve, getAchieveDetail } from '../api';
+import './index.scss';
+
+pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
+
+export default (props) => {
+  const { match, history, current_user } = props;
+  const id = match.params.achieveId;
+  const [achiveForm, setAchiveForm] = useState({});
+  const [createUserId, setCreateUserId] = useState("");
+  const [visible, setVisible] = useState(false);
+  const [fileType, setFileType] = useState(4);
+  const [fileUrl, setFileUrl] = useState(4);
+  const [numPages, setNumPages] = useState(null);
+
+  useEffect(() => {
+    getAchieveDetail(id).then(data => {
+      setAchiveForm(data);
+      setCreateUserId(data.user.id);
+    })
+  }, [id]);
+
+  function editItem() {
+    props.history.push(`/achieve/achieveEdit/${id}`);
+  }
+
+  function deletItem() {
+    DelModal(() => {
+      deleteAchieve(id).then(res => {
+        if (res.code === '1') {
+          props.showNotification("删除成功");
+          history.go(-1);
+        } else {
+          props.showNotification("删除失败");
+        }
+      })
+    });
+  }
+
+  function downFile(item) {
+    let url = httpUrl + '/busiAttachments/download/' + item.id;
+    window.open(url);
+  }
+
+  function pdfShow(e) {
+    setFileType(e.fileType);
+    if (e.fileType === 1 || e.fileType === 2 || e.fileType === 3) {
+      // pdf||video||img
+      setVisible(true);
+      setFileUrl(httpUrl + '/busiAttachments/view/' + e.id);
+    }
+  }
+
+  function onDocumentLoadSuccess({ numPages }) {
+    setNumPages(numPages);
+  }
+
+  return (
+    <div className="centerbox">
+      <div className="center-content">
+        <div className="centerScreen">
+          <div className="center-left-but">{achiveForm.achievementName}</div>
+          {
+            createUserId === current_user.user_id &&
+            <div className="center-right-but" ><span onClick={editItem}>编辑</span> <span onClick={deletItem}>删除</span></div>
+          }
+        </div>
+
+        <Descriptions className="item-content" column={1}>
+          <Descriptions.Item label="成果类别">{achiveForm.achievementType && achiveForm.achievementType.dicItemName}</Descriptions.Item>
+          <Descriptions.Item label="标签">
+            {
+              achiveForm.achievementLabel && achiveForm.achievementLabel.map(itemx => {
+                return <span className="list-tag" key={itemx + 'ax'}>{itemx}</span>
+              })
+            }
+          </Descriptions.Item>
+          <Descriptions.Item label="单位名称">{achiveForm.achievementBelong}</Descriptions.Item>
+          <Descriptions.Item label="发布时间">{achiveForm.updatedAt}</Descriptions.Item>
+          <Descriptions.Item label="成果描述">{achiveForm.achievementRemark}</Descriptions.Item>
+          <Descriptions.Item label="成果文件" className="file-list-item">
+            {
+              achiveForm.achievementAttachments && achiveForm.achievementAttachments.map(item => {
+                return <div className="file-list-box" key={item.id + 'down'}>
+                  <p onClick={() => { pdfShow(item) }}>{item.fileName}</p>
+                  <span className="downP" onClick={() => { downFile(item) }}>下载</span>
+                </div>
+              })
+            }
+          </Descriptions.Item>
+        </Descriptions>
+      </div>
+
+      <Modal
+        visible={visible}
+        maskClosable={true}
+        closable={true}
+        footer={null}
+        onCancel={() => { setVisible(false) }}
+        className="file-modal"
+      >
+        {
+          fileType === 3 && <div >
+            <img className="show-img" src={fileUrl} alt="" />
+          </div>
+        }
+        {
+          fileType === 2 && <div>
+            <video src={fileUrl} style={{ width: '100%' }} controls="controls">您的浏览器不支持 video 标签。</video>
+          </div>
+        }
+        {
+          fileType === 1 && <div className="pdf-box">
+            {
+              <Document
+                file={fileUrl}
+                onLoadSuccess={onDocumentLoadSuccess}
+              >
+                {new Array(numPages).fill("").map((item, index) => {
+                  return (
+                    <Page
+                      loading=""
+                      noData=""
+                      key={index}
+                      pageNumber={index + 1}
+                      renderTextLayer={true}
+                    />
+                  );
+                })}
+              </Document>
+            }
+          </div>
+        }
+      </Modal>
+    </div>
+  )
+}

src/achieveRequirement/achieve/achieveDetail/index.scss

@@ -0,0 +1,33 @@
+// 内容详情
+.item-content {
+  padding: 10px 10px 0 30px;
+}
+.ant-descriptions-item-label {
+  width: 5em;
+  margin-right: 5px;
+  color: rgba(0, 0, 0, 0.65);
+  text-align: right;
+}
+.ant-descriptions-item-content {
+  color: rgba(0, 0, 0, 1);
+}
+.file-list-item > span {
+  vertical-align: top;
+}
+.file-list-box {
+  width: 600px;
+  height: 60px;
+  display: flex;
+  justify-content: space-between;
+  p:hover {
+    cursor: pointer;
+    color: #0089ff;
+  }
+  .downP {
+    color: #0089ff;
+    cursor: pointer;
+    text-decoration: none;
+  }
+}
+
+

src/achieveRequirement/achieve/achieveEdit/index.jsx

@@ -0,0 +1,236 @@
+import React, { forwardRef, useCallback, useEffect, useState } from 'react';
+import { Form, Input, Select, Button, } from 'antd';
+import Upload from '../../components/Upload';
+import { httpUrl } from '../../../fetch';
+import { getDictionary, getAchieveDetail, addAchieve, editAchieve } from '../api';
+import './index.scss';
+
+const Option = Select.Option;
+const { TextArea } = Input;
+
+export default Form.create()(
+  forwardRef(({ form, showNotification, match, history }, ref) => {
+    const [shareType, setShareType] = useState([]);
+    const [tagType, setTagType] = useState([]);
+    const [fileList, setFileList] = useState(null);
+    const [achievementFileTypes, setAchievementFileTypes] = useState('');
+
+    const id = match.params.achieveId;
+    const { getFieldDecorator, validateFields, setFieldsValue } = form;
+
+    useEffect(() => {
+      id && getAchieveDetail(id).then(data => {
+        const formValue = {
+          achievementName: data.achievementName,
+          achievementTypeId: data.achievementTypeId,
+          achievementBelong: data.achievementBelong,
+          achievementLabel: data.achievementLabel,
+          achievementRemark: data.achievementRemark,
+          achievementFiles: data.achievementFiles
+        };
+        setFieldsValue(formValue);
+        if (data.achievementAttachments.length) {
+          for (const item of data.achievementAttachments) {
+            item.name = item.fileName;
+            item.size = item.fileSize;
+            item.uid = "rc-upload" + item.id
+          }
+          setFileList(data.achievementAttachments);
+        }
+      })
+    }, [id]);
+
+    // 加载选项数据
+    useEffect(() => {
+      getDictionary('share_type').then((res) => {
+        setShareType(res.data);
+      });
+      getDictionary("tag_type").then((res) => {
+        setTagType(res.data);
+      });
+    }, []);
+
+    // 上传附件后得到的文件数组
+    function UploadFunc(fileList) {
+      setFileList(fileList);
+      let files = [];
+      let fileTypes = [];
+      for (const item of fileList) {
+        files.push(item.id || item.response.data.id);
+        fileTypes.push(item.fileType || item.response.data.fileType);
+      }
+      setFieldsValue({
+        achievementFiles: files.join()
+      });
+      setAchievementFileTypes(fileTypes.join());
+    }
+
+    const helper = useCallback(
+      (label, name, rules, widget) => (
+        <Form.Item label={label}>
+          {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
+        </Form.Item>
+      ),
+      []
+    );
+
+    const formItemLayout = {
+      labelCol: {
+        xs: { span: 12 },
+        sm: { span: 4 },
+      },
+      wrapperCol: {
+        xs: { span: 12 },
+        sm: { span: 16 },
+      },
+    };
+
+    const tailFormItemLayout = {
+      wrapperCol: {
+        xs: {
+          span: 20,
+          offset: 4,
+        },
+        sm: {
+          span: 20,
+          offset: 4,
+        },
+      },
+    };
+
+    // 修改
+    function saveItem() {
+      validateFields((error, values) => {
+        if (!error) {
+          let params = {
+            ...values,
+            achievementFileTypes,
+          };
+          params.achievementLabel = params.achievementLabel.join();
+
+          if (id) {
+            // 编辑
+            params.id = id;
+            editAchieve(params).then(res => {
+              if (res.code === '1') {
+                showNotification("成果更新成功！");
+                history.go(-1);
+              } else {
+                showNotification(res.message);
+              }
+            });
+          } else {
+            // 新增
+            params.uploadUserId = 1;
+            addAchieve(params).then(res => {
+              if (res.code === '1') {
+                showNotification("成果新增成功！");
+                history.go(-1);
+              } else {
+                showNotification(res.message);
+              }
+            });
+          }
+        }
+      })
+    }
+
+    return (
+      <div className="centerbox">
+        <div className="center-content">
+
+          <div className="centerScreen">
+            <div className="center-left-but">{id ? '修改' : '新增'}成果</div>
+          </div>
+
+          <Form className="achieve-form" {...formItemLayout}>
+            {helper(
+              "成果名称：",
+              "achievementName",
+              [{ required: true, message: "请输入成果名称" }],
+              <Input
+                className="edit-input"
+                placeholder="请输入成果名称"
+              />
+            )}
+
+            {helper(
+              "成果类别：",
+              "achievementTypeId",
+              [{ required: true, message: "请选择成果类别" }],
+              <Select placeholder="请选择成果类别"
+                className="edit-input"
+              >
+                {
+                  shareType.map(item => {
+                    return <Option key={item.dicItemName + item.id} value={item.id}>{item.dicItemName}</Option>
+                  })
+                }
+              </Select>
+            )}
+
+            {helper(
+              "单位名称：",
+              "achievementBelong",
+              [{ required: true, message: "请输入单位名称" }],
+              <Input
+                className="edit-input"
+                placeholder="请输入单位名称"
+              />
+            )}
+
+            <Form.Item label={"成果文件："} required={true}>
+              <Upload
+                className="commentStyle"
+                load={UploadFunc}
+                size={100}
+                showNotification={showNotification}
+                actionUrl={httpUrl}
+                fileList={fileList}
+              />
+
+              {/* 用一个隐藏的input实现上传文件的必填校验 */}
+              {getFieldDecorator('achievementFiles', {
+                rules: [{ required: true, message: "请上传成果文件" }], validateFirst: true
+              })(<Input style={{ display: 'none' }} />)}
+            </Form.Item>
+
+            {helper(
+              "标签：",
+              "achievementLabel",
+              [{ required: true, message: "请选择成果标签" }],
+              <Select
+                className="edit-input"
+                placeholder="请选择成果标签"
+                mode="tags"
+                tokenSeparators={[',']}
+              >
+                {
+                  tagType.map(item => {
+                    return <Option key={item.dicItemName}>{item.dicItemName}</Option>
+                  })
+                }
+              </Select>
+            )}
+
+            {helper(
+              "成果描述：",
+              "achievementRemark",
+              [{ required: true, message: "请输入成果描述" }],
+              <TextArea
+                placeholder="请输入成果描述"
+                autoSize={{ minRows: 3, maxRows: 5 }}
+              />
+            )}
+
+            <Form.Item {...tailFormItemLayout}>
+              <Button className="mr20" type={"primary"} onClick={saveItem}>保存</Button>
+              <Button onClick={() => { history.go(-1) }}>取消</Button>
+            </Form.Item>
+
+          </Form>
+        </div>
+      </div>
+    )
+  })
+)

src/achieveRequirement/achieve/achieveEdit/index.scss

@@ -0,0 +1,4 @@
+  .achieve-form{
+    padding:24px 40px 0px 40px;
+  }
+  

src/achieveRequirement/achieve/achieveList/index.jsx

@@ -0,0 +1,148 @@
+import React, { useEffect, useState } from 'react';
+import classNames from 'classnames';
+import { Pagination, Button, Icon } from 'antd';
+import ChooseNav from '../../components/chooseNav';
+import ItemList from '../../components/itemList';
+import { getDictionary, getAchieveList } from '../api';
+
+export default (props) => {
+  const { current_user } = props;
+  // console.log(current_user);
+
+  const [achievementTypeId, setAchievementTypeId] = useState('');  //成果类别
+  const [achievementFileTypes, setAchievementFileTypes] = useState('');  //文件类型
+  const [orderBy, setOrderBy] = useState('-1');
+  const [curPage, setCurPage] = useState(1);
+  const [total, setTotal] = useState(0);
+  const [industryOption, setIndustryOption] = useState([]);
+  const [achiveList, setAchiveList] = useState([]);
+
+  useEffect(() => {
+    getDictionary('share_type').then(res => {
+      if (res && res.data) setIndustryOption(res.data);
+    });
+  }, []);
+
+  useEffect(() => {
+    const params = {
+      achievementTypeId,
+      achievementFileTypes,
+      achievementLabel: '',
+      isOwned: '',
+      orderBy,
+      curPage,
+      pageSize: 10
+    };
+    getAchieveList(params).then(data => {
+      setAchiveList(data.rows);
+      setTotal(data.total);
+    })
+  }, [achievementTypeId, achievementFileTypes, orderBy, curPage]);
+
+
+  function changeOptionId(option, type) {
+    if (type === 'share_type') {
+      setAchievementTypeId(option.id);
+      setCurPage(1);
+    } else if (type === 'file_type') {
+      setAchievementFileTypes(option.id);
+      setCurPage(1);
+    }
+  }
+
+  function changeSort(sortType) {
+    setOrderBy(sortType);
+    setCurPage(1);
+  }
+
+  function goAchieveMine() {
+    props.history.push('/achieve/achieveMine');
+  }
+  function goAdd() {
+    props.history.push("/achieve/achieveAdd");
+  }
+
+  function achiveClick(id) {
+    props.history.push(`/achieve/achieveDetail/${id}`);
+  }
+
+  const filetypeOption = [
+    {
+      dicItemName: '文件',
+      id: 1
+    },
+    {
+      dicItemName: '视频',
+      id: 2
+    },
+    {
+      dicItemName: '图片',
+      id: 3
+    },
+    {
+      dicItemName: '软件',
+      id: 4
+    },
+    {
+      dicItemName: '其它',
+      id: 5
+    },
+  ];
+
+
+  return (
+    <div className="centerbox">
+      <div className="nav-content">
+        <ChooseNav
+          key={'share_type'}
+          type={'share_type'}
+          title={'成果类别'}
+          options={industryOption}
+          changeOptionId={changeOptionId}
+        />
+
+        <ChooseNav
+          key={'file_type'}
+          type={'file_type'}
+          title={'文件类型'}
+          options={filetypeOption}
+          changeOptionId={changeOptionId}
+        />
+      </div>
+
+      <div className="center-content">
+        <div className="centerScreen">
+          <div className="center-left-but">
+            <div className={classNames({ 'center-left-butD': true, 'center-left-butDACT': orderBy === '-1' })} onClick={() => { changeSort('-1') }}>默认</div>
+            <div className={classNames({ 'center-left-butD': true, 'center-left-butDACT': orderBy === 'created_at' })} onClick={() => { changeSort('created_at') }}><Icon type="arrow-down" />最新</div>
+            <div className={classNames({ 'center-left-butD': true, 'center-left-butDACT': orderBy === 'view_count' })} onClick={() => { changeSort('view_count') }}><Icon type="arrow-down" />最热</div>
+          </div>
+          {
+            // current_user.login &&
+            <div className="center-right-but">
+              <Button className="mr15 font-12" size="small" type="primary" onClick={goAchieveMine}>我的成果</Button>
+              <Button className="mr20 font-12" size="small" type="primary" onClick={goAdd}><i className="iconfont icon-zaibianji font-12 mr3"></i>发布成果</Button>
+            </div>
+          }
+        </div>
+
+        <ItemList
+          list={achiveList}
+          itemClick={achiveClick}
+        />
+
+      </div>
+
+      <div className="edu-txt-center ">
+        <Pagination
+          showQuickJumper
+          onChange={(page) => { setCurPage(page) }}
+          current={curPage}
+          total={total}
+          showTotal={total => `共 ${total} 条`}
+        />
+      </div>
+
+    </div>
+  )
+}

src/achieveRequirement/achieve/achieveMine/index.jsx

@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from 'react';
+import { Pagination } from 'antd';
+import ItemList from '../../components/itemList';
+import DelModal from '../../components/DelModal';
+import { deleteAchieve, getAchieveList } from '../api';
+
+export default (props) => {
+  const [achiveList, setAchiveList] = useState([]);
+  const [curPage, setCurPage] = useState(1);
+  const [total, setTotal] = useState(0);
+
+  useEffect(() => {
+    getAcheiveListOwn();
+  }, [curPage]);
+
+  function getAcheiveListOwn() {
+    const params = {
+      achievementTypeId: '',
+      achievementFileTypes: '',
+      achievementLabel: '',
+      // isOwned: '',  //方便游客身份时显示数据
+      isOwned: true,
+      orderBy: -1,
+      curPage,
+      pageSize: 10
+    };
+    getAchieveList(params).then(data => {
+      setAchiveList(data.rows);
+      setTotal(data.total);
+    })
+  }
+
+  function achiveClick(id) {
+    props.history.push(`/achieve/achieveDetail/${id}`);
+  }
+
+  function editItem(id) {
+    props.history.push(`/achieve/achieveEdit/${id}`);
+  }
+
+  function deletItem(id) {
+    DelModal(() => {
+      deleteAchieve(id).then(res => {
+        if (res.code === '1') {
+          props.showNotification("删除成功");
+          getAcheiveListOwn();
+        } else {
+          props.showNotification("删除失败");
+        }
+      })
+    });
+  }
+
+  return (
+    <div className="centerbox">
+      <div className="center-content">
+        <div className="centerScreen">
+          <div className="center-left-but">
+            我的成果
+          </div>
+        </div>
+
+        <ItemList
+          list={achiveList}
+          itemClick={achiveClick}
+          deletItem={deletItem}
+          editItem={editItem}
+        />
+      </div>
+
+      <div className="edu-txt-center ">
+        <Pagination
+          showQuickJumper
+          onChange={(page) => { setCurPage(page) }}
+          current={curPage}
+          total={total}
+          showTotal={total => `共 ${total} 条`}
+        />
+      </div>
+    </div>
+  )
+}

src/achieveRequirement/achieve/api.js

@@ -0,0 +1,62 @@
+import fetch from '../../fetch';
+
+// 获取字典分类列表
+export function getDictionary(id) {
+  return fetch({
+    url: '/dicItem/getData?dicTypeCode=' + id,
+    method: 'get'
+  });
+}
+
+// 成果列表查询
+export async function getAchieveList(params) {
+  let res = await fetch({
+    url: '/api/achievement/',
+    method: 'get',
+    params,
+  })
+  if (res && res.data) {
+    for (const i of res.data.rows) {
+      // 处理分解标签
+      i.tag = i.achievementLabel.split(',');
+    }
+  }
+  return res.data;
+}
+
+//新增成果
+export function addAchieve(data) {
+  return fetch({
+    url: '/api/achievement/',
+    method: 'post',
+    data: data
+  });
+}
+
+//删除成果
+export function deleteAchieve(id) {
+  return fetch({
+    url: '/api/achievement/' + id,
+    method: 'DELETE',
+  });
+}
+
+//更新成果
+export function editAchieve(data) {
+  return fetch({
+    url: '/api/achievement/',
+    method: 'put',
+    data: data
+  });
+}
+
+// 成果详情查询
+export async function getAchieveDetail(id) {
+  let res = await fetch({
+    url: '/api/achievement/' + id,
+    method: 'get',
+  });
+  res.data.achievementLabel = res.data.achievementLabel.split(',');
+  return res.data;
+}
+

src/achieveRequirement/components/DelModal.jsx

@@ -0,0 +1,20 @@
+import { Modal } from 'antd';
+
+export default (
+  handleOk,
+  title,
+  content,
+  handleCancel) => {
+  return Modal.confirm({
+    title: title || "警告",
+    content: content || "确认删除？",
+    okText: '确定',
+    cancelText: '取消',
+    onOk() {
+      handleOk && handleOk();
+    },
+    onCancel() {
+      handleCancel && handleCancel();
+    }
+  });
+}

src/achieveRequirement/components/Upload.jsx

@@ -0,0 +1,97 @@
+import React, { useEffect, useState } from "react";
+import { Upload, Button } from 'antd';
+import axios from 'axios';
+import { appendFileSizeToUploadFileAll } from 'educoder';
+axios.defaults.withCredentials = true;
+
+function Uploads({ className, size, actionUrl, fileList, showNotification, load }) {
+  const [files, setFiles] = useState(undefined);
+
+  useEffect(() => {
+    if (fileList) {
+      init();
+    }
+  }, [fileList]);
+
+  function init() {
+    let f = appendFileSizeToUploadFileAll(fileList);
+    setFiles(f);
+  }
+  function onAttachmentRemove(file) {
+    if (!file.percent || file.percent === 100) {
+      deleteAttachment(file);
+      return false;
+    }
+  }
+  function deleteAttachment(file) {
+    let id = (file.response && file.response.data && file.response.data.id) || file.id;
+
+    // 暂时不直接删除上传的文件，只在最后保存的时候进行修改
+    let nf = files.filter(item => {
+      let itemId = (item.response && item.response.data && item.response.data.id) || item.id;
+      return itemId !== id;
+    });
+    setFiles(nf);
+    // fileIdList(nf);
+    load && load(nf);
+
+    // 发送服务到后台删除文件，同步更新数据
+    // const url = actionUrl + `/busiAttachments/${id}`;
+    // axios.delete(url).then((response) => {
+    //   if (response.data) {
+    //     if (response.data.code === "1") {
+    //       let nf = files.filter(item => (item.response.data.id !== id) && (item.id !== id));
+    //       setFiles(nf);
+    //       fileIdList(nf);
+    //     } else {
+    //       showNotification(response.data.message);
+    //     }
+    //   }
+    // }).catch(function (error) {
+    //   console.log(error);
+    // });
+  }
+
+
+  function handleChange(info) {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let fileList = info.fileList;
+      setFiles(appendFileSizeToUploadFileAll(fileList));
+      if (info.file.status === 'done' || info.file.status === 'removed') load && load(fileList);
+    }
+  }
+
+  // function fileIdList(fileList) {
+  //   let id = [];
+  //   let fileType = [];
+  //   for (const item of fileList) {
+  //     id.push(item.id || item.response.data.id);
+  //     fileType.push(item.fileType || item.response.data.fileType);
+  //   }
+  //   load && load(id.join(), fileType.join());
+  // }
+
+  function beforeUpload(file) {
+    const isLt100M = file.size / 1024 / 1024 < size;
+    if (!isLt100M) {
+      showNotification(`文件大小必须小于${size}MB!`);
+    }
+    return isLt100M;
+  }
+
+  const upload = {
+    name: 'file',
+    fileList: files,
+    action: actionUrl + `/busiAttachments/upload`,
+    onChange: handleChange,
+    onRemove: onAttachmentRemove,
+    beforeUpload: beforeUpload,
+  };
+  return (
+    <Upload {...upload} className={className}>
+      <Button type="primary">点击上传</Button>
+      <span className="ml10 color-grey-9">(你可以上传小于<span className="color-red">{size}MB</span>的文件)</span>
+    </Upload>
+  )
+}
+export default Uploads;

src/achieveRequirement/components/chooseNav/index.jsx

@@ -0,0 +1,29 @@
+import React, { useEffect, useState } from 'react';
+import classNames from 'classnames';
+import './index.scss';
+
+export default (props) => {
+  const { title, options, changeOptionId, type } = props;
+
+  const [option, setOption] = useState({ id: "", dicItemName: "" ,dicItemCode:""});
+
+  useEffect(() => {
+    changeOptionId(option, type);
+  }, [option])
+
+  return (
+
+    <div className="shop-box">
+      <div className="choose-title">{title}</div>
+      <div className="choose-list">
+        <div className={classNames({ "choose-item-checked": option.id === "", "choose-item": true })} key={"all"} onClick={() => { setOption({ id: "", dicItemName: "" }) }}>全部</div>
+        {
+          options.map((item) => {
+            return <div className={classNames({ "choose-item-checked": option.id === item.id, "choose-item": true })} key={item.dicItemName} onClick={() => { setOption(item) }} >{item.dicItemName}</div>
+          })
+        }
+      </div>
+    </div>
+
+  )
+}

src/achieveRequirement/components/chooseNav/index.scss

@@ -0,0 +1,41 @@
+.nav-content {
+  margin-top:20px;
+  background: #fff;
+  border-bottom: 1px solid #eaeaea;
+  box-shadow: #ddd 0px 0px 5px;
+}
+.shop-box {
+  width: 1280px;
+  border-top: 1px solid #eaeaea;
+  display: flex;
+  justify-content: start;
+}
+.choose-title {
+  width: 110px;
+  background: #f3f3f3;
+  text-align: center;
+  padding: 16px 0;
+  font-size: 14px;
+  color: #666;
+  font-weight: 600;
+}
+.choose-list {
+  width: 1170px;
+  padding: 16px 0;
+  display: flex;
+  justify-content: start;
+}
+.choose-item {
+  font-size: 14px;
+  text-align: center;
+  padding: 0 15px ;
+  cursor: pointer;
+  &:hover{
+    color: #0072ff;
+  }
+}
+
+.choose-item-checked {
+  color: #0072ff;
+}
+

src/achieveRequirement/components/itemList/index.jsx

@@ -0,0 +1,42 @@
+import React from 'react';
+import './index.scss';
+const statusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '其他', '验收未通过'];
+const classArr = ['', 'list-done', 'list-done', 'list-done', 'list-error', '', '', 'list-error'];
+
+export default (props) => {
+  const { list, itemClick, editItem, deletItem, activeByStatus } = props;
+
+  return (
+    list.map(item => {
+      return (
+        <div className="list-box" key={item.id}>
+          <div className="list-title" onClick={() => { itemClick(item.id) }}>
+            {item.achievementName || item.title}
+            {item.status && <span className={classArr[item.status]}>{statusArr[item.status]}</span>}
+          </div>
+          <div >
+            {
+              item.tag.map(i => {
+                return <span className="list-tag" key={i + "av"}>{i}</span>;
+              })
+            }
+          </div>
+          <div className="list-other">
+            {item.user && <p>发布者：{item.user.nickname ? item.user.nickname : item.user.login}</p>}
+            {item.createUser && <p>发布者：{item.createUser.nickname ? item.createUser.nickname : item.createUser.login}</p>}
+            <p>发布时间：{item.achievementPublishTime || item.createTime}</p>
+          </div>
+          {
+            editItem && <div className="list-box-action">
+              {
+                !activeByStatus || (activeByStatus && item.status == '0' || item.status == '4' || item.status == '5') &&
+                <button onClick={() => { editItem(item.id) }}><i className="iconfont icon-zaibianji font-25"></i></button>
+              }
+              <button onClick={() => { deletItem(item.id) }}><i className="iconfont icon-shanchu font-30 "></i></button>
+            </div>
+          }
+        </div>
+      )
+    })
+  )
+}

src/achieveRequirement/components/itemList/index.scss

@@ -0,0 +1,70 @@
+.list-box {
+  position: relative;
+  padding: 20px;
+  background: #fff;
+  border-bottom: 1px solid #dedede;
+}
+.list-title {
+  font-size: 17px;
+  color: #000;
+  cursor: pointer;
+}
+.list-title:hover {
+  color: #409eff;
+}
+.list-title span {
+  padding: 3px 5px;
+  margin-left:.5em;
+  background: #f8c753;
+  font-size: 13px;
+  color: #fff;
+  border-radius: 3px;
+}
+span.list-done {
+  background: #35d77e;
+}
+span.list-error {
+  background: #f56c6c;
+}
+
+.list-tag {
+  display: inline-block;
+  margin: 5px 10px 5px 0;
+  background: #cfe9ff;
+  color: #0089ff;
+  font-size: 14px;
+  border-radius: 3px;
+  padding: 2px 5px;
+}
+.list-other > p {
+  display: inline-block;
+  margin: 0 10px 0 0;
+  font-size: 12px;
+  color: #666;
+}
+
+.list-box-action {
+  position: absolute;
+  display: flex;
+  align-items: center;
+  top: 0;
+  bottom: 0;
+  right: 100px;
+  visibility: hidden;
+}
+.list-box:hover .list-box-action {
+  visibility: visible;
+}
+.list-box-action button {
+  display: inline-block;
+  margin: 0 25px;
+  width: 50px;
+  height: 50px;
+  color: #0089ff;
+  line-height: 50px;
+  text-align: center;
+  border: 0;
+  border-radius: 25px;
+  box-shadow: 2px 2px 5px 2px #eee;
+  cursor: pointer;
+}

src/achieveRequirement/index.scss

@@ -0,0 +1,100 @@
+// 本模块公共样式
+
+.centerbox {
+  width: 80vw;
+  max-width: 1280px;
+  margin: 40px auto;
+}
+.center-content {
+  margin: 20px 0;
+  background: #fff;
+  border: 1px solid #dedede;
+  box-shadow: #eee 0px 1px 1px 3px;
+}
+.centerScreen {
+  display: flex;
+  justify-content: space-between;
+  height: 46px;
+  background-color: #fff;
+  border-bottom: 1px solid #dedede;
+}
+
+// 内容标题左侧样式
+.center-left-but {
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  margin-left: 20px;
+  font-size: 16px;
+  font-weight: 600;
+}
+.center-left-butD {
+  height: 24px;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 24px;
+  color: #333;
+  padding: 0 10px;
+  background-color: #fff;
+  border: 1px solid #dedede;
+}
+.center-left-butD:hover {
+  background-color: #fff;
+  color: #409eff;
+  cursor: pointer;
+}
+.center-left-butDACT {
+  background-color: #409eff;
+  color: #fff;
+}
+
+// 内容标题右侧样式
+.center-right-but {
+  display: flex;
+  align-items: center;
+}
+.center-right-but > span {
+  margin: 0 10px;
+  font-size: 16px;
+  color: #0089ff;
+  cursor: pointer;
+}
+
+// 通用标签样式
+.list-tag {
+  display: inline-block;
+  margin-right: 10px;
+  background: #cfe9ff;
+  color: #0089ff;
+  font-size: 14px;
+  border-radius: 3px;
+  padding: 2px 5px;
+  line-height: 25px;
+}
+
+// 文件预览modal样式
+.file-modal {
+  width: 800px !important;
+  .ant-modal-body {
+    padding-top: 40px;
+    .pdf-box {
+      height: 70vh;
+      overflow-y: scroll;
+    }
+  }
+  .ant-modal-close {
+    top: 0 !important;
+  }
+  .show-img {
+    width: 100%;
+  }
+  .react-pdf__Page__canvas,
+  .react-pdf__Page__textContent {
+    margin: 0 auto;
+    max-width: 100%;
+  }
+}
+
+.edit-input {
+  max-width: 500px;
+}

src/achieveRequirement/requirement.js

@@ -0,0 +1,95 @@
+import React, { Component } from "react";
+
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
+import Loadable from "react-loadable";
+import Loading from "../Loading";
+import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
+import './index.scss';
+
+const RequireList = Loadable({
+  loader: () => import("./requirement/requireList"),
+  loading: Loading,
+});
+
+const RequireDetail = Loadable({
+  loader: () => import("./requirement/requireDetail"),
+  loading: Loading,
+});
+
+const RequireMine = Loadable({
+  loader: () => import("./requirement/requireMine"),
+  loading: Loading,
+});
+const RequireAdd = Loadable({
+  loader: () => import("./requirement/requireEdit"),
+  loading: Loading,
+});
+const RequireEdit = Loadable({
+  loader: () => import("./requirement/requireEdit"),
+  loading: Loading,
+});
+
+class Index extends Component {
+  render() {
+    return (
+      <div className="newMain clearfix">
+        <Switch {...this.props}>
+
+          <Route
+            path="/requirement/requireDetail/:requireId"
+            render={(props) => (
+              <RequireDetail {...this.props} {...props} />
+            )}
+          ></Route>
+           <Route
+            path="/requirement/requireMine"
+            render={(props) => (
+              <RequireMine {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/requirement/requireAdd"
+            render={(props) => (
+              <RequireAdd {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/requirement/requireEdit/:requireId"
+            render={(props) => (
+              <RequireEdit {...this.props} {...props} />
+            )}
+          ></Route>
+          <Route
+            path="/requirement"
+            render={(props) => (
+              <RequireList {...this.props} {...props} />
+            )}
+          ></Route>
+
+
+
+          {/* <Route
+            exact
+            path="/"
+            render={(props) => (
+              this.props.current_user && this.props.current_user.login ?
+              <Infos {...this.props} {...props} />
+              :
+              <RequireIndex {...this.props} {...props} />
+            )}
+          ></Route> */}
+        </Switch>
+      </div>
+    );
+  }
+}
+export default withRouter(
+  ImageLayerOfCommentHOC({
+    imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+    parentSelector: ".newMain",
+  })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
+);

src/achieveRequirement/requirement/api.js

@@ -0,0 +1,71 @@
+import fetch from '../../fetch';
+
+// 获取字典分类列表
+export function getDictionary(id) {
+  return fetch({
+    url: '/dicItem/getData?dicTypeCode=' + id,
+    method: 'get'
+  });
+}
+
+// 需求列表查询
+export async function getRequirementList(data) {
+  let res = await fetch({
+    url: '/requirement/page',
+    method: 'post',
+    data,
+  });
+  if (res && res.data && res.data.rows) {
+    for (const i of res.data.rows) {
+      // 处理分解标签
+      i.tag = i.tag.split(',');
+    }
+  }
+  return res.data;
+}
+
+//新增需求
+export function addRequirement(data) {
+  return fetch({
+    url: '/requirement/add',
+    method: 'post',
+    data: data
+  });
+}
+
+//删除需求
+export function deleteRequirement(id) {
+  return fetch({
+    url: '/requirement/delete?id=' + id,
+    method: 'DELETE',
+  });
+}
+
+//更新需求
+export function updateRequirement(data) {
+  return fetch({
+    url: '/requirement/update',
+    method: 'put',
+    data: data
+  });
+}
+
+// 需求详情查询
+export async function getRequirementDetail(id) {
+  let res = await fetch({
+    url: '/requirement/getInfo?id=' + id,
+    method: 'get',
+  });
+  if (res && res.data) {
+    res.data.tag = res.data.tag.split(',');
+    return res.data;
+  }
+}
+
+//获取用户列表
+export function getAllUsers() {
+  return fetch({
+    url: '/user/getUsers',
+    method: 'get'
+  });
+}

src/achieveRequirement/requirement/requireDetail/index.jsx

@@ -0,0 +1,217 @@
+import React, { useEffect, useState } from 'react';
+import { Descriptions, Modal, Button } from 'antd';
+import { Document, Page, pdfjs } from 'react-pdf';
+import DelModal from '../../components/DelModal';
+import Upload from '../../components/Upload';
+import { httpUrl } from '../../../fetch';
+import { deleteRequirement, getRequirementDetail, updateRequirement } from '../api';
+import './index.scss';
+
+pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
+
+export default ({ match, history, current_user, showNotification }) => {
+  const id = match.params.requireId;
+  const [requireForm, setRequireForm] = useState({});
+  const [visible, setVisible] = useState(false);
+  const [visibleAchieve, setVisibleAchieve] = useState(false);
+  const [fileType, setFileType] = useState(4);
+  const [fileUrl, setFileUrl] = useState(4);
+  const [numPages, setNumPages] = useState(null);
+  const [fileList, setFileList] = useState(null);
+  const [edit, setEdit] = useState(false);
+
+
+  useEffect(() => {
+    getRequirementDetail(id).then(data => {
+      if (data) {
+        setRequireForm(data);
+        if (data.achievementList) {
+          for (const item of data.achievementList) {
+            item.name = item.fileName;
+            item.size = item.fileSize;
+            item.uid = "rc-upload" + item.id
+          }
+          setFileList(data.achievementList);
+        }
+      }
+    });
+  }, [id, edit]);
+
+  function editItem() {
+    history.push(`/requirement/requireEdit/${id}`);
+  }
+
+  function deletItem() {
+    DelModal(() => {
+      deleteRequirement(id).then(res => {
+        if (res.code === '1') {
+          showNotification("删除成功");
+          history.go(-1);
+        } else {
+          showNotification("删除失败");
+        }
+      })
+    });
+  }
+
+  function downFile(item) {
+    let url = httpUrl + '/busiAttachments/download/' + item.id;
+    window.open(url);
+  }
+
+  function pdfShow(e) {
+    setFileType(e.fileType);
+    if (e.fileType === 1 || e.fileType === 2 || e.fileType === 3) {
+      // pdf||video||img
+      setVisible(true);
+      setFileUrl(httpUrl + '/busiAttachments/view/' + e.id);
+    }
+  }
+
+  function onDocumentLoadSuccess({ numPages }) {
+    setNumPages(numPages);
+  }
+
+  // 上传附件后得到的文件数组
+  function UploadFunc(fileList) {
+    setFileList(fileList);
+  }
+
+  function uploadAchievement() {
+    let files = [];
+    let filestype = [];
+    for (const item of fileList) {
+      files.push(item.id || item.response.data.id);
+      filestype.push(item.fileType || item.response.data.fileType);
+    }
+    let data = {
+      id,
+      achievements: files.toString(),
+      // createUserAccount: sessionStorage.getItem('SET_Account'),//用户信息
+      // createUserName: sessionStorage.getItem('SET_NAME'),
+      status: "2"
+    }
+    updateRequirement(data).then(res => {
+      if (res.code === '1') {
+        showNotification('更新成果文件成功!');
+        setEdit(!edit);
+        setVisibleAchieve(false);
+      }
+    })
+  }
+
+  return (
+    <div className="centerbox">
+      <div className="center-content">
+        <div className="centerScreen">
+          <div className="center-left-but">{requireForm.title}</div>
+          {
+            <div className="center-right-but">
+              {
+                // (role||operator||needsForm.assignedUserLogin==userid||needsForm.createUserAccount==userid)&&(needsForm.status==1||needsForm.status==2||needsForm.status==7||needsForm.status==5)
+                ((current_user.admin || current_user.operator || requireForm.assignedUserLogin == current_user.login || requireForm.createUserAccount == current_user.login)
+                  && (requireForm.status == 1 || requireForm.status == 2 || requireForm.status == 7 || requireForm.status == 5)) &&
+                <Button className="mr15 font-12" size="small" type="primary" onClick={() => { setVisibleAchieve(true) }}>上传成果</Button>
+              }
+
+              {
+                requireForm.createUserAccount === current_user.login &&
+                <React.Fragment>
+                  <span onClick={editItem}>编辑</span>
+                  <span onClick={deletItem}>删除</span>
+                </React.Fragment>
+              }
+            </div>
+          }
+
+        </div>
+
+        <Descriptions className="item-content" column={1}>
+          <Descriptions.Item label="需求类别">{requireForm.typeName}</Descriptions.Item>
+          <Descriptions.Item label="标签">
+            {
+              requireForm.tag && requireForm.tag.map(itemx => {
+                return <span className="list-tag" key={itemx + 'ax'}>{itemx}</span>
+              })
+            }
+          </Descriptions.Item>
+          <Descriptions.Item label="指派人员">{requireForm.assignedUserName}</Descriptions.Item>
+          <Descriptions.Item label="结束时间">{requireForm.endTime}</Descriptions.Item>
+          <Descriptions.Item label="需求描述">{requireForm.remark}</Descriptions.Item>
+          <Descriptions.Item label="需求文件" className="file-list-item">
+            {
+              requireForm.attachmentList && requireForm.attachmentList.map(item => {
+                return <div className="file-list-box" key={item.id + 'down'}>
+                  <p onClick={() => { pdfShow(item) }}>{item.fileName}</p>
+                  <span className="downP" onClick={() => { downFile(item) }}>下载</span>
+                </div>
+              })
+            }
+          </Descriptions.Item>
+        </Descriptions>
+      </div>
+
+      <Modal
+        visible={visible}
+        maskClosable={true}
+        closable={true}
+        footer={null}
+        onCancel={() => { setVisible(false) }}
+        className="file-modal"
+      >
+        {
+          fileType === 3 && <div >
+            <img className="show-img" src={fileUrl} alt="" />
+          </div>
+        }
+        {
+          fileType === 2 && <div>
+            <video src={fileUrl} style={{ width: '100%' }} controls="controls">您的浏览器不支持 video 标签。</video>
+          </div>
+        }
+        {
+          fileType === 1 && <div className="pdf-box">
+            {
+              <Document
+                file={fileUrl}
+                onLoadSuccess={onDocumentLoadSuccess}
+              >
+                {new Array(numPages).fill("").map((item, index) => {
+                  return (
+                    <Page
+                      loading=""
+                      noData=""
+                      key={index}
+                      pageNumber={index + 1}
+                      renderTextLayer={true}
+                      width={750}
+                    />
+                  );
+                })}
+              </Document>
+            }
+          </div>
+        }
+      </Modal>
+
+      <Modal
+        visible={visibleAchieve}
+        maskClosable={true}
+        closable={true}
+        onCancel={() => { setVisibleAchieve(false) }}
+        onOk={uploadAchievement}
+        className="upload-modal"
+      >
+        <Upload
+          className="commentStyle"
+          load={UploadFunc}
+          size={100}
+          showNotification={showNotification}
+          actionUrl={httpUrl}
+          fileList={fileList}
+        />
+      </Modal>
+
+    </div>
+  )
+}

src/achieveRequirement/requirement/requireDetail/index.scss

@@ -0,0 +1,40 @@
+// 内容详情
+.item-content {
+  padding: 10px 10px 0 30px;
+}
+.ant-descriptions-item-label {
+  width: 5em;
+  margin-right: 5px;
+  color: rgba(0, 0, 0, 0.65);
+  text-align: right;
+}
+.ant-descriptions-item-content {
+  color: rgba(0, 0, 0, 1);
+}
+.file-list-item > span {
+  vertical-align: top;
+}
+.file-list-box {
+  width: 600px;
+  height: 60px;
+  display: flex;
+  justify-content: space-between;
+  p:hover {
+    cursor: pointer;
+    color: #0089ff;
+  }
+  .downP {
+    color: #0089ff;
+    cursor: pointer;
+    text-decoration: none;
+  }
+}
+
+.upload-modal{
+  width: 800px !important;
+  .commentStyle{
+    display: inline-block;
+    width: 100%;
+  }
+}
+

src/achieveRequirement/requirement/requireEdit/index.jsx

@@ -0,0 +1,247 @@
+import React, { forwardRef, useCallback, useEffect, useState } from 'react';
+import { Form, Input, Select, Button, DatePicker } from 'antd';
+import moment from 'moment';
+import Upload from '../../components/Upload';
+import { httpUrl } from '../../../fetch';
+import { getDictionary, getRequirementDetail, addRequirement, updateRequirement } from '../api';
+import './index.scss';
+
+const Option = Select.Option;
+const { TextArea } = Input;
+const format = "YYYY-MM-DD HH:mm:ss";
+
+export default Form.create()(forwardRef(({current_user, form, showNotification, match, history }, ref) => {
+
+  const [requireType, setRequireType] = useState([]);
+  const [tagType, setTagType] = useState([]);
+  const [fileList, setFileList] = useState(null);
+  const [typeCode, setTypeCode] = useState('');
+  const [typeName, setTypeName] = useState('');
+
+  const id = match.params.requireId;
+  const { getFieldDecorator, validateFields, setFieldsValue, } = form;
+
+  useEffect(() => {
+    id && getRequirementDetail(id).then(data => {
+      const formValue = {
+        title: data.title,
+        attachments: data.attachments,
+        // typeCode: data.typeCode,   //为使用select labelInValue，在代码中初始化值
+        endTime: moment(data.endTime),
+        tag: data.tag,
+        remark: data.remark
+      };
+      setFieldsValue(formValue);
+      setTypeName(data.typeName);
+      setTypeCode(data.typeCode)
+      if (data.attachmentList.length) {
+        for (const item of data.attachmentList) {
+          item.name = item.fileName;
+          item.size = item.fileSize;
+          item.uid = "rc-upload" + item.id
+        }
+        setFileList(data.attachmentList);
+      }
+    })
+  }, [id]);
+
+  // 加载选项数据
+  useEffect(() => {
+    getDictionary('requirement_type').then((res) => {
+      setRequireType(res.data);
+    });
+    getDictionary("tag_type").then((res) => {
+      setTagType(res.data);
+    });
+  }, []);
+
+
+  // 上传附件后得到的文件数组
+  function UploadFunc(fileList) {
+    setFileList(fileList);
+    let files = [];
+    for (const item of fileList) {
+      files.push(item.id || item.response.data.id);
+    }
+    setFieldsValue({
+      attachments: files.join()
+    });
+  }
+
+  const helper = useCallback(
+    (label, name, rules, widget, initialValue) => (
+      <Form.Item label={label}>
+        {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
+      </Form.Item>
+    ), []);
+
+  const formItemLayout = {
+    labelCol: {
+      xs: { span: 12 },
+      sm: { span: 4 },
+    },
+    wrapperCol: {
+      xs: { span: 12 },
+      sm: { span: 16 },
+    },
+  };
+
+  const tailFormItemLayout = {
+    wrapperCol: {
+      xs: {
+        span: 20,
+        offset: 4,
+      },
+      sm: {
+        span: 20,
+        offset: 4,
+      },
+    },
+  };
+
+  // 修改
+  function saveItem() {
+    validateFields((error, values) => {
+      if (!error) {
+        let params = {
+          ...values,
+          createUserAccount:current_user.login|| sessionStorage.getItem("SET_Account"), //用户信息
+          createUserName:current_user.username|| sessionStorage.getItem("SET_NAME"),    //模拟时使用莫胜吕
+          typeName,
+          typeCode,
+          status: 0, //状态
+        };
+        params.tag = params.tag.join();
+        params.endTime = params.endTime.format(format);
+        if (id) {
+          // 编辑
+          params.id = id;
+          updateRequirement(params).then(res => {
+            if (res.code === '1') {
+              showNotification("需求更新成功！");
+              history.go(-1);
+            } else {
+              showNotification(res.message);
+            }
+          });
+        } else {
+          // 新增
+          addRequirement(params).then(res => {
+            if (res.code === '1') {
+              showNotification("需求新增成功！");
+              history.go(-1);
+            } else {
+              showNotification(res.message);
+            }
+          });
+        }
+      }
+    })
+  }
+
+  function changeTypeName(value) {
+    setTypeCode(value.key);
+    setTypeName(value.label);
+  }
+
+  return (
+    <div className="centerbox">
+      <div className="center-content">
+
+        <div className="centerScreen">
+          <div className="center-left-but">{id ? '修改' : '新增'}需求</div>
+        </div>
+        <Form className="achieve-form" {...formItemLayout}>
+          {helper(
+            "需求名称：",
+            "title",
+            [{ required: true, message: "请输入需求名称" }],
+            <Input
+              className="edit-input"
+              placeholder="请输入需求名称"
+            />
+          )}
+
+          {helper(
+            "需求类型：",
+            "typeCode",
+            [{ required: true, message: "请选择需求类别" }],
+            <Select placeholder="请选择需求类别"
+              className="edit-input"
+              labelInValue
+              onChange={changeTypeName}
+            >
+              {
+                requireType.map(item => {
+                  return <Option key={item.id + ''} value={item.id + ''}>{item.dicItemName}</Option>
+                })
+              }
+            </Select>
+            , { key: typeCode, label: typeName })}
+
+          {helper(
+            "结束时间：",
+            "endTime",
+            [{ required: true, message: "请输入结束时间" }],
+            <DatePicker
+              showTime
+              format={format}
+              placeholder="请输入结束时间"
+            />
+          )}
+
+          <Form.Item label={"需求文件："} required={true}>
+            <Upload
+              className="commentStyle"
+              load={UploadFunc}
+              size={100}
+              showNotification={showNotification}
+              actionUrl={httpUrl}
+              fileList={fileList}
+            />
+
+            {/* 用一个隐藏的input实现上传文件的必填校验 */}
+            {getFieldDecorator('attachments', {
+              rules: [{ required: true, message: "请上传需求文件" }], validateFirst: true
+            })(<Input style={{ display: 'none' }} />)}
+          </Form.Item>
+
+          {helper(
+            "标签：",
+            "tag",
+            [{ required: true, message: "请选择需求标签" }],
+            <Select
+              placeholder="请选择需求标签"
+              className="edit-input"
+              mode="tags"
+              tokenSeparators={[',']}
+            >
+              {
+                tagType.map(item => {
+                  return <Option key={item.dicItemName}>{item.dicItemName}</Option>
+                })
+              }
+            </Select>
+          )}
+
+          {helper(
+            "需求描述：",
+            "remark",
+            [{ required: true, message: "请输入需求描述" }],
+            <TextArea
+              placeholder="请输入需求描述"
+              autoSize={{ minRows: 3, maxRows: 5 }}
+            />
+          )}
+
+          <Form.Item {...tailFormItemLayout}>
+            <Button className="mr20" type={"primary"} onClick={saveItem}>保存</Button>
+            <Button onClick={() => { history.go(-1) }}>取消</Button>
+          </Form.Item>
+
+        </Form>
+      </div>
+    </div>
+  )
+})
+)

src/achieveRequirement/requirement/requireEdit/index.scss

@@ -0,0 +1,4 @@
+  .achieve-form{
+    padding:24px 40px 0px 40px;
+  }
+  

src/achieveRequirement/requirement/requireList/index.jsx

@@ -0,0 +1,117 @@
+import React, { useEffect, useState } from 'react';
+import { Pagination, Button } from 'antd';
+import ChooseNav from '../../components/chooseNav';
+import ItemList from '../../components/itemList';
+import { getDictionary, getRequirementList } from '../api';
+
+export default (props) => {
+  const { current_user } = props;
+  // console.log(current_user);
+
+  const [requirementType, setrequirementType] = useState([]);  //需求类别选项数组
+  const [requirementStatusArr, setrequirementStatusArr] = useState([]);  //需求状态选项数组
+  const [requirementTypeName, setRequirementTypeName] = useState('');  //当前需求类别
+  const [requirementStatus, setRequirementStatus] = useState('');  //当前需求状态
+  const [curPage, setCurPage] = useState(1);
+  const [total, setTotal] = useState(0);
+  const [requirementList, setRequirementList] = useState([]);
+
+  useEffect(() => {
+    getDictionary('requirement_type').then(res => {
+      if (res && res.data) setrequirementType(res.data);
+    });
+    getDictionary('requirement_status').then(res => {
+      if (res && res.data) setrequirementStatusArr(res.data);
+    });
+  }, []);
+
+  useEffect(() => {
+    const params = {
+      tag: null,
+      status: requirementStatus || null,
+      typeName: requirementTypeName || null,
+      queryType: 'all',
+      curPage,
+      pageSize: 10
+    };
+    getRequirementList(params).then(data => {
+      if (data && data.rows) {
+        setRequirementList(data.rows);
+        setTotal(data.total);
+      }
+    })
+  }, [requirementTypeName, requirementStatus, curPage]);
+
+  function changeOptionId(option, type) {
+    if (type === 'requirement_type') {
+      setRequirementTypeName(option.dicItemName);
+      setCurPage(1);
+    } else if (type === 'requirement_status') {
+      setRequirementStatus(option.dicItemCode);
+      setCurPage(1);
+    }
+  }
+
+  function goRequirementMine() {
+    props.history.push('/requirement/requireMine');
+  }
+  function goAdd() {
+    props.history.push("/requirement/requireAdd");
+  }
+
+  function achiveClick(id) {
+    props.history.push(`/requirement/requireDetail/${id}`);
+  }
+
+  return (
+    <div className="centerbox">
+      <div className="nav-content">
+        <ChooseNav
+          key={'requirement_type'}
+          type={'requirement_type'}
+          title={'需求类别'}
+          options={requirementType}
+          changeOptionId={changeOptionId}
+        />
+
+        <ChooseNav
+          key={'requirement_status'}
+          type={'requirement_status'}
+          title={'需求状态'}
+          options={requirementStatusArr}
+          changeOptionId={changeOptionId}
+        />
+      </div>
+
+      <div className="center-content">
+        <div className="centerScreen">
+          <div className="center-left-but">需求大厅</div>
+          {
+            current_user.login &&
+            <div className="center-right-but">
+              <Button className="mr15 font-12" size="small" type="primary" onClick={goRequirementMine}>我的需求</Button>
+              <Button className="mr20 font-12" size="small" type="primary" onClick={goAdd}><i className="iconfont icon-zaibianji font-12 mr3"></i>发布需求</Button>
+            </div>
+          }
+        </div>
+
+        <ItemList
+          list={requirementList}
+          itemClick={achiveClick}
+        />
+
+      </div>
+
+      <div className="edu-txt-center ">
+        <Pagination
+          showQuickJumper
+          onChange={(page) => { setCurPage(page) }}
+          current={curPage}
+          total={total}
+          showTotal={total => `共 ${total} 条`}
+        />
+      </div>
+
+    </div>
+  )
+}

src/achieveRequirement/requirement/requireMine/allRequire.jsx

@@ -0,0 +1,333 @@
+import React, { useEffect, forwardRef, useCallback, useState } from 'react';
+import classnames from 'classnames';
+import { Form, Radio, Input, Select, Pagination, Table, Button, Modal } from 'antd';
+import DelModal from '../../components/DelModal';
+import { deleteRequirement, getRequirementList, getAllUsers, updateRequirement } from '../api';
+
+const Option = Select.Option;
+const { TextArea } = Input;
+
+const statusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '其他', '验收未通过'];
+const chooseStatusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '全部'];
+const statusColor = ['#f8c753', '#67c23a', '#67c23a', '#67c23a', '#F56C6C', '#f8c753', '#f8c753', '#F56C6C'];
+
+export default Form.create()(forwardRef(({ form, showNotification, match, history }, ref) => {
+  const [requirementList, setRequirementList] = useState([]);
+  const [curPage, setCurPage] = useState(1);
+  const [total, setTotal] = useState(0);
+  const [status, setStatus] = useState(6);
+  const [checkVisible, setCheckVisible] = useState(false);
+  const [checkStatus, setCheckStatus] = useState(1);
+  const [acceptVisible, setAcceptVisible] = useState(false);
+  const [currentId, setCurrentId] = useState('');
+  const [allUsers, setAllUsers] = useState([]);
+
+
+  const { getFieldDecorator, validateFields, } = form;
+
+  useEffect(() => {
+    getRequireList();
+  }, [curPage, status]);
+
+  useEffect(() => {
+    if (checkVisible) {
+      getAllUsers().then(res => {
+        if (res.code === '1') {
+          setAllUsers(res.data);
+        } else {
+          showNotification(res.message);
+        }
+      })
+    }
+  }, [checkVisible]);
+
+  function getRequireList() {
+    let searchStaus = "";
+    if (status !== 6) {
+      searchStaus = status;
+    }
+    const params = {
+      curPage,
+      pageSize: 10,
+      status: searchStaus,
+      tag: "",
+      title: "",
+      typeName: "",
+      currentUser: "",
+      queryType: "all"  //all:所有  my:我创建的  tome:指派给我的
+    };
+    getRequirementList(params).then(data => {
+      if (data) {
+        for (const item of data.rows) {
+          item.createUserName = item.createUser.nickname ? item.createUser.nickname : item.createUser.login;
+        }
+        setRequirementList(data.rows);
+        setTotal(data.total);
+      }
+    })
+  }
+
+  function detailItem(id) {
+    history.push(`/requirement/requireDetail/${id}`);
+  }
+
+  function editItem(id) {
+    history.push(`/requirement/requireEdit/${id}`);
+  }
+
+  function deletItem(id) {
+    DelModal(() => {
+      deleteRequirement(id).then(res => {
+        if (res.code === '1') {
+          showNotification("删除成功");
+          getRequireList();
+        } else {
+          showNotification("删除失败");
+        }
+      })
+    }, '此操作将删除该记录, 是否继续?');
+  }
+
+  // 审核
+  function checkItem() {
+    validateFields((error, values) => {
+      if (!error) {
+        let params = {
+          id: currentId,
+          status: checkStatus,      //状态
+          assignedUserLogin: values.vertifyUserAccount ? values.vertifyUserAccount.key : '',
+          assignedUserName: values.vertifyUserAccount ? values.vertifyUserAccount.label : '',
+          vertifyUserAccount: values.vertifyUserAccount ? values.vertifyUserAccount.key : '',
+          vertifyUserName: values.vertifyUserAccount ? values.vertifyUserAccount.label : '',
+          vertifyComments: values.vertifyComments,
+        };
+        console.log(params);
+        updateRequirement(params).then(res => {
+          if (res.code === '1') {
+            showNotification("操作成功!");
+            setCheckVisible(false);
+            getRequireList();
+          } else {
+            showNotification(res.message);
+          }
+        });
+      }
+    })
+  }
+
+  // 验收
+  function acceptItem() {
+    validateFields((error, values) => {
+      if (!error) {
+        let params = {
+          status: values.status,
+          id: currentId,
+          checkComments: values.checkComments,
+        };
+        console.log(params);
+        updateRequirement(params).then(res => {
+          if (res.code === '1') {
+            showNotification("操作成功!");
+            setAcceptVisible(false);
+            getRequireList();
+          } else {
+            showNotification(res.message);
+          }
+        });
+      }
+    })
+  }
+
+  const columns = [
+    {
+      title: '需求标题',
+      dataIndex: 'title',
+      key: 'title',
+      width: '20%',
+    },
+    {
+      title: '类型',
+      dataIndex: 'typeName',
+      key: 'typeName',
+    },
+    {
+      title: '创建人',
+      dataIndex: 'createUserName',
+      key: 'createUserName',
+    },
+    {
+      title: '指派人',
+      key: 'assignedUserName',
+      dataIndex: 'assignedUserName',
+    },
+    {
+      title: '创建时间',
+      key: 'createTime',
+      dataIndex: 'createTime',
+    },
+    {
+      title: '结束时间',
+      key: 'endTime',
+      dataIndex: 'endTime',
+    },
+    {
+      title: '状态',
+      key: 'status',
+      dataIndex: 'status',
+      render: (text, record) => {
+        return <span style={{ color: statusColor[text] }}>{statusArr[text]}</span>
+      }
+    },
+    {
+      title: '操作',
+      key: 'action',
+      render: (text, record) => (
+        <span>
+          <Button className="mr5 font-12" type="primary" size="small" onClick={() => { editItem(record.id) }}><i className="iconfont icon-zaibianji font-15 mr3"></i></Button>
+          <Button className="mr5 font-12" type="danger" size="small" onClick={() => { deletItem(record.id) }}><i className="iconfont icon-shanchu font-15 "></i></Button>
+          <Button className="mr5 font-12" type="info" size="small" onClick={() => { detailItem(record.id) }}>详情</Button>
+          {record.status === '0' && <Button className="mr5 font-12" type="primary" size="small" onClick={() => { setCurrentId(record.id); setCheckVisible(true); }}>审核</Button>}
+          {record.status === '2' && <Button className="mr5 font-12" type="success" size="small" onClick={() => { setCurrentId(record.id); setAcceptVisible(true) }}>验收成果</Button>}
+        </span>
+      ),
+    },
+  ];
+
+  const helper = useCallback(
+    (label, name, rules, widget, initialValue) => (
+      <Form.Item label={label}>
+        {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
+      </Form.Item>
+    ), []);
+
+  const formItemLayout = {
+    labelCol: {
+      xs: { span: 12 },
+      sm: { span: 6 },
+    },
+    wrapperCol: {
+      xs: { span: 12 },
+      sm: { span: 18 },
+    },
+  };
+
+  return (
+    <React.Fragment>
+
+      <div className="choose-status">
+        {
+          chooseStatusArr.map((item, i) => {
+            return <Button className={classnames({ mr10: true, active: status === i })} type="dashed" key={i} onClick={() => { setStatus(i) }}> {item}</Button>
+          })
+        }
+      </div>
+
+      <Table
+        rowKey={(row) => row.id}
+        dataSource={requirementList}
+        columns={columns}
+        pagination={false}
+      />
+
+      <div className="edu-txt-center mt10">
+        <Pagination
+          showQuickJumper
+          onChange={(page) => { setCurPage(page) }}
+          current={curPage}
+          total={total}
+        />
+      </div>
+
+      <Modal
+        title="需求审核"
+        visible={checkVisible}
+        onOk={checkItem}
+        onCancel={() => { setCheckVisible(false) }}
+        className="form-edit-modal"
+      >
+
+        {checkVisible && <Form  {...formItemLayout}>
+          <Form.Item label="审批结果：">
+            <Radio.Group value={checkStatus} onChange={(e) => { setCheckStatus(e.target.value) }}>
+              <Radio className="columsRadio" value={1}>
+                同意
+            </Radio>
+              <Radio className="columsRadio" value={4}>
+                拒绝
+            </Radio>
+            </Radio.Group>
+          </Form.Item>
+
+          {helper(
+            "指派用户：",
+            "vertifyUserAccount",
+            [{ required: checkStatus === 1, message: "请指派用户" }],
+            <Select placeholder="请指派用户"
+              className="edit-input"
+              showSearch
+              labelInValue
+              disabled={checkStatus === 4}
+              filterOption={(input, option) =>
+                option.props && option.props.children && (option.props.children.indexOf(input) > -1 || option.props.children.toLowerCase().indexOf(input.toLowerCase()) > -1)
+              }
+            >
+              {
+                allUsers.map((item, i) => {
+                  return <Option key={item.id} value={item.login}>{item.nickName}</Option>
+                })
+              }
+            </Select>
+          )}
+
+          {helper(
+            "审核意见：",
+            "vertifyComments",
+            [{ required: true, message: "请输入审核意见" }],
+            <TextArea
+              className="edit-input"
+              placeholder="请输入审核意见"
+            />
+          )}
+        </Form>}
+      </Modal>
+
+
+      <Modal
+        title="验收成果"
+        visible={acceptVisible}
+        onOk={acceptItem}
+        onCancel={() => { setAcceptVisible(false) }}
+        className="form-edit-modal"
+      >
+
+        {acceptVisible && <Form  {...formItemLayout}>
+          {helper(
+            "验收结果：",
+            "status",
+            [{ required: true, message: "请选择验收结果" }],
+            <Radio.Group>
+              <Radio className="columsRadio" value={3}>
+                同意
+            </Radio>
+              <Radio className="columsRadio" value={7}>
+                拒绝
+            </Radio>
+            </Radio.Group>
+          )}
+
+          {helper(
+            "验收意见：",
+            "checkComments",
+            [],
+            <TextArea
+              className="edit-input"
+              placeholder="请输入验收意见"
+            />
+          )}
+        </Form>}
+
+      </Modal>
+    </React.Fragment>
+  )
+})
+)

src/achieveRequirement/requirement/requireMine/index.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import { Tabs } from 'antd';
+import AllRequire from './allRequire';
+import MyRequire from './myRequire';
+import './index.scss';
+
+const { TabPane } = Tabs;
+export default (props) => {
+
+  return (
+    <div className="centerbox">
+
+      <Tabs className="tabs-style" type="card">
+        <TabPane tab="全部需求" key="1">
+          <AllRequire {...props}/>
+        </TabPane>
+
+        <TabPane tab="我的需求" key="2">
+          <MyRequire {...props}/>
+        </TabPane>
+      </Tabs>
+
+    </div>
+  )
+}

src/achieveRequirement/requirement/requireMine/index.scss

@@ -0,0 +1,54 @@
+// Tabs
+.tabs-style{
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0,0,0,.12), 0 0 6px 0 rgba(0,0,0,.04);
+  box-shadow: 0 2px 4px 0 rgba(0,0,0,.12), 0 0 6px 0 rgba(0,0,0,.04);
+  padding-bottom: 1vw;
+  .ant-tabs-tab{
+    margin: 0 !important;
+  }
+  .ant-tabs-tab{
+    border-top:0 !important;
+    border-left:0 !important;
+    border-radius:0 !important;
+  }
+  .ant-tabs-nav .ant-tabs-tab{
+    padding:19px 0px;
+    margin-right: 40px;
+  }
+  .ant-tabs-ink-bar{
+    width:25px!important;
+    bottom: 10px;
+  }
+}
+
+.choose-status{
+  padding: 1em;
+  background: #fff;
+}
+
+.ant-btn-info{
+  color: #fff;
+  background-color: #909399;
+  border-color: #909399;
+}
+
+.ant-btn-success{
+  color: #fff;
+  background-color: #67c23a;
+  border-color: #67c23a;
+}
+
+.mt10{
+  margin-top:10px;
+}
+
+.form-edit-modal{
+  .ant-col{
+    display: inline-block;
+  }
+  .edit-input{
+    width: 300px;
+  }
+}

src/achieveRequirement/requirement/requireMine/myRequire.jsx

@@ -0,0 +1,80 @@
+import React, { useEffect, useState } from 'react';
+import classnames from 'classnames';
+import { Pagination, Button } from 'antd';
+import ItemList from '../../components/itemList';
+import DelModal from '../../components/DelModal';
+import { deleteRequirement, getRequirementList } from '../api';
+
+export default (props) => {
+  const [requirementList, setRequirementList] = useState([]);
+  const [curPage, setCurPage] = useState(1);
+  const [total, setTotal] = useState(0);
+  // const [queryType, setQueryType] = useState("my");
+  const [queryType, setQueryType] = useState("all");
+
+  useEffect(() => {
+    getRequireList();
+  }, [curPage, queryType]);
+
+  function getRequireList() {
+    const params = {
+      curPage,
+      pageSize: 10,
+      status: "",
+      tag: "",
+      title: "",
+      typeName: "",
+      currentUser: "",
+      queryType,  //all:所有  my:我创建的  tome:指派给我的
+    };
+    getRequirementList(params).then(data => {
+      setRequirementList(data.rows);
+      setTotal(data.total);
+    })
+  }
+
+  function detailItem(id) {
+    props.history.push(`/requirement/requireDetail/${id}`);
+  }
+
+  function editItem(id) {
+    props.history.push(`/requirement/requireEdit/${id}`);
+  }
+
+  function deletItem(id) {
+    DelModal(() => {
+      deleteRequirement(id).then(res => {
+        if (res.code === '1') {
+          props.showNotification("删除成功");
+          getRequireList();
+        } else {
+          props.showNotification("删除失败");
+        }
+      })
+    }, '此操作将删除该记录, 是否继续?');
+  }
+
+  return (
+    <React.Fragment>
+      <div className="choose-status">
+        <Button className={classnames({ mr10: true, active: queryType === "my" })} type="dashed" key="my" onClick={() => { setQueryType("my") }}>我创建的</Button>
+        <Button className={classnames({ mr10: true, active: queryType === "tome" })} type="dashed" key="tome" onClick={() => { setQueryType("tome") }}> 指派给我的 </Button>
+      </div>
+      <ItemList
+        list={requirementList}
+        itemClick={detailItem}
+        deletItem={queryType === "my" && deletItem}
+        editItem={queryType === "my" && editItem}
+        activeByStatus={queryType === "my"}
+      />
+      <div className="edu-txt-center mt10">
+        <Pagination
+          showQuickJumper
+          onChange={(page) => { setCurPage(page) }}
+          current={curPage}
+          total={total}
+        />
+      </div>
+    </React.Fragment>
+  )
+}

src/college/College.js

@@ -195,7 +195,7 @@ class College extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth105",
 					render: (text, record) => (
-						<a href={`/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
+						<a href={`/users/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
 							color:'#007bff',
 
 						}}>	{

src/college/colleagecss/colleage.css

@@ -218,7 +218,7 @@ a:hover {
 }
 
 .color-blue {
-  color: #2A61FF;
+  color: #4CACFF;
 }
 
 .color-huang {

src/common/DateUtil.js

@@ -1,5 +1,4 @@
 import moment  from "moment";
-import { number } from "prop-types";
 
 // 处理整点 半点
 // 取传入时间往后的第一个半点
@@ -98,41 +97,3 @@ export function formatDuring(mss){
 	}
   return days + "天" + hours + "小时" + minutes + "分";
 }
-
-/*
-  返回：多久以前
-  backDate：以前的某个日期
-*/
-export function timeAgo(backDate) {
-  try {
-    moment(backDate);
-  } catch (e) {
-    return '刚刚';
-  }
-  if(typeof backDate ==='number'){
-    backDate=backDate*1000
-  }else{
-    backDate= moment(backDate);
-  }
-  let time = new Date() - backDate;
-  var days = Math.floor(time / (1000 * 60 * 60 * 24));
-  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
-  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
-  var seconds = Math.floor((time % (1000 * 60 * 60)) / 1000);
-  if (time <= 0) {
-    return "刚刚";
-  }
-  if (days) {
-    return days + "天前";
-  }
-  if (hours) {
-    return hours + "小时前";
-  }
-  if (minutes) {
-    return minutes + "分前";
-  }
-  if (seconds) {
-    return seconds + "秒前";
-  }
-  return "刚刚";
-}

src/common/TextUtil.js

@@ -68,8 +68,8 @@ export function appendFileSizeToUploadFile(item) {
     return `${item.title}${uploadNameSizeSeperator}${item.filesize}`
 }
 export function appendFileSizeToUploadFileAll(fileList) {
-    return fileList.map(item => {
-        if (item.name.indexOf(uploadNameSizeSeperator) === -1) {
+    return fileList && fileList.map(item => {
+        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
             return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
         }
         return item

src/common/UrlTool.js

@@ -6,40 +6,23 @@ const { Search } = Input;
 const $ = window.$;
 const isDev = window.location.port == 3007;
 const isdev2= window.location.hostname ==='www.educoder.net'
-export const TEST_HOST = "https://testforgeplus.trustie.net/"
+export const TEST_HOST = "http://39.105.176.215:49999"
 export function getImageUrl(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
   // const local = 'http://localhost:3000'
-	const local = 'https://testforgeplus.trustie.net';
+	const local = 'http://39.105.176.215:49999';
 	if (isDev) {
 		return `${local}/${path}`
 	}
-	return `${path}`;
-}
-
-export function numFormat(num, digits){
-	let d = digits || 1;
-  var si = [
-    { value: 1, symbol: "" },
-    { value: 1E3, symbol: "k" },
-    { value: 1E4, symbol: "W" }
-  ];
-  var rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
-  var i;
-  for (i = si.length - 1; i > 0; i--) {
-    if (num >= si[i].value) {
-      break;
-    }
-  }
-  return (num / si[i].value).toFixed(d).replace(rx, "$1") + si[i].symbol;
+	return `/${path}`;
 }
 
 export function getImage(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
   // const local = 'http://localhost:3000'
-	const local = 'https://testforgeplus.trustie.net/';
+	const local = 'http://39.105.176.215:49999';
 	if(path.indexOf("http://")===-1){
 		if (isDev) {
 			return `${local}/images/${path}`
@@ -110,7 +93,7 @@ export function setImagesUrl(path){
 }
 
 export function getUrl(path, goTest) {
-	const local = 'https://testforgeplus.trustie.net'
+	const local = 'http://39.105.176.215:49999'
 	if (isDev) {
 		return `${local}${path?path:''}`
 	}
@@ -179,28 +162,28 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
+	return `${getUrl()}/api/attachments.json`;
 }
 
 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
+	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
 }
 
 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
 }
 
 
 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getRandomNumber(type) {

src/common/components/comment/CommentItem.js

@@ -64,7 +64,7 @@ function CommentItem({
   const commentAvatar = (author) => (
     <img
       className="item-flex flex-image"
-      src={author.image_url ? getImageUrl(`/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
+      src={author.image_url ? getImageUrl(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
       alt=""
     />
   );

src/common/educoder.js

@@ -3,7 +3,7 @@
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
 export {
-	getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat,
+	getUploadLogoActionUrl as getUploadLogoActionUrl,
 	getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl
@@ -27,7 +27,7 @@ export {
 	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
 	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
 } from './TextUtil'
-export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds ,timeAgo} from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
 
 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
 

src/components/render-html.jsx

@@ -46,18 +46,18 @@ export default ({
         let id = decodeURIComponent(u.split("#")[1]);
         let ele = document.getElementById(id);
         if(ele){
-          window.scrollTo(0, ele.offsetTop + 120);
+          window.scrollTo(0, ele.offsetTop + 220);
         }
       }
     }
-  },[url,html])
+  },[url])
 
   const el = useRef();
   function onAncherHandler(e) {
-    let target = e.target;
+    let target = e.target
     if (target.tagName.toUpperCase() === 'A') {
-      let ancher = target.getAttribute('href');
-      if (ancher && ancher.startsWith('#')) {
+      let ancher = target.getAttribute('href')
+      if (ancher.startsWith('#')) {
         e.preventDefault()
         let viewEl = document.getElementById(ancher.replace('#', ''))
         if (viewEl) {

src/context/TPIContextProvider.js

@@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
 		image_url: "avatars/User/1"
 		login: "innov"
 		name: "Coder"
-		user_url: "/innov"
+		user_url: "/users/innov"
 		 */
 		let user = resData.user;
 		user.username = resData.user.name;
-		user.user_url = `/${resData.user.login}`;
+		user.user_url = `/users/${resData.user.login}`;
 		// user.image_url = resData.image_url;
 		user.is_teacher = resData.is_teacher;
 		resData.user = user;

src/fetch.js

@@ -0,0 +1,85 @@
+import axios from 'axios';
+import cookie from 'react-cookies';
+
+export const httpUrl='http://117.50.100.12:8001';
+
+const TokenKey = 'autologin_forge_military';
+axios.defaults.withCredentials = true;
+
+// 创建axios实例
+const service = axios.create({
+  // baseURL: process.env.BASE_API, // api的base_url
+  baseURL:httpUrl,
+  timeout: 5000 // 请求超时时间
+  // headers:{'X-Custom-Header': 'foobar'} // 请求头
+});
+
+
+// request拦截器
+service.interceptors.request.use(config => {
+  if (cookie.load(TokenKey)) {
+    config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改
+    // config.headers['Authorization'] = 'autologin_forge_military=' + cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config;
+}, error => {
+  // Do something with request error
+  console.log(error); // for debug
+  Promise.reject(error);
+});
+// respone拦截器
+service.interceptors.response.use(
+  response => {
+    /**
+     * 下面的注释为通过response自定义code来标示请求状态，当code返回如下情况为权限有问题，登出并返回到登录页
+     * 如通过xmlhttprequest 状态码标识 逻辑可写在下面error中
+     */
+    const res = response;
+    if (res.status === 400) {
+      // Message({
+      //   message: '请求错误',
+      //   type: 'error',
+      //   duration: 5 * 1000
+      // });
+      // eslint-disable-next-line prefer-promise-reject-errors
+      return Promise.reject('error');
+    }
+    if (res.status === 401) {
+      // Message({
+      //   message: '未授权，请登录！',
+      //   type: 'error',
+      //   duration: 5 * 1000
+      // });
+      // eslint-disable-next-line prefer-promise-reject-errors
+      return Promise.reject('error');
+    }
+    if (res.status === 40001) {
+      // Message({
+      //   message: '账户或密码错误！',
+      //   type: 'warning'
+      // });
+      // eslint-disable-next-line prefer-promise-reject-errors
+      return Promise.reject('error');
+    }
+    if (response.status !== 200 && res.status !== 200) {
+      // Message({
+      //   message: res.message,
+      //   type: 'error',
+      //   duration: 7 * 1000
+      // });
+    } else {
+      return response.data;
+    }
+  },
+  error => {
+    if (error.response&& error.response.status === 401 && !error.config.url.includes('/auth-server/oauth/token')) {
+      return cookie.remove(TokenKey);
+      // that.$router.push('/Login');
+    } else {
+      // that.$router.push('/Login');
+    }
+    return Promise.reject(error);
+  }
+);
+
+export default service;

src/forge/About/Index.jsx

@@ -67,14 +67,15 @@ function Index(props){
   }
   return(
     <div className="aboutPanels">
+      
       <div className="aboutContent">
-        <AlignCenterBetween style={{padding:"14px 20px"}}>
-          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目概览</span>
+        <AlignCenterBetween style={{padding:"14px 0px"}}>
+          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目简介</span>
           { editOpration && !edit && <a onClick={editContent} className="color-blue">编辑</a> }
         </AlignCenterBetween>
         {
           edit ? 
-          <div className="padding20">
+          <div>
             <MDEditor
               placeholder={"请输入描述信息"}
               height={500}
@@ -113,11 +114,11 @@ function Index(props){
             </div>
           </div>
           :
-          <div className="padding20">
+          <div style={{padding:"20px 0px"}}>
             {content ? 
               <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
               :
-              <div>暂无概览~</div>
+              <div>暂无简介~</div>
             }
             {attachments && attachments.length > 0 &&
               <Attachments

src/forge/About/index.scss

@@ -4,6 +4,7 @@
   .aboutContent{
     border-radius: 2px;
     border: 1px solid #EEEEEE;
+    padding:0px 30px;
     width:100%;
     background-color: #fff;
     margin-top:20px;

src/forge/Activity/Activity.js

@@ -1,7 +1,7 @@
 import React , { Component } from 'react';
 import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
 import '../css/index.scss';
-import '../Branch/branch.scss';
+import '../Branch/branch.css';
 import './activity.css';
 import NoneData from '../Nodata';
 
@@ -10,10 +10,6 @@ import ActivityItem from './ActivityItem';
 import axios from 'axios';
 const LIMIT = 15;
 const ARRAY = [
-  {
-    id:"",
-    name:'全部'
-  },
   {
     id:1,
     name:'1天'
@@ -36,15 +32,10 @@ class Activity extends Component{
   constructor(props){
     super(props);
     this.state={
-      time:undefined,
+      time:'30',
       type:undefined,
       state:undefined,
       page:1,
-      pr_count:undefined,
-      new_pr_count:undefined,
-      close_issues_count:undefined,
-      open_issues_count:undefined,
-      pr_all_count:undefined,issues_count:undefined,
 
       data:undefined,
       project_trends:undefined,
@@ -72,15 +63,8 @@ class Activity extends Component{
         this.setState({
           data:result.data,
           project_trends:result.data.project_trends,
-          isSpin:false,
-          pr_count:result.data.pr_count,
-          new_pr_count:result.data.new_pr_count,
-          close_issues_count:result.data.close_issues_count,
-          open_issues_count:result.data.open_issues_count,
-          pr_all_count:result.data.pr_all_count,
-          issues_count:result.data.issues_count,
+          isSpin:false
         })
-        window.scrollTo(0,0);
       }
     }).catch(error=>{
       console.log(error);
@@ -90,19 +74,19 @@ class Activity extends Component{
   // 切换周期
   changeTime=(e)=>{
     this.setState({
-      time:e.key ==="item_0"?undefined:e.key,
+      time:e.key,
       isSpin:true
     })
     const { type,status,page } = this.state;
-    this.getInfo(e.key ==="item_0"?undefined:e.key,type,status,page);
+    this.getInfo(e.key,type,status,page);
   }
    //筛选
    changeTrends=(type,status)=>{
     this.setState({
-      type,status,page:1
+      type,status
     })
-    const {time}=this.state;
-    this.getInfo(time,type,status,1);
+    const {time,page}=this.state;
+    this.getInfo(time,type,status,page);
    }
   // 分页
   ChangePage=(page)=>{
@@ -124,14 +108,12 @@ class Activity extends Component{
     </Menu>
   )
   render(){
-    const { time , data , page , project_trends , isSpin , pr_count , new_pr_count , close_issues_count , open_issues_count , pr_all_count ,issues_count } = this.state;
-    let name = time ? ARRAY.filter(item=>item.id === parseInt(time)) :[{name:"全部"}];
+    const { time , data , page , project_trends , isSpin } = this.state;
 
-    const first_per = pr_all_count > 0 ? `${parseFloat(pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
-    const second_per =pr_all_count > 0 ? `${parseFloat(new_pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
-    const third_per =issues_count > 0 ?`${parseFloat(close_issues_count/issues_count).toFixed(2)*100}%` :"50%";
-    const fourth_per =issues_count > 0 ?`${parseFloat(open_issues_count/issues_count).toFixed(2)*100}%` :"50%";
-    
+    let name = time && ARRAY.filter(item=>item.id === parseInt(time)) ;
+    const second_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
+    const third_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
+    const fourth_per = (parseInt(data && data.open_issues_count)/parseInt(data && data.issues_count)*100)+'%';
     return(
       <div className="main">
         
@@ -140,7 +122,7 @@ class Activity extends Component{
           <div className="orderInfo">
             <div>
               <div className="percentLine prPercent">
-                <p className="percent_purple" style={{width:first_per}}></p>
+                <p className="percent_purple" style={{width:'100%'}}></p>
                 <p className="percent_green resetStyle" style={{width:`${second_per}`}}></p>
               </div>
               <span>{data && data.pr_all_count}合并请求</span>
@@ -150,25 +132,25 @@ class Activity extends Component{
                 <p className="percent_red" style={{width:`${third_per}`}}></p>
                 <p className="percent_green" style={{width:`${fourth_per}`}}></p>
               </div>
-              <span>{data && data.issues_count}易修</span>
+              <span>{data && data.issues_count}任务</span>
             </div>
           </div>
           <ul className="percentBox">
             <li>
               <span className="purple">{data && data.pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","delay")}>已处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","close")}>已处理的合并请求</span>
             </li>
             <li>
               <span className="green">{data && data.new_pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","not_delay")}>未处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","create")}>未处理的合并请求</span>
             </li>
             <li>
               <span className="red">{data && data.close_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","delay")}>已关闭的易修</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","close")}>已关闭的任务</span>
             </li>
             <li>
               <span className="green">{data && data.open_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","not_delay")}>未处理的易修</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","create")}>未处理的任务</span>
             </li>
           </ul>
         </div>

src/forge/Activity/ActivityItem.js

@@ -14,26 +14,26 @@ class ActivityItem extends Component {
           {/* 如果是版本发布 */}
           {item.trend_type === "VersionRelease" ?
           <p className="itemLine">
-            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/projects/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
             <span className="activity_type">{item.trend_type}</span>
           </p >
           :
           // 如果是任务
           item.trend_type === "Issue" ?
             <p className="itemLine">
-              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
             :
             // 如果是合并请求
             <p className="itemLine">
-              <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/projects/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
           }
           <p className="itemLine mt10">
-            <Link to={`/${item && item.user_login}`} className="show-user-link">
-              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
+            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
+              <img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage" />
               <span className="mr20">{item.user_name}</span>
             </Link>
             {item.created_at && <span className="color-grey-9">创建于<span className="ml2 color-grey-6">{item.created_at}</span></span>}

src/forge/Branch/CloneAddress.js

@@ -1,27 +1,39 @@
-import React, { useState } from 'react';
-import { Menu } from 'antd';
-import "./branch.scss";
-import CopyTool from '../Component/CopyTool';
+import React, { Component } from 'react';
+import { Dropdown, Icon, Tooltip } from 'antd';
+import "./branch.css";
 
-function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
-  const [ key , setKey ] = useState("HTTP");
-  return (
-    <div className="downMenu">
-      <div style={{borderBottom:"1px solid #eee"}}>
-        <Menu className="urlMenu" selectedKeys={[key]} mode={"horizontal"}>
-          <Menu.Item key="HTTP" onClick={(e)=>{setKey(e.key)}}>HTTP</Menu.Item>
-          <Menu.Item key="SSH" onClick={(e)=>{setKey(e.key)}}>SSH</Menu.Item>
-        </Menu>
-        <div className="gitAddressClone">
-          <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
-          <CopyTool inputId="copy_rep_content" className="copytool"/>
-        </div>
+class CloneAddress extends Component {
+  // 点击按钮复制功能
+  jsCopy = () => {
+    var e = document.getElementById("copy_rep_content");
+    e.select();
+    document.execCommand("Copy");
+  }
+
+  render() {
+    const { http_url, downloadUrl } = this.props;
+    return (
+      <div className="gitAddressClone">
+        {/* <p className="addressTips"><span>版本库地址已变更，请基于新地址提交代码</span></p> */}
+        {
+          http_url && <span>HTTP</span>
+        }
+        <input type="text" id="copy_rep_content" value={http_url} />
+        <Tooltip title="复制链接">
+          <span className="color-blue" onClick={() => this.jsCopy()}><i className="iconfont icon-fuzhi"></i></span>
+        </Tooltip>
+        {
+          downloadUrl &&
+          <span>
+            <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
+              <a className="ant-dropdown-link">
+                <Icon type="cloud-download" className="font-18 fl color-blue" />
+              </a>
+            </Dropdown>
+          </span>
+        }
       </div>
-      <Menu className="edu-txt-center">
-        <Menu.Item><a href={zip_url}>下载 ZIP</a></Menu.Item>
-        <Menu.Item><a href={tar_url}>下载 TAR.GZ</a></Menu.Item>
-      </Menu>
-    </div>
-  )
+    )
+  }
 }
 export default CloneAddress;

src/forge/Branch/Select.jsx

@@ -1,65 +1,115 @@
-import React , { useState , useEffect , useRef } from 'react';
-import { Dropdown} from 'antd';
-import './branch.scss';
-import SelectOverlay from './SelectOverlay';
-import { findDOMNode } from 'react-dom';
+import React , { useState , useEffect } from 'react';
+import { Popover , Input , Spin } from 'antd';
+import './branch.css';
+import { getBranch , getTag } from '../GetData/getData';
+
 
 export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
   const [ showValue , setShowValue ] = useState(branch);
-  const [ visible , setVisible ] = useState(false);
+  const [ inputValue , setInputValue] = useState(undefined);
+  const [ nav , setNav ] = useState(0);
+  const [ isSpin , setIsSpin ] = useState(true);
+  const [ flag , setFlag ] = useState(false);
 
-  const refFa = useRef(null);
-  const refBox = useRef(null);
-
-  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);
-      if(!isChild && !isBox){
-        setVisible(false);
-      }
-    }
-  }
+  const [ data , setData ] = useState(undefined);
+  const [ datas , setDatas ] = useState(undefined);
 
   useEffect(()=>{
     setShowValue(branch);
   },[branch])
 
-  function ChangeB(params) {
-    setVisible(false);
-    changeBranch(params);
+  useEffect(()=>{
+    document.body.addEventListener('click', e => {
+      let name = e.target.className;
+      let turn = name === "ant-input OptionsInput" || name === "navli active"|| name === "navli" || name === "padding10 bor-bottom-greyE";
+      if(turn){
+        return;
+      }else{
+        setFlag(false);
+      }
+    })
+  })
+
+  useEffect(()=>{
+    if(branchList){
+      setData(branchList);
+      setDatas(branchList);
+      setIsSpin(false);
+    }
+  },[branchList])
+
+
+  async function getBranchs(id,owner){
+    let result = await getBranch(id,owner);
+    setData(result);
+    setDatas(result);
+    setIsSpin(false);
+  }
+  async function getTags(id,owner){
+    let result = await getTag(id,owner);
+    setData(result);
+    setDatas(result);
+    setIsSpin(false);
   }
 
+  function changeInputValue(e){
+    setInputValue(e.target.value);
+    let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
+    setDatas(filter);
+  }
+
+  function changeNav(nav){
+    setNav(nav);
+    setIsSpin(true);
+    if(nav === 0){
+      getBranchs(projectsId,owner);
+    }else{
+      getTags(projectsId,owner);
+    }
+  }
+  function chooseitem(value){
+    // setShowValue(value);
+    changeBranch(value);
+  }
+
+
   const menu = (
-    <div ref={refFa}>
-      <SelectOverlay 
-        visible={visible}
-        changeBranch={ChangeB} 
-        tagflag={tagflag} 
-        projectsId={projectsId}
-        owner={owner}
-        branchList={branchList}
-      />
+    <div>
+      <div className="padding10 bor-bottom-greyE">
+        <Input 
+          placeholder="请输入分支或标签名称搜索" 
+          autocomplete="off" className="OptionsInput" value={inputValue} 
+          onChange={changeInputValue} style={{width:"220px"}}
+        />
+        <ul className="navUl">
+          <li className={nav === 0?"navli active":"navli"} onClick={()=>changeNav(0)}><i className="iconfont icon-fenzhi1 font-14 mr3"></i>分支列表</li>
+          { tagflag && <li className={nav === 1?"navli active":"navli"} onClick={()=>changeNav(1)}><i className="iconfont icon-biaoqian3 font-14 mr3"></i>标签列表</li> }
+        </ul>
+      </div>
+      <Spin spinning={isSpin}>
+        <ul className="OptionsUl" id="ul-btn">
+          {
+            datas && datas.length>0 ?
+            datas.map((item,key)=>{
+              return(
+                <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
+              )
+            }):
+            <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
+          }
+        </ul>
+      </Spin>
     </div>
   );
   return(
-    <Dropdown placement='bottomLeft' visible={visible} overlay={menu} overlayClassName="branch-tagBox-list" trigger={['click']} >
-      <div className="branch-tagBox" ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
-        {/* {nav === 0 ?"分支":"标签"} */}
-        <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
-        <span className="ant-dropdown-link task-hide" style={{fontWeight:"500",minWidth:"45px",maxWidth:"270px"}}>
+    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
+      <div className="branch-tagBox">
+        <span className="color-grey-9 mr3 ml8">{nav === 0 ?"分支":"标签"}:</span>
+        <a className="ant-dropdown-link">
           {showValue}
-        </span>
-        <i className="showtag iconfont icon-sanjiaoxing-down font-15 color-grey-9 mr5 ml5 mt1" />
+        </a>
+        <i className="showtag iconfont icon-xiajiantou font-14 color-grey-9 mr8" />
       </div>
-    </Dropdown>
+    </Popover>
   )
 })

src/forge/Branch/SelectOverlay.jsx

@@ -1,90 +0,0 @@
-import React , { useState , useEffect } from 'react';
-import { Input , Spin , Menu } from 'antd';
-import { getBranch , getTag } from '../GetData/getData';
-
-function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) {
-  const [ inputValue , setInputValue] = useState(undefined);
-  const [ nav , setNav ] = useState(0);
-  const [ isSpin , setIsSpin ] = useState(true);
-
-  const [ data , setData ] = useState(undefined);
-  const [ datas , setDatas ] = useState(undefined);
-  const [ keys ,setKeys] = useState("branch");
-
-  useEffect(()=>{
-    if(visible){
-      setKeys("branch");
-      getBranchs(projectsId,owner);
-      setIsSpin(true);
-    }
-  },[visible])
-
-  async function getBranchs(id,owner){
-    let result = await getBranch(id,owner);
-    setData(result);
-    setDatas(result);
-    setIsSpin(false);
-  }
-  async function getTags(id,owner){
-    let result = await getTag(id,owner);
-    setData(result);
-    setDatas(result);
-    setIsSpin(false);
-  }
-  function chooseitem(value){
-    changeBranch(value);
-  }
-  function changeInputValue(e){
-    setInputValue(e.target.value);
-    let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
-    setDatas(filter);
-  }
-
-  function changeNav(e){
-    setKeys(e.key);
-    setIsSpin(true);
-    if(e.key === "branch"){
-      getBranchs(projectsId,owner);
-      setNav(0);
-    }else{
-      getTags(projectsId,owner);
-      setNav(1);
-    }
-  }
-
-  return(
-    <div className="overlayBranch">
-      <div className="padding15" style={{paddingBottom:"0px"}}>
-        <Input 
-          prefix={<i className="iconfont icon-sousuo_icon1 font-14"></i>}
-          placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
-          autocomplete="off" className="OptionsInput" 
-          value={inputValue} 
-          onChange={changeInputValue}
-        />
-      </div>
-      <Menu mode="horizontal" className="navUl" selectedKeys={[keys]} onClick={changeNav}>
-        <Menu.Item key={"branch"}>分支</Menu.Item>
-        { tagflag && <Menu.Item key={"tag"}>标签</Menu.Item> }
-      </Menu>
-      <Spin spinning={isSpin}>
-        <ul className="OptionsUl" id="ul-btn">
-          {
-            datas && datas.length>0 &&
-            datas.map((item,key)=>{
-              return(
-                <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
-              )
-            })
-           
-          }
-          {
-            datas && datas.length === 0 &&
-            <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
-          }
-        </ul>
-      </Spin>
-    </div>
-  )
-}
-export default SelectOverlay;

src/forge/Branch/branch.css

@@ -0,0 +1,84 @@
+.branchDropdown{
+  border:1px solid #eee;
+  border-radius: 4px;
+  display: flex;
+  justify-content: center;
+  height: 40px;
+  line-height: 40px;
+  min-width: 220px;
+}
+.branchDropdown .ant-dropdown-trigger{
+  width: 100%;
+  padding:0px 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  cursor: pointer;
+}
+.branchOptions{
+  width: 220px;
+  box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
+  border-radius: 3px;
+  background: #fff;
+  max-height: 300px;
+}
+.OptionsUl{
+  max-height: 220px;
+  overflow-y: auto;
+}
+.OptionsUl li{
+  height: 35px;
+  line-height: 35px;
+  cursor: pointer;
+  padding:0px 10px;
+}
+.OptionsUl li:hover{
+   background-color: #F0F0F0;
+}
+.OptionsUl li a{
+  display: block;
+}
+.OptionsInput{
+  height: 32px;
+  padding-left: 4px;
+  line-height: 32px;
+  width: 100%;
+}
+.branch-tagBox{
+  border:1px solid #eee;
+  border-radius: 3px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  min-width: 240px;
+}
+.branch-tagBox-list .ant-popover-arrow{
+  display: none;
+}
+.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{
+  padding-top:0px;
+}
+.branch-tagBox .ant-dropdown-link{
+  display: block;
+  flex:1;
+}
+.branch-tagBox-list .ant-popover-inner-content{
+  padding:0px;
+}
+.navUl{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 5px;
+}
+.navUl li{
+  cursor: pointer;
+}
+.navUl li.active{
+  color:#5091FF;
+}
+.listTips{
+  padding:20px 0px;
+  text-align: center;
+}

src/forge/Branch/branch.scss

@@ -1,129 +0,0 @@
-.branchDropdown{
-  border:1px solid #eee;
-  border-radius: 4px;
-  display: flex;
-  justify-content: center;
-  height: 40px;
-  line-height: 40px;
-  min-width: 220px;
-}
-.branchDropdown .ant-dropdown-trigger{
-  width: 100%;
-  padding:0px 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  cursor: pointer;
-}
-.branchOptions{
-  width: 220px;
-  box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
-  border-radius: 3px;
-  background: #fff;
-  max-height: 300px;
-}
-.OptionsUl{
-  min-height: 50px;
-  max-height: 220px;
-  overflow-y: auto;
-}
-.OptionsUl li{
-  height: 30px;
-  line-height: 30px;
-  cursor: pointer;
-  padding:0px 20px;
-  margin:5px 0px;
-}
-.OptionsUl li:hover{
-   background-color: #F0F0F0;
-}
-.OptionsUl li a{
-  display: block;
-}
-.OptionsInput{
-  height: 32px;
-  padding-left: 4px;
-  line-height: 32px;
-  width: 100%;
-}
-.branch-tagBox{
-  border:1px solid #D0D0D0;
-  border-radius: 3px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  min-width: 104px;
-}
-.branch-tagBox:hover{
-  background-color: #F3F4F6;
-}
-.branch-tagBox-list{
-  background: #FFFFFF;
-  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
-  border-radius: 4px;
-  .ant-popover-arrow{
-    display: none;
-  }
-  &.ant-popover.ant-popover-placement-bottom{
-    padding-top:0px;
-  }
-  .branch-tagBox .ant-dropdown-link{
-    display: block;
-    flex:1;
-    max-width: 105px;
-  }
-  .ant-popover-inner-content{
-    padding:0px;
-  }
-}
-.overlayBranch{
-  width: 325px;
-  .navUl{
-    margin-top: 8px;
-    height: 30px;
-    line-height: 30px;
-    li{
-      height: 30px;
-      line-height: 30px;
-      padding:0px 5px;
-      margin-left: 20px!important;
-      &.ant-menu-item-selected{
-        border-color:#466aff!important;
-        color:#466aff!important;
-      }
-      &.ant-menu-item-active{
-        border-color:transparent ;
-      }
-    }
-  }
-}
-.listTips{
-  padding:20px 0px;
-  text-align: center;
-}
-
-.urlMenu{
-  line-height: 30px;
-  margin-bottom: 10px;
-  padding:15px 20px 0px 20px;
-  border-bottom: none;
-  li.ant-menu-item{
-    height: 30px;
-    line-height: 30px;
-    padding:0px 5px;
-    margin-right: 20px!important;
-    &.ant-menu-item-selected,&.ant-menu-item-active{
-      color: #333;
-    }
-    &.ant-menu-item-selected{
-      border-color:#466aff!important;
-    }
-    &.ant-menu-item-active{
-      border-color:transparent ;
-    }
-  }
-}
-.copytool{
-  margin:0px 10px;
-}

src/forge/Component/AddGroup.jsx

@@ -55,7 +55,6 @@ function AddGroup({organizeId,getGroupID}){
 
   function addCollaborator(){
     getGroupID && getGroupID(id);
-    setID(undefined);
   }
 
   return(

src/forge/Component/AddMember.jsx

@@ -4,7 +4,7 @@ import axios from 'axios';
 import { getImageUrl } from 'educoder';
 
 const { Option } = AutoComplete;
-function AddMember({getID,login,showNotification}){
+function AddMember({getID,login}){
   const [ id , setID ] = useState(undefined);
   const [ source , setSource ] = useState(undefined);
   const [ searchKey , setSearchKey ] = useState(undefined);
@@ -42,10 +42,10 @@ function AddMember({getID,login,showNotification}){
             className="user_img radius"
             width="28"
             height="28"
-            src={getImageUrl(`/${item && item.image_url}`)}
+            src={getImageUrl(`images/${item && item.image_url}`)}
             alt=""
           />
-          <span className="ml10" style={{ verticalAlign: "middle" }}>
+          <span className="ml10" style={{ "vertical-align": "middle" }}>
             {item.username}
             <span className="color-grey ml10">({item.login})</span>
           </span>
@@ -66,12 +66,7 @@ function AddMember({getID,login,showNotification}){
   };
 
   function addCollaborator(){
-    if(source && source.length>0){
-      getID && getID(id);
-      setSearchKey(undefined);
-    }else{
-      showNotification("请选择存在的用户!");
-    }
+    getID && getID(id);
   }
 
   return(

src/forge/Component/Cards.jsx

@@ -3,10 +3,10 @@ import { getImageUrl } from 'educoder';
 import { Link } from 'react-router-dom';
 import './Component.scss';
 
-function Cards({img , title, desc , rightBtn , src , bottomInfos}){
+function Cards({img , title, desc , rightBtn , src}){
   return(
     <div className="cards">
-      {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
+      {img &&<div className="img"><img src={getImageUrl(`images/${img}`)} alt=""/></div>}
       <div className="content">
         <p className="titles">
           <Link to={src}>{title}</Link>
@@ -15,7 +15,6 @@ function Cards({img , title, desc , rightBtn , src , bottomInfos}){
         <div className="desc">
           {desc}
         </div>
-        {bottomInfos}
       </div>
     </div>
   )

src/forge/Component/Component.scss

@@ -20,7 +20,6 @@ li.ant-menu-item{
   background-color: #fff;
   margin-bottom:18px;
   min-height: 130px;
-  border:1px solid #eee;
   .img{
     margin-right: 20px;
     width: 190px;
@@ -62,7 +61,6 @@ li.ant-menu-item{
 }
 // Tabs
 .tabsStyle{
-  border:1px solid #eee;
   .ant-tabs-bar.ant-tabs-top-bar{
     padding-left: 35px;
     margin-bottom: 0px;
@@ -112,16 +110,6 @@ li.ant-menu-item{
   right:240px;
   z-index: 10000;
 }
-.laterest{
-  background-color: #EF3131;
-  color: #fff;
-  font-size: 12px;
-  margin-left: 10px;
-  padding:0px 5px;
-  border-radius: 2px;
-  height: 18px;
-  line-height: 18px;
-}
 
 @media screen and (max-width: 1800px){
   .handleBox{
@@ -147,295 +135,4 @@ li.ant-menu-item{
   .handleBox{
     right:0px;
   }
-}
-.ant-drawer{
-  z-index: 10000!important;
-}
-.ant-drawer-body{
-  padding:0px!important;
-  .drawerHead{
-    background-color: #333;
-    color: #fff;
-    padding:15px 20px;
-  }
-  .ant-tree{
-    margin:0px 20px!important;
-  }
-}
-.hoverA{
-  display:flex;
-  align-items: center;
-  max-width: 78px;
-  &:hover a{
-    color:#2A61FF !important ;
-  }
-}
-.menuPanels{
-  width: 295px;
-  .leftline{
-    position: relative;
-    color: #666;
-    height: 16px;
-    margin-left: 14px;
-    font-size: 12px;
-    &::before{
-      position: absolute;
-      left: -7px;
-      top:3px;
-      height: 12px;
-      width: 1px;
-      background-color: #999;
-      content: "";
-    }
-  }
-  .ant-btn{
-    height: 36px;
-    line-height: 34px;
-    width: 83px;
-    text-align: center;
-    padding:0px ;
-    font-weight: 500;
-    font-size: 14px;
-    &.currentBtn{
-      cursor: default;
-      color: #333;
-      &:hover{
-        color: #333;
-        border-color: #d0d0d0;
-      }
-    }
-  }
-  .ant-btn-default{
-    color: #333;
-    border-color: #d0d0d0;
-    &:hover{
-      background: #F3F4F6;
-    }
-  }
-  .ant-btn{
-    width: 102px;
-    height: 32px;
-    line-height: 30px;
-  }
-  .ant-btn-primary{
-    color: #fff;
-    background-color: #466AFF;
-    border:none;
-    &:hover{
-      background-color: rgba(70,106,255,0.85);
-    }
-  }
-  .focusPanelHeadInfo{
-    padding:14px 16px;
-    border-bottom: 1px solid #eee;
-  }
-  .ant-popover-content,.ant-popover-inner{
-    height: 100%;
-    width: 100%;
-  }
-  .ant-popover-inner-content{
-    padding:0px;
-  }
-}
-.halfs{
-  margin-top: 24px;
-  padding:24px 0px 0px 0px;
-  border-top: 1px solid #e8e8e8;
-}
-.aboutSubTitle{
-  display: flex;
-  align-items: center;
-}
-.menuMaininfos{
-  padding:10px 16px 14px;
-  border-bottom: 1px solid #eee;
-}
-.menuinfos{
-  padding:10px 20px 16px;
-  &>a{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    flex: 1;
-    & >span:first-child{
-      font-size: 16px;
-      font-weight: 500;
-      color: #333;
-      line-height: 22px;
-    }
-    & >span:last-child{
-      color: #666;
-      font-weight: 400;
-      line-height: 20px;
-      margin-top: 6px;
-    }
-  }
-}
-
-/*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar {
-  position: fixed;
-  width: 40px;
-  right: 0;
-  bottom: 80px;
-  z-index: 10;
-}
-
-@media screen and (max-width: 1920px){
-  .-task-sidebar{
-    right:220px;
-  }
-}
-@media screen and (max-width: 1750px){
-  .-task-sidebar{
-    right:160px;
-  }
-}
-@media screen and (max-width: 1650px){
-  .-task-sidebar{
-    right:115px;
-  }
-}
-@media screen and (max-width: 1550px){
-  .-task-sidebar{
-    right:90px;
-  }
-}
-@media screen and (max-width: 1450px){
-  .-task-sidebar{
-    right:45px;
-  }
-}
-@media screen and (max-width: 1200px){
-  .-task-sidebar{
-    right:0px;
-    display: none;
-  }
-}
-.-task-sidebar>div {
-  height: 40px;
-  line-height: 40px;
-  box-sizing: border-box;
-  width: 40px;
-  color: #999;
-  font-size: 20px;
-  text-align: center;
-  margin-bottom: 20px;
-  border-radius: 50%;
-  background: #FFFFFF;
-  box-shadow: 0px 0px 10px 1px #F1F1F1;
-}
-
-.-task-sidebar>div i {
-  color: #999;
-}
-
-.-task-sidebar>div:hover i {
-  color: #fff !important;
-}
-.-task-sidebar>div:hover{
-  background: #1890FF;
-  box-shadow: 0px 0px 10px 2px #B6D0FC;
-}
-.helpBox{
-  width: 260px;
-  z-index: 103;
-  &.shareContent{
-    width: 200px;
-  }
-  .ant-popover-inner-content{
-    padding:0px;
-  }
-  p.titlecontent{
-    font-size: 18px;
-    color: #333;
-    line-height: 20px;
-    padding:15px 20px;
-  }
-  .faqUl{
-    padding:0px 20px 10px;
-    max-height: 230px;
-    overflow-y: auto;
-    li{
-      background: #F5F5F5;
-      border-radius: 20px;
-      padding:0px 20px;
-      color: #333;
-      height: 34px;
-      line-height: 34px;
-      margin-bottom: 10px;
-      a{
-        display: block;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-      &:hover{
-        background-color: #D1E9FF;
-        a{
-          color: #333!important;
-        }
-      }
-    }
-  }
-  .shareUl{
-    padding:10px 0px;
-    display: flex;
-    align-items: center;
-    .titlecontent{
-      margin-right: 20px;
-    }
-    li > i{
-      font-size: 32px!important;
-    }
-  }
-}
-
-
-
-.-task-desc {
-  background: #494949;
-  width: 90px;
-  line-height: 36px;
-  text-align: center;
-  position: absolute;
-  color: #fff;
-  font-size: 13px;
-  z-index: 999999;
-  opacity: 0;
-}
-
-.-task-desc div {
-  position: absolute;
-  top: 10px;
-  right: -7px;
-  height: 13px;
-}
-
-.-task-desc div img {
-  float: left
-}
-
-.-task-sidebar .scan_ewm {
-  position: absolute !important;
-  right: 45px !important;
-  bottom: 0px !important;
-  background-color: #494949 !important;
-  -webkit-box-sizing: border-box !important;
-  box-sizing: border-box !important;
-  font-size: 14px !important;
-  line-height: 16px !important;
-  display: none;
-  height: 213px !important;
-}
-
-.trangle_right {
-  position: absolute;
-  right: -5px;
-  bottom: 15px;
-  width: 0;
-  height: 0px;
-  border-top: 6px solid transparent;
-  border-left: 5px solid #494949;
-  border-bottom: 6px solid transparent
-}
+}

src/forge/Component/Contributors.jsx

@@ -1,174 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { AlignCenter , FlexAJ  } from '../Component/layout';
-import { Link } from 'react-router-dom';
-import { Popover , Spin , Button } from 'antd';
-import { getImageUrl } from 'educoder';
-import './Component.scss';
-import { getUser } from '../GetData/getData';
-import axios from 'axios';
-
-function Contributors({contributors,owner,projectsId,currentLogin}){
-  const [ menuList ,setMenuList ]= useState([]);
-  const [ list , setList ]= useState(undefined);
-  const [ total , setTotal ]= useState(0);
-  const [ menu , setMenu ] = useState("");
-  const [ login , setLogin ] = useState(undefined);
-  const [ isSpin , setIsSpin ] = useState(false);
-
-  useEffect(()=>{
-    if(contributors && contributors.total_count>0){
-      setTotal(contributors.total_count);
-      setList(contributors.list);
-    }
-  },[contributors])
-
-  useEffect(()=>{
-    if(login){
-      getUsers(login);
-    }else{
-      setMenu(undefined);
-    }
-  },[login])
-
-  async function getUsers(login){
-    setIsSpin(true);
-    let a = menuList && menuList.filter(i=>i.login === login);
-    if(a.length === 0){
-      let result = await getUser(login);
-      let arr = menuList;
-      arr.push({...result});
-      setMenuList(arr);
-      setMenusFunc(result);
-      setIsSpin(false);
-    }else{
-      setMenusFunc(a[0]);
-      setIsSpin(false);
-    }
-  }
-
-  function renderOrganize(list) {
-    let str = "";
-    list.map(i=>{
-      str = str+i.name + "、";
-    })
-    return str && str.substr(0,str.length - 1);
-  }
-
-  function setMenusFunc(data){
-    if(data){
-      let ele = (
-        <Spin spinning={isSpin}>
-          <FlexAJ className="menuMaininfos">
-            <AlignCenter>
-              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
-             
-              <div className="ml10">
-                <Link to={`/${data.login}`}>{data.name}</Link>
-                { data.location && <span className="leftline">{data.location}</span> }
-                {
-                  data.organizations && data.organizations.length>0&&
-                  <p className="task-hide" style={{maxWidth:"215px"}}>
-                    所属组织：{renderOrganize(data.organizations)}
-                  </p>
-                }
-              </div>
-            </AlignCenter>
-          </FlexAJ>
-          <AlignCenter className="menuinfos">
-            <Link to={`/${data.login}/projects`}>
-              <span>{data.projects_count}</span>
-              <span>项目数</span>
-            </Link>
-            <Link to={`/${data.login}/followers`}>
-              <span>{data.followers_count}</span>
-              <span>粉丝数</span>
-            </Link>
-            <Link to={`/${data.login}/following`}>
-              <span>{data.following_count}</span>
-              <span>关注数</span>
-            </Link>
-          </AlignCenter>
-          <div className={"pb20"} style={{display:"flex",justifyContent:'center'}}>
-            {
-              currentLogin && (currentLogin === data.login)
-              ?
-              <Button className="currentBtn">当前用户</Button>
-              :
-              data.is_watch ? 
-              <Button type={"default"} onClick={()=>FocusFunc(false,data.login)}>已关注</Button>
-              :
-              <Button type={"primary"} onClick={()=>FocusFunc(true,data.login)}>关注TA</Button>
-            }
-          </div>
-        </Spin>
-      )
-      setMenu(ele);
-    }
-  }
-
-  function FocusFunc(flag,login){
-    axios({
-      method: flag ? 'post' : 'delete',
-      url: `/watchers/${flag ? 'follow' : 'unfollow'}.json`,
-      params: {target_type: "user",id:login}
-    }).then(result => {
-      if (result && (result.data.status === 0 || result.data.status === 2)) {
-        let a = menuList && menuList.filter(i=>i.login === login);
-        if(a){
-          a[0].is_watch = flag;
-        }
-        setMenusFunc(a[0]);
-      }
-    })
-    .catch(error => {
-      console.log(error);
-    });
-  }
-
-  function renderArray(array){
-    let str = "";
-    for(var i = 0;i<array.length;i++){
-      str += array[i].name +"、";
-    }
-    let substr = str.substr(0,str.length-1);
-    return (<span title={substr}>{substr}</span>)
-  }
-
-  function setVisibleFunc(flag,l,index){
-    if(l !== login){
-      setLogin(l);
-    }
-    var lx = list.concat();
-    lx.map(i=>i.visible =false);
-    if(flag){
-      lx[index].visible = flag;
-    }
-    lx.splice();
-    setList(lx);
-  }
-
-  return(
-    <div className="halfs">
-      <Link to={`/${owner}/${projectsId}/contribute`} className="font-16 color-ooo hoverA">
-        <span>贡献者</span>
-        { contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
-      </Link>
-      <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
-        {
-          total > 0 ?
-          list.map((item,key)=>{
-            return(
-              <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/${item.login}`}>
-                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
-                </Link>
-              </Popover>
-            )
-          })
-          :""
-        }
-      </div>
-    </div>
-  )
-}
-export default Contributors;

src/forge/Component/CopyTool.jsx

@@ -1,51 +0,0 @@
-import React, { useState, useCallback, memo } from 'react';
-import { Tooltip } from 'antd';
-
-CopyTool.defaultProps = {
-  beforeText: '复制链接',     //浮动过去显示的文字
-  afterText: '复制成功',  //点击后显示的文字
-  className: '',         //传给svg的class
-  inputId: 'copyText',    //要复制的文本的ID
-  timeOut:true, //复制后将浮动的文字改为beforeText
-};
-
-
-function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
-  const [title, setTitle] = useState(() => {
-    return beforeText;
-  });
-
-  // 复制链接
-  const copyUrl = useCallback(() => {
-    const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
-    if (!copyEle) {
-      console.error("您的CopyTool未设置正确的inputId");
-      return;
-    }
-    copyEle.select(); // 执行选中元素
-    if (document.execCommand('copy')) {
-      document.execCommand('copy');
-    }
-    document.getSelection().removeAllRanges();
-    
-    setTitle(afterText);
-    if(timeOut){
-      setTimeout(function(){
-        setTitle(beforeText);
-      },1500)
-    }
-  }, []);
-
-  return (
-    <Tooltip
-      placement="top"
-      title={title}
-      onVisibleChange={() => { setTitle(beforeText) }}
-    >
-      <i className={`iconfont icon-fuzhiicon ${className}`} style={{ color: '#466aff' }} onClick={copyUrl}></i>
-    </Tooltip>
-  );
-}
-
-
-export default memo(CopyTool);

src/forge/Component/DeleteModal/Index.jsx

@@ -1,33 +0,0 @@
-import React from 'react';
-import { AlignCenter } from '../layout';
-import { Button } from 'antd';
-import Modals from '../PublicModal/Index';
-
-function DeleteBox({ 
-  visible , 
-  onCancel ,
-  onSuccess ,
-  title ,
-  subTitle,
-  content
-}) {
-  return(
-    <Modals 
-      title={title} 
-      btn={
-        <div>
-          <Button size={'large'} onClick={onCancel}>取消</Button>
-          <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
-        </div>
-      } 
-      onCancel={onCancel} 
-      visible={visible}
-    >
-      <div className="desc">
-        <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
-      <p>{subTitle}</p>
-      </div>
-    </Modals>
-  )
-}
-export default DeleteBox;

src/forge/Component/DrawerPanel.jsx

@@ -1,106 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Drawer , Tree , Spin } from 'antd';
-import './Component.scss';
-import axios from 'axios';
-const { TreeNode , DirectoryTree } = Tree;
-
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
-function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
-  const [ treeData , setTreeData ] = useState(undefined);
-  const [ isSpin , setIsSpin ] = useState(true);
-  const [first , setFirst ] = useState(true);
-  useEffect(()=>{
-    if(visible && first){
-      if(list){
-        setTreeData(list);
-        setIsSpin(false);
-      }else{
-        getMenulist();
-      }
-      setFirst(false);
-    }
-  },[visible])
-
-  function getMenulist(){
-    const url = `/${owner}/${projectsId}/entries.json`;
-    axios.get(url,{ params: { ref: branch } }).then(result=>{
-      if(result){
-        setTreeData(result.data.entries);
-      }
-      setIsSpin(false);
-    }).catch(error=>{})
-  }
-
-  function renderTreeNodes(data) {
-    return data && data.length > 0 && data.map((item) => {
-      return (
-        <TreeNode title={item.name} key={item.key} dataRef={item} isLeaf={item.type === "file"}>
-          {renderTreeNodes(item.children)}
-        </TreeNode>
-      );
-    });
-  }
-
-  function onLoadData(tr){
-    return new Promise((resolve) => {
-      if (tr.props.children) {
-          resolve();
-          return;
-      }
-      let en = [];
-      const url = `/${owner}/${projectsId}/sub_entries.json`;
-      axios.get(url, { 
-        params:{
-          filepath:tr.props.dataRef.path,
-          ref:branch,
-          type:"dir"
-        }
-      }).then((result) => {
-        if(result){
-          en =  result.data.entries;
-        }
-      }).catch(error=>{})
-      setTimeout(() => {
-        tr.props.dataRef.children = en;
-        setTreeData([...treeData]);
-        resolve();
-      }, 2000);
-    });
-  }
-
-  function selectTree(keys,event){
-    let dataref = event.node.props.dataRef;
-    if(dataref.type==="file"){
-      onClose();
-      let value = turnbar(branch);
-      history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
-    }
-  }
-
-  return(
-    <Drawer
-      placement="left"
-      visible={visible}
-      closable={false}
-      onClose={onClose}
-      width={"320px"}
-      maskStyle={{backgroundColor:'rgba(0,0,0,0.09)'}}
-    >
-      <Spin spinning={isSpin}>
-        <div className="drawerHead">
-          <p className="font-20">{name}</p>
-          <p><i class="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>{branch}</p>
-        </div>
-        <DirectoryTree loadData={onLoadData} onSelect={selectTree}>
-          {treeData && renderTreeNodes(treeData)}
-        </DirectoryTree>
-      </Spin>
-    </Drawer>
-  )
-}
-export default DrawerPanel;

src/forge/Component/EAccount.scss

@@ -1,6 +0,0 @@
-.ant-modal-mask{
-  z-index: 1031;
-}
-.ant-modal-wrap{
-  z-index: 1032;
-}

src/forge/Component/EducoderAccount.jsx

@@ -1,60 +0,0 @@
-import React , {forwardRef, useEffect} from 'react';
-import { Modal , Form , Input , Button } from 'antd';
-import './EAccount.scss';
-
-function EducoderAccount({form , visible , onOk , email}){
-  const { getFieldDecorator, validateFields , setFieldsValue } = form;
-
-  useEffect(()=>{
-    if(email){
-      setFieldsValue({email})
-    }
-  },[email])
-
-  function onSure(){
-    validateFields((error,values)=>{
-      if(!error){
-        onOk(values);
-      }
-    })
-  }
-  const layout = {
-    labelCol: { span: 5 },
-    wrapperCol: { span: 18 },
-  };
-  return(
-    <Modal 
-      visible={visible}
-      title="提示"
-      width="500px"
-      closable={false}
-      footer={
-        <Button type="primary" onClick={onSure}>确定</Button>
-      }
-      centered
-    >
-      <div>
-        <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
-        为确保您能正常使用平台功能，请确认以下信息:
-        </p>
-        <Form {...layout}>
-          <Form.Item label="邮箱">
-            {getFieldDecorator("email",{
-              rules:[{required:true,message:"请输入邮箱账号"}]
-            })(
-              <Input placeholder="请输入您的邮箱账号" width="220px"/>
-            )}
-          </Form.Item>
-          <Form.Item label="密码">
-            {getFieldDecorator("password",{
-              rules:[{required:true,message:"请输入邮箱密码"}]
-            })(
-              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
-            )}
-          </Form.Item>
-        </Form>
-      </div>
-    </Modal>
-  )
-}
-export default Form.create()(forwardRef(EducoderAccount));

src/forge/Component/FileLanguage.jsx

@@ -1,3 +1,5 @@
+
+
 import React , { useState , useEffect } from 'react';
 import { Select } from 'antd';
 import axios from 'axios';
@@ -57,7 +59,6 @@ const LANGUAGE = [
 
 export default (({ language , select_language })=>{
   const [ languages , setLanguage ] = useState(undefined);
-
   // useEffect(()=>{
   //   const url = '/dev_ops/languages.json';
   //   axios.get(url).then(result=>{

src/forge/Component/Handbook.jsx

@@ -5,7 +5,7 @@ import './Component.scss';
 export default (()=>{
   return(
     <div className="handleBox">
-      <a href="https://forum.trustie.net/forums/3075/detail" target="_blank" >
+      <a href="https://forum.trustie.net/forums/3075/detail" ta  rget="_blank" >
         <img src={Handbook} alt=""/>
       </a>
     </div>

src/forge/Component/HeadSearch.jsx

@@ -1,41 +0,0 @@
-import React, { useState } from "react";
-import { Input ,notification} from "antd";
-
-const { Search } = Input;
-export default ({history}) => {
-  const [openSearch, setOpenSearch] = useState(false);
-
-  function onGlobalSearch(value) {
-    history.push('/search?value=' + value);
-    // window.location.href = `search?value=` + value;
-    // history.push({
-    //   pathname:'/search',
-    //   state:value
-    // })
-  }
-  return (
-    <React.Fragment>
-      {
-        openSearch ?
-          <div
-            onBlur={() => {
-              setTimeout(() => {
-                setOpenSearch(false)
-              }, 500)
-            }}
-          >
-            <Search placeholder="请输入搜索关键字"
-              className={`search-input mr20`}
-              onSearch={onGlobalSearch}
-              autoFocus={true}
-              style={{width:'260px'}}
-            />
-          </div>
-          :
-          <i className="iconfont icon-sousuo font-18 color-grey-6 ml30" onClick={() => {
-            setOpenSearch(true)
-          }} />
-      }
-    </React.Fragment>
-  )
-};

src/forge/Component/LanguagePower.jsx

@@ -1,54 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { FlexAJ  } from '../Component/layout';
-
-function LanguagePower({languages}){
-  const [ array , setArray ] = useState(undefined);
-
-  useEffect(()=>{
-    if(languages){
-      let arr = [];
-      Object.keys(languages).map((item,key)=>{
-        arr.push({name:item,percent:languages[item],color:getColor()});
-      })
-      setArray(arr);
-    }
-  },[languages])
-
-   function getColor(){
-      let str = "#";
-      let arr = ["1","2","3","4","4","5","6","7","8","9","a","b","c","d","e","f"];
-      for(var i=0;i<6;i++){
-        let num = parseInt(Math.random() * 16);
-        str+=arr[num];
-      }
-      return str;
-    }
-  return(
-    <div>
-      <p className="font-16 color-ooo aboutSubTitle">开发语言</p>
-      <div className="progress">
-        {
-          array && array.map((item,key)=>{
-            return(
-              <span style={{width:item.percent,backgroundColor:item.color}}></span>
-            )
-          })
-        }
-      </div>
-      {
-        array && array.length > 0 &&
-        <FlexAJ className="progresstip">
-          {
-            array.map((item,key)=>{
-              return(
-                <span><i className="zero" style={{backgroundColor:`${item.color}`}}></i><span>{item.name}</span><span>{item.percent}</span></span>
-              )
-            })
-          }
-        </FlexAJ>
-      }
-      
-    </div>
-  )
-}
-export default LanguagePower;

src/forge/Component/MemberCards.jsx

@@ -45,15 +45,15 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
   return (
     <Div>
-      <Link to={`/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`images/${img}`)} /></Link>
       <div className="m-infos">
-        <Link to={`/${user && user.login}`}><Name>{name}</Name></Link>
+        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
         {
           is_current_user ?
           <Button type="default">当前用户</Button>
           : 
-          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc} notReset={true}/>
+          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc}/>
         }
       </div>
     </Div>

src/forge/Component/ModalFun/index.jsx

@@ -1,125 +0,0 @@
-/* eslint-disable react/jsx-no-duplicate-props */
-import React, { useState } from 'react';
-import * as ReactDOM from 'react-dom';
-import { Modal, Button } from 'antd';
-import './index.scss';
-
-// 函数式调用删除、通知等模态框
-
-InitModal.defaultProps = {
-  okText: '确认',     //确定按钮的文字
-  cancelText: '取消',  //取消按钮的文字
-  className: '',         //传入的模态框类名
-  inputId: 'copyText',    //要复制的文本的ID
-  onCancel:()=>{},        //取消的回调
-  onOk:()=>{},            //确认的回调
-  title:'提示',            //模态框名字
-  contentTitle:'',        //内容标题
-  content:'',             //详细内容
-  afterClose:()=>{},      //关闭模态框以后的回调
-};
-
-// 使用函数调用删除组件
-export default function DelModal(props) {
-  renderModal({ ...props, type: 'delete' })
-}
-
-// 使用函数调用选择模态框组件
-export function Confirm(props) {
-  renderModal({ ...props, type: 'confirm' })
-}
-
-function renderModal(props) {
-  const { type, afterClose } = props;
-  const div = document.createElement('div');
-  document.body.appendChild(div);
-
-  function destroy() {
-    afterClose && afterClose();
-    const unmountResult = ReactDOM.unmountComponentAtNode(div);
-    if (unmountResult && div.parentNode) {
-      div.parentNode.removeChild(div);
-    }
-  }
-
-  function modalType(type) {
-    if (type === 'delete') {
-      return <InitModal
-        title="删除"
-        contentTitle="确定要删除吗？"
-        okText="确认删除"
-        {...props}
-
-        afterClose={destroy}
-        contentTitle={<React.Fragment>
-          <i className="red-circle iconfont icon-shanchu_tc_icon mr3"></i>
-          {props.contentTitle}
-        </React.Fragment>}
-      />
-    } else if (type === 'confirm') {
-      return <InitModal title="选择" afterClose={destroy} {...props} />
-    } else {
-      return <InitModal title="选择" afterClose={destroy} {...props} />
-    }
-  }
-
-  function render() {
-    setTimeout(() => {
-      ReactDOM.render(
-        modalType(type),
-        div,
-      );
-    });
-  }
-  render();
-}
-
-// 选择模态框组件
-function InitModal({
-  onCancel,
-  onOk,
-  title,
-  contentTitle,
-  content,
-  okText,
-  cancelText,
-  afterClose,
-  className,
-}) {
-
-  const [visible, setVisible] = useState(true);
-
-  function onCancelModal() {
-    setVisible(false);
-    onCancel && onCancel()
-  }
-
-  function onSuccess() {
-    setVisible(false);
-    onOk && onOk();
-  }
-
-  return (
-    <Modal
-      visible={visible}
-      onCancel={onCancelModal}
-      afterClose={afterClose}
-      title={title}
-      className={`myself-modal ${className}`}
-      centered
-      footer={[
-        <Button type="default" key="back" onClick={onCancelModal}>
-          {cancelText}
-        </Button>,
-        <Button className="foot-submit" key="submit" onClick={onSuccess}>
-          {okText}
-        </Button>,
-      ]}
-    >
-      <div>
-        {contentTitle && <p className="content-title">{contentTitle}</p>}
-        <p className="content-descibe">{content}</p>
-      </div>
-    </Modal>
-  )
-}

src/forge/Component/ModalFun/index.scss

@@ -1,63 +0,0 @@
-.myself-modal {
-  .ant-modal-header {
-    padding: 9px 24px;
-    background: #f8f8f8;
-    border-bottom: 1px solid #eee;
-  }
-  .ant-modal-title {
-    text-align: left;
-  }
-  .ant-modal-close {
-    top: 0px !important;
-  }
-  .ant-modal-close-x {
-    font-size: 24px;
-  }
-  .ant-modal-body {
-    text-align: center;
-  }
-  .content-title {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin: 2rem 0 1rem !important;
-    font-size: 16px;
-    color: #333;
-    letter-spacing: 0;
-    line-height: 29px;
-    font-weight: 400;
-  }
-  .red-circle {
-    align-self: flex-start;
-    color: #ca0002;
-    font-size: 1.5rem !important;
-  }
-  .content-descibe {
-    font-size: 14px;
-    color: #666;
-    line-height: 33px;
-    font-weight: 400;
-  }
-  .ant-modal-footer {
-    padding: 2rem 0;
-    text-align: center;
-    border: 0;
-    .ant-btn {
-      width: 6rem;
-    }
-  }
-  .foot-submit {
-    margin-left: 3rem;
-    color: #df0002;
-    &:hover {
-      border-color: #df0002;
-    }
-  }
-  .ant-btn-default:hover,
-  .ant-btn-default:active,
-  .ant-btn-default:focus {
-    background: #f3f4f6;
-    color: #333;
-    border-color: #d0d0d0;
-  }
-}

src/forge/Component/Monaco.jsx

@@ -1,62 +0,0 @@
-import React, {useEffect, useRef, useState} from 'react';
-import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
-import './Component.scss';
-
-function Monaco(props) {
-  const {
-    style = { // dom节点样式
-      height: '400px',
-    },
-    value = '', // 代码文本
-    onChange = () => { // 改变的事件
-    },
-    fontSize = 14, // 代码字体大小
-    monacoOptions = {
-      scrollBeyondLastLine: false,
-      lineNumbers: "off",
-      wordWrap: true,
-      overviewRulerBorder: true,
-      lineHeight: 24,
-      readOnly:true
-    }, // monaco 自定义属性
-    language = 'html', // 语言 支持 js ts sql css json html等
-  } = props;
-  const editOrRef = useRef();
-  const ThisEditor = useRef();
-  useEffect(() => {
-    ThisEditor.current = monaco.editor.create(editOrRef.current, {
-      value: value || '',
-      language,
-      theme: "vs-grey",
-      fontSize: fontSize + 'px',
-      minimap: { // 关闭代码缩略图
-        enabled: false,
-      },
-      ...monacoOptions,
-    });
- 
-    ThisEditor.current.onDidChangeModelContent((e) => {
-      let newValue = ThisEditor.current.getValue();
-      onChange(newValue);
-    });
-    return () => {
-      ThisEditor.current.dispose();
-      ThisEditor.current = undefined; // 清除编辑器对象
-    }
-  }, []);
-  useEffect(() => {
-    if (ThisEditor.current) {
-      ThisEditor.current.updateOptions({
-        fontSize: fontSize + 'px',
-      })
-    }
-  }, [fontSize]);
- 
-  return (
-    <div style={style} ref={editOrRef}>
- 
-    </div>
-  );
-}
- 
-export default Monaco;

src/forge/Component/NoticeModal/Index.scss

@@ -1,90 +0,0 @@
-.systemBox{
-  .ant-modal-body{
-    padding:1px 0px 0px 0px;
-    .sysBox{
-      background-image: url('./bg.png');
-      background-repeat: no-repeat;
-      background-size: 100% 334px;
-      margin-top: -55px;
-    }
-    .sysnoticeBox{
-      width: 100%;
-      padding:80px 0px 34px;
-      display: flex;
-      flex-direction: column;
-      width: 780px;
-      margin: 0px auto;
-      p.ntitle{
-        height: 33px;
-        font-size: 24px;
-        font-weight: 500;
-        color: #31FFF7;
-        line-height: 33px;
-        text-align: center;
-      }
-      p.nSubtitle{
-        height: 25px;
-        line-height: 25px;
-        font-size: 18px;
-        font-weight: 500;
-        color: #FFFFFF;
-        margin-top: 60px;
-        padding-left: 20px;
-      }
-      .markdown-body{
-        box-shadow: 0px 0px 17px rgba(0,0,0,0.2);
-        border-radius: 4px;
-        margin-top: 17px!important;
-      }
-      .nContent{
-        padding:20px 34px;
-        background-color: #fff;
-        line-height: 30px;
-        font-size: 15px;
-        font-weight: 400;
-        color: #333;
-        .realmName{
-          margin-top: 20px;
-          display: flex;
-          ul{
-            width: 50%;
-            padding-left: 0px!important;
-            li{
-              font-size: 15px;
-              font-weight: 500;
-              line-height: 32px;
-              text-align: left;
-              color: #000;
-              list-style-type: none!important;
-              &:first-child{
-                color: #E65714;
-              }
-            }
-          }
-        }
-        .nSubdesc{
-          font-size: 15px;
-          font-weight: 400;
-          color: #000000;
-          line-height: 31px;
-          margin-top: 20px;
-        }
-        .nInfo{
-          font-size: 14px;
-          font-weight: 400;
-          color: #333333;
-          text-align: right;
-          margin-top: 25px;
-          p{
-            height: 20px;
-            line-height: 20px;
-          }
-        }
-      }
-      .nBtn{
-        text-align: center;
-        margin-top: 33px;
-      }
-    }
-  }
-}

src/forge/Component/NoticeModal/SystemNotice.jsx

@@ -1,76 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import { Modal , Button } from 'antd';
-import './Index.scss';
-import '../../css/index.scss';
-import RenderHtml from '../../../components/render-html';
-import cookie from 'react-cookies';
-
-function SystemNotice({system_notification,history}){
-  const [ visible , setVisible ] = useState(false);
-
-  useEffect(()=>{
-    if(system_notification && !cookie.load('notice_stage')){
-      setVisible(true);
-    }
-  },[system_notification,history.location])
-
-  function sureContinue() {
-    cookie.remove('notice_stage');
-
-    let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
-    // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
-    cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
-
-    setVisible(false);
-  }
-
-  return (
-    <Modal
-      visible = {visible}
-      width="1000px"
-      footer={false}
-      title={false}
-      centered={true}
-      closable={false}
-      wrapClassName={'systemBox'}
-    >
-      <div className="sysBox">
-        <div className="sysnoticeBox">
-          <p className="ntitle">{system_notification && system_notification.subject}</p>
-          <p className="nSubtitle">{system_notification && system_notification.sub_subject}</p>
-          {/* <div className="nContent">
-            <div className="nMaindesc">
-            为了给用户提供更加稳定、优质的服务，我们即将对平台门户首页、平台名称、平台域名进行一次全面升级与变更。原平台名称：Trustie（中文名：确实）将于2021年10月xx日统一更改为Gitlink（中文名：确实开源）。届时平台域名将统一进行更换，更换规则如下
-            </div>
-            <div className="realmName">
-              <ul>
-                <li>原域名：</li>
-                <li>官网顶级域名https://www.trustie.net</li>
-                <li>版本库子域名https://forgeplus.trustie.net</li>
-                <li>论坛子域名https://forum.trustie.net/forums</li>
-              </ul>
-              <ul>
-                <li>更换后域名：</li>
-                <li>官网顶级域名https://www.gitlink.org.cn</li>
-                <li>版本库子域名https://www.git.gitlink.org.cn</li>
-                <li>论坛子域名https://forum.gitlink.org.cn</li>
-              </ul>
-            </div>
-            <div className="nSubdesc">
-            自2021年10月xx日起，旧域名将停止访问。因平台名称与域名变更给您带来的不便，我们深表歉意!非常感谢您一直以来对本平台的信任与支持，我们将一如既往地为您提供优质的服务。 特此通知!
-            </div>
-            <div className="nInfo">
-              <p>Gitlink运营团队</p>
-              <p>2021年10月xx日</p>
-            </div>
-          </div> */}
-          <RenderHtml className="break_word_comments imageLayerParent" value={system_notification && system_notification.content} url={history.location}/>
-          <div className="nBtn">
-            <Button type="primary" className="btnblue" onClick={sureContinue}>确认并继续</Button>
-          </div>
-        </div>
-      </div>
-    </Modal>
-  )
-}
-export default SystemNotice;

src/forge/Component/ProfileModal/Index.jsx

@@ -1,72 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import Modals from '../PublicModal/Index';
-import { Button } from 'antd';
-import axios from 'axios';
-
-import ProfileImg from './images/profile.png';
-import './Index.scss';
-
-function ProfileModal({visible,onCancel,history}) {
-  const [ modalVis , setModalVis ] = useState(visible);
-  const [ addMemberCheck , setAddMemberCheck ] = useState(false);
-
-  useEffect(()=>{
-    axios.interceptors.response.use((response) => {
-      if (response && (response.data.status === 411 || response.data.status === 412)) {
-        setModalVis(true);
-        if(response.data.status === 412){
-          setAddMemberCheck(true);
-        }
-      }
-      return response;
-      }, (error) => {
-    });
-  },[])
-
-  useEffect(()=>{
-    setModalVis(visible);
-  },[visible])
-  
-  function onOk(){
-    onCancel();
-    setModalVis(false);
-    setTimeout(function(){
-      window.open(`/settings/profile`,"_blank");
-    },200)
-  }
-
-  function onNo() {
-    onCancel();
-    setModalVis(false);
-  }
-
-  return(
-    <Modals 
-      title="完善资料" 
-      onCancel={onNo} 
-      visible={modalVis}
-      btn={
-        addMemberCheck?
-        <div>
-          <Button type={'primary'} size={"large"} onClick={onNo}>好的</Button>
-        </div>
-        :
-        <div>
-          <Button size={"large"} onClick={onNo}>暂不补充</Button>
-          <Button type={'primary'} size={"large"} onClick={onOk}>好的</Button>
-        </div>
-      }  
-    >
-      <div className="contents">
-        <img src={ProfileImg} alt=""/> 
-        {
-          addMemberCheck ?
-          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
-          :
-          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
-        }
-      </div>
-    </Modals>
-  )
-}
-export default ProfileModal;

src/forge/Component/ProfileModal/Index.scss

@@ -1,18 +0,0 @@
-.contents{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin:10px auto 0px;
-  img{
-    margin-right: 13px;
-    width: 44px;
-  }
-  p{
-    line-height: 29px;
-    max-width: 327px;
-    font-size: 16px!important;
-  }
-}
-.font-44{
-  font-size: 44px!important;
-}

src/forge/Component/ProfileModal/Profile.jsx

@@ -1,17 +0,0 @@
-import React from 'react';
-
-function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
-
-  function checkProfile() {
-    if(!completeProfile){
-      showCompeleteDialog && showCompeleteDialog();
-    }else{
-      sureFunc();
-    }
-  }
-
-  return(
-    <a className={className} onClick={checkProfile}>{children}</a>
-  )
-}
-export default Profile;

src/forge/Component/PublicModal/Index.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { Modal } from 'antd';
-import './Index.scss';
-
-function Modals({title,children,btn,onCancel,visible}) {
-  return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={title}
-      width={"520px"}
-      footer={btn}
-      centered={true}
-      wrapClassName={"deleteBox"}
-    >
-      {children}
-    </Modal>
-  )
-}
-export default Modals;

src/forge/Component/PublicModal/Index.scss

@@ -1,75 +0,0 @@
-.deleteBox{
-  z-index: 1033;
-  .ant-modal-close-x{
-    font-size: 17px!important;
-  }
-  .ant-modal-header{
-    background-color: #f8f8f8;
-    padding:10px 30px;
-    .ant-modal-title{
-      text-align: left;
-      font-size: 16px;
-      font-weight: bold;
-    }
-  }
-  .ant-modal-close{
-    top:0px !important;
-    font-size: 24px !important;
-  }
-  .ant-modal-body{
-    padding:30px 50px;
-    p{
-      font-size: 14px;
-      line-height: 26px;
-      color:#666;
-      word-break: break-all;
-    }
-    .desc{
-      .descMain{
-        align-items: center;
-        justify-content: center;
-        font-size: 20px;
-        margin-bottom: 10px;
-        i.red{
-          color:#DF0002;
-        }
-      }
-    }
-  }
-  .ant-modal-footer{
-    border-top: none;
-    text-align: center;
-    padding-bottom: 40px;
-    button,a{
-      width: 96px;
-      height: 32px;
-      margin:0px 20px;
-      font-weight: 400;
-      font-size: 14px;
-      &.ant-btn{
-        border-color: #D0D0D0;
-        color: #666;
-        &:hover,&:active,&:focus{
-          background: #f3f4f6;
-        }
-      }
-      &.ant-btn-danger{
-        background-color: #fff;
-        color: #DF0002;
-        border-color: #D0D0D0;
-        &:hover,&:active,&:focus{
-          border-color: #DF0002;
-          background-color: #fff;
-        }
-      }
-      &.ant-btn.ant-btn-primary{
-        background-color: #466AFF;
-        color: #fff;
-        border-color: #466AFF;
-        &:hover,&:focus,&:active{
-          background-color: rgba(70,106,255,0.85);
-        }
-      }
-    }
-  }
-}

src/forge/Component/Releases.jsx

@@ -1,38 +0,0 @@
-import React from 'react';
-import { AlignTop } from '../Component/layout';
-import { Link } from 'react-router-dom';
-
-function Releases({ owner, projectsId, releaseVersions, distribution }) {
-  return(
-    <div>
-      <Link to={`/${owner}/${projectsId}/releases`} className="font-16 color-ooo hoverA">
-        <span>发行版</span>
-      { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
-      </Link>
-      {
-        releaseVersions && releaseVersions.total_count>0 ?
-          releaseVersions.list.map((item,key)=>{
-            return(
-            key === 0 &&<AlignTop className="mt10">
-              <div>
-                <p className="font-16 color-grey-6" style={{display:'flex',alignItems:'center'}}>
-                  {/* 如果是点击最新则发行版列表页只展示最新的一个 */}
-                  <Link to={{pathname:`/${owner}/${projectsId}/releases`,query:{turnFromNew:true}}} style={{maxWidth:'200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis'}}>{item.name}</Link>
-                  <span className="font-12 laterest ml5">最新</span>
-                </p>
-                <p className="color-grey-3 font-12">{item.created_at}</p>
-              </div>
-            </AlignTop>
-            )
-          })
-        :
-        <div className="mt8">
-          您暂未发布任何版本
-          {distribution && <Link className="color-blue ml20" to={{pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}}}>创建新版本</Link>}
-        </div>
-      }
-      
-    </div>
-  )
-}
-export default Releases;

src/forge/Component/SearchUser.jsx

@@ -1,54 +1,50 @@
-import React , { useState , useEffect } from 'react';
+import React , { useState } from 'react';
 import { AutoComplete } from 'antd';
 import { getImageUrl } from "educoder";
 import axios from 'axios';
 
 const Option = AutoComplete.Option;
 
-export default ({ getUser , placeholder, width ,value })=>{
-  const [ source , setSource ] = useState(undefined);
+export default ({ getUser })=>{
   const [ searchKey , setSearchKey ] = useState(undefined);
-
-  useEffect(()=>{
-    if(!value){
-      setSearchKey(undefined);
-    }
-  },[value])
-  
-  useEffect(()=>{
-    getUserList();
-  },[searchKey])
+  const [ userDataSource , setUserDataSource ] = useState(undefined);
 
   function getUserList(e){
     const url = `/users/list.json`;
     axios.get(url, {
       params: {
-        search: searchKey,
+        search: e,
       },
-    }).then((result) => {
+    })
+    .then((result) => {
       if (result) {
-        sourceOptions(result.data.users);
+        setUserDataSource(result.data.users);
       }
     })
     .catch((error) => {
       console.log(error);
     });
   };
+  
+  function changeInputUser(value){
+    setSearchKey(value);
+    getUserList(value);
+  }
 
-  function sourceOptions(userDataSource){
-    const s = userDataSource && userDataSource.map((item, key) => {
+  function selectInputUser(id, option){
+    setSearchKey(option.props.value);
+    getUserList(option.props.value);
+    getUser && getUser(id);
+  }
+  const source =
+    userDataSource && userDataSource.map((item, key) => {
       return (
-        <Option
-          key={key}
-          value={`${item.user_id}`}
-          login={`${item.login}`}
-          name={item.username}
-        >
+        <Option key={key} value={`${item.login}`}>
           <img
             className="user_img radius"
             width="28"
             height="28"
-            src={getImageUrl(`/${item && item.image_url}`)}
+            src={getImageUrl(`images/${item && item.image_url}`)}
             alt=""
           />
           <span className="ml10" style={{ "vertical-align": "middle" }}>
@@ -58,31 +54,14 @@ export default ({ getUser , placeholder, width ,value })=>{
         </Option>
       );
     });
-    setSource(s);
-  }
-
-  function changeInputUser(e){
-    setSearchKey(e);
-  };
-
-  // 选择用户
-  function selectInputUser(e, option){
-    setSearchKey(option.props.name);
-    getUser(option.props.login);
-  };
-
   return(
-    <div className="addPanel">
-      <AutoComplete
-        getPopupContainer={trigger => trigger.parentNode}
-        dataSource={source}
-        value={searchKey}
-        style={{ width: width || 300 }}
-        onChange={changeInputUser}
-        onSelect={selectInputUser}
-        placeholder={placeholder || "搜索需要添加的用户..."}
-        allowClear
-      />
-    </div>
+    <AutoComplete
+      dataSource={source}
+      value={searchKey}
+      style={{ width: 300 }}
+      onChange={changeInputUser}
+      onSelect={selectInputUser}
+      placeholder="搜索需要添加的用户..."
+    />
   )
 }