Merge branch 'master' of https://git.trustie.net/jasder/forgeplus-react

# Conflicts:
#	src/forge/Main/sub/UpdateDescModal.jsx

.gitignore

@@ -86,6 +86,3 @@ typings/
 
 .DS_Store
 .idea/*
-
-package.json
-package-lock.json

config/webpack.config.dev.js

@@ -101,13 +101,9 @@ module.exports = {
     extensions: [".web.js", ".mjs", ".js", ".json", ".web.jsx", ".jsx"],
     alias: {
       educoder: __dirname + "/../src/common/educoder.js",
-      src: path.join(paths.appSrc), // 整个源代码目录
-      forge: path.join(paths.appSrc, 'forge'),
-      military: path.join(paths.appSrc, 'military'),
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
       "react-native": "react-native-web",
-      'react-dom': '@hot-loader/react-dom',
     },
     plugins: [
       // Prevents users from importing files from outside of src/ (or node_modules/).

config/webpack.config.prod.js

@@ -87,9 +87,6 @@ module.exports = {
     extensions: [".web.js", ".mjs", ".js", ".json", ".web.jsx", ".jsx"],
     alias: {
       educoder: __dirname + "/../src/common/educoder.js",
-      src: path.join(paths.appSrc),
-      forge: path.join(paths.appSrc, 'forge'),
-      military: path.join(paths.appSrc, 'military'),
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
       "react-native": "react-native-web",

jsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "educoder": ["./src/common/educoder.js"],
-      "forge":["./src/forge"],
-      "military":["./src/military"],
-    }
-  },
-  "exclude": [
-    "node_modules",
-    "build"
-  ]
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge",
-  "version": "0.1.0",
+  "version": "3.0.0",
   "private": true,
   "dependencies": {
     "@monaco-editor/react": "^2.3.0",
@@ -14,6 +14,7 @@
     "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",
@@ -29,7 +30,8 @@
     "dompurify": "^2.0.15",
     "dotenv": "4.0.0",
     "dotenv-expand": "4.2.0",
-    "echarts": "^4.7.0",
+    "echarts": "^4.9.0",
+    "echarts-wordcloud": "^2.0.0",
     "editor.md": "^1.5.0",
     "eslint": "4.10.0",
     "eslint-config-react-app": "^2.1.0",
@@ -46,6 +48,7 @@
     "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",
@@ -62,7 +65,7 @@
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.6.1",
-    "qrcode.react": "^1.0.0",
+    "qrcode.react": "^1.0.1",
     "qs": "^6.9.3",
     "quill": "^1.3.7",
     "quill-delta-to-html": "^0.11.0",
@@ -92,6 +95,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",
@@ -102,21 +106,23 @@
     "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",
     "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.6.2",
-    "wangeditor-for-react": "^1.4.0",
     "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.10.3",
     "webpack-manifest-plugin": "^2.2.0",
     "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20"
+    "wrap-md-editor": "^0.2.20",
+    "xterm": "4.8.1",
+    "xterm-addon-fit": "0.4.0"
   },
   "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",
+    "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",
@@ -183,22 +189,22 @@
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
-    "@hot-loader/react-dom": "^16.14.0",
     "babel-cli": "^6.26.0",
     "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",
     "compression-webpack-plugin": "^1.1.12",
     "concat": "^1.0.3",
-    "cross-env": "^7.0.3",
     "happypack": "^5.0.1",
     "mockjs": "^1.1.0",
     "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,5 +1,6 @@
 /*头部导航条样式---2018-03-19--by-cs*/
 .newHeader {
+  background: #24292D !important;
   width: 100%;
   height: 60px !important;
   min-width: 1200px;
@@ -37,78 +38,6 @@
   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-purge.css

@@ -1753,7 +1753,7 @@ a.decoration {
 }
 
 .mb15 {
-  margin-bottom: 15px;
+  margin-bottom: 15px!important;
 }
 
 .mb16 {
@@ -2346,7 +2346,6 @@ input::-ms-clear {
 /*中间部分宽度固定为1200*/
 .newMain {
   margin: 0 auto;
-  padding-bottom: 110px;
   min-width: 1200px;
 }
 
@@ -2425,10 +2424,16 @@ 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: #999999 !important;
@@ -3410,7 +3415,7 @@ a.user_bluebg_btn {
 }
 
 .cdefault {
-  cursor: default
+  cursor: default!important;
 }
 
 
@@ -3585,42 +3590,6 @@ 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 ******/
 /*****载入中******/
@@ -3945,11 +3914,21 @@ 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;
@@ -3971,9 +3950,7 @@ html>body #ajax-indicator {
   cursor: pointer;
   position: relative;
   font-size: 16px;
-  margin-right: 40px;
-}.head-nav ul#header-nav li:first-child{
-  margin-left: 20px;
+  padding-right:40px;
 }
 
 .head-nav ul#header-nav li a {
@@ -4110,21 +4087,6 @@ 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;
@@ -6720,4 +6682,19 @@ 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.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1629767316093') format('woff2'),
-       url('iconfont.woff?t=1629767316093') format('woff'),
-       url('iconfont.ttf?t=1629767316093') format('truetype');
+  src: url('iconfont.woff2?t=1627870211301') format('woff2'),
+       url('iconfont.woff?t=1627870211301') format('woff'),
+       url('iconfont.ttf?t=1627870211301') format('truetype');
 }
 
 .iconfont {
@@ -13,190 +13,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-xiangmugonggao:before {
-  content: "\e8c2";
-}
-
-.icon-chengguo:before {
-  content: "\e8c3";
-}
-
-.icon-chengjiaogonggao:before {
-  content: "\e8c0";
-}
-
-.icon-jishuzichan:before {
-  content: "\e8c1";
-}
-
-.icon-feibiaogonggao:before {
-  content: "\e8bc";
-}
-
-.icon-zhongbiaogonggao:before {
-  content: "\e8bd";
-}
-
-.icon-gengzhenggonggao:before {
-  content: "\e8be";
-}
-
-.icon-zhaobiaogonggao:before {
-  content: "\e8bf";
-}
-
-.icon-wenjian6:before {
-  content: "\e8ba";
-}
-
-.icon-wenjianjia4:before {
-  content: "\e8bb";
-}
-
-.icon-quxiaoguanzhu:before {
-  content: "\e89a";
-}
-
-.icon-dianzan_icon:before {
-  content: "\e8a2";
-}
-
-.icon-wenjian5:before {
-  content: "\e896";
-}
-
-.icon-wenjianjia3:before {
-  content: "\e8a9";
-}
-
-.icon-fuzhiicon:before {
-  content: "\e886";
-}
-
-.icon-zhuye-fill:before {
-  content: "\e876";
-}
-
-.icon-daimakuicon:before {
-  content: "\e884";
-}
-
-.icon-xinjian2:before {
-  content: "\e8b0";
-}
-
-.icon-xieyiicon:before {
-  content: "\e870";
-}
-
-.icon-neicunicon:before {
-  content: "\e891";
-}
-
-.icon-zishuwenjian_icon:before {
-  content: "\e8a6";
-}
-
-.icon-biaoqianicon:before {
-  content: "\e882";
-}
-
-.icon-a-bianji:before {
-  content: "\e883";
-}
-
-.icon-cangkushezhiicon:before {
-  content: "\e885";
-}
-
-.icon-lianjieicon:before {
-  content: "\e887";
-}
-
-.icon-hebingqingqiuicon:before {
-  content: "\e888";
-}
-
-.icon-lichengbeiicon:before {
-  content: "\e889";
-}
-
-.icon-gongzuoliuicon:before {
-  content: "\e88a";
-}
-
-.icon-dongtaiicon:before {
-  content: "\e88b";
-}
-
-.icon-morendianzan_icon:before {
-  content: "\e88e";
-}
-
-.icon-muluicon:before {
-  content: "\e894";
-}
-
-.icon-a-shezhi:before {
-  content: "\e899";
-}
-
-.icon-tijiaoicon:before {
-  content: "\e89e";
-}
-
-.icon-morenguanzhu_ICON:before {
-  content: "\e89f";
-}
-
-.icon-xialaanniu1:before {
-  content: "\e8a4";
-}
-
-.icon-zuohuaicon:before {
-  content: "\e8b5";
-}
-
-.icon-master_icon:before {
-  content: "\e8b6";
-}
-
-.icon-morenfuke_icon:before {
-  content: "\e8b7";
-}
-
-.icon-a-wikiicon:before {
-  content: "\e8b8";
-}
-
-.icon-yixiuicon:before {
-  content: "\e8b9";
-}
-
-.icon-suofang:before {
-  content: "\e87f";
-}
-
-.icon-fangdaicon:before {
-  content: "\e881";
-}
-
-.icon-sousuo_icon1:before {
-  content: "\e873";
-}
-
-.icon-huanying_icon:before {
-  content: "\e878";
-}
-
-.icon-wenjianjia2:before {
-  content: "\e879";
-}
-
-.icon-shanchuicon1:before {
-  content: "\e87a";
-}
-
 .icon-qingqiuicon:before {
   content: "\e871";
 }
@@ -233,6 +49,10 @@
   content: "\e898";
 }
 
+.icon-xialaanniu_icon:before {
+  content: "\e89a";
+}
+
 .icon-weixuanzhongqingqiuicon:before {
   content: "\e89b";
 }
@@ -241,6 +61,10 @@
   content: "\e8a1";
 }
 
+.icon-xuanzhongxiangyingicon:before {
+  content: "\e8a2";
+}
+
 .icon-xuanzhongfenzhiicon:before {
   content: "\e8a3";
 }
@@ -257,6 +81,18 @@
   content: "\e8af";
 }
 
+.icon-xinzengmulu_xuantingicon:before {
+  content: "\e884";
+}
+
+.icon-xinzengyemian_morenicon:before {
+  content: "\e885";
+}
+
+.icon-zhankai_morenicon:before {
+  content: "\e889";
+}
+
 .icon-shanchu_tc_icon:before {
   content: "\e88c";
 }
@@ -265,14 +101,26 @@
   content: "\e88d";
 }
 
+.icon-xinzengyemian_shubiaodianjiicon:before {
+  content: "\e88e";
+}
+
 .icon-daorumoban_icon:before {
   content: "\e86f";
 }
 
+.icon-daochu_xuanfu:before {
+  content: "\e870";
+}
+
 .icon-cuowu:before {
   content: "\e872";
 }
 
+.icon-chenggong1:before {
+  content: "\e873";
+}
+
 .icon-gengduo_icon:before {
   content: "\e874";
 }
@@ -281,10 +129,26 @@
   content: "\e875";
 }
 
+.icon-fuzhi_icon:before {
+  content: "\e876";
+}
+
 .icon-shanchuicon:before {
   content: "\e877";
 }
 
+.icon-a-lajitong_icon3x:before {
+  content: "\e878";
+}
+
+.icon-shouqi_morenicon:before {
+  content: "\e879";
+}
+
+.icon-huanying_icon:before {
+  content: "\e87a";
+}
+
 .icon-sousuo_shanchuicon:before {
   content: "\e87b";
 }
@@ -297,10 +161,22 @@
   content: "\e87e";
 }
 
+.icon-wenjianjia_icon:before {
+  content: "\e87f";
+}
+
 .icon-xialaanniu:before {
   content: "\e880";
 }
 
+.icon-xinzengmulu_morenicon:before {
+  content: "\e882";
+}
+
+.icon-xinzengmulu_shubiaodianjiicon:before {
+  content: "\e883";
+}
+
 .icon-erciqueren_icon:before {
   content: "\e867";
 }

public/css/iconfont.json

