Merge pull request '将功能合并至educoder forge（隐藏wiki）' (#32) from caishi/forgeplus-react:develop_educoder into develop_educoder

创建新文件显示： Add 文件名
修改文件： Update 文件名

package-lock.json

@@ -1273,7 +1273,7 @@
     },
     "babel-cli": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-cli/download/babel-cli-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
       "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
       "dev": true,
       "requires": {
@@ -1296,7 +1296,7 @@
       "dependencies": {
         "chokidar": {
           "version": "1.7.0",
-          "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz?cache=0&sync_timestamp=1602585438968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-1.7.0.tgz",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
           "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
           "dev": true,
           "optional": true,
@@ -1314,7 +1314,7 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
@@ -1413,7 +1413,7 @@
     },
     "babel-helper-bindify-decorators": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-bindify-decorators/download/babel-helper-bindify-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
       "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
       "dev": true,
       "requires": {
@@ -1476,7 +1476,7 @@
     },
     "babel-helper-explode-class": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-explode-class/download/babel-helper-explode-class-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
       "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
       "dev": true,
       "requires": {
@@ -1676,7 +1676,7 @@
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-async-generators/download/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
       "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
       "dev": true
     },
@@ -1687,7 +1687,7 @@
     },
     "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-decorators/download/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
       "dev": true
     },
@@ -1723,7 +1723,7 @@
     },
     "babel-plugin-transform-async-generator-functions": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-async-generator-functions/download/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
       "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
       "dev": true,
       "requires": {
@@ -1755,7 +1755,7 @@
     },
     "babel-plugin-transform-decorators": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-decorators/download/babel-plugin-transform-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
       "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
       "dev": true,
       "requires": {
@@ -2060,7 +2060,7 @@
     },
     "babel-plugin-transform-runtime": {
       "version": "6.23.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
       "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
       "requires": {
         "babel-runtime": "^6.22.0"
@@ -2077,7 +2077,7 @@
     },
     "babel-polyfill": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
       "requires": {
         "babel-runtime": "^6.26.0",
@@ -2087,7 +2087,7 @@
       "dependencies": {
         "regenerator-runtime": {
           "version": "0.10.5",
-          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz?cache=0&sync_timestamp=1595456367497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.10.5.tgz",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
           "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
         }
       }
@@ -2131,7 +2131,7 @@
     },
     "babel-preset-es2015": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-es2015/download/babel-preset-es2015-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
@@ -2179,7 +2179,7 @@
     },
     "babel-preset-react": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.3.13",
@@ -2212,7 +2212,7 @@
     },
     "babel-preset-stage-2": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-2/download/babel-preset-stage-2-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
       "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
       "dev": true,
       "requires": {
@@ -2224,7 +2224,7 @@
     },
     "babel-preset-stage-3": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-3/download/babel-preset-stage-3-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
       "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
       "dev": true,
       "requires": {
@@ -3507,7 +3507,7 @@
     },
     "code-prettify": {
       "version": "0.1.0",
-      "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
       "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
     },
     "codemirror": {
@@ -4885,7 +4885,7 @@
     },
     "dom-closest": {
       "version": "0.2.0",
-      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-closest/-/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.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-matches/-/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.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",
+      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
       "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
     },
     "entities": {
@@ -5706,7 +5706,7 @@
     },
     "eventlistener": {
       "version": "0.0.1",
-      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
       "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
     },
     "events": {
@@ -8040,7 +8040,7 @@
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
@@ -8881,7 +8881,7 @@
     },
     "immutable": {
       "version": "3.7.6",
-      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npmjs.org/immutable/-/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.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.uniq": {
@@ -11673,7 +11673,7 @@
     },
     "output-file-sync": {
       "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/output-file-sync/download/output-file-sync-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
       "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
       "dev": true,
       "requires": {
@@ -19100,7 +19100,7 @@
     },
     "user-home": {
       "version": "1.1.1",
-      "resolved": "https://registry.npm.taobao.org/user-home/download/user-home-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
       "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
       "dev": true
     },
@@ -19157,7 +19157,7 @@
     },
     "v8flags": {
       "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/v8flags/download/v8flags-2.1.1.tgz?cache=0&sync_timestamp=1590964281452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fv8flags%2Fdownload%2Fv8flags-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
       "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
       "dev": true,
       "requires": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge",
-  "version": "3.0.0",
+  "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@monaco-editor/react": "^2.3.0",
@@ -14,7 +14,6 @@
     "babel-jest": "20.0.3",
     "babel-loader": "7.1.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-react-app": "^3.1.1",
     "babel-runtime": "6.26.0",
     "bizcharts": "^3.5.8",
@@ -95,7 +94,6 @@
     "react-resizable": "^1.10.1",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
-    "react-slick": "^0.28.1",
     "react-split-pane": "^0.1.91",
     "react-url-query": "^1.5.0",
     "react-zmage": "^0.8.5-beta.31",
@@ -106,7 +104,6 @@
     "scroll-into-view": "^1.14.2",
     "showdown": "^1.9.1",
     "showdown-katex": "^0.8.0",
-    "slick-carousel": "^1.8.1",
     "store": "^2.0.12",
     "style-loader": "0.19.0",
     "styled-components": "^4.4.1",
@@ -116,9 +113,7 @@
     "webpack-dev-server": "^3.10.3",
     "webpack-manifest-plugin": "^2.2.0",
     "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20",
-    "xterm": "4.8.1",
-    "xterm-addon-fit": "0.4.0"
+    "wrap-md-editor": "^0.2.20"
   },
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",
@@ -193,7 +188,6 @@
     "babel-core": "^6.26.0",
     "babel-plugin-import": "^1.13.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
@@ -204,7 +198,6 @@
     "node-sass": "^4.12.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "purgecss": "^2.1.2",
-    "react-json-view": "^1.21.3",
     "reqwest": "^2.0.5",
     "resize-observer-polyfill": "^1.5.1",
     "terser-webpack-plugin": "^2.3.5",

public/css/edu-common.css

@@ -25,9 +25,6 @@ html {
   min-width: 1200px
 }
 
-.newFooter {
-  max-height: 110px;
-}
 
 .newFooter {
   position: absolute;

public/css/edu-purge.css

@@ -1307,6 +1307,7 @@ td,
 span {
   margin: 0;
   padding: 0;
+  margin-bottom: 0px!important;
 }
 
 table,
@@ -1753,7 +1754,7 @@ a.decoration {
 }
 
 .mb15 {
-  margin-bottom: 15px!important;
+  margin-bottom: 15px;
 }
 
 .mb16 {
@@ -2424,16 +2425,10 @@ input::-ms-clear {
 .color-grey-c {
   color: #ccc !important;
 }
-a.hoverLine:hover{
-  text-decoration: underline;
-}
+
 .color-grey-cd {
   color: #cdcdcd !important;
 }
-.color-grey-d {
-  color: #ddd;
-}
-
 
 .color-grey-9 {
   color: #999999 !important;
@@ -3590,7 +3585,6 @@ a.user_bluebg_btn {
   margin-right: 5px;
 }
 
-
 /***** loading ******/
 /*****载入中******/
 #ajax-indicator {
@@ -3957,7 +3951,7 @@ html>body #ajax-indicator {
   display: block;
   height: 100%;
   width: 100%;
-  color: #333;
+  color: #fff;
   font-size: 16px;
 }
 
@@ -6691,10 +6685,4 @@ p{
   right: 0px;
   top:4px;
   color: #999;
-}
-.ant-input, .ant-input .ant-input-suffix{
-  background-color: #fff!important;
-}
-.has-error .ant-input{
-  background-color: #FEF1F0!important;
 }

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1627870211301') format('woff2'),
-       url('iconfont.woff?t=1627870211301') format('woff'),
-       url('iconfont.ttf?t=1627870211301') format('truetype');
+  src: url('iconfont.woff2?t=1630045103946') format('woff2'),
+       url('iconfont.woff?t=1630045103946') format('woff'),
+       url('iconfont.ttf?t=1630045103946') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,202 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.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";
+}
+
+.icon-xieyiicon:before {
+  content: "\e870";
+}
+
+.icon-neicunicon:before {
+  content: "\e891";
+}
+
+.icon-zishuwenjian_icon:before {
+  content: "\e8a6";
+}
+
+.icon-biaoqianicon:before {
+  content: "\e882";
+}
+
+.icon-a-bianji:before {
+  content: "\e883";
+}
+
+.icon-cangkushezhiicon:before {
+  content: "\e885";
+}
+
+.icon-lianjieicon:before {
+  content: "\e887";
+}
+
+.icon-hebingqingqiuicon:before {
+  content: "\e888";
+}
+
+.icon-lichengbeiicon:before {
+  content: "\e889";
+}
+
+.icon-gongzuoliuicon:before {
+  content: "\e88a";
+}
+
+.icon-dongtaiicon:before {
+  content: "\e88b";
+}
+
+.icon-morendianzan_icon:before {
+  content: "\e88e";
+}
+
+.icon-muluicon:before {
+  content: "\e894";
+}
+
+.icon-a-shezhi:before {
+  content: "\e899";
+}
+
+.icon-tijiaoicon:before {
+  content: "\e89e";
+}
+
+.icon-morenguanzhu_ICON:before {
+  content: "\e89f";
+}
+
+.icon-xialaanniu1:before {
+  content: "\e8a4";
+}
+
+.icon-zuohuaicon:before {
+  content: "\e8b5";
+}
+
+.icon-master_icon:before {
+  content: "\e8b6";
+}
+
+.icon-morenfuke_icon:before {
+  content: "\e8b7";
+}
+
+.icon-a-wikiicon:before {
+  content: "\e8b8";
+}
+
+.icon-yixiuicon:before {
+  content: "\e8b9";
+}
+
+.icon-suofang:before {
+  content: "\e87f";
+}
+
+.icon-fangdaicon:before {
+  content: "\e881";
+}
+
+.icon-sousuo_icon1:before {
+  content: "\e873";
+}
+
+.icon-huanying_icon:before {
+  content: "\e878";
+}
+
+.icon-wenjianjia2:before {
+  content: "\e879";
+}
+
+.icon-shanchuicon1:before {
+  content: "\e87a";
+}
+
 .icon-qingqiuicon:before {
   content: "\e871";
 }
@@ -49,10 +245,6 @@
   content: "\e898";
 }
 
-.icon-xialaanniu_icon:before {
-  content: "\e89a";
-}
-
 .icon-weixuanzhongqingqiuicon:before {
   content: "\e89b";
 }
@@ -61,10 +253,6 @@
   content: "\e8a1";
 }
 
-.icon-xuanzhongxiangyingicon:before {
-  content: "\e8a2";
-}
-
 .icon-xuanzhongfenzhiicon:before {
   content: "\e8a3";
 }
@@ -81,18 +269,6 @@
   content: "\e8af";
 }
 
-.icon-xinzengmulu_xuantingicon:before {
-  content: "\e884";
-}
-
-.icon-xinzengyemian_morenicon:before {
-  content: "\e885";
-}
-
-.icon-zhankai_morenicon:before {
-  content: "\e889";
-}
-
 .icon-shanchu_tc_icon:before {
   content: "\e88c";
 }
@@ -101,26 +277,14 @@
   content: "\e88d";
 }
 
-.icon-xinzengyemian_shubiaodianjiicon:before {
-  content: "\e88e";
-}
-
 .icon-daorumoban_icon:before {
   content: "\e86f";
 }
 
-.icon-daochu_xuanfu:before {
-  content: "\e870";
-}
-
 .icon-cuowu:before {
   content: "\e872";
 }
 
-.icon-chenggong1:before {
-  content: "\e873";
-}
-
 .icon-gengduo_icon:before {
   content: "\e874";
 }
@@ -129,26 +293,10 @@
   content: "\e875";
 }
 
-.icon-fuzhi_icon:before {
-  content: "\e876";
-}
-
 .icon-shanchuicon:before {
   content: "\e877";
 }
 
-.icon-a-lajitong_icon3x:before {
-  content: "\e878";
-}
-
-.icon-shouqi_morenicon:before {
-  content: "\e879";
-}
-
-.icon-huanying_icon:before {
-  content: "\e87a";
-}
-
 .icon-sousuo_shanchuicon:before {
   content: "\e87b";
 }
@@ -161,22 +309,10 @@
   content: "\e87e";
 }
 
-.icon-wenjianjia_icon:before {
-  content: "\e87f";
-}
-
 .icon-xialaanniu:before {
   content: "\e880";
 }
 
-.icon-xinzengmulu_morenicon:before {
-  content: "\e882";
-}
-
-.icon-xinzengmulu_shubiaodianjiicon:before {
-  content: "\e883";
-}
-
 .icon-erciqueren_icon:before {
   content: "\e867";
 }

public/css/iconfont.json

