issue

同步镜像调用websockt，成功后刷新页面；
合并请求可选标签，仓库设置类别、语言可选

config/webpack.config.prod.js

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

package-lock.json

@@ -4885,7 +4885,7 @@
     },
     "dom-closest": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
       "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
       "requires": {
         "dom-matches": ">=1.0.1"
@@ -4929,7 +4929,7 @@
     },
     "dom-matches": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
       "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
     },
     "dom-scroll-into-view": {
@@ -5187,7 +5187,7 @@
     },
     "enquire.js": {
       "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz",
       "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
     },
     "entities": {
@@ -5706,7 +5706,7 @@
     },
     "eventlistener": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
       "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
     },
     "events": {
@@ -8040,7 +8040,7 @@
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
@@ -8881,7 +8881,7 @@
     },
     "immutable": {
       "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
       "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
     },
     "import-fresh": {
@@ -10486,7 +10486,7 @@
     },
     "lodash.throttle": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.uniq": {

package.json

@@ -193,6 +193,7 @@
     "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",

public/css/edu-common.css

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

public/css/edu-main.css

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

public/css/edu-purge.css

@@ -1,3 +1,4 @@
+@charset "utf-8";
 /* 头部 */
 .header {
   width: 100%;
@@ -1271,7 +1272,7 @@ html body {
   font-size: 14px;
   line-height: 2.0;
   background: #fafafa;
-  font-family: "微软雅黑", "宋体";
+  font-family: "Microsoft YaHei", "SimSun";
   color: #05101a;
   height: 100%;
   position: relative;
@@ -1307,6 +1308,7 @@ td,
 span {
   margin: 0;
   padding: 0;
+  margin-bottom: 0px!important;
 }
 
 table,
@@ -1363,10 +1365,6 @@ a:visited {
   color: #05101a;
 }
 
-a:hover {
-  color: #459be5;
-}
-
 ol,
 ul,
 li {
@@ -1473,7 +1471,7 @@ a.edu-txt-w80,
 
 /*隐藏*/
 .none {
-  display: none
+  display: none!important;
 }
 
 .block {
@@ -1929,7 +1927,9 @@ a.decoration {
 }
 
 .mr20 {
-  margin-right: 20px;
+  margin-right: 10px;
+  margin-left: 10px;
+  float: left;
 }
 
 .mr25 {
@@ -1937,7 +1937,7 @@ a.decoration {
 }
 
 .mr30 {
-  margin-right: 30px;
+  margin-right: 10px;
 }
 
 .mr35 {
@@ -2436,7 +2436,11 @@ a.hoverLine:hover{
 
 
 .color-grey-9 {
-  color: #999999 !important;
+  color: #333333 !important;
+}
+
+a:hover{
+  color: #466AFF !important;
 }
 
 .color-grey-98 {
@@ -2471,33 +2475,23 @@ a.hoverLine:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover {
-  color: #4cacff !important;
-}
-
-a.color-grey-9:hover,
-a.color-grey-8:hover,
-a.color-grey-c:hover {
-  color: #111C24 !important;
+a.color-grey-3:hover,a.color-ooo:hover {
+  color: #2A61FF !important;
 }
 
 /*蓝色*/
 .color-blue {
-  color: #4CACFF !important;
+  color: #2A61FF !important;
+}
+.color-blue-file {
+  color: #4598FA!important;
 }
 /* 绿色 */
-.color-green-file{
-  color: #28BD6C;
-}
 /*主*/
 .color-blue_4C {
   color: #4CACFF !important;
 }
 
-a.color-blue:hover,
-a.color-blue_4C:hover {
-  color: #459BE6 !important;
-}
 
 /*橙色*/
 .color-orange {

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1628841816999') format('woff2'),
-       url('iconfont.woff?t=1628841816999') format('woff'),
-       url('iconfont.ttf?t=1628841816999') format('truetype');
+  src: url('iconfont.woff2?t=1632638897939') format('woff2'),
+       url('iconfont.woff?t=1632638897939') format('woff'),
+       url('iconfont.ttf?t=1632638897939') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,210 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-liulanicon2x:before {
+  content: "\e8dd";
+}
+
+.icon-wenjianicon:before {
+  content: "\e8dc";
+}
+
+.icon-a-yuanquan2x:before {
+  content: "\e8db";
+}
+
+.icon-xiangmubiaoqian:before {
+  content: "\e8da";
+}
+
+.icon-icon:before {
+  content: "\e8ce";
+}
+
+.icon-tar:before {
+  content: "\e8cf";
+}
+
+.icon-a-fuzhi2:before {
+  content: "\e8d0";
+}
+
+.icon-fujian1:before {
+  content: "\e8d1";
+}
+
+.icon-a-bianji1:before {
+  content: "\e8d2";
+}
+
+.icon-banbenicon:before {
+  content: "\e8d3";
+}
+
+.icon-shanchuicon2:before {
+  content: "\e8d4";
+}
+
+.icon-a-lajitong_icon3x:before {
+  content: "\e8d5";
+}
+
+.icon-xialaanniu2:before {
+  content: "\e8d6";
+}
+
+.icon-xiazai-icon:before {
+  content: "\e8d7";
+}
+
+.icon-master_icon1:before {
+  content: "\e8d8";
+}
+
+.icon-shangchuanicon:before {
+  content: "\e8d9";
+}
+
+.icon-gerenziliao1:before {
+  content: "\e8c7";
+}
+
+.icon-lichengbeiicon:before {
+  content: "\e885";
+}
+
+.icon-cangkushezhiicon:before {
+  content: "\e889";
+}
+
+.icon-dongtaiicon:before {
+  content: "\e88a";
+}
+
+.icon-gongzuoliuicon:before {
+  content: "\e88b";
+}
+
+.icon-yixiuicon1:before {
+  content: "\e89b";
+}
+
+.icon-a-wikiicon1:before {
+  content: "\e8c6";
+}
+
+.icon-daimakuicon1:before {
+  content: "\e8c5";
+}
+
+.icon-wodetongzhi:before {
+  content: "\e8c8";
+}
+
+.icon-tongzhiguanli:before {
+  content: "\e8c9";
+}
+
+.icon-xuanzhong3:before {
+  content: "\e8ca";
+}
+
+.icon-xitongtongzhiicon:before {
+  content: "\e8cb";
+}
+
+.icon-xiaoxi2:before {
+  content: "\e8cc";
+}
+
+.icon-sshmiyue:before {
+  content: "\e8cd";
+}
+
+.icon-gerenziliao:before {
+  content: "\e8c4";
+}
+
+.icon-xinshouzhiyin:before {
+  content: "\e8e4";
+}
+
+.icon-xinjianxiangmu:before {
+  content: "\e8e6";
+}
+
+.icon-jiaruketang1:before {
+  content: "\e8e9";
+}
+
+.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";
 }
@@ -29,22 +233,6 @@
   content: "\e8a6";
 }
 
-.icon-dianzan_icon:before {
-  content: "\e8ba";
-}
-
-.icon-quxiaoguanzhu:before {
-  content: "\e8bb";
-}
-
-.icon-daimakuicon:before {
-  content: "\e8a9";
-}
-
-.icon-zhuyeicon:before {
-  content: "\e884";
-}
-
 .icon-biaoqianicon:before {
   content: "\e882";
 }
@@ -53,14 +241,6 @@
   content: "\e883";
 }
 
-.icon-cangkushezhiicon:before {
-  content: "\e885";
-}
-
-.icon-fuzhiicon:before {
-  content: "\e886";
-}
-
 .icon-lianjieicon:before {
   content: "\e887";
 }
@@ -69,18 +249,6 @@
   content: "\e888";
 }
 
-.icon-lichengbeiicon:before {
-  content: "\e889";
-}
-
-.icon-gongzuoliuicon:before {
-  content: "\e88a";
-}
-
-.icon-dongtaiicon:before {
-  content: "\e88b";
-}
-
 .icon-morendianzan_icon:before {
   content: "\e88e";
 }
@@ -93,10 +261,6 @@
   content: "\e899";
 }
 
-.icon-wenjian5:before {
-  content: "\e89a";
-}
-
 .icon-tijiaoicon:before {
   content: "\e89e";
 }
@@ -105,10 +269,6 @@
   content: "\e89f";
 }
 
-.icon-wenjianjia3:before {
-  content: "\e8a2";
-}
-
 .icon-xialaanniu1:before {
   content: "\e8a4";
 }
@@ -193,10 +353,6 @@
   content: "\e898";
 }
 
-.icon-weixuanzhongqingqiuicon:before {
-  content: "\e89b";
-}
-
 .icon-xiezuozheguanliicon:before {
   content: "\e8a1";
 }
@@ -241,10 +397,6 @@
   content: "\e875";
 }
 
-.icon-fuzhi_icon:before {
-  content: "\e876";
-}
-
 .icon-shanchuicon:before {
   content: "\e877";
 }

public/css/iconfont.json

@@ -5,6 +5,363 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "24600282",
+      "name": "浏览icon@2x",
+      "font_class": "a-liulanicon2x",
+      "unicode": "e8dd",
+      "unicode_decimal": 59613
+    },
+    {
+      "icon_id": "24567893",
+      "name": "文件icon",
+      "font_class": "wenjianicon",
+      "unicode": "e8dc",
+      "unicode_decimal": 59612
+    },
+    {
+      "icon_id": "24527422",
+      "name": "圆圈@2x",
+      "font_class": "a-yuanquan2x",
+      "unicode": "e8db",
+      "unicode_decimal": 59611
+    },
+    {
+      "icon_id": "24378423",
+      "name": "项目标签",
+      "font_class": "xiangmubiaoqian",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
+    {
+      "icon_id": "24368060",
+      "name": "icon",
+      "font_class": "icon",
+      "unicode": "e8ce",
+      "unicode_decimal": 59598
+    },
+    {
+      "icon_id": "24368061",
+      "name": "tar",
+      "font_class": "tar",
+      "unicode": "e8cf",
+      "unicode_decimal": 59599
+    },
+    {
+      "icon_id": "24289113",
+      "name": "复制 (2)",
+      "font_class": "a-fuzhi2",
+      "unicode": "e8d0",
+      "unicode_decimal": 59600
+    },
+    {
+      "icon_id": "24289114",
+      "name": "附件",
+      "font_class": "fujian1",
+      "unicode": "e8d1",
+      "unicode_decimal": 59601
+    },
+    {
+      "icon_id": "24289115",
+      "name": "编 辑",
+      "font_class": "a-bianji1",
+      "unicode": "e8d2",
+      "unicode_decimal": 59602
+    },
+    {
+      "icon_id": "24289116",
+      "name": "版本icon",
+      "font_class": "banbenicon",
+      "unicode": "e8d3",
+      "unicode_decimal": 59603
+    },
+    {
+      "icon_id": "24289117",
+      "name": "删除icon",
+      "font_class": "shanchuicon2",
+      "unicode": "e8d4",
+      "unicode_decimal": 59604
+    },
+    {
+      "icon_id": "24289118",
+      "name": "垃圾桶_icon@3x",
+      "font_class": "a-lajitong_icon3x",
+      "unicode": "e8d5",
+      "unicode_decimal": 59605
+    },
+    {
+      "icon_id": "24289119",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu2",
+      "unicode": "e8d6",
+      "unicode_decimal": 59606
+    },
+    {
+      "icon_id": "24289120",
+      "name": "下载-icon",
+      "font_class": "xiazai-icon",
+      "unicode": "e8d7",
+      "unicode_decimal": 59607
+    },
+    {
+      "icon_id": "24289121",
+      "name": "master_icon",
+      "font_class": "master_icon1",
+      "unicode": "e8d8",
+      "unicode_decimal": 59608
+    },
+    {
+      "icon_id": "24289122",
+      "name": "上传icon",
+      "font_class": "shangchuanicon",
+      "unicode": "e8d9",
+      "unicode_decimal": 59609
+    },
+    {
+      "icon_id": "24059956",
+      "name": "个人资料",
+      "font_class": "gerenziliao1",
+      "unicode": "e8c7",
+      "unicode_decimal": 59591
+    },
+    {
+      "icon_id": "24059409",
+      "name": "里程碑icon",
+      "font_class": "lichengbeiicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "24059410",
+      "name": "仓库设置icon",
+      "font_class": "cangkushezhiicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
+    {
+      "icon_id": "24059411",
+      "name": "动态icon",
+      "font_class": "dongtaiicon",
+      "unicode": "e88a",
+      "unicode_decimal": 59530
+    },
+    {
+      "icon_id": "24059412",
+      "name": "工作流icon",
+      "font_class": "gongzuoliuicon",
+      "unicode": "e88b",
+      "unicode_decimal": 59531
+    },
+    {
+      "icon_id": "24059413",
+      "name": "易修icon",
+      "font_class": "yixiuicon1",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "24059414",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon1",
+      "unicode": "e8c6",
+      "unicode_decimal": 59590
+    },
+    {
+      "icon_id": "24047186",
+      "name": "代码库icon",
+      "font_class": "daimakuicon1",
+      "unicode": "e8c5",
+      "unicode_decimal": 59589
+    },
+    {
+      "icon_id": "24047189",
+      "name": "我的通知",
+      "font_class": "wodetongzhi",
+      "unicode": "e8c8",
+      "unicode_decimal": 59592
+    },
+    {
+      "icon_id": "24047190",
+      "name": "通知管理",
+      "font_class": "tongzhiguanli",
+      "unicode": "e8c9",
+      "unicode_decimal": 59593
+    },
+    {
+      "icon_id": "24047191",
+      "name": "选中",
+      "font_class": "xuanzhong3",
+      "unicode": "e8ca",
+      "unicode_decimal": 59594
+    },
+    {
+      "icon_id": "24047192",
+      "name": "系统通知icon",
+      "font_class": "xitongtongzhiicon",
+      "unicode": "e8cb",
+      "unicode_decimal": 59595
+    },
+    {
+      "icon_id": "24047193",
+      "name": "消息",
+      "font_class": "xiaoxi2",
+      "unicode": "e8cc",
+      "unicode_decimal": 59596
+    },
+    {
+      "icon_id": "24047194",
+      "name": "ssh密钥",
+      "font_class": "sshmiyue",
+      "unicode": "e8cd",
+      "unicode_decimal": 59597
+    },
+    {
+      "icon_id": "24014152",
+      "name": "个人资料",
+      "font_class": "gerenziliao",
+      "unicode": "e8c4",
+      "unicode_decimal": 59588
+    },
+    {
+      "icon_id": "23655968",
+      "name": "新手指引",
+      "font_class": "xinshouzhiyin",
+      "unicode": "e8e4",
+      "unicode_decimal": 59620
+    },
+    {
+      "icon_id": "23655969",
+      "name": "新建项目",
+      "font_class": "xinjianxiangmu",
+      "unicode": "e8e6",
+      "unicode_decimal": 59622
+    },
+    {
+      "icon_id": "23658111",
+      "name": "加入课堂",
+      "font_class": "jiaruketang1",
+      "unicode": "e8e9",
+      "unicode_decimal": 59625
+    },
+    {
+      "icon_id": "23791639",
+      "name": "项目公告",
+      "font_class": "xiangmugonggao",
+      "unicode": "e8c2",
+      "unicode_decimal": 59586
+    },
+    {
+      "icon_id": "23791640",
+      "name": "成果",
+      "font_class": "chengguo",
+      "unicode": "e8c3",
+      "unicode_decimal": 59587
+    },
+    {
+      "icon_id": "23791410",
+      "name": "成交公告",
+      "font_class": "chengjiaogonggao",
+      "unicode": "e8c0",
+      "unicode_decimal": 59584
+    },
+    {
+      "icon_id": "23791411",
+      "name": "技术资产",
+      "font_class": "jishuzichan",
+      "unicode": "e8c1",
+      "unicode_decimal": 59585
+    },
+    {
+      "icon_id": "23790928",
+      "name": "废标公告",
+      "font_class": "feibiaogonggao",
+      "unicode": "e8bc",
+      "unicode_decimal": 59580
+    },
+    {
+      "icon_id": "23790929",
+      "name": "中标公告",
+      "font_class": "zhongbiaogonggao",
+      "unicode": "e8bd",
+      "unicode_decimal": 59581
+    },
+    {
+      "icon_id": "23790930",
+      "name": "更正公告",
+      "font_class": "gengzhenggonggao",
+      "unicode": "e8be",
+      "unicode_decimal": 59582
+    },
+    {
+      "icon_id": "23790931",
+      "name": "招标公告",
+      "font_class": "zhaobiaogonggao",
+      "unicode": "e8bf",
+      "unicode_decimal": 59583
+    },
+    {
+      "icon_id": "23732532",
+      "name": "文件",
+      "font_class": "wenjian6",
+      "unicode": "e8ba",
+      "unicode_decimal": 59578
+    },
+    {
+      "icon_id": "23732533",
+      "name": "文件夹",
+      "font_class": "wenjianjia4",
+      "unicode": "e8bb",
+      "unicode_decimal": 59579
+    },
+    {
+      "icon_id": "23642443",
+      "name": "取消关注",
+      "font_class": "quxiaoguanzhu",
+      "unicode": "e89a",
+      "unicode_decimal": 59546
+    },
+    {
+      "icon_id": "23642444",
+      "name": "点赞_icon",
+      "font_class": "dianzan_icon",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
+    {
+      "icon_id": "23639530",
+      "name": "文件",
+      "font_class": "wenjian5",
+      "unicode": "e896",
+      "unicode_decimal": 59542
+    },
+    {
+      "icon_id": "23639533",
+      "name": "文件夹",
+      "font_class": "wenjianjia3",
+      "unicode": "e8a9",
+      "unicode_decimal": 59561
+    },
+    {
+      "icon_id": "23639440",
+      "name": "复制icon",
+      "font_class": "fuzhiicon",
+      "unicode": "e886",
+      "unicode_decimal": 59526
+    },
+    {
+      "icon_id": "23639422",
+      "name": "主页-fill",
+      "font_class": "zhuye-fill",
+      "unicode": "e876",
+      "unicode_decimal": 59510
+    },
+    {
+      "icon_id": "23639423",
+      "name": "代码库icon",
+      "font_class": "daimakuicon",
+      "unicode": "e884",
+      "unicode_decimal": 59524
+    },
     {
       "icon_id": "23572260",
       "name": "新建",
@@ -33,34 +390,6 @@
       "unicode": "e8a6",
       "unicode_decimal": 59558
     },
-    {
-      "icon_id": "23492900",
-      "name": "点赞_icon",
-      "font_class": "dianzan_icon",
-      "unicode": "e8ba",
-      "unicode_decimal": 59578
-    },
-    {
-      "icon_id": "23492901",
-      "name": "取消关注",
-      "font_class": "quxiaoguanzhu",
-      "unicode": "e8bb",
-      "unicode_decimal": 59579
-    },
-    {
-      "icon_id": "23473151",
-      "name": "代码库icon",
-      "font_class": "daimakuicon",
-      "unicode": "e8a9",
-      "unicode_decimal": 59561
-    },
-    {
-      "icon_id": "23473104",
-      "name": "主页icon",
-      "font_class": "zhuyeicon",
-      "unicode": "e884",
-      "unicode_decimal": 59524
-    },
     {
       "icon_id": "23472253",
       "name": "标签icon",
@@ -75,20 +404,6 @@
       "unicode": "e883",
       "unicode_decimal": 59523
     },
-    {
-      "icon_id": "23472256",
-      "name": "仓库设置icon",
-      "font_class": "cangkushezhiicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
-    {
-      "icon_id": "23472257",
-      "name": "复制icon",
-      "font_class": "fuzhiicon",
-      "unicode": "e886",
-      "unicode_decimal": 59526
-    },
     {
       "icon_id": "23472258",
       "name": "链接icon",
@@ -103,27 +418,6 @@
       "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",
@@ -145,13 +439,6 @@
       "unicode": "e899",
       "unicode_decimal": 59545
     },
-    {
-      "icon_id": "23472268",
-      "name": "文件",
-      "font_class": "wenjian5",
-      "unicode": "e89a",
-      "unicode_decimal": 59546
-    },
     {
       "icon_id": "23472269",
       "name": "提交icon",
@@ -166,13 +453,6 @@
       "unicode": "e89f",
       "unicode_decimal": 59551
     },
-    {
-      "icon_id": "23472271",
-      "name": "文件夹",
-      "font_class": "wenjianjia3",
-      "unicode": "e8a2",
-      "unicode_decimal": 59554
-    },
     {
       "icon_id": "23472272",
       "name": "下拉按钮",
@@ -320,13 +600,6 @@
       "unicode": "e898",
       "unicode_decimal": 59544
     },
-    {
-      "icon_id": "23144155",
-      "name": "未选中请求icon",
-      "font_class": "weixuanzhongqingqiuicon",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
     {
       "icon_id": "23144158",
       "name": "协作者管理icon",
@@ -404,13 +677,6 @@
       "unicode": "e875",
       "unicode_decimal": 59509
     },
-    {
-      "icon_id": "23046262",
-      "name": "复制_icon",
-      "font_class": "fuzhi_icon",
-      "unicode": "e876",
-      "unicode_decimal": 59510
-    },
     {
       "icon_id": "23046268",
       "name": "删除icon",

public/js/editormd/editormd.min.js

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

src/App.js

@@ -3,7 +3,7 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	BrowserRouter as Router,
+	// BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
@@ -19,7 +19,7 @@ import moment from 'moment'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 import SiderBar from './forge/Component/SiderBar'
 
-import { SnackbarHOC } from 'educoder'
+import { SnackbarHOC } from 'educoder';
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@@ -39,6 +39,11 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("./forge/Main/DetailAdaptor"),
+  loading: Loading,
+});
 //forge安全设置
 const Security = Loadable({
 	loader: () => import('./forge/SecuritySetting/Index'),
@@ -91,6 +96,15 @@ const ProjectIndex = Loadable({
 	loader: () => import("./forge/Index"),
 	loading: Loading,
 });
+
+const CreateMerge = Loadable({
+  loader: () => import('./forge/Merge/NewMerge'),
+  loading: Loading,
+})
+
+// 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
+const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
+
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -100,6 +114,51 @@ class App extends Component {
 			mydisplay: false,
 			occupation: 0,
 			mygetHelmetapi: null,
+			pathType: null,
+			pathName: null,
+		}
+	}
+
+	UNSAFE_componentWillMount() {
+		initAxiosInterceptors(this.props);
+		let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
+		pathname && this.getPathnameType(pathname);
+
+		// 添加路由监听，决定组织还是个人
+		this.unlisten = this.props.history.listen((location) => {
+			let newPathname = location.pathname.split('/')[1];
+			if (this.state.pathName !== newPathname) {
+				// this.setState({ pathType: '' });
+				newPathname && this.getPathnameType(newPathname);
+			}
+		});
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		// (!keyWord.includes(this.props.location.pathname.split('/')[1])) &&
+		if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	getPathnameType = (pathname) => {
+		if (!keyWord.includes(pathname)) {
+			let url = `/owners/${pathname}.json`;
+			axios.get(url).then((response) => {
+				if (response && response.status === 200) {
+					this.setState({
+						pathType: response.data.type || '404',
+						pathName: pathname,
+					})
+				}
+			});
+		}else{
+			this.setState({
+				pathType: pathname,
+				pathName: pathname,
+			});
 		}
 	}
 
@@ -119,13 +178,19 @@ class App extends Component {
 
 	componentDidMount() {
 		document.title = "loading...";
-		initAxiosInterceptors(this.props);
+
 		this.getAppdata();
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
+
 	}
+
+	componentWillUnmount() {
+		this.unlisten && this.unlisten(); // 执行解绑
+	}
+
 	//修改登录方法
 	Modifyloginvalue = () => {
 		this.setState({
@@ -196,7 +261,7 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi } = this.state;
+		const { mygetHelmetapi, pathType} = this.state;
 		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
@@ -204,87 +269,131 @@ class App extends Component {
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
 						<SiderBar />
-						<Router>
-							<Switch>
-								{/* wiki预览 */}
-								<Route path="/projects/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+						{/* <Router> */}
+						<Switch>
+							{/* wiki预览 */}
+							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+								(props) => {
+									return (<WikiPreview {...this.props} {...props} {...this.state} />)
+								}
+							} />
+
+							{/* 项目PR */}
+							<Route path="/:owner/:projectsId/pulls/new"
+								render={
+									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
+								}
+							></Route>
+
+							{/*项目*/}
+							<Route
+								path={"/:owner/:projectId/devops/:opsId/detail"}
+								render={
 									(props) => {
-										return (<WikiPreview {...this.props} {...props} {...this.state} />)
+										return (<OpsDetail {...this.props} {...props} {...this.state} />)
 									}
-								} />
-
-								{/*项目*/}
-								<Route
-									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
-									render={
-										(props) => {
-											return (<OpsDetail {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								<Route
-									path={"/settings"}
-									render={
-										(props) => {
-											return (<Security {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*项目*/}
-								<Route
-									path={"/projects"}
-									render={
-										(props) => {
-											return (<Projects {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								<Route
-									path="/register"
-									render={
-										(props) => {
-											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
+								}>
+							</Route>
+							<Route
+								path={"/settings"}
+								render={
+									(props) => {
+										return (<Security {...this.props} {...props} {...this.state} />)
 									}
-								/>
-								{/*403*/}
-								<Route path="/403" component={Shixunauthority} />
+								}>
+							</Route>
 
-								<Route path="/500" component={http500} />
-								<Route path={"/organize"}
-									render={
-										(props) => {
-											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*404*/}
-								<Route path="/nopage" component={Shixunnopage} />
-
-								{/* 查询 */}
-								<Route path="/search" component={Search} />
-
-
-								{/* 个人主页 */}
-								<Route path="/users/:username"
-									render={
-										(props) => {
-											return (<InfosIndex {...this.props} {...this.state} />)
-										}
-									}></Route>
-								<Route exact path="/"
-									render={
-										(props) => (
-											personal && personal.length > 0 ?
-												<InfosIndex {...this.props} {...props} />
-												:
-												<ProjectIndex {...this.props} {...props} />
-										)
+							<Route
+								path="/register"
+								render={
+									(props) => {
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 									}
-								/>
-								<Route component={Shixunnopage} />
-							</Switch>
-						</Router>
+								}
+							/>
+							{/*403*/}
+							<Route path="/403" component={Shixunauthority} />
+
+							<Route path="/500" component={http500} />
+
+							{/*404*/}
+							<Route path="/nopage" component={Shixunnopage} />
+
+							{/* 查询 */}
+							<Route path="/search" component={Search} />
+
+							<Route exact path="/explore"
+								render={
+									(props) => (
+											<ProjectIndex {...this.props} {...props} />
+									)
+								}
+							/>
+
+
+							{/* 组织 */}
+							<Route path={"/organize"}
+								render={
+									(props) => {
+										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+									}
+								}>
+							</Route>
+							
+							{/*新建项目等*/}
+							<Route
+								path={"/projects"}
+								render={
+									(props) => {
+										return (<Projects {...this.props} {...props} {...this.state} />)
+									}
+								}>
+							</Route>
+
+							{/* 判断为用户/组织，并进入对应页面 */}
+							{
+								pathType === 'User' ?
+									<Route exact path="/:username"
+										render={
+											(props) => {
+												return (<InfosIndex {...this.props} {...this.state} />)
+											}
+										}
+									/> : pathType === 'Organization' ? <Route path={"/:OIdentifier"}
+										render={
+											(props) => {
+												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+											}
+										}>
+									</Route> : pathType === '404' ? <Route component={Shixunnopage} />:
+										<Route exact path="/"
+											render={
+												(props) => (
+													personal && personal.length > 0 ?
+														<InfosIndex {...this.props} {...props} />
+														:
+														<ProjectIndex {...this.props} {...props} />
+												)
+											}
+										/>
+								// <Route path="/" component={Loading} />
+								// <Route path="/" component={Shixunnopage} /> 
+							}
+
+
+
+							{/* 个人主页 */}
+							<Route path="/:username"
+								render={
+									(props) => {
+										return (<InfosIndex {...this.props} {...this.state} />)
+									}
+								}></Route>
+
+
+							<Route component={Shixunnopage} />
+						</Switch>
+						{/* </Router> */}
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>

src/AppConfig.js

@@ -85,7 +85,10 @@ export function initAxiosInterceptors(props) {
     }
 
     if (response.data.status === 404) {
-      locationurl('/nopage');
+      let responseURL = response.request ? response.request.responseURL:'';
+      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
+        locationurl('/nopage');
+      }
     }
 
     if (response.data.status === 500) {

src/college/College.js

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

src/college/colleagecss/colleage.css

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

src/common/DateUtil.js

@@ -107,7 +107,7 @@ export function timeAgo(backDate) {
   try {
     moment(backDate);
   } catch (e) {
-    return;
+    return '刚刚';
   }
   if(typeof backDate ==='number'){
     backDate=backDate*1000
@@ -134,4 +134,5 @@ export function timeAgo(backDate) {
   if (seconds) {
     return seconds + "秒前";
   }
+  return "刚刚";
 }

src/common/UrlTool.js

@@ -18,6 +18,23 @@ export function getImageUrl(path) {
 	return `${path}`;
 }
 
+export function numFormat(num, digits){
+	let d = digits || 1;
+  var si = [
+    { value: 1, symbol: "" },
+    { value: 1E3, symbol: "k" },
+    { value: 1E4, symbol: "W" }
+  ];
+  var rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+  var i;
+  for (i = si.length - 1; i > 0; i--) {
+    if (num >= si[i].value) {
+      break;
+    }
+  }
+  return (num / si[i].value).toFixed(d).replace(rx, "$1") + si[i].symbol;
+}
+
 export function getImage(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net

src/common/educoder.js

@@ -3,7 +3,7 @@
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
 export {
-	getUploadLogoActionUrl as getUploadLogoActionUrl,
+	getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat,
 	getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl

src/context/TPIContextProvider.js

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

src/forge/Activity/ActivityItem.js

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

src/forge/Branch/CloneAddress.js

@@ -1,28 +1,20 @@
 import React, { useState } from 'react';
-import { Dropdown, Menu, Tooltip } from 'antd';
+import { Menu } from 'antd';
 import "./branch.scss";
+import CopyTool from '../Component/CopyTool';
 
 function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
   const [ key , setKey ] = useState("HTTP");
-  // 点击按钮复制功能
-  function jsCopy(){
-    var e = document.getElementById("copy_rep_content");
-    e.select();
-    document.execCommand("Copy");
-  }
-
   return (
     <div className="downMenu">
-      <div style={{padding:"10px 20px 20px 20px",borderBottom:"1px solid #eee"}}>
+      <div style={{borderBottom:"1px solid #eee"}}>
         <Menu className="urlMenu" selectedKeys={[key]} mode={"horizontal"}>
           <Menu.Item key="HTTP" onClick={(e)=>{setKey(e.key)}}>HTTP</Menu.Item>
           <Menu.Item key="SSH" onClick={(e)=>{setKey(e.key)}}>SSH</Menu.Item>
         </Menu>
         <div className="gitAddressClone">
           <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
-          <Tooltip title="复制链接">
-            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
-          </Tooltip>
+          <CopyTool inputId="copy_rep_content" className="copytool"/>
         </div>
       </div>
       <Menu className="edu-txt-center">

src/forge/Branch/Select.jsx

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

src/forge/Branch/SelectOverlay.jsx

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

src/forge/Branch/branch.scss

@@ -27,10 +27,11 @@
   overflow-y: auto;
 }
 .OptionsUl li{
-  height: 35px;
-  line-height: 35px;
+  height: 30px;
+  line-height: 30px;
   cursor: pointer;
-  padding:0px 10px;
+  padding:0px 20px;
+  margin:5px 0px;
 }
 .OptionsUl li:hover{
    background-color: #F0F0F0;
@@ -45,38 +46,49 @@
   width: 100%;
 }
 .branch-tagBox{
-  border:1px solid #eee;
+  border:1px solid #D0D0D0;
   border-radius: 3px;
-  height: 40px;
+  height: 32px;
   display: flex;
   align-items: center;
   cursor: pointer;
-  min-width: 140px;
+  min-width: 104px;
 }
-.branch-tagBox-list .ant-popover-arrow{
-  display: none;
+.branch-tagBox:hover{
+  background-color: #F3F4F6;
 }
-.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{
-  padding-top:0px;
+.branch-tagBox-list{
+  background: #FFFFFF;
+  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
+  border-radius: 4px;
+  .ant-popover-arrow{
+    display: none;
+  }
+  &.ant-popover.ant-popover-placement-bottom{
+    padding-top:0px;
+  }
+  .branch-tagBox .ant-dropdown-link{
+    display: block;
+    flex:1;
+    max-width: 105px;
+  }
+  .ant-popover-inner-content{
+    padding:0px;
+  }
 }
-.branch-tagBox .ant-dropdown-link{
-  display: block;
-  flex:1;
-}
-.branch-tagBox-list .ant-popover-inner-content{
-  padding:0px;
-}
-.navUl{
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 5px;
-}
-.navUl li{
-  cursor: pointer;
-}
-.navUl li.active{
-  color:#5091FF;
+.overlayBranch{
+  width: 325px;
+  .navUl{
+    margin-top: 8px;
+    height: 30px;
+    line-height: 30px;
+    li{
+      height: 30px;
+      line-height: 30px;
+      padding:0px 5px;
+      margin-left: 20px!important;
+    }
+  }
 }
 .listTips{
   padding:20px 0px;
@@ -86,6 +98,7 @@
 .urlMenu{
   line-height: 30px;
   margin-bottom: 10px;
+  padding:15px 20px 0px 20px;
   border-bottom: none;
   li.ant-menu-item{
     height: 30px;
@@ -102,4 +115,7 @@
       border-color:transparent ;
     }
   }
+}
+.copytool{
+  margin:0px 10px;
 }

src/forge/Component/AddGroup.jsx

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

src/forge/Component/Component.scss

@@ -113,7 +113,14 @@ li.ant-menu-item{
   z-index: 10000;
 }
 .laterest{
-  color: #05690d;
+  background-color: #EF3131;
+  color: #fff;
+  font-size: 12px;
+  margin-left: 10px;
+  padding:0px 5px;
+  border-radius: 2px;
+  height: 18px;
+  line-height: 18px;
 }
 
 @media screen and (max-width: 1800px){
@@ -155,41 +162,112 @@ li.ant-menu-item{
     margin:0px 20px!important;
   }
 }
-
+.hoverA{
+  display:flex;
+  align-items: center;
+  max-width: 78px;
+  &:hover a{
+    color:#2A61FF !important ;
+  }
+}
 .menuPanels{
-  width: 240px;
-  height: 180px;
+  width: 295px;
+  .leftline{
+    position: relative;
+    color: #666;
+    height: 16px;
+    margin-left: 14px;
+    font-size: 12px;
+    &::before{
+      position: absolute;
+      left: -7px;
+      top:3px;
+      height: 12px;
+      width: 1px;
+      background-color: #999;
+      content: "";
+    }
+  }
+  .ant-btn{
+    height: 36px;
+    line-height: 34px;
+    width: 83px;
+    text-align: center;
+    padding:0px ;
+    font-weight: 500;
+    font-size: 14px;
+    &.currentBtn{
+      cursor: default;
+      color: #333;
+      &:hover{
+        color: #333;
+        border-color: #d0d0d0;
+      }
+    }
+  }
+  .ant-btn-default{
+    color: #333;
+    border-color: #d0d0d0;
+    &:hover{
+      background: #F3F4F6;
+    }
+  }
+  .ant-btn{
+    width: 102px;
+    height: 32px;
+    line-height: 30px;
+  }
+  .ant-btn-primary{
+    color: #fff;
+    background-color: #466AFF;
+    border:none;
+    &:hover{
+      background-color: rgba(70,106,255,0.85);
+    }
+  }
+  .focusPanelHeadInfo{
+    padding:14px 16px;
+    border-bottom: 1px solid #eee;
+  }
   .ant-popover-content,.ant-popover-inner{
     height: 100%;
     width: 100%;
   }
+  .ant-popover-inner-content{
+    padding:0px;
+  }
 }
 .halfs{
   margin-top: 24px;
   padding:24px 0px 0px 0px;
   border-top: 1px solid #e8e8e8;
-  .attrPerson{
-    padding-bottom: 24px;
-  }
+}
+.aboutSubTitle{
+  display: flex;
+  align-items: center;
+}
+.menuMaininfos{
+  padding:10px 16px 14px;
+  border-bottom: 1px solid #eee;
 }
 .menuinfos{
-  padding:15px 0px;
+  padding:10px 20px 16px;
   &>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;
+      font-size: 16px;
+      font-weight: 500;
       color: #333;
+      line-height: 22px;
     }
     & >span:last-child{
       color: #666;
-    }
-    &:last-child{
-      border-right: none;
+      font-weight: 400;
+      line-height: 20px;
+      margin-top: 6px;
     }
   }
 }

src/forge/Component/Contributors.jsx

@@ -1,13 +1,13 @@
 import React, { useEffect, useState } from 'react';
 import { AlignCenter , FlexAJ  } from '../Component/layout';
 import { Link } from 'react-router-dom';
-import { Popover , Spin } from 'antd';
+import { Popover , Spin , Button } from 'antd';
 import { getImageUrl } from 'educoder';
 import './Component.scss';
 import { getUser } from '../GetData/getData';
 import axios from 'axios';
 
-function Contributors({contributors,owner,projectsId}){
+function Contributors({contributors,owner,projectsId,currentLogin}){
   const [ menuList ,setMenuList ]= useState([]);
   const [ list , setList ]= useState(undefined);
   const [ total , setTotal ]= useState(0);
@@ -46,46 +46,60 @@ function Contributors({contributors,owner,projectsId}){
     }
   }
 
+  function renderOrganize(list) {
+    let str = "";
+    list.map(i=>{
+      str = str+i.name + "、";
+    })
+    return str && str.substr(0,str.length - 1);
+  }
+
   function setMenusFunc(data){
     if(data){
       let ele = (
         <Spin spinning={isSpin}>
-          <FlexAJ>
+          <FlexAJ className="menuMaininfos">
             <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)}
+              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+             
+              <div className="ml10">
+                <Link to={`/${data.login}`}>{data.name}</Link>
+                { data.location && <span className="leftline">{data.location}</span> }
+                {
+                  data.organizations && data.organizations.length>0&&
+                  <p className="task-hide" style={{maxWidth:"215px"}}>
+                    所属组织：{renderOrganize(data.organizations)}
+                  </p>
+                }
               </div>
             </AlignCenter>
-            :""
-          }
-          {
-            data.location && <AlignCenter className="font-12 pt4 pb4"><span>所在地址:</span><span className="ml5">{data.location}</span></AlignCenter>
-          }
+          </FlexAJ>
+          <AlignCenter className="menuinfos">
+            <Link to={`/${data.login}/projects`}>
+              <span>{data.projects_count}</span>
+              <span>项目数</span>
+            </Link>
+            <Link to={`/${data.login}/followers`}>
+              <span>{data.followers_count}</span>
+              <span>粉丝数</span>
+            </Link>
+            <Link to={`/${data.login}/following`}>
+              <span>{data.following_count}</span>
+              <span>关注数</span>
+            </Link>
+          </AlignCenter>
+          <div className={"pb20"} style={{display:"flex",justifyContent:'center'}}>
+            {
+              currentLogin && (currentLogin === data.login)
+              ?
+              <Button className="currentBtn">当前用户</Button>
+              :
+              data.is_watch ? 
+              <Button type={"default"} onClick={()=>FocusFunc(false,data.login)}>已关注</Button>
+              :
+              <Button type={"primary"} onClick={()=>FocusFunc(true,data.login)}>关注TA</Button>
+            }
+          </div>
         </Spin>
       )
       setMenu(ele);
@@ -135,17 +149,17 @@ function Contributors({contributors,owner,projectsId}){
 
   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>
+      <Link to={`/${owner}/${projectsId}/contribute`} className="font-16 color-ooo hoverA">
+        <span>贡献者</span>
+        { contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
+      </Link>
       <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
         {
           total > 0 ?
           list.map((item,key)=>{
             return(
               <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/users/${item.login}`}>
+                <Link key={key} to={`/${item.login}`}>
                   <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
                 </Link>
               </Popover>

src/forge/Component/CopyTool.jsx

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

src/forge/Component/DeleteModal/Index.jsx

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

src/forge/Component/DeleteModal/Index.scss

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

@@ -78,7 +78,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
     if(dataref.type==="file"){
       onClose();
       let value = turnbar(branch);
-      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
+      history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
     }
   }
 

src/forge/Component/EAccount.scss

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

src/forge/Component/LanguagePower.jsx

@@ -25,7 +25,7 @@ function LanguagePower({languages}){
     }
   return(
     <div>
-      <p className="font-16 color-grey-6">开发语言</p>
+      <p className="font-16 color-ooo aboutSubTitle">开发语言</p>
       <div className="progress">
         {
           array && array.map((item,key)=>{

src/forge/Component/MemberCards.jsx

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

src/forge/Component/ProfileModal/Index.jsx

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

src/forge/Component/ProfileModal/Index.scss

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

src/forge/Component/ProfileModal/Profile.jsx

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

src/forge/Component/PublicModal/Index.jsx

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

src/forge/Component/PublicModal/Index.scss

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

src/forge/Component/Releases.jsx

@@ -1,38 +1,34 @@
 import React from 'react';
-import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
+import { AlignTop } 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>
+      <Link to={`/${owner}/${projectsId}/releases`} className="font-16 color-ooo hoverA">
+        <span>发行版</span>
+      { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
+      </Link>
       {
         releaseVersions && releaseVersions.total_count>0 ?
           releaseVersions.list.map((item,key)=>{
             return(
             key === 0 &&<AlignTop className="mt10">
-              <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>
+                  <Link to={`/${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>
+                <p className="color-grey-3 font-12">{item.created_at}</p>
               </div>
             </AlignTop>
             )
           })
-        :""
+        :
+        <div className="mt8">
+          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
+        </div>
       }
       
     </div>

src/forge/Component/Sort.jsx

@@ -2,9 +2,9 @@ import React from 'react';
 import {Popover} from 'antd';
 import './Component.scss';
 
-export default (({menu , children})=>{
+export default (({menu , children, overlayClassName})=>{
   return(
-    <Popover content={menu} trigger={['click']} placement='bottom'>
+    <Popover content={menu} trigger={['click']} placement='bottom' overlayClassName={overlayClassName}>
       {children}
     </Popover>
   )

src/forge/Component/User.jsx

@@ -20,7 +20,7 @@ export default ({ url , name , column  , id , login })=>{
   `;
   return(
     id?
-    <Link to={`/users/${login}`}>
+    <Link to={`/${login}`}>
       <Img>
         { url && <img src={url} alt=""/> }
         <span>{name}</span>

src/forge/DevOps/About.jsx

@@ -149,7 +149,7 @@ function About(props, ref) {
     axios.post(url).then(result=>{
       setIsSpining(false);
       if(result && result.data.status === 0){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
         // 需要将顶部的open_devops修改
         let { changeOpenDevops } = props;
         changeOpenDevops && changeOpenDevops(true);

src/forge/DevOps/Dispose.jsx

@@ -96,7 +96,7 @@ function Dispose(props){
           setVisible(false);
           if(result && result.data){
             props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
           }else{
             props.showNotification("流水线新增失败，请稍后再试！");
           }
@@ -134,12 +134,12 @@ function Dispose(props){
 
   // 模板管理
   function toModalManage(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
+    props.history.push(`/${owner}/${projectsId}/devops/mould`);
   }
 
   // 参数管理
   function toparameter(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+    props.history.push(`/${owner}/${projectsId}/devops/params`);
   }
 
   const operate = current_user && (permission && permission !== "Reporter");

src/forge/DevOps/Dispose/List.jsx

@@ -73,7 +73,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       render:(value,item)=>{
         let v = turnbar(item.branch);
         return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
         )
       }
     },
@@ -117,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
         return(
           <span>
             { operate ? 
-              <Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
+              <Link to={`/${owner}/${projectsId}/devops/${item.id}`} className="mr10 color-grey-6">
               <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
             }
             { operate ? 
@@ -125,7 +125,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
                 <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
               </Popconfirm>:""
             }
-            <Link to={`/projects/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
+            <Link to={`/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
           </span>
         )
       }

src/forge/DevOps/Index.jsx

@@ -36,39 +36,37 @@ export default ((props)=>{
   return(
     <WhiteBack className="opsPanel">
       <Switch {...props}>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/:disposeId"
-          render={
-            (p) => (<New {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/params"
+        
+        <Route path="/:owner/:projectsId/devops/params"
           render={
             (p) => (<Params {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/mould"
+        <Route path="/:owner/:projectsId/devops/mould"
           render={
             (p) => (<Mould {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/new"
+        <Route path="/:owner/:projectsId/devops/new"
           render={
             (p) => (<New {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose"
-          render={
-            (p) => (<Dispose {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/list/:branch"
+        
+        <Route path="/:owner/:projectsId/devops/list/:branch"
           render={
             (p) => (<Stucture {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops"
+        <Route path="/:owner/:projectsId/devops/:disposeId"
           render={
-            (p) => (<About {...props} {...p}/>)
+            (p) => (<New {...props} {...p}/>)
+          }
+        ></Route>
+        {/* 原本的两种合为一个 */}
+        <Route path="/:owner/:projectsId/devops"
+          render={
+            (p) =>{return( p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
           }
         ></Route>
       </Switch>

src/forge/DevOps/Infos.jsx

@@ -26,7 +26,7 @@ export default ((props)=>{
   return(
     <div className="disposePanel">
       <Banner>
-        { permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
+        { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops`}>工作流配置</Link>}
       </Banner>
       <Div>
         <Dispost {...props}/>

src/forge/DevOps/Manage/Params.jsx

@@ -104,7 +104,7 @@ function Params(props){
       <Banner>
         <FlexAJ>
           <span className="font-18">工作流 - 参数管理</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9 ml20">返回</Link>
         </FlexAJ>
       </Banner>
       <Div className="disposeList">

src/forge/DevOps/Mould.jsx

@@ -126,7 +126,7 @@ function Mould(props){
     <div>
       <New wrappedComponentRef={(f) => childRef.current = f} ref={childRef} visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}></New>
       <Banner>
-        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9">返回</Link></FlexAJ>
+        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9">返回</Link></FlexAJ>
       </Banner>
       <Div className="disposeList">
         <FlexAJ>

src/forge/DevOps/Structure.jsx

@@ -198,7 +198,7 @@ function Structure(props,ref){
   }
 
   function clickRows(event,e){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/${e.number}/detail`);
+    props.history.push(`/${owner}/${projectsId}/devops/${e.number}/detail`);
   }
   const column = [
     {
@@ -290,7 +290,7 @@ function Structure(props,ref){
       <Banner>
         <FlexAJ>
           <span>构建列表</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-15 color-grey-9">返回</Link>
         </FlexAJ>
       </Banner>
       <Div>

src/forge/DevOps/disposePipeline.jsx

@@ -275,7 +275,7 @@ function disposePipeline(props){
       ...params
     }).then(result=>{
       if(result){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
       }
       setLoading(false);
     }).catch(error=>{

src/forge/DevOps/opsDetail.jsx

@@ -48,7 +48,7 @@ export default (props) => {
       axios.post(url).then((result) => {
         if (result && result.data) {
           props.showNotification("工作流正在重新构建！");
-          props.history.push(`/projects/${owner}/${projectId}/devops/${result.data.number}/detail`);
+          props.history.push(`/${owner}/${projectId}/devops/${result.data.number}/detail`);
         }
       })
       .catch((error) => {
@@ -87,7 +87,7 @@ export default (props) => {
           </AlignCenter>
           <Link
             style={{ color: "#ddd" }}
-            to={`/projects/${owner}/${projectId}/devops/dispose`}
+            to={`/${owner}/${projectId}/devops`}
           >
             <i className="iconfont icon-yiguanbi font-15 mr5"></i>退出
           </Link>

src/forge/Divert/DivertModal.jsx

@@ -41,14 +41,15 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
   // 确认转移
   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){
+          if(result && result.data.id){
             onSuccess(result.data && result.data.owner);
+          }else{
+            onSuccess();
           }
         }).catch(error=>{})
       }
@@ -104,7 +105,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
           </ul>
           :
           <ul className="descUl">
-            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>仓库仅可以转移到您具有管理权限的组织中</li>
             <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
             <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
           </ul>

src/forge/Head/AddProjectModal.jsx

@@ -1,6 +1,7 @@
 import React, { useState , forwardRef, useEffect } from 'react';
 import { Form , Modal , Input , Radio } from 'antd';
 import Axios from 'axios';
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 export default Form.create()(
   forwardRef((props)=>{
@@ -77,7 +78,7 @@ export default Form.create()(
             </Form.Item>
           </Form>
         </Modal>
-        <a onClick={()=>setVisible(true)}>加入项目</a>
+        <CheckProfile {...props} sureFunc={()=>setVisible(true)}>加入项目</CheckProfile>
       </React.Fragment>
     )
   })

src/forge/Head/Header.js

@@ -10,6 +10,7 @@ import HeadSearch from '../Component/HeadSearch';
 
 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 import './header.scss';
 const $ = window.$
@@ -222,6 +223,15 @@ class NewHeader extends Component {
       }
     }
   }
+  
+  checkProfile=(url)=>{
+    const { showCompeleteDialog , completeProfile } = this.props;
+    if(!completeProfile){
+      showCompeleteDialog && showCompeleteDialog();
+    }else{
+      window.location.href(url);
+    }
+  }
 
   addMenu=(list)=>{
     return(
@@ -231,11 +241,16 @@ class NewHeader extends Component {
           {
             list.map((item,key)=>{
               return(
-                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && 
+                <Menu.Item key={item.name+key}>
+                  <CheckProfile {...this.props} sureFunc={()=>{window.location.href=item.url}}>{item.name}</CheckProfile>
+                </Menu.Item>
               )
             })
           }
-          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
+          <Menu.Item>
+            <AddProjectModal {...this.props} showNotification={this.props.showNotification}/>
+          </Menu.Item>
         </Menu>
       </div>
     )
@@ -245,7 +260,7 @@ class NewHeader extends Component {
     return(
       <Menu className="currentMenu">
         <Menu.Item>
-          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
+          <span className="currentName" title={current_user && current_user.username}>{current_user && current_user.username}</span>
         </Menu.Item>
           {
             personal && personal.length > 0 && personal.map((item,key)=>{
@@ -254,7 +269,7 @@ class NewHeader extends Component {
               )
             })
           }
-          <li><Link to={`/settings/SSH`}>设置</Link></li>
+          <li><Link to={`/settings/profile`}>设置</Link></li>
         <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
       </Menu>
     )
@@ -347,7 +362,7 @@ class NewHeader extends Component {
       })
     }
 
-    // let search_url = settings && settings.common && settings.common.search;
+    let search_url = settings && settings.common && settings.common.search;
     let notice_url = settings && settings.common && settings.common.notice;
     return (
       <div className="newHeaders" id="nHeader">
@@ -385,16 +400,16 @@ class NewHeader extends Component {
                     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")
+                          new_link = new_link.replace(/courses/g, user_login + "/courses")
                         } else if (new_link.indexOf("contests") > -1) {
-                          new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
+                          new_link = new_link.replace(/contests/g, 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")
+                      new_link = new_link.replace(/homes/g, user_login + "/user_activities")
                     }
                     
                     var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
@@ -412,7 +427,7 @@ class NewHeader extends Component {
           </div>
           <div className="head-right">
             {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
-            <HeadSearch {...this.props}/>
+            { 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">
@@ -442,7 +457,7 @@ class NewHeader extends Component {
             </span>
             :
             <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
-              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
+              <a href={`/${this.props.current_user  && this.props.current_user.login}`}>
                 <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
               </a>
             </Dropdown>

src/forge/Head/header.scss

@@ -30,6 +30,13 @@
   width: 120px;
   text-align: center;
   padding:0px;
+  .currentName{
+    padding:0px 8px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
+  }
   li{
     height: 40px;
     line-height: 40px;

src/forge/Index.js

@@ -12,8 +12,9 @@ import Loadable from "react-loadable";
 import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
 
+
 const ProjectNew = Loadable({
-  loader: () => import("./New/Index"), 
+  loader: () => import("./New/Index"),
   loading: Loading,
 });
 const ProjectIndex = Loadable({
@@ -21,21 +22,23 @@ const ProjectIndex = Loadable({
   loading: Loading,
 });
 
-const ProjectDetail = Loadable({
-  loader: () => import("./Main/Detail"),
-  loading: Loading,
-});
+// 项目详情放在用户和组织下作为二级菜单存在
+// const ProjectDetail = Loadable({
+//   loader: () => import("./Main/Detail"),
+//   loading: Loading,
+// });
 
 class Index extends Component {
 
-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
+  componentDidUpdate = () => {
+    this.props.history.listen(() => {
       if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
         window.scrollTo(0, 0)
       }
     })
   }
   render() {
+    
     return (
       <div className="newMain clearfix">
         <Switch {...this.props}>
@@ -52,23 +55,24 @@ class Index extends Component {
             )}
           ></Route>
           <Route
-            path="/projects/new"
+            path="/projects/mirror/new"
             render={(props) => (
               <ProjectNew {...this.props} {...props} />
             )}
           ></Route>
-          <Route
-            path="/projects/:owner/:projectsId"
+          {/* <Route
+            path="/:owner/:projectsId"
             render={(props) => (
               <ProjectDetail {...this.props} {...props} />
             )}
-          ></Route>
+          ></Route> */}
           <Route
-            path="/projects"
+            path="/explore"
             render={(props) => (
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>
+
           <Route
             path="/"
             render={(props) => (
@@ -86,3 +90,10 @@ export default withRouter(
     parentSelector: ".newMain",
   })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
 );
+
+// export default withRouter(
+//   ImageLayerOfCommentHOC({
+//     imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+//     parentSelector: ".newMain",
+//   })(Index)
+// );

src/forge/Main/CoderDepot.jsx

@@ -1,8 +1,9 @@
 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 { Dropdown , Menu , Divider , Spin, Button , Typography } from 'antd';
 import { getImageUrl } from "educoder";
 import { Link } from 'react-router-dom';
+import { truncateCommitId } from "../common/util";
 import CloneAddress from '../Branch/CloneAddress';
 
 import SelectBranch from '../Branch/Select';
@@ -20,10 +21,11 @@ import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
 import Invite from './sub/Invite';
+import CheckProfile from '../Component/ProfileModal/Profile';
 /**
  * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
  */
-
+ const { Paragraph } = Typography;
 function turnbar(str){
   if(str && str.length>0 && str.indexOf("/")>-1){
     return str.replaceAll('/','%2F');
@@ -112,7 +114,7 @@ function CoderDepot(props){
   useEffect(()=>{
     if (projectsId && owner && defaultBranch){
       let b = turnbar(branchName) ;
-      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+      if(pathname.indexOf(`/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
         let url = pathname.split(`/tree/${b}/`)[1];
         setTreeValue(url);
         getFileInfo(url,branchName);
@@ -174,6 +176,7 @@ function CoderDepot(props){
       }
     }).then((result) => {
       if (result) {
+        console.log(result)
         let en = result.data.entries;
         if(en.type){
           setDirInfo(undefined);
@@ -198,7 +201,7 @@ function CoderDepot(props){
   // 切换分支或者标签
   function changeBranch(value){
     let checkvalue = turnbar(value);
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
     props.history.push(url);
   }
     
@@ -207,9 +210,13 @@ function CoderDepot(props){
     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 className="fileMenu">
+      <Menu.Item>
+        <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</CheckProfile>
+      </Menu.Item>
+      <Menu.Item>
+        <CheckProfile  {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</CheckProfile>
+      </Menu.Item>
     </Menu>
     )
   }
@@ -228,12 +235,12 @@ function CoderDepot(props){
     setTreeValue(undefined);
     let branch = branchName || defaultBranch;
     let checkvalue = turnbar(branch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}`);
   };
   // 子目录路径返回链接
   function returnUlr(url){
     let enBranch = turnbar(branchName);
-    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
+    props.history.push(`/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
   }
   // 点击跳转到子目录
   function goToSubRoot(path,type,filename){
@@ -241,7 +248,7 @@ function CoderDepot(props){
       let enBranch = branchName || defaultBranch;
       let checkvalue = turnbar(enBranch);
       setType(type);
-      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+      props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
     }
   }
 
@@ -253,7 +260,7 @@ function CoderDepot(props){
     //点击直接跳转页面 加载一次路由
     let enBranch = branchName || defaultBranch;
     let checkvalue = turnbar(enBranch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
     setType("file");
     setEditReadme(true);
   };
@@ -297,6 +304,7 @@ function CoderDepot(props){
   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}/>
@@ -315,7 +323,7 @@ function CoderDepot(props){
               list = {mainFlag ? dirInfo : undefined}
             />
             <div className="drawerBtn" onClick={()=>setVisible(true)}>
-              <i className="iconfont icon-youjiantou font-16"></i>
+              <i className="iconfont icon-zuohuaicon font-14"></i>
               <span>目录</span>
             </div>
           </React.Fragment>
@@ -328,7 +336,7 @@ function CoderDepot(props){
                 <div className="panelmenu">
                   <FlexAJ>
                     <AlignCenter>
-                      <div className="mr20">
+                      <div className="mr30">
                         {
                           props && props.platform ?
                           <SelectBranch
@@ -341,76 +349,89 @@ function CoderDepot(props){
                             branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
                           ></SelectBranch>
                           :
-                          <span>分支：<span className="color-grey-6">{branchName || defaultBranch}</span></span>
+                          <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>
+           {
+                        treeValuePath && treeValuePath.length > 0 ?
+                        <Path
+                            identifier={projectDetail && projectDetail.identifier}
+                            treeValuePath={treeValuePath}
+                            returnUlr={returnUlr}
+                            returnMain={returnMain}
+                            getPathUrl={getPathUrl}
+                        />
+                            :
+                            <div>
+                                <AlignCenter className="mr20">
+                                    <Link to={`/${owner}/${projectsId}/branches`} className="iconBtn">
+                                        <i className="iconfont icon-master_icon font-16"></i>
+                                        <span>分支</span>
+                                        <span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
+                                    </Link>
+                                </AlignCenter>
+                                <AlignCenter className="mr20">
+                                    <Link to={`/${owner}/${projectsId}/tags`} className="iconBtn">
+                                        <i className="iconfont icon-biaoqianicon font-16"></i>
+                                        <span>标签</span>
+                                        <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
+                                    </Link>
+                                </AlignCenter>
+                            </div>
+                      }
                     </AlignCenter>
-                    <AlignCenter>
+                    <AlignCenter className="depotBtn">
                       {
                         baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
-                        <div className="mr20 addOptionBtn">
+                        <div className="addOptionBtn">
                           {
                             projectDetail.type !== 2 && pullsFlag &&
-                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</CheckProfile>
                           }
                           {
                             issuesFlag &&
-                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 易修</CheckProfile>
                           }
                         </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 
+                          overlay={fileMenu()} 
+                          className="mr10" 
+                          trigger={['click']}
+                          getPopupContainer={document.parentNode}
+                        >
+                          <a>文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-6 mr-5"></i></a>
                         </Dropdown>
                       }
                       
                       <Dropdown overlay={downloadMenu} placement="bottomRight" trigger={['click']}>
-                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white"></i></Button>
+                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white mr-3"></i></Button>
                       </Dropdown>
                     </AlignCenter>
                   </FlexAJ>
                   {
-                    dirInfo || fileInfo ?
+                    (dirInfo && dirInfo.length>0) || 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 onClick={()=>props.history.push(`/${owner}/${projectsId}/commits/${truncateCommitId(lastCommit.sha)}`)} className={hideBtn && hide ? "ellipsistxt hidetxt" :"ellipsistxt"}>
+                            <pre id="ptxt">{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>:"" }
+                          <span className="ml20 color-grey-6 font-12 mt3">{lastCommit.time_from_now}</span>
+                          { 
+                            commitCount ? 
+                            <Link to={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml20 color-grey-3"style={{height:"28px",lineHeight:"28px"}}>
+                              <i className="iconfont icon-tijiaoicon mr3 font-16"></i><span style={{fontWeight:"500"}}>{commitCount}次提交</span>
+                            </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)=>{
@@ -441,56 +462,59 @@ function CoderDepot(props){
                     : ""
                   }
                   {
-                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
+                    (dirInfo && dirInfo.length === 0) && !fileInfo ? <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} /> :"" }
+                  { (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
                 </div>
               </LongWidth>
               {
-                !fileInfo && 
+                 (!(treeValuePath && treeValuePath.length > 0) && !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 className="font-18 color-ooo mb20" style={{lineHeight:"28px"}}>关于
+                        {
+                        projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner" || projectDetail.permission==="Manager") && 
+                          <i onClick={()=>setOpenModal(true)} className="iconfont icon-a-shezhi 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>}
+                      {desc && <p className="font-14 color-grey-3 mb15 task-hide-2" style={{lineHeight:"24px",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>
+                        <div className="color-grey-6 df pinfos mb5">
+                          <i className="iconfont icon-lianjie2 font-15 mr10"></i>
+                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
+                        </div>
                       }
-                      <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>
+                      <div className="pinfos mb5">
+                        <i className="iconfont icon-zishuwenjian_icon font-15 mr10"></i>
+                        <a href="#readme">README.md</a>
+                      </div>
+                      <div className="color-grey-6 mb5">
+                        <i className="iconfont icon-neicunicon font-15 mr10"></i>
                         <span>{projectDetail && projectDetail.size}</span>
-                      </p>
+                      </div>
                       {
                         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 className="pinfos">
+                          <i className="iconfont icon-xieyiicon font-16 mr10"></i>
+                          <Link to={`/${owner}/${projectsId}/tree/${branchName || defaultBranch}/LICENSE`} className="color-grey-6">{projectDetail.license_name}</Link>
+                        </div>
                       }
                     </div>
                     {
                       inviteCode && 
                       <div>
                         <Divider />
-                        <Invite code={inviteCode} className={"detailsCode"}/>
+                        <Invite code={inviteCode}/>
                       </div>
                     }
                     {
                       lesson_url &&
                       <div>
                         <Divider />
-                        <p className="font-16 color-grey-6">实践课程</p>
+                        <p className="font-16 color-ooo">实践课程</p>
                         <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline",wordBreak:"break-all"}}>{lesson_url}</a>
                       </div>
                     }
@@ -511,11 +535,11 @@ function CoderDepot(props){
                     }
                     {/* 贡献者 */}
                     {
-                      projectDetail && projectDetail.contributors &&
-                      <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
+                      projectDetail && projectDetail.contributors && projectDetail.contributors.total_count >0 && 
+                      <Contributors contributors={projectDetail.contributors} owner={owner} projectsId={projectsId} />
                     }
                     {/* 语言 */}
-                    { projectDetail && projectDetail.languages && 
+                    { projectDetail && projectDetail.languages &&
                       <React.Fragment>
                         <Divider />
                         <LanguagePower languages={projectDetail.languages}/>

src/forge/Main/CoderDepotCatalogue.jsx

@@ -4,8 +4,8 @@ import { truncateCommitId } from '../common/util';
 
 const typeIco = {
   "submodule":"icon-file-submodule font-17",
-  "file":'icon-wenjia font-15',
-  "dir":"icon-wenjianjia1 font-15"
+  "file":'icon-wenjian6 font-15 color-blue-file',
+  "dir":"icon-wenjianjia4 font-15 color-blue_4C"
 }
 
 function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
@@ -13,15 +13,15 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
     <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}
+          <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></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}>
+        <Link to={`/${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>
+      <span title={item.commit && item.commit.created_at}>{item.commit && item.commit.time_from_now}</span>
     </li>
   )
 }

src/forge/Main/CoderDepotPath.jsx

@@ -1,3 +1,4 @@
+import { result } from 'lodash';
 import React from 'react';
 
 
@@ -12,6 +13,7 @@ function CoderDepotPath({treeValuePath , returnUlr , returnMain , getPathUrl , i
           {identifier}
         </a>
         {treeValuePath.map((item, key) => {
+          console.log(result)
           return (
             <React.Fragment>
               {

src/forge/Main/CoderDepotReadme.jsx

@@ -1,8 +1,9 @@
 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';
+import { Dropdown , Anchor , Spin } from 'antd';
+
+import ReadmeCatelogue from './sub/ReadmeCatelogue';
 const $ = window.$;
 
 function CoderDepotReadme({ operate , history , readme , ChangeFile }){
@@ -23,49 +24,45 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
       const anchor = el.id;
       const level = el.tagName.replace("H", "");
       const href = `#${anchor}`;
-      return { href:`${path}${href}`,text:el.textContent , level:level }
+      return { href:`${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>
+        <ReadmeCatelogue menuList={menuList} hash={history.location.hash}/>
       )
     }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>
+    <div className="commonBox readBox" id="readme">
+      <Anchor offsetTop={70} targetOffset={160}>
+        <div className="commonBox-title boxTitle">
+          <AlignCenter>
+            <Dropdown overlay={menu()} trigger={['hover']} overlayClassName="menuslist">
+              <span className="catelogue">
+                <i className="iconfont icon-muluicon font-12 mr5"></i>
+                <span>目录</span>
+              </span>
+            </Dropdown>
+            
+              <span className="commonBox-title-read"><a href="#readme ">README.md</a></span>
+            
+          </AlignCenter>
+          {
+            operate ?
+              <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>
+                <i className="iconfont icon-a-bianji font-17 color-grey-6"></i>
+              </a>
+            :""
+          }
+        </div>
+      </Anchor>
       {
         content && 
         <div className="commonBox-info">

src/forge/Main/CoderRootBranch.js

@@ -4,7 +4,7 @@ import { Dropdown , Menu , Icon , Tooltip , Spin } from 'antd';
 import { truncateCommitId } from '../common/util';
 import { getBranch } from '../GetData/getData';
 import Nodata from '../Nodata';
-import './list.css';
+import './list.scss';
 
 function turnbar(str){
   if(str && str.length>0 && str.indexOf("/")>-1){
@@ -38,9 +38,9 @@ export default ((props)=>{
               return(
                 <li key={key}>
                   <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/${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>
+                      <Link to={`/${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>
                       <span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span>
                     </p>
@@ -48,7 +48,7 @@ export default ((props)=>{
                   <span>
                     {
                       (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
-                      <Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
+                      <Link to={`/${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">

src/forge/Main/CoderRootCommit.js

@@ -101,7 +101,7 @@ class CoderRootCommit extends Component{
   // 切换分支 search:tag为根据标签搜索
   changeBranch=(value)=>{
     const { projectsId , owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/commits/branch/${value}`);
+    this.props.history.push(`/${owner}/${projectsId}/commits/branch/${value}`);
   }
 
   ChangePage=(page)=>{
@@ -141,13 +141,13 @@ class CoderRootCommit extends Component{
                     return(
                       <div key={k}>
                         <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>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
                         </AlignTop>
                         <p className="f-wrap-alignCenter mt15">
                           {
                             item.id ?
-                            <Link to={`/users/${item.login}`} className="show-user-link">
+                            <Link to={`/${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>:

src/forge/Main/CoderRootFileDetail.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { Popconfirm , Select } from "antd";
-import "./list.css";
+import "./list.scss";
 import axios from "axios";
 import Meditor from "../Newfile/m_editor";
 import RenderHtml from "../../components/render-html";
@@ -149,7 +149,7 @@ class CoderRootFileDetail extends Component {
       .then((result) => {
         if (result) {
           this.props.showNotification("删除成功!");
-          this.props.history.push(`/projects/${owner}/${projectsId}`);
+          this.props.history.push(`/${owner}/${projectsId}`);
         }
       })
       .catch((error) => {

src/forge/Main/CoderRootIndex.js

@@ -87,57 +87,57 @@ class CoderRootIndex extends Component{
         <Top {...this.props} {...this.state}/>
         <Switch {...this.props}>
           {/* 新建文件 */}
-          <Route path="/projects/:owner/:projectsId/:branch/newfile/:path"
+          <Route path="/:owner/:projectsId/:branch/newfile/:path"
             render={
               (props) => (<FileNew {...this.props} {...props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/uploadfile"
+          <Route path="/:owner/:projectsId/:branch/uploadfile"
             render={
               (props) => (<UploadFile {...this.props} {...props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/newfile"
+          <Route path="/:owner/:projectsId/:branch/newfile"
             render={
               (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+          <Route path="/:owner/:projectsId/commits/branch/:branchName"
             render={
               () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/:sha"
+          <Route path="/:owner/:projectsId/commits/:sha"
             render={
               (props) => (<Diff {...this.props} {...props} {...this.state}/>)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/commits"
+          <Route path="/:owner/:projectsId/commits"
             render={
               () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/:versionId/update"
+          <Route path="/:owner/:projectsId/releases/:versionId/update"
             render={
               (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/new"
+          <Route path="/:owner/:projectsId/releases/new"
             render={
               () => (<CoderRootVersionNew {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/releases"
+          <Route path="/:owner/:projectsId/releases"
             render={
               () => (<CoderRootVersion {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/tag"
+          <Route path="/:owner/:projectsId/tags"
             render={
               () => (<CoderRootTag {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/branchs"
+          <Route path="/:owner/:projectsId/branches"
             render={
               () => (<CoderRootBranch {...this.props} {...this.state} />)
             }

src/forge/Main/CoderRootTag.js

@@ -34,7 +34,7 @@ export default (( props, { projectDetail }) => {
             <div className="div_table">
               <ul className="ul_thead">
                 <li>
-                  <span className="flex1">标签名</span>
+                  <span className="flex1">标记名</span>
                   <span>提交信息</span>
                   <span className="ul_tbody_forth">下载</span>
                 </li>
@@ -49,7 +49,7 @@ export default (( props, { projectDetail }) => {
                           <span className="font-16">{item.name}</span>
                         </span>
                         <span className="ul_tbody_third">
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
                         </span>
                         <span className="ul_tbody_forth">
                           <a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>

src/forge/Main/Detail.js

@@ -1,10 +1,13 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip , Button } from 'antd';
+import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , AlignTop } from '../Component/layout';
+import { Content, AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
-import './list.css';
+import './list.scss';
+
+import { ImageLayerOfCommentHOC } from "../../modules/page/layers/ImageLayerOfCommentHOC";
+
 
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
@@ -103,12 +106,12 @@ const Contribute = Loadable({
 })
 
 const CoderRootCommit = Loadable({
-	loader: () => import('./CoderRootCommit'),
-	loading: Loading,
+  loader: () => import('./CoderRootCommit'),
+  loading: Loading,
 })
 const CoderDepot = Loadable({
-	loader: () => import('./CoderDepot'),
-	loading: Loading,
+  loader: () => import('./CoderDepot'),
+  loading: Loading,
 })
 
 const TrendsIndex = Loadable({
@@ -139,28 +142,28 @@ const WikiEdit = Loadable({
 /**
  * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
  */
-function checkPathname(projectsId,owner,pathname){
+function checkPathname(projectsId, owner, pathname) {
   let name = "";
-  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
-    let url = pathname.split(`/projects/${owner}/${projectsId}`)[1];
-    if(url.indexOf("/about")>-1){
-      name="about"
-    }else if(url.indexOf("/issues")>-1 ||url.indexOf("Milepost") > 0){
+  if (pathname && pathname !== `/${owner}/${projectsId}`) {
+    let url = pathname.split(`/${owner}/${projectsId}`)[1] || "";
+    if (url.indexOf("/about") > -1) {
+      name = "about"
+    } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
       name = "issues";
-    }else if(url.indexOf("/pulls")>-1){
-      name="pulls"
-    }else if(url.indexOf("/milestones")>-1){
-      name="milestones"
-    }else if(url.indexOf("/activity")>-1){
-      name="activity"
-    }else if(url.indexOf("/setting")>-1){
-      name="setting"
-    }else if(url.indexOf(`/devops`)>-1){
-      name="devops"
-    }else if(url.indexOf(`/source`)>-1){
-      name="source"
-    }else if(url.indexOf(`/wiki`)>-1){
-      name="wiki"
+    } else if (url.indexOf("/pulls") > -1) {
+      name = "pulls"
+    } else if (url.indexOf("/milestones") > -1) {
+      name = "milestones"
+    } else if (url.indexOf("/activity") > -1) {
+      name = "activity"
+    } else if (url.indexOf("/settings") > -1) {
+      name = "settings"
+    } else if (url.indexOf(`/devops`) > -1) {
+      name = "devops"
+    } else if (url.indexOf(`/source`) > -1) {
+      name = "source"
+    } else if (url.indexOf(`/wiki`) > -1) {
+      name = "wiki"
     }
   }
   return name;
@@ -183,15 +186,15 @@ class Detail extends Component {
       branchs: undefined,
       branchList: undefined,
       project: null,
-      firstSync:false,
-      secondSync:false,
-      open_devops:false,
-      forkSpin:false,
+      firstSync: false,
+      secondSync: false,
+      open_devops: false,
+      forkSpin: false,
       // 默认分支
-      defaultBranch:undefined,
+      defaultBranch: undefined,
 
       // 非本平台项目
-      platform:false
+      platform: false
     }
   }
 
@@ -208,36 +211,38 @@ class Detail extends Component {
   }
 
   getProject = (num) => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/simple.json`;
     axios.get(url).then((result) => {
       if (result && result.data) {
         this.setState({
           project: result.data,
-          open_devops:result.data.open_devops,
-          platform:result.data.platform && result.data.platform !== 'educoder'
+          open_devops: result.data.open_devops,
+          platform: result.data.platform && result.data.platform !== 'educoder'
         })
 
         if (result.data.type !== 0 && result.data.mirror_status === 1) {
           console.log("--------start channel --------");
           // 是镜像项目，且未完成迁移
           this.canvasChannel();
-          if(num){
+          if (num) {
             this.setState({
-              secondSync:true,
-              firstSync:false
+              secondSync: true,
+              firstSync: false
             })
-          }else{
+          } else {
             this.setState({
-              firstSync:true,
-              secondSync:false
+              firstSync: true,
+              secondSync: false
             })
           }
-        }else{
+        } else if (result.data.mirror_status === 2) {
+          this.deleteProjectBack();
+        } else {
           this.getDetail();
           this.setState({
-            firstSync:false,
-            secondSync:false
+            firstSync: false,
+            secondSync: false
           })
         }
       }
@@ -245,12 +250,16 @@ class Detail extends Component {
   }
 
   // 工作流激活后修改状态
-  changeOpenDevops=(flag)=>{
+  changeOpenDevops = (flag) => {
     this.setState({
-      open_devops:flag
+      open_devops: flag
     })
   }
-  canvasChannel = () => {
+  /**
+   * 
+   * @param {*} deleteFlag ：同步镜像需要提示成功，且未成功的情况下不需要删除项目
+   */
+  canvasChannel = (deleteFlag) => {
     const name = window.location.hostname === "localhost" ? "testforgeplus.trustie.net" : window.location.hostname;
     const actioncable = require("actioncable");
     var project = this.state.project;
@@ -265,11 +274,20 @@ class Detail extends Component {
       disconnected: () => { },
       received: data => {
         console.log(`###### ---received data--- ######`);
+        console.log(data);
         if (data) {
-          this.getDetail();
+          if(deleteFlag){
+            this.props.showNotification("镜像同步成功!");
+            window.location.reload();
+          }else{
+            if (data.project && data.project.mirror_status === 2) {
+              this.deleteProjectBack();
+            }
+            this.getDetail();
+          }
           this.setState({
-            firstSync:false,
-            secondSync:false
+            firstSync: false,
+            secondSync: false
           });
           cable.subscriptions.consumer.disconnect();
         }
@@ -277,8 +295,25 @@ class Detail extends Component {
     })
   }
 
+  deleteProjectBack = () => {
+    const { history } = this.props;
+    const { projectsId, owner } = this.props.match.params;
+    axios.delete(`/${owner}/${projectsId}.json`).then(res => {
+      let hash = '/projects/mirror/new';
+      if (res && res.data) {
+        history.push({
+          pathname: hash,
+          mirror_status: 2
+        });
+      }
+      else {
+        window.location.hash = hash;
+      }
+    });
+  }
+
   getDetail = () => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     this.getBanner();
     const url = `/${owner}/${projectsId}/detail.json`;
     axios.get(url).then((result) => {
@@ -295,29 +330,29 @@ class Detail extends Component {
           watchers_count: result.data.watchers_count,
           praises_count: result.data.praises_count,
           forked_count: result.data.forked_count,
-          defaultBranch:result.data.default_branch
+          defaultBranch: result.data.default_branch
         })
       }
     }).catch((error) => { })
   }
 
   // 获取动态导航栏菜单
-  getBanner(){
-    const { projectsId , owner } = this.props.match.params;
+  getBanner() {
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/menu_list.json`;
-    axios.get(url).then(result=>{
-      if(result){
+    axios.get(url).then(result => {
+      if (result) {
         this.setState({
-          bannerList:result.data
+          bannerList: result.data
         })
       }
-    }).catch(error=>{})
+    }).catch(error => { })
   }
 
   // 关注和取消关注
   focusFunc = (flag) => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
 
     const { project_id } = this.state;
     axios({
@@ -332,15 +367,15 @@ class Detail extends Component {
         this.setWatchersCount(result.data.watchers_count, result.data.watched);
       }
     })
-    .catch(error => {
-      console.log(error);
-    });
+      .catch(error => {
+        console.log(error);
+      });
   }
 
   // 点赞和取消点赞
   pariseFunc = (flag) => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
     const { project_id } = this.state;
     axios({
       method: flag ? 'delete' : 'post',
@@ -350,9 +385,9 @@ class Detail extends Component {
         this.setPraisesCount(result.data.praises_count, result.data.praised)
       }
     })
-    .catch(error => {
-      console.log(error);
-    });
+      .catch(error => {
+        console.log(error);
+      });
   }
 
   setWatchersCount = (count, is_watched) => {
@@ -372,24 +407,24 @@ class Detail extends Component {
   // fork项目
   forkFunc = () => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
     this.setState({
-      forkSpin:true
+      forkSpin: true
     })
     const { current_user } = this.props
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/forks.json`;
     axios.post(url).then(result => {
       if (result && result.data.status === 0) {
-        this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
+        this.props.history.push(`/${current_user && current_user.login}/${result.data.identifier}`);
         this.props.showNotification(result.data.message);
       }
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     }).catch(error => {
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     })
   }
@@ -397,13 +432,15 @@ class Detail extends Component {
   // 同步镜像
   synchronismMirror = () => {
     const { platform } = this.state;
-    if(!platform)return;
-    const { projectsId , owner } = this.props.match.params;
+    if (!platform) return;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/sync_mirror.json`;
     axios.post(url).then(result => {
       if (result && result.data && result.data.status === 0) {
-        this.props.showNotification("镜像同步成功!");
-        this.getProject(2);
+        this.setState({
+          secondSync:true
+        })
+        this.canvasChannel(true);
       } else {
         this.props.showNotification("镜像同步失败!");
       }
@@ -412,348 +449,352 @@ class Detail extends Component {
     })
   }
 
-  textFunc = (forked_from_project_id,fork_info)=>{
+  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>
+        <Link to={`/${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>
+        <Link to={`/${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> : ""
   }
-  
+
 
   render() {
-    const { projectDetail, watchers_count, praises_count, 
-      forked_count, firstSync , secondSync , 
-      isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch , bannerList , forkSpin } = this.state;
+    const { projectDetail, watchers_count, praises_count,
+      forked_count, firstSync, secondSync,
+      isManager, watched, praised,
+      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 { projectsId, owner } = this.props.match.params;
     const { current_user } = this.props;
-    let pathname = checkPathname(projectsId,owner,url);
+    let pathname = checkPathname(projectsId, owner, url);
 
     const { state } = this.props.history.location;
-    
+
     const common = {
       getDetail: this.getDetail,
-      changeOpenDevops:this.changeOpenDevops,
+      changeOpenDevops: this.changeOpenDevops,
       defaultBranch
     }
     return (
       <div>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <AlignTop style={{padding:"20px 0px 10px",justifyContent:"space-between"}}>
+            <AlignTop style={{ padding: "18px 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>
+                      <Link to={`/${project.author.login}`}>{project.author.name}</Link>
                     }
                     <span className="ml5 mr5">/</span>
-                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
+                    <Link to={`/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
                   </div>
-                  { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
+                  {projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
                 </AlignTop>
                 <div className="mt8">
                   {
                     projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                    this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
-                    :""
+                      this.textFunc(projectDetail.forked_from_project_id, projectDetail.fork_info)
+                      : ""
                   }
                   {
-                    projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
-                    <span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
-                    :""
+                    projectDetail && projectDetail.type && projectDetail.type !== 0 ?
+                      <span className="color-grey-9">导入于 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
+                      : ""
                   }
                 </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> : ""
-                    }
-                    <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>
+                  firstSync ? "" :
+                    <span className="df">
                       {
-                        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>
-                        :""
+                        ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
+                          <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
                       }
-                    </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>复刻
+                      <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>
-                      </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>
+                        {
+                          watchers_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `#666` }} to={platform ? { pathname: `/${owner}/${projectsId}/following`, state } : ""}>
+                                {watchers_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{watchers_count}</span>
+                            : ""
+                        }
+                      </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>
+                        {
+                          praises_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `#666` }} to={{ pathname: `/${owner}/${projectsId}/stargazers`, state }}>
+                                {praises_count}
+                              </Link> :
+                              <span className="detail_tag_btn_count">{praises_count}</span>
+                            : ""
+                        }
+                      </span>
+                      <span 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 font-16"></i><span>复刻</span>
+                          </a>
+                        </Tooltip>
+                        {
+                          forked_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" to={{ pathname: `/${owner}/${projectsId}/members`, state }}>
+                                {forked_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{forked_count}</span>
+                            : ""
+                        }
+                      </span>
+                    </span>
                 }
               </div>
             </AlignTop>
             {
               firstSync ? "" :
-              <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}
-              />
+                <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" />
-          </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={
-                  () => (<DevAbout {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* wiki新增文件 */}
-              <Route path="/projects/:owner/:projectsId/wiki/add"
-                render={
-                  () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* wiki编辑文件 */}
-              <Route path="/projects/:owner/:projectsId/wiki/edit/:wikiName"
-                render={
-                  () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* wiki */}
-              <Route path="/projects/:owner/:projectsId/wiki"
-                render={
-                  () => (<Wiki {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 工作流 */}
-              <Route path="/projects/:owner/:projectsId/devops"
-                render={
-                  () => (<DevIndex {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 标签列表 */}
-              <Route path="/projects/:owner/:projectsId/issues/tags"
-                render={
-                  (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 仓库设置 */}
-              <Route path="/projects/:owner/:projectsId/setting"
-                render={
-                  (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 任务详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/detail"
-                render={
-                  (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
-                }
-              ></Route>
-              {/*修改里程碑*/}
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid/edit"
-                render={
-                  (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建里程碑 */}
-              <Route path="/projects/:owner/:projectsId/milestones/new"
-                render={
-                  (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/*里程碑详情*/}
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid"
-                render={
-                  (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 里程碑 */}
-              <Route path="/projects/:owner/:projectsId/milestones"
-                render={
-                  (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 里程碑页面新建任务 */}
-              <Route path="/projects/:owner/:projectsId/issues/:milepostId/new"
-                render={
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建任务 */}
-              <Route path="/projects/:owner/:projectsId/issues/new"
-                render={
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 修改详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail"
-                render={
-                  (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 复制详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail"
-                render={
-                  (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 动态 */}
-              <Route path="/projects/:owner/:projectsId/activity"
-                render={
-                  (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 代码Index */}
-              <Route path="/projects/:owner/:projectsId/issues"
-                render={
-                  (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} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
-                render={
-                  (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount"
-                render={
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
-                render={
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
+            <Content className="spincontent">
+              <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
+            </Content>
+            :
+            <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
+              <Switch {...this.props}>
+                {/* 资源 */}
+                <Route path="/:owner/:projectsId/source"
+                  render={
+                    () => (<Source {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 主页 */}
+                <Route path="/:owner/:projectsId/about"
+                  render={
+                    () => (<DevAbout {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki新增文件 */}
+                <Route path="/:owner/:projectsId/wiki/add"
+                  render={
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki编辑文件 */}
+                <Route path="/:owner/:projectsId/wiki/edit/:wikiName"
+                  render={
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki */}
+                <Route path="/:owner/:projectsId/wiki"
+                  render={
+                    () => (<Wiki {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 工作流 */}
+                <Route path="/:owner/:projectsId/devops"
+                  render={
+                    () => (<DevIndex {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 标签列表 */}
+                <Route path="/:owner/:projectsId/issues/tags"
+                  render={
+                    (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 仓库设置 */}
+                <Route path="/:owner/:projectsId/settings"
+                  render={
+                    (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+               
+                {/*修改里程碑*/}
+                <Route path="/:owner/:projectsId/milestones/:meilid/edit"
+                  render={
+                    (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建里程碑 */}
+                <Route path="/:owner/:projectsId/milestones/new"
+                  render={
+                    (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/*里程碑详情*/}
+                <Route path="/:owner/:projectsId/milestones/:meilid"
+                  render={
+                    (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 里程碑 */}
+                <Route path="/:owner/:projectsId/milestones"
+                  render={
+                    (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 里程碑页面新建任务 */}
+                <Route path="/:owner/:projectsId/issues/:milepostId/new"
+                  render={
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建任务 */}
+                <Route path="/:owner/:projectsId/issues/new"
+                  render={
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 修改详情 */}
+                <Route path="/:owner/:projectsId/issues/:orderId/updatedetail"
+                  render={
+                    (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 复制详情 */}
+                <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
+                  render={
+                    (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                 {/* 任务详情 */}
+                 <Route path="/:owner/:projectsId/issues/:orderId"
+                  render={
+                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
+                  }
+                ></Route>
+                {/* 动态 */}
+                <Route path="/:owner/:projectsId/activity"
+                  render={
+                    (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 代码Index */}
+                <Route path="/:owner/:projectsId/issues"
+                  render={
+                    (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建合并请求 */}
+                <Route path="/:owner/:projectsId/pulls/new/:branch"
+                  render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/new"
+                  render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
+                  render={
+                    (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/Messagecount"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
 
-              <Route path="/projects/:owner/:projectsId/pulls"
-                render={
-                  (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/watchers"
-                render={
-                  (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/stargazers"
-                render={
-                  (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/fork_users"
-                render={
-                  (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="/:owner/:projectsId/pulls"
+                  render={
+                    (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/following"
+                  render={
+                    (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/stargazers"
+                  render={
+                    (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/members"
+                  render={
+                    (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 贡献者列表 */}
+                <Route path="/:owner/:projectsId/contribute"
+                  render={
+                    () => (<Contribute {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
 
-              {/* 代码库----详情页面 */}
-              <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
-                render={
-                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/tree/:branchName"
-                render={
-                  (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) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-            </Switch>
-          </Spin>
+                {/* 代码库----详情页面 */}
+                <Route path="/:owner/:projectsId/commits/branch/:branchName"
+                  render={
+                    (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/tree/:branchName"
+                  render={
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/:subIndex"
+                  render={
+                    (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId"
+                  render={
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+              </Switch>
+            </Spin>
         }
       </div>
     )
   }
 }
 
-export default Detail;
+export default ImageLayerOfCommentHOC({
+  imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+  parentSelector: ".newContainer",
+})(Detail);

src/forge/Main/DetailAdaptor.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
+
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("../Main/Detail"),
+  loading: Loading,
+});
+export default withRouter(
+  (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
+    return (
+      <Switch>
+        <Route
+          path="/:owner/:projectsId"
+          render={(p) => (
+            <ProjectDetail  {...props} {...p} />
+          )}
+        ></Route>
+      </Switch>
+    )
+  }))))
+)

src/forge/Main/DetailTop.js

@@ -12,19 +12,19 @@ class DetailTop extends Component {
         {
           platform ?
           <React.Fragment>
-            <Link to={`/projects/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
               <i className="iconfont icon-tijiaojilu font-20 mr3 font-bd"></i>
               <span>{(coderCount && coderCount.commits_count) || 0}</span>个提交
             </Link>
-            <Link to={`/projects/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/branches`} className={pathname.indexOf("/branches") > 0 ? "active" : ""}>
               <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
               <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
             </Link>
-            <Link to={`/projects/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/tags`} className={pathname.indexOf("/tags") > 0 ? "active" : ""}>
               <i className="iconfont icon-biaoqian3 font-18 mr3"></i>
               <span>{(coderCount && coderCount.tags_count) || 0}</span>个标签
             </Link>
-            <Link to={`/projects/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
               <i className="iconfont icon-fahangban font-18 mr3"></i>
               <span>{(coderCount && coderCount.version_releasesed_count) || 0}</span>个发行版
             </Link>

src/forge/Main/Diff.jsx

@@ -59,7 +59,7 @@ 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}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
             </div>
           </div>
           <div className="f-wrap-between" style={{ alignItems: "center" }}>

src/forge/Main/Index.js

@@ -1,18 +1,19 @@
 import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
 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 './list.scss';
 import './Index.scss';
 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.jpg';
+import CheckProfile from '../Component/ProfileModal/Profile';
+
 const Search = Input.Search;
 
 class Index extends Component {
@@ -228,7 +229,7 @@ class Index extends Component {
   }
 
   getoDetail=(login,identifier)=>{
-    this.props.history.push(`/projects/${login}/${identifier}`);
+    this.props.history.push(`/${login}/${identifier}`);
   }
 
   // 选择语言类别
@@ -254,10 +255,14 @@ class Index extends Component {
 
   newItem = ()=>{
     return(
-      <Menu>
-        <Menu.Item key="created_mirror"><Link to={`/projects/mirror/new`}>新建镜像项目</Link></Menu.Item>
-        <Menu.Item key="created_deposit"><Link to={`/projects/deposit/new`}>新建托管项目</Link></Menu.Item>
-      </Menu>
+      <ul>
+        <li>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile>
+        </li>
+        <li>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile>
+        </li>
+      </ul>
     )
   }
 
@@ -387,7 +392,13 @@ class Index extends Component {
                 <div>
                   {
                     current_user && current_user.login &&
-                    <Popover content={this.newItem()} trigger={["click"]} placement='bottom' className="mr50">
+                    <Popover
+                      overlayClassName="newPopUl" 
+                      content={this.newItem()} 
+                      trigger={["click"]} 
+                      placement='bottom' 
+                      className="mr50"
+                    >
                       <a className="ant-dropdown-link">
                         <span className="color-blue font-16"><img src={img_new} alt="" width="13px" /> 新建</span>
                       </a>

src/forge/Main/Index.scss

@@ -13,6 +13,21 @@
     }
   }
 }
+.iconBtn{
+  i{
+    color: #666;
+  }
+  span{
+    margin-left: 4px;
+    color: #333!important;
+    &:last-child{
+      font-weight: 500;
+    }
+  }
+  &:hover span,&:hover i{
+    color: #466AFF!important;
+  }
+}
 /* recommandProjects */
 .recommandProjects.slick-slider{
   width: 1230px;
@@ -108,46 +123,77 @@
   margin: 0 auto;
   .panelmenu{
     padding-top:30px;
+    .depotBtn{
+      .mr-5{
+        margin-right: -5px;
+      }
+      .ant-btn{
+        height: 32px;
+        line-height: 32px;
+        width: 83px;
+        text-align: center;
+        padding:0px ;
+        font-weight: 500;
+        font-size: 14px;
+      }
+      .ant-btn-default{
+        color: #333;
+        border-color: #d0d0d0;
+        &:hover{
+          background: #F3F4F6;
+        }
+      }
+      .ant-btn-primary{
+        color: #fff;
+        background-color: #466AFF;
+        border: none;
+        &:hover{
+          background-color: rgba(70,106,255,0.85);
+        }
+      }
+    }
   }
-  .addOptionBtn{
-    height: 32px;
-    line-height: 30px;
+  .depotBtn,.addOptionBtn{
     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;
+      color: #333!important;
+      font-weight: 500!important;
+      border-radius: 5px;
+      width: 83px;
+      height: 32px;
+      line-height: 30px;
+      background: #fff;
+      border: 1px solid #D0D0D0;
+      margin-right: 10px;
+      text-align: center;
+      &:hover,&:active{
+        background: #F3F4F6;
+      }
     }
   }
   .infoCount{
     display: inline-block;
-    padding:0px 5px;
-    height: 16px;
-    line-height: 16px;
-    background-color: #eee;
-    color:#999;
+    width: 24px;
+    text-align: center;
+    height: 24px;
+    line-height: 24px;
+    background-color:rgba(153, 153, 153, 0.13);;
+    color:#666;
     border-radius: 12px;
-    margin-left: 10px;
+    margin-left: 6px;
     font-size: 12px;
   }
   .attrPerson{
-    padding-top: 15px;
+    padding-top: 12px;
     display: flex;
     flex-wrap: wrap;
+    padding-bottom: 2px;
     a{
-      margin: 10px 10px 0px 0px;
+      margin: 0px 17px 0px 0px;
       img{
         border-radius: 50%;
-        width: 35px;
-        height: 35px;
+        width: 40px;
+        height: 40px;
       }
       &:nth-child(6){
         margin-right: 0px;
@@ -156,15 +202,15 @@
   }
   .progress{
     display: flex;
-    border-radius: 10px;
-    height: 7px;
+    border-radius: 2px;
+    height: 11px;
     margin-top: 12px;
     span{
       &:first-child{
-        border-radius: 10px 0px 0px 10px;
+        border-radius: 2px 0px 0px 2px;
       }
       &:last-child{
-        border-radius: 0px 10px 10px 0px;
+        border-radius: 0px 2px 2px 0px;
       }
     }
   }
@@ -184,10 +230,11 @@
       padding-left: 15px;
       position: relative;
       min-width: 33.5%;
+      font-size: 12px;
+      font-weight: 400;
+      color: #666;
       span{
-        color: #666;
         &:last-child{
-          color: #999;
           margin-left: 5px;
         }
       }
@@ -195,18 +242,18 @@
   }
   .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;
+      padding:12px 20px 11px;
       border-radius: 4px 4px 0px 0px;
-      background-color: #FAFBFC;
+      border: 1px solid rgba(42, 97, 255, 0.23);
+      background-color: #FAFCFF;
       .ellipsistxt{
         margin-top: 6px;
+        cursor: pointer;
         #ptxt{
           margin-bottom: 0px;
           word-break: break-all;
@@ -227,32 +274,37 @@
           overflow: hidden;
           position: relative;
           padding-right:8px;
-          &::after{
-            position: absolute;
-            right: 0px;
-            bottom: 0px;
-            content:"...";
-          }
+          // &::after{
+          //   position: absolute;
+          //   right: 0px;
+          //   bottom: 0px;
+          //   content:"...";
+          // }
         }
       }
       .ellipsis{
         margin-left: 8px;
         cursor: pointer;
         border-radius: 2px;
-        background-color: #c1c1c1;
+        height: 16px;
+        background: rgba(153, 153, 153, 0.2);
+        border-radius: 2px;
         padding:0px 4px;
         height: 14px;
         line-height: 14px;
         margin-top: 9px;
         i{
           font-size: 15px!important;
-          color: #fff;
+          color: #333;
           height: 14px;
           line-height: 14px;
         }
       }
     }
     .listtablebody{
+      border-radius:0px 0px 4px 4px ;
+      border: 1px solid #D0D0D0;
+      border-top: none;
       li.listtablepath{
         a{color: #40a9ff;}
         p{
@@ -260,12 +312,15 @@
         }
       }
       & > li{
-        height: 42px;
+        height: 38px;
         display: flex;
         justify-content: space-between;
         align-items: center;
         border-bottom: 1px solid #d9d9d9;
         padding:0px 20px 0px 24px;
+        &:hover{
+          background-color: #F3F4F6;
+        }
         & > span:first-child{
           width: 30%;
           overflow: hidden;
@@ -292,8 +347,10 @@
 .drawerBtn{
   position: fixed;
   left: -13px;
-  border:1px solid rgb(207,205,223);
-  width: 34px;
+  width: 33px;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
+  border: 1px solid #666666;
   border-radius: 0px 12px 12px 0px;
   height: 70px;
   top:50%;
@@ -301,63 +358,63 @@
   cursor: pointer;
   display: flex;
   flex-direction: column;
-  align-items: flex-end;
+  align-items: center;
   justify-content: center;
+  padding-left: 7px;
   &:hover{
-    box-shadow: 1px 0px 7px rgba(0,0,0,0.1);
+    box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
   }
   span{
     writing-mode: vertical-lr;
-    color: #202429;
+    color: #333;
     width: 25px;
+    font-size: 14px;
   }
   i{
-    color: #24292e;
-    height: 18px;
-    line-height: 18px;
-    width: 18px;
+    color: #333;
+    height: 14px;
+    line-height: 14px;
+    width: 14px;
+    margin-left: 2px;
+    margin-bottom: 3px;
   }
 }
 .downMenu{
-  width: 330px;
-  box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
+  width: 329px;
   background-color: #fff;
-  .ant-menu-vertical .ant-menu-item:hover{
-    background-color: #e6f7ff;
+  box-shadow: 0px 1px 8px 1px rgba(212, 212, 212, 0.5);
+  padding-bottom: 14px;
+  .ant-menu-item{
+    height: 50px;
+    line-height: 50px;
+  }
+}
+.fileMenu{
+  width: 83px;
+  li{
+    padding:6px 0px!important;
+    text-align: center;
+    width: 100%;
   }
 }
 
-.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);
+  cursor: pointer;
+  background: #FAFBFC;
+  border-radius: 4px;
+  border: 1px solid #D0D0D0;
   font-size: 15px;
   font-weight: normal;
-  border-radius: 5px;
-  margin-right: 10px;
+  margin-right: 12px;
   padding:0px 10px;
   height: 30px;
   line-height: 30px;
   color: #666!important;
   display: flex;
   align-items: center;
+  &:hover{
+    background-color: #F3F4F6;
+  }
   span{
     margin-top: 1px;
   }
@@ -370,4 +427,24 @@
   &:hover{
     color: #05101a;
   }
+}
+.pinfos{
+  i,a{color: #666;}
+  &:hover i,&:hover a{
+    color: #2A61FF!important;
+  }
+}
+.graph{
+  flex:1;
+  margin:0px 12px;
+  .ant-typography{
+    white-space: pre-wrap;
+    margin-bottom: 0px;
+  }
+}
+.ant-anchor-wrapper{
+  padding-left: 2px;
+  .ant-anchor-ink::before{
+    background-color: #fff;
+  }
 }

src/forge/Main/IndexItem.js

@@ -5,7 +5,7 @@ import { AlignCenter } from '../Component/layout';
 import { Link } from 'react-router-dom';
 import '../css/index.scss';
 import Nodata from '../Nodata';
-import './list.css';
+import './list.scss';
 import img_parise from '../Images/parise.png';
 
 class IndexItem extends Component {
@@ -28,35 +28,35 @@ class IndexItem extends Component {
                   <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                 </a>
                 :
-                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
+                <Link to={`/${item.author && 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 }}>
+                    <Link to={`/${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">
+                        <Tooltip title="该项目是一个fork仓库" className="ml5">
                           <i className="iconfont icon-fork font-18 color-orange" />
-                        </span>
+                        </Tooltip>
                         : ""
                     }
                     {
                       item.type && item.type === 2 ?
-                      <Tooltip title="该项目是一个镜像" className="ml5">
+                      <Tooltip title="该项目是一个同步镜像仓库" className="ml5">
                         <i className="iconfont icon-banbenku font-18 color-green" />
                       </Tooltip>:""
                     }
                     {
                       item.type && item.type === 1 ?
-                      <span className="ml5">
+                      <Tooltip title="该项目是一个导入于其他网站的仓库" className="ml5">
                         <i className="iconfont icon-jingxiang font-18 color-green" />
-                      </span>:""
+                      </Tooltip>:""
                     }
                   </AlignCenter>
                   <span className="p-r-tags">

src/forge/Main/list.scss

@@ -218,74 +218,92 @@
 }
 /* -----------详情------------ */
 .detailHeader-wrapper{
-  background-color:#FAFBFC;
-  /* background: url(../Images/forgeBanner.jpg) no-repeat  center; */
-  /* background-size:cover; */
+  background-color:#FBFCFF;
+  border-bottom:1px solid #e2e2e2;
 }
 .headerMenu-wrapper{
-  font-size: 16px;
   display: flex;
   flex-direction: row;
-}
-.headerMenu-wrapper li{
-  position: relative;
-  text-align: center;
-  height: 40px;
-  line-height: 28px;
-  margin-right: 40px;
-}
-.headerMenu-wrapper li a{
-  color: #666;
-}
-.headerMenu-wrapper li a > img{
-  margin-right: 8px;
-}
-.headerMenu-wrapper li a > span.num{
-  height: 28px;
-  line-height: 29px;
-  margin-left: 8px;
-  font-size: 12px;
-  color: #2878FF;
-  float: right;
-}
-.headerMenu-wrapper li.active::after{
-  position: absolute;
-  bottom:0px;
-  height:2px;
-  background-color: #5091FF;
-  content:'';
-  left: 0px;
-  width:100%;
+  cursor: pointer;
+  li{
+    text-align: center;
+    padding:0px;
+    margin-right: 40px;
+    display: flex;
+    & > a{
+      position: relative;
+      font-size: 14px;
+      height: 36px;
+      line-height: 24px;
+      display: block;
+      color: #000!important; 
+      &> span.num{
+        line-height: 24px;
+        margin-left: 5px;
+        font-size: 12px;
+        float: right;
+        color: #666!important;
+        background-color:  rgba(153, 153, 153, 0.13);;
+        border-radius: 50%;
+        width: 24px;
+        height: 24px;
+      }
+    }
+   
+    &.active a::after,&:hover a::after{
+      position: absolute;
+      bottom:0px;
+      height:2px;
+      background-color:rgba(153, 153, 153, 0.2);
+      content:'';
+      left: 0px;
+      width:100%;
+    }
+    &.active span{
+      font-weight: 500;
+    }
+    &.active a::after{
+      background-color: #466AFF;
+    }
+  }
 }
 .detail_tag_btn{
-  height:26px;
-  line-height: 26px;
+  height:32px;
+  line-height: 32px;
   border-radius:5px;
-  border:1px solid #f1f1f1;
+  border:1px solid #D0D0D0;
   display: flex;
   align-items: center;
-  margin-left: 30px;
+  margin-left: 10px;
   padding:0px;
-  background-color: transparent;
+  background-color:#FAFBFC;
   box-shadow: none;
+  .detail_tag_btn_name{
+    padding:0px 10px;
+    text-align: center;
+    height: 30px;
+    line-height: 30px;
+    border-radius:5px 0px 0px 5px;
+    &:hover
+    {
+      background-color: #F3F4F6;
+    }
+    span{
+      color: #333!important;
+    }
+  }
+  .detail_tag_btn_count{
+    width: 42px;
+    text-align: center;
+    background: #fff;
+    border-radius: 0px 4px 4px 0px;
+    height:100%;
+    border-left: 1px solid #D0D0D0;
+  }
 }
 .ant-tooltip {
   max-width: fit-content!important;
 }
-.detail_tag_btn_name{
-  padding:0px 10px;
-  color: #666!important;
-}
-.detail_tag_btn_name img{
-  margin-right: 10px;
-}
-.detail_tag_btn_count{
-  padding:0px 10px;
-  background: #fff;
-  border-radius: 0px 4px 4px 0px;
-  font-size: 12px;
-  height:100%;
-}
 .files-md{
   padding:20px;
 }
@@ -336,6 +354,7 @@
 
 
 .gitAddressClone{
+  margin:14px 20px!important;
   display: flex;
   height: 40px;
   align-items: center;
@@ -499,7 +518,7 @@
 }
 .addFile a{
   display: block;
-  background-color: rgb(76, 172, 255,0.8);
+  background-color: rgba(76, 172, 255,0.8);
   color: #fff;
   cursor: pointer;
   height: 32px;
@@ -514,7 +533,7 @@
   border-left: 1px solid rgba(247, 247, 247, 0.3);
 }
 .addFile a:active{
-  background-color: rgb(76, 172, 255,1);
+  background-color: rgba(76, 172, 255,1);
 }
 
 
@@ -553,7 +572,7 @@
 }
 .commonBox{
   border:1px solid #ddd;
-  margin-top: 30px;
+  margin-top: 18px;
   border-radius: 4px;
 }
 .commonBox .commonBox-title{
@@ -567,14 +586,28 @@
   border-bottom: 1px solid #d9d9d9;
   border-radius: 4px 4px 0px 0px;
 }
+.readBox{
+  border:none;
+  &.commonBox .commonBox-info{
+    border:1px solid #D0D0D0;
+    border-top: none;
+    border-radius: 0px 0px 4px 4px;
+    padding:20px 38px;
+  }
+}
 .commonBox .commonBox-title.boxTitle{
   display: flex;
   justify-content: space-between;
+  height: 55px;
+  line-height: 55px;
+  background: #FAFCFF;
+  border-radius: 4px 4px 0px 0px;
+  border: 1px solid rgba(42, 97, 255, 0.23);
 }
 .synchronism{
   display: block;
-  height: 26px;
-  line-height: 26px;
+  height: 34px;
+  line-height: 34px;
   padding:0px 15px;
   color: #fff!important;
   background-color: #28BD6C;
@@ -583,10 +616,19 @@
 .files_info{
   cursor: pointer;
 }
-.commonBox .commonBox-info{
-  padding:20px 15px;
+.commonBox {
+  .commonBox-info{
+    padding:20px 15px;
+  }
+}
+.commonBox-title-read{
+  vertical-align: middle;
+  color: #000;
+  font-size: 14px;
+  &:hover {
+    color: #466AFF;
+  }
 }
-.commonBox-title-read{vertical-align: middle;color: #666;}
 
 @media screen and (max-width: 370px){
   .p-r-tags,.p-r-btn{
@@ -627,9 +669,7 @@
 .item:last-child{
   border-bottom:none;
 }
-.gitAddressClone{
-  margin: 0 !important;
-}
+
 .item_title small{
   font-weight: 400;
   margin-left: 10px;
@@ -732,4 +772,13 @@ a.color-grey-ccc:hover{
   text-align: center;
   display: flex;
   justify-content: center;
+}
+.depotNum{
+  color: #666!important;
+  span:last-child{
+    color: #333;
+  }
+  &:hover span:last-child{
+    color: #2A61FF;
+  }
 }

src/forge/Main/sub/Contribute.jsx

@@ -52,7 +52,7 @@ function Contribute(props){
                     <AlignCenter>
                       <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
                       <div>
-                        <Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
+                        <Link to={`/${item.login}`} className="font-16">{item.name}</Link>
                         <p className="font-12 color-grey-9">提交{item.contributions}次</p>
                       </div>
                     </AlignCenter>

src/forge/Main/sub/DetailBanner.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Skeleton , Tooltip} from 'antd';
 import { Link } from 'react-router-dom';
+import { numFormat } from 'educoder';
 
 function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
   const [ menuName , setMenuName ] = useState(undefined);
@@ -10,14 +11,14 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
       if(pathname && pathname==="source"){
         let a = list.filter(item=>item.menu_name === "resources");
         if(a && a.length === 0){
-          history.push(`/projects/${owner}/${projectsId}`);
+          history.push(`/${owner}/${projectsId}`);
         }
       }
       setMenuName(list);
     }
   },[list]);
   return(
-    <div className="f-wrap-between mt15">
+    <div className="f-wrap-between mt25">
       {
         menuName && projectDetail ? 
         <ul className="headerMenu-wrapper">
@@ -28,48 +29,48 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "home" &&
                     <li className={pathname==="about" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
-                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/about`, state }}>
+                        <i className={"iconfont icon-zhuye-fill color-grey-3 mr5 font-14"}></i>
                         <span>主页</span>
-                        </Link>
+                      </Link>
                     </li>
                   }
                   {
                     item.menu_name === "code" &&
                     <li className={(pathname==="" || urlFlag) ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
-                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}`, state }}>
+                        <i className={"iconfont icon-daimakuicon1 color-grey-3 mr5 font-14"}></i>
                         <span>代码库</span>
-                        </Link>
+                      </Link>
                     </li>
                   }
                   {
                     item.menu_name === "issues" &&
                     <li className={pathname==="issues" ? "active" : ""}>
-                      <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
-                        <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                          <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
-                          <span>易修</span>
-                          {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
+                        <Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
+                          <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
+                              <i className={"iconfont icon-yixiuicon1 color-grey-3 mr5 font-14"}></i>
+                              <span>易修</span>
+                          </Tooltip>
+                          {projectDetail && projectDetail.issues_count ? <span className="num">{numFormat(projectDetail.issues_count)}</span> : ""}
                         </Link>
-                      </Tooltip>
                     </li>
                   }
                   {
                     item.menu_name === "pulls" && 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-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/pulls`, state }}>
+                        <i className={"iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14"}></i>
                         <span>合并请求</span>
-                        {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
+                        {projectDetail && projectDetail.pull_requests_count ? <span className="num">{numFormat(projectDetail.pull_requests_count)}</span> : ""}
                       </Link>
                     </li>:""
                   }
                   {
                     item.menu_name === "wiki" &&
                     <li className={pathname === "wiki" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/wiki`, state }}>
-                        <i className={pathname==="wiki" ? "iconfont icon-wiki_icon color-grey-3 mr5 font-14":"iconfont icon-wiki_icon color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/wiki`, state }}>
+                        <i className={"iconfont icon-a-wikiicon1 color-grey-3 mr5 font-14"}></i>
                         <span>Wiki</span>
                       </Link>
                     </li>
@@ -77,8 +78,9 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "devops" && platform ? 
                     <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
-                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
+                      {/* <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> */}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/devops`, state:{...state,open_devops} }}>
+                        <i className="iconfont icon-gongzuoliuicon font-13 mr5 color-grey-3"></i>工作流(beta版)
                         {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
                     </li>
@@ -87,37 +89,37 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "resources" &&
                     <li className={pathname==="source" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
-                          <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
-                          <span>资源库</span>
-                          {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/source`, state }}>
+                        <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
+                        <span>资源库</span>
+                        {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                       </Link>
                     </li>
                   }
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
-                          <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i>
-                          <span>里程碑</span>
-                          {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/milestones`, state }}>
+                        <i className={pathname==="milestones" ? "iconfont icon-lichengbeiicon color-grey-3 mr5 font-14":"iconfont icon-lichengbeiicon color-grey-6 font-14 mr5"}></i>
+                        <span>里程碑</span>
+                        {projectDetail && projectDetail.versions_count ? <span className="num">{numFormat(projectDetail.versions_count)}</span> :""}
                       </Link>
                     </li>
                   }
                   {
                     item.menu_name === "activity" &&
                      <li className={pathname==="activity" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
-                        <i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/activity`, state }}>
+                        <i className={pathname==="activity" ? "iconfont icon-dongtaiicon color-grey-3 mr5 font-14":"iconfont icon-dongtaiicon color-grey-6 font-14 mr5"}></i>
                         <span>动态</span>
                       </Link>
                     </li>
                   }
                   {
-                    item.menu_name === "setting" &&
-                    <li className={pathname === "setting" ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                    item.menu_name === "settings" &&
+                    <li className={pathname === "settings" ? "active" : ""}>
+                      <Link to={`/${owner}/${projectsId}/settings`}>
+                        <i className={url && url.indexOf("/settings") > 0 ? "iconfont icon-cangkushezhiicon color-grey-3 mr5 font-14":"iconfont icon-cangkushezhiicon color-grey-6 font-14 mr5"}></i>
                         <span>仓库设置</span>
                       </Link>
                     </li>

src/forge/Main/sub/Invite.jsx

@@ -1,26 +1,15 @@
 import React from 'react';
-import { Tooltip , message } from 'antd';
 import './sub.scss';
+import CopyTool from '../../Component/CopyTool';
 
 function Invite({code,className}) {
 
-  function jsCopy(id) {
-    const copyEle = document.querySelector(id); // 获取要复制的节点
-    const range = document.createRange(); // 创造range
-    window.getSelection().removeAllRanges(); //清除页面中已有的selection
-    range.selectNode(copyEle); // 选中需要复制的节点
-    window.getSelection().addRange(range); // 执行选中元素
-    document.execCommand("Copy"); // 执行copy操作
-    message.success('复制成功');
-  }
   return(
     <div className={className}>
-      <span className="font-16 color-grey-6">邀请码</span>
+      <span className="font-16 color-ooo">邀请码</span>
       <div>
-        <span id="devitecode">{code}</span>
-        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
-          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
-        </Tooltip>
+        <input value={code} id="devitecode" style={{width:"62px",border:"none",cursor:"default"}} readOnly/>
+        <CopyTool timeOut={true} beforeText={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>} className="ml8 font-16" inputId="devitecode"/>
       </div>
     </div>
   )

src/forge/Main/sub/ReadmeCatelogue.jsx

@@ -0,0 +1,57 @@
+import React , { useState , useEffect } from 'react';
+import { Anchor , Input } from 'antd';
+import './sub.scss';
+import { Base64 } from 'js-base64';
+
+const { Link } = Anchor;
+
+function ReadmeCatelogue({ menuList , hash }) {
+  const [ goHref , setGoHref ] = useState("");
+  const [ value , setValue ] = useState("");
+  const [ menu , setMenu] = useState(menuList);
+
+
+  function onChange(link){
+    setGoHref(link);
+  };
+
+  function changeValue(e) {
+    setValue(e.target.value);
+    if(e.target.value){
+      let m = menuList.filter(i=>i.text.indexOf(e.target.value)>-1);
+      setMenu(m);
+    }else{
+      setMenu(menuList);
+    }
+  }
+  return(
+    <div>
+      <div className="searchBox">
+        <Input 
+          placeholder={"请输入关键字"} 
+          value={value}
+          onChange={changeValue}
+          prefix={<i className="iconfont icon-sousuo_icon1 font-14"></i>}/>
+      </div>
+      {
+        menu && menu.length>0?
+        <div className="anchorBox">
+          <Anchor affix={false} onChange={onChange}>
+            {
+              menu.map((item,key)=>{
+                return(
+                  <div style={{paddingLeft:`${item.level *10}px`}} className={goHref===item.href?"items active":"items"}>
+                    <Link href={`#${item.text}`} title={item.text} />
+                  </div>
+                )
+              })
+            }
+          </Anchor>
+        </div>
+        :""
+      }
+      
+    </div>
+  )
+}
+export default ReadmeCatelogue;

src/forge/Main/sub/UpdateDescModal.jsx

@@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
           {getFieldDecorator("lesson_url",{
             rules:[]
           })(
-            <Input placeholder="实践课程链接"/>
+            <Input placeholder="实践课程链接" />
           )}
         </Form.Item>
       </Form>

src/forge/Main/sub/sub.scss

@@ -24,7 +24,44 @@
   }
 }
 
-.detailsCode{
-  display: flex;
-  justify-content: space-between;
+.menuslist{
+  z-index: 100;
+  width: 297px;
+  background: #FFFFFF;
+  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
+  border-radius: 4px;
+  .searchBox{
+    padding:15px;
+    border-bottom: 1px solid #eee;
+  }
+  .ant-anchor-wrapper{
+    margin-left: 0px;
+    padding:5px 15px;
+    max-height: 255px!important;
+    .items{
+      border-radius: 4px;
+      margin-bottom: 5px;
+      cursor: pointer;
+      .ant-anchor-link-title{
+        color: #333333!important;
+      }
+      &:hover{
+        background-color: #F3F4F6;
+      }
+      &.active{
+        background-color: #2A61FF;
+        .ant-anchor-link-title{
+          color: #fff!important;
+        }
+      }
+    }
+    .ant-anchor-link{
+      padding:0px;
+      height: 30px;
+      line-height: 30px;
+    }
+    .ant-anchor-ink::before{
+      background-color: #fff;
+    }
+  }
 }

src/forge/Merge/Commits.jsx

@@ -16,10 +16,10 @@ function Commits({ commits , projectsId , owner }){
               <div className="prInfo">
                 <FlexAJ>
                   <AlignCenter>
-                    <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                    <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
                     <p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p>
                   </AlignCenter>
-                  <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
+                  <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                 </FlexAJ>
                 <AlignCenter className="mt15">
                   <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>

src/forge/Merge/Files.jsx

@@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
                       <span>{item.name}</span>
                     </AlignCenter>
                     <span>
-                      <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
+                      <Button className="mr20" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
                       <span className="color-green">+{item.addition}</span>
                       <span className="color-red ml20">-{item.deletion}</span>
                     </span>

src/forge/Merge/MergeDetail.js

@@ -228,7 +228,7 @@ class MergeDetail extends Component {
               <div>
                 {
                   data && data.issue.user_permission ?
-                    <Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
+                    <Link to={`/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
                     : ''
                 }
               </div>
@@ -248,8 +248,8 @@ class MergeDetail extends Component {
           <div className="detailHeader-wrapper">
             <div className="normal f-wrap-between">
               <ul className="headerMenu-wrapper">
-                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
-                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
+                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
+                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
               </ul>
             </div>
           </div>

src/forge/Merge/MergeItem.js

@@ -49,7 +49,7 @@ class MergeItem extends Component {
   };
 
   render() {
-    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
     const { projectsId , owner } = this.props.match.params;
     const { current_user } = this.props;
     const renderList = () => {
@@ -62,7 +62,7 @@ class MergeItem extends Component {
                 <p className="mb15 df" style={{ alignItems: "center" }}>
                   <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
                   <Link
-                    to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                    to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                     className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
                     style={{ maxWidth: "300px" }}
                   >
@@ -78,7 +78,7 @@ class MergeItem extends Component {
                 </p>
                 <p className="grid-item font-13">
                   <Link
-                    to={`/users/${item && item.author_login}`}
+                    to={`/${item && item.author_login}`}
                     className="show-user-link"
                   >
                     <img
@@ -91,7 +91,7 @@ class MergeItem extends Component {
                   </Link>
                   <AlignCenter>
                     <Link
-                      to={`/users/${item && item.author_login}`}
+                      to={`/${item && item.author_login}`}
                       className="show-user-link color-grey-8 ml5"
                     >
                       {item && item.author_name}
@@ -109,7 +109,7 @@ class MergeItem extends Component {
                         item.pull_request_head &&
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
+                            to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {item.is_original
@@ -133,7 +133,7 @@ class MergeItem extends Component {
                         item.pull_request_base && 
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
+                            to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
@@ -156,7 +156,7 @@ class MergeItem extends Component {
                 <li>
                   {item.assign_user_name ? (
                     <Link
-                      to={`/users/${item.assign_user_login}`}
+                      to={`/${item.assign_user_login}`}
                       className="show-user-link"
                     >
                       {item.assign_user_name}
@@ -175,7 +175,7 @@ class MergeItem extends Component {
                     {item.journals_count ? (
                       <Link
                         className="mr5 color-grey-8"
-                        to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                        to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                       >
                         <i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i>
                         {item.journals_count}
@@ -183,7 +183,7 @@ class MergeItem extends Component {
                     ) : (
                       ""
                     )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {user_admin_or_developer && item.pull_request_status === 0 ? (
                       <div
                         className="milepostleft"
                         style={{
@@ -196,7 +196,7 @@ class MergeItem extends Component {
                       >
                         <div className="grid-item mr15 color-grey-9">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
+                            to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                             className="color-grey-9"
                           >
                             <i className="iconfont icon-bianji3 font-14 mr5"></i>

src/forge/Merge/MergeSubmit.js

@@ -100,7 +100,7 @@ class MergeSubmit extends Component{
         width:"10%",
         render: (text,item) => (
           <span className="f-wrap-alignCenter">
-            <Link to={`/users/${item.login}`} className="show-user-link">
+            <Link to={`/${item.login}`} className="show-user-link">
                 <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
           <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
           </Link>
@@ -110,7 +110,7 @@ class MergeSubmit extends Component{
         title:"SHA",
         dataIndex: 'sha',
         render: (text) => (
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
+          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
         )
       },{
         title:"备注",

src/forge/Merge/MessageCount.js

@@ -361,7 +361,7 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
+                            to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
                             className="ver-middle"
                           >
                             {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
@@ -376,7 +376,7 @@ class MessageCount extends Component {
                         </span>
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${data.pull_request.base}`}
+                            to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
                             className="ver-middle"
                           >
                             {data.issue.project_author_name}:{data.pull_request.base}
@@ -386,14 +386,14 @@ class MessageCount extends Component {
                     }
 
                     <div className="mt15">
-                      <Link to={`/users/${data.issue.author_login}`} className="show-user-link">
+                      <Link to={`/${data.issue.author_login}`} className="show-user-link">
                         <img className="mr5" src={getImageUrl(`/${data.issue.author_picture}`)}
                           alt="" width="24" height="24" style={{borderRadius:"50%"}}
                         />
                       </Link>
                       <span className="ver-middle">
                         <span className="color-grey-8 mr5">由</span>
-                        <Link to={`/users/${data.issue.author_login}`} className="show-user-link color-blue">
+                        <Link to={`/${data.issue.author_login}`} className="show-user-link color-blue">
                           {data.issue.author_name}
                         </Link>
                         <span className="ml5 color-grey-8">
@@ -408,7 +408,7 @@ class MessageCount extends Component {
                           <span className="color-grey-8">审查人员：</span>
                           {data.issue.assign_user_name ? (
                             <Link
-                              to={`/users/${data.issue.assign_user_login}`}
+                              to={`/${data.issue.assign_user_login}`}
                               className="show-user-link color-blue"
                             >
                               {data.issue.assign_user_name}
@@ -424,7 +424,7 @@ class MessageCount extends Component {
                           </span>
                         </span>
                         <span className="ml25">
-                          <span className="color-grey-8">标签：</span>
+                          <span className="color-grey-8">标记：</span>
                           <span className="color-grey-3">
                             {data.issue.issue_tags &&
                             data.issue.issue_tags.length > 0
@@ -448,7 +448,7 @@ class MessageCount extends Component {
                             type="green"
                             ghost
                             className="ml20"
-                            onClick={()=>{this.props.history.push(`/projects/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
+                            onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
                           >
                             编辑
                           </Button>

src/forge/Merge/NewMerge.js

@@ -48,8 +48,10 @@ class NewMerge extends Component {
       this.compareProject(this.state.id,pull,"master");
     }
   }
+
   // 页面销毁取消监听 
   componentWillUnmount () {
+    console.log('----------destoyed---------');
     window.removeEventListener('popstate', this.handleBack, false);
   };
 
@@ -60,8 +62,11 @@ class NewMerge extends Component {
 
   //获取新建分支数据
   getmergelist = (projectsId) => {
-    this.setState({isSpin: true})
-    const { owner } = this.props.match.params;
+    this.setState({isSpin: true});
+    // const { owner } = this.props.match.params;
+    let owner =this.props.history.location.pathname.split('/')[1];
+    console.log('owner:'+owner);
+    console.log(this.props);
     const url = `/${owner}/${projectsId}/pulls/new.json`;
     axios
       .get(url)
@@ -186,7 +191,7 @@ class NewMerge extends Component {
     // this.ischeckmerge();
     let { id ,merge , pull } = this.state;
     if(type==="pull"){
-      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
+      this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
       this.compareProject(id,value,merge);
     }else{
       this.compareProject(id,pull,value);
@@ -208,7 +213,7 @@ class NewMerge extends Component {
         merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
       }
     })
-    this.props.history.push(`/projects/${login}/${identifier}/pulls/new`);
+    this.props.history.push(`/${login}/${identifier}/pulls/new`);
     this.newMergelist(login,identifier);
   };
 
@@ -264,7 +269,9 @@ class NewMerge extends Component {
       show_message,
       default_message,
       merge_head,
-      projects_names,id,comparesData
+      projects_names,
+      id,
+      comparesData
     } = this.state;
     
     const renderBrances = (list, type) => {
@@ -298,6 +305,7 @@ class NewMerge extends Component {
       return <div dangerouslySetInnerHTML={{ __html: html }}></div>;
     };
     let { project } = this.props;
+
     return (
       <div>
         <div className="main">

src/forge/Merge/merge.js

@@ -4,10 +4,11 @@ import "./merge.css";
 import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
-import OrderItem from "./MergeItem";
+import MergeItem from "./MergeItem";
 import './Index.scss';
 
 import axios from "axios";
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 const Search = Input.Search;
 /**
@@ -42,7 +43,7 @@ class merge extends Component {
       //设置选择高亮
       openselect: 1,
       closeselect: undefined,
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       fixed_version_ids: "里程碑",
       assigned_to_ids: "审查人员",
       paix: "排序",
@@ -197,7 +198,7 @@ class merge extends Component {
     });
     this.setState({
       status_type: type,
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       fixed_version_ids: "里程碑",
       assigned_to_ids: "审查人员",
       paix: "排序",
@@ -212,7 +213,7 @@ class merge extends Component {
 
   checkOperation() {
     const { projectsId,owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
+    this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
   }
   render() {
     const { projectsId , owner } = this.props.match.params;
@@ -255,10 +256,10 @@ class merge extends Component {
             />
           </div>
           {
-            data && data.user_admin_or_member &&
-            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
+            data && data.user_admin_or_developer &&
+            <CheckProfile {...this.props} className="topWrapper_btn ml10" sureFunc={() => this.checkOperation()}>
               +&nbsp;新建合并请求
-            </a>
+            </CheckProfile>
           }
         </div>
         <div className="f-wrap-between screenWrap">
@@ -320,7 +321,7 @@ class merge extends Component {
                 className="topWrapperSelect"
                 overlay={this.renderMenu(
                   issue_chosen && issue_chosen.issue_tag,
-                  "标签",
+                  "标记",
                   "issue_tag_id"
                 )}
                 trigger={["click"]}
@@ -387,7 +388,7 @@ class merge extends Component {
           <Spin spinning={isSpin}>
             {data && data.search_count && data.search_count > 0 ? (
               <div>
-                <OrderItem
+                <MergeItem
                   issues={issues}
                   search_count={search_count}
                   page={select_params.page}
@@ -396,8 +397,8 @@ class merge extends Component {
                   project_author_name={data.project_author_name}
                   {...this.props}
                   {...this.state}
-                  user_admin_or_member={data && data.user_admin_or_member}
-                ></OrderItem>
+                  user_admin_or_developer={data && data.user_admin_or_developer}
+                ></MergeItem>
               </div>
             ):""}
             {search_count > select_params.limit ? (

src/forge/Merge/merge_form.js

@@ -165,7 +165,7 @@ class MergeForm extends Component {
               this.setState({
                 isSpin: false,
               });
-              this.props.history.push(`/projects/${owner}/${projectsId}/pulls`);
+              this.props.history.push(`/${owner}/${projectsId}/pulls`);
               const { getDetail } = this.props;
               getDetail && getDetail();
             } else {
@@ -195,7 +195,7 @@ class MergeForm extends Component {
                 isSpin: false,
               });
               this.props.history.push(
-                `/projects/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
+                `/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
               );
             } else {
               this.setState({
@@ -287,7 +287,7 @@ class MergeForm extends Component {
                     type="default"
                     className="ml30"
                     onClick={()=>{
-                      this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`)
+                      this.props.history.push(merge_type === "new" ? `/${owner}/${projectsId}/pulls` : `/${owner}/${projectsId}/pulls/${mergeId}/detail`)
                     }}
                   >
                     <span className="plr10">取消</span>
@@ -300,7 +300,8 @@ class MergeForm extends Component {
                     {getFieldDecorator("assigned_to_id", {
                       initialValue: assigned_to_id,
                     })(
-                      <Select placeholder="审查人员" showSearch>
+                      <Select placeholder="未选择审查人员" showSearch>
+                        <Option key={0} value={""}>未选择审查人员</Option>
                         {this.renderSelect(members)}
                       </Select>
                     )}
@@ -311,12 +312,11 @@ class MergeForm extends Component {
                     })(
                       <Select
                         placeholder={
-                          issue_versions && issue_versions.length > 0
-                            ? "未选择里程碑"
-                            : "请添加里程碑"
+                          issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"
                         }
                         showSearch
                       >
+                        <Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option>
                         {this.renderSelect(issue_versions)}
                       </Select>
                     )}
@@ -327,12 +327,11 @@ class MergeForm extends Component {
                     })(
                       <Select
                         placeholder={
-                          issue_tags && issue_tags.length > 0
-                            ? "未选择标签"
-                            : "请在仓库设置里添加标签"
+                          issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"
                         }
                         showSearch
                       >
+                        <Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option>
                         {this.renderSelect(issue_tags)}
                       </Select>
                     )}

src/forge/Merge/no_data.js

@@ -12,7 +12,7 @@ class Nodata extends Component{
           <h3>欢迎使用合并请求！</h3>
         
           <div className="color-grey-8">
-          合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/projects/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
+          合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
           </div>
         </div>
       </div>

src/forge/New/Index.js

@@ -1,10 +1,11 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete } from 'antd';
+import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete, Modal } from 'antd';
 import { Base64 } from 'js-base64';
+import { AlignCenter } from '../Component/layout';
 
 import '../css/index.scss';
-import './new.css'
+import './new.scss'
 
 import axios from 'axios';
 const Option = Select.Option;
@@ -44,7 +45,12 @@ class Index extends Component {
       project_category_name: undefined,
       license_name: undefined,
       ignore_name: undefined,
-      descNum:0
+      descNum:0,
+
+      categoreFlag:false,
+      languageFlag:false,
+      ignoreFlag:false,
+      licenseFlag:false,
     }
   }
   componentDidMount = () => {
@@ -58,6 +64,8 @@ class Index extends Component {
     this.getGitignore();
     // 获取开源许可证
     this.getLicenses();
+    //判断是否为删除新建项目失败后返回，并执行对应逻辑
+    this.isDeleteProjectBack();
   }
   componentDidUpdate=(prevPros)=>{
     if(prevPros && this.props && !this.props.checkIfLogin()){
@@ -69,6 +77,7 @@ class Index extends Component {
   getOwner=()=>{
     const { OIdentifier } = this.props.match.params;
     const { user_id } = this.props && this.props.current_user;
+    
     const url = `/owners.json`;
     axios.get(url).then(result=>{
       if(result && result.data){
@@ -77,16 +86,13 @@ class Index extends Component {
           OwnerList: owner,
         })
         if(OIdentifier){
-          owner = owner.filter(item=>item.name === OIdentifier);
-          this.props.form.setFieldsValue({
-            user_id:OIdentifier
-          })
+          owner = owner.filter(item=>item.login === OIdentifier);
         }else if(user_id){
           owner = owner.filter(item=>item.id === user_id);
-          this.props.form.setFieldsValue({
-            user_id:owner && owner[0].name
-          })
         }
+        this.props.form.setFieldsValue({
+          user_id:owner && owner[0].name
+        })
         owner && this.setState({
           owners_id:owner[0].id,
           owners_name:owner[0].name
@@ -144,6 +150,31 @@ class Index extends Component {
     }).catch((error) => { })
   }
 
+  isDeleteProjectBack = () => {
+    let mirror_status = this.props.history.location.mirror_status;
+    if (mirror_status === 2 && sessionStorage.newProjectValue) {
+      Modal.warning({
+        title: '警告',
+        content: '项目导入失败！请按操作规范重新导入项目！',
+      });
+      let newProjectValue = JSON.parse(sessionStorage.newProjectValue);
+      if (newProjectValue) {
+        this.setState({
+          project_language_id: newProjectValue.project_language_id,
+          project_category_id: newProjectValue.project_category_id,
+          license_id: newProjectValue.license_id,
+          ignore_id: newProjectValue.ignore_id
+        });
+        delete newProjectValue.project_language_id;
+        delete newProjectValue.project_category_id;
+        delete newProjectValue.license_id;
+        delete newProjectValue.ignore_id;
+        this.props.form.setFieldsValue(newProjectValue);
+      }
+
+    }
+  }
+
   // 设置option
   setOptionsList = (data, _head, name) => {
     if (data && data.length > 0) {
@@ -164,35 +195,40 @@ class Index extends Component {
 
   subMitFrom = () => {
     this.props.form.validateFieldsAndScroll((err, values) => {
+      console.log(values);
       if (!err) {
         this.setState({
           isSpin: true
         })
         const { projectsType } = this.props.match.params;
-        const { project_language_id, project_category_id, license_id, ignore_id , owners_id , owners_name } = this.state;
+        const { 
+          project_language_id, project_category_id, license_id, ignore_id , owners_id , 
+          ignoreFlag,licenseFlag,categoreFlag,languageFlag
+        } = this.state;
         const decoderPass = Base64.encode(values.password);
         const url = (projectsType && projectsType === "mirror") ? "/projects/migrate.json" : "/projects.json";
+        // 新建项目的时候，暂存数据，如果失败，返回的时候可以重新赋值
+        sessionStorage.newProjectValue=JSON.stringify({...values,project_language_id,project_category_id,license_id,ignore_id});
         axios.post(url, {
           ...values,
           auth_password:decoderPass,
-          project_language_id,
-          project_category_id,
-          license_id,
-          ignore_id,
+          project_language_id:languageFlag ? project_language_id : undefined,
+          project_category_id:categoreFlag ? project_category_id : undefined,
+          license_id:licenseFlag ? license_id : undefined,
+          ignore_id:ignoreFlag ? ignore_id : undefined,
           user_id:owners_id
         }).then((result) => {
           if (result && result.data.id) {
-            this.setState({
-              isSpin: false
-            })
-            this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
-            this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
+            projectsType && projectsType !== "mirror" && this.props.showNotification(`项目创建成功!`);
+            this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
           }
+          this.setState({
+            isSpin: false
+          })
         }).catch((error) => {
           this.setState({
             isSpin: false
           })
-          console.log(error);
         })
       } else {
         this.setState({
@@ -287,48 +323,35 @@ class Index extends Component {
 
       mirrorCheck,
 
-      descNum
+      descNum,
+
+      ignoreFlag,
+      licenseFlag,
+      languageFlag,
+      categoreFlag
     } = this.state;
     return (
       <div className="main back-white" style={{padding:"0px",border:"none"}}>
         <div className="newPanel">
-          <div className="newPanel_title">创建{projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目</div>
+          <div className="newPanel_title">{projectsType && projectsType === "mirror" ? "导入" : "新建"}项目</div>
           <Spin spinning={isSpin}>
             <Form>
               <div className="newPanel_content">
-                <Form.Item
-                  label="拥有者"
-                >
-                  {getFieldDecorator('user_id', {
-                    rules: [{
-                      required: true, message: '请选择拥有者'
-                    },{
-                      validator:(rule, value, callback) => this.checkId(rule, value, callback, OwnerList, '拥有者')
-                    }],
-                  })(
-                    <AutoComplete 
-                      placeholder="请选择拥有者"
-                      onChange={(value, e) => this.ChangePlatform(value, e, 'owners', OwnerList)}
-                      className="plateAutoComplete"
-                      onBlur={(value) => this.blurCategory(value, OwnerList, "owners")}
-                      >
-                      {owners_list}
-                    </AutoComplete>
-                  )}
-                </Form.Item>
-                {
+
+              {
                   projectsType && projectsType === "mirror" &&
                   <React.Fragment>
                     <Form.Item
-                      label="镜像版本库地址"
+                      label="导入仓库URL"
                       style={{ marginBottom: "0px" }}
+                      colon={false}
                     >
                       {getFieldDecorator('clone_addr', {
                         rules: [{
                           required: true, message: '请填写镜像版本库地址'
                         }],
                       })(
-                        <Input placeholder="输入需要同步到本项目的镜像版本库地址" onChange={this.ChangeAddr} />
+                        <Input placeholder="请输入需要导入到本项目的仓库地址" onChange={this.ChangeAddr} />
                       )}
                     </Form.Item>
                     <p className="formTip color-orange">示例：https://github.com/facebook/reack.git</p>
@@ -336,12 +359,16 @@ class Index extends Component {
                 }
                 {
                   projectsType && projectsType === "mirror" &&
-                  <React.Fragment>
-                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>需要授权验证<i className={mirrorCheck?"iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i></p>
+                  <div className="pb10">
+                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>
+                      需要授权验证<i className={mirrorCheck ? "iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i>
+                      <span className="ml20 font-12 color-red">如果导入项目为私有仓库，则必须填写相应平台正确的用户名和密码</span>
+                    </p>
                     {
                       mirrorCheck &&
-                      <div className="df mb20" style={{alignItems:'center'}}>
+                      <div className="df mb10" style={{alignItems:'center'}}>
                         <span className="mr10">用户名</span>
+                        <input type="password" style={{display:"none"}} />
                         <Form.Item
                           style={{ marginBottom: "0px" }}
                           label=""
@@ -355,153 +382,153 @@ class Index extends Component {
                         <span className="mr10">密码</span>
                         <Form.Item
                           style={{ marginBottom: "0px" }}
-                          label=""
                         >
                           {getFieldDecorator('password', {
                             rules: [],
                           })(
-                            <Input placeholder="请输入对应平台的登录密码" type="password" style={{width:"240px"}}/>
+                            <Input.Password placeholder="请输入对应平台的登录密码" autocomplete='new-password' style={{width:"240px"}}/>
                           )}
                         </Form.Item>
                       </div>
                     }
-                  </React.Fragment>
+                  </div>
                 }
+                <AlignCenter>
+                  <Form.Item
+                    label="拥有者"
+                    style={{width:"260px"}}
+                    colon={false}
+                    className="explainPos"
+                  >
+                    {getFieldDecorator('user_id', {
+                      rules: [{
+                        required: true, message: '请选择拥有者'
+                      },{
+                        validator:(rule, value, callback) => this.checkId(rule, value, callback, OwnerList, '拥有者')
+                      }],
+                    })(
+                      <AutoComplete 
+                        style={{width:"260px",height:"35px"}}
+                        placeholder="请选择拥有者"
+                        onChange={(value, e) => this.ChangePlatform(value, e, 'owners', OwnerList)}
+                        className="plateAutoComplete"
+                        onBlur={(value) => this.blurCategory(value, OwnerList, "owners")}
+                        >
+                        {owners_list}
+                      </AutoComplete>
+                    )}
+                  </Form.Item>
+                  <span className="ml10 mr10 mt10 font-18">/</span>
+                  <Form.Item
+                    label="项目名称"
+                    className="flex1 explainPos"
+                    colon={false}
+                  >
+                    {getFieldDecorator('name', {
+                      rules: [{
+                        required: true, message: '请填写项目名称'
+                      }],
+                    })(
+                      <Input placeholder="例如：团队协作方法与研究" maxLength={50}/>
+                    )}
+                  </Form.Item>
+                </AlignCenter>
                 <Form.Item
-                  label="项目名称"
+                  label={<span>项目标识 <span className="color-grey-9">(项目url标识部分)</span></span>}
+                  colon={false}
                 >
-                  {getFieldDecorator('name', {
+                  {getFieldDecorator('repository_name', {
                     rules: [{
-                      required: true, message: '请填写项目名称'
+                      required: true, message: '请填写项目标识'
                     }],
                   })(
-                    <Input placeholder="例如：团队协作方法与研究" maxLength={50}/>
+                    <Input placeholder="项目标识请使用与项目相关的英文关键字" maxLength={100} />
                   )}
                 </Form.Item>
                 <div className="pr">
                   <span className="toprightNum">{descNum}/200</span>
                   <Form.Item
                     label="项目简介"
+                    colon={false}
+                    style={{marginBottom:"0px"}}
                   >
                     {getFieldDecorator('description', {
-                      rules: [{
-                        required: true, message: '请填写项目简介'
-                      }],
+                      rules: [],
                     })(
                       <Input.TextArea maxLength={200} placeholder="项目的介绍" autoSize={{ minRows: 2, maxRows: 6 }} onChange={this.changeDesc}/>
                     )}
                   </Form.Item>
                 </div>
-                <Form.Item
-                  label="仓库名称"
-                >
-                  {getFieldDecorator('repository_name', {
-                    rules: [{
-                      required: true, message: '请填写仓库名称'
-                    }],
-                  })(
-                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" maxLength={100} />
-                  )}
-                </Form.Item>
-                <Form.Item
-                  label="项目类别"
-                >
-                  {getFieldDecorator('project_category', {
-                    rules: [{
-                      required: true, message: '请选择大类别',
-                    }, {
-                      validator: (rule, value, callback) => this.checkId(rule, value, callback, CategoryList, '项目类别')
-                    }],
-                  })(
-                    <AutoComplete
-                      placeholder="请选择项目类别"
-                      onChange={(value, e) => this.ChangePlatform(value, e, 'project_category', CategoryList)}
-                      className="plateAutoComplete"
-                      onBlur={(value) => this.blurCategory(value, CategoryList, "project_category")}
-                    >
-                      {project_category_list}
-                    </AutoComplete>
-                  )}
-                </Form.Item>
-                <Form.Item
-                  label="项目语言"
-                >
-                  {getFieldDecorator('project_language', {
-                    rules: [{
-                      required: true, message: '请选择项目语言'
-                    }, {
-                      validator: (rule, value, callback) => this.checkId(rule, value, callback, LanguageList, '项目语言')
-                    }],
-                  })(
-                    <AutoComplete
-                      placeholder="请选择项目语言"
-                      onChange={(value, e) => this.ChangePlatform(value, e, 'project_language', LanguageList)}
-                      className="plateAutoComplete"
-                      onBlur={(value) => this.blurCategory(value, LanguageList, "project_language")}
-                    >
-                      {project_language_list}
-                    </AutoComplete>
-                  )}
-                </Form.Item>
+                
                 {
                   (projectsType === "deposit" || !projectsType) &&
                   <React.Fragment>
                     <Form.Item
-                      label=".gitignore"
+                      className="privatePart"
                     >
-                      {getFieldDecorator('ignore', {
-                        rules: [{
-                          required: true, message: '请选择gitignore'
-                        }, {
-                          validator: (rule, value, callback) => this.checkId(rule, value, callback, GitignoreList, 'gitignore')
-                        }],
-                      })(
-                        <AutoComplete
-                          placeholder="请选择gitignore，用来定义哪些文件不需要添加到版本管理中"
-                          onChange={(value, e) => this.ChangePlatform(value, e, 'ignore', GitignoreList)}
-                          className="plateAutoComplete"
-                          onBlur={(value) => this.blurCategory(value, GitignoreList, "ignore")}
-                        >
-                          {ignore_list}
-                        </AutoComplete>
+                      {getFieldDecorator('ignoreFlag')(
+                        <Checkbox checked={ignoreFlag} onChange={(e)=>this.setState({ignoreFlag:e.target.checked})}>.gitignore</Checkbox>
                       )}
                     </Form.Item>
+                    { ignoreFlag &&
+                      <Form.Item>
+                        {getFieldDecorator('ignore', {
+                          rules: [{
+                            required: ignoreFlag, message: '请选择gitignore'
+                          }, {
+                            validator: (rule, value, callback) => this.checkId(rule, value, callback, GitignoreList, 'gitignore')
+                          }],
+                        })(
+                          <AutoComplete
+                            placeholder="请选择gitignore，用来定义哪些文件不需要添加到版本管理中"
+                            onChange={(value, e) => this.ChangePlatform(value, e, 'ignore', GitignoreList)}
+                            className="plateAutoComplete"
+                            onBlur={(value) => this.blurCategory(value, GitignoreList, "ignore")}
+                          >
+                            {ignore_list}
+                          </AutoComplete>
+                        )}
+                      </Form.Item>
+                    }
                     <Form.Item
-                      label="开源许可证"
+                      className="privatePart"
                     >
-                      {getFieldDecorator('license', {
-                        rules: [{
-                          required: true, message: '请选择开源许可证'
-                        }, {
-                          validator: (rule, value, callback) => this.checkId(rule, value, callback, LicensesList, '开源许可证')
-                        }],
-                      })(
-                        <AutoComplete
-                          placeholder="请选择开源许可证"
-                          onChange={(value, e) => this.ChangePlatform(value, e, 'license', LicensesList)}
-                          className="plateAutoComplete"
-                          onBlur={(value) => this.blurCategory(value, LicensesList, "license")}
-                        >
-                          {license_list}
-                        </AutoComplete>
+                      {getFieldDecorator('licenseFlag')(
+                        <Checkbox checked={licenseFlag} onChange={(e)=>this.setState({licenseFlag:e.target.checked})}>开源许可证</Checkbox>
                       )}
                     </Form.Item>
+                    { licenseFlag &&
+                      <Form.Item>
+                        {getFieldDecorator('license', {
+                          rules: [{
+                            required: licenseFlag, message: '请选择开源许可证'
+                          }, {
+                            validator: (rule, value, callback) => this.checkId(rule, value, callback, LicensesList, '开源许可证')
+                          }],
+                        })(
+                          <AutoComplete
+                            placeholder="请选择开源许可证"
+                            onChange={(value, e) => this.ChangePlatform(value, e, 'license', LicensesList)}
+                            className="plateAutoComplete"
+                            onBlur={(value) => this.blurCategory(value, LicensesList, "license")}
+                          >
+                            {license_list}
+                          </AutoComplete>
+                        )}
+                      </Form.Item>
+                    }
                   </React.Fragment>
                 }
                 <Form.Item
-                  label="可见性"
-                  style={{ margin: "0px" }}
                   className="privatePart"
                 >
                   {getFieldDecorator('private')(
-                    <Checkbox value="limit">将项目设为私有<span className="ml15 font-13 color-grey-9">(只有项目所有人或拥有权限的项目成员才能看到)</span></Checkbox>
+                    <Checkbox value="limit">将项目设为私有<span className="font-13 color-grey-9">(只有项目所有人或拥有权限的项目成员才能看到)</span></Checkbox>
                   )}
                 </Form.Item >
                 {
                   projectsType && projectsType === "mirror" &&
                   <Form.Item
-                    label="迁移类型："
-                    style={{ margin: "0px" }}
                     className="privatePart"
                   >
                     {getFieldDecorator('is_mirror')(
@@ -509,12 +536,69 @@ class Index extends Component {
                     )}
                   </Form.Item >
                 }
-                <div>
+                <Form.Item
+                  style={{ margin: "0px" }}
+                  className="privatePart"
+                >
+                  {getFieldDecorator('categoreFlag')(
+                    <Checkbox checked={categoreFlag} onChange={(e)=>this.setState({categoreFlag:e.target.checked})}>项目类别</Checkbox>
+                  )}
+                </Form.Item>
+                {categoreFlag &&
+                    <Form.Item
+                    className="privatePart"
+                    >
+                      {getFieldDecorator('project_category', {
+                        rules: [{
+                          required: categoreFlag, message: '请选择项目类别',
+                        }, {
+                          validator: (rule, value, callback) => this.checkId(rule, value, callback, CategoryList, '项目类别')
+                        }],
+                      })(
+                        <AutoComplete
+                          placeholder="请选择项目类别"
+                          onChange={(value, e) => this.ChangePlatform(value, e, 'project_category', CategoryList)}
+                          className="plateAutoComplete"
+                          onBlur={(value) => this.blurCategory(value, CategoryList, "project_category")}
+                        >
+                          {project_category_list}
+                        </AutoComplete>
+                      )}
+                  </Form.Item>
+                }
+                <Form.Item
+                  className="privatePart"
+                >
+                  {getFieldDecorator('languageFlag')(
+                    <Checkbox checked={languageFlag} onChange={(e)=>this.setState({languageFlag:e.target.checked})}>项目语言</Checkbox>
+                  )}
+                </Form.Item>
+                {languageFlag && 
+                  <Form.Item>
+                    {getFieldDecorator('project_language', {
+                      rules: [{
+                        required: languageFlag, message: '请选择项目语言'
+                      }, {
+                        validator: (rule, value, callback) => this.checkId(rule, value, callback, LanguageList, '项目语言')
+                      }],
+                    })(
+                      <AutoComplete
+                        placeholder="请选择项目语言"
+                        onChange={(value, e) => this.ChangePlatform(value, e, 'project_language', LanguageList)}
+                        className="plateAutoComplete"
+                        onBlur={(value) => this.blurCategory(value, LanguageList, "project_language")}
+                      >
+                        {project_language_list}
+                      </AutoComplete>
+                    )}
+                  </Form.Item>
+                }
+                <div className="mt20">
                   注：<span className="ant-form-item-required"></span> 为必填项，否则为选填
                 </div>
                 <Form.Item className="formTip mt20">
-                  <Button type="primary" onClick={this.subMitFrom} className="mr20">创建项目</Button>
-                  <Link to={'/projects'} className="btn_32">取消</Link>
+                  <Button type="primary" onClick={this.subMitFrom} className="mr20">{projectsType && projectsType === "mirror" ? "导入" : "创建"}项目</Button>
+                  <Link to={'/explore'} className="btn_32">取消</Link>
                 </Form.Item>
               </div>
             </Form>

src/forge/New/new.scss

@@ -12,7 +12,13 @@
   border-bottom: 1px solid #f0f0f0
 }
 .newPanel_content{
-  padding:1rem 2rem;
+  padding:2rem;
+}
+.newPanel_content form .ant-row.ant-form-item{
+  margin-bottom: 25px;
+}
+.newPanel_content .ant-form-item-label label{
+  font-size: 16px;
 }
 .newPanel_content .ant-form-item-control-wrapper{
   flex: 1;
@@ -25,24 +31,35 @@
   height: 35px;
   line-height: 35px;
 }
-
 .newContent_inline{
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
   align-items:flex-end
 }
+.explainPos{
+  .ant-form-explain{
+    position: absolute;
+  }
+}
 
 .newContent_inline > .ant-form-item:nth-child(2){
   margin-left: 20px;
 }
-.newPanel_content .privatePart .ant-form-item-label{
-  margin-left: 0px;
+.privatePart{
+  margin-bottom: 0px!important;
+  .ant-form-item-label{
+    margin-left: 0px;
+  }
 }
 .newPanel_content .ant-form-item-label{
   line-height: 25px;
   height: 25px;
-  margin-left: -0.8rem;
+}
+.plateAutoComplete{
+  .ant-input{
+    height: 34px!important;
+  }
 }
 @media screen and (max-width: 750px){
   .newPanel_content{

src/forge/Newfile/UserSubmitComponent.js

@@ -86,7 +86,7 @@ class UserSubmitComponent extends Component {
               const { getTopCount } = this.props;
               getTopCount && getTopCount(values.branchname);
             }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+            let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
             this.props.history.push(url);
           }
         })
@@ -123,7 +123,7 @@ class UserSubmitComponent extends Component {
             this.setState({ isSpin: false });
             if (result.data && result.data.status === 1) {
               let b = currentBranch || branch;
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
+              let url = `/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
               this.props.history.push(url);
               this.props.showNotification("文件修改成功!");
             }
@@ -150,7 +150,7 @@ class UserSubmitComponent extends Component {
     return (
       <div>
         <span className="df" style={{ alignItems: "center" }}>
-          <Link to={`/users/${current_user && current_user.login}`} className="show-user-link" >
+          <Link to={`/${current_user && current_user.login}`} className="show-user-link" >
             <img
               src={getImageUrl(`/${current_user && current_user.image_url}`)}
               alt=""
@@ -248,7 +248,7 @@ class UserSubmitComponent extends Component {
             <Button
               type="primary grey"
               onClick={() => {
-                this.props.history.push(`/projects/${owner}/${projectsId}`);
+                this.props.history.push(`/${owner}/${projectsId}`);
               }}
               className="mr20"
             >

src/forge/Newfile/m_editor.js

@@ -4,12 +4,14 @@ import UserSubmitComponent from "./UserSubmitComponent";
 
 import "./index.css";
 import "./editor.css";
+import { edit } from "marked/src/helpers";
 
 class m_editor extends Component {
   constructor(props) {
     super(props);
     this.state = {
       editorValue: this.props.content,
+      prevHeight:0
     };
   }
   componentDidUpdate=(prevProps)=>{
@@ -41,19 +43,57 @@ class m_editor extends Component {
       folding: true,
       foldingStrategy: "indentation", // 代码可分小段折叠
       automaticLayout: true, // 自适应布局
-      // overviewRulerBorder: false, // 不要滚动条的边框
-      // scrollBeyondLastLine: false, // 取消代码后面一大段空白
+      overviewRulerBorder: false, // 不要滚动条的边框
+      scrollBeyondLastLine: false, // 取消代码后面一大段空白
       minimap: {
         // 不要小地图
         enabled: false,
       },
     };
+
+    const handleEditorMount = (editor, monaco) => {
+      editor.onDidChangeModelDecorations(() => {
+        updateEditorHeight(); // typing
+        requestAnimationFrame(updateEditorHeight); //folding
+      });
+
+      const updateEditorHeight = () => {
+        const editorElement = editor.getDomNode();
+
+        if (!editorElement) {
+          return;
+        }
+
+        const padding = 40;
+
+        const lineHeight = editor.getOption(
+          monaco.editor.EditorOption.lineHeight
+        );
+        const lineCount = editor.getModel().getLineCount() || 1;
+        const height = 
+            editor.getTopForLineNumber(lineCount + 1) +
+            lineHeight +
+            padding;
+            
+            if (this.state.prevHeight !== height) {
+              this.serState({
+                prevHeight:height
+              })
+              // setPrevHeight(height);
+              editorElement.style.height = `${height}px`;
+              editor.layout();
+            }
+      };
+    };
+
     return (
+
+
       <React.Fragment>
         <div>
-          <div className="branchTable" style={{border:"1px solid #eee"}}>
+          <div className="">
             <Editor
-              height="400px"
+              // height={this.state.x}
               language={language ? language : "plaintext"}
               theme={"vs-grey"}
               placeholder="请输入内容"
@@ -61,6 +101,7 @@ class m_editor extends Component {
               options={editor_options}
               onChange={this.changeEditor}
               editorWillMount={this.editorWillMount}
+              editorDidMount={handleEditorMount}
             />
           </div>
             {!readOnly && (

src/forge/Notice/Apply.jsx

@@ -63,11 +63,11 @@ function Apply(props) {
               {
                 list.map((i,k)=>{
                   return(
-                    <li>
-                      <Link to={`/users/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
+                    <li key={k}>
+                      <Link to={`/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
                       <div className="notifyFlex">
                         <p className="notifyInfos">
-                          <Link to={`/users/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                          <Link to={`/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
                           <span className="color-grey-9">{i.time_ago}</span>
                         </p>
                         <FlexAJ>

src/forge/Notice/Index.jsx

@@ -33,7 +33,7 @@ function Index(props){
 
   useEffect(()=>{
     if((username && current_user && (current_user.login !== username))){
-      props.history.push(`/users/${username}`);
+      props.history.push(`/${username}`);
     }
   },[current_user,username])
 
@@ -47,14 +47,14 @@ function Index(props){
 
   useEffect(()=>{
     if(pathname && username){
-      if(pathname === `/users/${username}/notice`){
+      if(pathname === `/${username}/notice`){
         setMenu("notify");
         changeNum(user.undo_messages);
       }
-      if(pathname === `/users/${username}/notice/undo`){
+      if(pathname === `/${username}/notice/undo`){
         setMenu("undo");
       }
-      if(pathname === `/users/${username}/notice/apply`){
+      if(pathname === `/${username}/notice/apply`){
         setMenu("apply");
       }
     }
@@ -70,9 +70,9 @@ function Index(props){
   function deleteEvent(type,count) {
     let c = count;
     if(type==="apply"){
-      setTransferCount(transferCount-count);
-    }else if(type==="undo"){
       setApplyCount(applyCount-count);
+    }else if(type==="undo"){
+      setTransferCount(transferCount-count);
     }else{
       setMessagesCount(0);
       c = messagesCount;
@@ -84,19 +84,19 @@ function Index(props){
     <div>
       <ul className="noticeMenu">
         <li className={menu === "notify" ? "active":""}>
-          <Link to={`/users/${username}/notice`} onClick={changeNum}>
+          <Link to={`/${username}/notice`} onClick={changeNum}>
             <span>通知</span>
             {messagesCount ? <span className="unNum">{messagesCount}</span>:""}
           </Link>
         </li>
         <li className={menu === "undo" ? "active":""}>
-          <Link to={`/users/${username}/notice/undo`}>
+          <Link to={`/${username}/notice/undo`}>
             <span>接收仓库</span>
             {transferCount ? <span className="unNum">{transferCount}</span>:""}
           </Link>
         </li>
         <li className={menu === "apply" ? "active":""}>
-          <Link to={`/users/${username}/notice/apply`}>
+          <Link to={`/${username}/notice/apply`}>
             <span>成员申请</span>
             {applyCount ? <span className="unNum">{applyCount}</span>:""}
           </Link>
@@ -104,19 +104,19 @@ function Index(props){
       </ul>
       <Switch>
         <Route
-          path="/users/:username/notice/apply"
+          path="/:username/notice/apply"
           render={(p) => {
             return <Apply {...props} {...p} deleteEvent={deleteEvent}/>;
           }}
         ></Route>
         <Route
-          path="/users/:username/notice/undo"
+          path="/:username/notice/undo"
           render={(p) => {
             return <UndoEvent {...props} {...p} deleteEvent={deleteEvent}/>;
           }}
         ></Route>
         <Route
-          path="/users/:username/notice"
+          path="/:username/notice"
           render={(p) => {
             return <Notify {...props} {...p} deleteEvent={deleteEvent}/>;
           }}