@@ -5,328 +5,6 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
-    {
-      "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": "23472256",
-      "name": "仓库设置icon",
-      "font_class": "cangkushezhiicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
-    {
-      "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": "23472260",
-      "name": "里程碑icon",
-      "font_class": "lichengbeiicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
-    {
-      "icon_id": "23472261",
-      "name": "工作流icon",
-      "font_class": "gongzuoliuicon",
-      "unicode": "e88a",
-      "unicode_decimal": 59530
-    },
-    {
-      "icon_id": "23472262",
-      "name": "动态icon",
-      "font_class": "dongtaiicon",
-      "unicode": "e88b",
-      "unicode_decimal": 59531
-    },
-    {
-      "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",
@@ -390,6 +68,13 @@
       "unicode": "e898",
       "unicode_decimal": 59544
     },
+    {
+      "icon_id": "23144154",
+      "name": "下拉按钮_icon",
+      "font_class": "xialaanniu_icon",
+      "unicode": "e89a",
+      "unicode_decimal": 59546
+    },
     {
       "icon_id": "23144155",
       "name": "未选中请求icon",
@@ -404,6 +89,13 @@
       "unicode": "e8a1",
       "unicode_decimal": 59553
     },
+    {
+      "icon_id": "23144159",
+      "name": "选中响应icon",
+      "font_class": "xuanzhongxiangyingicon",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
     {
       "icon_id": "23144160",
       "name": "选中分支icon",
@@ -432,6 +124,27 @@
       "unicode": "e8af",
       "unicode_decimal": 59567
     },
+    {
+      "icon_id": "23046282",
+      "name": "新增目录_悬停icon",
+      "font_class": "xinzengmulu_xuantingicon",
+      "unicode": "e884",
+      "unicode_decimal": 59524
+    },
+    {
+      "icon_id": "23046283",
+      "name": "新增页面_默认icon",
+      "font_class": "xinzengyemian_morenicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "23046287",
+      "name": "展开_默认icon",
+      "font_class": "zhankai_morenicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
     {
       "icon_id": "23046290",
       "name": "shanchu_tc_icon",
@@ -446,6 +159,13 @@
       "unicode": "e88d",
       "unicode_decimal": 59533
     },
+    {
+      "icon_id": "23046311",
+      "name": "新增页面_鼠标点击icon",
+      "font_class": "xinzengyemian_shubiaodianjiicon",
+      "unicode": "e88e",
+      "unicode_decimal": 59534
+    },
     {
       "icon_id": "23046244",
       "name": "导入模版_icon",
@@ -453,6 +173,13 @@
       "unicode": "e86f",
       "unicode_decimal": 59503
     },
+    {
+      "icon_id": "23046247",
+      "name": "导出_悬浮",
+      "font_class": "daochu_xuanfu",
+      "unicode": "e870",
+      "unicode_decimal": 59504
+    },
     {
       "icon_id": "23046252",
       "name": "错误",
@@ -460,6 +187,13 @@
       "unicode": "e872",
       "unicode_decimal": 59506
     },
+    {
+      "icon_id": "23046254",
+      "name": "成功",
+      "font_class": "chenggong1",
+      "unicode": "e873",
+      "unicode_decimal": 59507
+    },
     {
       "icon_id": "23046255",
       "name": "更多_icon",
@@ -474,6 +208,13 @@
       "unicode": "e875",
       "unicode_decimal": 59509
     },
+    {
+      "icon_id": "23046262",
+      "name": "复制_icon",
+      "font_class": "fuzhi_icon",
+      "unicode": "e876",
+      "unicode_decimal": 59510
+    },
     {
       "icon_id": "23046268",
       "name": "删除icon",
@@ -481,6 +222,27 @@
       "unicode": "e877",
       "unicode_decimal": 59511
     },
+    {
+      "icon_id": "23046269",
+      "name": "垃圾桶_icon@3x",
+      "font_class": "a-lajitong_icon3x",
+      "unicode": "e878",
+      "unicode_decimal": 59512
+    },
+    {
+      "icon_id": "23046270",
+      "name": "收起_默认icon",
+      "font_class": "shouqi_morenicon",
+      "unicode": "e879",
+      "unicode_decimal": 59513
+    },
+    {
+      "icon_id": "23046271",
+      "name": "欢迎_icon",
+      "font_class": "huanying_icon",
+      "unicode": "e87a",
+      "unicode_decimal": 59514
+    },
     {
       "icon_id": "23046273",
       "name": "搜索_删除icon",
@@ -502,6 +264,13 @@
       "unicode": "e87e",
       "unicode_decimal": 59518
     },
+    {
+      "icon_id": "23046277",
+      "name": "文件夹_icon",
+      "font_class": "wenjianjia_icon",
+      "unicode": "e87f",
+      "unicode_decimal": 59519
+    },
     {
       "icon_id": "23046278",
       "name": "下拉按钮",
@@ -509,6 +278,20 @@
       "unicode": "e880",
       "unicode_decimal": 59520
     },
+    {
+      "icon_id": "23046280",
+      "name": "新增目录_默认icon",
+      "font_class": "xinzengmulu_morenicon",
+      "unicode": "e882",
+      "unicode_decimal": 59522
+    },
+    {
+      "icon_id": "23046281",
+      "name": "新增目录_鼠标点击icon",
+      "font_class": "xinzengmulu_shubiaodianjiicon",
+      "unicode": "e883",
+      "unicode_decimal": 59523
+    },
     {
       "icon_id": "22906287",
       "name": "二次确认_icon",

public/index.html

@@ -1,12 +1,11 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-CN" class="notranslate translated-ltr" translate="no">
 <head>
   <meta charset="utf-8">
-  <title>红山开源社区</title>
-  <meta name="keywords" content="红山开源,创客空间,群智共享">
-  <meta name="keywords" content="红山开源社区,开源开放,众创,论坛">
-  <meta name="keywords" content="issue,bug,tracker">
-  <meta name="description" content="红山开源是一个依托互联网群体智慧实现世界范围内资源深度融合、开放共享和协同创新的开源社区" />
+  <meta name=”Keywords” Content=”trustie,trustieforge,forge,确实让创建更美好,协同开发平台″>
+  <meta name=”Keywords” Content=”TrustieOpenSourceProject″>
+  <meta name=”Keywords” Content=”issue,bug,tracker,软件工程,课程实践″>
+  <meta name=”Description” Content=”持续构建协同、共享、可信的软件创建生态开源创作与软件生产相结合，支持大规模群体开展软件协同创新活动”>
   <meta name="theme-color" content="#000000">
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
   

src/App.css

@@ -60,12 +60,13 @@ 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;
 }
 
@@ -87,6 +88,10 @@ 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

@@ -17,8 +17,7 @@ import marked from './common/marked';
 import moment from 'moment'
 
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
-
-import history from './history';
+import SiderBar from './forge/Component/SiderBar'
 
 import { SnackbarHOC } from 'educoder'
 import { initAxiosInterceptors } from './AppConfig'
@@ -40,21 +39,16 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
+//forge安全设置
+const Security = Loadable({
+	loader: () => import('./forge/SecuritySetting/Index'),
+	loading: Loading,
+})
 //forge项目-devOps详情
 const OpsDetail = Loadable({
 	loader: () => import('./forge/DevOps/opsDetail'),
 	loading: Loading,
 })
-// Notice项目公告
-const Notice = Loadable({
-	loader: () => import('./military/notice'),
-	loading: Loading,
-})
-//任务/需求
-const Task = Loadable({
-	loader: () => import('./military/task'),
-	loading: Loading,
-})
 //403页面
 const Shixunauthority = Loadable({
 	loader: () => import('./modules/403/Shixunauthority'),
@@ -84,7 +78,15 @@ const EducoderLogin = Loadable({
 	loader: () => import('./modules/login/EducoderLogin'),
 	loading: Loading,
 })
+const Search = Loadable({
+	loader: () => import('./modules/search/'),
+	loading: Loading,
+})
 
+const ProjectIndex = Loadable({
+  loader: () => import("./forge/Index"),
+  loading: Loading,
+});
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -110,36 +112,9 @@ 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();
 
@@ -217,11 +192,14 @@ class App extends Component {
 	};
 
 	render() {
+		const { mygetHelmetapi } = 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>
 								{/*项目*/}
@@ -233,6 +211,14 @@ class App extends Component {
 										}
 									}>
 								</Route>
+								<Route
+									path={"/settings"}
+									render={
+										(props) => {
+											return (<Security {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
 								{/*项目*/}
 								<Route
 									path={"/projects"}
@@ -250,18 +236,6 @@ class App extends Component {
 										}
 									}
 								/>
-								{/*公告*/}
-								<Route
-									path={"/notice"}
-									render={
-										(props) => {
-											return (<Notice {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*任务*/}
-								<Route path="/task" component={Task} />
-
 								{/*403*/}
 								<Route path="/403" component={Shixunauthority} />
 
@@ -275,6 +249,10 @@ class App extends Component {
 								</Route>
 								{/*404*/}
 								<Route path="/nopage" component={Shixunnopage} />
+
+								{/* 查询 */}
+								<Route path="/search" component={Search} />
+
 								{/* 个人主页 */}
 								<Route path="/users/:username"
 									render={
@@ -285,7 +263,10 @@ class App extends Component {
 								<Route exact path="/"
 									render={
 										(props) => (
-											<Projects {...this.props} {...props} {...this.state}></Projects>
+											personal && personal.length > 0 ?
+											<InfosIndex {...this.props} {...props} />
+											:
+											<ProjectIndex {...this.props} {...props} />
 										)
 									}
 								/>

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;
 
+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,55 +24,22 @@ 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 || 's'
+  window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
-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()
-  // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
-  var
-    proxy = "http://localhost:3000";
-    proxy = "https://forge.osredm.com";
+  // 判断网络是否连接
+  initOnlineOfflineListener();
 
-  const requestMap = {};
-  window.setfalseInRequestMap = function (keyName) {
-    requestMap[keyName] = false;
-  }
+  var proxy = "https://testforgeplus.trustie.net";
   //响应前的设置
   axios.interceptors.request.use(
     config => {
-      setpostcookie()
-      clearAllCookie()
-
-      if (config.url.indexOf(proxy) !== -1) {
+      if(config.url.indexOf("http") !== -1) {
         return config
       }
-      requestProxy(config)
-
+      requestProxy(config);
       let url = `/api${config.url}`;
 
       if (`${config[0]}` !== `true`) {
@@ -86,17 +53,12 @@ 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) {
@@ -145,8 +107,6 @@ 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,20 +9,7 @@ class Loading extends Component {
 	}
 
 	render() {
-		return (
-			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
-				<style>
-					{
-						`
-						 .margintop{
-						   margin-top:20%;
-						 }
-						`
-					}
-				</style>
-				<Spin size="large" className={"margintop"} />
-			</div>
-		);
+		return ""
 	}
 }
 

src/common/DateUtil.js

@@ -1,4 +1,4 @@
-import moment from "moment";
+import moment  from "moment";
 
 // 处理整点 半点
 // 取传入时间往后的第一个半点
@@ -12,7 +12,7 @@ export function handleDateString(dateString) {
   if (miniute < 30 || miniute == 60) {
     return [ar[0], '30'].join(':')
   }
-  if (miniute < 60) {
+  if (miniute < 60) { 
     // 加一个小时
     const tempStr = [ar[0], '00'].join(':');
     const format = "YYYY-MM-DD HH:mm";
@@ -20,7 +20,7 @@ export function handleDateString(dateString) {
     _moment.add(1, 'hours')
     return _moment.format(format)
   }
-
+  
   return dateString
 }
 
@@ -38,91 +38,62 @@ export function getNextHalfHourOfMoment(moment) {
   return moment
 }
 
-export function formatSeconds(value) {
+ export function formatSeconds(value) {
 
-  var theTime = parseInt(value);// 秒
-  var middle = 0;// 分
-  var hour = 0;// 小时
+          var theTime = parseInt(value);// 秒
+          var middle= 0;// 分
+          var hour= 0;// 小时
+      
+          if(theTime > 60) {
+              middle= parseInt(theTime/60);
+              theTime = parseInt(theTime%60);
+              if(middle> 60) {
+                  hour= parseInt(middle/60);
+                  middle= parseInt(middle%60);
+              }
+          }
+          var result = ""+parseInt(theTime)+"秒";
+          if(middle > 0) {
+            if(hour>0){
+              result = ""+parseInt(middle)+"分";
+            }else{
+              result = ""+parseInt(middle)+"分"+result;
+            }
+              
+          }
+          if(hour> 0) {
+              result = ""+parseInt(hour)+"小时"+result;
+          }
+          return result;
+      }
+  
 
-  if (theTime > 60) {
-    middle = parseInt(theTime / 60);
-    theTime = parseInt(theTime % 60);
-    if (middle > 60) {
-      hour = parseInt(middle / 60);
-      middle = parseInt(middle % 60);
-    }
-  }
-  var result = "" + parseInt(theTime) + "秒";
-  if (middle > 0) {
-    if (hour > 0) {
-      result = "" + parseInt(middle) + "分";
-    } else {
-      result = "" + parseInt(middle) + "分" + result;
-    }
+export function formatDuring(mss){
+  var days = parseInt(mss / (1000 * 60 * 60 * 24));
+  var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+  var minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
+	// console.log("formatDuringformatDuring");
+	// console.log(days);
+	// console.log(hours);
+	// console.log(minutes);
+	// console.log(Math.abs(days));
+	// console.log(Math.abs(hours));
+	// console.log(Math.abs(minutes));
 
-  }
-  if (hour > 0) {
-    result = "" + parseInt(hour) + "小时" + result;
-  }
-  return result;
+	try {
+		days = Math.abs(days);
+	} catch (e) {
+
+	}
+	try {
+		hours = Math.abs(hours);
+	} catch (e) {
+
+	}
+	try {
+		minutes = Math.abs(minutes);
+	} catch (e) {
+
+	}
+  return days + "天" + hours + "小时" + minutes + "分";
 }
-
-
-export function formatDuring(s) {
-  s = Math.abs(s);
-  let days = Math.floor(s / (60 * 60 * 24));
-  let hours = Math.floor((s % (60 * 60 * 24)) / (60 * 60));
-  let minutes = Math.floor((s % (60 * 60)) / (60));
-  let second = Math.floor(s % 60);
-
-  if (days) {
-    if(hours){
-      return days + "天" + hours + "小时";
-    }
-    return days + "天";
-  }
-  if (hours) {
-    if(minutes){
-      return hours + "小时" + minutes + "分";
-    }
-    return hours + "小时" ;
-  }
-  if (minutes) {
-    return minutes + "分";
-  }
-  return second + "秒";
-}
-
-
-
-/*
-  返回：多久以前
-  backDate：以前的某个日期
-*/
-export function timeAgo(backDate) {
-  try {
-    moment(backDate);
-  } catch (e) {
-    return;
-  }
-  let time = new Date() - moment(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 + "秒前";
-  }
-}

src/common/TextUtil.js

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

src/common/UrlTool.js

@@ -6,24 +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 = "http://39.105.176.215:49999"
+export const TEST_HOST = "https://testforgeplus.trustie.net/"
 export function getImageUrl(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
   // const local = 'http://localhost:3000'
-	const local = 'http://39.105.176.215:49999';
-
+	const local = 'https://testforgeplus.trustie.net';
 	if (isDev) {
 		return `${local}/${path}`
 	}
-	return `/${path}`;
+	return `${path}`;
 }
 
 export function getImage(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
   // const local = 'http://localhost:3000'
-	const local = 'http://39.105.176.215:49999';
+	const local = 'https://testforgeplus.trustie.net/';
 	if(path.indexOf("http://")===-1){
 		if (isDev) {
 			return `${local}/images/${path}`
@@ -94,7 +93,7 @@ export function setImagesUrl(path){
 }
 
 export function getUrl(path, goTest) {
-	const local = 'http://39.105.176.215:49999'
+	const local = 'https://testforgeplus.trustie.net'
 	if (isDev) {
 		return `${local}${path?path:''}`
 	}
@@ -163,28 +162,28 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json`;
+	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
 }
 
 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
+	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
 }
 
 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }
 
 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }
 
 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }
 
 
 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?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(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
+      src={author.image_url ? getImageUrl(`/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
       alt=""
     />
   );

src/common/educoder.js

@@ -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 + 220);
+          window.scrollTo(0, ele.offsetTop + 120);
         }
       }
     }
-  },[url])
+  },[url,html])
 
   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.startsWith('#')) {
+      let ancher = target.getAttribute('href');
+      if (ancher && ancher.startsWith('#')) {
         e.preventDefault()
         let viewEl = document.getElementById(ancher.replace('#', ''))
         if (viewEl) {

src/forge/About/Index.jsx

@@ -67,15 +67,14 @@ function Index(props){
   }
   return(
     <div className="aboutPanels">
-      
       <div className="aboutContent">
-        <AlignCenterBetween style={{padding:"14px 0px"}}>
-          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目简介</span>
+        <AlignCenterBetween style={{padding:"14px 20px"}}>
+          <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>
+          <div className="padding20">
             <MDEditor
               placeholder={"请输入描述信息"}
               height={500}
@@ -114,11 +113,11 @@ function Index(props){
             </div>
           </div>
           :
-          <div style={{padding:"20px 0px"}}>
+          <div className="padding20">
             {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,7 +4,6 @@
   .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.css';
+import '../Branch/branch.scss';
 import './activity.css';
 import NoneData from '../Nodata';
 

src/forge/Activity/ActivityItem.js

@@ -33,7 +33,7 @@ class ActivityItem extends Component {
           }
           <p className="itemLine mt10">
             <Link to={`/users/${item && item.user_login}`} className="show-user-link">
-              <img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage" />
+              <img alt="" src={getImageUrl(`/${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,39 +1,35 @@
-import React, { Component } from 'react';
-import { Dropdown, Icon, Tooltip } from 'antd';
-import "./branch.css";
+import React, { useState } from 'react';
+import { Dropdown, Menu, Tooltip } from 'antd';
+import "./branch.scss";
 
-class CloneAddress extends Component {
+function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
+  const [ key , setKey ] = useState("HTTP");
   // 点击按钮复制功能
-  jsCopy = () => {
+  function 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>
-        }
+  return (
+    <div className="downMenu">
+      <div style={{padding:"10px 20px 20px 20px",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} />
+          <Tooltip title="复制链接">
+            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
+          </Tooltip>
+        </div>
       </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,6 +1,6 @@
 import React , { useState , useEffect } from 'react';
 import { Popover , Input , Spin } from 'antd';
-import './branch.css';
+import './branch.scss';
 import { getBranch , getTag } from '../GetData/getData';
 
 
@@ -102,9 +102,10 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
     </div>
   );
   return(
-    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
+    <Popover placement='bottomLeft' 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>
+        {/* {nav === 0 ?"分支":"标签"} */}
+        <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
         <a className="ant-dropdown-link">
           {showValue}
         </a>

src/forge/Branch/branch.scss

@@ -51,7 +51,7 @@
   display: flex;
   align-items: center;
   cursor: pointer;
-  min-width: 240px;
+  min-width: 140px;
 }
 .branch-tagBox-list .ant-popover-arrow{
   display: none;
@@ -81,4 +81,25 @@
 .listTips{
   padding:20px 0px;
   text-align: center;
+}
+
+.urlMenu{
+  line-height: 30px;
+  margin-bottom: 10px;
+  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:#1890ff!important;
+    }
+    &.ant-menu-item-active{
+      border-color:transparent ;
+    }
+  }
 }

src/forge/Component/AddMember.jsx

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

src/forge/Component/Component.scss

@@ -20,6 +20,7 @@ li.ant-menu-item{
   background-color: #fff;
   margin-bottom:18px;
   min-height: 130px;
+  border:1px solid #eee;
   .img{
     margin-right: 20px;
     width: 190px;
@@ -61,6 +62,7 @@ li.ant-menu-item{
 }
 // Tabs
 .tabsStyle{
+  border:1px solid #eee;
   .ant-tabs-bar.ant-tabs-top-bar{
     padding-left: 35px;
     margin-bottom: 0px;
@@ -110,6 +112,9 @@ li.ant-menu-item{
   right:240px;
   z-index: 10000;
 }
+.laterest{
+  color: #05690d;
+}
 
 @media screen and (max-width: 1800px){
   .handleBox{
@@ -135,4 +140,224 @@ 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;
+  }
+}
+
+.menuPanels{
+  width: 240px;
+  height: 180px;
+  .ant-popover-content,.ant-popover-inner{
+    height: 100%;
+    width: 100%;
+  }
+}
+.halfs{
+  margin-top: 24px;
+  padding:24px 0px 0px 0px;
+  border-top: 1px solid #e8e8e8;
+  .attrPerson{
+    padding-bottom: 24px;
+  }
+}
+.menuinfos{
+  padding:15px 0px;
+  &>a{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    border-right: 1px solid #eee;
+    flex: 1;
+    & >span:first-child{
+      font-size: 18px;
+      font-weight: 400;
+      color: #333;
+    }
+    & >span:last-child{
+      color: #666;
+    }
+    &:last-child{
+      border-right: none;
+    }
+  }
+}
+
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-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

@@ -0,0 +1,160 @@
+import React, { useEffect, useState } from 'react';
+import { AlignCenter , FlexAJ  } from '../Component/layout';
+import { Link } from 'react-router-dom';
+import { Popover , Spin } from 'antd';
+import { getImageUrl } from 'educoder';
+import './Component.scss';
+import { getUser } from '../GetData/getData';
+import axios from 'axios';
+
+function Contributors({contributors,owner,projectsId}){
+  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 setMenusFunc(data){
+    if(data){
+      let ele = (
+        <Spin spinning={isSpin}>
+          <FlexAJ>
+            <AlignCenter>
+              <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+              <Link to={`/users/${data.login}`} className="ml10">{data.name}</Link>
+            </AlignCenter>
+            {
+              data.is_watch ? <a className="color-grey-9" onClick={()=>FocusFunc(false,data.login)}>取消关注</a>:<a className="color-blue" onClick={()=>FocusFunc(true,data.login)}>关注</a>
+            }
+          </FlexAJ>
+          <AlignCenter className="menuinfos">
+            <a href={data.projects_url}>
+              <span>{data.projects_count}</span>
+              <span>项目数</span>
+            </a>
+            <a href={data.followers_url}>
+              <span>{data.followers_count}</span>
+              <span>粉丝数</span>
+            </a>
+            <a href={data.following_url}>
+              <span>{data.following_count}</span>
+              <span>关注数</span>
+            </a>
+          </AlignCenter>
+          {
+            data.organizations && data.organizations.length > 0 ?
+            <AlignCenter className="font-12 pt4 pb4">
+              <span>所属组织：</span>
+              <div className="task-hide flex1">
+                {renderArray(data.organizations)}
+              </div>
+            </AlignCenter>
+            :""
+          }
+          {
+            data.location && <AlignCenter className="font-12 pt4 pb4"><span>所在地址:</span><span className="ml5">{data.location}</span></AlignCenter>
+          }
+        </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">
+      <FlexAJ>
+        <AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter>
+        <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/contribute`}>全部</Link>
+      </FlexAJ>
+      <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={`/users/${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/DeleteModal/Index.jsx

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

src/forge/Component/DeleteModal/Index.scss

@@ -0,0 +1,45 @@
+.deleteBox{
+  .ant-modal-header{
+    background-color: #f8f8f8;
+    border-bottom: none;
+    .ant-modal-title{
+      text-align: left;
+      font-size: 20px;
+    }
+  }
+  .ant-modal-body{
+    padding:30px 50px;
+    p{
+      font-size: 16px;
+      line-height: 26px;
+      color:#666;
+      word-break: break-all;
+    }
+    .desc{
+      .descMain{
+        align-items: center;
+        justify-content: center;
+        font-size: 20px;
+        margin-bottom: 10px;
+        i{
+          font-size: 38px!important;
+          color:#DF0002
+        }
+      }
+    }
+  }
+  .ant-modal-footer{
+    border-top: none;
+    text-align: center;
+    padding-bottom: 40px;
+    button{
+      width: 120px;
+      margin:0px 20px;
+      &.ant-btn-danger{
+        background-color: #fff;
+        color: #DF0002;
+        border-color: #D0D0D0;
+      }
+    }
+  }
+}

src/forge/Component/DrawerPanel.jsx

@@ -0,0 +1,106 @@
+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(`/projects/${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

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

src/forge/Component/EducoderAccount.jsx

@@ -0,0 +1,60 @@
+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,5 +1,3 @@
-
-
 import React , { useState , useEffect } from 'react';
 import { Select } from 'antd';
 import axios from 'axios';
@@ -59,6 +57,7 @@ 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/HeadSearch.jsx

@@ -0,0 +1,41 @@
+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

@@ -0,0 +1,54 @@
+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-grey-6">开发语言</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,7 +45,7 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
   return (
     <Div>
-      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`images/${img}`)} /></Link>
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
       <div className="m-infos">
         <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>

src/forge/Component/Monaco.jsx

@@ -0,0 +1,62 @@
+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/Releases.jsx

@@ -0,0 +1,41 @@
+import React from 'react';
+import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
+import { Link } from 'react-router-dom';
+
+function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
+  
+  return(
+    <div>
+      <FlexAJ>
+        <AlignCenter><span className="font-16 color-grey-6">发行版</span>
+          { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
+        </AlignCenter>
+        { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? 
+          <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link>
+          : 
+          baseOperate && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
+        }
+      </FlexAJ>
+      {
+        releaseVersions && releaseVersions.total_count>0 ?
+          releaseVersions.list.map((item,key)=>{
+            return(
+            key === 0 &&<AlignTop className="mt10">
+              <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
+              <div>
+                <p className="font-16 color-grey-6">
+                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
+                  <span className="font-12 laterest ml5">最新</span>
+                </p>
+                <p className="color-grey-9 font-13">{item.created_at}</p>
+              </div>
+            </AlignTop>
+            )
+          })
+        :""
+      }
+      
+    </div>
+  )
+}
+export default Releases;

src/forge/Component/SearchUser.jsx

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

src/forge/Component/SiderBar.js

@@ -0,0 +1,91 @@
+import React, { useEffect, useState } from 'react';
+import { Popover , Tooltip } from 'antd';
+import './Component.scss';
+import axios from 'axios';
+import ShareModal from './SiderBarShareModal';
+
+const $ = window.$;
+
+$(window).scroll(function () {
+  if ($(".gotop").length > 0) {
+    if ($(document).scrollTop() > 0) {
+      $(".-task-sidebar .gotop").show();
+      $(".gotop").click(function () {
+        $("html,body").scrollTop(0);
+      });
+    }
+    if ($(document).scrollTop() === 0) {
+      $(".-task-sidebar .gotop").hide();
+    }
+  }
+});
+
+function SiderBar() {
+  const [ data , setData ] = useState([]);
+  const [ visible , setVisible ] = useState(false);
+
+  useEffect(()=>{
+    getFAQ();
+  },[])
+
+  function getFAQ(){
+    const url = `/faqs.json`;
+    axios.get(url).then(result=>{
+      if(result && result.data){
+        setData(result.data);
+      }
+    }).catch(error=>{})
+  }
+  function content(list){
+    return <div>
+      <p className="titlecontent">帮助</p>
+      <ul className="faqUl">
+        {
+          list && list.map((i,k)=>{
+            return(
+              <li key={i.question+k}><a href={`${i.url}`} title={i.question} target="_blank">{i.question}</a></li>
+            )
+          })
+        }
+      </ul>
+    </div>
+  }
+
+  function shareContent(){
+    return <div>
+      <ul className="shareUl">
+        <p className="titlecontent">分享到</p>
+        <li onClick={()=>setVisible(true)}><i className="iconfont icon-weixin2" style={{color:"#62b900"}}></i></li>
+      </ul>
+    </div>
+  }
+  return (
+    <div className={"-task-sidebar"} >
+      <ShareModal visible={visible} urlValue={window.location.href} onCancel={()=>setVisible(false)}/>
+      {
+        data && data.length > 0 && (data[0] && data[0].question) ? 
+        <Popover content={content(data)} overlayClassName="helpBox" placement={"left"}>
+          <div className="feedback">
+            <i className="iconfont icon-bangzhu font-22"></i>
+          </div>
+        </Popover>
+        :""
+      }
+      {/* <div className="scan pr" title="微信扫一扫">
+        <span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
+      </div>*/}
+      <Popover content={shareContent()} overlayClassName="helpBox shareContent" placement={"left"}>
+        <div className="consult">
+          <i className="iconfont icon-fenxiang1"></i>
+        </div> 
+      </Popover>
+      <div className="gotop">
+        <Tooltip title="返回顶部" placement={"right"}>
+          <a><i className="iconfont icon-huidaodingbu1"></i></a>
+        </Tooltip>
+      </div>
+    </div>
+  )
+}
+
+export default SiderBar;

src/forge/Component/SiderBarShareModal.jsx

@@ -0,0 +1,27 @@
+import React from 'react';
+import { Modal } from 'antd';
+import QRCode  from 'qrcode.react';
+
+function SiderBarShareModal({visible,urlValue,onCancel}) {
+  return(
+    <Modal
+      title={"分享到微信"}
+      visible={visible}
+      width="500px"
+      closable={true}
+      footer={false}
+      onCancel={onCancel}
+    >
+      <div style={{textAlign:"center"}}>
+        {urlValue &&<QRCode
+          value={urlValue}
+          size={200}
+          fgColor="#000000"
+          style={{margin:"20px"}}
+        />}
+        <p>打开微信“扫一扫”,点击右上角菜单，即可将网页分享至朋友圈</p>
+      </div>
+    </Modal>
+  )
+}
+export default SiderBarShareModal;

src/forge/Component/User.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
+import { Link } from 'react-router-dom';
 
-
-export default ({ url , name , column })=>{
+export default ({ url , name , column  , id , login })=>{
   const Img = styled.span`
     display:flex;
     ${column && "flex-direction: column;text-align:center;"}
@@ -19,8 +19,16 @@ export default ({ url , name , column })=>{
     }
   `;
   return(
+    id?
+    <Link to={`/users/${login}`}>
+      <Img>
+        { url && <img src={url} alt=""/> }
+        <span>{name}</span>
+      </Img>
+    </Link>
+    :
     <Img>
-      <img src={url} alt=""/>
+      { url && <img src={url} alt=""/> }
       <span>{name}</span>
     </Img>
   )

src/forge/Component/layout.jsx

@@ -24,18 +24,38 @@ export const AlignCenter = styled.div`{
   display:flex;
   align-items: center;
 }`
+export const AlignTop = styled.div`{
+  display:flex;
+  align-items: flex-start;
+}`
+export const AlignAJBottom = styled.div`{
+  display:flex;
+  justify-content: space-between;
+  align-items: flex-end;
+}`
 // 左右结构
 export const Box = styled.div`{
   display:flex;
-  align-item:flex-start;
+  align-items:flex-start;
+}`
+export const LongWidth = styled.div`{
+  flex:1;
+  width:0;
+  border-radius:5px;
+  margin-bottom:30px;
 }`
 export const Long = styled.div`{
-  width:72%;
+  width:78%;
+  border-radius:5px;
+  margin-bottom:30px;
+}`
+export const ShortWidth = styled.div`{
+  width:300px;
   border-radius:5px;
   margin-bottom:30px;
 }`
 export const Short = styled.div`{
-  width:28%;
+  flex:1;
   border-radius:5px;
   margin-bottom:30px;
 }`

src/forge/DevOps/About.jsx

@@ -36,8 +36,7 @@ function About(props, ref) {
   const [ disabled, setDisabled ] = useState(false);
   const [ typeFlag, setTypeFlag] = useState(false);
 
-
-  const AuthorLogin = props.author && props.author.login;
+  const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
   const CurrentLogin = props.current_user && props.current_user.login;
   useEffect(()=>{
     if(CurrentLogin === AuthorLogin){
@@ -56,11 +55,6 @@ function About(props, ref) {
       setIsSpining(false);
       if(result && result.data ){
         setStep(result.data.step);
-        // setStep(0);
-        // setFieldsValue({...result.data.cloud_account});
-        // if(result.data.cloud_account){
-        //   setDisabled(true);
-        // }
       }
     }).catch(error=>{
       setIsSpining(false);

src/forge/DevOps/Dispose.jsx

@@ -45,9 +45,9 @@ function Dispose(props){
     }).then(result=>{
       if(result && result.data){
         setList(result.data.pipelines);
-        setSpining(false);
       }
-    }).catch(error=>{})
+      setSpining(false);
+    }).catch(error=>{setSpining(false);})
   }
 
   useEffect(()=>{
@@ -137,13 +137,17 @@ function Dispose(props){
     props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
   }
 
+  // 参数管理
+  function toparameter(){
+    props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+  }
+
   const operate = current_user && (permission && permission !== "Reporter");
-  
   return(
     <Spin spinning={spining}>
       <PipelineName branchList={branchList} visible={visible} value={updateInfo} onCancel={()=>setVisible(false)} onOk={onOk}/>
       <div className="disposePanel">
-        <Head manager={ operate ? toModalManage : undefined} />
+        <Head manager={ operate ? toModalManage : undefined} parameter={operate ? toparameter :undefined}/>
         <Div>
           { operate &&  <Blueback onClick={()=>addNew(undefined,undefined)}>新增流水线</Blueback> }
           <div className="mt20 disposeList">

src/forge/DevOps/Dispose/List.jsx

@@ -2,16 +2,56 @@ import React from 'react';
 import { Table , Popconfirm } from 'antd';
 import { Link } from 'react-router-dom';
 
-const STATUS = {
-  running:"运行中",
-  failure:"未通过",
-  error:"未通过",
-  success:"已通过",
-  killed:"已撤销",
-  pending:"准备中"
+// const STATUS = {
+//   running:"运行中",
+//   failure:"未通过",
+//   error:"未通过",
+//   success:"已通过",
+//   killed:"已撤销",
+//   pending:"准备中"
+// }
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
+function renderTableStatus(status) {
+  switch (status) {
+    case "running":
+      return (
+        <span className="statusTag running">
+          <i className="iconfont icon-yunhangzhong"></i>运行中
+        </span>
+      );
+    case "failure": case 'error':
+      return (
+        <span className="statusTag failed">
+          <i className="iconfont icon-weitongguo"></i>未通过
+        </span>
+      );
+    case "success":
+      return (
+        <span className="statusTag pass">
+          <i className="iconfont icon-yitongguo"></i>已通过
+        </span>
+      );
+    case 'killed':
+      return (
+        <span className="statusTag killed">
+          <i className="iconfont icon-weitongguo"></i>已撤销
+        </span>
+      );
+    default :
+      return (
+        <span className="statusTag Preparing">
+          <i className="iconfont icon-zhunbeizhong"></i>准备中
+        </span>
+      );
+  }
 }
 function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
-
+  
   const columns = [
     {
       title:"流水线名称",
@@ -31,8 +71,9 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       width:"15%",
       ellipsis:true,
       render:(value,item)=>{
+        let v = turnbar(item.branch);
         return(
-          <Link to={`/projects/${owner}/${projectsId}/branch/${item.branch}/tree/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
         )
       }
     },
@@ -61,10 +102,10 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       title:"最近构建状态",
       dataIndex:"pipeline_status",
       key:1,
-      width:"10%",
+      width:"12%",
       ellipsis:true,
       render:(txt)=>{
-        return(STATUS[txt])
+        return renderTableStatus(txt)
       }
     },
     {

src/forge/DevOps/Dispose/PipelineName.jsx

@@ -42,7 +42,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
       </div>
       <div className="choosenList mt20">
         <span>触发条件:</span>
-        <Select value={branchValue} style={{width:"150px"}} onChange={(e)=>setBranchValue(e)}>
+        <Select value={branchValue} style={{width:"150px"}} dropdownClassName="chooseCon" onChange={(e)=>setBranchValue(e)}>
           {
             branchList && branchList.length>0 && branchList.map((item,key)=>{
               return(
@@ -51,7 +51,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
             })
           }
         </Select>
-        <Select mode="multiple" allowClear value={eventValue} style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{console.log(e);setEventValue(e)}}>
+        <Select mode="multiple" allowClear value={eventValue} dropdownClassName="chooseCon" style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{console.log(e);setEventValue(e)}}>
           {
             EVENT.map((item,key)=>{
               return(

src/forge/DevOps/Dispose/head.jsx

@@ -2,15 +2,18 @@ import React from 'react';
 import { AlignCenterBetween , Blueline , FlexAJ } from '../../Component/layout';
 
 
-function head({manager}){
+function head({manager , parameter}){
   return(
     <AlignCenterBetween>
       <span className="font-20">工作流配置</span>
       <FlexAJ>
-        <a href={`https://forum.trustie.net/forums/3111/detail`} target="_blank" className="color-grey-6"><i className="iconfont icon-tishi1 font-14 mr3"></i>模板使用说明</a>
+        {
+          parameter && <Blueline onClick={parameter}>参数管理</Blueline>
+        }
         {
           manager && <Blueline style={{marginLeft:"20px"}} onClick={manager}>模板管理</Blueline>
         }
+        <a href={`https://forum.trustie.net/forums/3111/detail`} target="_blank" className="color-grey-6 ml20"><i className="iconfont icon-tishi1 font-14 mr3"></i>模板使用说明</a>
       </FlexAJ>
     </AlignCenterBetween>
   )

src/forge/DevOps/Index.jsx

@@ -26,6 +26,11 @@ const Mould = Loadable({
   loader: () => import('./Mould'),
   loading: Loading,
 })
+const Params = Loadable({
+  loader: () => import('./Manage/Params'),
+  loading: Loading,
+})
+
 export default ((props)=>{
 
   return(
@@ -36,6 +41,11 @@ export default ((props)=>{
             (p) => (<New {...props} {...p}/>)
           }
         ></Route>
+        <Route path="/projects/:owner/:projectsId/devops/params"
+          render={
+            (p) => (<Params {...props} {...p}/>)
+          }
+        ></Route>
         <Route path="/projects/:owner/:projectsId/devops/mould"
           render={
             (p) => (<Mould {...props} {...p}/>)

src/forge/DevOps/Infos.jsx

@@ -1,9 +1,8 @@
-import React , { useEffect , useState , useRef } from 'react';
+import React , { useEffect , useState } from 'react';
 import { Banner } from '../Component/layout';
 import { Link } from 'react-router-dom';
 
 import Dispost from './Dispose';
-import Structure from './Structure';
 
 import styled from 'styled-components';
 
@@ -11,22 +10,11 @@ const Div = styled.div`{
   padding:24px 30px;
 }`;
 export default ((props)=>{
-  const [ menu , setMenu ] = useState(false);
   const [ permission , setPermission ] = useState("");
-  const childRef = useRef();
 
-  const path = props.location.pathname;
   const owner = props.match.params.owner;
-  const projectsId = props.match.params.projectsId;
 
   const projectDetail = props.projectDetail;
-  useEffect(()=>{
-    if(path === `/projects/${owner}/${projectsId}/devops/list`){
-      setMenu(true);
-    }else{
-      setMenu(false);
-    }
-  },[path])
 
   useEffect(()=>{
     if(projectDetail){
@@ -34,22 +22,13 @@ export default ((props)=>{
     }
   },[projectDetail])
 
-  const updateChildState = () => {
-    // changeVal就是子组件暴露给父组件的方法
-    if (childRef.current) {
-      childRef.current.changeVal();
-    }
-  }
 
   return(
     <div className="disposePanel">
       <Banner>
         { permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
-        {/* <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/list`}className={menu===true && "color-blue"}>构建列表</Link> */}
-        {/* { menu===true && <a onClick={updateChildState} style={{float:"right",fontSize:"14px",color:"#FF6E21",marginTop:"5px"}}>刷新</a>} */}
       </Banner>
       <Div>
-        {/* { menu === true && <Structure {...props}  wrappedComponentRef={(form) => childRef.current = form} ref={childRef}/> } */}
         <Dispost {...props}/>
       </Div>
     </div>

src/forge/DevOps/Manage/Params.jsx

@@ -0,0 +1,119 @@
+import React , { useEffect , useState , useRef } from 'react';
+import { Banner , Blueback , FlexAJ , AlignCenter } from '../../Component/layout';
+import { Input , Table , Popconfirm , Pagination } from 'antd';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import New from './ParamsNew';
+import "./manage.scss";
+import axios from 'axios';
+import { result } from 'lodash';
+
+const Div = styled.div`{
+  padding:24px 30px;
+  min-height:420px;
+}`;
+function Params(props){
+  const [ list ,setList ] = useState(undefined);
+  const [ editList ,setEditList ] = useState(undefined);
+  const [ visible ,setVisible ] = useState(false);
+  
+  let projectsId = props.match.params.projectsId; 
+  let owner = props.match.params.owner; 
+
+  useEffect(()=>{
+    Init()
+  },[])
+
+  function Init(){
+    const url = `/ci/secrets.json`;
+    axios.get(url,{
+      params:{
+        owner,repo:projectsId
+      }
+    }).then(result=>{
+      if(result){
+        setList(result.data);
+      }
+    }).catch(error=>{})
+  }
+
+  const columns=[
+    {
+      title:"参数名",
+      dataIndex:"name",
+      key:1,
+      ellipsis:true
+    },
+    {
+      title:"操作",
+      dataIndex:"operation",
+      key:4,
+      render:(txt,item)=>{
+        return(
+          <React.Fragment>
+            <a className="mr10 color-grey-6" onClick={()=>editMouldFunc(item)}><i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</a>
+            <Popconfirm title={"确定要删除此模板？"} onConfirm={()=>deleteMouldFunc(item.id,item.name)} okText="确定" cancelText={"取消"}>
+              <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
+            </Popconfirm>
+          </React.Fragment>
+        )
+      }
+    }
+  ]
+
+  // 编辑
+  function editMouldFunc(item){
+    setEditList(item);
+    setVisible(true);
+  }
+
+  // 删除
+  function deleteMouldFunc(id,name){
+    if(id && name){
+      const url = `/ci/secrets/${id}.json`;
+      axios.delete(url,{
+        params:{owner,repo:projectsId,name}
+      }).then(result=>{
+        if(result){
+          Init();
+          props.showNotification(`参数删除成功！`);
+        }
+      }).catch(error=>{})
+    }
+  }
+
+  function successFunc(values,id){
+    const url = `/ci/secrets.json?owner=${owner}&repo=${projectsId}`;
+    axios.post(url,{
+      ...values,id
+    }).then(result=>{
+      if(result){
+        props.showNotification(`${id ? '参数编辑':"新增参数"}成功！`);
+        Init();
+      }
+    }).catch(error=>{})
+  }
+
+  function CancelFunc(){
+    setVisible(false)
+  }
+
+  return(
+    <div>
+      <New visble={visible} successFunc={successFunc} CancelFunc={CancelFunc} editList={editList}/>
+      <Banner>
+        <FlexAJ>
+          <span className="font-18">工作流 - 参数管理</span>
+          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+        </FlexAJ>
+      </Banner>
+      <Div className="disposeList">
+        <div style={{textAlign:"right"}}>
+          <Blueback onClick={()=>setVisible(true)}>新建</Blueback>
+        </div>
+        <Table className="mt20" size="small" columns={columns} dataSource={list} rowKey={(row)=>row.id} pagination={false}></Table>
+      </Div>
+    </div>
+  )
+}
+export default Params;

src/forge/DevOps/Manage/ParamsNew.jsx

@@ -0,0 +1,73 @@
+import React , { useEffect , useState , useRef , forwardRef } from 'react';
+import { Modal , Input , Form } from 'antd';
+
+const { TextArea } = Input;
+
+function ParamsNew({ form , visble,successFunc,CancelFunc ,editList }){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+
+  useEffect(()=>{
+    if(editList && editList.id){
+      setFieldsValue({
+        name:editList.name,
+        data:editList.data
+      })
+    }else{
+      setFieldsValue({
+        name:undefined,
+        data:undefined
+      })
+    }
+  },[editList])
+
+  // 确定
+  function onConfirmFunc(){
+    validateFields((error,values)=>{
+      if(!error){
+        successFunc(values,editList && editList.id);
+        onCancelFunc();
+      }
+    })
+  }
+  function onCancelFunc(){
+    setFieldsValue({
+      name:undefined,
+      data:undefined
+    })
+    CancelFunc();
+  }
+  return(
+    <Modal
+      visible={visble}
+      okText={"确定"}
+      cancelText={"取消"}
+      onCancel={onCancelFunc}
+      onOk={onConfirmFunc}
+      title={"新建"}
+      closable={false}
+      width="500px"
+    >
+      <Form {...layout}>
+        <Form.Item label="参数名称">
+          {getFieldDecorator("name",{
+            rules:[{required:true,message:"请输入参数名称"}]
+          })(
+            <Input placeholder="请输入参数名称" width="220px"/>
+          )}
+        </Form.Item>
+        <Form.Item label="参数值">
+          {getFieldDecorator("data",{
+            rules:[{required:true,message:"请输入参数值"}]
+          })(
+            <TextArea placeholder="请输入参数值" width="220px" autoSize={{ minRows: 4, maxRows: 4 }}/>
+          )}
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(ParamsNew));

src/forge/DevOps/Manage/manage.scss

@@ -0,0 +1,4 @@
+.ant-form-explain{
+  position: absolute;
+  bottom: -15px;
+}

src/forge/DevOps/OpsDetailRightpanel.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from "react";
-import { Spin } from "antd";
+import { Spin , Menu } from "antd";
 import { FlexAJ, AlignCenter } from "../Component/layout";
 import axios from "axios";
+import CodeSSH from './ssh/Index';
 
 export default ({
   data,
@@ -17,6 +18,8 @@ export default ({
   const [spining, setSpining] = useState(true);
   const [stage, setStage] = useState(undefined);
   const [step, setStep] = useState(undefined);
+  const [nav, setNav] = useState("0");
+
   useEffect(() => {
     setSpining(rightSpin);
   }, [rightSpin]);
@@ -35,6 +38,7 @@ export default ({
           : p[0];
 
         setStep(sub);
+        setNav("0");
         if (sub && sub.status !== "skipped") {
           getStep(pre.number, sub.number);
         }
@@ -65,43 +69,55 @@ export default ({
     }
   }
   return (
-    <Spin spinning={spining}>
-      <div className="rightMainContent">
-        {data && data.status !== "error" ? (
-          <div>
-            <FlexAJ className="items">
-              <span>{step && step.name}</span>
-              <AlignCenter>
-                {step && step.duration_time}
-                <i className="iconfont icon-sanjiaoxing-down"></i>
-              </AlignCenter>
-            </FlexAJ>
-            <div>
-              {coders && coders.length > 0 ? (
-                coders.map((item, key) => {
-                  return (
+    <React.Fragment>
+      {/* <Menu className="devopsNav" onClick={(e)=>{setNav(e.key)}} selectedKeys={[nav]} mode="horizontal">
+        <Menu.Item key={'0'} value="0">开发流水线</Menu.Item>
+        <Menu.Item key={'1'} value="1">命令行</Menu.Item>
+      </Menu> */}
+      {
+        nav === "0" &&
+        <Spin spinning={spining}>
+          <div className="rightMainContent">
+            {data && data.status !== "error" ? (
+              <div>
+                <FlexAJ className="items">
+                  <span>{step && step.name}</span>
+                  <AlignCenter>
+                    {step && step.duration_time}
+                    <i className="iconfont icon-sanjiaoxing-down"></i>
+                  </AlignCenter>
+                </FlexAJ>
+                <div>
+                  {coders && coders.length > 0 ? (
+                    coders.map((item, key) => {
+                      return (
+                        <div className="opsDetailOut">
+                          <span>{key + 1}</span>
+                          <p>{item.out}</p>
+                        </div>
+                      );
+                    })
+                  ) : empty ? (
                     <div className="opsDetailOut">
-                      <span>{key + 1}</span>
-                      <p>{item.out}</p>
+                      <span>1</span>
+                      <p>
+                        {stage && stage.name} – {step && step.name}: Skipped
+                      </p>
                     </div>
-                  );
-                })
-              ) : empty ? (
-                <div className="opsDetailOut">
-                  <span>1</span>
-                  <p>
-                    {stage && stage.name} – {step && step.name}: Skipped
-                  </p>
+                  ) : (
+                    ""
+                  )}
                 </div>
-              ) : (
-                ""
-              )}
-            </div>
+              </div>
+            ) : (
+              <div style={{ color: "red" }}>error:{data && data.error}</div>
+            )}
           </div>
-        ) : (
-          <div style={{ color: "red" }}>error:{data && data.error}</div>
-        )}
-      </div>
-    </Spin>
+        </Spin>
+      }
+      {
+        nav === "1" && <CodeSSH />
+      }
+    </React.Fragment>
   );
 };

src/forge/DevOps/Structure.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect , useImperativeHandle ,forwardRef } from "re
 import { FlexAJ, AlignCenter , Banner } from "../Component/layout";
 import { Table, Pagination, Popconfirm } from "antd";
 import { truncateCommitId } from "../common/util";
-import {getUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import axios from "axios";
 import { Link } from 'react-router-dom';
 
@@ -58,6 +58,7 @@ function Structure(props,ref){
           return {
             ...item,
             author:item.author && item.author.name,
+            image_url:item.author && item.author.image_url,
             message: {
               branch: item.branch_target,
               message: item.message,
@@ -187,7 +188,7 @@ function Structure(props,ref){
             <i className="iconfont icon-weitongguo"></i>已撤销
           </span>
         );
-      case 'pending':
+      default:
         return (
           <span className="statusTag Preparing">
             <i className="iconfont icon-zhunbeizhong"></i>准备中
@@ -244,7 +245,7 @@ function Structure(props,ref){
               {meg.sha && <span className="color-orange">{meg.sha}</span>}
             </div>
             <AlignCenter>
-              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} src={`${current_user && getUrl(`/images/${current_user.image_url}`)}`} />
+              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} alt="" src={`${item.image_url && getImageUrl(`/${item.image_url}`)}`} />
               <div className="task-hide ml5" style={{ maxWidth: "300px" }}>
                 {meg.message}
               </div>

src/forge/DevOps/ops.scss

@@ -10,6 +10,7 @@
     padding:60px 0px;
   }
   .disposePanel{
+    border:1px solid #eee;
     .language{
       display: flex;
       margin-bottom: 20px;
@@ -81,48 +82,7 @@
   .ant-modal-close{
     top:7px;
   }
-  // 列表
-  .listPart{
-    .statusTag{
-      display: flex;
-      padding:0px 16px;
-      height: 32px;
-      line-height: 32px;
-      border-radius:20px;
-      float: left;
-      i{
-        font-size: 20px!important;
-        margin-right: 7px;
-      }
-      &.running{
-        background:#F1F8FF;
-        border:1px solid #5091FF;
-        color: #5091FF;
-      }
-      &.Preparing{
-        background:rgba(255,248,244,1);
-        border:1px solid rgba(255,110,33,1);
-        color:rgba(255,110,33,1) ;
-      }
-      &.pass{
-        background:#EEFDF5;
-        border:1px solid #28BD6C;
-        color:#28BD6C ;
-      }
-      &.failed{
-        background:#FCEEEE;
-        border:1px solid #F73030;
-        color:#F73030 ;
-      }
-      &.killed{
-        background:#eee;
-        border:1px solid #999;
-        color:#999 ;
-      }
-    }
-
-  }
-
+  
 }
 // ops详情
 .opsDetailPanel{
@@ -234,6 +194,18 @@
       &.rightSection{
         width:100%;
         background-color: #081930;
+        .devopsNav{
+          background-color: #111c24;
+          border-bottom: none;
+          .ant-menu-item{
+            color: #ccc;
+            padding:0px;
+            margin:0px 20px!important;
+          }
+          .ant-menu-item.ant-menu-item-selected{
+            color: #1890ff;
+          }
+        }
         .rightMainContent{
           padding:24px 30px;
           height:100vh;
@@ -419,6 +391,9 @@
     }
   }
 }
+.chooseCon.ant-select-dropdown{
+  z-index: 100001;
+}
 
 .choosenList{
   display: flex;
@@ -509,4 +484,41 @@
 }
 .hide{
   display: none!important;
+}
+.statusTag{
+  display: flex;
+  padding:0px 16px;
+  height: 32px;
+  line-height: 32px;
+  border-radius:20px;
+  float: left;
+  i{
+    font-size: 20px!important;
+    margin-right: 7px;
+  }
+  &.running{
+    background:#F1F8FF;
+    border:1px solid #5091FF;
+    color: #5091FF;
+  }
+  &.Preparing{
+    background:rgba(255,248,244,1);
+    border:1px solid rgba(255,110,33,1);
+    color:rgba(255,110,33,1) ;
+  }
+  &.pass{
+    background:#EEFDF5;
+    border:1px solid #28BD6C;
+    color:#28BD6C ;
+  }
+  &.failed{
+    background:#FCEEEE;
+    border:1px solid #F73030;
+    color:#F73030 ;
+  }
+  &.killed{
+    background:#eee;
+    border:1px solid #999;
+    color:#999 ;
+  }
 }

src/forge/DevOps/ssh/Index.jsx

@@ -0,0 +1,42 @@
+import React, { useState, useEffect } from "react";
+import XmlPanel from "./XmlPanel";
+import mediator from "./mediator";
+import axios from "axios";
+
+// const defaulturl = `http://47.111.130.18:48088`;
+const defaultValue = {
+  host: "106.75.231.63",
+  port: "2021",
+  ws_url: "wss://pre-webssh.educoder.net/ws",
+  username: "root",
+  secret: "Dron_123123",
+};
+function Index() {
+  const [sshConfigData, setSshConfigData] = useState(undefined);
+
+  useEffect(() => {
+    if (!sshConfigData) {
+      init();
+    }
+    setTimeout(() => {
+      mediator.publish("create-socket", 1);
+    }, 300);
+  }, [sshConfigData]);
+
+  // 获取服务器连接信息
+  function init() {
+    const url = `/api/ci/pipelines/ssh_server.json`;
+    axios.get(url).then(result=>{
+      if(result && result.data){
+        setSshConfigData({...result.data})
+      }
+    }).catch(error=>{})
+  }
+  return (
+    <XmlPanel
+      sshConfigData={sshConfigData||{}}
+      sid={1}
+    />
+  );
+}
+export default Index;

src/forge/DevOps/ssh/XmlPanel.jsx

@@ -0,0 +1,219 @@
+import React, { useRef, useEffect, useState } from 'react';
+import { Base64 } from 'js-base64';
+
+import { Terminal } from 'xterm';
+import 'xterm/css/xterm.css';
+import mediator from './mediator';
+import ResizeObserver from 'resize-observer-polyfill';
+
+function getColsAndRows(width, height, term) {
+  let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
+  let h = term._core._renderService.dimensions.actualCellHeight || 18;
+  const rows = Math.floor(height / h);
+  const cols = Math.floor(width / w);
+  return [cols, rows];
+}
+
+function onLayout(term, el) {
+  const ro = new ResizeObserver(entries => {
+    console.log(entries);
+    for (let entry of entries) {
+      if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
+        const [cols, rows] = getColsAndRows(
+          entry.target.offsetWidth,
+          entry.target.offsetHeight,
+          term,
+        );
+        console.log('cols, rows', cols, rows);
+        term.resize(cols, rows);
+        mediator.publish('ssh-xterm-resize', {
+          columns: cols,
+          rows: rows,
+          width: entry.target.offsetWidth,
+          height: entry.target.offsetHeight,
+        });
+      }
+    }
+  });
+  ro.observe(el);
+  return ro;
+}
+
+const TimeTicket = 30000;
+
+//建立 websockt 来交互
+//根据容器大小计算行数和列数并做到自适应
+//socket 与 term 需要分开初始化 因为socket 可能重置连接
+//mediator 监听消息，如果和id匹配，则建立连接，重置，或关闭连接
+
+export default ({ sshConfigData, sid }) => {
+  const [term, setTerm] = useState(null);
+
+  const { ws_url, password, port, secret } = sshConfigData;
+  const el = useRef();
+  const socket = useRef();
+  const isFirstConnected = useRef(false);
+
+  //term init
+  useEffect(() => {
+    if (el.current && ws_url) {
+      const term = new Terminal({ fontSize: 16, rendererType: 'dom' });
+      term.open(el.current);
+
+      term.onData(data => {
+        if (socket.current) {
+          if (socket.current.readyState === 1) {
+            socket.current.send(JSON.stringify({ tp: 'client', data: data }));
+            mediator.publish('on-operating-ssh'); //有操作则自动延时
+          } else {
+            //断开连接后重连
+            // socket.current = null
+            // mediator.publish('create-socket', sid)
+          }
+        }
+      });
+      term.write('Connecting...');
+      setTerm(term);
+      const ro = onLayout(term, el.current);
+      return () => {
+        term.dispose();
+        ro.unobserve(el.current);
+      };
+    }
+  }, [ws_url, el.current]);
+
+  useEffect(() => {
+    if (term && ws_url) {
+      function createSocket() {
+        const socketInstance = new WebSocket(ws_url);
+        socket.current = socketInstance;
+
+        socketInstance.onopen = () => {
+          let container = term.element.parentElement;
+          if (container) {
+            let width = container.offsetWidth;
+            let height = container.offsetHeight;
+            console.log('init', {
+              tp: 'init',
+              data: {
+                ...sshConfigData,
+                secret: secret,
+                width,
+                height,
+                rows: term.rows,
+                columns: term.cols,
+              },
+            });
+            socketInstance.send(
+              JSON.stringify({
+                tp: 'init',
+                data: {
+                  ...sshConfigData,
+                  secret: secret,
+                  width,
+                  height,
+                  rows: term.rows,
+                  columns: term.cols,
+                },
+              }),
+            );
+          }
+          term.focus();
+        };
+        socketInstance.onerror = error => {
+          console.log(
+            '------in socket error----',
+            error,
+            socketInstance,
+            ws_url,
+          );
+          //连接报错后，重新请求资源
+          // mediator.publish('on-recreate-socket')
+        };
+        socketInstance.onmessage = event => {
+          if (!isFirstConnected.current) {
+            term.write('\r');
+            // term.focus()
+            setTimeout(() => {
+              // term.clear();
+            }, 1000);
+          }
+          isFirstConnected.current = true;
+          console.log('event:', event);
+
+          const data = Base64.decode(event.data.toString());
+          let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
+
+          console.log('data:', data, w, term);
+          term.write(data);
+        };
+
+        socketInstance.onclose = evt => {
+          if (tid) {
+            clearInterval(tid);
+          }
+          term.write('\r\nconnection closed');
+        };
+      }
+
+      const tid = setInterval(() => {
+        if (socket.current) {
+          socket.current.send(JSON.stringify({ tp: 'h' }));
+        }
+      }, TimeTicket);
+
+      const unSubCreate = mediator.subscribe('create-socket', id => {
+        if (sid === id) {
+          if (socket.current && socket.current.readyState === 1) {
+            term.focus();
+          } else {
+            createSocket();
+          }
+          term.focus();
+        }
+      });
+
+      const unSubClose = mediator.subscribe('close-socket', id => {
+        if (sid === id) {
+          if (socket.current) {
+            socket.current.close();
+            isFirstConnected.current = false;
+            term.clear();
+          }
+          socket.current = null;
+        }
+      });
+
+      const unSubResize = mediator.subscribe('ssh-xterm-resize', option => {
+        if (socket.current && socket.current.readyState === 1) {
+          socket.current.send(
+            JSON.stringify({ tp: 'resize', data: { ...option } }),
+          );
+        }
+      });
+
+      const unSubAddTime = mediator.subscribe('ssh-add-connect-time', () => {
+        if (socket.current && socket.current.readyState === 1) {
+          socket.current.send(JSON.stringify({ tp: 'overtime' }));
+        }
+      });
+
+      return () => {
+        unSubClose();
+        unSubCreate();
+        unSubResize();
+        unSubAddTime();
+        if (socket.current) {
+          socket.current.close();
+          isFirstConnected.current = false;
+        }
+      };
+    }
+  }, [term, ws_url, port]);
+
+  return (
+    <div ref={el} className="xterm-panel" style={{height:"100%"}}>
+      {!ws_url ? <p style={{ color: '#fff' }}>正在连接命令行服务...</p> : null}
+    </div>
+  );
+};

src/forge/DevOps/ssh/mediator.jsx

@@ -0,0 +1,46 @@
+function Mediator(obj) {
+  const channels = {};
+
+  const mediator = {
+    subscribe: function(channel, cb) {
+      if (!channels[channel]) {
+        channels[channel] = [];
+      }
+      channels[channel].push(cb);
+      return this.unsubscribe.bind(null, channel, cb);
+    },
+
+    unsubscribe: function(channel, cb) {
+      let rs = channels[channel];
+      let index = -1;
+      if (rs) {
+        for (let i = 0; i < rs.length; i++) {
+          if (rs[i].name === cb.name) {
+            index = i;
+            break;
+          }
+        }
+        if (index >= 0) {
+          channels[channel].splice(index, 1);
+          return true;
+        }
+      }
+      return false;
+    },
+
+    publish: function(channel) {
+      if (!channels[channel]) {
+        return false;
+      }
+      const args = Array.prototype.slice.call(arguments, 1);
+      channels[channel].forEach(subscription => {
+        subscription.apply(null, args);
+      });
+      return this;
+    },
+  };
+
+  return obj ? Object.assign(obj, mediator) : mediator;
+}
+const mediator = new Mediator();
+export default mediator;

src/forge/Divert/DivertModal.jsx

@@ -0,0 +1,175 @@
+import React ,{ forwardRef, useEffect, useState } from 'react';
+import { Modal , Form , Input , Radio , Select } from 'antd';
+import SearchUser from '../Component/SearchUser';
+import './Index.scss';
+import Axios from 'axios';
+
+const { Option } = Select;
+function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+  const [ cate , setCate ] = useState(0);
+  const [ value , setValue ] = useState(undefined);
+  
+  const [ organizations , setOrganizations ] = useState(undefined);
+
+  useEffect(()=>{
+    setFieldsValue({goal:cate})
+  },[])
+
+  useEffect(()=>{
+    if(owner && repo && visible===true){
+      getTeam();
+    }
+    if(!visible){
+      setFieldsValue({
+        owner_name:undefined,
+        identifier:undefined
+      })
+      setValue(undefined)
+    }
+  },[repo,owner,visible])
+
+  function getTeam(){
+    const url = `/${owner}/${repo}/applied_transfer_projects/organizations.json`;
+    Axios.get(url).then(result=>{
+      if(result){
+        setOrganizations(result.data.organizations);
+      }
+    }).catch(error=>{})
+  }
+
+  // 确认转移
+  function onOk(){
+    validateFields((error,values)=>{
+      console.log(...values);
+      if(!error){
+        const url = `/${owner}/${repo}/applied_transfer_projects.json`;
+        Axios.post(url,{
+          ...values
+        }).then(result=>{
+          if(result){
+            onSuccess(result.data && result.data.owner);
+          }
+        }).catch(error=>{})
+      }
+    })
+    
+  }
+  function changeType(e){
+    setCate(e.target.value);
+    setFieldsValue({
+      owner_name:undefined
+    })
+  }
+
+  function checkIdentifier(rule, value, callback){
+    if(!value){
+      callback();
+    }
+    if (repo && value !== repo) {
+      callback("请输入当前项目的标识！");
+    }
+    callback();
+  }
+
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+
+  function getUser(id){
+    setValue(id);
+    setFieldsValue({
+      owner_name:id
+    })
+  }
+  return(
+    <Modal 
+      width="620px"
+      visible={visible}
+      title="转移仓库"
+      onCancel={onCancel}
+      onOk={onOk}
+      okText="确认转移"
+      cancelText={"取消"}
+      centered
+    >
+      <div className="diverModal">
+        {
+          cate === 0 ?
+          <ul className="descUl">
+            <li>转移需对方确认接受，转移成功后你将被移出仓库，其他已有成员权限不变</li>
+            <li>转移成功后，仓库的地址将变更至目标用户的命名空间下</li>
+            <li>已有成员如需继续操作仓库，需更新本地仓库的remote，使之指向新的地址</li>
+          </ul>
+          :
+          <ul className="descUl">
+            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
+            <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
+          </ul>
+        }
+        <Form {...layout} colon={false} layout={"horizontal"}>
+          <Form.Item label="转移给:" style={{marginBottom:"0px"}}>
+            {getFieldDecorator("goal",{
+              rules:[]
+            })(
+              <Radio.Group onChange={changeType}>
+                <Radio value={0}>个人</Radio>
+                <Radio value={1}>组织</Radio>
+              </Radio.Group>
+            )}
+          </Form.Item>
+          {
+            cate === 0 && 
+            <Form.Item label=" ">
+              {getFieldDecorator("owner_name",{
+                rules:[{required:true,message:"请输入目标用户名"}]
+              })(
+                // <Input placeholder="请输入目标用户" autoComplete={"off"}/>
+                <SearchUser getUser={getUser} width={"100%"} placeholder="请输入目标用户" value={value}/>
+              )}
+            </Form.Item>
+          }
+          {
+            cate === 1 &&
+            <Form.Item label=" ">
+              {getFieldDecorator("owner_name",
+                {rules:[{required:true,message:"请选择目标组织"}]}
+              )(
+                <Select placeholder="请选择目标组织" getPopupContainer={trigger => trigger.parentNode}>
+                  {
+                    organizations && organizations.length > 0 ?
+                      organizations.map((i,k)=>{
+                        return(
+                          <Option value={i.name}>{i.nickname}</Option>
+                        )
+                      })
+                    :""
+                  }
+                </Select>
+              )}
+            </Form.Item>
+          }
+          
+          <Form.Item label="仓库标识:" style={{marginBottom:"0px"}}>
+            {getFieldDecorator("identifier",
+              {
+                rules:[
+                  {required:true,message:"请输入仓库标识！"},
+                  {
+                    validator:checkIdentifier
+                  }
+                ]
+              }
+            )(
+              <Input placeholder="请输入仓库标识" autoComplete={"off"}/>
+            )}
+          </Form.Item>
+          <span className="color-grey-9" style={{marginLeft:"120px"}}>请输入当前项目的标识：<span className="ml5 mr5 color-grey-3">{repo}</span>进行确认！</span>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(DivertModal));

src/forge/Divert/Index.scss

@@ -0,0 +1,12 @@
+.diverModal{
+  .descUl{
+    background-color: #fffae6;
+    border-radius: 4px;
+    padding:10px 15px;
+    color: #efc16b;
+    border:1px solid #efc16b;
+  }
+  .ant-form-item-required::before{
+    content: "";
+  }
+}

src/forge/GetData/getData.jsx

@@ -10,4 +10,12 @@ export const getTag = async (id,owner)=>{
 // 获取hooks（仓库设置-管理web钩子）列表
 export const getHooks = async (id,params)=>{
   return (await axios.get(`/projects/${id}/hooks.json`,{params})).data;
+}
+// 获取子目录列表
+export const getSubEntries = async (owner,projectsId,params)=>{
+  return (await axios.get(`/${owner}/${projectsId}/sub_entries.json`,{params})).data;
+}
+// 获取用户信息
+export const getUser = async (login)=>{
+  return (await axios.get(`/users/${login}/hovercard.json`)).data;
 }

src/forge/Head/AddProjectModal.jsx

@@ -0,0 +1,84 @@
+import React, { useState , forwardRef, useEffect } from 'react';
+import { Form , Modal , Input , Radio } from 'antd';
+import Axios from 'axios';
+
+export default Form.create()(
+  forwardRef((props)=>{
+    const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
+    const [ visible , setVisible ] = useState(false);
+
+    useEffect(()=>{
+      if(!visible){
+        setFieldsValue({
+          code:undefined,
+          role:"developer"
+        })
+      }
+    },[visible])
+
+    function onOk() {
+      validateFields((error,values)=>{
+        if(!error){
+          const url = `/applied_projects.json`;
+          Axios.post(url,{
+            applied_project:{
+              ...values
+            }
+          }).then(result=>{
+            if(result && result.data){
+              setVisible(false);
+              props.showNotification("申请加入项目成功，等待审核!");
+            }
+          }).catch(error=>{})
+        }
+      })
+    }
+    function checkValue(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value.length < 6 || value.length > 6){
+        callback("请输入6位数的邀请码");
+      }
+      callback();
+    }       
+
+    return(
+      <React.Fragment>
+        <Modal
+          title="加入项目"
+          width="480px"
+          visible={visible}
+          centered={true}
+          onOk={onOk}
+          onCancel={()=>setVisible(false)}
+        >
+          <Form layout={'inline'} className="inviteForm">
+            <Form.Item label="项目邀请码">
+              {getFieldDecorator("code",{
+                rules:[
+                  {required:true,message:"请输入6位项目邀请码"},
+                  {validator:checkValue}
+                ]
+              })(
+                <Input placeholder="请输入6位项目邀请码" autoComplete={"off"} maxLength="6" style={{width:"300px"}}/>
+              )}
+            </Form.Item>
+            <Form.Item label="选择角色">
+              {getFieldDecorator("role",{
+                rules:[{required:true,message:"请选择角色"}]
+              })(
+                <Radio.Group defaultValue={"developer"}>
+                  <Radio value="manager">管理员</Radio>
+                  <Radio value="developer">开发者</Radio>
+                  <Radio value="reporter">报告者</Radio>
+                </Radio.Group>
+              )}
+            </Form.Item>
+          </Form>
+        </Modal>
+        <a onClick={()=>setVisible(true)}>加入项目</a>
+      </React.Fragment>
+    )
+  })
+)

src/forge/Head/Footer.jsx

@@ -0,0 +1,66 @@
+import React, { useEffect , useState } from 'react';
+import './header.scss';
+
+function Footer(){
+  const [ value , setValue ] = useState(undefined);
+
+  useEffect(()=>{
+    try {
+      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+      setValue(chromesettingArray.footer);
+    } catch (e) {
+    }
+  },[])
+
+  function showhtml(htmlString){
+    var html = {__html:htmlString};
+    return <div dangerouslySetInnerHTML={html}></div> ;
+  }
+
+  return(
+    <div>
+      <div style={{height:"497px"}}></div>
+      <div className="newFooter edu-txt-center">
+        {value && showhtml(value)}
+        {/* <div className="footerInfos">
+          <ul>
+            <li>社区</li>
+            <li><a href={`/`} target="_blank">网站首页</a></li>
+            <li><a href={`https://www.trustie.net/agreement`} target="_blank">服务协议</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://forum.trustie.net/`} target="_blank">问吧交流</a></li>
+            <li><a href={`https://www.trustie.net/cooperation`} target="_blank">合作伙伴</a></li>
+          </ul>
+          <ul>
+            <li>支持与服务</li>
+            <li><a href={`https://forgeplus.trustie.net/docs/api`} target="_blank">API文档</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://git-scm.com`} target="_blank">Git常用命令</a></li>
+            <li><a href={`https://forum.trustie.net/forums/3080/detail`} target="_blank">DevOps使用文档</a></li>
+            <li><a href={`https://forgeplus.trustie.net/projects/jasder/forgeplus/tree/master/CHANGELOG.md`} target="_blank">日志更新</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><a href={`http://www.sei.pku.edu.cn`} target="_blank">北京大学</a></li>
+            <li><a href={`http://scse.buaa.edu.cn`} target="_blank">北京航空航天大学</a></li>
+            <li><a href={`https://www.nju.edu.cn`} target="_blank">南京大学</a></li>
+            <li><a href={`https://www.xtu.edu.cn`} target="_blank">湘潭大学</a></li>
+            <li><a href={`http://www.iscas.ac.cn`} target="_blank">ISCAS</a></li>
+            <li><a href={`https://www.ucloud.cn`} target="_blank">UCloud优刻得</a></li>
+            <li><a href={`http://www.inforbus.com`} target="_blank">中创软件</a></li>
+            <li><a href={`https://www.inspur.com`} target="_blank">浪潮集团</a></li>
+            <li><a href={`http://www.copu.org.cn`} target="_blank">中国开源软件推进联盟</a></li>
+            <li><a href={`https://www.sjtu.edu.cn`} target="_blank">上海交通大学</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><span>热线：</span></li>
+            <li><span>QQ群：1071514693</span></li>
+          </ul>
+        </div>
+        <p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477号</a></p> */}
+      </div>
+    </div>
+  )
+}
+export default Footer;

src/forge/Head/Header.js

@@ -0,0 +1,456 @@
+import React, { Component } from 'react';
+import AccountProfile from "../../modules/user/AccountProfile";
+import { getImageUrl } from 'educoder'
+import axios from 'axios';
+import { Input , notification , Dropdown , Menu } from 'antd';
+import { Link } from 'react-router-dom';
+
+import LoginDialog from '../../modules/login/LoginDialog';
+import HeadSearch from '../Component/HeadSearch';
+
+import AddProjectModal from './AddProjectModal';
+import '../../modules/tpm/TPMIndex.css';
+
+import './header.scss';
+const $ = window.$
+// TODO 这部分脚本从公共脚本中直接调用
+const { Search } = Input;
+let old_url;
+
+window._header_componentHandler = null;
+// 非trustie链接则新开页跳转
+const str = ['www.trustie.net','forgeplus.trustie.net','forum.trustie.net','testforgeplus.trustie.net']
+class NewHeader extends Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      Addcoursestypes: false,
+      tojoinitemtype: false,
+      tojoinclasstitle: undefined,
+      rolearr: ["", ""],
+      Checkboxteacherchecked: false,
+      Checkboxstudentchecked: false,
+      Checkboxteachingchecked: false,
+      Checkboxteachertype: false,
+      Checkboxteachingtype: false,
+      code_notice: false,
+      RadioGroupvalue: undefined,
+      submitapplications: false,
+      isRender: false,
+      showTrial: false,
+      setevaluatinghides: false,
+      occupation: 0,
+      mydisplay: false,
+      headtypesonClickbool: false,
+      headtypess: "/",
+      settings: null,
+      visiblemyss: false,
+      openSearch:false,
+    }
+  }
+  componentDidMount() {
+    this.geturlsdata();
+    window._header_componentHandler = this;
+
+    //下拉框的显示隐藏
+    var hoverTimeout;
+    var hoveredPanel;
+    $(".edu-menu-panel").hover(function () {
+      if (hoverTimeout) { // 一次只显示一个panel
+        if (hoveredPanel && hoveredPanel !== this) {
+          $(hoveredPanel).find(".edu-menu-list").hide()
+        }
+        clearTimeout(hoverTimeout);
+        hoverTimeout = null;
+      }
+      hoveredPanel = this;
+      $(this).find(".edu-menu-list").show();
+    }, function () {
+      var that = this;
+      // 延迟hide
+      hoverTimeout = setTimeout(function () {
+        $(that).find(".edu-menu-list").hide();
+      }, 800)
+
+    });
+    //获取游览器地址
+    try {
+      window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href))
+    } catch (e) {}
+  }
+
+  openNotification = (messge) => {
+    notification.open({
+      message: "提示",
+      description:
+        messge,
+    });
+  };
+
+  componentWillReceiveProps(newProps, oldProps) {
+    this.setState({
+      user: newProps.user
+    })
+    if (newProps.Headertop !== undefined) {
+      old_url = newProps.Headertop.old_url
+    }
+  }
+
+  educoderlogin = () => {
+    //登录账号
+    this.setState({
+      isRender: true
+    })
+  }
+  educoderloginysl = () => {
+    //退出账号
+    var url = `/accounts/logout.json`;
+    axios.get((url)).then((result) => {
+      if (result !== undefined) {
+        window.location.href = "/";
+      }
+    }).catch((error) => {
+      console.log(error);
+    })
+  }
+
+  hideAddcoursestypes = () => {
+    this.setState({
+      Addcoursestypes: false
+    })
+  };
+  HideAddcoursestypess = (i) => {
+    console.log("调用了");
+    this.setState({
+      Addcoursestypes: false,
+      mydisplay: true,
+      occupation: i,
+    })
+  };
+  ModalCancelsy = () => {
+    this.setState({
+      mydisplay: false,
+    })
+  };
+
+  // 关闭
+  cancelModulationModels = () => {
+    this.setState({ isRenders: false })
+  }
+
+  setevaluatinghides = () => {
+    this.setState({
+      setevaluatinghides: true
+    })
+  }
+  //修改登录方法
+  Modifyloginvalue = () => {
+    this.setState({
+      isRender: false,
+    })
+  }
+
+  hideAccountProfile = () => {
+    this.setState({
+      AccountProfiletype: false
+    })
+  };
+  headtypesonClick = (url, bool) => {
+    this.setState({
+      headtypess: url,
+      headtypesonClickbool: bool,
+    })
+  }
+  //获取数据为空的时候
+  gettablogourlnull = () => {
+    this.setState({
+      settings: undefined
+    });
+    var link = document.createElement('link'),
+      oldLink = document.getElementById('dynamic-favicon');
+    link.id = 'dynamic-favicon';
+    link.rel = 'shortcut icon';
+    link.href = "/react/build/./favicon.ico";
+    if (oldLink) {
+      document.head.removeChild(oldLink);
+    }
+    document.head.appendChild(link);
+  };
+
+  //获取数据的时候
+  gettablogourldata = (response) => {
+    document.title = response.data.setting.name;
+    var link = document.createElement('link'),
+      oldLink = document.getElementById('dynamic-favicon');
+    link.id = 'dynamic-favicon';
+    link.rel = 'shortcut icon';
+    link.href = '/' + response.data.setting.tab_logo_url;
+    if (oldLink) {
+      document.head.removeChild(oldLink);
+    }
+    document.head.appendChild(link);
+  }
+
+  handleVisibleChanges = (boll) => {
+    this.setState({
+      visiblemyss: boll,
+    })
+  }
+
+  geturlsdata = () => {
+    let url = "/setting.json";
+    axios.get(url).then((response) => {
+      if (response && response.data) {
+        this.setState({ settings: response.data.setting });
+        localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+        localStorage.setItem('chromesettingresponse', JSON.stringify(response));
+      } else {
+        this.gettablogourlnull();
+      }
+    }).catch((error) => {
+      this.gettablogourlnull();
+    });
+  }
+
+  matchpaths = (url) => {
+    const { match } = this.props;
+    if(url){
+      if (match.path.indexOf(url) > -1) {
+        return true
+      }else {
+        return false
+      }
+    }
+  }
+
+  addMenu=(list)=>{
+    return(
+      list && list.length >0 && 
+      <div className="dropdownFlex">
+        <Menu> 
+          {
+            list.map((item,key)=>{
+              return(
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
+              )
+            })
+          }
+          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
+        </Menu>
+      </div>
+    )
+  }
+  renderMenu=(personal)=>{
+    const { current_user } = this.props;
+    return(
+      <Menu className="currentMenu">
+        <Menu.Item>
+          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
+        </Menu.Item>
+          {
+            personal && personal.length > 0 && personal.map((item,key)=>{
+              return(
+                <li key={key}><a href={item.url} target="_blank">{item.name}</a></li>
+              )
+            })
+          }
+          <li><Link to={`/settings/SSH`}>设置</Link></li>
+        <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
+      </Menu>
+    )
+  }
+
+  render() {
+    const { match} = this.props;
+    let current_user = this.props.user;
+    let {
+      AccountProfiletype,
+      user,
+      isRender,
+      headtypesonClickbool,
+      headtypess,
+      settings,
+    } = this.state;
+    /*用户名称  用户头像url*/
+    let activeIndex = false;
+    let activeForums = false;
+    let activeShixuns = false;
+    let activePaths = false;
+    let coursestype = false;
+    let activePackages = false;
+    let activeMoopCases = false;
+    let activeCompetitions = false;
+
+    if (match.path === '/forums') {
+      activeForums = true;
+    } else if (match.path.startsWith('/shixuns')) {
+      activeShixuns = true;
+    } else if (match.path.startsWith('/paths')) {
+      activePaths = true;
+    } else if (match.path.startsWith('/courses')) {
+      coursestype = true;
+    } else if (match.path.startsWith('/crowdsourcing')) {
+      activePackages = true;
+    } else if (match.path.startsWith('/moop_cases')) {
+      activeMoopCases = true;
+    } else if (match.path.startsWith('/competitions')) {
+      activeCompetitions = true;
+    } else {
+      activeIndex = true;
+    }
+
+    let headtypes = '/';
+    if (settings) {
+      if (settings.navbar) {
+        if (settings.navbar.length > 0) {
+          if (match.path === '/') {
+            if (headtypesonClickbool === false) {
+              headtypes = undefined;
+            } else {
+              headtypes = headtypess;
+            }
+          } else {
+            for (var i = 0; i < settings.navbar.length; i++) {
+              if (match.path === settings.navbar[i].link) {
+                headtypes = settings.navbar[i].link;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+    let shixuntype = false;
+    let pathstype = false;
+    let coursestypes = false;
+    if (this.props && this.props.mygetHelmetapi != null) {
+      let shixun = "/shixuns";
+      let paths = "/paths";
+      let courses = "/courses";
+      this.props.mygetHelmetapi && this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item, key) => {
+        var reg = RegExp(item.link);
+        if (shixun.match(reg)) {
+          if (item.hidden === true) {
+            shixuntype = true
+          }
+        }
+        if (paths.match(reg)) {
+          if (item.hidden === true) {
+            pathstype = true
+          }
+        }
+        if (courses.match(reg)) {
+          if (item.hidden === true) {
+            coursestypes = true
+          }
+        }
+      })
+    }
+
+    // let search_url = settings && settings.common && settings.common.search;
+    let notice_url = settings && settings.common && settings.common.notice;
+    return (
+      <div className="newHeaders" id="nHeader">
+        <div className="headerContent">
+          {isRender === true ?
+            <LoginDialog
+              {...this.props}
+              {...this.state}
+              Modifyloginvalue={() => this.Modifyloginvalue()}
+            /> : ""}
+
+          {AccountProfiletype === true ?
+            <AccountProfile
+              hideAccountProfile={() => this.hideAccountProfile()}
+              {...this.props}
+              {...this.state}
+            /> : ""}
+            {
+              settings && settings.nav_logo_url ?
+              <a href={settings && settings.new_course.default_url} className={"fl mr50"} style={{minWidth:"45px"}}>
+                <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(`/${settings.nav_logo_url}`)}></img>
+              </a>
+              :
+              ""
+            }
+          <div className="head-nav pr" id={"head-navpre1"}>
+            {
+              settings && settings.navbar && settings.navbar.length > 0 ?
+              <ul id="header-nav">
+                {
+                  settings.navbar && settings.navbar.map((item, key) => {
+                    var new_link = item.link;
+                    var user_login = this.props.user && this.props.user.login;
+                    var is_hidden = item.hidden
+                    if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
+                      if (user_login) {
+                        if (new_link.indexOf("courses") > -1) {
+                          new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses")
+                        } else if (new_link.indexOf("contests") > -1) {
+                          new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
+                        }
+                      } else {
+                        is_hidden = true
+                      }
+                    }
+                    if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
+                      new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
+                    }
+                    
+                    var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
+                    var wl = waiLian && waiLian.length>0;
+                    return (
+                      <li key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
+                        <a href={new_link} target={wl ? "_self":"_blank"}>{item.name}</a>
+                      </li>
+                    )
+                  })
+                }
+              </ul>
+            : ""
+            }
+          </div>
+          <div className="head-right">
+            {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
+            <HeadSearch {...this.props}/>
+            {
+              current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
+              <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
+                <i className="iconfont icon-tianjiafangda color-grey-6 ml30"></i>
+              </Dropdown>:""
+            }
+            
+            {this.props.user && this.props.user.login && notice_url ?
+              <div className="ml30 edu-menu-panel">
+                {user && user.login &&
+                  <a href={`${notice_url}`} style={{ position: 'relative' }}>
+                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
+                    <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
+                    </span>
+                  </a>
+                }
+              </div>:""
+            }
+          </div>
+          {!user || (user && !user.login)  ?
+            <span className="font-15 ml30">
+              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              {
+                settings && settings.common && settings.common.register &&
+                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
+              }
+            </span>
+            :
+            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
+              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
+                <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
+              </a>
+            </Dropdown>
+          }
+        </div>
+      </div>
+    );
+  }
+}
+
+export default NewHeader;

src/forge/Head/header.scss

@@ -0,0 +1,122 @@
+
+.dropdownFlex{
+  display:flex;
+  background:#fff;
+  border-radius: 3px;
+  .ant-menu-vertical > .ant-menu-item{
+    border:none;
+    height: 35px;
+    line-height: 35px;
+    margin:0px;
+    &.ant-menu-item-selected{
+      background-color: #fff;
+      a{color: rgba(0, 0, 0, 0.65)!important;}
+    }
+    &.ant-menu-item-active{
+      a{color: #4cacff!important;}
+    }
+  }
+  .ant-menu-vertical{
+    border:none;
+  }
+}
+.currentImg{
+  width: 34px;
+  height: 34px;
+  border-radius: 50%;
+  margin-left: 30px;
+}
+.currentMenu{
+  width: 120px;
+  text-align: center;
+  padding:0px;
+  li{
+    height: 40px;
+    line-height: 40px;
+    padding:0px!important;
+    cursor: default;
+    &:hover{
+      background-color: #fff;
+    }
+    &:first-child{
+      border-bottom: 1px solid #eee;
+    }
+    &:last-child{
+      border-top: 1px solid #eee;
+      a{
+        border-radius: 0px 0px 4px 4px;
+      }
+    }
+    a{
+      padding:0px;
+      margin:0px;
+      display: block;
+      color: #666;
+      &:hover{
+        color: #fff;
+        background: #4CACFF;
+      }
+    }
+  }
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+  p {
+    margin-top: 0;
+    margin-bottom:0px !important;
+  }
+  .footerInfos{
+    display: flex;
+    max-width: 1200px;
+    margin:0px auto;
+    justify-content: space-around;
+    padding:60px 0px;
+    & >ul{
+      padding:0px 40px;
+      box-sizing: border-box;
+      max-width: 25%;
+      text-align: left;
+      li{
+        color: #fff;
+        font-weight: 300;
+        &:first-child{
+          font-size: 17px;
+        }
+        &>a,&>span{
+          color: #bbb;
+        }
+        &>a:hover{
+          color: #4cacff;
+        }
+      }
+    }
+  }
+  .footerCopy{
+    color: #bbb;
+    border-top: 1px solid #4e4e4e;
+    padding:10px 0px;
+    a{
+      color: #bbb;
+      &:hover{
+        color: #4cacff;
+      }
+    }
+  }
+}
+.inviteForm{
+  .ant-form-item{
+    margin-right: 0px;
+  }
+  .ant-form-item-label{
+    width: 110px;
+    text-align: right;
+  }
+}

src/forge/Index.js

@@ -6,7 +6,6 @@ import { withRouter } from "react-router";
 import { SnackbarHOC } from "educoder";
 import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
 import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
-import Handbook from './Component/Handbook';
 import "./css/index.scss";
 
 import Loadable from "react-loadable";
@@ -27,15 +26,18 @@ const ProjectDetail = Loadable({
   loading: Loading,
 });
 
-const Infos = Loadable({
-  loader: () => import("./users/Infos"),
-  loading: Loading,
-});
 class Index extends Component {
+
+  componentDidUpdate=()=>{
+    this.props.history.listen(()=>{
+      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
+        window.scrollTo(0, 0)
+      }
+    })
+  }
   render() {
     return (
       <div className="newMain clearfix">
-        <Handbook />
         <Switch {...this.props}>
           <Route
             path="/projects/:projectsType/new/:OIdentifier"
@@ -49,6 +51,12 @@ class Index extends Component {
               <ProjectNew {...this.props} {...props} />
             )}
           ></Route>
+          <Route
+            path="/projects/new"
+            render={(props) => (
+              <ProjectNew {...this.props} {...props} />
+            )}
+          ></Route>
           <Route
             path="/projects/:owner/:projectsId"
             render={(props) => (
@@ -62,12 +70,8 @@ class Index extends Component {
             )}
           ></Route>
           <Route
-            exact
             path="/"
             render={(props) => (
-              this.props.current_user && this.props.current_user.login ?
-              <Infos {...this.props} {...props} />
-              :
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>

src/forge/Main/CoderDepot.jsx

@@ -0,0 +1,534 @@
+import React , { useEffect , useState } from 'react';
+import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ  } from '../Component/layout';
+import { Dropdown , Menu , Divider , Spin, Button } from 'antd';
+import { getImageUrl } from "educoder";
+import { Link } from 'react-router-dom';
+import CloneAddress from '../Branch/CloneAddress';
+
+import SelectBranch from '../Branch/Select';
+import User from '../Component/User';
+import axios from 'axios';
+import Path from './CoderDepotPath';
+import Catalogue from './CoderDepotCatalogue';
+import ReadMe from './CoderDepotReadme';
+import CoderRootFileDetail from './CoderRootFileDetail';
+import './Index.scss';
+import Releases from '../Component/Releases';
+import Contributors from '../Component/Contributors';
+import LanguagePower from '../Component/LanguagePower';
+import DrawerPanel from '../Component/DrawerPanel';
+import UpdateDescModal from './sub/UpdateDescModal';
+import Nodata from '../Nodata';
+import Invite from './sub/Invite';
+/**
+ * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
+ */
+
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
+function returnbar(str){
+  if(str && str.length>0 && str.indexOf("%2F")>-1){
+    return str.replaceAll('%2F','/');
+  }
+  return str;
+}
+
+function CoderDepot(props){
+  const [ projectDetail , setProjectDetail ]= useState(undefined);
+  const [ inviteCode , setInviteCode ] = useState(undefined);
+  const [ treeValue , setTreeValue ] = useState(undefined);
+  const [ treeValuePath , setTreeValuePath ] = useState(undefined);
+  const [ lastCommit,setLastCommit ] = useState(undefined);
+  const [ lastCommitAuthor,setLastCommitAuthor ] = useState(undefined);
+  const [ type ,setType ] = useState('dir');
+  const [ hide , setHide ] = useState(true);
+  const [ hideBtn , setHideBtn ] = useState(false);
+  const [ commitCount ,setCommitCount ] = useState(0);
+  const [ dirInfo ,setDirInfo ] = useState(undefined);//文件夹目录列表
+  const [ fileInfo ,setFileInfo ] = useState(undefined);//文件内容信息
+  const [ zip_url , setZip_url ] = useState(undefined);
+  const [ tar_url , setTar_url ] = useState(undefined);
+  const [ readOnly , setReadOnly] = useState(true);
+  const [ isSpin , setIsSpin] = useState(true);
+  const [ visible ,setVisible ] = useState(false);
+  const [ mainFlag ,setMainFlag ] = useState(false);
+  const [ openModal , setOpenModal ] = useState(false);
+  const [ desc , setDesc ] = useState(undefined);
+  const [ website , setWebsite ] = useState(undefined);
+  const [ lesson_url , setLessonUrl ] = useState(undefined);
+  const [ readme , setReadme ] = useState(undefined);
+  const [ defaultBranch , setDefaultBranch ] = useState(undefined);
+  const [ editReadme , setEditReadme ] = useState(false);
+  const [ pullsFlag , setPullsFlag ] = useState(true);
+  const [ issuesFlag , setIssuesFlag ] = useState(true);
+
+  const owner = props.match.params.owner;
+  const projectsId = props.match.params.projectsId;
+  let branchName = props.match.params.branchName;
+  branchName = returnbar(branchName);
+  const details = props.projectDetail;
+  let pathname = props.history.location.pathname;
+  
+  const { bannerList } = props;
+
+  useEffect(()=>{
+    if(bannerList && bannerList.length>0){
+      let a = bannerList.filter(i=>i.menu_name === "pulls");
+      let i = bannerList.filter(i=>i.menu_name === "issues");
+      if(a && a.length === 0){
+        setPullsFlag(false);
+      }
+      if(i && i.length === 0){
+        setIssuesFlag(false);
+      }
+    }
+  },[bannerList])
+
+
+  useEffect(()=>{
+    if(details){
+      setProjectDetail(details);
+      setDesc(details.description);
+      setWebsite(details.website);
+      setLessonUrl(details.lesson_url);
+      setDefaultBranch(details.default_branch);
+      setInviteCode(details.invite_code);
+    }
+  },[details])
+
+  useEffect(()=>{
+    if(treeValue){
+      setTreeValuePath(treeValue.split('/'));
+    }else{
+      setTreeValuePath(undefined);
+    }
+  },[treeValue])
+
+
+  useEffect(()=>{
+    if (projectsId && owner && defaultBranch){
+      let b = turnbar(branchName) ;
+      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+        let url = pathname.split(`/tree/${b}/`)[1];
+        setTreeValue(url);
+        getFileInfo(url,branchName);
+        setType("file");
+      }else{
+        setTreeValue(undefined);
+        getDirInfo(branchName || defaultBranch);
+        setType("dir");
+      }
+    } 
+  },[projectsId,owner,pathname,defaultBranch])
+
+  // 获取主目录列表
+  function getDirInfo(branch){
+    setIsSpin(true);
+    const url = `/${owner}/${projectsId}/entries.json`;
+
+    axios.get(url, { 
+      params: { ref: branch } 
+    }).then((result) => {
+      if (result) {
+        setCommitCount(result.data.commits_count);
+        setDirInfo(result.data.entries);
+        setFileInfo(undefined);
+        setTar_url(result.data.tar_url);
+        setZip_url(result.data.zip_url);
+        let c = result.data.last_commit
+        setLastCommit(c && c.commit);
+        setLastCommitAuthor(c && c.committer);
+        setMainFlag(true);
+        setReadOnly(true);
+        setReadme(result.data.readme);
+        setEditReadme(false);
+        setHide(true);
+      }
+      setTimeout(function(){setIsSpin(false);},500);
+    }).catch(error=>{setIsSpin(false);})
+  }
+
+  useEffect(()=>{
+    if(projectDetail && lastCommit)
+    {
+      let ele = document.getElementById("ptxt");
+      if(ele){
+        let h = ele.offsetHeight;
+        if( h > 18 ) setHideBtn(true);
+      }
+    }
+  },[projectDetail,lastCommit])
+  // 获取子目录列表
+  function getFileInfo(path, ref){
+    setIsSpin(true);
+    const url = `/${owner}/${projectsId}/sub_entries.json`;
+    axios.get(url, { 
+      params:{
+        filepath:path,
+        ref:ref || branchName,
+        type
+      }
+    }).then((result) => {
+      if (result) {
+        let en = result.data.entries;
+        if(en.type){
+          setDirInfo(undefined);
+          setFileInfo(en);
+          setType(en.type);
+        }else{
+          setFileInfo(undefined);
+          setDirInfo(en);
+          setType("dir");
+        }
+        let c = result.data.last_commit
+        setLastCommit(c && c.commit);
+        setLastCommitAuthor(c && c.committer);
+        setMainFlag(false);
+        setReadOnly(!editReadme);
+        setHide(true);
+      }
+      setTimeout(function(){setIsSpin(false);},500)
+    }).catch(error=>{setIsSpin(false);})
+  }
+
+  // 切换分支或者标签
+  function changeBranch(value){
+    let checkvalue = turnbar(value);
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
+    props.history.push(url);
+  }
+    
+  // 文件相关的下拉项
+  function fileMenu(){
+    let b = branchName || defaultBranch;
+    let checkvalue = turnbar(b);
+    return (
+    <Menu>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+    </Menu>
+    )
+  }
+
+  function getPathUrl(array,index){
+    if(array && array.length>0 && index){
+      let str = "";
+      for(let i=0;i<index;i++){
+        str += `/${array[i]}`;
+      }
+      return str.substr(1);
+    }
+  }
+  // 页面地址返回到主目录
+  function returnMain(){
+    setTreeValue(undefined);
+    let branch = branchName || defaultBranch;
+    let checkvalue = turnbar(branch);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
+  };
+  // 子目录路径返回链接
+  function returnUlr(url){
+    let enBranch = turnbar(branchName);
+    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
+  }
+  // 点击跳转到子目录
+  function goToSubRoot(path,type,filename){
+    if(type!=="submodule"){
+      let enBranch = branchName || defaultBranch;
+      let checkvalue = turnbar(enBranch);
+      setType(type);
+      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+    }
+  }
+
+  function onEdit(readOnly){
+    setReadOnly(readOnly);
+    setEditReadme(false);
+  }
+  function ChangeFile(path, readOnly){
+    //点击直接跳转页面 加载一次路由
+    let enBranch = branchName || defaultBranch;
+    let checkvalue = turnbar(enBranch);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
+    setType("file");
+    setEditReadme(true);
+  };
+
+  function changeHide(hide){
+    setHide(!hide);
+  }
+
+  function urlLink(link){
+    if(props.checkIfLogin()===false){
+      props.showLoginDialog()
+      return false;
+    }
+    props.history.push(link);
+  }
+
+  const downloadMenu = (
+    <CloneAddress 
+      http_url={projectDetail && projectDetail.clone_url}
+      ssh_url = {projectDetail && projectDetail.ssh_url}
+      zip_url={zip_url}
+      tar_url={tar_url}
+      showNotification={props.showNotification}/>
+  )
+  // 确认修改简介、website、实践课程链接
+  function okUpdate(d,w,l){
+    const url = `/${owner}/${projectsId}.json`;
+    axios.put(url,{
+      description:d,website:w,lesson_url:l
+    }).then(result=>{
+      if(result && result.data && result.data.id){
+        setDesc(result.data.description);
+        setWebsite(result.data.website);
+        setLessonUrl(result.data.lesson_url);
+      }
+    })
+  }
+  let n = fileInfo && fileInfo.name;
+  const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
+
+  const { current_user } = props;
+  const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter";
+  const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
+  return(
+    <WhiteBack>
+      <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
+      <Spin spinning={isSpin}>
+        {
+          (dirInfo || fileInfo) && 
+          <React.Fragment>
+            <DrawerPanel 
+              history={props.history} 
+              owner={owner} 
+              projectsId={projectsId} 
+              name={projectDetail && projectDetail.name}
+              branch={branchName || defaultBranch} 
+              visible={visible} 
+              onClose={()=>setVisible(false)}
+              list = {mainFlag ? dirInfo : undefined}
+            />
+            <div className="drawerBtn" onClick={()=>setVisible(true)}>
+              <i className="iconfont icon-youjiantou font-16"></i>
+              <span>目录</span>
+            </div>
+          </React.Fragment>
+        }
+        <div style={{minHeight:"500px"}}>
+          { 
+            projectDetail &&
+            <Box className="Panels">
+              <LongWidth>
+                <div className="panelmenu">
+                  <FlexAJ>
+                    <AlignCenter>
+                      <div className="mr20">
+                        {
+                          props && props.platform ?
+                          <SelectBranch
+                            repo_id={projectDetail && projectDetail.repo_id}
+                            projectsId={projectsId}
+                            branch={branchName || defaultBranch}
+                            changeBranch={changeBranch}
+                            owner={owner}
+                            history={props.history}
+                            branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
+                          ></SelectBranch>
+                          :
+                          <span>分支：<span className="color-grey-6">{branchName || defaultBranch}</span></span>
+                        }
+                      </div>
+                      <AlignCenter className="mr20">
+                        <Link to={`/projects/${owner}/${projectsId}/branchs`} className="color-grey-9">
+                          <i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>
+                          <span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支
+                        </Link>
+                      </AlignCenter>
+                      <AlignCenter className="mr20">
+                        <Link to={`/projects/${owner}/${projectsId}/tag`} className="color-grey-9">
+                          <i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i>
+                          <span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签
+                        </Link>
+                      </AlignCenter>
+                    </AlignCenter>
+                    <AlignCenter>
+                      {
+                        baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
+                        <div className="mr20 addOptionBtn">
+                          {
+                            projectDetail.type !== 2 && pullsFlag &&
+                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                          }
+                          {
+                            issuesFlag &&
+                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
+                          }
+                        </div>
+                      }
+                      { fileOperate &&
+                        <Dropdown overlay={fileMenu()} className="mr20" trigger={['click']}>
+                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
+                        </Dropdown>
+                      }
+                      
+                      <Dropdown overlay={downloadMenu} placement="bottomRight" trigger={['click']}>
+                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white"></i></Button>
+                      </Dropdown>
+                    </AlignCenter>
+                  </FlexAJ>
+                  {
+                    dirInfo || fileInfo ?
+                    <div className="listtable">
+                      {
+                        lastCommit &&
+                        <div className="listtablehead">
+                          <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
+                          <div className={hideBtn && hide ? "ellipsistxt hidetxt" :"ellipsistxt"}>
+                            <pre id="ptxt">{lastCommit && lastCommit.message}</pre>
+                          </div>
+                          { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
+
+                          <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>
+                          { commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
+                            <i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交
+                          </Link>:"" }
+                        </div>
+                      }
+                      <ul className="listtablebody">
+                        {
+                          treeValuePath && treeValuePath.length > 0 &&
+                          <Path 
+                            identifier={projectDetail && projectDetail.identifier} 
+                            treeValuePath={treeValuePath}
+                            returnUlr={returnUlr}
+                            returnMain={returnMain}
+                            getPathUrl={getPathUrl}
+                          />
+                        }
+                        {
+                          dirInfo && dirInfo.length > 0 &&
+                          dirInfo.map((item,key)=>{
+                            return(
+                              <Catalogue 
+                                owner={owner} 
+                                item={item} 
+                                projectsId={projectsId} 
+                                goToSubRoot={goToSubRoot} 
+                              />
+                            )
+                          })
+                        }
+                        {
+                          fileInfo &&
+                          <CoderRootFileDetail
+                            {...props}
+                            detail={fileInfo}
+                            readOnly={readOnly}
+                            md={mdFlag}
+                            onEdit={onEdit}
+                            currentBranch={branchName || defaultBranch}
+                            type={projectDetail.type}
+                          ></CoderRootFileDetail>
+                        }
+                      </ul>
+                    </div>
+                    : ""
+                  }
+                  {
+                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
+                  } 
+                  {/* readme文件显示(显示文件详情时不显示readme文件) */}
+                  { dirInfo && (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
+                </div>
+              </LongWidth>
+              {
+                !fileInfo && 
+                <ShortWidth>
+                  <Gap style={{paddingLeft:"30px"}}>
+                    <div className="panelmenu">
+                      <FlexAJ className="font-18 color-grey-6 mb20" style={{lineHeight:"28px"}}>简介
+                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>}
+                      </FlexAJ>
+                      {desc && <p className="font-14 color-grey-9 mb15 task-hide-2" style={{lineHeight:"22px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
+                      {
+                        website &&
+                        <p className="color-grey-6 df">
+                          <i className="iconfont icon-lianjie2 font-15 mr10 color-grey-9"></i>
+                          <a href={website} className="color-grey-6" target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
+                        </p>
+                      }
+                      <p>
+                        <i className="iconfont icon-wenjian4 font-15 mr10 color-grey-9"></i>
+                        <a href="#readme" className="color-grey-6">README.md</a>
+                      </p>
+                      <p className="color-grey-6">
+                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-6"></i>
+                        <span>{projectDetail && projectDetail.size}</span>
+                      </p>
+                      {
+                        projectDetail && projectDetail.license_name &&
+                        <p className="color-grey-6">
+                          <i className="iconfont icon-tianping font-16 mr10 color-grey-3"></i>
+                          <span>{projectDetail.license_name}</span>
+                        </p>
+                      }
+                    </div>
+                    {
+                      inviteCode && 
+                      <div>
+                        <Divider />
+                        <Invite code={inviteCode} className={"detailsCode"}/>
+                      </div>
+                    }
+                    {
+                      lesson_url &&
+                      <div>
+                        <Divider />
+                        <p className="font-16 color-grey-6">实践课程</p>
+                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline",wordBreak:"break-all"}}>{lesson_url}</a>
+                      </div>
+                    }
+                    {/* 发布 */}
+                    {
+                      projectDetail && projectDetail.release_versions &&
+                      <React.Fragment>
+                        <Divider />
+                        <Releases 
+                          owner={owner} 
+                          projectsId={projectsId} 
+                          releaseVersions={projectDetail.release_versions} 
+                          history={props.history}
+                          baseOperate={baseOperate}
+                          projectType={projectDetail.type}
+                        />
+                      </React.Fragment>
+                    }
+                    {/* 贡献者 */}
+                    {
+                      projectDetail && projectDetail.contributors &&
+                      <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
+                    }
+                    {/* 语言 */}
+                    { projectDetail && projectDetail.languages && 
+                      <React.Fragment>
+                        <Divider />
+                        <LanguagePower languages={projectDetail.languages}/>
+                      </React.Fragment>
+                    }
+                  </Gap>
+                </ShortWidth>
+              }
+            </Box>
+          }
+        </div>
+      </Spin>
+    </WhiteBack>
+  )
+}
+export default CoderDepot;

src/forge/Main/CoderDepotCatalogue.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { truncateCommitId } from '../common/util';
+
+const typeIco = {
+  "submodule":"icon-file-submodule font-17",
+  "file":'icon-wenjia font-15',
+  "dir":"icon-wenjianjia1 font-15"
+}
+
+function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
+  return(
+    <li>
+      <span>
+        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
+          <i className={`iconfont ${typeIco[`${item.type}`]} color-green-file mr5`}></i>{item.name}
+        </a>
+      </span>
+      <span title="init project">
+        <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
+          {item.commit && item.commit.message}
+        </Link>
+      </span>
+      <span>{item.commit && item.commit.time_from_now}</span>
+    </li>
+  )
+}
+export default CoderDepotCatalogue;

src/forge/Main/CoderDepotPath.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+
+
+function CoderDepotPath({treeValuePath , returnUlr , returnMain , getPathUrl , identifier}){
+  return(
+    <li className="listtablepath">
+      <p>
+        <a
+          onClick={returnMain}
+          className="color-blue"
+        >
+          {identifier}
+        </a>
+        {treeValuePath.map((item, key) => {
+          return (
+            <React.Fragment>
+              {
+                key === treeValuePath.length-1 ?
+                  <span className="color-grey-6 subFileName" key={key}>{item}</span>
+                  :
+                  <a onClick={()=>returnUlr(`${getPathUrl(treeValuePath,key+1)}`)} className="color-blue subFileName">{item}</a>
+              }
+            </React.Fragment>
+          );
+        })}
+      </p>
+    </li>
+  )
+}
+export default CoderDepotPath;

src/forge/Main/CoderDepotReadme.jsx

@@ -0,0 +1,78 @@
+import React, { useEffect, useState } from 'react';
+import RenderHtml from '../../components/render-html';
+import { AlignCenter } from '../Component/layout';
+import { Dropdown , Menu , Spin } from 'antd';
+import { Link } from 'react-router-dom';
+const $ = window.$;
+
+function CoderDepotReadme({ operate , history , readme , ChangeFile }){
+  const [ menuList ,setMenuList ] = useState(undefined);
+  const [ content ,setContent ] = useState(undefined);
+
+  useEffect(()=>{
+    if(readme && readme.content){
+      setContent(readme.content);
+    }else{
+      setContent(undefined);
+    }
+  },[readme])
+
+  useEffect(()=>{
+    let path = history.location.pathname;
+    const items = $.map($("#readme").find("h1,h2,h3,h4,h5,h6"), function (el, _) {
+      const anchor = el.id;
+      const level = el.tagName.replace("H", "");
+      const href = `#${anchor}`;
+      return { href:`${path}${href}`,text:el.textContent , level:level }
+    });
+    setMenuList(items);
+  },[content])
+
+  function menu(){
+    if(menuList && menuList.length > 0){
+      let hash = history.location.hash;
+      return(
+        <Menu className="menuslist">
+          {
+            menuList.map((item,key)=>{
+              return(
+                <Menu.Item key={item.id} className={decodeURI(hash).indexOf(item.text)>-1 ?"active":""}><Link to={`${item.href}`} style={{paddingLeft:`${item.level *10}px`}} title={item.text}>{item.text}</Link></Menu.Item>
+              )
+            })
+          }
+        </Menu>
+      )
+    }else{
+      return <Spin />
+    }
+  }
+  return(
+    <div className="commonBox" id="readme">
+      <div className="commonBox-title boxTitle">
+        <AlignCenter>
+          <Dropdown overlay={menu()}>
+            <span className="catelogue">
+              <i className="iconfont icon-zhangjie1 font-14 mr5"></i>
+              <span>目录</span>
+            </span>
+          </Dropdown>
+          <span className="commonBox-title-read">README.md</span>
+        </AlignCenter>
+        {
+          operate ?
+            <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>
+              <i className="iconfont icon-bianji6 font-16 color-blue"></i>
+            </a>
+          :""
+        }
+      </div>
+      {
+        content && 
+        <div className="commonBox-info">
+          <RenderHtml className="break_word_comments imageLayerParent" value={content} url={history.location}/>
+        </div>
+      }
+    </div>
+  )
+}
+export default CoderDepotReadme;

src/forge/Main/CoderRootBranch.js

@@ -6,12 +6,18 @@ import { getBranch } from '../GetData/getData';
 import Nodata from '../Nodata';
 import './list.css';
 
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 export default ((props)=>{
   const [ data , setData ] =useState(undefined);
   const [ isSpin , setIsSpin ] =useState(true);
 
   const { projectsId , owner } = props.match.params;
-
+  const { isManager , isDeveloper , projectDetail } = props;
   useEffect(()=>{
     getBranchs(projectsId, owner);
   },[projectsId])
@@ -32,7 +38,7 @@ export default ((props)=>{
               return(
                 <li key={key}>
                   <div>
-                    <Link to={`/projects/${owner}/${projectsId}/branch/${item.name}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                     <p className="f-wrap-alignCenter mt15">
                       <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                       <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
@@ -40,7 +46,10 @@ export default ((props)=>{
                     </p>
                   </div>
                   <span>
-                    <Link to={`/projects/${owner}/${projectsId}/pulls/new`} className="mr20 color-blue mr30">创建合并请求</Link>
+                    {
+                      (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
+                      <Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
+                    }
                     <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
                       <a className="ant-dropdown-link">
                         <Tooltip title={`下载分支${item.name}`}><Icon type="cloud-download" className="font-18"/></Tooltip>
@@ -64,6 +73,7 @@ export default ((props)=>{
       <Menu.Item key={'1'}><a href={tar_url}>TAR.GZ</a></Menu.Item>
     </Menu>
   )
+
   return(
     <React.Fragment>
       <div className="main">

src/forge/Main/CoderRootCommit.js

@@ -2,12 +2,19 @@ import React , { Component } from 'react';
 import { Spin , Pagination } from 'antd';
 import { getImageUrl } from 'educoder';
 import { truncateCommitId } from '../common/util';
+import { AlignTop } from '../Component/layout';
 import SelectBranch from '../Branch/Select';
 import Nodata from '../Nodata';
 
 import axios from 'axios';
 import {Link} from "react-router-dom";
 
+function returnbar(str){
+  if(str && str.length>0 && str.indexOf("%2F")>-1){
+    return str.replaceAll('%2F','/');
+  }
+  return str;
+}
 class CoderRootCommit extends Component{
   constructor(props){
     super(props)
@@ -56,11 +63,12 @@ class CoderRootCommit extends Component{
     this.setState({
       isSpining:true
     })
+    console.log(returnbar(branch));
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/commits.json`;
     axios.get(url,{
       params:{
-        sha:branch,
+        sha:returnbar(branch),
         page,
         limit
       }
@@ -74,6 +82,7 @@ class CoderRootCommit extends Component{
           array.push({
             name:item.author && item.author.name,
             login: item.author && item.author.login,
+            id: item.author && item.author.id,
             image_url:item.author && item.author.image_url,
             sha:item.sha,
             time_from_now:item.time_from_now,
@@ -104,10 +113,10 @@ class CoderRootCommit extends Component{
     const { commitDatas , dataCount , limit , page , isSpining , branchList } = this.state;
     const { projectDetail, commit_class , defaultBranch } = this.props;
     const { projectsId , owner , branchName } = this.props.match.params;
-    let branch = branchName || defaultBranch;
+    let branch = returnbar(branchName || defaultBranch);
     return(
       <React.Fragment>
-        <div className={commit_class}>
+        <div className={"main"}style={{padding:"0px",border:"none"}}>
           <div className="f-wrap-between">
             <SelectBranch 
               repo_id={projectDetail && projectDetail.repo_id} 
@@ -131,15 +140,23 @@ class CoderRootCommit extends Component{
                   commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
                     return(
                       <div key={k}>
-                        <p className="f-wrap-alignCenter">
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
-                        </p>
+                        <AlignTop>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
+                        </AlignTop>
                         <p className="f-wrap-alignCenter mt15">
-                          <Link to={`/users/${item.login}`} className="show-user-link">
-                            {item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
-                            <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
-                          </Link>
+                          {
+                            item.id ?
+                            <Link to={`/users/${item.login}`} className="show-user-link">
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                            </Link>:
+                            <span className="show-user-link">
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                            </span>
+                          }
+                          
                         </p> 
                       </div>
                     )

src/forge/Main/CoderRootDirectory.js

@@ -1,517 +0,0 @@
-import React, { Component } from "react";
-import { Menu, Spin } from "antd";
-import { getImageUrl } from "educoder";
-import { Link } from "react-router-dom";
-
-import './list.css';
-import SelectBranch from '../Branch/Select';
-import CloneAddress from '../Branch/CloneAddress';
-import RootTable from './RootTable';
-import CoderRootFileDetail from './CoderRootFileDetail';
-import { truncateCommitId } from '../common/util';
-import RenderHtml from '../../components/render-html';
-import Nodata from '../Nodata';
-import { getBranch } from '../GetData/getData';
-
-import axios from "axios";
-/**
- * address:http和SSH，http_url(对应git地址)
- * filePath:点击目录时当前目录的路径
- * subfileType:保存当前点击目录的文件类型（显示目录列表时才显示新建文件，如果点击的是文件就不显示新建文件按钮）
- * readMeContent:根目录下面的readme文件内容
- */
-function getPathUrl(array,index){
-  if(array && array.length>0 && index){
-    let str = "";
-    for(let i=0;i<index;i++){
-      str += `/${array[i]}`;
-    }
-    return str.substr(1);
-  }
-}
-class CoderRootDirectory extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      address: "http",
-      filePath: undefined,
-      subFileType: undefined,
-      readMeContent: undefined,
-      readMeFile: undefined,
-
-      isSpin: true,
-
-      branchList: undefined,
-      fileDetail: undefined,
-      branchLastCommit: undefined,
-      lastCommitAuthor: undefined,
-
-      rootList: undefined,
-      readOnly: true,
-      zip_url:undefined,
-      tar_url:undefined,
-      chooseType:undefined,
-
-      md:false,
-      treeValue:undefined
-    }
-  }
-  changeAddress = (address) => {
-    this.setState({
-      address,
-    });
-  };
-
-  componentDidMount = () => {
-    this.Init();
-    this.getBranchs();
-  };
-  // 获取分支列表
-  getBranchs=()=>{
-    const { projectsId , owner } = this.props.match.params;
-    axios.get(`/${owner}/${projectsId}/branches.json`).then(result=>{
-      this.setState({
-        branchList:result.data
-      })
-    }).catch((error)=>{})
-  }
-
-  componentDidUpdate = (prevState) => {
-    const { location } = this.props;
-    const prevlocation = prevState && prevState.location;
-    if (location !== prevlocation) {
-      this.setState({
-        isSpin: true,
-      });
-      this.Init();
-    }
-  };
-
-  Init = () => {
-    let { pathname } = this.props.history.location;
-    const { branchName , owner , projectsId } = this.props.match.params;
-    const { defaultBranch } = this.props;
-    let branch = branchName || defaultBranch;
-    if (pathname && (pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1)) {
-      let url = pathname.split(`/tree/${branchName}/`)[1];
-      this.setState({treeValue:url})
-      this.getFileDetail(decodeURI(url),branch);
-    } else {
-      this.getProjectRoot(branch);
-    }
-  };
-
-  // 页面地址返回到主目录
-  returnMain = (branch) => {
-    const { projectsId , owner , branchName } = this.props.match.params;
-    this.setState({
-      readOnly:true,
-      treeValue:undefined
-    })
-    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/tree/${branchName}`:""}`);
-    this.getProjectRoot(branch);
-  };
-
-  // 获取根目录
-  getProjectRoot = (branch) => {
-    const { projectsId , owner } = this.props.match.params;
-    const url = `/${owner}/${projectsId}/entries.json`;
-    axios.get(url, { params: { ref: branch } })
-    .then((result) => {
-      if (result) {
-        let last_commit = result.data && result.data.last_commit;
-        let entries = result.data && result.data.entries;
-        this.setState({
-          filePath: undefined,
-          fileDetail: [],
-          isSpin: false,
-          branchLastCommit: last_commit && last_commit.commit,
-          lastCommitAuthor:
-            last_commit && (last_commit.author || (last_commit.commit && last_commit.commit.author)),
-          zip_url: result.data.zip_url,
-          tar_url: result.data.tar_url
-        });
-        if (entries && entries.length > 0) {
-          this.renderData(entries);
-        }
-        this.setState({
-          rootList: entries,
-          subFileType: true,
-        });
-      }
-    }).catch((error) => {});
-  };
-
-  ChangeFile = (arr, readOnly) => {
-    const { projectsId , owner } = this.props.match.params;
-    //点击直接跳转页面 加载一次路由
-    this.props.history.push(`/projects/${owner}/${projectsId}/tree/${arr.path}`);
-    this.setState({
-      readOnly: readOnly,
-      chooseType:"file"
-    });
-  };
-
-  // 获取子目录
-  getFileDetail = (path, ref) => {
-    this.setState({
-      filePath: decodeURI(path),
-    });
-    const { projectsId , owner , branchName } = this.props.match.params;
-    const { chooseType } = this.state;
-    const url = `/${owner}/${projectsId}/sub_entries.json`;
-    axios.get(url,{
-      params:{
-        filepath:path,
-        ref:ref || branchName,
-        type:chooseType
-      }
-    }).then((result)=>{
-      let entries = result.data && result.data.entries;
-      this.setState({
-        isSpin:false
-      })
-      if(result){
-        if(entries){
-          // 返回对象entries.type则是文件类型，否则是文件夹
-          if(entries.type){
-            this.setState({
-              fileDetail:[entries],
-              rootList:[],
-              subFileType:false
-            })
-          }else{
-            this.setState({
-              fileDetail:[],
-              rootList:entries,
-              branchLastCommit:result.data.last_commit && result.data.last_commit.commit,
-              lastCommitAuthor:result.data.last_commit && (result.data.last_commit.author || (result.data.last_commit.commit && result.data.last_commit.commit.author))
-            })
-            this.renderData(entries);
-          }
-        }else{
-          this.setState({
-            fileDetail:[],
-            rootList:[],
-            isSpin:false,
-            subFileType:false
-          })
-        }
-      }
-    })
-    .catch((error) => {
-      this.setState({
-        isSpin:false
-      })
-      console.log(error);
-    });
-  };
-
-  renderData = (data) => {
-    const rootList = [];
-    const readMeContent = [];
-    const readMeFile = [];
-    data && data.map((item, key) => {
-      rootList.push({
-        key,
-        message: item.commit && item.commit.message,
-        ...item,
-      });
-      if (item.is_readme_file) {
-        readMeContent.push({ ...item });
-        readMeFile.push({ ...item });
-      }
-    });
-    this.setState({
-      rootList: rootList,
-      readMeContent,
-      readMeFile,
-    });
-  };
-
-  // 点击跳转到子目录
-  goToSubRoot=(path,type,filename)=>{
-    this.setState({
-      chooseType:type
-    })
-    const { projectsId, owner , branchName } = this.props.match.params;
-    const { defaultBranch } = this.props;
-    this.props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || defaultBranch}`}${path?`/${path}`:""}`);
-    if(filename.substring(filename.length - 3) === ".md"){
-      this.setState({
-        md:true
-      })
-    }else{
-      this.setState({
-        md:false
-      })
-    }
-  };
-
-  // readme文件内容
-  renderReadMeContent = (readMeContent, permission) => {
-    const { fileDetail, readMeFile } = this.state;
-    if (fileDetail && fileDetail.length !== 0) {
-      return;
-    }
-    if (readMeContent && readMeContent.length > 0) {
-      return (
-        <div className="commonBox">
-          <div className="commonBox-title">
-            <span className="mr10">
-              <i className="iconfont icon-wenjian1 font-16 color-grey-9 fl mt3"></i>
-            </span>
-            <span className="commonBox-title-read">
-              {readMeContent[0].name}
-            </span>
-            {permission ?
-              <a
-                onClick={() => this.ChangeFile(readMeFile[0], false)}
-                className="ml20 pull-right"
-              >
-                <i className="iconfont icon-bianji6 font-16 color-blue"></i>
-              </a>
-            :
-              ""
-            }
-          </div>
-          <div className="commonBox-info">
-            {readMeContent[0].content ?
-              <RenderHtml className="break_word_comments imageLayerParent" value={readMeContent[0].content} url={this.props.history.location}/>
-            :
-              <span>暂无~</span>
-            }
-          </div>
-        </div>
-      );
-    }
-  };
-
-  // 选择分支
-  changeBranch = (value) => {
-    const { projectsId , owner } = this.props.match.params;
-    const { treeValue } = this.state;
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
-    this.props.history.push(url);
-  }
-
-  // 子目录路径返回链接
-  returnUlr=(url)=>{
-    this.setState({
-      chooseType:"dir",
-      readOnly:true,
-      treeValue:url
-    })
-    const { projectsId , owner , branchName } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}/tree/${url}`);
-  }
-
-  onEdit=(readOnly)=>{
-    this.setState({
-      readOnly
-    })
-  }
-
-  downloadUrl = (zip_url,tar_url) => {
-    return(
-      <Menu>
-        {zip_url && (
-          <Menu.Item>
-            <a href={zip_url}>ZIP</a>
-          </Menu.Item>
-        )}
-        {tar_url && (
-          <Menu.Item>
-            <a href={tar_url}>TAR.GZ</a>
-          </Menu.Item>
-        )}
-      </Menu>
-    )
-  }
-
-  title = (branchLastCommit,lastCommitAuthor) => {
-    if (branchLastCommit) {
-      const { projectsId , owner } = this.props.match.params;
-      return (
-        <div className="f-wrap-alignCenter">
-          {lastCommitAuthor ? (
-            <React.Fragment>
-              {lastCommitAuthor.login ? (
-                <Link
-                  to={`/users/${lastCommitAuthor.login}/projects`}
-                  className="show-user-link"
-                >
-                  <img
-                    src={getImageUrl(`images/${lastCommitAuthor.image_url}`)}
-                    className="radius mr10"
-                    width="32"
-                    height="32"
-                    alt=""
-                  />
-                  <span className="mr15">{lastCommitAuthor.name}</span>
-                </Link>
-              ) : (
-                <span className="mr15">{lastCommitAuthor.name}</span>
-              )}
-            </React.Fragment>
-          ) : (
-            ""
-          )}
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${branchLastCommit.sha}`)}`} className="color-blue flex-1 hide-1">
-            {branchLastCommit.message}
-          </Link>
-          <span>{branchLastCommit.time_from_now}</span>
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${branchLastCommit.sha}`)}`} className="commitKey">
-            {truncateCommitId(branchLastCommit.sha)}
-          </Link>
-        </div>
-      );
-    }else{
-      return false;
-    }
-  }
-
-  
-  render(){
-    const { branchLastCommit , lastCommitAuthor , rootList ,filePath , fileDetail , subFileType , readMeContent, isSpin , zip_url , tar_url , branchList} = this.state;
-    const { isManager , isDeveloper , projectDetail , platform , defaultBranch } = this.props;
-
-    const { projectsId , owner , branchName } = this.props.match.params;
-    let branch = branchName || defaultBranch;
-    
-    const columns = [
-      {
-        key:"name",
-        dataIndex: 'name',
-        width:"30%",
-        render: (text,item) => (
-          <a onClick={()=>this.goToSubRoot(item.path,item.type,text)} className="ml12 task-hide" style={{ display: "block", maxWidth: "345px" }}>
-            <i className={ item.type === "file" ? "iconfont icon-wenjia font-15 color-green-file mr5" : "iconfont icon-wenjianjia1 color-green-file font-15 mr5"}></i>{text}
-          </a>
-        ),
-      },
-      {
-        key:"message",
-        dataIndex: "message",
-        width: "60%",
-        render: (text, item) =>
-          item.commit && item.commit.message ? 
-            <Link  to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit.sha}`)}`} title={item.commit.message} className="task-hide" style={{ display: "block", maxWidth: "670px" }} >
-              {item.commit.message}
-            </Link>
-          : ""
-      },
-      {
-        key:"time_from_now",
-        dataIndex: "time_from_now",
-        width: "10%",
-        className: "edu-txt-right",
-        render: (text, item) =>
-          item.commit && item.commit.time_from_now ? 
-            <a title={item.commit.created_at} className="mr12" style={{ cursor: "default", color: "#888" }} >
-              {item.commit.time_from_now}
-            </a>
-          :""
-      },
-    ];
-    const urlRoot = filePath === undefined ? "" : `/${filePath}`;
-    let array = filePath && filePath.split("/");
-    return (
-      <Spin spinning={isSpin}>
-        <div className="main" style={{minHeight:'400px'}}>
-          <div className="f-wrap-between mb20">
-            <div className="f-wrap-alignCenter">
-              {
-                platform ?
-                <SelectBranch
-                  repo_id={projectDetail && projectDetail.repo_id}
-                  projectsId={projectsId}
-                  branch={branch}
-                  changeBranch={this.changeBranch}
-                  owner={owner}
-                  history={this.props.history}
-                  branchList={branchList}
-                ></SelectBranch>
-                :
-                <span>分支：<span className="color-grey-6">master</span></span>
-              }
-
-              {filePath && (
-                <span className="ml20 font-16">
-                  <a
-                    onClick={() => this.returnMain(branch)}
-                    className="color-blue"
-                  >
-                    {projectDetail && projectDetail.identifier}
-                  </a>
-                  {array &&
-                    array.map((item, key) => {
-                      return (
-                        <React.Fragment>
-                          {
-                            key === array.length-1 ?
-                              <span className="color-grey-6 subFileName" key={key}>{item}</span>
-                              :
-                              <a onClick={()=>this.returnUlr(`${getPathUrl(array,key+1)}`)} className="color-blue subFileName">{item}</a>
-                          }
-                        </React.Fragment>
-                      );
-                    })}
-                </span>
-              )}
-            </div>
-            <div className="f-wrap-alignCenter">
-              {subFileType && (projectDetail && parseInt(projectDetail.type)) !== 2 && (isManager || isDeveloper) && platform && (
-                <div>
-                  <span>
-                    <Link to={`/projects/${owner}/${projectsId}/${branch}/uploadfile${urlRoot}`} >
-                      <span className="color-green mr30">上传文件</span>
-                    </Link>
-                  </span>
-                  <span className="mr30">
-                    <Link
-                      to={`/projects/${owner}/${projectsId}/${branch}/newfile${urlRoot}`}
-                    >
-                      <span className="color-blue">新建文件</span>
-                    </Link>
-                  </span>
-                </div>
-              )}
-              {projectDetail && projectDetail.clone_url && (
-                <CloneAddress
-                  http_url={projectDetail.clone_url}
-                  downloadUrl={this.downloadUrl(zip_url,tar_url)}
-                  showNotification={this.props.showNotification}
-                ></CloneAddress>
-              )}
-            </div>
-          </div>
-          {/* 主目录列表 */}
-          {rootList && rootList.length > 0 && (
-            <RootTable
-              columns={columns}
-              data={rootList}
-              title={() => this.title(branchLastCommit,lastCommitAuthor)}
-            ></RootTable>
-          )}
-          {/* 子目录列表、文件 */}
-          {fileDetail && fileDetail.length > 0 && (
-            <CoderRootFileDetail
-              detail={fileDetail[0]}
-              {...this.props}
-              {...this.state}
-              readOnly={this.state.readOnly}
-              onEdit={this.onEdit}
-              currentBranch={branch}
-            ></CoderRootFileDetail>
-          )}
-          {
-            (rootList && rootList.length === 0) && (fileDetail && fileDetail.length === 0) && <Nodata _html="暂未发现文件！"/>
-          }
-          { rootList && this.renderReadMeContent(readMeContent, isManager || isDeveloper)}
-      </div>
-    </Spin>
-    );
-  }
-}
-export default CoderRootDirectory;

src/forge/Main/CoderRootFileDetail.js

@@ -24,13 +24,25 @@ class CoderRootFileDetail extends Component {
   }
 
   componentDidMount = () => {
-    const { detail } = this.props;
+    const { detail , mdFlag } = this.props;
     this.setState({
       value: detail.content,
     });
     this.languages_total();
   };
 
+  componentDidUpdate=(prevProps)=>{
+    const { content } = this.props && this.props.detail;
+    const prevcontent = prevProps.detail && prevProps.detail.content;
+    if (content && prevcontent) {
+      if (prevcontent !== content){
+        this.setState({
+          description: content
+        });
+      }
+    }
+  }
+
   languages_total = () => {
     const { detail } = this.props;
     const file_name = detail.path.split("/").pop().split(".").pop();
@@ -164,15 +176,16 @@ class CoderRootFileDetail extends Component {
       current_user,
       isManager,
       isDeveloper,
-      md,
       currentBranch,
-      platform
+      platform,
+      md,
+      type
     } = this.props;
     const { language, languages, description } = this.state;
     let flag = current_user && current_user.login && (isManager || isDeveloper);
     const Option = Select.Option;
     return (
-      <div className="mb20">
+      <React.Fragment>
         <div className="grid-item branchTitle">
           <div className="grid-item">
             <span className="ml20 color-grey-6 font-16">
@@ -185,17 +198,18 @@ class CoderRootFileDetail extends Component {
                 {readOnly ? (
                   <span>
                     {
-                      detail.direct_download ?
-                        ""
-                        :
+                      !detail.direct_download?
                         <span>
                           <a onClick={() => this.DownLoadFile(detail.download_url)} className="ml20">
                             <i className="iconfont icon-xiazai1 font-15 color-grey-6"></i>
                           </a>
-                          <a onClick={() => this.EditFile(false)} className="ml20">
-                            <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
-                          </a>
-                        </span>
+                          {
+                            type !==2  &&
+                            <a onClick={() => this.EditFile(false)} className="ml20">
+                              <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+                            </a>
+                          }
+                        </span>:""
                     }
                   </span>
                 ) : (
@@ -226,18 +240,21 @@ class CoderRootFileDetail extends Component {
                       </button>
                     </React.Fragment>
                   )}
-
-                <Popconfirm
-                  title="确认删除这个文件？"
-                  className="ml20"
-                  okText="确定"
-                  cancelText="取消"
-                  onConfirm={this.deleteFile}
-                >
-                  <a>
-                    <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
-                  </a>
-                </Popconfirm>
+                {
+                  type !==2 &&
+                  <Popconfirm
+                    title="确认删除这个文件？"
+                    className="ml20"
+                    okText="确定"
+                    cancelText="取消"
+                    onConfirm={this.deleteFile}
+                  >
+                    <a>
+                      <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
+                    </a>
+                  </Popconfirm>
+                }
+                
               </div>
             )}
           </p>
@@ -245,11 +262,7 @@ class CoderRootFileDetail extends Component {
         <div>
           {detail.image_type ? (
             <div className="edu-txt-center pt20 pb20">
-              <img
-                alt=""
-                src={detail.download_url}
-                style={{ maxWidth: "80%" }}
-              />
+              <img alt="" src={detail.download_url} style={{ maxWidth: "80%" }} />
             </div>
           ) : detail.direct_download ? (
             <div className="mt20 text-center">
@@ -268,14 +281,15 @@ class CoderRootFileDetail extends Component {
                 {...this.state}
                 language={language ? language : "javascript"}
                 filepath={`/${detail.path}`}
-                content={detail.content}
+                content={description}
                 readOnly={readOnly}
                 editorType="update"
                 currentBranch={currentBranch}
+                descName={detail && `Update ${detail.name}`}
               ></Meditor>
             )}
         </div>
-      </div>
+      </React.Fragment>
     );
   }
 }

src/forge/Main/CoderRootIndex.js

@@ -13,10 +13,6 @@ const UploadFile = Loadable({
   loader: () => import('../Newfile/upload_file'),
   loading: Loading,
 })
-const CoderRootDirectory = Loadable({
-	loader: () => import('./CoderRootDirectory'),
-	loading: Loading,
-})
 const CoderRootCommit = Loadable({
 	loader: () => import('./CoderRootCommit'),
 	loading: Loading,
@@ -71,6 +67,7 @@ class CoderRootIndex extends Component{
     this.getTopCount(branchName || defaultBranch);
   }
 
+  // 获取<Top />组件里要显示的数据
   getTopCount=(branch)=>{
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/top_counts.json`;
@@ -105,11 +102,9 @@ class CoderRootIndex extends Component{
               (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
             }
           ></Route>
-
-          {/* diff */}
           <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
             render={
-              (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
+              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
           <Route path="/projects/:owner/:projectsId/commits/:sha"
@@ -122,7 +117,6 @@ class CoderRootIndex extends Component{
               () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
-
           <Route path="/projects/:owner/:projectsId/releases/:versionId/update"
             render={
               (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
@@ -133,33 +127,21 @@ class CoderRootIndex extends Component{
               () => (<CoderRootVersionNew {...this.props} {...this.state} />)
             }
           ></Route>
-
           <Route path="/projects/:owner/:projectsId/releases"
             render={
               () => (<CoderRootVersion {...this.props} {...this.state} />)
             }
           ></Route>
-
           <Route path="/projects/:owner/:projectsId/tag"
             render={
               () => (<CoderRootTag {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/tree/:branchName"
-            render={
-              (props) => (<CoderRootDirectory {...this.props} {...this.state} getTopCount={this.getTopCount} />)
-            }
-          ></Route>
           <Route path="/projects/:owner/:projectsId/branchs"
             render={
               () => (<CoderRootBranch {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId"
-            render={
-              () => (<CoderRootDirectory {...this.props} {...this.state} getTopCount={this.getTopCount} />)
-            }
-          ></Route>
         </Switch>
       </div>
     )

src/forge/Main/CoderRootTag.js

@@ -26,7 +26,7 @@ export default (( props, { projectDetail }) => {
   }, [owner, projectsId]);
 
   return (
-    <div className="main">
+    <div className="main" style={{padding:"0px",border:"none"}}>
       <Spin spinning={isSpin}>
         <div style={{minHeight:"400px"}}>
           {

src/forge/Main/Detail.js

@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip } from 'antd';
+import { Spin, Tooltip , Button } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content } from '../Component/layout';
+import { Content , AlignTop } from '../Component/layout';
+import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
 import './list.css';
-import SpecialModal from './SpecialModal';
 
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
@@ -97,7 +97,19 @@ const ForkUsers = Loadable({
   loader: () => import('../UsersList/fork_users'),
   loading: Loading,
 })
+const Contribute = Loadable({
+  loader: () => import('./sub/Contribute'),
+  loading: Loading,
+})
 
+const CoderRootCommit = Loadable({
+	loader: () => import('./CoderRootCommit'),
+	loading: Loading,
+})
+const CoderDepot = Loadable({
+	loader: () => import('./CoderDepot'),
+	loading: Loading,
+})
 
 const TrendsIndex = Loadable({
   loader: () => import('../Activity/Activity'),
@@ -108,6 +120,10 @@ const DevAbout = Loadable({
   loader: () => import('../About/Index'),
   loading: Loading,
 })
+const Source = Loadable({
+  loader: () => import('../Source/Index'),
+  loading: Loading,
+})
 const DevIndex = Loadable({
   loader: () => import('../DevOps/Index'),
   loading: Loading,
@@ -133,6 +149,8 @@ function checkPathname(projectsId,owner,pathname){
       name="setting"
     }else if(url.indexOf(`/devops`)>-1){
       name="devops"
+    }else if(url.indexOf(`/source`)>-1){
+      name="source"
     }
   }
   return name;
@@ -152,20 +170,18 @@ class Detail extends Component {
       watched: false,
       praised: false,
       http_url: undefined,
-      author: undefined,
       branchs: undefined,
       branchList: undefined,
       project: null,
       firstSync:false,
       secondSync:false,
       open_devops:false,
+      forkSpin:false,
       // 默认分支
       defaultBranch:undefined,
 
       // 非本平台项目
-      platform:false,
-      visible:false,
-      user_apply_signatures:[]
+      platform:false
     }
   }
 
@@ -182,7 +198,6 @@ class Detail extends Component {
   }
 
   getProject = (num) => {
-    const {user} = this.props;
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/simple.json`;
     axios.get(url).then((result) => {
@@ -192,24 +207,6 @@ class Detail extends Component {
           open_devops:result.data.open_devops,
           platform:result.data.platform && result.data.platform !== 'educoder'
         })
-        let signa = result.data.user_apply_signatures && result.data.user_apply_signatures[0];
-        if(result.data.is_secret && !result.data.is_member && (!signa || (signa && signa.status !== "passed")) && user.login !== owner){
-          this.setState({
-            visible:true,
-            is_secret:result.data.is_secret,
-            user_apply_signatures:signa
-          })
-        }
-
-        // 工作流：两种状态进入的链接不同
-        const pathname = this.props.history.location.pathname;
-        if(pathname===`/projects/${owner}/${projectsId}/devops`){
-          if(result.data.open_devops && pathname === `/projects/${owner}/${projectsId}/devops`){
-            this.props.history.push(`/projects/${owner}/${projectsId}/devops/list`);
-          }else if(result.data.open_devops===false && pathname !== `/projects/${owner}/${projectsId}/devops`){
-            this.props.history.push(`/projects/${owner}/${projectsId}/devops`);
-          }
-        }
 
         if (result.data.type !== 0 && result.data.mirror_status === 1) {
           console.log("--------start channel --------");
@@ -268,7 +265,8 @@ class Detail extends Component {
 
   getDetail = () => {
     const { projectsId , owner } = this.props.match.params;
-    const url = `/${owner}/${projectsId}.json`;
+    this.getBanner();
+    const url = `/${owner}/${projectsId}/detail.json`;
     axios.get(url).then((result) => {
       if (result && result.data) {
         this.setState({
@@ -278,7 +276,6 @@ class Detail extends Component {
           isReporter: result.data.permission && result.data.permission === "Reporter",
           isDeveloper: result.data.permission && result.data.permission === "Developer",
           http_url: result.data.clone_url,
-          author: result.data.author,
           praised: result.data.praised,
           watched: result.data.watched,
           watchers_count: result.data.watchers_count,
@@ -290,6 +287,19 @@ class Detail extends Component {
     }).catch((error) => { })
   }
 
+  // 获取动态导航栏菜单
+  getBanner(){
+    const { projectsId , owner } = this.props.match.params;
+    const url = `/${owner}/${projectsId}/menu_list.json`;
+    axios.get(url).then(result=>{
+      if(result){
+        this.setState({
+          bannerList:result.data
+        })
+      }
+    }).catch(error=>{})
+  }
+
   // 关注和取消关注
   focusFunc = (flag) => {
     const { platform } = this.state;
@@ -349,6 +359,9 @@ class Detail extends Component {
   forkFunc = () => {
     const { platform } = this.state;
     if(!platform)return;
+    this.setState({
+      forkSpin:true
+    })
     const { current_user } = this.props
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/forks.json`;
@@ -357,8 +370,13 @@ class Detail extends Component {
         this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
         this.props.showNotification(result.data.message);
       }
+      this.setState({
+        forkSpin:false
+      })
     }).catch(error => {
-      console.log(error);
+      this.setState({
+        forkSpin:false
+      })
     })
   }
 
@@ -380,43 +398,33 @@ class Detail extends Component {
     })
   }
 
-  hideModal=()=>{
-    this.setState({
-      visible:false
-    })
+  textFunc = (forked_from_project_id,fork_info)=>{
+    let type = fork_info && fork_info.fork_project_user_type;
+    return forked_from_project_id && fork_info ?
+      <div className="color-grey-9 df">
+        <span>复刻自</span>
+        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
+        <span> / </span>
+        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{maxWidth:"400px"}} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
+      </div> : ""
   }
-
-  sureModal=()=>{
-    this.hideModal();
-    this.props.history.push('/projects');
-  }
-
   
 
   render() {
     const { projectDetail, watchers_count, praises_count, 
       forked_count, firstSync , secondSync , 
       isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch , project_id , user_apply_signatures , visible } = this.state;
+      project , open_devops , platform , defaultBranch , bannerList , forkSpin } = this.state;
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
 
     const { projectsId , owner } = this.props.match.params;
+    const { current_user } = this.props;
     let pathname = checkPathname(projectsId,owner,url);
 
     const { state } = this.props.history.location;
     
-    const text = (
-      projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-        <React.Fragment>
-          <span>forked from </span>
-          <Link to={`/users/${projectDetail.fork_info.fork_project_user_login}`} className="show-user-link color-grey-ccc">{projectDetail.fork_info.fork_project_user_name}</Link>
-          <span> / </span>
-          <Link to={`/projects/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}`} className="color-grey-ccc">{projectDetail.fork_info.fork_form_name}</Link>
-        </React.Fragment> : ""
-    );
-    
     const common = {
       getDetail: this.getDetail,
       changeOpenDevops:this.changeOpenDevops,
@@ -424,172 +432,125 @@ class Detail extends Component {
     }
     return (
       <div>
-         <SpecialModal {...this.props} visible={visible} hideModal={this.sureModal} user_apply_signatures={user_apply_signatures} project_id={project_id} sureModal={this.sureModal}></SpecialModal>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <div className="f-wrap-between pb15" style={{ position: "relative" }}>
-              <p className="color-white font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
-                {project && project.author &&
-                  <Link to={`/users/${project.author.login}`} className="show-user-link color-white">
-                    {project.author.name}
-                  </Link>
-                }
-                <span className="ml5 mr5">/</span>
-                <span className="hide-1 flex-1 df">
-                  <Link to={`/projects/${owner}/${projectsId}`} className="color-white font-22">{project && project.name}</Link>
+            <AlignTop style={{padding:"20px 0px 10px",justifyContent:"space-between"}}>
+              <div>
+                <AlignTop>
+                  <div className="projectallName">
+                    {project && project.author &&
+                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
+                    }
+                    <span className="ml5 mr5">/</span>
+                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
+                  </div>
+                  { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
+                </AlignTop>
+                <div className="mt8">
                   {
                     projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                      <Tooltip placement={'right'} title={text}>
-                        <Link to={`/projects/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}`}
-                          className="ml10" >
-                          <i className="iconfont icon-fork font-18 fl mt6" style={{ color: "#8D90E3" }}></i>
-                        </Link>
-                      </Tooltip> : ""
+                    this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
+                    :""
                   }
                   {
                     projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
-                    projectDetail.type === 2 ?
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-banbenku font-18 mt6" style={{ color: "#8D90E3" }}/>
-                    </Tooltip>
-                    :
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-jingxiang font-18 color-green mt6" />
-                    </Tooltip>
+                    <span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
                     :""
                   }
-                </span>
-              </p>
-              {
-                firstSync ? "":
-                <span className="df mt25">
-                  {
-                    projectDetail && projectDetail.type && projectDetail.type === 2 ?
+                </div>
+              </div>
+              <div>
+                {
+                  firstSync ? "":
+                  <span className="df">
+                    {
+                      ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
                       <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
-                  }
-                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
-                      <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
-                      <span>{watched ? '取消关注' : '关注'}</span>
-                    </a>
-                    {
-                      platform ?
-                      <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
-                        {watchers_count}
-                      </Link>
-                      :
-                      <span className="detail_tag_btn_count">{watchers_count}</span>
                     }
-                   
+                    <Button className="detail_tag_btn">
+                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
+                        <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
+                        <span>{watched ? '取消关注' : '关注'}</span>
+                      </a>
+                      {
+                        watchers_count > 0 ?
+                        platform ?
+                        <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
+                          {watchers_count}
+                        </Link>
+                        :
+                        <span className="detail_tag_btn_count">{watchers_count}</span>
+                        :""
+                      }
+                    </Button>
+                    <Button className="detail_tag_btn">
+                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
+                        <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                        <span>{praised ? '取消点赞' : '点赞'}</span>
+                      </a>
+                      {
+                        praises_count > 0 ?
+                        platform ?
+                        <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
+                          {praises_count}
+                        </Link>:
+                        <span className="detail_tag_btn_count">{praises_count}</span>
+                        :""
+                      }
+                    </Button>
+                    <Button className="detail_tag_btn" loading={forkSpin}>
+                      <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
+                        <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
+                          <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
+                        </a>
+                      </Tooltip>
+                      {
+                        forked_count > 0 ?
+                        platform ?
+                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
+                          {forked_count}
+                        </Link>
+                        :
+                        <span className="detail_tag_btn_count">{forked_count}</span>
+                        :""
+                      }
+                    </Button>
                   </span>
-                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
-                      <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
-                      <span>{praised ? '取消点赞' : '点赞'}</span>
-                    </a>
-                    {
-                      platform ?
-                      <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
-                        {praises_count}
-                      </Link>:
-                      <span className="detail_tag_btn_count">{praises_count}</span>
-                    }
-                  </span>
-                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                      <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻 (Fork)
-                    </a>
-                    {
-                      platform ?
-                      <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
-                        {forked_count}
-                      </Link>
-                      :
-                      <span className="detail_tag_btn_count">{praises_count}</span>
-                    }
-                  </span>
-                </span>
-              }
-            </div>
+                }
+              </div>
+            </AlignTop>
             {
               firstSync ? "" :
-              <div className="f-wrap-between pb20">
-                <ul className="headerMenu-wrapper">
-                  <li className={pathname==="about" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
-                      <i className={ pathname === "about" ? "iconfont icon-zhuye1 color-blue mr5 font-14":"iconfont icon-zhuye1 color-white font-14 mr5"}></i>
-                      <span>主页</span>
-                      </Link>
-                  </li>
-                  <li className={(pathname==="" || urlFlag) ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
-                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-blue mr5 font-14":"iconfont icon-daimaku color-white font-14 mr5"}></i>
-                      <span>代码库</span>
-                      </Link>
-                  </li>
-                  <li className={pathname==="issues" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                      <i className={pathname==="issues" ? "iconfont icon-renwu color-blue mr5 font-14":"iconfont icon-renwu color-white font-14 mr5"}></i>
-                      <span>易修 (Issue)</span>
-                      {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
-                    </Link>
-                  </li>
-                  {
-                    projectDetail && parseInt(projectDetail.type) !== 2 && platform &&
-                    <li className={pathname==="pulls" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
-                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-blue mr5 font-14":"iconfont icon-hebingqingqiu1 color-white font-14 mr5"}></i>
-                        <span>合并请求</span>
-                        {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
-                      </Link>
-                    </li>
-                  }
-                  {/* {
-                     platform &&
-                     <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/list`:""}`, state }}>
-                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
-                        {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
-                      </Link>
-                    </li>
-                  } */}
-                  
-                  <li className={pathname==="milestones" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
-                        <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-blue mr5 font-14":"iconfont icon-lichengbei color-white font-14 mr5"}></i>
-                        <span>里程碑</span>
-                        {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
-                    </Link>
-                  </li>
-                  <li className={pathname==="activity" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
-                      <i className={pathname==="activity" ? "iconfont icon-tongzhi color-blue mr5 font-14":"iconfont icon-tongzhi color-white font-14 mr5"}></i>
-                      <span>动态</span>
-                    </Link>
-                  </li>
-                  {
-                    isManager && platform &&
-                    <li className={url.indexOf("/setting") > 0 ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-blue mr5 font-14":"iconfont icon-cangku color-white font-14 mr5"}></i>
-                        <span>仓库设置</span>
-                      </Link>
-                    </li>
-                  }
-                </ul>
-              </div>
+              <DetailBanner 
+                history={this.props.history}
+                list={bannerList}
+                owner={owner}
+                projectsId={projectsId}
+                pathname={pathname}
+                state={state}
+                projectDetail={projectDetail}
+                open_devops={open_devops}
+                platform={platform}
+                urlFlag={urlFlag}
+                isManager={isManager}
+              />
             }
           </div>
         </div>
         {
           firstSync ?
           <Content className="spincontent">
-            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large">
-            </Spin>
+            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
           </Content>
           :
           <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
             <Switch {...this.props}>
+              {/* 资源 */}
+              <Route path="/projects/:owner/:projectsId/source"
+                render={
+                  () => (<Source {...this.props} {...this.state} {...common} />)
+                }
+              ></Route>
               {/* 主页 */}
               <Route path="/projects/:owner/:projectsId/about"
                 render={
@@ -680,6 +641,12 @@ class Detail extends Component {
                   (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
                 }
               ></Route>
+              {/* 新建合并请求 */}
+              <Route path="/projects/:owner/:projectsId/pulls/new/:branch"
+                render={
+                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                }
+              ></Route>
               <Route path="/projects/:owner/:projectsId/pulls/new"
                 render={
                   (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
@@ -706,11 +673,6 @@ class Detail extends Component {
                   (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
                 }
               ></Route>
-              <Route path="/projects/:owner/:projectsId/coders/filesurl"
-                render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
               <Route path="/projects/:owner/:projectsId/watchers"
                 render={
                   (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
@@ -726,19 +688,32 @@ class Detail extends Component {
                   (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
                 }
               ></Route>
+              {/* 贡献者列表 */}
+              <Route path="/projects/:owner/:projectsId/contribute"
+                render={
+                  () => (<Contribute {...this.props} {...this.state} {...common} />)
+                }
+              ></Route>
+
+              {/* 代码库----详情页面 */}
               <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
                 render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
                 }
               ></Route>
               <Route path="/projects/:owner/:projectsId/tree/:branchName"
                 render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/:subIndex"
+                render={
+                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common}/>)
                 }
               ></Route>
               <Route path="/projects/:owner/:projectsId"
                 render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
                 }
               ></Route>
             </Switch>

src/forge/Main/Diff.jsx

@@ -51,7 +51,7 @@ export default ({ match , history }) => {
     }
   }, [projectsId , owner, sha]);
   return (
-    <div className="main">
+    <div className="main" style={{padding:"0px",border:"none"}}>
       <Spin spinning={isSpin}>
         <Infos>
           <div className="commitinfos">
@@ -59,13 +59,13 @@ export default ({ match , history }) => {
               {commit && commit.message &&
                 <pre className="task-hide" style={{marginBottom:"0px",height:"28px",whiteSpace:"pre-wrap"}}>{commit.message}</pre>
               }
-              <Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/branch/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
             </div>
           </div>
           <div className="f-wrap-between" style={{ alignItems: "center" }}>
             <ul className="df">
               <User
-                url={(committer && getImageUrl(`images/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
+                url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
                 name={committer && committer.name}
               />
               {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}

src/forge/Main/Index.js

@@ -1,6 +1,10 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Menu, Input , Spin, Pagination , Popover, Affix, } from 'antd';
+import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
+import Slider from "react-slick";
+import { getImageUrl } from 'educoder';
+import "slick-carousel/slick/slick.css";
+import "slick-carousel/slick/slick-theme.css";
 import '../css/index.scss'
 import './list.css';
 import './Index.scss';
@@ -8,7 +12,7 @@ import ListItem from './IndexItem'
 import axios from 'axios';
 import img_new from '../Images/new.png';
 import img_array from '../Images/array.png';
-import banner from '../Images/banner_list.png';
+import banner from '../Images/banner_list.jpg';
 const Search = Input.Search;
 
 class Index extends Component {
@@ -22,12 +26,15 @@ class Index extends Component {
       sort: undefined,
       total: 0,
       isSpin: true,
+      project_type: undefined,
       category_id: undefined,
 
       typeList: undefined,
       categoryList: undefined,
       recommendList:undefined,
 
+      recommendOriList:undefined,
+
       languageList:undefined,
       languageId:undefined
     }
@@ -35,8 +42,8 @@ class Index extends Component {
   }
 
   componentDidMount = () => {
-    const { page,search, sort,category_id , languageId } = this.state;
-    this.getListData(page,search, sort,category_id , languageId);
+    const { page, limit, search, sort, project_type, category_id , languageId } = this.state;
+    this.getListData(page, limit, search, sort, project_type, category_id , languageId);
 
     this.getType();
 
@@ -45,6 +52,8 @@ class Index extends Component {
     this.getRecommand();
 
     this.getLanguage();
+
+    // this.getRecommandOri();
   }
 
   // 获取语言列表
@@ -70,25 +79,31 @@ class Index extends Component {
     }).catch(error=>{})
   }
 
+  getRecommandOri=()=>{
+    const url = `/organizations/recommend.json`;
+    axios.get(url).then(result=>{
+      if(result){
+        this.setState({
+          recommendOriList:result.data.organizations
+        })
+      }
+    }).catch(error=>{})
+  }
+
   // 获取列表
-  getListData = (page,search, sort,category_id,language_id) => {
+  getListData = (page, limit, search, sort, project_type, category_id,languageId) => {
     const { current_user } = this.props;
     const url = `/projects.json`;
-    if(category_id==0){
-      category_id=undefined;
-    }
-    if(language_id==0){
-      language_id=undefined;
-    }
     axios.get(url, {
       params: {
         user_id: current_user && current_user.user_id,
         page,
-        limit:15,
+        limit,
         search,
         sort_by: sort,
+        project_type,
         category_id,
-        language_id
+        language_id:languageId
       }
     }).then((result) => {
       if (result) {
@@ -106,11 +121,7 @@ class Index extends Component {
     const url = `/projects/group_type_list.json`;
     axios.get(url).then((result) => {
       if (result && result.data) {
-        result.data.unshift({
-          name:'全部语言',
-          id:0,
-        });
-        this.setTypeList(result.data, 0)
+        this.setTypeList(result.data, undefined)
       }
     }).catch((error) => { })
   }
@@ -119,7 +130,7 @@ class Index extends Component {
     this.setState({
       typeList: list.map((item, key) => {
         return (
-          <li key={key} className={ parseInt(active_type) === item.id ? 'active' : ''} onClick={() => this.changeType(`${item.id}`, list)}>
+          <li key={key} className={active_type && active_type === item.project_type ? 'active' : ''} onClick={() => this.changeType(`${item.project_type}`, list)}>
             <p>
               <span className="font-16">{item.name}</span>
               <span className="color-blue">{item.projects_count}</span>
@@ -130,16 +141,16 @@ class Index extends Component {
     })
   }
 
-  // 切换语言类型
-  changeType = (id, list) => {
+  // 切换类型
+  changeType = (type, list) => {
     this.setState({
       isSpin: true,
-      languageId: id,
+      project_type: type,
       search: undefined
     })
-    this.setTypeList(list, id);
-    const { page,sort, category_id} = this.state;
-    this.getListData(page,undefined, sort,category_id , id);
+    this.setTypeList(list, type)
+    const { page, limit, sort, category_id , languageId } = this.state;
+    this.getListData(page, limit, undefined, sort, type, category_id , languageId);
   }
 
   // 获取类型
@@ -148,11 +159,7 @@ class Index extends Component {
 
     axios.get(url).then((result) => {
       if (result && result.data) {
-        result.data.unshift({
-          name:'全部类别',
-          id:0,
-        });
-        this.setCategoryList(result.data, 0);
+        this.setCategoryList(result.data, undefined);
       }
     }).catch((error) => { })
   }
@@ -161,7 +168,7 @@ class Index extends Component {
     this.setState({
       categoryList: list.map((item, key) => {
         return (
-          <li key={key} className={ parseInt(active_id) === item.id ? 'active' : ''} onClick={() => this.changeCategory(`${item.id}`, list)}>
+          <li key={key} className={active_id && parseInt(active_id) === item.id ? 'active' : ''} onClick={() => this.changeCategory(`${item.id}`, list)}>
             <p>
               <span className="font-16">{item.name}</span>
               <span className="color-blue">{item.projects_count}</span>
@@ -178,8 +185,8 @@ class Index extends Component {
       page: 1
     });
     this.setCategoryList(list, id)
-    const { sort,languageId } = this.state;
-    this.getListData(1,undefined, sort,id , languageId);
+    const { limit, sort, project_type , languageId } = this.state;
+    this.getListData(1, limit, undefined, sort, project_type, id , languageId);
   }
 
   // 排序
@@ -190,8 +197,8 @@ class Index extends Component {
       search: undefined,
       isSpin: true
     })
-    const {category_id , languageId } = this.state;
-    this.getListData(1,undefined, e.key,category_id , languageId);
+    const { limit, project_type, category_id , languageId } = this.state;
+    this.getListData(1, limit, undefined, e.key, project_type, category_id , languageId);
   }
 
   // 搜索
@@ -203,8 +210,8 @@ class Index extends Component {
       project_type: undefined,
       sort: "updated_on"
     })
-    const {sort, category_id , languageId } = this.state;
-    this.getListData(1,value, sort,category_id , languageId);
+    const { limit, sort, category_id , languageId } = this.state;
+    this.getListData(1, limit, value, sort, undefined, category_id , languageId);
   }
   changeSearchValue = (e) => {
     this.setState({
@@ -216,14 +223,23 @@ class Index extends Component {
     this.setState({
       page
     })
-    const {search, sort,category_id , languageId } = this.state;
-    this.getListData(page,search, sort, category_id , languageId);
+    const { limit, search, sort, project_type, category_id , languageId } = this.state;
+    this.getListData(page, limit, search, sort, project_type, category_id , languageId);
   }
 
   getoDetail=(login,identifier)=>{
     this.props.history.push(`/projects/${login}/${identifier}`);
   }
 
+  // 选择语言类别
+  changeLanguage=(e)=>{
+    this.setState({
+      isSpin:true,
+      languageId:e === 0 ?undefined:e
+    })
+    const { page, limit, sort , project_type , category_id } = this.state;
+    this.getListData(page, limit, undefined, sort, project_type, category_id ,e === 0 ?undefined:e);
+  }
 
   menu =()=> { 
     return(
@@ -257,7 +273,29 @@ class Index extends Component {
   render() {
     const { current_user } = this.props;
 
-    const { projectsList , isSpin , total , search , limit , page , typeList , categoryList } = this.state;
+    const { projectsList , recommendList , languageList , languageId , 
+      isSpin, total, search, limit, page, typeList, categoryList , recommendOriList } = this.state;
+
+      const setting={
+        dots: true,
+        infinite: true,
+        speed: 500,
+        slidesToShow: 5,
+        slidesToScroll: 5,
+        autoplay:false,
+        arrows:false,
+        adaptiveHeight:true
+      }
+      const settings={
+        dots: true,
+        infinite: true,
+        speed: 500,
+        slidesToShow: 6,
+        slidesToScroll: 6,
+        autoplay:false,
+        arrows:false,
+        adaptiveHeight:true
+      }
 
     return (
       <div>
@@ -265,14 +303,27 @@ class Index extends Component {
           <img src={banner} width="100%" alt=""/>
         </p>
         {/* {
+          recommendOriList && recommendOriList.length>0?
+            <Slider {...settings} className="recommandOri">
+              {
+                recommendOriList.map((i,k)=>{
+                  return(
+                    <li><Link to={''}><img src={getImageUrl(`/${i.avatar_url}`)} alt={i.name} title={i.name} width="80px"/></Link></li>
+                  )
+                })
+              }
+            </Slider>
+          :""
+        } */}
+        {
           recommendList && recommendList.length>0 &&
-          <div className="recommandProjects">
+          <Slider {...setting} className={recommendList.length>5 ? "recommandProjects":"recommandProjects mb20"}>
             {
               recommendList.map((item,key)=>{
                 return(
-                  <div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
+                  <div className="items" onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
                     <div className="mainInfo">
-                      <img src={getUrl(`/images/${item.author && item.author.image_url}`)} alt=""/>
+                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} width="50px" height="50px"alt=""/>
                       <p className="school">{item.name}</p>
                       <p className="name">{item.author && item.author.name}</p>
                     </div>
@@ -284,31 +335,45 @@ class Index extends Component {
                 )
               })
             }
-          </div>
+          </Slider>
         }
-         */}
         <div className="ProjectListIndex">
-
-         <Affix className="affix-list-left" offsetTop={90}>
-          <div className="affix-list-content">
+          <div className="list-left">
             <ul className="list-l-Menu">
-              <li className="MenuTitle" onClick={() => {this.getType();this.changeType(undefined, this.state.typeList);}}>
-                <span><i className="iconfont icon-bianchengyuyan color-grey-9 font-15 mr5"></i>
-                语言</span></li>
-              <div className="list-affix">{typeList}</div>
+              <li className="MenuTitle"><i className="iconfont icon-xiangmuleixing color-grey-9 font-15 mr5"></i>项目类型</li>
+              {typeList}
             </ul>
             <ul className="list-l-Menu">
-              <li className="MenuTitle" onClick={() => {this.getCategory();this.changeCategory(undefined, this.state.categoryList);}}>
-              <span><i className="iconfont icon-xiangmuleibie color-grey-9 font-15 mr5"></i>项目类别</span></li>
-              <div className="list-affix">{categoryList}</div>
+              <li className="MenuTitle"><i className="iconfont icon-xiangmuleibie color-grey-9 font-15 mr5"></i>项目类别</li>
+              {categoryList}
             </ul>
           </div>
-          </Affix>
-
           <div className="list-right boxShandow radius-2" style={{padding:0}}>
             <Spin spinning={isSpin}>
               <div className="list-r-operation">
                 <div>
+                  <Select 
+                    showSearch
+                    placeholder="请选择语言"
+                    style={{width:"150px",marginRight:"20px"}}
+                    size={"large"}
+                    onChange={this.changeLanguage}
+                    value={languageId}
+                    allowClear={true}
+                    optionFilterProp="children"
+                    filterOption={(input,option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                  >
+                    <Select.Option key={0} value={0}>请选择语言</Select.Option>
+                    {
+                      languageList && languageList.length>0 && languageList.map((item,key)=>{
+                        return(
+                          <Select.Option key={item.id} value={item.id}>
+                            {item.name}
+                          </Select.Option>
+                        )
+                      })
+                    }
+                  </Select>
                   <Search
                     placeholder="输入项目名称关键字进行搜索"
                     enterButton="搜索"
@@ -336,7 +401,7 @@ class Index extends Component {
                   </Popover>
                 </div>
               </div>
-              <ListItem {...this.props} {...this.state} projects={projectsList} getListData={this.getListData}></ListItem>
+              <ListItem {...this.props} {...this.state} projects={projectsList}></ListItem>
               {this.pagination(total,limit,page)}
             </Spin>
           </div>

src/forge/Main/Index.scss

@@ -1,56 +1,53 @@
+.recommandOri.slick-slider{
+  width: 1300px;
+  margin:20px auto 40px;
+  .slick-track{
+    margin-left: 0px;
+  }
+  .slick-slide{
+    li > a{
+
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+}
 /* recommandProjects */
-.recommandProjects{
-  display: flex;
-  max-width: 1200px;
-  margin:20px auto;
-}
-.recommandProjects >div{
-  background-color: #fff;
-  border-radius: 10px;
-  width: 220px;
-  margin-right: 25px;
-  cursor: pointer;
-  &:last-child{
-    margin-right: 0px;
+.recommandProjects.slick-slider{
+  width: 1230px;
+  margin:20px auto 40px;
+  .slick-track{
+    margin-left: 0px;
   }
-}
-.recommandProjects > div:hover{
-  box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
-}
-.recommandProjects > div .mainInfo{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-height: 160px;
-  border-bottom: 1px solid #eee;
-  padding:20px;
-  box-sizing: border-box;
-  img{
-    height: 50px;
-    width:50px;
-    border-radius: 50%;
+  .slick-arrow.slick-prev,.slick-arrow.slick-next{
+    &:before{
+      color: #999;
+    }
+    li.slick-active button:before{
+      color: #999;
+    }
   }
-  .name{
-    font-size: 13px;
-    color: #666;
-    height: 18px;
-    line-height: 18px;
-    margin-top:12px;
+  .slick-dots{
+    bottom: -29px;
+    li button:before{
+      color: #909090;
+    }
   }
-  .school{
-    margin-top:12px;
-    color: #333;
-    font-size: 16px;
-    height: 22px;
-    line-height: 22px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    max-width:100%;
+  .slick-slide{
+    padding:0px 15px;
+    box-sizing: border-box;
+    & > div{
+      background-color: #fff;
+      border-radius: 10px;
+      width: 100%;
+      cursor: pointer;
+      border: 1px solid #eee;
+      &:hover{
+        box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
   }
-}
-.recommandProjects{
   .baseInfo{
     padding:18px 15px;
     display: flex;
@@ -71,16 +68,306 @@
       text-align: right;
     }
   }
-}
-.singleBtn{
-  display: inline-block;
-  .ant-upload-list-item{
-    position: absolute;
-    bottom: 0px;
-    width: 100%;
-    left: 0px;
-    .ant-upload-list-item-name{
-      text-align: left;
+  .mainInfo{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 160px;
+    border-bottom: 1px solid #eee;
+    padding:20px;
+    box-sizing: border-box;
+    img{
+      height: 50px;
+      width:50px;
+      border-radius: 50%;
+    }
+    .name{
+      font-size: 13px;
+      color: #666;
+      height: 18px;
+      line-height: 18px;
+      margin-top:12px;
+    }
+    .school{
+      margin-top:12px;
+      color: #333;
+      font-size: 16px;
+      height: 22px;
+      line-height: 22px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      max-width:100%;
     }
   }
+}
+// coderDepot
+.Panels{
+  max-width: 1200px;
+  margin: 0 auto;
+  .panelmenu{
+    padding-top:30px;
+  }
+  .addOptionBtn{
+    height: 32px;
+    line-height: 30px;
+    display: flex;
+    border:1px solid #d9d9d9;
+    border-radius: 2px;
+    a{
+      padding:0px 13px;
+      color: rgba(0, 0, 0, 0.65);
+      cursor: pointer;
+    }
+    & > a:first-child{
+      border-right: 1px solid #d9d9d9;
+    }
+    & > a:last-child{
+      border-right: none;
+    }
+  }
+  .infoCount{
+    display: inline-block;
+    padding:0px 5px;
+    height: 16px;
+    line-height: 16px;
+    background-color: #eee;
+    color:#999;
+    border-radius: 12px;
+    margin-left: 10px;
+    font-size: 12px;
+  }
+  .attrPerson{
+    padding-top: 15px;
+    display: flex;
+    flex-wrap: wrap;
+    a{
+      margin: 10px 10px 0px 0px;
+      img{
+        border-radius: 50%;
+        width: 35px;
+        height: 35px;
+      }
+      &:nth-child(6){
+        margin-right: 0px;
+      }
+    }
+  }
+  .progress{
+    display: flex;
+    border-radius: 10px;
+    height: 7px;
+    margin-top: 12px;
+    span{
+      &:first-child{
+        border-radius: 10px 0px 0px 10px;
+      }
+      &:last-child{
+        border-radius: 0px 10px 10px 0px;
+      }
+    }
+  }
+  .progresstip{
+    margin-top: 15px;
+    flex-wrap: wrap;
+    i.zero{
+      position: absolute;
+      display: block;
+      border-radius: 50%;
+      height: 8px;
+      width: 8px;
+      left: 0px;
+      top:10px
+    }
+    &>span{
+      padding-left: 15px;
+      position: relative;
+      min-width: 33.5%;
+      span{
+        color: #666;
+        &:last-child{
+          color: #999;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+  .listtable{
+    margin-top: 20px;
+    border:1px solid #d9d9d9;
+    border-radius: 4px;
+    .listtablehead{
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      border-bottom: 1px solid #d9d9d9;
+      padding:7px 20px;
+      border-radius: 4px 4px 0px 0px;
+      background-color: #FAFBFC;
+      .ellipsistxt{
+        margin-top: 6px;
+        #ptxt{
+          margin-bottom: 0px;
+          word-break: break-all;
+          overflow: unset;
+          white-space:pre-wrap; /* css3.0 */ 
+          white-space:-moz-pre-wrap; /* Firefox */ 
+          white-space:-pre-wrap; /* Opera 4-6 */ 
+          white-space:-o-pre-wrap; /* Opera 7 */ 
+          word-wrap:break-word;
+        }
+        margin-left: 13px;
+        line-height:18px;
+        flex:1;
+        width: 0;
+        color: #666;
+        &.hidetxt{
+          height: 18px;
+          overflow: hidden;
+          position: relative;
+          padding-right:8px;
+          &::after{
+            position: absolute;
+            right: 0px;
+            bottom: 0px;
+            content:"...";
+          }
+        }
+      }
+      .ellipsis{
+        margin-left: 8px;
+        cursor: pointer;
+        border-radius: 2px;
+        background-color: #c1c1c1;
+        padding:0px 4px;
+        height: 14px;
+        line-height: 14px;
+        margin-top: 9px;
+        i{
+          font-size: 15px!important;
+          color: #fff;
+          height: 14px;
+          line-height: 14px;
+        }
+      }
+    }
+    .listtablebody{
+      li.listtablepath{
+        a{color: #40a9ff;}
+        p{
+          margin-bottom: 0px!important;
+        }
+      }
+      & > li{
+        height: 42px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #d9d9d9;
+        padding:0px 20px 0px 24px;
+        & > span:first-child{
+          width: 30%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+        & > span:nth-child(2){
+          width: 60%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+        & > span:nth-child(3){
+          width: 10%;
+          text-align: right;
+        }
+      }
+      &> li:last-child{
+        border-bottom: none;
+      }
+    }
+  }
+}
+.drawerBtn{
+  position: fixed;
+  left: -13px;
+  border:1px solid rgb(207,205,223);
+  width: 34px;
+  border-radius: 0px 12px 12px 0px;
+  height: 70px;
+  top:50%;
+  margin-top: -35px;
+  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
+  &:hover{
+    box-shadow: 1px 0px 7px rgba(0,0,0,0.1);
+  }
+  span{
+    writing-mode: vertical-lr;
+    color: #202429;
+    width: 25px;
+  }
+  i{
+    color: #24292e;
+    height: 18px;
+    line-height: 18px;
+    width: 18px;
+  }
+}
+.downMenu{
+  width: 330px;
+  box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
+  background-color: #fff;
+  .ant-menu-vertical .ant-menu-item:hover{
+    background-color: #e6f7ff;
+  }
+}
+
+.menuslist{
+  max-height: 200px;
+  overflow-y: auto;
+  padding:10px 15px;
+  border-radius: 4px;
+  .ant-dropdown-menu-item{
+    border-radius: 8px;
+    text-align: left!important;
+    a{
+      width: 350px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+  .ant-dropdown-menu-item.active{
+    background-color: #e6f7ff;
+  }
+}
+.catelogue{
+  border:1px solid rgb(211, 211, 211);
+  font-size: 15px;
+  font-weight: normal;
+  border-radius: 5px;
+  margin-right: 10px;
+  padding:0px 10px;
+  height: 30px;
+  line-height: 30px;
+  color: #666!important;
+  display: flex;
+  align-items: center;
+  span{
+    margin-top: 1px;
+  }
+}
+.submoduleStyle{
+  cursor: default;
+  i{
+    cursor: default;
+  }
+  &:hover{
+    color: #05101a;
+  }
 }

src/forge/Main/IndexItem.js

@@ -1,128 +1,91 @@
 import React, { Component } from 'react';
 import { Tooltip } from 'antd';
 import { getImageUrl } from 'educoder';
+import { AlignCenter } from '../Component/layout';
 import { Link } from 'react-router-dom';
 import '../css/index.scss';
 import Nodata from '../Nodata';
 import './list.css';
 import img_parise from '../Images/parise.png';
-import SpecialModal from './SpecialModal';
 
 class IndexItem extends Component {
-  constructor(props){
-    super(props);
-    this.state={
-      visible:false,
-      user_apply_signatures:[],
-      project_id:undefined
-    }
-  }
   TurnToDetail = (login, url) => {
     this.props.history.push({
       pathname: url,
       state: login
     })
   }
-  /**
-   * link:跳转到详情的地址
-   * user_apply_signatures:是否已经发送访问特殊开源项目的文件
-   * project_id：项目id
-   * is_secret:是否是特殊开源许可证项目
-   * id：创建者login
-   * is_member:是否是项目成员(如果是项目成员可以直接进入项目)
-   * */ 
-  projectHref=(link , user_apply_signatures,project_id,is_secret , id,is_member)=>{
-    const { user , showLoginDialog } = this.props;
-    if(is_secret && (!user || (user && !user.login))){
-      showLoginDialog();
-      return;
-    }
-    let signa = user_apply_signatures && user_apply_signatures[0];
-    if((is_secret && !is_member && (!signa || (signa && signa.status !== "passed"))) && user.login !== id ){
-      this.setState({
-        visible:true,
-        user_apply_signatures:user_apply_signatures.length>0 ? user_apply_signatures[0] : undefined,
-        project_id
-      })
-    }else{
-      this.props.history.push(link);
-    }
-  }
-  hideModal=()=>{
-    this.setState({
-      visible:false
-    })
-  }
-
-  sureModal=()=>{
-    this.hideModal();
-    const { getListData } = this.props;
-    getListData && getListData(1);
-  }
-
   render() {
     const { projects } = this.props;
-    const { visible , user_apply_signatures , project_id } = this.state;
-    const renderList = (
-      projects && projects.length > 0 ? projects.map((item, key) => {
-        return (
-          <div className="p-r-Item" key={key}>
-            {
-              item.platform === "educoder" ?
-              <a style={{cursor:"default"}} className="show-user-link">
-                <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
-              </a>
-              :
-              <Link to={`/users/${item.author.login}`} className="show-user-link">
-                <img className="p-r-photo" alt="" src={getImageUrl(`${item.author && item.author.image_url}`)} ></img>
-              </Link>
-            }
-            <div className="p-r-Infos">
-              <div className="p-r-name">
-                <a onClick={()=>this.projectHref(`/projects/${item.author.login}/${item.identifier}`,item.user_apply_signatures, item.id,item.is_secret,item.author.login,item.is_member)} className="hide-1 color-grey-3 font-18 task-hide fwt-500 " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}>
-                  {item.author.name}/{item.name}
-                  {
-                    item.forked_from_project_id ?
-                      <span className="ml5">
-                        <i className="iconfont icon-fork font-18 color-orange" />
-                      </span>
-                      : ""
-                  }
-                  {
-                    item.type && item.type !== 0 ? 
-                    item.type === 2 ?
-                    <Tooltip title="该项目是一个镜像" className="ml5">
-                      <i className="iconfont icon-banbenku font-18 color-green" />
-                    </Tooltip>:
-                    <span className="ml5">
-                      <i className="iconfont icon-jingxiang font-18 color-green" />
-                    </span>:""
-                  }
+    return (
+      <div className="project-list minH-670" style={{padding:"0px 20px"}}>
+        { projects && projects.length > 0 ? projects.map((item, key) => {
+          return (
+            <div className="p-r-Item" key={key}>
+              {
+                item.platform === "educoder" ?
+                <a href="javascript:void(0)" style={{cursor:"default"}} className="show-user-link">
+                  <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                 </a>
-                <span className="p-r-tags">
-                  <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
-                  <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>
-                </span>
-              </div>
-              <p className="break_word task-hide-2 mt8 color-grey-3 " style={{ maxHeight: "44px",lineHeight:"22px" }}>{item.description}</p>
+                :
+                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
+                  <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
+                </Link>
+              }
+              <div className="p-r-Infos">
+                <div className="p-r-name">
+                  <AlignCenter>
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
+                      {item.author.name}/{item.name}
+                    </Link>
+                    { !item.is_public && <span className="privateTag">私有</span> }
+                    {
+                      item.forked_from_project_id ?
+                        <span className="ml5">
+                          <i className="iconfont icon-fork font-18 color-orange" />
+                        </span>
+                        : ""
+                    }
+                    {
+                      item.type && item.type === 2 ?
+                      <Tooltip title="该项目是一个镜像" className="ml5">
+                        <i className="iconfont icon-banbenku font-18 color-green" />
+                      </Tooltip>:""
+                    }
+                    {
+                      item.type && item.type === 1 ?
+                      <span className="ml5">
+                        <i className="iconfont icon-jingxiang font-18 color-green" />
+                      </span>:""
+                    }
+                  </AlignCenter>
+                  <span className="p-r-tags">
+                    {
+                      item.praises_count && item.praises_count>0 ?
+                      <span className="pariseTag">
+                        <img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}
+                      </span>:""
+                    }
+                    {
+                      item.forked_count && item.forked_count>0 ?
+                      <span>
+                        <i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}
+                      </span>:""
+                    }
+                  </span>
+                </div>
+                <p className="break_word task-hide-2 mt10" style={{ maxHeight: "44px",lineHeight:"22px" }}>{item.description}</p>
 
-              <div className="p-r-about">
-                <span className="p-r-detail">
-                  {/* <span><label>浏览量：</label>{item.visits}</span> */}
-                  {/* {item.category && item.category.id && <span>{item.category.name}</span>} */}
-                  {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
-                  {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
-                </span>
+                <div className="p-r-about">
+                  <span className="p-r-detail">
+                    {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
+                    {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
+                  </span>
+                </div>
               </div>
             </div>
-          </div>
-        )
-      }) : <Nodata _html="暂无数据~"></Nodata>
-    )
-    return (
-      <div className="project-list minH-670">
-        <SpecialModal {...this.props} visible={visible} hideModal={this.hideModal} user_apply_signatures={user_apply_signatures} project_id={project_id} sureModal={this.sureModal}></SpecialModal>
-        {renderList}
+          )
+        }) : <Nodata _html="暂无数据~"></Nodata>}
       </div>
     )
   }

src/forge/Main/NullData.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import "../Branch/branch.css"
+import "../Branch/branch.scss"