@@ -5,6 +5,349 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "23655968",
+      "name": "新手指引",
+      "font_class": "xinshouzhiyin",
+      "unicode": "e8e4",
+      "unicode_decimal": 59620
+    },
+    {
+      "icon_id": "23655969",
+      "name": "新建项目",
+      "font_class": "xinjianxiangmu",
+      "unicode": "e8e6",
+      "unicode_decimal": 59622
+    },
+    {
+      "icon_id": "23658111",
+      "name": "加入课堂",
+      "font_class": "jiaruketang1",
+      "unicode": "e8e9",
+      "unicode_decimal": 59625
+    },
+    {
+      "icon_id": "23791639",
+      "name": "项目公告",
+      "font_class": "xiangmugonggao",
+      "unicode": "e8c2",
+      "unicode_decimal": 59586
+    },
+    {
+      "icon_id": "23791640",
+      "name": "成果",
+      "font_class": "chengguo",
+      "unicode": "e8c3",
+      "unicode_decimal": 59587
+    },
+    {
+      "icon_id": "23791410",
+      "name": "成交公告",
+      "font_class": "chengjiaogonggao",
+      "unicode": "e8c0",
+      "unicode_decimal": 59584
+    },
+    {
+      "icon_id": "23791411",
+      "name": "技术资产",
+      "font_class": "jishuzichan",
+      "unicode": "e8c1",
+      "unicode_decimal": 59585
+    },
+    {
+      "icon_id": "23790928",
+      "name": "废标公告",
+      "font_class": "feibiaogonggao",
+      "unicode": "e8bc",
+      "unicode_decimal": 59580
+    },
+    {
+      "icon_id": "23790929",
+      "name": "中标公告",
+      "font_class": "zhongbiaogonggao",
+      "unicode": "e8bd",
+      "unicode_decimal": 59581
+    },
+    {
+      "icon_id": "23790930",
+      "name": "更正公告",
+      "font_class": "gengzhenggonggao",
+      "unicode": "e8be",
+      "unicode_decimal": 59582
+    },
+    {
+      "icon_id": "23790931",
+      "name": "招标公告",
+      "font_class": "zhaobiaogonggao",
+      "unicode": "e8bf",
+      "unicode_decimal": 59583
+    },
+    {
+      "icon_id": "23732532",
+      "name": "文件",
+      "font_class": "wenjian6",
+      "unicode": "e8ba",
+      "unicode_decimal": 59578
+    },
+    {
+      "icon_id": "23732533",
+      "name": "文件夹",
+      "font_class": "wenjianjia4",
+      "unicode": "e8bb",
+      "unicode_decimal": 59579
+    },
+    {
+      "icon_id": "23642443",
+      "name": "取消关注",
+      "font_class": "quxiaoguanzhu",
+      "unicode": "e89a",
+      "unicode_decimal": 59546
+    },
+    {
+      "icon_id": "23642444",
+      "name": "点赞_icon",
+      "font_class": "dianzan_icon",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
+    {
+      "icon_id": "23639530",
+      "name": "文件",
+      "font_class": "wenjian5",
+      "unicode": "e896",
+      "unicode_decimal": 59542
+    },
+    {
+      "icon_id": "23639533",
+      "name": "文件夹",
+      "font_class": "wenjianjia3",
+      "unicode": "e8a9",
+      "unicode_decimal": 59561
+    },
+    {
+      "icon_id": "23639440",
+      "name": "复制icon",
+      "font_class": "fuzhiicon",
+      "unicode": "e886",
+      "unicode_decimal": 59526
+    },
+    {
+      "icon_id": "23639422",
+      "name": "主页-fill",
+      "font_class": "zhuye-fill",
+      "unicode": "e876",
+      "unicode_decimal": 59510
+    },
+    {
+      "icon_id": "23639423",
+      "name": "代码库icon",
+      "font_class": "daimakuicon",
+      "unicode": "e884",
+      "unicode_decimal": 59524
+    },
+    {
+      "icon_id": "23572260",
+      "name": "新建",
+      "font_class": "xinjian2",
+      "unicode": "e8b0",
+      "unicode_decimal": 59568
+    },
+    {
+      "icon_id": "23567674",
+      "name": "协议icon",
+      "font_class": "xieyiicon",
+      "unicode": "e870",
+      "unicode_decimal": 59504
+    },
+    {
+      "icon_id": "23567675",
+      "name": "内存icon",
+      "font_class": "neicunicon",
+      "unicode": "e891",
+      "unicode_decimal": 59537
+    },
+    {
+      "icon_id": "23567676",
+      "name": "自述文件_icon",
+      "font_class": "zishuwenjian_icon",
+      "unicode": "e8a6",
+      "unicode_decimal": 59558
+    },
+    {
+      "icon_id": "23472253",
+      "name": "标签icon",
+      "font_class": "biaoqianicon",
+      "unicode": "e882",
+      "unicode_decimal": 59522
+    },
+    {
+      "icon_id": "23472254",
+      "name": "编 辑",
+      "font_class": "a-bianji",
+      "unicode": "e883",
+      "unicode_decimal": 59523
+    },
+    {
+      "icon_id": "23472256",
+      "name": "仓库设置icon",
+      "font_class": "cangkushezhiicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "23472258",
+      "name": "链接icon",
+      "font_class": "lianjieicon",
+      "unicode": "e887",
+      "unicode_decimal": 59527
+    },
+    {
+      "icon_id": "23472259",
+      "name": "合并请求icon",
+      "font_class": "hebingqingqiuicon",
+      "unicode": "e888",
+      "unicode_decimal": 59528
+    },
+    {
+      "icon_id": "23472260",
+      "name": "里程碑icon",
+      "font_class": "lichengbeiicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
+    {
+      "icon_id": "23472261",
+      "name": "工作流icon",
+      "font_class": "gongzuoliuicon",
+      "unicode": "e88a",
+      "unicode_decimal": 59530
+    },
+    {
+      "icon_id": "23472262",
+      "name": "动态icon",
+      "font_class": "dongtaiicon",
+      "unicode": "e88b",
+      "unicode_decimal": 59531
+    },
+    {
+      "icon_id": "23472263",
+      "name": "默认点赞_icon",
+      "font_class": "morendianzan_icon",
+      "unicode": "e88e",
+      "unicode_decimal": 59534
+    },
+    {
+      "icon_id": "23472265",
+      "name": "目录icon",
+      "font_class": "muluicon",
+      "unicode": "e894",
+      "unicode_decimal": 59540
+    },
+    {
+      "icon_id": "23472267",
+      "name": "设 置",
+      "font_class": "a-shezhi",
+      "unicode": "e899",
+      "unicode_decimal": 59545
+    },
+    {
+      "icon_id": "23472269",
+      "name": "提交icon",
+      "font_class": "tijiaoicon",
+      "unicode": "e89e",
+      "unicode_decimal": 59550
+    },
+    {
+      "icon_id": "23472270",
+      "name": "默认关注_ICON",
+      "font_class": "morenguanzhu_ICON",
+      "unicode": "e89f",
+      "unicode_decimal": 59551
+    },
+    {
+      "icon_id": "23472272",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu1",
+      "unicode": "e8a4",
+      "unicode_decimal": 59556
+    },
+    {
+      "icon_id": "23472276",
+      "name": "左滑icon",
+      "font_class": "zuohuaicon",
+      "unicode": "e8b5",
+      "unicode_decimal": 59573
+    },
+    {
+      "icon_id": "23472277",
+      "name": "master_icon",
+      "font_class": "master_icon",
+      "unicode": "e8b6",
+      "unicode_decimal": 59574
+    },
+    {
+      "icon_id": "23472278",
+      "name": "默认复刻_icon",
+      "font_class": "morenfuke_icon",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "23472279",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon",
+      "unicode": "e8b8",
+      "unicode_decimal": 59576
+    },
+    {
+      "icon_id": "23472280",
+      "name": "易修icon",
+      "font_class": "yixiuicon",
+      "unicode": "e8b9",
+      "unicode_decimal": 59577
+    },
+    {
+      "icon_id": "23436350",
+      "name": "缩放",
+      "font_class": "suofang",
+      "unicode": "e87f",
+      "unicode_decimal": 59519
+    },
+    {
+      "icon_id": "23436351",
+      "name": "放大icon",
+      "font_class": "fangdaicon",
+      "unicode": "e881",
+      "unicode_decimal": 59521
+    },
+    {
+      "icon_id": "23384231",
+      "name": "搜索_icon",
+      "font_class": "sousuo_icon1",
+      "unicode": "e873",
+      "unicode_decimal": 59507
+    },
+    {
+      "icon_id": "23384232",
+      "name": "欢迎_icon",
+      "font_class": "huanying_icon",
+      "unicode": "e878",
+      "unicode_decimal": 59512
+    },
+    {
+      "icon_id": "23384233",
+      "name": "文件夹",
+      "font_class": "wenjianjia2",
+      "unicode": "e879",
+      "unicode_decimal": 59513
+    },
+    {
+      "icon_id": "23384234",
+      "name": "删除icon",
+      "font_class": "shanchuicon1",
+      "unicode": "e87a",
+      "unicode_decimal": 59514
+    },
     {
       "icon_id": "23261798",
       "name": "请求icon",
@@ -68,13 +411,6 @@
       "unicode": "e898",
       "unicode_decimal": 59544
     },
-    {
-      "icon_id": "23144154",
-      "name": "下拉按钮_icon",
-      "font_class": "xialaanniu_icon",
-      "unicode": "e89a",
-      "unicode_decimal": 59546
-    },
     {
       "icon_id": "23144155",
       "name": "未选中请求icon",
@@ -89,13 +425,6 @@
       "unicode": "e8a1",
       "unicode_decimal": 59553
     },
-    {
-      "icon_id": "23144159",
-      "name": "选中响应icon",
-      "font_class": "xuanzhongxiangyingicon",
-      "unicode": "e8a2",
-      "unicode_decimal": 59554
-    },
     {
       "icon_id": "23144160",
       "name": "选中分支icon",
@@ -124,27 +453,6 @@
       "unicode": "e8af",
       "unicode_decimal": 59567
     },
-    {
-      "icon_id": "23046282",
-      "name": "新增目录_悬停icon",
-      "font_class": "xinzengmulu_xuantingicon",
-      "unicode": "e884",
-      "unicode_decimal": 59524
-    },
-    {
-      "icon_id": "23046283",
-      "name": "新增页面_默认icon",
-      "font_class": "xinzengyemian_morenicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
-    {
-      "icon_id": "23046287",
-      "name": "展开_默认icon",
-      "font_class": "zhankai_morenicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
     {
       "icon_id": "23046290",
       "name": "shanchu_tc_icon",
@@ -159,13 +467,6 @@
       "unicode": "e88d",
       "unicode_decimal": 59533
     },
-    {
-      "icon_id": "23046311",
-      "name": "新增页面_鼠标点击icon",
-      "font_class": "xinzengyemian_shubiaodianjiicon",
-      "unicode": "e88e",
-      "unicode_decimal": 59534
-    },
     {
       "icon_id": "23046244",
       "name": "导入模版_icon",
@@ -173,13 +474,6 @@
       "unicode": "e86f",
       "unicode_decimal": 59503
     },
-    {
-      "icon_id": "23046247",
-      "name": "导出_悬浮",
-      "font_class": "daochu_xuanfu",
-      "unicode": "e870",
-      "unicode_decimal": 59504
-    },
     {
       "icon_id": "23046252",
       "name": "错误",
@@ -187,13 +481,6 @@
       "unicode": "e872",
       "unicode_decimal": 59506
     },
-    {
-      "icon_id": "23046254",
-      "name": "成功",
-      "font_class": "chenggong1",
-      "unicode": "e873",
-      "unicode_decimal": 59507
-    },
     {
       "icon_id": "23046255",
       "name": "更多_icon",
@@ -208,13 +495,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",
@@ -222,27 +502,6 @@
       "unicode": "e877",
       "unicode_decimal": 59511
     },
-    {
-      "icon_id": "23046269",
-      "name": "垃圾桶_icon@3x",
-      "font_class": "a-lajitong_icon3x",
-      "unicode": "e878",
-      "unicode_decimal": 59512
-    },
-    {
-      "icon_id": "23046270",
-      "name": "收起_默认icon",
-      "font_class": "shouqi_morenicon",
-      "unicode": "e879",
-      "unicode_decimal": 59513
-    },
-    {
-      "icon_id": "23046271",
-      "name": "欢迎_icon",
-      "font_class": "huanying_icon",
-      "unicode": "e87a",
-      "unicode_decimal": 59514
-    },
     {
       "icon_id": "23046273",
       "name": "搜索_删除icon",
@@ -264,13 +523,6 @@
       "unicode": "e87e",
       "unicode_decimal": 59518
     },
-    {
-      "icon_id": "23046277",
-      "name": "文件夹_icon",
-      "font_class": "wenjianjia_icon",
-      "unicode": "e87f",
-      "unicode_decimal": 59519
-    },
     {
       "icon_id": "23046278",
       "name": "下拉按钮",
@@ -278,20 +530,6 @@
       "unicode": "e880",
       "unicode_decimal": 59520
     },
-    {
-      "icon_id": "23046280",
-      "name": "新增目录_默认icon",
-      "font_class": "xinzengmulu_morenicon",
-      "unicode": "e882",
-      "unicode_decimal": 59522
-    },
-    {
-      "icon_id": "23046281",
-      "name": "新增目录_鼠标点击icon",
-      "font_class": "xinzengmulu_shubiaodianjiicon",
-      "unicode": "e883",
-      "unicode_decimal": 59523
-    },
     {
       "icon_id": "22906287",
       "name": "二次确认_icon",

src/App.js

@@ -39,11 +39,6 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
-//forge安全设置
-const Security = Loadable({
-	loader: () => import('./forge/SecuritySetting/Index'),
-	loading: Loading,
-})
 //forge项目-devOps详情
 const OpsDetail = Loadable({
 	loader: () => import('./forge/DevOps/opsDetail'),
@@ -78,15 +73,16 @@ const EducoderLogin = Loadable({
 	loader: () => import('./modules/login/EducoderLogin'),
 	loading: Loading,
 })
-const Search = Loadable({
-	loader: () => import('./modules/search/'),
-	loading: Loading,
-})
+// const Search = Loadable({
+// 	loader: () => import('./search/SearchPage'),
+// 	loading: Loading,
+// })
+// const WikiPreview = Loadable({
+// 	loader: () => import('./forge/Wiki/Preview'),
+// 	loading: Loading,
+// })
+
 
-const ProjectIndex = Loadable({
-  loader: () => import("./forge/Index"),
-  loading: Loading,
-});
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -199,9 +195,16 @@ class App extends Component {
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-						<SiderBar/>
+						<SiderBar />
 						<Router>
 							<Switch>
+								{/* wiki预览 */}
+								{/* <Route path="/projects/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+									(props) => {
+										return (<WikiPreview {...this.props} {...props} {...this.state} />)
+									}
+								} /> */}
+
 								{/*项目*/}
 								<Route
 									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
@@ -211,23 +214,7 @@ class App extends Component {
 										}
 									}>
 								</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={
@@ -251,7 +238,8 @@ class App extends Component {
 								<Route path="/nopage" component={Shixunnopage} />
 
 								{/* 查询 */}
-								<Route path="/search" component={Search} />
+								{/* <Route path="/search" component={Search} /> */}
+
 
 								{/* 个人主页 */}
 								<Route path="/users/:username"
@@ -260,13 +248,18 @@ class App extends Component {
 											return (<InfosIndex {...this.props} {...this.state} />)
 										}
 								}></Route>
+								<Route
+									path={"/projects"}
+									render={
+										(props) => {
+											return (<Projects {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
 								<Route exact path="/"
 									render={
 										(props) => (
-											personal && personal.length > 0 ?
-											<InfosIndex {...this.props} {...props} />
-											:
-											<ProjectIndex {...this.props} {...props} />
+											<Projects {...this.props} {...props} {...this.state} />
 										)
 									}
 								/>

src/AppConfig.js

@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  var proxy = "https://testforgeplus.trustie.net";
+  var proxy = "https://testforgeplus.educoder.net";
   //响应前的设置
   axios.interceptors.request.use(
     config => {

src/common/DateUtil.js

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

src/common/UrlTool.js

@@ -8,12 +8,18 @@ const isDev = window.location.port == 3007;
 const isdev2= window.location.hostname ==='www.educoder.net'
 export const TEST_HOST = "https://testforgeplus.trustie.net/"
 export function getImageUrl(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-  // const local = 'http://localhost:3000'
-	const local = 'https://testforgeplus.trustie.net';
-	if (isDev) {
-		return `${local}/${path}`
+	const local = 'https://testforgeplus.educoder.net';
+	const normal = 'https://ali-cdn.educoder.net/images';
+	const normalend = 'https://ali-cdn.educoder.net';
+	if(path.substr(0, 7) !== "/system"){
+		if (isDev) {
+			return `${local}/${path}`
+		}
+		if(path.substr(0, 7) !== "/images"){
+    	return `${normal}${path}`;
+		}else{
+			return `${normalend}${path}`;
+		}
 	}
 	return `${path}`;
 }
@@ -162,28 +168,28 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
+	return `${getUrl()}/api/attachments.json`;
 }
 
 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
+	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
 }
 
 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
 }
 
 
 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getRandomNumber(type) {

src/common/educoder.js

@@ -27,7 +27,7 @@ export {
 	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
 	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
 } from './TextUtil'
-export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds ,timeAgo} from './DateUtil'
 
 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
 

src/forge/Activity/Activity.js

@@ -1,7 +1,7 @@
 import React , { Component } from 'react';
 import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
 import '../css/index.scss';
-import '../Branch/branch.scss';
+import '../Branch/branch.css';
 import './activity.css';
 import NoneData from '../Nodata';
 

src/forge/Branch/CloneAddress.js

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

src/forge/Branch/Select.jsx

@@ -1,6 +1,6 @@
 import React , { useState , useEffect } from 'react';
 import { Popover , Input , Spin } from 'antd';
-import './branch.scss';
+import './branch.css';
 import { getBranch , getTag } from '../GetData/getData';
 
 
@@ -102,7 +102,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
     </div>
   );
   return(
-    <Popover placement='bottomLeft' visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
+    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
       <div className="branch-tagBox">
         {/* {nav === 0 ?"分支":"标签"} */}
         <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>

src/forge/Branch/branch.css

@@ -81,25 +81,4 @@
 .listTips{
   padding:20px 0px;
   text-align: center;
-}
-
-.urlMenu{
-  line-height: 30px;
-  margin-bottom: 10px;
-  border-bottom: none;
-  li.ant-menu-item{
-    height: 30px;
-    line-height: 30px;
-    padding:0px 5px;
-    margin-right: 20px!important;
-    &.ant-menu-item-selected,&.ant-menu-item-active{
-      color: #333;
-    }
-    &.ant-menu-item-selected{
-      border-color:#1890ff!important;
-    }
-    &.ant-menu-item-active{
-      border-color:transparent ;
-    }
-  }
 }

src/forge/Component/AddGroup.jsx

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

src/forge/Component/Cards.jsx

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

src/forge/Component/CopyTool.jsx

@@ -0,0 +1,44 @@
+import React, { useState, useCallback, memo } from 'react';
+import { Tooltip } from 'antd';
+
+CopyTool.defaultProps = {
+  beforeText: '复制',     //浮动过去显示的文字
+  afterText: '复制成功',  //点击后显示的文字
+  className: '',         //传给svg的class
+  inputId: 'copyText',    //要复制的文本的ID
+};
+
+
+function CopyTool({ beforeText, afterText, className,inputId }) {
+  const [title, setTitle] = useState(() => {
+    return beforeText;
+  });
+
+  // 复制链接
+  const copyUrl = useCallback(() => {
+    let inputDom = document.getElementById(inputId);
+    if (!inputDom) {
+      console.error("您的CopyTool未设置正确的inputId");
+      return;
+    }
+    inputDom.select();
+    if (document.execCommand('copy')) {
+      document.execCommand('copy');
+    }
+    setTitle(afterText);
+    inputDom.blur();
+  }, []);
+
+  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,35 +0,0 @@
-import React from 'react';
-import { AlignCenter } from '../layout';
-import { Modal , Button } from 'antd';
-import './Index.scss';
-
-function DeleteBox({ 
-  visible , 
-  onCancel ,
-  onSuccess ,
-  title ,
-  subTitle,
-  content
-}) {
-  return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={title}
-      width="600px"
-      className="deleteBox"
-      footer={
-        <div>
-          <Button size={'large'} onClick={onCancel}>取消</Button>
-          <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
-        </div>
-      }
-    >
-      <div className="desc">
-        <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
-        <p>{subTitle}</p>
-      </div>
-    </Modal>
-  )
-}
-export default DeleteBox;

src/forge/Component/DeleteModal/Index.scss

@@ -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/EAccount.scss

@@ -3,4 +3,7 @@
 }
 .ant-modal-wrap{
   z-index: 1002;
+  .ant-form-explain{
+    position: absolute;
+  }
 }

src/forge/Component/EducoderAccount.jsx

@@ -2,7 +2,7 @@ import React , {forwardRef, useEffect} from 'react';
 import { Modal , Form , Input , Button } from 'antd';
 import './EAccount.scss';
 
-function EducoderAccount({form , visible , onOk , email}){
+function EducoderAccount({form , visible , onOk , email , onCancel , match , unReload}){
   const { getFieldDecorator, validateFields , setFieldsValue } = form;
 
   useEffect(()=>{
@@ -22,6 +22,10 @@ function EducoderAccount({form , visible , onOk , email}){
     labelCol: { span: 5 },
     wrapperCol: { span: 18 },
   };
+  function Cancel() {
+    onCancel();
+  }
+
   return(
     <Modal 
       visible={visible}
@@ -29,27 +33,35 @@ function EducoderAccount({form , visible , onOk , email}){
       width="500px"
       closable={false}
       footer={
-        <Button type="primary" onClick={onSure}>确定</Button>
+        <div>
+          <Button onClick={Cancel}>暂不绑定，随便看看</Button>
+          <Button type="primary" onClick={onSure}>绑定邮箱</Button>
+        </div>
       }
       centered
     >
       <div>
         <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
-        为确保您能正常使用平台功能，请确认以下信息:
+          { 
+          email ? 
+          `平台已检测到您已绑定邮箱${email},请您确认如下操作`
+          :
+          "平台已检测到您未绑定邮箱，为不影响使用协同开发功能，请先绑定邮箱"
+          }
         </p>
         <Form {...layout}>
           <Form.Item label="邮箱">
             {getFieldDecorator("email",{
               rules:[{required:true,message:"请输入邮箱账号"}]
             })(
-              <Input placeholder="请输入您的邮箱账号" width="220px"/>
+              <Input placeholder="请输入您的邮箱账号" width="220px" disabled={email}/>
             )}
           </Form.Item>
           <Form.Item label="密码">
             {getFieldDecorator("password",{
-              rules:[{required:true,message:"请输入邮箱密码"}]
+              rules:[{required:true,message:"请输入您的平台密码"}]
             })(
-              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
+              <Input.Password placeholder="请输入您的平台密码" width="220px"/>
             )}
           </Form.Item>
         </Form>

src/forge/Component/HeadSearch.jsx

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

src/forge/Component/Monaco.jsx

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

src/forge/Component/Releases.jsx

@@ -20,7 +20,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
         releaseVersions && releaseVersions.total_count>0 ?
           releaseVersions.list.map((item,key)=>{
             return(
-            key === 0 &&<AlignTop className="mt10">
+            <AlignTop className="mt10">
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
                 <p className="font-16 color-grey-6">

src/forge/Component/SiderBar.js

@@ -43,7 +43,7 @@ function SiderBar() {
         {
           list && list.map((i,k)=>{
             return(
-              <li key={i.question+k}><a href={`${i.url}`} title={i.question} target="_blank">{i.question}</a></li>
+              <li><a href={`${i.url}`} title={i.question} target="_blank">{i.question}</a></li>
             )
           })
         }

src/forge/Component/User.jsx

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

src/forge/DevOps/About.jsx

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

src/forge/DevOps/Index.jsx

@@ -33,6 +33,14 @@ const Params = Loadable({
 
 export default ((props)=>{
 
+  useEffect(()=>{
+    const { projectsId , owner } = props.match.params;
+    const { giteaVisible , showEABox } = props;
+    if(giteaVisible){
+      showEABox && showEABox(`/projects/${owner}/${projectsId}`);
+    }
+  },[])
+
   return(
     <WhiteBack className="opsPanel">
       <Switch {...props}>

src/forge/DevOps/OpsDetailRightpanel.jsx

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

src/forge/DevOps/ServiceModal.jsx

@@ -12,7 +12,7 @@ function ServiceModal({sureModal}){
     <div className="mt30" style={{textAlign:"center"}}>
       <Radio.Group value={type} onChange={changeType}>
         <Radio value={1}>自有服务器</Radio>
-        <Radio value={2}>Trustie服务器</Radio>
+        <Radio value={2}>EduCoder服务器</Radio>
       </Radio.Group>
       <p className="mt30"><Button type="primary" onClick={()=>sureModal(type)}>下一步</Button></p>
     </div>

src/forge/DevOps/ssh/Index.jsx

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

src/forge/DevOps/ssh/XmlPanel.jsx

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

src/forge/DevOps/ssh/mediator.jsx

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

src/forge/Divert/DivertModal.jsx

@@ -20,13 +20,6 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
     if(owner && repo && visible===true){
       getTeam();
     }
-    if(!visible){
-      setFieldsValue({
-        owner_name:undefined,
-        identifier:undefined
-      })
-      setValue(undefined)
-    }
   },[repo,owner,visible])
 
   function getTeam(){
@@ -48,7 +41,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
           ...values
         }).then(result=>{
           if(result){
-            onSuccess(result.data && result.data.owner);
+            onSuccess();
           }
         }).catch(error=>{})
       }
@@ -104,7 +97,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
           </ul>
           :
           <ul className="descUl">
-            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>仓库仅可以转移到您具有管理权限的组织中</li>
             <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
             <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
           </ul>
@@ -126,7 +119,6 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
               {getFieldDecorator("owner_name",{
                 rules:[{required:true,message:"请输入目标用户名"}]
               })(
-                // <Input placeholder="请输入目标用户" autoComplete={"off"}/>
                 <SearchUser getUser={getUser} width={"100%"} placeholder="请输入目标用户" value={value}/>
               )}
             </Form.Item>
@@ -152,11 +144,11 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
             </Form.Item>
           }
           
-          <Form.Item label="仓库标识:" style={{marginBottom:"0px"}}>
+          <Form.Item label="仓库标识:">
             {getFieldDecorator("identifier",
               {
                 rules:[
-                  {required:true,message:"请输入仓库标识！"},
+                  {required:true,message:"请输入仓库标识"},
                   {
                     validator:checkIdentifier
                   }

src/forge/Head/Footer.jsx

@@ -19,7 +19,7 @@ function Footer(){
 
   return(
     <div>
-      <div style={{height:"497px"}}></div>
+      <div style={{height:"810px"}}></div>
       <div className="newFooter edu-txt-center">
         {value && showhtml(value)}
         {/* <div className="footerInfos">

src/forge/Head/Header.js

@@ -3,11 +3,7 @@ import AccountProfile from "../../modules/user/AccountProfile";
 import { getImageUrl } from 'educoder'
 import axios from 'axios';
 import { Input , notification , Dropdown , Menu } from 'antd';
-import { Link } from 'react-router-dom';
-
 import LoginDialog from '../../modules/login/LoginDialog';
-import HeadSearch from '../Component/HeadSearch';
-
 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
 
@@ -79,6 +75,37 @@ class NewHeader extends Component {
     } catch (e) {}
   }
 
+  SearchInput = (open,item)=>{
+    if(open){
+      return(
+        <div
+          onBlur={() => {
+            setTimeout(() => {
+              this.setState({
+                openSearch:false
+              })
+            }, 300)
+          }}
+        >
+          <Search placeholder="请输入搜索关键字"
+            className={`search-input mr20`}
+            onSearch={(value)=>this.onGlobalSearch(value,item)}
+            autoFocus={true}
+            style={{width:"260px"}}
+          />
+        </div>
+      )
+    }else{
+      return <i className="iconfont icon-sousuo font-18 color-white ml30" onClick={() => {
+        this.setState({openSearch:true})
+      }} />
+    }
+  }
+
+  onGlobalSearch=(value,item)=>{
+    window.location.href=`${item}?value=` + value;
+  }
+
   openNotification = (messge) => {
     notification.open({
       message: "提示",
@@ -87,6 +114,8 @@ class NewHeader extends Component {
     });
   };
 
+
+
   componentWillReceiveProps(newProps, oldProps) {
     this.setState({
       user: newProps.user
@@ -96,6 +125,7 @@ class NewHeader extends Component {
     }
   }
 
+
   educoderlogin = () => {
     //登录账号
     this.setState({
@@ -133,11 +163,13 @@ class NewHeader extends Component {
     })
   };
 
+
   // 关闭
   cancelModulationModels = () => {
     this.setState({ isRenders: false })
   }
 
+
   setevaluatinghides = () => {
     this.setState({
       setevaluatinghides: true
@@ -231,7 +263,7 @@ 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><a href={item.url}>{item.name}</a></Menu.Item>
               )
             })
           }
@@ -254,7 +286,6 @@ class NewHeader extends Component {
               )
             })
           }
-          <li><Link to={`/settings/SSH`}>设置</Link></li>
         <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
       </Menu>
     )
@@ -263,13 +294,17 @@ class NewHeader extends Component {
   render() {
     const { match} = this.props;
     let current_user = this.props.user;
-    let {
+    let { Addcoursestypes,
+      tojoinitemtype,
+      tojoinclasstitle,
+      code_notice,
       AccountProfiletype,
       user,
       isRender,
       headtypesonClickbool,
       headtypess,
       settings,
+      openSearch,
     } = this.state;
     /*用户名称  用户头像url*/
     let activeIndex = false;
@@ -347,7 +382,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">
@@ -401,7 +436,7 @@ class NewHeader extends Component {
                     var wl = waiLian && waiLian.length>0;
                     return (
                       <li key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
-                        <a href={new_link} target={wl ? "_self":"_blank"}>{item.name}</a>
+                        <a href={new_link} target={wl ? "_self":"_blank"}><div dangerouslySetInnerHTML={{ __html: item.name }}></div></a>
                       </li>
                     )
                   })
@@ -411,12 +446,11 @@ class NewHeader extends Component {
             }
           </div>
           <div className="head-right">
-            {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
-            <HeadSearch {...this.props}/>
+            {search_url ? this.SearchInput(openSearch,search_url):""}
             {
               current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
               <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
-                <i className="iconfont icon-tianjiafangda color-grey-6 ml30"></i>
+                <i className="iconfont icon-tianjiafangda color-white ml30"></i>
               </Dropdown>:""
             }
             
@@ -424,7 +458,7 @@ class NewHeader extends Component {
               <div className="ml30 edu-menu-panel">
                 {user && user.login &&
                   <a href={`${notice_url}`} style={{ position: 'relative' }}>
-                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
+                    <i className="iconfont icon-xiaoxilingdang color-white"></i>
                     <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                     </span>
                   </a>
@@ -434,10 +468,10 @@ class NewHeader extends Component {
           </div>
           {!user || (user && !user.login)  ?
             <span className="font-15 ml30">
-              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
               {
                 settings && settings.common && settings.common.register &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="ml5 color-white" href={`${settings.common.register}`} target="_blank">注册</a></span>
               }
             </span>
             :

src/forge/Index.js

@@ -27,14 +27,6 @@ const ProjectDetail = Loadable({
 });
 
 class Index extends Component {
-
-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
-      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
-        window.scrollTo(0, 0)
-      }
-    })
-  }
   render() {
     return (
       <div className="newMain clearfix">

src/forge/Main/CoderDepot.jsx

@@ -147,6 +147,7 @@ function CoderDepot(props){
         setReadme(result.data.readme);
         setEditReadme(false);
         setHide(true);
+        console.log("dddd:",result.data.entries);
       }
       setTimeout(function(){setIsSpin(false);},500);
     }).catch(error=>{setIsSpin(false);})
@@ -271,12 +272,17 @@ function CoderDepot(props){
   }
 
   const downloadMenu = (
-    <CloneAddress 
-      http_url={projectDetail && projectDetail.clone_url}
-      ssh_url = {projectDetail && projectDetail.ssh_url}
-      zip_url={zip_url}
-      tar_url={tar_url}
-      showNotification={props.showNotification}/>
+    <div className="downMenu">
+      <div style={{padding:"20px",borderBottom:"1px solid #eee"}}>
+        <CloneAddress 
+          http_url={projectDetail && projectDetail.clone_url}
+          showNotification={props.showNotification}/>
+      </div>
+      <Menu className="edu-txt-center">
+        <Menu.Item><a href={zip_url}>下载 ZIP</a></Menu.Item>
+        <Menu.Item><a href={tar_url}>下载 TAR.GZ</a></Menu.Item>
+      </Menu>
+    </div>
   )
   // 确认修改简介、website、实践课程链接
   function okUpdate(d,w,l){
@@ -383,7 +389,7 @@ function CoderDepot(props){
                     </AlignCenter>
                   </FlexAJ>
                   {
-                    dirInfo || fileInfo ?
+                    (dirInfo && dirInfo.length>0) || fileInfo ?
                     <div className="listtable">
                       {
                         lastCommit &&
@@ -441,7 +447,7 @@ 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} /> :"" }
@@ -460,7 +466,7 @@ function CoderDepot(props){
                         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>
+                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
                         </p>
                       }
                       <p>
@@ -468,13 +474,13 @@ function CoderDepot(props){
                         <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>
+                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-9"></i>
                         <span>{projectDetail && projectDetail.size}</span>
                       </p>
                       {
                         projectDetail && projectDetail.license_name &&
                         <p className="color-grey-6">
-                          <i className="iconfont icon-tianping font-16 mr10 color-grey-3"></i>
+                          <i className="iconfont icon-tianping font-16 mr10 color-grey-9"></i>
                           <span>{projectDetail.license_name}</span>
                         </p>
                       }
@@ -511,11 +517,11 @@ function CoderDepot(props){
                     }
                     {/* 贡献者 */}
                     {
-                      projectDetail && projectDetail.contributors &&
+                      projectDetail && projectDetail.contributors && projectDetail.contributors.length >0 && 
                       <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
                     }
                     {/* 语言 */}
-                    { projectDetail && projectDetail.languages && 
+                    { projectDetail && projectDetail.languages && projectDetail.languages.length >0 &&
                       <React.Fragment>
                         <Divider />
                         <LanguagePower languages={projectDetail.languages}/>

src/forge/Main/CoderRootCommit.js

@@ -116,7 +116,7 @@ class CoderRootCommit extends Component{
     let branch = returnbar(branchName || defaultBranch);
     return(
       <React.Fragment>
-        <div className={"main"}style={{padding:"0px",border:"none"}}>
+        <div className={"main"}>
           <div className="f-wrap-between">
             <SelectBranch 
               repo_id={projectDetail && projectDetail.repo_id} 

src/forge/Main/CoderRootFileDetail.js

@@ -24,7 +24,7 @@ class CoderRootFileDetail extends Component {
   }
 
   componentDidMount = () => {
-    const { detail , mdFlag } = this.props;
+    const { detail } = this.props;
     this.setState({
       value: detail.content,
     });
@@ -178,8 +178,7 @@ class CoderRootFileDetail extends Component {
       isDeveloper,
       currentBranch,
       platform,
-      md,
-      type
+      md
     } = this.props;
     const { language, languages, description } = this.state;
     let flag = current_user && current_user.login && (isManager || isDeveloper);
@@ -198,18 +197,17 @@ class CoderRootFileDetail extends Component {
                 {readOnly ? (
                   <span>
                     {
-                      !detail.direct_download?
+                      detail.direct_download ?
+                        ""
+                        :
                         <span>
                           <a onClick={() => this.DownLoadFile(detail.download_url)} className="ml20">
                             <i className="iconfont icon-xiazai1 font-15 color-grey-6"></i>
                           </a>
-                          {
-                            type !==2  &&
-                            <a onClick={() => this.EditFile(false)} className="ml20">
-                              <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
-                            </a>
-                          }
-                        </span>:""
+                          <a onClick={() => this.EditFile(false)} className="ml20">
+                            <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+                          </a>
+                        </span>
                     }
                   </span>
                 ) : (
@@ -240,21 +238,18 @@ class CoderRootFileDetail extends Component {
                       </button>
                     </React.Fragment>
                   )}
-                {
-                  type !==2 &&
-                  <Popconfirm
-                    title="确认删除这个文件？"
-                    className="ml20"
-                    okText="确定"
-                    cancelText="取消"
-                    onConfirm={this.deleteFile}
-                  >
-                    <a>
-                      <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
-                    </a>
-                  </Popconfirm>
-                }
-                
+
+                <Popconfirm
+                  title="确认删除这个文件？"
+                  className="ml20"
+                  okText="确定"
+                  cancelText="取消"
+                  onConfirm={this.deleteFile}
+                >
+                  <a>
+                    <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
+                  </a>
+                </Popconfirm>
               </div>
             )}
           </p>

src/forge/Main/Detail.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip , Button } from 'antd';
+import { Spin, Tooltip, Button } 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';
@@ -103,12 +103,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({
@@ -127,30 +127,40 @@ const Source = Loadable({
 const DevIndex = Loadable({
   loader: () => import('../DevOps/Index'),
   loading: Loading,
-})
+});
+const Wiki = Loadable({
+  loader: () => import('../Wiki/Index'),
+  loading: Loading,
+});
+const WikiEdit = Loadable({
+  loader: () => import('../Wiki/EditWiki'),
+  loading: Loading,
+});
 /**
  * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
  */
-function checkPathname(projectsId,owner,pathname){
+function checkPathname(projectsId, owner, pathname) {
   let name = "";
-  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
+  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 (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("/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"
     }
   }
   return name;
@@ -173,15 +183,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
     }
   }
 
@@ -198,36 +208,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,
-              firsrtSync: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({
-            firsrtSync:false,
-            secondSync:false
+            firstSync: false,
+            secondSync: false
           })
         }
       }
@@ -235,9 +247,9 @@ class Detail extends Component {
   }
 
   // 工作流激活后修改状态
-  changeOpenDevops=(flag)=>{
+  changeOpenDevops = (flag) => {
     this.setState({
-      open_devops:flag
+      open_devops: flag
     })
   }
   canvasChannel = () => {
@@ -247,7 +259,7 @@ class Detail extends Component {
     var cable = actioncable.createConsumer(`wss://${name}/cable`);
     this.canvasChannel1 = cable.subscriptions.create({
       channel: `MirrorProjectChannel`,
-      id: project && project.identifier
+      id: project && project.id
     }, {
       connected: () => {
         console.log("###### channel connected! ######");
@@ -255,16 +267,41 @@ class Detail extends Component {
       disconnected: () => { },
       received: data => {
         console.log(`###### ---received data--- ######`);
+        console.log(data);
         if (data) {
+          if ( data.project && data.project.mirror_status === 2) {
+            this.deleteProjectBack();
+          }
           this.getDetail();
+          this.setState({
+            firstSync: false,
+            secondSync: false
+          });
           cable.subscriptions.consumer.disconnect();
         }
       }
     })
   }
 
+  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) => {
@@ -281,29 +318,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({
@@ -318,15 +355,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',
@@ -336,9 +373,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) => {
@@ -359,10 +396,14 @@ class Detail extends Component {
   forkFunc = () => {
     const { platform } = this.state;
     if(!platform)return;
+    const { current_user ,  giteaVisible , showEABox } = this.props;
+    if(giteaVisible){
+      showEABox && showEABox();
+      return;
+    }
     this.setState({
-      forkSpin:true
+      forkSpin: true
     })
-    const { current_user } = this.props
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/forks.json`;
     axios.post(url).then(result => {
@@ -371,11 +412,11 @@ class Detail extends Component {
         this.props.showNotification(result.data.message);
       }
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     }).catch(error => {
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     })
   }
@@ -383,8 +424,8 @@ 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) {
@@ -398,326 +439,344 @@ 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={`${type === "Organization" ? "/organize" : '/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
         <span> / </span>
-        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{maxWidth:"400px"}} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
+        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{ maxWidth: "400px" }} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
       </div> : ""
   }
-  
+
 
   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: "20px 0px 10px", justifyContent: "space-between" }}>
               <div>
                 <AlignTop>
                   <div className="projectallName">
                     {project && project.author &&
-                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
+                      <Link to={`${project.author.type === "Organization" ? "/organize" : '/users'}/${project.author.login}`}>{project.author.name}</Link>
                     }
                     <span className="ml5 mr5">/</span>
                     <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
                   </div>
-                  { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
+                  {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>复刻
+                      <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>
-                      </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: `${watched ? "#2878FF" : "#666"}` }} to={platform ? { pathname: `/projects/${owner}/${projectsId}/watchers`, state } : ""}>
+                                {watchers_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{watchers_count}</span>
+                            : ""
+                        }
+                      </Button>
+                      <Button className="detail_tag_btn">
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.pariseFunc(praised)}>
+                          <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3" : "iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                          <span>{praised ? '取消点赞' : '点赞'}</span>
+                        </a>
+                        {
+                          praises_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `${praised ? "#2878FF" : "#666"}` }} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
+                                {praises_count}
+                              </Link> :
+                              <span className="detail_tag_btn_count">{praises_count}</span>
+                            : ""
+                        }
+                      </Button>
+                      <Button className="detail_tag_btn" loading={forkSpin}>
+                        <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
+                          <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={this.forkFunc}>
+                            <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
+                          </a>
+                        </Tooltip>
+                        {
+                          forked_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
+                                {forked_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{forked_count}</span>
+                            : ""
+                        }
+                      </Button>
+                    </span>
                 }
               </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>
-              {/* 工作流 */}
-              <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="/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>
 
-              <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="/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="/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="/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>
         }
       </div>
     )

src/forge/Main/Index.js

@@ -1,10 +1,7 @@
 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 { Menu, Input , Spin, Pagination , Popover , Select , Button } from 'antd';
 import { getImageUrl } from 'educoder';
-import "slick-carousel/slick/slick.css";
-import "slick-carousel/slick/slick-theme.css";
 import '../css/index.scss'
 import './list.css';
 import './Index.scss';
@@ -12,7 +9,8 @@ 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 banner from '../Images/banner.png';
+import AddProjectModal from '../Head/AddProjectModal';
 const Search = Input.Search;
 
 class Index extends Component {
@@ -33,8 +31,6 @@ class Index extends Component {
       categoryList: undefined,
       recommendList:undefined,
 
-      recommendOriList:undefined,
-
       languageList:undefined,
       languageId:undefined
     }
@@ -52,8 +48,6 @@ class Index extends Component {
     this.getRecommand();
 
     this.getLanguage();
-
-    // this.getRecommandOri();
   }
 
   // 获取语言列表
@@ -79,17 +73,6 @@ class Index extends Component {
     }).catch(error=>{})
   }
 
-  getRecommandOri=()=>{
-    const url = `/organizations/recommend.json`;
-    axios.get(url).then(result=>{
-      if(result){
-        this.setState({
-          recommendOriList:result.data.organizations
-        })
-      }
-    }).catch(error=>{})
-  }
-
   // 获取列表
   getListData = (page, limit, search, sort, project_type, category_id,languageId) => {
     const { current_user } = this.props;
@@ -274,56 +257,48 @@ class Index extends Component {
     const { current_user } = this.props;
 
     const { projectsList , recommendList , languageList , languageId , 
-      isSpin, total, search, limit, page, typeList, categoryList , recommendOriList } = this.state;
-
-      const setting={
-        dots: true,
-        infinite: true,
-        speed: 500,
-        slidesToShow: 5,
-        slidesToScroll: 5,
-        autoplay:false,
-        arrows:false,
-        adaptiveHeight:true
-      }
-      const settings={
-        dots: true,
-        infinite: true,
-        speed: 500,
-        slidesToShow: 6,
-        slidesToScroll: 6,
-        autoplay:false,
-        arrows:false,
-        adaptiveHeight:true
-      }
-
+      isSpin, total, search, limit, page, typeList, categoryList } = this.state;
+    let userflag = (current_user &&  ( current_user.login && current_user.login === "pns5oi9af" )) ? true : false;
     return (
       <div>
-        <p className="t_project_banner">
-          <img src={banner} width="100%" alt=""/>
-        </p>
-        {/* {
-          recommendOriList && recommendOriList.length>0?
-            <Slider {...settings} className="recommandOri">
-              {
-                recommendOriList.map((i,k)=>{
-                  return(
-                    <li><Link to={''}><img src={getImageUrl(`/${i.avatar_url}`)} alt={i.name} title={i.name} width="80px"/></Link></li>
-                  )
-                })
-              }
-            </Slider>
-          :""
-        } */}
+        <div className="subjectBanner">
+          <img src={banner} alt=""/>
+          <div className="bannerBox">
+            <div class="subjectleft">
+              <span>头歌开源</span>
+              <span>
+                <span>
+                  {userflag ? 
+                    <span className="words">让师姐开心的玩开源</span>:
+                    <span className="words">让大学绽放开源之花</span>
+                  }
+                  <p className="font-13" style={{color:"#ccc"}}>Powered by Trustie</p>
+                </span>
+              </span>
+            </div>
+            <Link to={`/projects/deposit/new`}>
+              <i class="iconfont icon-xinjianxiangmu"></i>
+              <a>新建项目</a>
+            </Link>
+            <a>
+              <i class="iconfont icon-jiaruketang1"></i>
+              <AddProjectModal showNotification={this.props.showNotification}/>
+            </a>
+            <a href={`https://data.educoder.net/api/attachments/1955244?disposition=inline`} target="_blank">
+              <i class="iconfont icon-xinshouzhiyin"></i>
+              新手指引
+            </a>
+          </div>
+        </div>
         {
           recommendList && recommendList.length>0 &&
-          <Slider {...setting} className={recommendList.length>5 ? "recommandProjects":"recommandProjects mb20"}>
+          <div className="recommandProjects">
             {
               recommendList.map((item,key)=>{
                 return(
-                  <div className="items" onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
+                  <div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
                     <div className="mainInfo">
-                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} width="50px" height="50px"alt=""/>
+                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} alt=""/>
                       <p className="school">{item.name}</p>
                       <p className="name">{item.author && item.author.name}</p>
                     </div>
@@ -335,8 +310,9 @@ class Index extends Component {
                 )
               })
             }
-          </Slider>
+          </div>
         }
+        
         <div className="ProjectListIndex">
           <div className="list-left">
             <ul className="list-l-Menu">

src/forge/Main/Index.scss

@@ -1,53 +1,57 @@
-.recommandOri.slick-slider{
-  width: 1300px;
-  margin:20px auto 40px;
-  .slick-track{
-    margin-left: 0px;
-  }
-  .slick-slide{
-    li > a{
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
+/* recommandProjects */
+.recommandProjects{
+  display: flex;
+  max-width: 1200px;
+  margin:20px auto;
+}
+.recommandProjects >div{
+  background-color: #fff;
+  border-radius: 10px;
+  width: 220px;
+  margin-right: 25px;
+  cursor: pointer;
+  border: 1px solid #eee;
+  &:last-child{
+    margin-right: 0px;
   }
 }
-/* recommandProjects */
-.recommandProjects.slick-slider{
-  width: 1230px;
-  margin:20px auto 40px;
-  .slick-track{
-    margin-left: 0px;
+.recommandProjects > div:hover{
+  box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
+}
+.recommandProjects > div .mainInfo{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  min-height: 160px;
+  border-bottom: 1px solid #eee;
+  padding:20px;
+  box-sizing: border-box;
+  img{
+    height: 50px;
+    width:50px;
+    border-radius: 50%;
   }
-  .slick-arrow.slick-prev,.slick-arrow.slick-next{
-    &:before{
-      color: #999;
-    }
-    li.slick-active button:before{
-      color: #999;
-    }
+  .name{
+    font-size: 13px;
+    color: #666;
+    height: 18px;
+    line-height: 18px;
+    margin-top:12px;
   }
-  .slick-dots{
-    bottom: -29px;
-    li button:before{
-      color: #909090;
-    }
-  }
-  .slick-slide{
-    padding:0px 15px;
-    box-sizing: border-box;
-    & > div{
-      background-color: #fff;
-      border-radius: 10px;
-      width: 100%;
-      cursor: pointer;
-      border: 1px solid #eee;
-      &:hover{
-        box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
-      }
-    }
+  .school{
+    margin-top:12px;
+    color: #333;
+    font-size: 16px;
+    height: 22px;
+    line-height: 22px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width:100%;
   }
+}
+.recommandProjects{
   .baseInfo{
     padding:18px 15px;
     display: flex;
@@ -68,39 +72,6 @@
       text-align: right;
     }
   }
-  .mainInfo{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    min-height: 160px;
-    border-bottom: 1px solid #eee;
-    padding:20px;
-    box-sizing: border-box;
-    img{
-      height: 50px;
-      width:50px;
-      border-radius: 50%;
-    }
-    .name{
-      font-size: 13px;
-      color: #666;
-      height: 18px;
-      line-height: 18px;
-      margin-top:12px;
-    }
-    .school{
-      margin-top:12px;
-      color: #333;
-      font-size: 16px;
-      height: 22px;
-      line-height: 22px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      max-width:100%;
-    }
-  }
 }
 // coderDepot
 .Panels{
@@ -123,9 +94,6 @@
     & > a:first-child{
       border-right: 1px solid #d9d9d9;
     }
-    & > a:last-child{
-      border-right: none;
-    }
   }
   .infoCount{
     display: inline-block;
@@ -319,7 +287,6 @@
   }
 }
 .downMenu{
-  width: 330px;
   box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
   background-color: #fff;
   .ant-menu-vertical .ant-menu-item:hover{

src/forge/Main/IndexItem.js

@@ -47,13 +47,11 @@ class IndexItem extends Component {
                         : ""
                     }
                     {
-                      item.type && item.type === 2 ?
+                      item.type && item.type !== 0 ? 
+                      item.type === 2 ?
                       <Tooltip title="该项目是一个镜像" className="ml5">
                         <i className="iconfont icon-banbenku font-18 color-green" />
-                      </Tooltip>:""
-                    }
-                    {
-                      item.type && item.type === 1 ?
+                      </Tooltip>:
                       <span className="ml5">
                         <i className="iconfont icon-jingxiang font-18 color-green" />
                       </span>:""
@@ -78,7 +76,9 @@ class IndexItem extends Component {
 
                 <div className="p-r-about">
                   <span className="p-r-detail">
-                    {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
+                    {/* <span><label>浏览量：</label>{item.visits}</span> */}
+                    {/* {item.category && item.category.id && <span>{item.category.name}</span>} */}
+                    {/* {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""} */}
                     {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
                   </span>
                 </div>

src/forge/Main/NullData.js

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

src/forge/Main/list.css

@@ -1,10 +1,69 @@
 
 .lineH2{line-height:2}
-.t_project_banner {
-  /* height: 260px;
-  background: url(../Images/banner_list.jpg) no-repeat center; */
+.subjectBanner {
+  height: 160px;
+  position: relative;
+  overflow: hidden;
   background-color: #050d34;
 }
+.subjectleft{
+  margin-top: 40px;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: center;
+  align-items: center;
+}
+.bannerBox{
+  width: 1200px;
+  position: absolute;
+  z-index: 2;
+  left: 50%;
+  top: 0;
+  transform: translateX(-50%);
+}
+.subjectleft>span:first-child{
+  width: 140px;
+  height: 30px;
+  font-size: 30px;
+  font-weight: 600;
+  color: #fff;
+  line-height: 30px;
+  letter-spacing: 4px;
+}
+.subjectleft>span:last-child{
+  height: 16px;
+  font-size: 16px;
+  color: #fff;
+  line-height: 16px;
+  margin-left: 16px;
+}
+.subjectleft>span:last-child .words{
+  letter-spacing: 3px;
+  display: block;
+  margin-top: -6px;
+  margin-bottom: 2px!important;
+}
+.bannerBox > a{
+  display: inline-block;
+  width: 104px;
+  height: 30px;
+  line-height: 28px;
+  text-align: center;
+  border-radius: 4px;
+  border: 1px solid #666;
+  margin-right: 30px;
+  margin-top: 30px;
+  color: #fff;
+  cursor: pointer;
+}
+.bannerBox > a > i{
+  font-size: 14px!important;
+  display: inline-block;
+  margin-right: 10px;
+}
+.bannerBox > a > a{
+  color: #fff!important;
+}
 .ProjectListIndex{
   width: 1200px;
   margin:20px auto;

src/forge/Main/sub/Contribute.jsx

@@ -42,7 +42,7 @@ function Contribute(props){
     <WhiteBack>
       <Spin spinning={isSpin}>
         <div className="boxPanel">
-          <p className="font-18 padding10-20" style={{borderBottom:"1px solid #eee"}}>贡献者列表</p>
+          <p className="font-18 mb20">贡献者列表</p>
           {
             list && list.length > 0 ?
             <div className="contrbuteList">

src/forge/Main/sub/DetailBanner.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Skeleton , Tooltip} from 'antd';
+import { Skeleton , Tooltip } from 'antd';
 import { Link } from 'react-router-dom';
 
 function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
@@ -19,12 +19,12 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
   return(
     <div className="f-wrap-between mt15">
       {
-        menuName && projectDetail ? 
+        menuName && menuName.length> 0 && projectDetail ? 
         <ul className="headerMenu-wrapper">
           {
-            menuName.map((item,key)=>{
+           Array.isArray(menuName)&& menuName.map((item,key)=>{
               return(
-                <React.Fragment>
+                <React.Fragment key={item.menu_name}>
                   {
                     item.menu_name === "home" &&
                     <li className={pathname==="about" ? "active" : ""}>
@@ -49,7 +49,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                       <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>
+                          <span>易修(Issue)</span>
                           {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
                         </Link>
                       </Tooltip>
@@ -65,6 +65,15 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                       </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>
+                        <span>Wiki</span>
+                      </Link>
+                    </li>
+                  } */}
                   {
                     item.menu_name === "devops" && platform ? 
                     <li className={pathname==="devops" ? "active" : ""}>

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

@@ -1,13 +1,11 @@
 .boxPanel{
   width: 1200px;
-  margin:20px auto;
-  border-radius: 4px;
-  border:1px solid #eee;
+  margin:0px auto;
+  padding:20px 0px;
   min-height: 500px;
   .contrbuteList{
     display: flex;
     flex-wrap: wrap;
-    padding:20px;
     & > div{
       width: 20%;
     }

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 = () => {
@@ -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={{

src/forge/Merge/MergeSubmit.js

@@ -102,7 +102,7 @@ class MergeSubmit extends Component{
           <span className="f-wrap-alignCenter">
             <Link to={`/users/${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>
+          <label className="hide-1" style={{maxWidth:"75px",verticalAlign:'middle'}}>{text}</label>
           </Link>
           </span>
         ),

src/forge/Merge/NewMerge.js

@@ -32,20 +32,23 @@ class NewMerge extends Component {
   }
 
   componentDidMount = () => {
-    const { projectsId } = this.props.match.params;
+    const { projectsId , owner } = this.props.match.params;
     this.getmergelist(projectsId);
     // 监听回退事件
     if (window.history && window.history.pushState) {
       window.addEventListener('popstate', this.handleBack, false);
     }
+    const { giteaVisible , showEABox } = this.props;
+    if(giteaVisible){
+      showEABox && showEABox(`/projects/${owner}/${projectsId}/pulls`);
+    }
   };
 
   componentDidUpdate=(preProps)=>{
     const { project } = this.props;
-    const { pull } = this.state;
     let oldProject = preProps.project;
     if(project && oldProject && (oldProject.id !== project.id)){
-      this.compareProject(this.state.id,pull,"master");
+      this.compareProject(this.state.id,"master","master");
     }
   }
   // 页面销毁取消监听 
@@ -79,8 +82,7 @@ class NewMerge extends Component {
           this.set_default_pull(result.data.branches);
           this.set_default_merge(result.data.merge_projects);
         }
-        const { pull } = this.state;
-        this.compareProject(result.data.id,pull||"master","master");
+        this.compareProject(result.data.id,"master","master");
         this.setState({isSpin: false})
       })
       .catch((error) => {

src/forge/Merge/merge.js

@@ -4,7 +4,7 @@ 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";
@@ -255,7 +255,7 @@ class merge extends Component {
             />
           </div>
           {
-            data && data.user_admin_or_member &&
+            data && data.user_admin_or_developer &&
             <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
               +&nbsp;新建合并请求
             </a>
@@ -387,7 +387,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 +396,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/New/Index.js

@@ -1,6 +1,6 @@
 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 '../css/index.scss';
@@ -48,6 +48,10 @@ class Index extends Component {
     }
   }
   componentDidMount = () => {
+    const { giteaVisible , showEABox } = this.props;
+    if(giteaVisible){
+      showEABox && showEABox('/projects');
+    }
     // 获取拥有者列表
     this.getOwner();
     // 获取项目类别
@@ -58,6 +62,8 @@ class Index extends Component {
     this.getGitignore();
     // 获取开源许可证
     this.getLicenses();
+    //判断是否为删除新建项目失败后返回，并执行对应逻辑
+    this.isDeleteProjectBack();
   }
   componentDidUpdate=(prevPros)=>{
     if(prevPros && this.props && !this.props.checkIfLogin()){
@@ -69,6 +75,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 +84,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 +148,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) {
@@ -172,6 +201,8 @@ class Index extends Component {
         const { project_language_id, project_category_id, license_id, ignore_id , owners_id , owners_name } = 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,
@@ -185,7 +216,7 @@ class Index extends Component {
             this.setState({
               isSpin: false
             })
-            this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
+            projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
             this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
           }
         }).catch((error) => {
@@ -270,7 +301,6 @@ class Index extends Component {
     const { getFieldDecorator } = this.props.form;
     // 项目类型：deposit-托管项目，mirror-镜像项目
     const { projectsType } = this.props.match.params;
-
     const {
       CategoryList,
       LanguageList,
@@ -337,7 +367,9 @@ 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>
+                    <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'}}>

src/forge/Newfile/Index.js

@@ -14,6 +14,14 @@ class Index extends Component {
     };
   }
 
+  componentDidMount=()=>{
+    const { projectsId , owner } = this.props.match.params;
+    const { giteaVisible , showEABox } = this.props;
+    if(giteaVisible){
+      showEABox && showEABox(`/projects/${owner}/${projectsId}`);
+    }
+  }
+
   // 命名文件
   changeFileName = (e) => {
     this.setState({

src/forge/Newfile/upload_file.js

@@ -15,6 +15,14 @@ class UploadFile extends Component {
     };
   }
 
+  componentDidMount=()=>{
+    const { projectsId , owner } = this.props.match.params;
+    const { giteaVisible , showEABox } = this.props;
+    if(giteaVisible){
+      showEABox && showEABox(`/projects/${owner}/${projectsId}`);
+    }
+  }
+  
   // 获取上传后的文件id数组
   UploadFunc = (fileList) => {
     this.setState({

src/forge/Notice/Index.jsx

@@ -22,6 +22,7 @@ function Index(props){
   const username = props.match.params.username;
   const pathname = props.history.location.pathname;
   const user = props.user;
+  const undo_messages = props.undo_messages;
 
   const [ menu , setMenu ] = useState("notify");
   const [ messagesCount , setMessagesCount ] = useState(0);
@@ -70,9 +71,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;

src/forge/Notice/Notify.jsx

@@ -14,8 +14,24 @@ function Notify(props){
   const [ isSpin , setIsSpin ] = useState(true);
 
   useEffect(()=>{
-    props && props.deleteEvent("notify",0);
-  },[])
+    if(username){
+      getList();
+    }
+  },[username,page])
+
+  function getList(){
+    const url = `/users/${username}/applied_messages.json`;
+    Axios.get(url,{
+      params:{
+        page,per_page:limit
+      }
+    }).then(result=>{
+      if(result){
+        setList(result.data.applied_messages);
+        setTotal(result.data.total_count);
+      }
+    }).catch(error=>{})
+  }
 
   useEffect(()=>{
     if(username){

src/forge/Notice/UndoEvent.jsx

@@ -14,6 +14,7 @@ function UndoEvent(props){
   const [ total , setTotal ] = useState(0);
   const [ isSpin , setIsSpin ] = useState(true);
 
+
   useEffect(()=>{
     if(username){
       setIsSpin(true);
@@ -53,7 +54,7 @@ function UndoEvent(props){
     Axios.post(url).then(result=>{
       if(result && result.data){
         getList();
-        props && props.deleteEvent("apply",1);
+        props && props.deleteEvent("undo",1);
       }
     }).catch(error=>{})
   }
@@ -69,15 +70,14 @@ function UndoEvent(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>
+                    <Link to={`/users/${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.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
                         <span className="color-grey-9">{i.time_ago}</span>
                       </p>
                       <FlexAJ>
-                        <p className="color-grey-6">请求将仓库【<Link to={`/projects/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
-                        转移给【<Link to={`/users/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】，是否接受？</p>
+                        <p>请求将仓库转移给【{i.owner && i.owner.name}】,是否接受？</p>
                         {
                           i.status === "common" &&
                           <span>
@@ -93,7 +93,7 @@ function UndoEvent(props){
                           i.status === "canceled" && <span className="color-grey-9">对方已取消转移</span>
                         }
                         {
-                          i.status === "accepted" && <span className="color-grey-9">已接受</span>
+                          i.status === "accept" && <span className="color-grey-9">已接受</span>
                         }
                         {
                           i.status === "refused" && <span className="color-grey-9">已拒绝</span>

src/forge/SecuritySetting/Index.jsx

@@ -1,68 +0,0 @@
-import React from "react";
-
-import { Route, Switch } from "react-router-dom";
-import { withRouter } from "react-router";
-
-import { SnackbarHOC } from "educoder";
-import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
-import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
-import Loadable from "react-loadable";
-import Loading from "../../Loading";
-import { Box , Gap , LongWidth } from '../Component/layout';
-import { getImageUrl } from 'educoder';
-import { Link } from 'react-router-dom';
-
-import './Index.scss';
-
-const SSHNew = Loadable({
-  loader: () => import("./sub/New"),
-  loading: Loading,
-});
-const SSHIndex = Loadable({
-  loader: () => import("./sub/SSH"),
-  loading: Loading,
-});
-function Index(props){
-  const { current_user } = props;
-  const { pathname } = props.location;
-
-  return(
-    <div className="newMain clearfix whiteBack">
-      <div className="boies">
-        <Box>
-          <div className="shortW">
-            <div className="userDetail">
-              <img src={getImageUrl(`/${current_user && current_user.image_url}`)} alt=""/>
-              <span>{current_user && current_user.username}</span>
-            </div>
-            <ul className="securityUl">
-              <li>安全设置</li>
-              <li className={pathname.indexOf("/settings/SSH")>-1 ?"active":""}><Link to={`/settings/SSH`}><i className="iconfont icon-xuanzhongssh_icon mr5 font-14"></i>SSH密钥</Link></li>
-            </ul>
-          </div>
-          <LongWidth>
-            <Gap>
-              <Switch>
-                <Route
-                  path="/settings/SSH/new"
-                  render={(p) => (
-                    <SSHNew {...props} {...p}/>
-                  )}
-                ></Route>
-                <Route
-                  path="/settings/SSH"
-                  render={(p) => (
-                    <SSHIndex {...props} {...p}/>
-                  )}
-                ></Route>
-              </Switch>
-            </Gap>
-          </LongWidth>
-        </Box>
-      </div>
-      
-    </div>
-  )
-}
-export default withRouter((CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
-);

src/forge/SecuritySetting/Index.scss

@@ -1,192 +0,0 @@
-.whiteBack{
-  background-color: #fff;
-  .boies{
-    width: 1200px;
-    margin:0px auto;
-    padding:30px 0px 10px;
-    .shortW{
-      width: 198px;
-      border: 1px solid rgba(153, 153, 153, 0.22);
-      border-radius: 4px;
-      min-height: 400px;
-      margin-bottom: 30px;
-      .userDetail{
-        background: rgba(153, 153, 153, 0.05);
-        border-radius: 4px 4px 0px 0px;
-        padding:20px 25px;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        img{
-          height: 48px;
-          width: 48px;
-          border-radius: 50%;
-          margin-right: 12px;
-        }
-        span{
-          font-size: 16px;
-          color: #333;
-          max-width: 90px;
-          display: block;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-        }
-      }
-      .securityUl{
-        padding:20px 16px;
-        color: #333;
-        li{
-          margin-bottom: 10px;
-          height: 27px;
-          line-height: 27px;
-          position: relative;
-          cursor: pointer;
-          a{
-            color: #666;
-            &:hover{
-              color: #333;
-            }
-          }
-          &.active a{
-            color: #333;
-          }
-          &:first-child{
-            font-size: 16px;
-          }
-          &.active::before{
-            position: absolute;
-            left: -16px;
-            top:0px;
-            height: 100%;
-            width: 2px;
-            content: "";
-            background-color: #2A61FF;
-          }
-        }
-      }
-    }
-    .sshHead{
-      display: flex;
-      align-items: center;
-      padding:15px 20px;
-      justify-content: space-between;
-      border-bottom: 1px solid #EEEEEE;
-      &>span{
-        font-size: 18px;
-      }
-    }
-    .ant-list-item{
-      padding:20px;
-      border-bottom: 1px solid #eee!important;
-      &>img{
-        margin-right: 24px;
-      }
-      &>div{
-        flex:1;
-        width: 0;
-        margin-right: 20px;
-        p{
-          margin-bottom: 8px!important;
-        }
-        span{
-          font-size: 12px;
-        }
-      }
-      .ant-btn.ant-btn-danger{
-        background-color: #fff;
-        border-color: #D0D0D0;
-        color: #DF0002;
-        &:hover{
-          background-color: #DF0002;
-          color: #fff;
-          border-color: #DF0002;
-        }
-      }
-    }
-    .questionLink{
-      padding:15px 20px;
-      a{
-        color: #4B7AFF;
-        &:hover{
-          text-decoration: underline;
-        }
-      }
-    }
-    .sshForm{
-      padding:15px 20px;
-      .ant-col.ant-form-item-label{
-        font-size: 16px;
-        color:#333;
-      }
-    }
-  }
-}
-.deleteBox{
-  .ant-modal-header{
-    background-color: rgba(223, 0, 2, 0.06);
-    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
-    }
-    .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;
-      }
-    }
-  }
-}
-.descModal{
-  .ant-modal-title{
-    text-align: left;
-    font-size: 20px;
-  }
-  .keyContent{
-    border:1px solid #eee;
-    border-radius: 4px;
-    padding:10px 15px;
-    margin-top: 10px;
-    max-height: 200px;
-    overflow-y: auto;
-  }
-  .keysTitle{
-    display: flex;
-    align-items: flex-start;
-    justify-content: flex-start;
-    flex-wrap: wrap;
-    span:last-child{
-      word-break: break-all;
-      flex:1;
-    }
-  }
-}

src/forge/SecuritySetting/sub/DeleteBox.jsx

@@ -1,28 +0,0 @@
-import React from 'react';
-import { AlignCenter } from '../../Component/layout';
-import { Modal , Button } from 'antd';
-
-function DeleteBox({ visible , onCancel ,onSuccess }) {
-  
-  return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title="删除SSH密钥"
-      width="600px"
-      className="deleteBox"
-      footer={
-        <div>
-          <Button size={'large'} onClick={onCancel}>取消</Button>
-          <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
-        </div>
-      }
-    >
-      <div className="desc">
-        <AlignCenter className="descMain"><i className="iconfont icon-jinggao1 mr10"></i>您确定要删除此 SSH 密钥吗？</AlignCenter>
-        <p>此操作将永久删除该SSH密钥，且不可恢复。如果您想再次使用该密钥，则需要您重新上传。</p>
-      </div>
-    </Modal>
-  )
-}
-export default DeleteBox;

src/forge/SecuritySetting/sub/New.jsx

@@ -1,59 +0,0 @@
-import React , { forwardRef, useState } from 'react';
-import { Link } from 'react-router-dom';
-import { Button, Form , Input } from 'antd';
-import Axios from 'axios';
-
-const { TextArea } = Input;
-function New({ form , showNotification , history }) {
-  const { getFieldDecorator, validateFields , setFieldsValue } = form;
-  const [ msg , setMsg ] = useState(undefined);
-
-  function submit() {
-    validateFields((error,values)=>{
-      if(!error){
-        const url = `/public_keys.json`;
-        Axios.post(url,{
-          ...values
-        }).then(result=>{
-          if(result){
-            if(result.data.status === 0){
-              history.push(`/settings/SSH`);
-              showNotification("密钥创建成功!");
-            }
-            let s = {
-              status:result.data.status,
-              message:result.data.message
-            }
-            setMsg(s);
-          }
-        }).catch(error=>{})
-      }
-    })
-  }
-
-  return(
-    <div>
-      <div className="sshHead">
-        <span><Link to={`/settings/SSH`} className="color-blue">SSH密钥</Link><i className="iconfont icon-youjiantou ml5 mr5 font-12"></i>添加SSH密钥</span>
-      </div>
-      <Form className="sshForm">
-        <Form.Item label="标题" validateStatus={msg && msg.status === 10001 ? "error":undefined} help={msg && msg.status === 10001 ? msg.message:undefined}>
-          {getFieldDecorator("title",{
-            rules:[{required:true,message:"请输入密钥标题"}]
-          })(
-            <Input placeholder="请输入密钥标题" size="large" maxLength="200"/>
-          )}
-        </Form.Item>
-        <Form.Item label="密钥" validateStatus={msg && msg.status === 10002 ? "error":undefined} help={msg && msg.status === 10002 ? msg.message:undefined}>
-          {getFieldDecorator("key",{
-            rules:[{required:true,message:"请输入密钥"}]
-          })(
-            <TextArea placeholder="支持以'ssh-rsa','ssh-dss','ssh-ed25519','ecdsa-sha2-nistp256','ecdsa-sha2-nistp384','ecdsa-sha2-nistp521'开头" autoSize={{ minRows: 6, maxRows: 6 }}/>
-          )}
-        </Form.Item>
-        <Button type="primary" style={{width:"100px"}} onClick={submit}>确定</Button>
-      </Form>
-    </div>
-  )
-}
-export default Form.create()(forwardRef(New));

src/forge/SecuritySetting/sub/SSH.jsx

@@ -1,96 +0,0 @@
-import React, { useState , useEffect } from 'react';
-import { Button , List , Pagination , Skeleton } from 'antd';
-import miyao from '../img/miyao_middle_icon.png';
-import axios from 'axios';
-import DeleteBox from './DeleteBox';
-import SSHDetail from './SSHDetail';
-
-const limit = 10;
-function SSH(props) {
-  const [ list ,setList ] = useState(undefined);
-  const [ page , setPage ] = useState(1);
-  const [ total , setTotal ] = useState(0);
-  const [ id , setId ] = useState(undefined);
-  const [ visible , setVisible ] = useState(false);
-  const [ visibleDesc , setVisibleDesc ] = useState(false);
-  const [ content , setContent ] = useState(undefined);
-
-  useEffect(()=>{
-    Init();
-  },[page])
-
-  function Init() {
-    const url = `/public_keys.json`;
-    axios.get(url,{
-      params:{
-        page,limit
-      }
-    }).then(result=>{
-      if(result && result.data){
-        setList(result.data.public_keys);
-        setTotal(result.data.total_count);
-      }
-    }).catch(error=>{})
-  }
-
-  function onSuccess() {
-    if(id){
-      const url = `/public_keys/${id}.json`;
-      axios.delete(url).then(result=>{
-        if(result && result.data){
-          props.showNotification("密钥删除成功！");
-          setVisible(false);
-          if(page>1 && (list && list.length===1)){
-            setPage(page-1);
-          }else{
-            Init();
-          }
-        }
-      }).catch(error=>{})
-    }
-  }
-
-  return(
-    <div>
-      <DeleteBox visible={visible} onCancel={()=>setVisible(false)} onSuccess={onSuccess}/>
-      <SSHDetail visible={visibleDesc} onCancel={()=>setVisibleDesc(false)} desc={content}/>
-      <div className="sshHead">
-        <span>SSH密钥</span>
-        <Button type="primary" size="large" onClick={()=>props.history.push('/settings/SSH/new')}>添加SSH密钥</Button>
-      </div>
-      {
-        list && list.length > 0 &&
-        <List>
-          {
-            list.map((i,k)=>{
-              return(
-                <List.Item> 
-                  <img src={miyao} alt=""/>
-                  <div>
-                    <p className="color-grey-3"><a className="task-hide" style={{display:"block",fontWeight:"500"}} onClick={()=>{setContent(i);setVisibleDesc(true)}}>{i.name}</a></p>
-                    <p className="task-hide color-grey-6">{i.fingerprint}</p>
-                    <span className="color-grey-6">添加时间：{i.created_time}</span>
-                  </div>
-                  <Button type="danger" onClick={()=>{setId(i.id);setVisible(true)}}>删除</Button>
-                </List.Item>
-              )
-            })
-          }
-          
-        </List>
-      }
-      {
-        !list && <Skeleton />
-      }
-      {
-        total > limit &&
-        <div className="edu-txt-center mt15">
-          <Pagination simple current={page} onChange={(p)=>{setPage(p)}} pageSize={limit} total={total}/>
-        </div>
-      }
-      { (!list || (list && list.length === 0)) && <p className="mt30 pl20">您还没有添加任何SSH密钥</p> }
-      <p className="questionLink"><a href={`https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent`} target="_blank">如何生成SSH密钥？</a></p>
-    </div>
-  )
-}
-export default SSH;

src/forge/SecuritySetting/sub/SSHDetail.jsx

@@ -1,31 +0,0 @@
-import React from 'react';
-
-import { Button, Modal } from 'antd';
-
-function SSHDetail({visible , onCancel , desc }) {
-  return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={"SSH密钥详情"}
-      width="600px"
-      footer={null}
-      className={"descModal"}
-    >
-      <div>
-        <p className="color-grey-3 font-16 keysTitle">
-          <span style={{fontWeight:"600"}}>SSH Key：</span>
-          <span>{desc && desc.name}</span>
-        </p>
-        <p className="mt5">添加时间：{desc && desc.created_time}</p>
-        <p className="color-grey-3 mt30 keysTitle mb15">
-          <span style={{fontWeight:"600"}}>公钥指纹：</span>
-          <span>{desc && desc.fingerprint}</span>
-        </p>
-        <div className="keyContent">{desc && desc.content}</div>
-        <div className="edu-txt-center mt30 mb20"><Button type={"primary"} size="large" style={{width:"100px"}} onClick={onCancel}>关闭</Button></div>
-      </div>
-    </Modal>
-  )
-}
-export default SSHDetail;

src/forge/Settings/Collaborator.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState , useRef } from "react";
 import {WhiteBack} from '../Component/layout';
 import AddMember from '../Component/AddMember';
 import AddGroup from '../Component/AddGroup';
@@ -8,9 +8,11 @@ import Group from './CollaboratorGroup';
 function Collaborator(props){
   const [ nav , setNav] = useState("1");
   const [ newId , setNewId] = useState(undefined);
+  const [ addOperation , setAddOperation] = useState(true);
   const [ newGroupId , setNewGroupId] = useState(undefined);
   const {projectsId ,owner} = props.match.params;
 
+
   const author = props && props.projectDetail && props.projectDetail.author;
 
   function getID(id){
@@ -19,6 +21,7 @@ function Collaborator(props){
   function getGroupID(id){
     setNewGroupId(id);
   }
+
   
   return (
     <WhiteBack>
@@ -27,15 +30,17 @@ function Collaborator(props){
           author && author.type === "Organization" ?
           <span>
             <span style={{cursor:"pointer"}} className={nav === "1" ? "font-18 text-black color-blue":"font-18 text-black"} onClick={()=>{setNav("1");setNewId(undefined)}}>协作者管理</span>
-            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>{setNav("2");setNewId(undefined)}}>团队管理</span>
+            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>{setNav("2");setNewId(undefined);setNewGroupId(undefined)}}>团队管理</span>
           </span>
           :
           <span className="font-18 text-black">协作者管理</span>
         }
         {
-          nav === "1" ?
+          nav === "1" &&
           <AddMember getID={getID} login showNotification={props.showNotification}/>
-          :
+        }
+        {
+          (nav !== "1" && addOperation) &&
           <AddGroup getGroupID={getGroupID} organizeId={owner}/>
         }
       </div>
@@ -44,7 +49,7 @@ function Collaborator(props){
           nav === "1" ? 
           <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.projectDetail && props.projectDetail.author} showNotification={props.showNotification}/> 
           :
-          <Group owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
+          <Group setAddOperation={setAddOperation} owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
         }
       </div>
     </WhiteBack>

src/forge/Settings/CollaboratorGroup.jsx

@@ -10,7 +10,7 @@ const roles = {
   read: "报告者",
 };
 const limit = 15;
-function CollaboratorGroup({ newGroupId, owner, projectsId }) {
+function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation }) {
   const [list, setList] = useState(undefined);
   const [isSpin, setIsSpin] = useState(true);
   const [page, setPage] = useState(1);
@@ -34,6 +34,7 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) {
           setList(result.data.teams);
           setTotal(result.data.total_count);
           setIsSpin(false);
+          setAddOperation(result.data.can_add);
         }
       })
       .catch((error) => {});
@@ -47,16 +48,15 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) {
   // 添加团队
   function addGroup(id) {
     const url = `/${owner}/${projectsId}/teams.json`;
-    axios
-      .post(url, {
-        team_id: id,
-      })
-      .then((result) => {
-        if (result && result.data) {
-          getData();
-        }
-      })
-      .catch((error) => {});
+    axios.post(url, {
+      team_id: id,
+    })
+    .then((result) => {
+      if (result && result.data) {
+        getData();
+      }
+    })
+    .catch((error) => {});
   }
 
   // 删除团队
@@ -77,7 +77,11 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) {
       title: "团队名",
       dataIndex: "name",
       render: (value, item) => {
-        return <Link to={`/organize/${owner}/group/${item.id}`}>{value}</Link>;
+        if(item.is_admin || item.is_member){
+          return <Link to={`/organize/${owner}/group/${item.id}`}>{value}</Link>;
+        }else{
+          return <span>{value}</span>;
+        }
       },
     },
     {

src/forge/Settings/Index.js

@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component, useEffect } from "react";
 import { Link, Route, Switch } from "react-router-dom";
 
 import "../css/index.scss";
@@ -20,14 +20,6 @@ const Setting = Loadable({
   loader: () => import("./Setting"),
   loading: Loading,
 });
-const WebhookNew = Loadable({
-  loader: () => import("./Webhooks/New"),
-  loading: Loading,
-});
-const Webhook = Loadable({
-  loader: () => import("./Webhooks/Index"),
-  loading: Loading,
-});
 const Collaborator = Loadable({
   loader: () => import("./Collaborator"),
   loading: Loading,
@@ -45,11 +37,22 @@ const ManageNew = Loadable({
   loading: Loading,
 });
 class Index extends Component {
+
+  componentDidMount = () => {
+    const { projectsId , owner } = this.props.match.params;
+    const { giteaVisible , showEABox } = this.props;
+    if(giteaVisible){
+      showEABox && showEABox(`/projects/${owner}/${projectsId}`);
+    }
+  }
+
   render() {
     const { projectsId , owner } = this.props.match.params;
     const { pathname } = this.props.history.location;
 
     const flag = pathname === `/projects/${owner}/${projectsId}/setting`;
+
+    
     return (
       <Box className="ProjectListIndex">
         <Short>
@@ -73,18 +76,6 @@ class Index extends Component {
                 </Link>
               </p>
             </li>
-            <li
-              className={
-                pathname.indexOf("setting/webhooks") > -1 ? "active" : ""
-              }
-            >
-              <p>
-                <Link to={`/projects/${owner}/${projectsId}/setting/webhooks`} className="w-100">
-                  <i className="iconfont icon-a-xuanzhongwebhookicon font-18 mr10 color-grey-9"></i>
-                  Webhooks
-                </Link>
-              </p>
-            </li>
             <li
               className={
                 pathname.indexOf("setting/branch") > -1 ? "active" : ""
@@ -123,27 +114,8 @@ class Index extends Component {
           </ul>
         </Short>
         <Long>
-          <Gap>
+          <Gap className="list-r-Info">
             <Switch {...this.props}>
-              {/* webhooks */}
-              <Route
-                path="/projects/:owner/:projectsId/setting/webhooks/new"
-                render={(props) => (
-                  <WebhookNew {...this.props} {...props} {...this.state} />
-                )}
-              ></Route>
-              <Route
-                path="/projects/:owner/:projectsId/setting/webhooks/:id"
-                render={(props) => (
-                  <WebhookNew {...this.props} {...props} {...this.state} />
-                )}
-              ></Route>
-              <Route
-                path="/projects/:owner/:projectsId/setting/webhooks"
-                render={(props) => (
-                  <Webhook {...this.props} {...props} {...this.state} />
-                )}
-              ></Route>
               {/* 协作者 */}
               <Route
                 path="/projects/:owner/:projectsId/setting/collaborator"

src/forge/Settings/ManageWebNew.jsx

@@ -80,7 +80,7 @@ export default Form.create()(
             [],
             <Input type="password" />
           )}
-          <p className="font-12 mt10 pb15" style={{borderBottom:"1px solid #eee"}}>推送、创建，删除分支事件白名单，支持匹配符。如果为空或者 *，所有分支的事件均被触发。<br/>语法参见 <Link to="github.com/gobwas/glob" className="color-blue" target="_blank">github.com/gobwas/glob</Link> 。示例： Master, ${'{master,release*}'}。</p>
+          <p className="font-12 mt10 pb15" style={{borderBottom:"1px solid #eee"}}>推送、创建，删除分支事件白名单，支持匹配符。如果为空或者 *，所有分支的事件均被触发。<br/>语法参见 <a href="http://github.com/gobwas/glob" className="color-blue" target="_blank">github.com/gobwas/glob</a> 。示例： Master, ${'{master,release*}'}。</p>
           {helper(
             "",
             "active",

src/forge/Settings/Setting.js

@@ -3,7 +3,6 @@ import { Form, Input, Checkbox, Select , Spin } from "antd";
 import Title from '../Component/Title';
 import {WhiteBack} from '../Component/layout';
 import DivertModal from '../Divert/DivertModal';
-import { Link } from 'react-router-dom';
 import axios from "axios";
 import "./setting.scss";
 const { TextArea } = Input;
@@ -14,6 +13,7 @@ const menu = [
   {name:"代码库",index:"code"},
   {name:"易修 (Issue)",index:"issues"},
   {name:"合并请求",index:"pulls"},
+  // {name:"Wiki",index:"wiki"},
   {name:"工作流(beta版)",index:"devops"},
   // {name:"资源库",index:"resources"},
   {name:"里程碑",index:"versions"},
@@ -30,7 +30,8 @@ class Setting extends Component {
       project_units:['home',"activity","code"],
       divertVisible:false,
       is_transfering:undefined,
-      projectName:undefined
+      projectName:undefined,
+      permission:undefined
     };
   }
 
@@ -81,8 +82,8 @@ class Setting extends Component {
             private_check: result.data.private,
             loading:false,
             project_units:units,
-            transfer:result.data.transfer,
             is_transfering:result.data.is_transfering,
+            permission:result.data.permission
           });
         }
       })
@@ -221,23 +222,23 @@ class Setting extends Component {
     
   }
   // 确定转移仓库
-  onSuccess=(owner)=>{
+  onSuccess=()=>{
     this.setState({
       is_transfering:true,
-      divertVisible:false,
-      transfer:owner
+      divertVisible:false
     })
   }
 
   render() {
     const { getFieldDecorator } = this.props.form;
-    const { projectsId , owner } = this.props.match.params;
     const { projectDetail } = this.props;
+    const { projectsId , owner } = this.props.match.params;
 
-    const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
     let mirror = projectDetail && projectDetail.mirror;
     let type = projectDetail && projectDetail.type;
     const forked_from_project_id = this.props && this.props.projectDetail && this.props.projectDetail.forked_from_project_id;
+
+    const { CategoryList, LanguageList, private_check ,loading , divertVisible , permission , is_transfering } = this.state;
     return (
       <div>
         <DivertModal 
@@ -339,7 +340,7 @@ class Setting extends Component {
             {/* <Mirror /> */}
           </WhiteBack>
           {
-            projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner")?
+            permission && (permission === "Admin" || permission === "Owner")?
             <WhiteBack className="dangerousBox mb20">
               <div>
                 <div className="dangerousTitle">危险操作区</div>
@@ -347,14 +348,7 @@ class Setting extends Component {
                   <div>
                     <p className="font-bd font-16">转移仓库</p>
                     <p className="mt10">
-                      {
-                        is_transfering ?
-                        <span>此仓库正在转移给【
-                          {transfer && <Link to={transfer.type="User"?`/users/${transfer.login}`:`/organize/${transfer.login}`}>{transfer.name}</Link>}
-                          】，请联系对方接收此仓库。</span>
-                        :
-                        `将此仓库转移给其他用户或组织`
-                      }
+                      将此仓库转移给其他用户或组织
                     </p>
                   </div>
                   {

src/forge/Settings/Webhooks/Index.jsx

@@ -1,113 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Banner , FlexAJ } from '../../Component/layout';
-import DeleteBox from '../../Component/DeleteModal/Index';
-import './Index.scss';
-import { Button , List, Pagination } from 'antd';
-import { Link } from 'react-router-dom';
-import axios from 'axios';
-
-const limit = 15;
-function Index(props) {
-  const [ data , setData ] = useState(undefined);
-  const [ page , setPage ] = useState(1);
-  const [ total , setTotal ] = useState(1);
-  const [ deleteId , setDeleteId ] = useState(undefined);
-  const [ visible , setVisible ] = useState(false);
-  const [ url , setUrl ] = useState(undefined);
-
-  const { owner , projectsId } = props.match.params;
-
-  useEffect(()=>{
-    if(owner && projectsId){
-      getData();
-    }
-  },[owner,projectsId,page])
-
-  function getData() {
-    const url = `/${owner}/${projectsId}/webhooks.json`;
-    axios.get(url,{
-      params:{page,limit}
-    }).then(result=>{
-      if(result && result.data){
-        setData(result.data.webhooks);
-        setTotal(result.data.total_count);
-      }
-    }).catch(error=>{})
-  }
-
-  function deleteFunc(id,url) {
-    setDeleteId(id);
-    setUrl(url);
-    setVisible(true);
-  }
-
-  function onSuccess() {
-    if(deleteId){
-      const url = `/${owner}/${projectsId}/webhooks/${deleteId}.json`;
-      axios.delete(url).then(result=>{
-        if(result){
-          props.showNotification("webhook删除成功！");
-          if(page>1 && data.length === 1){
-            setPage(page-1);
-          }else{
-            getData();
-          }
-          setVisible(false);
-        }
-      }).catch(error=>{})
-    }
-  }
-
-  function addFunc() {
-    if(total >= 20){
-      return props.showNotification("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作");
-    }
-    props.history.push(`/projects/${owner}/${projectsId}/setting/webhooks/new`)
-  }
-
-  return(
-    <div>
-      <DeleteBox 
-        visible={visible} 
-        onCancel={()=>setVisible(false)}
-        onSuccess={onSuccess}
-        title="删除Webhook"
-        content="您确定要删除此Webhook吗？"
-        subTitle={`删除后未来事件将不会推送至此Webhook地址：${url}`}
-      />
-      <Banner>
-        <FlexAJ>
-          <span>Webhooks</span>
-          <Button type="primary" size="large" onClick={addFunc}>添加Webhook</Button>
-        </FlexAJ>
-      </Banner>
-      <div className="hookpanel">
-        <p className="color-grey-3">每当特定事件（如push代码，合并请求被编辑）发生时，我们将通过webhook给您提供的远程URL发送post请求。您可以在我们的<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a>中了解更多信息</p>
-        {
-          data && data.length> 0 &&
-          <List>
-            {data.map((i,k)=>{
-              return(
-                <List.Item key={k}>
-                  <i className="iconfont icon-a-xuanzhongwebhookicon color-grey-d mr12 font-17"></i>
-                  <Link to={`/projects/${owner}/${projectsId}/setting/webhooks/${i.id}`} className="webName">{i.url}</Link>
-                  <span>
-                    <Button ghost type={"primary"} onClick={()=>{props.history.push(`/projects/${owner}/${projectsId}/setting/webhooks/${i.id}`)}}>编辑</Button>
-                    <Button ghost className="ml20" type="danger" onClick={()=>{deleteFunc(i.id,i.url)}}>删除</Button>
-                  </span>
-                </List.Item>
-              )
-            })}
-          </List>
-        }
-        {
-          total > limit &&
-          <div className="edu-txt-center mt20 mb20">
-            <Pagination current={page} total={total} onChange={e=>{setPage(e)}} pageSize={limit}/>
-          </div>
-        }
-      </div>
-    </div>
-  )
-}
-export default Index;

src/forge/Settings/Webhooks/Index.scss

@@ -1,171 +0,0 @@
-.hookpanel{
-  &>p{
-    padding:20px 25px 0px 20px;
-  }
-  .ant-list{
-    .ant-list-item{
-      padding:15px 20px;
-      &:last-child{
-        border-bottom: 1px solid #e8e8e8;
-      }
-      .webName{
-        flex:1;
-        margin-right: 15px;
-        word-break: break-all;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-    }
-  }
-}
-.newPanel{
-  .ant-form .ant-form-item-label label{
-    font-size: 16px;
-  }
-  .has-success .ant-form-explain{
-    font-size: 12px;
-    color: #999;
-    line-height: 20px;
-    margin-top: 5px;
-    word-break: break-all;
-  }
-  .ant-form{
-    .ant-row{
-      padding:0px 194px 0px 20px;
-      &.topLine{
-        border-top: 1px solid #EEEEEE;
-        padding-top:20px;
-        margin-top: 25px;
-      }
-      &.bottomLine{
-        border-bottom: 1px solid #EEEEEE;
-        padding-bottom:20px;
-        margin-bottom: 25px;
-        .ant-checkbox + span{
-          font-size: 16px;
-        }
-      }
-    }
-  }
-  .eventCb{
-    padding:0px 194px 0px 45px;
-    .ant-checkbox-group{
-      width: 100%;
-    }
-    .colSpan{
-      display: flex;
-      flex-wrap: wrap;
-      &>span{
-        width: 50%;
-        margin:0px;
-        display: block;
-        &>span{
-          display: block;
-          padding-left: 24px;
-          margin-bottom: 20px;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-  .ant-form-item-children{
-    display: block;
-  }
-  .ant-checkbox + span{
-    color: #333;
-    &>span{
-      color: #333333;
-      height: 20px;
-      line-height: 20px;
-      padding-left: 24px;
-      font-size: 12px;
-      display: block;
-    }
-  }
-}
-.deschead{
-  background: #FAFCFF;
-  border-radius: 4px 4px 0px 0px;
-  border: 1px solid rgba(42, 97, 255, 0.23);
-  height: 50px;
-  padding:0px 20px;
-  margin-top: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.deschead.mg{
-  margin:20px!important;
-  padding:0px 12px;
-}
-.historyColl{
-  .ant-collapse-header{
-    background-color: #fff;
-  }
-  .panelHeader{
-    display: flex;
-    span{
-      width: 20%;
-      color: #333;
-      font-weight: 400;
-    }
-    .time{
-      text-align: right;
-    }
-    .name{
-      flex:1;
-    }
-  }
-  .ant-collapse-content-box{
-    background-color: #fff;
-  }
-}
-.contentMenu{
-  li{
-    font-weight: 500;
-  }
-  margin-left:14px;
-}
-.contentPanel{
-  .retitle{
-    font-size: 16px;
-    font-weight: 600;
-    color: #333333;
-    margin:20px 0px 10px!important;
-  }
-  .con{
-    background: #EEEEEE;
-    border-radius: 4px;
-    padding:15px;
-    max-height: 400px;
-    overflow: auto;
-    p{
-      font-size: 13px;
-      color:#333;
-      line-height: 28px;
-      &>span:first-child{
-        font-weight: 500;
-      }
-    }
-  }
-  .conEditor{
-    .overflow-guard{
-      border-radius: 4px;
-    }
-    .margin-view-overlays{
-      background-color: #eee;
-      &>div{
-        background-color: #eee;
-      }
-    }
-    .lines-content{
-      background-color: #eee;
-    }
-    .view-lines{
-      &>div{
-        background-color: #eee;
-      }
-    }
-  }
-}

src/forge/Settings/Webhooks/New.jsx

@@ -302,7 +302,7 @@ function New({ form , match , showNotification , history }) {
           <Form.Item 
             label="分支过滤" 
             className="topLine" 
-            help={<span>推送、创建，删除分支事件的分支白名单，使用 glob 模式匹配指定。若为空或 *，则将报告所有分支的事件。语法文档见<a href="github.com/gobwas/glob" target="_blank" className="hoverLine color-blue">github.com/gobwas/glob</a>。示例：master,{'{'}master,release*{'}'}。</span>}
+            help={<span>推送、创建，删除分支事件的分支白名单，使用 glob 模式匹配指定。若为空或 *，则将报告所有分支的事件。语法文档见<a href="http://github.com/gobwas/glob" target="_blank" className="hoverLine color-blue">github.com/gobwas/glob</a>。示例：master,{'{'}master,release*{'}'}。</span>}
             colon={false}
             style={{marginTop:'15px'}}
           >

src/forge/Settings/Webhooks/sub/PushHistory.jsx

@@ -1,82 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Button, Collapse , Tooltip , Spin } from 'antd';
-import axios from 'axios';
-import Content from './historyContent';
-import Fault from '../images/fault.png';
-const { Panel } = Collapse;
-
-function PushHistory({id,owner,projectsId,showNotification}) {
-  const [ list , setList ] = useState(undefined);
-  const [ isSpin , setIsSpin ] = useState(false);
-
-  useEffect(()=>{
-    if(id && owner && projectsId){
-      Init();
-    }
-  },[id,owner,projectsId])
-
-  function Init() {
-    const url = `/${owner}/${projectsId}/webhooks/${id}/tasks.json`;
-    axios.get(url,{
-      params:{page:1,limit:10}
-    }).then(result=>{
-      if(result && result.data){
-        setList(result.data.tasks);
-        setIsSpin(false);
-      }
-    }).catch(error=>{})
-  }
-
-  function testFunc() {
-    setIsSpin(true);
-    const url =  `/${owner}/${projectsId}/webhooks/${id}/test.json`;
-    axios.post(url).then(result=>{
-      if(result && result.data){
-        // Init();
-        showNotification("测试推送已经加入到队列，请耐心等待数秒再刷新推送记录!");
-        setIsSpin(false);
-      }
-    }).catch(error=>{setIsSpin(false);})
-  }
-
-  return(
-    <div className="pt30">
-      <div className="deschead">
-        <span className="font-16">最近推送历史</span>
-        <span>
-          <a className="color-blue" onClick={Init}>刷新</a>
-          <Button type="primary" className="ml20" onClick={testFunc} loading={isSpin}>测试推送</Button>
-        </span>
-      </div>
-      {
-        list && list.length>0 &&
-        <Collapse accordion bordered={false} className="historyColl">
-          {
-            list.map((i,k)=>{
-              return(
-                <Panel header={
-                  <div className="panelHeader">
-                    {
-                      i.is_succeed ? 
-                      <Tooltip title={<span className="pl20 pr20">响应成功，类型：{i.response_content && i.response_content.status}</span>}>
-                        <i className="iconfont icon-chenggongicon font-14 mr10" style={{color:"#2DB44D"}}></i>
-                      </Tooltip>
-                      :
-                      <img src={Fault} alt="" className="mr10" height="15px" style={{marginTop:"2px"}}/>
-                    }
-                    <span className="name">{i.uuid}</span>
-                    {/* <span>{i.type}</span> */}
-                    <span className="time">{i.delivered_time}</span>
-                  </div>
-                }>
-                  <Content request_content={i.request_content && i.request_content.headers} payload_content={i.payload_content} response_content={i.response_content}/>
-                </Panel>
-              )
-            })
-          }
-        </Collapse>
-      }
-    </div>
-  )
-}
-export default PushHistory;

src/forge/Settings/Webhooks/sub/historyContent.jsx

@@ -1,144 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Menu , Tag } from 'antd';
-import Nodata from '../../../Nodata';
-import ReactJson from 'react-json-view';
-import Editor from "../../../Component/Monaco";
-
-function HistoryContent({request_content,payload_content,response_content}) {
-  const [ key , setKey ] = useState("request");
-  const [ requestHeader , setRequestHeader ] = useState(undefined);
-  const [ responseHeader , setResponseHeader ] = useState(undefined);
-
-  useEffect(()=>{
-    if(request_content){
-      let arr = [];
-      Object.keys(request_content).map((item,key)=>{
-        arr.push({name:item,value:request_content[item],k:key});
-      })
-      setRequestHeader(arr);
-    }
-  },[request_content])
-
-  useEffect(()=>{
-    if(response_content && response_content.headers){
-      let arr = [];
-      Object.keys(response_content.headers).map((item,key)=>{
-        arr.push({name:item,value:response_content.headers[item],k:key});
-      })
-      setResponseHeader(arr);
-    }
-  },[response_content])
-
-  function isJSON(str) {
-    if (typeof str === 'string') {
-      try {
-        var obj=JSON.parse(str);
-        if(typeof obj === 'object' && obj ){
-          return true;
-        }else{
-          return false;
-        }
-      } catch(e) {
-        return false;
-      }
-    }
-  }
-
-  
-
-  return(
-    <div className="contentPanel">
-      <div>
-        <Menu selectedKeys={[key]} onSelect={(e)=>setKey(e.key)} mode={"horizontal"} className="contentMenu">
-          <Menu.Item key={"request"}><i className="iconfont icon-qingqiuicon font-15 mr5"></i>请求内容</Menu.Item>
-          <Menu.Item key={"response"}><i className="iconfont icon-xiangyingicon font-16 mr5"></i>响应内容
-            {response_content && <Tag color={response_content.status === 200 ? "#2DB44D":"#CA0002"} style={{margin:"0px",marginLeft:"3px",fontSize:"12px"}}>{response_content.status}</Tag>}
-          </Menu.Item>
-        </Menu>
-      </div>
-      <div style={{paddingLeft:"16px"}}>
-        {
-          key === "request" ?
-          <div>
-            {
-            requestHeader && requestHeader.length > 0 &&
-              <div>
-                <p className="retitle">头信息</p>
-                <div className="con">
-                  {
-                    requestHeader.map((i,k)=>{
-                      return(
-                        <p><span>{i.name}: </span><span>{i.value}</span></p>
-                      )
-                    })
-                  }
-                </div>
-              </div>
-            }
-            {
-              payload_content &&
-              <div>
-                <p className="retitle">内容</p>
-                <div className="con">
-                  <ReactJson 
-                    src={payload_content} 
-                    name={false} 
-                    displayObjectSize={false} 
-                    displayDataTypes={false}
-                    enableClipboard={false}
-                  />  
-                </div>
-              </div>
-            }
-          </div>
-          :
-          <div>
-            {
-              (!responseHeader && ((response_content && !response_content.body) || !response_content))?
-                <Nodata _html="暂无数据~"/>
-              :""
-            }
-            {
-            responseHeader && responseHeader.length > 0 &&
-              <div>
-                <p className="retitle">头信息</p>
-                <div className="con">
-                  {
-                    responseHeader.map((i,k)=>{
-                      return(
-                        <p><span>{i.name}: </span><span>{i.value}</span></p>
-                      )
-                    })
-                  }
-                </div>
-              </div>
-            }
-            {
-              response_content && response_content.body && 
-              <div>
-                <p className="retitle">响应体</p>
-                {
-                  isJSON(response_content.body) ?
-                  <div className="con">
-                    <ReactJson 
-                      enableClipboard={false}
-                      src={JSON.parse(response_content.body)} 
-                      name={false} 
-                      displayObjectSize={false} 
-                      displayDataTypes={false}
-                    />  
-                  </div>
-                  :
-                  <div className="conEditor">
-                    <Editor value={response_content.body}/>
-                  </div>
-                }
-              </div>
-            }
-          </div>
-        }
-      </div>
-    </div>
-  )
-}
-export default HistoryContent;

src/forge/Source/Index.scss

@@ -84,26 +84,4 @@
       }
     }
   }
-}
-.versionTable{
-  .currentTip{
-    display: block;
-    padding:0px 3px;
-    border-radius: 2px;
-    border:1px solid #68c7ec;
-    font-size: 12px;
-    color: #68c7ec;
-    height: 18px;
-    line-height: 18px;
-    margin-left: 5px;
-  }
-  .ant-table-body{
-    margin:0px!important;
-    thead{
-      background-color: #eee;
-    }
-    thead >tr >th,tbody > tr > td{
-      padding:4px 5px!important;
-    }
-  }
 }

src/forge/Team/Group/GroupDetailMember.jsx

@@ -10,7 +10,6 @@ export default (({ data , current_user , successFunc }) => {
         data.map((item, key) => {
           return (
             <Cards
-              user={item.user}
               img={item.user.image_url}
               name={item.user.name}
               time={item.created_at}

src/forge/Team/Group/GroupForm.jsx

@@ -24,21 +24,32 @@ export default Form.create()(
     const [check_box, setCheckBox] = useState(false);
     const [switch_box, setSwtichBox] = useState([]);
     const [onwers, setOnwers] = useState(false);
+    const [auth, setAuth] = useState("");
     const [ descNum , setDescNum ] = useState(0);
     const [switch_box_code, setSwtichBoxCode] = useState(false);
     const [switch_box_pull, setSwtichBoxPull] = useState(false);
     const [switch_box_issue, setSwtichBoxIssue] = useState(false);
     const [switch_box_release, setSwtichBoxRelease] = useState(false);
+    const [switch_box_wiki, setSwtichBoxWiki] = useState(false);
     const { getFieldDecorator, validateFields, setFieldsValue } = form;
     const { OIdentifier, groupId } = match.params;
 
+    useEffect(()=>{
+      setFieldsValue({
+        authorize:"read",
+        includes_all_project:0
+      })
+    },[])
+
     useEffect(() => {
       if (GroupDetail) {
         setOnwers(GroupDetail.authorize === "owner");
+        setAuth(GroupDetail.authorize);
         setCheckBox(GroupDetail.can_create_org_project)
         setSwtichBox(GroupDetail.units)
         setFieldsValue({
-          ...GroupDetail
+          ...GroupDetail,
+          includes_all_project:GroupDetail.includes_all_project ? 1 :0
         })
         setDescNum(GroupDetail.description ? GroupDetail.description.length : 0);
       }
@@ -50,6 +61,7 @@ export default Form.create()(
         setSwtichBoxPull(switch_checked("pulls"))
         setSwtichBoxIssue(switch_checked("issues"))
         setSwtichBoxRelease(switch_checked("releases"))
+        setSwtichBoxWiki(switch_checked("wiki"))
       }
     }, [switch_box])
 
@@ -68,11 +80,13 @@ export default Form.create()(
       setIsSpin(true)
       validateFields((error, values) => {
         if (!error) {
-          values.unit_types = switch_box
+          // values.unit_types = switch_box
+          values.unit_types = ['code','pulls','issues','releases','wiki'];
           if (groupId) { // 表示编辑，否则为新建
             const url = `/organizations/${OIdentifier}/teams/${groupId}.json`;
             axios.put(url, {
-              ...values
+              ...values,
+              includes_all_project:values.includes_all_project === 1?true:false
             }).then(result => {
               if (result && result.data) {
                 showNotification("基本设置更新成功！");
@@ -82,7 +96,8 @@ export default Form.create()(
           } else {
             const url = `/organizations/${OIdentifier}/teams.json`;
             axios.post(url, {
-              ...values
+              ...values,
+              includes_all_project:values.includes_all_project === 1?true:false
             }).then(result => {
               if (result && result.data) {
                 showNotification("团队创建成功！");
@@ -132,6 +147,11 @@ export default Form.create()(
       setSwtichBoxRelease(checked)
     }
 
+    function switch_wiki_types(checked, event) {
+      switch_unit_types(checked, "wiki");
+      setSwtichBoxWiki(checked);
+    }
+
     function cancelEdit(){
       if(groupId){
         history.push(`/organize/${OIdentifier}/group/${groupId}`);
@@ -140,6 +160,9 @@ export default Form.create()(
       }
     }
 
+    function changeAuth(params) {
+      setAuth(params.target.value)
+    }
 
     function checkname(rule, value, callback){
       if(!value){
@@ -192,8 +215,8 @@ export default Form.create()(
                 "includes_all_project",
                 [],
                 <Radio.Group>
-                  <Radio value={false} style={addStyle}>指定项目<span className="color-grey-8 ml10">(团队成员将只能访问添加到团队的项目。 选择此项 <span className="color-grey-3">将不会</span> 自动删除已经添加的项目)</span></Radio>
-                  <Radio value={true} style={OptionStyle}>所有项目<span className="color-grey-8 ml10">(团队可以访问所有项目。选择此选项将 <span className="color-grey-3">添加所有现有的</span> 项目到指定团队)</span></Radio>
+                  <Radio value={0} style={addStyle}>指定项目<span className="color-grey-8 ml10">(团队成员将只能访问添加到团队的项目。 选择此项 <span className="color-grey-3">将不会</span> 自动删除已经添加的项目)</span></Radio>
+                  <Radio value={1} style={OptionStyle}>所有项目<span className="color-grey-8 ml10">(团队可以访问所有项目。选择此选项将 <span className="color-grey-3">添加所有现有的</span> 项目到指定团队)</span></Radio>
                 </Radio.Group>, false, 0,onwers ? "hide":""
               )}
               {helper(
@@ -202,37 +225,42 @@ export default Form.create()(
                 [],
                 <Checkbox checked={check_box} onChange={change_check_box_status} style={OptionStyle}>新建项目<span className="color-grey-8 ml10">(成员可以在组织中新建项目。创建者将自动获得新建的项目的管理员权限)</span></Checkbox>, false, 20,onwers ? "hide":""
               )}
-              {/* {helper(
+              {helper(
                 '版本库权限：',
                 "authorize",
                 [],
-                <Radio.Group>
+                <Radio.Group onChange={changeAuth}>
                   <Radio value="read" style={addStyle}>读取权限<span className="color-grey-8 ml10">(成员可以查看和克隆团队项目)</span></Radio>
                   <Radio value="write" style={addStyle}>写入权限<span className="color-grey-8 ml10">(成员可以查看和推送提交到团队项目)</span></Radio>
                   <Radio value="admin" style={OptionStyle}>管理员权限<span className="color-grey-8 ml10">(成员可以拉取和推送到团队项目同时可以添加协作者)</span></Radio>
                 </Radio.Group>, false, 20,onwers ? "hide":""
-              )} */}
+              )}
             </Form>
-            {/* <p className="required">允许访问项目单元：</p>
-            <AlignCenter className="mb10">
-              <Switch checked={switch_box_code} onClick={switch_code_types} />
-              <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
-            </AlignCenter>
-            <AlignCenter className="mb10">
-              <Switch checked={switch_box_issue} onClick={switch_issue_types} />
-              <span className="ml30 color-grey-3">任务<span className="color-grey-8 ml15">(组织 bug 报告、任务和里程碑)</span></span>
-            </AlignCenter>
-            <AlignCenter className="mb10">
-              <Switch checked={switch_box_pull} onClick={switch_pull_types} />
-              <span className="ml30 color-grey-3">合并请求<span className="color-grey-8 ml15">(启用合并请求和代码评审)</span></span>
-            </AlignCenter>
-            <AlignCenter className="mb20">
-              <Switch checked={switch_box_release} onClick={switch_releas_types} />
-              <span className="ml30 color-grey-3">版本发布<span className="color-grey-8 ml15">(跟踪项目版本和下载)</span></span>
-            </AlignCenter>
-             */}
+            {/* <div className={(auth!=="owner" && auth !=="admin") ? "" :"hide"}>
+              <p className="required">允许访问项目单元：</p>
+              <AlignCenter className="mb10">
+                <Switch checked={switch_box_code} onClick={switch_code_types} />
+                <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb10">
+                <Switch checked={switch_box_issue} onClick={switch_issue_types} />
+                <span className="ml30 color-grey-3">任务<span className="color-grey-8 ml15">(组织 bug 报告、任务和里程碑)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb10">
+                <Switch checked={switch_box_pull} onClick={switch_pull_types} />
+                <span className="ml30 color-grey-3">合并请求<span className="color-grey-8 ml15">(启用合并请求和代码评审)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb10">
+                <Switch checked={switch_box_release} onClick={switch_releas_types} />
+                <span className="ml30 color-grey-3">版本发布<span className="color-grey-8 ml15">(跟踪项目版本和下载)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb20">
+                <Switch checked={switch_box_wiki} onClick={switch_wiki_types} />
+                <span className="ml30 color-grey-3">wiki<span className="color-grey-8 ml15">(编辑此仓库的相关文档说明)</span></span>
+              </AlignCenter>
+            </div> */}
              <Button type={"primary"} onClick={saveGroupFrom}>{groupId ? "更新团队设置" : "新建团队"}</Button>
-            <Cancel className="ml30" onClick={() => cancelEdit()}><span className="pl30 pr30">取消</span></Cancel>
+            <Cancel className="ml30" onClick={() => cancelEdit()}><span>取消</span></Cancel>
           </Div>
         </WhiteBack>
       </Spin>

src/forge/Team/Index.scss

@@ -368,5 +368,5 @@
   }
 }
 .hide{
-  display: hidden;
+  display: none;
 }

src/forge/Team/List.jsx

@@ -75,7 +75,7 @@ function List(props){
                 <Search placeholder="输入仓库名称进行搜索" onSearch={onSearch}/>
               </div>
               <p>
-                { organizeDetail && organizeDetail.is_admin ?
+                { organizeDetail && organizeDetail.can_create_project ?
                 <Sort menu={menu_new}>
                   <a className="addBtn mr30">+&nbsp;新建项目</a>
                 </Sort>

src/forge/Team/ListItem.jsx

@@ -7,7 +7,7 @@ function ListItem({item,key,OIdentifier}) {
     <div className="team_project" key={key}>
       <p className="t_p_title">
         <span className="flex1">
-          <Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.name}</Link>
+          <Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.identifier}</Link>
           { item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> }
           {
             item.type && item.type !== 0 ? 

src/forge/Team/RightBox.jsx

@@ -97,7 +97,12 @@ function RightBox({ OIdentifier , history , admin }) {
             return(
               <div className="teammembers" key={key}>
                 <div>
-                  <Link to={`/organize/${OIdentifier}/group/${item.id}`}><ColorListName>{item.name}</ColorListName></Link>
+                  {
+                    (item.is_admin || item.is_member) ?
+                    <Link to={`/organize/${OIdentifier}/group/${item.id}`}><ColorListName>{item.name}</ColorListName></Link>
+                    :
+                    <ColorListName>{item.name}</ColorListName>
+                  }
                   <Align>
                     <Span>{item.num_users}名成员</Span>
                     <Span>{item.num_projects}个仓库</Span>

src/forge/Team/Setting/TeamSettingCommon.jsx

@@ -168,7 +168,7 @@ export default Form.create()(
                 '权限：',
                 "repo_admin_change_team_access",
                 [],
-                <Checkbox style={radioStyle}>仓库管理员可以添加或移除团队的访问权限</Checkbox>,false,true
+                <Checkbox style={radioStyle}>项目管理员可以添加或移除团队的访问权限</Checkbox>,false,true
               )}
               <Divider/>
               {helper(

src/forge/Team/Sub/Detail.jsx

@@ -83,9 +83,10 @@ function Detail(props){
           img={detail.avatar_url}
           rightBtn={
             <React.Fragment>
-              {flag && !buttonflag && detail.is_admin ? 
-                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue ml10 font-14">设置<i className="iconfont icon-shezhi2 ml3 fr"></i></Link>
-              :""}
+              {flag && !buttonflag && detail.is_admin ? <AlignCenter className="color-blue">
+                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue">设置</Link>
+                <i className="iconfont icon-shezhi2 ml3"></i>
+              </AlignCenter> :""}
               {buttonflag && 
                 <span className="subNavs">
                   <Link to={`/organize/${OIdentifier}/member`} className={pathname ===`/organize/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
@@ -94,18 +95,6 @@ function Detail(props){
               }
             </React.Fragment>
           }
-          bottomInfos={
-            !buttonflag && <div>
-              {
-                detail.location && 
-                <span className="color-grey-6"><i className="iconfont icon-weizhi mr3 font-16 color-grey-6"></i>{detail.location}</span>
-              }
-              {
-                detail.website && 
-                <a href={detail.website} target="_blank" className="ml20 color-grey-6"><i className="iconfont icon-lianjie mr3 font-14"></i>{detail.website}</a>
-              }
-            </div>
-          }
         />
       }
       <Switch {...props}>

src/forge/Team/TeamGroupItems.jsx

@@ -75,7 +75,12 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                 return(
                 <div key={key}>
                   <p className="g-head">
-                    <Link to={`/organize/${organizeDetail.name}/group/${item.id}`} className="color-grey-3 font-16">{item.nickname}</Link>
+                    {
+                      (item.is_admin || item.is_member) ?
+                      <Link to={`/organize/${organizeDetail.name}/group/${item.id}`} className="color-grey-3 font-16">{item.nickname}</Link>
+                      :
+                      <span className="color-grey-3 font-16">{item.nickname}</span>
+                    }
                     <span>
                       { item.is_admin && item.authorize!=="owner" && <Popconfirm title={`确定解散团队${item.name}?`} okText="是" cancelText="否" onConfirm={()=>disMissGroup(item.id)}><a className="color-red">解散团队</a></Popconfirm>}
                       { item.is_member && <LeaveTeam className="ml15" teamID={item.id} onOk={outTeam}/>}

src/forge/Version/New.jsx

@@ -15,7 +15,7 @@ const { Option } = AutoComplete;
 export default Form.create()(
   forwardRef(
     (
-      { form, projectDetail , match, showNotification, history },
+      { form, projectDetail , match, showNotification, history , giteaVisible , showEABox },
       ref
     ) => {
       const { getFieldDecorator, validateFields, setFieldsValue } = form;
@@ -29,6 +29,13 @@ export default Form.create()(
 
       const repo_id = projectDetail && projectDetail.repo_id;
       const { projectsId, versionId , owner } = match.params;
+
+      useEffect(()=>{
+        if(giteaVisible){
+          showEABox && showEABox(`/projects/${owner}/${projectsId}/releases`);
+        }
+      },[])
+
       useEffect(()=>{
         getBranchs(projectsId,owner);
       },[projectsId])

src/forge/Wiki/EditWiki.jsx

@@ -0,0 +1,223 @@
+import React, { useEffect, useCallback, useState } from 'react';
+import { Button, Checkbox, Form, Icon, Radio, Input, message } from 'antd';
+import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
+import DelModal from './components/ModalFun';
+import { weekModal, monthModal } from './components/config';
+import { getWiki, wikiPages, addWiki, updateWiki } from './api';
+import './Index.scss';
+
+
+export default Form.create()(({ form, history, showNotification, projectDetail, match, project }) => {
+  // const permission = projectDetail && projectDetail.permission !== "Reporter";
+  const permission = projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter";
+
+  const { getFieldDecorator, validateFields, setFieldsValue } = form;
+  const [fileArrInit, setFileArrInit] = useState(null);
+  let projectsId = match.params.projectsId;
+  let owner = match.params.owner;
+
+  let wikiName = history.location.pathname.split('/').pop();
+  if (wikiName === 'add') {
+    wikiName = '';
+  }
+
+  const [content, setContent] = useState(undefined);
+  const [modal, setModal] = useState(false);
+  const [modalType, setModalType] = useState();
+
+
+  useEffect(() => {
+    wikiName && project && getWiki({
+      owner,
+      repo: projectsId,
+      pagename: wikiName,
+      projectId: project.id
+    }).then(res => {
+      if (res && res.data) {
+        setContent(res.data.md_content);
+        setFieldsValue({
+          name: res.data.name,
+          content: res.data.md_content,
+        });
+      }
+    });
+  }, [owner, wikiName]);
+
+  // 加载wiki列表
+  useEffect(() => {
+    project && wikiPages({
+      owner: owner,
+      repo: projectsId,
+      projectId: project.id
+    }).then(res => {
+      if (res && res.message === "200" && Array.isArray(res.data)) {
+        setFileArrInit(res.data);
+      } else {
+        setFileArrInit([]);
+      }
+    });
+  }, [project]);
+
+  const helper = useCallback(
+    (label, name, rules, widget, initialValue, rightComponent) => (
+      <Form.Item label={label} className="mb0">
+        {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
+        {rightComponent}
+      </Form.Item>
+    ), []);
+
+
+  function onContentChange(value) {
+    setContent(value);
+    setFieldsValue({
+      content: value
+    });
+  };
+
+  // 保存wiki文件，包括新增和修改
+  function saveFile() {
+    validateFields((err, values) => {
+      if (!err) {
+        let regEn = /[\[\]`\/:*?''<>|%-+_]/g;
+        if (regEn.test(values.name)) {
+          message.error('文件名不能有特殊字符');
+          return;
+        }
+        if (wikiName) {
+          updateWiki({
+            owner,
+            repo: projectsId,
+            projectId: project.id,
+            pagename: wikiName,
+            ...values,
+            commit_message: '',
+          }).then(res => dealRes(res));
+        } else {
+          if (Array.isArray(fileArrInit)) {
+            for (const item of fileArrInit) {
+              if (item.name === values.name) {
+                message.error('不能与已有文件标题相同');
+                return false;
+              }
+            }
+          }
+          addWiki({
+            owner,
+            repo: projectsId,
+            projectId: project.id,
+            pagename: values.name,
+            ...values,
+            commit_message: '',
+          }).then(res => dealRes(res));
+        }
+      }
+    })
+  }
+
+  function dealRes(res) {
+    if (res && res.message === "200") {
+      showNotification("操作成功");
+      goBack();
+    } else if (res && res.message === "500") {
+      message.error('请检查格式是否正确或文件名是否重复');
+    } else {
+      showNotification(res.message || "操作失败");
+    }
+  }
+
+  function goBack() {
+    history.push(`/projects/${owner}/${projectsId}/wiki`);
+  }
+
+  function changeModal(e) {
+    setModal(e.target.checked);
+    if (!e.target.checked) {
+      setModalType();
+    }
+  }
+
+  function changeModalType(e) {
+    let value = e.target.value;
+    if (!content) {
+      setModalContent(value);
+      return;
+    }
+    DelModal({
+      title: '添加模版',
+      contentTitle: `您确定要添加“${value}”模板吗`,
+      content: `此操作会将“${value}”模板替换编辑栏内所有内容，请确认以防文件的丢失`,
+      okText: '确认添加',
+      onOk: () => {
+        setModalType(value);
+        setModal(true);
+        setModalContent(value);
+      }
+    });
+  }
+
+  function setModalContent(value) {
+    if (value === '周报') {
+      setContent(weekModal);
+      setFieldsValue({
+        content: weekModal
+      });
+    } else if (value === '月报') {
+      setContent(monthModal);
+      setFieldsValue({
+        content: monthModal
+      });
+    }
+  }
+
+
+  return (
+    <div className="wiki-main">
+      <div className="wiki-head">
+        <span className="head-title"><span className="back-wiki" onClick={goBack}>Wiki</span> <Icon type="right" /> 编辑页面</span>
+      </div>
+
+      <div >
+        <h4 className="mt20 mb0">标题</h4>
+        {helper(
+          "",
+          "name",
+          [
+            { required: true, message: "请输入标题" },
+            // { pattern: /[^`\[\]\/:*?''<>|%-+_]/g, message: '不允许部分特殊字符' }
+          ],
+          <Input
+            placeholder={"请输入标题"}
+            className="contact-input"
+            maxLength={50}
+          />
+        )}
+
+        <Form.Item className="mb0">
+          <MDEditor
+            placeholder={"请输入wiki内容"}
+            height={500}
+            mdID={"order-new-description"}
+            initValue={content}
+            onChange={onContentChange}
+            className="mt20"
+          ></MDEditor>
+          {getFieldDecorator('content', {
+            rules: [{ required: true, message: "请输入wiki内容" }],
+            validateFirst: true
+          })(<Input style={{ display: 'none' }} />)}
+        </Form.Item>
+
+        <Checkbox checked={modal} onChange={changeModal}>添加模版</Checkbox>
+
+        <Radio.Group onChange={changeModalType} value={modalType}>
+          <Radio value='周报'>周报</Radio>
+          <Radio value='月报'>月报</Radio>
+        </Radio.Group>
+
+      </div>
+
+      {permission && <Button className="mt25" type="primary" onClick={saveFile}>保存</Button>}
+    </div>
+
+  )
+})

src/forge/Wiki/Index.jsx

@@ -0,0 +1,283 @@
+import React, { useEffect, useCallback, useState } from 'react';
+import { Button, Dropdown, Icon, Input, Menu, Tooltip, Select, Upload, message, Spin } from 'antd';
+import { getImageUrl, timeAgo } from 'educoder';
+import cookie from 'react-cookies';
+import CopyTool from '../Component/CopyTool';
+import DelModal from './components/ModalFun';
+import Welcome from './Welcome';
+import { wikiPages, getWiki, deleteWiki } from './api';
+import { httpUrl, TokenKey } from './fetch';
+import './Index.scss';
+import { isArray } from 'lodash';
+const Search = Input.Search;
+const InputGroup = Input.Group;
+const { Option } = Select;
+
+export default (props) => {
+  const { match, history, showNotification, project, projectDetail } = props;
+  const permission = projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter";
+
+  let projectsId = match.params.projectsId;
+  let owner = match.params.owner;
+
+  const [fileArrInit, setFileArrInit] = useState(null);
+  const [checkItem, setCheckItem] = useState({});
+  const [itemDetail, setItemDetail] = useState({});
+
+  const [fileArr, setFileArr] = useState([]);
+  const [reload, setReload] = useState();
+
+  const [urlType, setUrlType] = useState('HTTPS');
+
+  // 加载wiki列表
+  useEffect(() => {
+    project && wikiPages({
+      owner: owner,
+      repo: projectsId,
+      projectId: project.id
+    }).then(res => {
+      if (res && res.message === "200" && isArray(res.data)) {
+        setFileArr(res.data);
+        setFileArrInit(res.data);
+        if (res.data.length) {
+          setCheckItem(res.data[0]);
+        };
+      } else {
+        setFileArr([]);
+        setFileArrInit([]);
+      }
+    });
+  }, [project, reload])
+
+  // 加载单个wiki详情，参数尽量用驼峰，此处由于后端太麻烦所以不标准
+  useEffect(() => {
+    project && checkItem.name && getWiki({
+      owner: owner,
+      repo: projectsId,
+      pagename: checkItem.name,
+      projectId: project.id
+    }).then(res => {
+      if (res && res.message === "200") {
+        setItemDetail(res.data);
+      } else {
+        showNotification("加载失败")
+      }
+    });
+  }, [project, checkItem]);
+
+  function changeSearchValue(e) {
+    let value = e.target.value;
+    let newFileArr = [];
+    for (const item of fileArrInit) {
+      if (item.name.indexOf(value) > -1) {
+        newFileArr.push(item);
+      }
+    }
+    setFileArr(newFileArr);
+  }
+
+  // 删除wiki模态框
+  function deleteFileModal(e, item) {
+    e.stopPropagation();
+    DelModal({
+      title: '删除页面',
+      contentTitle: `您确定要删除“${item.name}”此页面吗？`,
+      content: '此操作将删除该页面，请进行确认以防文件的丢失',
+      onOk: () => {
+        deleteWiki({
+          owner: owner,
+          repo: projectsId,
+          pagename: item.name,
+          projectId: project.id
+        }).then(res => {
+          if (res && res.message === "200") {
+            message.success('删除成功');
+            setReload(Math.random());
+          } else {
+            message.error('删除失败');
+          }
+        });
+      }
+    });
+  }
+
+
+  function goUser(login) {
+    window.location.href = `/users/${login}`;
+  }
+
+  function addFile() {
+    history.push(`/projects/${owner}/${projectsId}/wiki/add`);
+  }
+
+  function goEdit() {
+    history.push(`/projects/${owner}/${projectsId}/wiki/edit/${encodeURI(checkItem.name)}`);
+  }
+
+  function preview() {
+    window.open(`/projects/${owner}/${projectsId}/wiki/preview/${encodeURI(project.name)}/${project.id}`);
+  }
+
+  // 支持 Markdown，Html，Pdf格式文件
+  const menu = (
+    <Menu >
+      <Menu.Item key="1" onClick={() => { downloadWiki('markdown') }}>
+        Markdown
+      </Menu.Item>
+      <Menu.Item key="2" onClick={() => { downloadWiki('html') }}>
+        HTML
+      </Menu.Item>
+      <Menu.Item key="3" onClick={() => { downloadWiki('pdf') }}>
+        PDF
+      </Menu.Item>
+    </Menu>
+  );
+
+  function downloadWiki(type) {
+    window.open(`${httpUrl}/api/wikiExport/wikiExport-wrapper?repoName=${projectsId}&owner=${owner}&type=${type}&projectName=${project.name}&projectId=${project.id}`);
+  }
+
+  function beforeUpload(file) {
+    if (!['md', 'txt'].includes(file.name.split('.').pop())) {
+      message.error('只能上传md、txt文件');
+      return false;
+    }
+
+    let regEn = /[\[\]`\/:*?''<>|%-+_]/g;
+    if (regEn.test(file.name)) {
+      message.error('文件名不能有特殊字符');
+      return;
+    }
+
+    for (const item of fileArrInit) {
+      if (item.name === file.name) {
+        message.error('不能上传与已有文件相同文件名的文件');
+        return false;
+      }
+    }
+    const isLt100M = file.size / 1024 / 1024 < 100;
+    if (!isLt100M) {
+      showNotification(`文件大小必须小于${100}MB!`);
+    }
+    return isLt100M;
+  }
+
+  const uploadProps = {
+    name: 'multipartFile',
+    withCredentials: true,
+    action: `${httpUrl}/api/wikiExport/uploadWiki/${owner}/${projectsId}/${project && project.id}`, //?token=${sessionStorage.taskToken}
+    showUploadList: false,
+    headers: {
+      Authorization: cookie.load(TokenKey) || sessionStorage.taskToken,
+    },
+    beforeUpload: beforeUpload,
+    onChange(info) {
+      if (info.file.status === 'uploading') {
+        console.log(info.file, info.fileList);
+      }
+      if (info.file.status === 'done') {
+        if (info.file.response.message === '200') {
+          message.success(`${info.file.name} 上传成功`);
+          setReload(Math.random());
+        } else if (info.file.response.message === '500') {
+          let data = JSON.parse(info.file.response.data);
+          message.error(data && data.message ? data.message : '文件上传失败');
+        } else {
+          message.error('文件上传失败');
+        }
+      } else if (info.file.status === 'error') {
+        message.error(`${info.file.name} 上传失败`);
+      }
+    },
+  };
+
+  return (
+    < Spin spinning={!fileArrInit} className="opacitySpin">
+      {fileArrInit && fileArrInit.length ?
+        <div className="wiki-main">
+          <div className="wiki-head">
+
+            <span className="head-title">
+              {
+                permission ?
+                  <Button type="default" onClick={addFile}><Icon type="plus" />新增页面</Button>
+                  : "Wiki文档"
+              }
+            </span>
+            <div>
+              {
+                permission &&
+                <Upload {...uploadProps}>
+                  <Tooltip placement="top" title={'支持导入txt、markdown格式文件'}>
+                    <Button type="default" className="ml10"><Icon type="plus" />导入模板</Button>
+                  </Tooltip>
+                </Upload>
+              }
+              <Dropdown overlay={menu}>
+                <Button type="default" className="ml10">导出<Icon type="caret-down" /></Button>
+              </Dropdown>
+              <Button type="default" className="ml10" onClick={preview}>预览</Button>
+
+            </div>
+          </div>
+
+          <div className="wiki-body">
+            <div className="wiki-nav-parent">
+              <div className="wiki-nav">
+                <Search
+                  // allowClear
+                  placeholder="输入关键字搜索文件"
+                  className="wiki-search"
+                  onChange={changeSearchValue}
+                />
+
+                {
+                  fileArr.map(item => {
+                    return <div className="wiki-nav-title-parent" key={item.name}>
+                      <div className={`wiki-nav-title ${item.name === checkItem.name ? 'active' : ''}`}  onClick={() => { setCheckItem(item) }}>
+                        <div className="nav-title-left">
+                          <i className="iconfont icon-wenjianjia2 mr3"></i>
+                          <span className="nav-title-left-text">{item.name}</span>
+                        </div>
+                        {permission && <i className="iconfont icon-shanchuicon1 delete-title-icon color-grey-6" onClick={(e) => { deleteFileModal(e, item) }}></i>}
+                      </div>
+                    </div>
+                  })
+                }
+              </div>
+
+
+              {checkItem.wiki_clone_link && <InputGroup className="copy-url" compact>
+                <Select dropdownClassName="wiki-url-type" defaultValue="HTTPS" onChange={(v) => { setUrlType(v) }}>
+                  <Option value="HTTPS">HTTPS</Option>
+                  <Option value="SSH">SSH</Option>
+                </Select>
+                <Input id="wikiUrl" value={urlType === 'HTTPS' ? checkItem.wiki_clone_link.https : checkItem.wiki_clone_link.ssh} />
+                <CopyTool className="copy-wiki" inputId="wikiUrl" />
+              </InputGroup>}
+
+            </div>
+
+            <div className="wiki-content">
+              <div className="wiki-content-head">
+                <div className="wiki-content-head-left">
+                  <h3 className="wiki-detail-title">{checkItem.name}</h3>
+                  <span className="user-box mr10" onClick={() => { checkItem.commit && goUser(checkItem.commit.author.name) }}>
+                    {itemDetail.image_url && <img alt="头像" className="head-log-small" src={getImageUrl(`/${itemDetail.image_url}`)} />}
+                    <span >{itemDetail.userName}</span>
+                  </span>
+                  <span className="time-ago">上次修改于{checkItem.commit && timeAgo(checkItem.commit.author.when)}</span>
+                </div>
+                {permission && <Button type="primary" onClick={goEdit}>编辑</Button>}
+              </div>
+
+              <div className="wiki-content-detail editor-content-panel markdown-body" dangerouslySetInnerHTML={{ __html: itemDetail && itemDetail.simple_content }} ></div>
+            </div>
+          </div>
+        </div >
+        :
+        <Welcome {...props} reloadList={setReload} />
+      }
+    </Spin>
+  )
+}

src/forge/Wiki/Index.scss

@@ -0,0 +1,381 @@
+$wikiColor: #466aff;
+$primaryBtnHover: #6482ff;
+body {
+  width: 100% !important;
+}
+.ant-spin-nested-loading > div > .ant-spin.opacitySpin{
+  max-height: 100vh;
+  background: rgba(255,255,255,1);
+}
+.wiki-main {
+  width: 1200px;
+  min-height: 400px;
+  margin: 20px auto;
+
+  .ant-btn-primary {
+    background-color: $wikiColor;
+    border-color: $wikiColor;
+    &:hover,
+    &:focus,
+    &:active {
+      background-color: $primaryBtnHover;
+    }
+  }
+
+  .ant-btn-default:hover,
+  .ant-btn-default:active,
+  .ant-btn-default:focus {
+    background: #f3f4f6;
+    color: #333;
+    border-color: #d0d0d0;
+  }
+
+  .wiki-head {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    height: 64px;
+    background: #fafcff;
+    box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.13);
+    border-radius: 4px;
+    border-bottom-left-radius: 0;
+    .ant-btn .anticon {
+      margin: 0 -3px 0 0;
+    }
+  }
+
+  .head-title {
+    font-size: 20px;
+    color: #05101a;
+    line-height: 30px;
+    font-weight: 500;
+
+    .anticon-right {
+      color: #666;
+      font-size: 0.9rem;
+    }
+  }
+
+  .back-wiki {
+    color: $wikiColor;
+    cursor: pointer;
+    &:hover {
+      color: $primaryBtnHover;
+    }
+  }
+
+  .head-log-middle {
+    width: 3rem;
+    height: 3rem;
+    margin-right: 0.35rem;
+    border-radius: 50%;
+  }
+
+  .head-log-small {
+    width: 1.25rem;
+    height: 1.25rem;
+    margin-right: 0.35rem;
+    border-radius: 50%;
+  }
+
+  .user-box {
+    font-size: 12px;
+    font-family: "PingFangSC-Medium";
+    color: $wikiColor;
+    cursor: pointer;
+    &:hover {
+      color: $primaryBtnHover;
+    }
+    .head-log-small {
+      position: relative;
+      top: -2px;
+    }
+  }
+
+  .time-ago {
+    font-size: 12px;
+    color: #333;
+    letter-spacing: 0;
+    line-height: 17px;
+    font-weight: 400;
+    font-family: "PingFangSC-Regular";
+  }
+
+  .has-error .ant-form-explain,
+  .has-error .ant-form-split {
+    position: absolute;
+  }
+  .wiki-nav {
+    max-height: 60vh;
+    .wiki-search {
+      padding: 0 14px;
+      .ant-input {
+        padding-left: 30px;
+      }
+      .ant-input-suffix {
+        left: 26px;
+        right: auto;
+      }
+      &:hover .ant-input,
+      &:focus .ant-input {
+        border-color: $wikiColor !important;
+      }
+    }
+  }
+
+  .wiki-nav-parent {
+    width: 260px;
+    flex: none;
+  }
+
+  .ant-form-item-children .ant-input:hover {
+    border-color: $wikiColor !important;
+  }
+
+  .ant-checkbox-checked .ant-checkbox-inner {
+    background-color: $wikiColor;
+    border-color: $wikiColor;
+  }
+  .ant-radio-checked .ant-radio-inner,
+  .ant-radio-checked::after {
+    border-color: $wikiColor;
+  }
+
+  .ant-radio-inner::after {
+    background-color: $wikiColor;
+  }
+
+  .ant-radio-group {
+    display: block;
+    margin: 10px 0 0 30px;
+  }
+
+  .ant-radio-wrapper:hover .ant-radio,
+  .ant-radio:hover .ant-radio-inner,
+  .ant-radio-input:focus + .ant-radio-inner {
+    border-color: $wikiColor;
+  }
+}
+
+#wikiUrl:focus {
+  border-right: 1px solid #d9d9d9 !important;
+}
+
+.wiki-body {
+  display: flex;
+}
+
+.wiki-content {
+  flex: auto;
+  width: 75%;
+}
+
+.wiki-content-detail {
+  padding: 0 20px;
+  word-break: break-all;
+}
+
+.ant-input-group.ant-input-group-compact.copy-url {
+  display: flex;
+  margin-top: 20px;
+  .ant-select-selection__rendered {
+    margin: 0 14px 0 5px;
+    width: 3rem;
+    font-size: 12px;
+  }
+  .ant-select-arrow {
+    right: 4px;
+  }
+  .ant-input {
+    font-size: 12px;
+    font-family: "PingFangSC-Regular";
+    color: #666;
+    letter-spacing: 0;
+    font-weight: 400;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    word-break: break-all;
+  }
+
+  .copy-wiki {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 5px;
+    background: #fff;
+    font-size: 1rem !important;
+    border: 1px solid #d9d9d9;
+    border-left: 0;
+    color: $wikiColor;
+    cursor: pointer;
+  }
+}
+
+.wiki-url-type {
+  .ant-select-dropdown-menu-item {
+    font-size: 12px;
+  }
+}
+
+.wiki-nav {
+  min-height: 300px;
+  padding: 20px 0;
+  background: #ffffff;
+  border: 1px solid rgba(153, 153, 153, 0.22);
+  overflow-y: scroll;
+  flex: none;
+  color: #333;
+}
+
+.wiki-nav-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 50px;
+  padding: 0 10px 0 10px;
+  font-size: 14px;
+  letter-spacing: 0;
+  font-weight: 400;
+  font-family: "PingFangSC-Regular";
+  border-bottom: 1px solid #eee;
+  line-height: 16px;
+  cursor: pointer;
+
+  .delete-title-icon {
+    display: none;
+  }
+
+  &:hover {
+    background-color: #fbfbfb;
+    .delete-title-icon {
+      display: inline-block;
+    }
+  }
+}
+
+.wiki-nav-title-parent {
+  padding: 0 14px;
+  &:hover {
+    background: #fbfbfb;
+  }
+}
+
+.wiki-nav-title.active {
+  color: $wikiColor;
+}
+
+.wiki-content-head {
+  margin: 20px 0 20px 20px;
+  padding: 0 20px 20px 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #eee;
+}
+
+.wiki-content-head-left {
+  width: 90%;
+}
+
+.nav-title-left {
+  display: inline-flex;
+  max-width: 90%;
+  svg {
+    margin-right: 0.5rem;
+    flex: none;
+  }
+  .nav-title-left-text {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+}
+
+.wiki-detail-title {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+// 预览页面样式文件
+.wiki-preview {
+  overflow-y: scroll;
+  height: 100%;
+  .wiki-body {
+    width: 90%;
+  }
+  .ant-btn-primary {
+    background-color: $wikiColor;
+    border-color: $wikiColor;
+    &:hover,
+    &:focus,
+    &:active {
+      background-color: $primaryBtnHover;
+    }
+  }
+  .preview-head {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 12rem 0 2rem;
+    width: 100%;
+    height: 80px;
+    background: rgb(39, 47, 76);
+    color: #fff;
+  }
+
+  .preview-head-left {
+    display: inline-flex;
+    align-items: center;
+    font-size: 24px;
+    cursor: pointer;
+
+    .icon-wendangyulan_icon {
+      font-size: 24px !important;
+      font-weight: 700;
+    }
+  }
+
+  .preview-head-right {
+    display: flex;
+
+    .copy-url {
+      margin-top: 0;
+    }
+    .copy-desc {
+      width: 6rem;
+      padding-top: 1px;
+    }
+  }
+
+  .wiki-nav-title {
+    padding: 0 10px 0 40px;
+  }
+  .wiki-nav-title.active {
+    background-color: #f3f4f6;
+  }
+
+  .wiki-content-head {
+    padding: 10px 20px 10px 20px;
+  }
+
+  .wiki-nav {
+    padding: 20px 0;
+    width: 20vw;
+    border-bottom: 0;
+    height: 80vh;
+  }
+  .wiki-content-detail {
+    padding: 0 40px;
+    img {
+      max-width: 100%;
+    }
+  }
+
+  .ant-btn:hover {
+    background: #f3f4f6;
+    color: #333;
+    border-color: #d0d0d0;
+  }
+}