合并develop分支的个人中心改版-全部

.idea/workspace.xml

@@ -499,7 +499,6 @@
         <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" />
         <option value="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
         <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
         <option value="$PROJECT_DIR$/public/css/css_min_all.css" />
@@ -1020,16 +1019,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="50" lean-forward="true" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
-          <folding>
-            <element signature="n#CoderRootDirectory#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "forge",
-  "version": "3.0.0",
+  "name": "educoder",
+  "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -990,18 +990,6 @@
             "react-lifecycles-compat": "^3.0.4",
             "warning": "^4.0.3"
           }
-        },
-        "react-slick": {
-          "version": "0.25.2",
-          "resolved": "https://registry.nlark.com/react-slick/download/react-slick-0.25.2.tgz",
-          "integrity": "sha1-VjMbZ9R9i8/i3OtqyrHI/VvR9rw=",
-          "requires": {
-            "classnames": "^2.2.5",
-            "enquire.js": "^2.1.6",
-            "json2mq": "^0.2.0",
-            "lodash.debounce": "^4.0.8",
-            "resize-observer-polyfill": "^1.5.0"
-          }
         }
       }
     },
@@ -2079,6 +2067,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
@@ -2088,7 +2077,8 @@
         "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",
-          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
         }
       }
     },
@@ -2377,12 +2367,6 @@
         }
       }
     },
-    "base16": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/base16/download/base16-1.0.0.tgz",
-      "integrity": "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA=",
-      "dev": true
-    },
     "base64-js": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
@@ -3875,23 +3859,6 @@
         "warning": "^4.0.3"
       }
     },
-    "cross-fetch": {
-      "version": "3.1.4",
-      "resolved": "https://registry.nlark.com/cross-fetch/download/cross-fetch-3.1.4.tgz",
-      "integrity": "sha1-lyPzo6JHv4uJA586OAqSROj6Lzk=",
-      "dev": true,
-      "requires": {
-        "node-fetch": "2.6.1"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "2.6.1",
-          "resolved": "https://registry.nlark.com/node-fetch/download/node-fetch-2.6.1.tgz?cache=0&sync_timestamp=1626684741221&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-fetch%2Fdownload%2Fnode-fetch-2.6.1.tgz",
-          "integrity": "sha1-BFvTI2Mfdu0uK1VXM5RBa2OaAFI=",
-          "dev": true
-        }
-      }
-    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -3926,6 +3893,11 @@
         "randomfill": "^1.0.3"
       }
     },
+    "crypto-js": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz",
+      "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
+    },
     "crypto-random-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -5091,11 +5063,11 @@
       }
     },
     "echarts": {
-      "version": "4.9.0",
-      "resolved": "https://registry.nlark.com/echarts/download/echarts-4.9.0.tgz",
-      "integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.7.0.tgz",
+      "integrity": "sha512-NlOTdUcAsIyCCG+N4uh0ZEvXtrPW2jvcuqf03RyqYeCKzyPbiOQ4I3MdKXMhxG3lBdqQNdNXVT71SB4KTQjN0A==",
       "requires": {
-        "zrender": "4.3.2"
+        "zrender": "4.3.0"
       }
     },
     "echarts-wordcloud": {
@@ -6237,41 +6209,6 @@
         "bser": "2.1.1"
       }
     },
-    "fbemitter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/fbemitter/download/fbemitter-3.0.0.tgz",
-      "integrity": "sha1-ALKhr1QRJUqrQWzXX55iib7kv/M=",
-      "dev": true,
-      "requires": {
-        "fbjs": "^3.0.0"
-      },
-      "dependencies": {
-        "fbjs": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/fbjs/download/fbjs-3.0.0.tgz?cache=0&sync_timestamp=1602048313843&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffbjs%2Fdownload%2Ffbjs-3.0.0.tgz",
-          "integrity": "sha1-CQcGf7P1enj0XZXx6s/8rNYjwWU=",
-          "dev": true,
-          "requires": {
-            "cross-fetch": "^3.0.4",
-            "fbjs-css-vars": "^1.0.0",
-            "loose-envify": "^1.0.0",
-            "object-assign": "^4.1.0",
-            "promise": "^7.1.1",
-            "setimmediate": "^1.0.5",
-            "ua-parser-js": "^0.7.18"
-          }
-        },
-        "promise": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npm.taobao.org/promise/download/promise-7.3.1.tgz",
-          "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
-          "dev": true,
-          "requires": {
-            "asap": "~2.0.3"
-          }
-        }
-      }
-    },
     "fbjs": {
       "version": "0.8.17",
       "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
@@ -6301,12 +6238,6 @@
         }
       }
     },
-    "fbjs-css-vars": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/fbjs-css-vars/download/fbjs-css-vars-1.0.2.tgz",
-      "integrity": "sha1-IWVRE2rgL+JVkyw+yHdfGOLAeLg=",
-      "dev": true
-    },
     "fecha": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
@@ -6751,42 +6682,6 @@
         "readable-stream": "^2.3.6"
       }
     },
-    "flux": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npm.taobao.org/flux/download/flux-4.0.1.tgz",
-      "integrity": "sha1-eENQKwKEHUqqU0rws3MDSh917lw=",
-      "dev": true,
-      "requires": {
-        "fbemitter": "^3.0.0",
-        "fbjs": "^3.0.0"
-      },
-      "dependencies": {
-        "fbjs": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/fbjs/download/fbjs-3.0.0.tgz?cache=0&sync_timestamp=1602048313843&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffbjs%2Fdownload%2Ffbjs-3.0.0.tgz",
-          "integrity": "sha1-CQcGf7P1enj0XZXx6s/8rNYjwWU=",
-          "dev": true,
-          "requires": {
-            "cross-fetch": "^3.0.4",
-            "fbjs-css-vars": "^1.0.0",
-            "loose-envify": "^1.0.0",
-            "object-assign": "^4.1.0",
-            "promise": "^7.1.1",
-            "setimmediate": "^1.0.5",
-            "ua-parser-js": "^0.7.18"
-          }
-        },
-        "promise": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npm.taobao.org/promise/download/promise-7.3.1.tgz",
-          "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
-          "dev": true,
-          "requires": {
-            "asap": "~2.0.3"
-          }
-        }
-      }
-    },
     "flv.js": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/flv.js/-/flv.js-1.5.0.tgz",
@@ -10003,11 +9898,6 @@
         "esprima": "^4.0.0"
       }
     },
-    "js2wordcloud": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npm.taobao.org/js2wordcloud/download/js2wordcloud-1.1.12.tgz",
-      "integrity": "sha1-8BdC2k5qyzAAsoY1dmQWjvn8o64="
-    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -10430,12 +10320,6 @@
       "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
       "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU="
     },
-    "lodash.curry": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npm.taobao.org/lodash.curry/download/lodash.curry-4.1.1.tgz",
-      "integrity": "sha1-JI42By7ekGUB11lmIAqG2riyMXA=",
-      "dev": true
-    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -10446,12 +10330,6 @@
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
     },
-    "lodash.flow": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npm.taobao.org/lodash.flow/download/lodash.flow-3.5.0.tgz",
-      "integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=",
-      "dev": true
-    },
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -14082,12 +13960,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "pure-color": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npm.taobao.org/pure-color/download/pure-color-1.3.0.tgz",
-      "integrity": "sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=",
-      "dev": true
-    },
     "purgecss": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-2.1.2.tgz",
@@ -14162,9 +14034,9 @@
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
     },
     "qrcode.react": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/qrcode.react/download/qrcode.react-1.0.1.tgz",
-      "integrity": "sha1-KDS7UOXidf/lr2kG7/FTkf6eOKU=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-1.0.0.tgz",
+      "integrity": "sha512-jBXleohRTwvGBe1ngV+62QvEZ/9IZqQivdwzo9pJM4LQMoCM2VnvNBnKdjvGnKyDZ/l0nCDgsPod19RzlPvm/Q==",
       "requires": {
         "loose-envify": "^1.4.0",
         "prop-types": "^15.6.0",
@@ -14859,18 +14731,6 @@
         "prop-types": "^15.6.2"
       }
     },
-    "react-base16-styling": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npm.taobao.org/react-base16-styling/download/react-base16-styling-0.6.0.tgz",
-      "integrity": "sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=",
-      "dev": true,
-      "requires": {
-        "base16": "^1.0.0",
-        "lodash.curry": "^4.0.1",
-        "lodash.flow": "^3.3.0",
-        "pure-color": "^1.2.0"
-      }
-    },
     "react-beautiful-dnd": {
       "version": "10.1.1",
       "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-10.1.1.tgz",
@@ -15236,18 +15096,6 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "react-json-view": {
-      "version": "1.21.3",
-      "resolved": "https://registry.npm.taobao.org/react-json-view/download/react-json-view-1.21.3.tgz",
-      "integrity": "sha1-8YQgnujxvzdPsMQbCBPP9UVJxHU=",
-      "dev": true,
-      "requires": {
-        "flux": "^4.0.1",
-        "react-base16-styling": "^0.6.0",
-        "react-lifecycles-compat": "^3.0.4",
-        "react-textarea-autosize": "^8.3.2"
-      }
-    },
     "react-jss": {
       "version": "8.6.1",
       "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz",
@@ -15407,9 +15255,9 @@
       }
     },
     "react-slick": {
-      "version": "0.28.1",
-      "resolved": "https://registry.nlark.com/react-slick/download/react-slick-0.28.1.tgz",
-      "integrity": "sha1-EsGNmRtZQy35w3V7pUCiJ7P7hbk=",
+      "version": "0.25.2",
+      "resolved": "https://registry.nlark.com/react-slick/download/react-slick-0.25.2.tgz",
+      "integrity": "sha1-VjMbZ9R9i8/i3OtqyrHI/VvR9rw=",
       "requires": {
         "classnames": "^2.2.5",
         "enquire.js": "^2.1.6",
@@ -15436,34 +15284,6 @@
         "prop-types": "^15.5.4"
       }
     },
-    "react-textarea-autosize": {
-      "version": "8.3.3",
-      "resolved": "https://registry.nlark.com/react-textarea-autosize/download/react-textarea-autosize-8.3.3.tgz?cache=0&sync_timestamp=1622628433420&other_urls=https%3A%2F%2Fregistry.nlark.com%2Freact-textarea-autosize%2Fdownload%2Freact-textarea-autosize-8.3.3.tgz",
-      "integrity": "sha1-9wkTlFNp2kU/1VTBaPa6rNH6BNg=",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.10.2",
-        "use-composed-ref": "^1.0.0",
-        "use-latest": "^1.0.0"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.14.8",
-          "resolved": "https://registry.nlark.com/@babel/runtime/download/@babel/runtime-7.14.8.tgz",
-          "integrity": "sha1-cRmlb0IQGIUmlCkLn5FICXORtEY=",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        },
-        "regenerator-runtime": {
-          "version": "0.13.9",
-          "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz",
-          "integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=",
-          "dev": true
-        }
-      }
-    },
     "react-transition-group": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
@@ -17220,11 +17040,6 @@
         "is-fullwidth-code-point": "^2.0.0"
       }
     },
-    "slick-carousel": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npm.taobao.org/slick-carousel/download/slick-carousel-1.8.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fslick-carousel%2Fdownload%2Fslick-carousel-1.8.1.tgz",
-      "integrity": "sha1-pL+ykBSIe7Zs5Si5C9DNomLMj40="
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -18559,12 +18374,6 @@
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
       "dev": true
     },
-    "ts-essentials": {
-      "version": "2.0.12",
-      "resolved": "https://registry.nlark.com/ts-essentials/download/ts-essentials-2.0.12.tgz",
-      "integrity": "sha1-yTA/PXT3X6dSjD1JuA4ImrCdh0U=",
-      "dev": true
-    },
     "tslib": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
@@ -19074,30 +18883,6 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
-    "use-composed-ref": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/use-composed-ref/download/use-composed-ref-1.1.0.tgz",
-      "integrity": "sha1-kiDk6UqXt7AtfSfq6rCzcDRDi7w=",
-      "dev": true,
-      "requires": {
-        "ts-essentials": "^2.0.3"
-      }
-    },
-    "use-isomorphic-layout-effect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npm.taobao.org/use-isomorphic-layout-effect/download/use-isomorphic-layout-effect-1.1.1.tgz",
-      "integrity": "sha1-e7ZYkXDNKYehUgQvkIT57/t1wiU=",
-      "dev": true
-    },
-    "use-latest": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/use-latest/download/use-latest-1.2.0.tgz",
-      "integrity": "sha1-pE9lcrgojgly7EEb3QhAraNm8jI=",
-      "dev": true,
-      "requires": {
-        "use-isomorphic-layout-effect": "^1.0.0"
-      }
-    },
     "user-home": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/user-home/download/user-home-1.1.1.tgz",
@@ -20701,16 +20486,6 @@
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true
     },
-    "xterm": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npm.taobao.org/xterm/download/xterm-4.8.1.tgz",
-      "integrity": "sha1-FVoXKaQ+Gom0BlJOIsVjQznjnKE="
-    },
-    "xterm-addon-fit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npm.taobao.org/xterm-addon-fit/download/xterm-addon-fit-0.4.0.tgz",
-      "integrity": "sha1-BuDF0KaqrPsAnvVl76HIHpPZAZM="
-    },
     "y18n": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
@@ -20748,9 +20523,9 @@
       }
     },
     "zrender": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz",
-      "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.3.0.tgz",
+      "integrity": "sha512-Dii6j2bDsPkxQayuVf2DXJeruIB/mKVxxcGRZQ9GExiBd4c3w7+oBuvo1O/JGHeFeA1nCmSDVDs/S7yKZG1nrA=="
     }
   }
 }

package.json

@@ -193,7 +193,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 +203,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-purge.css

@@ -1753,7 +1753,7 @@ a.decoration {
 }
 
 .mb15 {
-  margin-bottom: 15px!important;
+  margin-bottom: 15px;
 }
 
 .mb16 {
@@ -2424,16 +2424,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;
@@ -3415,7 +3409,7 @@ a.user_bluebg_btn {
 }
 
 .cdefault {
-  cursor: default!important;
+  cursor: default
 }
 
 
@@ -3590,6 +3584,42 @@ a.user_bluebg_btn {
   margin-right: 5px;
 }
 
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+  position: fixed;
+  width: 40px;
+  height: 180px;
+  right: 0;
+  bottom: 80px;
+  z-index: 10;
+}
+
+.-task-sidebar div {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+  width: 40px;
+  background: #4CACFF;
+  color: #fff;
+  font-size: 20px;
+  text-align: center;
+  margin-bottom: 5px;
+  border-radius: 4px;
+}
+
+.-task-sidebar div i {
+  color: #fff;
+}
+
+.-task-sidebar div i:hover {
+  color: #fff !important;
+}
+
+.gotop {
+  background-color: rgba(208, 207, 207, 0.5) !important;
+  padding: 0px !important;
+}
+
 
 /***** loading ******/
 /*****载入中******/
@@ -3914,21 +3944,11 @@ html>body #ajax-indicator {
   max-height: 340px;
 }/*头部导航条样式---2018-03-19--by-cs*/
 
-.privateTag{
-  display: block;
-  padding:0px 6px;
-  border-radius: 12px;
-  border:1px solid #2FC25B;
-  height: 18px;
-  line-height: 18px;
-  font-size: 12px;
-  margin-left: 10px;
-  color: #2FC25B;
-}
 .head-nav {
   text-align: center;
   height: 70px;
   box-sizing: border-box;
+  min-width: 780px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -6691,10 +6711,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=1622517296245') format('woff2'),
+       url('iconfont.woff?t=1622517296245') format('woff'),
+       url('iconfont.ttf?t=1622517296245') format('truetype');
 }
 
 .iconfont {
@@ -13,210 +13,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-qingqiuicon:before {
-  content: "\e871";
-}
-
-.icon-xiangyingicon:before {
-  content: "\e87c";
-}
-
-.icon-duoxuanxuanzhong:before {
-  content: "\e88f";
-}
-
-.icon-cuowuicon:before {
-  content: "\e890";
-}
-
-.icon-chenggongicon:before {
-  content: "\e892";
-}
-
-.icon-weixuanzhongxiangyingicon:before {
-  content: "\e893";
-}
-
-.icon-bitianicon:before {
-  content: "\e895";
-}
-
-.icon-weixuanzhongxiangmubiaoqianicon:before {
-  content: "\e897";
-}
-
-.icon-liebiaoicon:before {
-  content: "\e898";
-}
-
-.icon-xialaanniu_icon:before {
-  content: "\e89a";
-}
-
-.icon-weixuanzhongqingqiuicon:before {
-  content: "\e89b";
-}
-
-.icon-xiezuozheguanliicon:before {
-  content: "\e8a1";
-}
-
-.icon-xuanzhongxiangyingicon:before {
-  content: "\e8a2";
-}
-
-.icon-xuanzhongfenzhiicon:before {
-  content: "\e8a3";
-}
-
-.icon-xuanzhongjibenshezhiicon:before {
-  content: "\e8a5";
-}
-
-.icon-xuanzhongxiangmubiaoqianicon:before {
-  content: "\e8aa";
-}
-
-.icon-a-xuanzhongwebhookicon:before {
-  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";
-}
-
-.icon-wiki_icon:before {
-  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";
-}
-
-.icon-fucengguanbi_icon:before {
-  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";
-}
-
-.icon-sousuo_icon:before {
-  content: "\e87d";
-}
-
-.icon-wendangyulan_icon:before {
-  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";
-}
-
-.icon-xuanzhongssh_icon:before {
-  content: "\e868";
-}
-
-.icon-weixuanzhonganquanshezhi_icon:before {
-  content: "\e869";
-}
-
-.icon-weixuanzhongssh_icon:before {
-  content: "\e86a";
-}
-
-.icon-xuanzhonganquanshezhi_icon:before {
-  content: "\e86b";
-}
-
-.icon-shanchu_icon:before {
-  content: "\e86c";
-}
-
-.icon-liebiaossh_icon:before {
-  content: "\e86e";
-}
-
-.icon-file-submodule:before {
-  content: "\e866";
-}
-
-.icon-nv1:before {
-  content: "\e864";
-}
-
-.icon-nan1:before {
-  content: "\e865";
-}
-
 .icon-youxiang:before {
   content: "\e8b2";
 }

public/css/iconfont.json

@@ -5,363 +5,6 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
-    {
-      "icon_id": "23261798",
-      "name": "请求icon",
-      "font_class": "qingqiuicon",
-      "unicode": "e871",
-      "unicode_decimal": 59505
-    },
-    {
-      "icon_id": "23261799",
-      "name": "响应icon",
-      "font_class": "xiangyingicon",
-      "unicode": "e87c",
-      "unicode_decimal": 59516
-    },
-    {
-      "icon_id": "23144143",
-      "name": "多选选中",
-      "font_class": "duoxuanxuanzhong",
-      "unicode": "e88f",
-      "unicode_decimal": 59535
-    },
-    {
-      "icon_id": "23144144",
-      "name": "错误icon",
-      "font_class": "cuowuicon",
-      "unicode": "e890",
-      "unicode_decimal": 59536
-    },
-    {
-      "icon_id": "23144146",
-      "name": "成功icon",
-      "font_class": "chenggongicon",
-      "unicode": "e892",
-      "unicode_decimal": 59538
-    },
-    {
-      "icon_id": "23144147",
-      "name": "未选中响应icon",
-      "font_class": "weixuanzhongxiangyingicon",
-      "unicode": "e893",
-      "unicode_decimal": 59539
-    },
-    {
-      "icon_id": "23144149",
-      "name": "必填icon",
-      "font_class": "bitianicon",
-      "unicode": "e895",
-      "unicode_decimal": 59541
-    },
-    {
-      "icon_id": "23144151",
-      "name": "未选中项目标签icon",
-      "font_class": "weixuanzhongxiangmubiaoqianicon",
-      "unicode": "e897",
-      "unicode_decimal": 59543
-    },
-    {
-      "icon_id": "23144152",
-      "name": "列表icon",
-      "font_class": "liebiaoicon",
-      "unicode": "e898",
-      "unicode_decimal": 59544
-    },
-    {
-      "icon_id": "23144154",
-      "name": "下拉按钮_icon",
-      "font_class": "xialaanniu_icon",
-      "unicode": "e89a",
-      "unicode_decimal": 59546
-    },
-    {
-      "icon_id": "23144155",
-      "name": "未选中请求icon",
-      "font_class": "weixuanzhongqingqiuicon",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
-    {
-      "icon_id": "23144158",
-      "name": "协作者管理icon",
-      "font_class": "xiezuozheguanliicon",
-      "unicode": "e8a1",
-      "unicode_decimal": 59553
-    },
-    {
-      "icon_id": "23144159",
-      "name": "选中响应icon",
-      "font_class": "xuanzhongxiangyingicon",
-      "unicode": "e8a2",
-      "unicode_decimal": 59554
-    },
-    {
-      "icon_id": "23144160",
-      "name": "选中分支icon",
-      "font_class": "xuanzhongfenzhiicon",
-      "unicode": "e8a3",
-      "unicode_decimal": 59555
-    },
-    {
-      "icon_id": "23144162",
-      "name": "选中基本设置icon",
-      "font_class": "xuanzhongjibenshezhiicon",
-      "unicode": "e8a5",
-      "unicode_decimal": 59557
-    },
-    {
-      "icon_id": "23144165",
-      "name": "选中项目标签icon",
-      "font_class": "xuanzhongxiangmubiaoqianicon",
-      "unicode": "e8aa",
-      "unicode_decimal": 59562
-    },
-    {
-      "icon_id": "23144167",
-      "name": "选中webhook icon",
-      "font_class": "a-xuanzhongwebhookicon",
-      "unicode": "e8af",
-      "unicode_decimal": 59567
-    },
-    {
-      "icon_id": "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",
-      "font_class": "shanchu_tc_icon",
-      "unicode": "e88c",
-      "unicode_decimal": 59532
-    },
-    {
-      "icon_id": "23046293",
-      "name": "wiki_icon",
-      "font_class": "wiki_icon",
-      "unicode": "e88d",
-      "unicode_decimal": 59533
-    },
-    {
-      "icon_id": "23046311",
-      "name": "新增页面_鼠标点击icon",
-      "font_class": "xinzengyemian_shubiaodianjiicon",
-      "unicode": "e88e",
-      "unicode_decimal": 59534
-    },
-    {
-      "icon_id": "23046244",
-      "name": "导入模版_icon",
-      "font_class": "daorumoban_icon",
-      "unicode": "e86f",
-      "unicode_decimal": 59503
-    },
-    {
-      "icon_id": "23046247",
-      "name": "导出_悬浮",
-      "font_class": "daochu_xuanfu",
-      "unicode": "e870",
-      "unicode_decimal": 59504
-    },
-    {
-      "icon_id": "23046252",
-      "name": "错误",
-      "font_class": "cuowu",
-      "unicode": "e872",
-      "unicode_decimal": 59506
-    },
-    {
-      "icon_id": "23046254",
-      "name": "成功",
-      "font_class": "chenggong1",
-      "unicode": "e873",
-      "unicode_decimal": 59507
-    },
-    {
-      "icon_id": "23046255",
-      "name": "更多_icon",
-      "font_class": "gengduo_icon",
-      "unicode": "e874",
-      "unicode_decimal": 59508
-    },
-    {
-      "icon_id": "23046258",
-      "name": "复层关闭_icon",
-      "font_class": "fucengguanbi_icon",
-      "unicode": "e875",
-      "unicode_decimal": 59509
-    },
-    {
-      "icon_id": "23046262",
-      "name": "复制_icon",
-      "font_class": "fuzhi_icon",
-      "unicode": "e876",
-      "unicode_decimal": 59510
-    },
-    {
-      "icon_id": "23046268",
-      "name": "删除icon",
-      "font_class": "shanchuicon",
-      "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",
-      "font_class": "sousuo_shanchuicon",
-      "unicode": "e87b",
-      "unicode_decimal": 59515
-    },
-    {
-      "icon_id": "23046275",
-      "name": "搜索_icon",
-      "font_class": "sousuo_icon",
-      "unicode": "e87d",
-      "unicode_decimal": 59517
-    },
-    {
-      "icon_id": "23046276",
-      "name": "文档预览_icon",
-      "font_class": "wendangyulan_icon",
-      "unicode": "e87e",
-      "unicode_decimal": 59518
-    },
-    {
-      "icon_id": "23046277",
-      "name": "文件夹_icon",
-      "font_class": "wenjianjia_icon",
-      "unicode": "e87f",
-      "unicode_decimal": 59519
-    },
-    {
-      "icon_id": "23046278",
-      "name": "下拉按钮",
-      "font_class": "xialaanniu",
-      "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",
-      "font_class": "erciqueren_icon",
-      "unicode": "e867",
-      "unicode_decimal": 59495
-    },
-    {
-      "icon_id": "22906288",
-      "name": "选中ssh_icon",
-      "font_class": "xuanzhongssh_icon",
-      "unicode": "e868",
-      "unicode_decimal": 59496
-    },
-    {
-      "icon_id": "22906289",
-      "name": "未选中安全设置_icon",
-      "font_class": "weixuanzhonganquanshezhi_icon",
-      "unicode": "e869",
-      "unicode_decimal": 59497
-    },
-    {
-      "icon_id": "22906290",
-      "name": "未选中ssh_icon",
-      "font_class": "weixuanzhongssh_icon",
-      "unicode": "e86a",
-      "unicode_decimal": 59498
-    },
-    {
-      "icon_id": "22906291",
-      "name": "选中安全设置_icon",
-      "font_class": "xuanzhonganquanshezhi_icon",
-      "unicode": "e86b",
-      "unicode_decimal": 59499
-    },
-    {
-      "icon_id": "22906292",
-      "name": "删除_icon",
-      "font_class": "shanchu_icon",
-      "unicode": "e86c",
-      "unicode_decimal": 59500
-    },
-    {
-      "icon_id": "22906293",
-      "name": "列表ssh_icon",
-      "font_class": "liebiaossh_icon",
-      "unicode": "e86e",
-      "unicode_decimal": 59502
-    },
-    {
-      "icon_id": "17575494",
-      "name": "file-submodule",
-      "font_class": "file-submodule",
-      "unicode": "e866",
-      "unicode_decimal": 59494
-    },
-    {
-      "icon_id": "7539612",
-      "name": "nv",
-      "font_class": "nv1",
-      "unicode": "e864",
-      "unicode_decimal": 59492
-    },
-    {
-      "icon_id": "7539613",
-      "name": "nan",
-      "font_class": "nan1",
-      "unicode": "e865",
-      "unicode_decimal": 59493
-    },
     {
       "icon_id": "21936935",
       "name": "邮箱",

public/index.html

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

src/App.css

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

src/App.js

@@ -10,14 +10,15 @@ import {
 import axios from 'axios';
 import LoginDialog from './modules/login/LoginDialog';
 import 'babel-polyfill';
-import Loading from './Loading'
+import Loading from './Loading';
 
 import Loadable from 'react-loadable';
 import marked from './common/marked';
 import moment from 'moment'
 
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
-import SiderBar from './forge/Component/SiderBar'
+
+import history from './history';
 
 import { SnackbarHOC } from 'educoder'
 import { initAxiosInterceptors } from './AppConfig'
@@ -39,11 +40,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 +74,7 @@ const EducoderLogin = Loadable({
 	loader: () => import('./modules/login/EducoderLogin'),
 	loading: Loading,
 })
-const Search = Loadable({
-	loader: () => import('./modules/search/'),
-	loading: Loading,
-})
 
-const ProjectIndex = Loadable({
-  loader: () => import("./forge/Index"),
-  loading: Loading,
-});
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -112,9 +100,36 @@ class App extends Component {
 			Addcoursestypes: false
 		})
 	};
+	ModalCancelsy = () => {
+		this.setState({
+			mydisplay: false,
+		})
+		window.location.href = "/";
+	};
+	ModalshowCancelsy = () => {
+		this.setState({
+			mydisplay: true,
+		})
+	};
 
+	disableVideoContextMenu = () => {
+		window.$("body").on("mousedown", "video", function (event) {
+			if (event.which === 3) {
+				window.$('video').bind('contextmenu', function () { return false; });
+			} else {
+				window.$('video').unbind('contextmenu');
+			}
+		});
+	}
 	componentDidMount() {
 		document.title = "loading...";
+		this.disableVideoContextMenu();
+		history.listen(() => {
+			this.forceUpdate()
+			const $ = window.$
+			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
+		});
+
 		initAxiosInterceptors(this.props);
 		this.getAppdata();
 
@@ -192,14 +207,11 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi } = this.state;
-		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-						<SiderBar/>
 						<Router>
 							<Switch>
 								{/*项目*/}
@@ -211,14 +223,6 @@ class App extends Component {
 										}
 									}>
 								</Route>
-								<Route
-									path={"/settings"}
-									render={
-										(props) => {
-											return (<Security {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
 								{/*项目*/}
 								<Route
 									path={"/projects"}
@@ -249,10 +253,6 @@ class App extends Component {
 								</Route>
 								{/*404*/}
 								<Route path="/nopage" component={Shixunnopage} />
-
-								{/* 查询 */}
-								<Route path="/search" component={Search} />
-
 								{/* 个人主页 */}
 								<Route path="/users/:username"
 									render={
@@ -263,10 +263,7 @@ class App extends Component {
 								<Route exact path="/"
 									render={
 										(props) => (
-											personal && personal.length > 0 ?
-											<InfosIndex {...this.props} {...props} />
-											:
-											<ProjectIndex {...this.props} {...props} />
+											<Projects {...this.props} {...props} {...this.state}></Projects>
 										)
 									}
 								/>

src/Loading.js

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

src/common/UrlTool.js

@@ -162,28 +162,28 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
+	return `${getUrl()}/api/attachments.json?debug=${window._debugType || 'admin'}`;
 }
 
 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/components/render-html.jsx

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

src/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/AddMember.jsx

@@ -4,7 +4,7 @@ import axios from 'axios';
 import { getImageUrl } from 'educoder';
 
 const { Option } = AutoComplete;
-function AddMember({getID,login,showNotification}){
+function AddMember({getID,login}){
   const [ id , setID ] = useState(undefined);
   const [ source , setSource ] = useState(undefined);
   const [ searchKey , setSearchKey ] = useState(undefined);
@@ -66,12 +66,8 @@ function AddMember({getID,login,showNotification}){
   };
 
   function addCollaborator(){
-    if(source && source.length>0){
-      getID && getID(id);
-      setSearchKey(undefined);
-    }else{
-      showNotification("请选择存在的用户!");
-    }
+    getID && getID(id);
+    setSearchKey(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/Component.scss

@@ -112,9 +112,6 @@ li.ant-menu-item{
   right:240px;
   z-index: 10000;
 }
-.laterest{
-  color: #05690d;
-}
 
 @media screen and (max-width: 1800px){
   .handleBox{
@@ -192,172 +189,4 @@ li.ant-menu-item{
       border-right: none;
     }
   }
-}
-
-/*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar {
-  position: fixed;
-  width: 40px;
-  right: 0;
-  bottom: 80px;
-  z-index: 10;
-}
-
-@media screen and (max-width: 1920px){
-  .-task-sidebar{
-    right:220px;
-  }
-}
-@media screen and (max-width: 1750px){
-  .-task-sidebar{
-    right:160px;
-  }
-}
-@media screen and (max-width: 1650px){
-  .-task-sidebar{
-    right:115px;
-  }
-}
-@media screen and (max-width: 1550px){
-  .-task-sidebar{
-    right:90px;
-  }
-}
-@media screen and (max-width: 1450px){
-  .-task-sidebar{
-    right:45px;
-  }
-}
-@media screen and (max-width: 1200px){
-  .-task-sidebar{
-    right:0px;
-    display: none;
-  }
-}
-.-task-sidebar>div {
-  height: 40px;
-  line-height: 40px;
-  box-sizing: border-box;
-  width: 40px;
-  color: #999;
-  font-size: 20px;
-  text-align: center;
-  margin-bottom: 20px;
-  border-radius: 50%;
-  background: #FFFFFF;
-  box-shadow: 0px 0px 10px 1px #F1F1F1;
-}
-
-.-task-sidebar>div i {
-  color: #999;
-}
-
-.-task-sidebar>div:hover i {
-  color: #fff !important;
-}
-.-task-sidebar>div:hover{
-  background: #1890FF;
-  box-shadow: 0px 0px 10px 2px #B6D0FC;
-}
-.helpBox{
-  width: 260px;
-  z-index: 103;
-  &.shareContent{
-    width: 200px;
-  }
-  .ant-popover-inner-content{
-    padding:0px;
-  }
-  p.titlecontent{
-    font-size: 18px;
-    color: #333;
-    line-height: 20px;
-    padding:15px 20px;
-  }
-  .faqUl{
-    padding:0px 20px 10px;
-    max-height: 230px;
-    overflow-y: auto;
-    li{
-      background: #F5F5F5;
-      border-radius: 20px;
-      padding:0px 20px;
-      color: #333;
-      height: 34px;
-      line-height: 34px;
-      margin-bottom: 10px;
-      a{
-        display: block;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-      &:hover{
-        background-color: #D1E9FF;
-        a{
-          color: #333!important;
-        }
-      }
-    }
-  }
-  .shareUl{
-    padding:10px 0px;
-    display: flex;
-    align-items: center;
-    .titlecontent{
-      margin-right: 20px;
-    }
-    li > i{
-      font-size: 32px!important;
-    }
-  }
-}
-
-
-
-.-task-desc {
-  background: #494949;
-  width: 90px;
-  line-height: 36px;
-  text-align: center;
-  position: absolute;
-  color: #fff;
-  font-size: 13px;
-  z-index: 999999;
-  opacity: 0;
-}
-
-.-task-desc div {
-  position: absolute;
-  top: 10px;
-  right: -7px;
-  height: 13px;
-}
-
-.-task-desc div img {
-  float: left
-}
-
-.-task-sidebar .scan_ewm {
-  position: absolute !important;
-  right: 45px !important;
-  bottom: 0px !important;
-  background-color: #494949 !important;
-  -webkit-box-sizing: border-box !important;
-  box-sizing: border-box !important;
-  font-size: 14px !important;
-  line-height: 16px !important;
-  display: none;
-  height: 213px !important;
-}
-
-.trangle_right {
-  position: absolute;
-  right: -5px;
-  bottom: 15px;
-  width: 0;
-  height: 0px;
-  border-top: 6px solid transparent;
-  border-left: 5px solid #494949;
-  border-bottom: 6px solid transparent
-}
+}

src/forge/Component/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/DrawerPanel.jsx

@@ -4,12 +4,6 @@ import './Component.scss';
 import axios from 'axios';
 const { TreeNode , DirectoryTree } = Tree;
 
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
 function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
   const [ treeData , setTreeData ] = useState(undefined);
   const [ isSpin , setIsSpin ] = useState(true);
@@ -77,8 +71,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
     let dataref = event.node.props.dataRef;
     if(dataref.type==="file"){
       onClose();
-      let value = turnbar(branch);
-      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
+      history.push(`/projects/${owner}/${projectsId}/tree/${branch}/${dataref.path}`);
     }
   }
 

src/forge/Component/EAccount.scss

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

src/forge/Component/EducoderAccount.jsx

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

src/forge/Component/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

@@ -2,7 +2,7 @@ import React from 'react';
 import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
 import { Link } from 'react-router-dom';
 
-function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
+function Releases({owner,projectsId,releaseVersions}){
   
   return(
     <div>
@@ -10,10 +10,10 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
         <AlignCenter><span className="font-16 color-grey-6">发行版</span>
           { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
         </AlignCenter>
-        { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? 
+        { releaseVersions && releaseVersions.total_count > 0 ? 
           <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link>
           : 
-          baseOperate && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
+          <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
         }
       </FlexAJ>
       {

src/forge/Component/SearchUser.jsx

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

src/forge/Component/SiderBar.js

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

src/forge/Component/SiderBarShareModal.jsx

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

src/forge/Component/User.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Link } from 'react-router-dom';
 
-export default ({ url , name , column  , 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,7 +36,8 @@ 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 AuthorLogin = props.author && props.author.login;
   const CurrentLogin = props.current_user && props.current_user.login;
   useEffect(()=>{
     if(CurrentLogin === AuthorLogin){
@@ -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/Dispose/List.jsx

@@ -10,12 +10,6 @@ import { Link } from 'react-router-dom';
 //   killed:"已撤销",
 //   pending:"准备中"
 // }
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
 function renderTableStatus(status) {
   switch (status) {
     case "running":
@@ -71,9 +65,8 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       width:"15%",
       ellipsis:true,
       render:(value,item)=>{
-        let v = turnbar(item.branch);
         return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch}/${value}`} className="color-blue">{value}</Link>
         )
       }
     },

src/forge/DevOps/Dispose/PipelineName.jsx

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

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/Structure.jsx

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

src/forge/DevOps/ops.scss

@@ -194,18 +194,6 @@
       &.rightSection{
         width:100%;
         background-color: #081930;
-        .devopsNav{
-          background-color: #111c24;
-          border-bottom: none;
-          .ant-menu-item{
-            color: #ccc;
-            padding:0px;
-            margin:0px 20px!important;
-          }
-          .ant-menu-item.ant-menu-item-selected{
-            color: #1890ff;
-          }
-        }
         .rightMainContent{
           padding:24px 30px;
           height:100vh;
@@ -391,9 +379,6 @@
     }
   }
 }
-.chooseCon.ant-select-dropdown{
-  z-index: 100001;
-}
 
 .choosenList{
   display: flex;

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

@@ -152,21 +152,20 @@ 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
                   }
                 ]
               }
             )(
-              <Input placeholder="请输入仓库标识" autoComplete={"off"}/>
+              <Input placeholder="请输入仓库名称" autoComplete={"off"}/>
             )}
           </Form.Item>
-          <span className="color-grey-9" style={{marginLeft:"120px"}}>请输入当前项目的标识：<span className="ml5 mr5 color-grey-3">{repo}</span>进行确认！</span>
         </Form>
       </div>
     </Modal>

src/forge/Divert/Index.scss

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

src/forge/Head/AddProjectModal.jsx

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

src/forge/Head/Footer.jsx

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

src/forge/Head/Header.js

@@ -3,12 +3,10 @@ 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 GotoQQgroup from '../../modal/GotoQQgroup'
 
-import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
 
 import './header.scss';
@@ -79,6 +77,36 @@ 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}
+          />
+        </div>
+      )
+    }else{
+      return <i className="iconfont icon-sousuo font-18 color-grey-6 ml30" onClick={() => {
+        this.setState({openSearch:true})
+      }} />
+    }
+  }
+
+  onGlobalSearch=(value,item)=>{
+    window.location.href=`${item}?value=` + value;
+  }
+
   openNotification = (messge) => {
     notification.open({
       message: "提示",
@@ -87,6 +115,8 @@ class NewHeader extends Component {
     });
   };
 
+
+
   componentWillReceiveProps(newProps, oldProps) {
     this.setState({
       user: newProps.user
@@ -96,6 +126,7 @@ class NewHeader extends Component {
     }
   }
 
+
   educoderlogin = () => {
     //登录账号
     this.setState({
@@ -133,11 +164,13 @@ class NewHeader extends Component {
     })
   };
 
+
   // 关闭
   cancelModulationModels = () => {
     this.setState({ isRenders: false })
   }
 
+
   setevaluatinghides = () => {
     this.setState({
       setevaluatinghides: true
@@ -231,15 +264,15 @@ 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>
               )
             })
           }
-          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
         </Menu>
       </div>
     )
   }
+
   renderMenu=(personal)=>{
     const { current_user } = this.props;
     return(
@@ -254,7 +287,6 @@ class NewHeader extends Component {
               )
             })
           }
-          <li><Link to={`/settings/SSH`}>设置</Link></li>
         <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
       </Menu>
     )
@@ -263,13 +295,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 +383,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">
@@ -411,8 +447,7 @@ 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">

src/forge/Head/header.scss

@@ -1,6 +1,7 @@
 
 .dropdownFlex{
   display:flex;
+  padding:5px;
   background:#fff;
   border-radius: 3px;
   .ant-menu-vertical > .ant-menu-item{
@@ -8,13 +9,6 @@
     height: 35px;
     line-height: 35px;
     margin:0px;
-    &.ant-menu-item-selected{
-      background-color: #fff;
-      a{color: rgba(0, 0, 0, 0.65)!important;}
-    }
-    &.ant-menu-item-active{
-      a{color: #4cacff!important;}
-    }
   }
   .ant-menu-vertical{
     border:none;
@@ -33,7 +27,7 @@
   li{
     height: 40px;
     line-height: 40px;
-    padding:0px!important;
+    padding:0px;
     cursor: default;
     &:hover{
       background-color: #fff;
@@ -110,13 +104,4 @@
       }
     }
   }
-}
-.inviteForm{
-  .ant-form-item{
-    margin-right: 0px;
-  }
-  .ant-form-item-label{
-    width: 110px;
-    text-align: right;
-  }
 }

src/forge/Index.js

@@ -26,15 +26,11 @@ const ProjectDetail = Loadable({
   loading: Loading,
 });
 
+const Infos = Loadable({
+  loader: () => import("./users/Infos"),
+  loading: Loading,
+});
 class Index extends Component {
-
-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
-      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
-        window.scrollTo(0, 0)
-      }
-    })
-  }
   render() {
     return (
       <div className="newMain clearfix">
@@ -70,8 +66,12 @@ class Index extends Component {
             )}
           ></Route>
           <Route
+            exact
             path="/"
             render={(props) => (
+              this.props.current_user && this.props.current_user.login ?
+              <Infos {...this.props} {...props} />
+              :
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>

src/forge/Main/CoderDepot.jsx

@@ -19,27 +19,12 @@ import LanguagePower from '../Component/LanguagePower';
 import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
-import Invite from './sub/Invite';
+
 /**
  * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
  */
-
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
-function returnbar(str){
-  if(str && str.length>0 && str.indexOf("%2F")>-1){
-    return str.replaceAll('%2F','/');
-  }
-  return str;
-}
-
 function CoderDepot(props){
   const [ projectDetail , setProjectDetail ]= useState(undefined);
-  const [ inviteCode , setInviteCode ] = useState(undefined);
   const [ treeValue , setTreeValue ] = useState(undefined);
   const [ treeValuePath , setTreeValuePath ] = useState(undefined);
   const [ lastCommit,setLastCommit ] = useState(undefined);
@@ -61,33 +46,13 @@ function CoderDepot(props){
   const [ website , setWebsite ] = useState(undefined);
   const [ lesson_url , setLessonUrl ] = useState(undefined);
   const [ readme , setReadme ] = useState(undefined);
-  const [ defaultBranch , setDefaultBranch ] = useState(undefined);
-  const [ editReadme , setEditReadme ] = useState(false);
-  const [ pullsFlag , setPullsFlag ] = useState(true);
-  const [ issuesFlag , setIssuesFlag ] = useState(true);
+  const [ defaultBranch , setDefaultBranch ] = useState(undefined)
 
   const owner = props.match.params.owner;
   const projectsId = props.match.params.projectsId;
-  let branchName = props.match.params.branchName;
-  branchName = returnbar(branchName);
+  const branchName = props.match.params.branchName;
   const details = props.projectDetail;
   let pathname = props.history.location.pathname;
-  
-  const { bannerList } = props;
-
-  useEffect(()=>{
-    if(bannerList && bannerList.length>0){
-      let a = bannerList.filter(i=>i.menu_name === "pulls");
-      let i = bannerList.filter(i=>i.menu_name === "issues");
-      if(a && a.length === 0){
-        setPullsFlag(false);
-      }
-      if(i && i.length === 0){
-        setIssuesFlag(false);
-      }
-    }
-  },[bannerList])
-
 
   useEffect(()=>{
     if(details){
@@ -96,7 +61,6 @@ function CoderDepot(props){
       setWebsite(details.website);
       setLessonUrl(details.lesson_url);
       setDefaultBranch(details.default_branch);
-      setInviteCode(details.invite_code);
     }
   },[details])
 
@@ -111,16 +75,13 @@ function CoderDepot(props){
 
   useEffect(()=>{
     if (projectsId && owner && defaultBranch){
-      let b = turnbar(branchName) ;
-      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
-        let url = pathname.split(`/tree/${b}/`)[1];
+      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) {
+        let url = pathname.split(`/tree/${branchName}/`)[1];
         setTreeValue(url);
         getFileInfo(url,branchName);
-        setType("file");
       }else{
         setTreeValue(undefined);
         getDirInfo(branchName || defaultBranch);
-        setType("dir");
       }
     } 
   },[projectsId,owner,pathname,defaultBranch])
@@ -129,7 +90,6 @@ function CoderDepot(props){
   function getDirInfo(branch){
     setIsSpin(true);
     const url = `/${owner}/${projectsId}/entries.json`;
-
     axios.get(url, { 
       params: { ref: branch } 
     }).then((result) => {
@@ -145,8 +105,6 @@ function CoderDepot(props){
         setMainFlag(true);
         setReadOnly(true);
         setReadme(result.data.readme);
-        setEditReadme(false);
-        setHide(true);
       }
       setTimeout(function(){setIsSpin(false);},500);
     }).catch(error=>{setIsSpin(false);})
@@ -158,7 +116,7 @@ function CoderDepot(props){
       let ele = document.getElementById("ptxt");
       if(ele){
         let h = ele.offsetHeight;
-        if( h > 18 ) setHideBtn(true);
+        if( h > 18 ) setHideBtn(true)
       }
     }
   },[projectDetail,lastCommit])
@@ -188,8 +146,7 @@ function CoderDepot(props){
         setLastCommit(c && c.commit);
         setLastCommitAuthor(c && c.committer);
         setMainFlag(false);
-        setReadOnly(!editReadme);
-        setHide(true);
+        setReadOnly(true);
       }
       setTimeout(function(){setIsSpin(false);},500)
     }).catch(error=>{setIsSpin(false);})
@@ -197,22 +154,17 @@ function CoderDepot(props){
 
   // 切换分支或者标签
   function changeBranch(value){
-    let checkvalue = turnbar(value);
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
     props.history.push(url);
   }
     
   // 文件相关的下拉项
-  function fileMenu(){
-    let b = branchName || defaultBranch;
-    let checkvalue = turnbar(b);
-    return (
+  const fileMenu =(
     <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
     </Menu>
-    )
-  }
+  )
 
   function getPathUrl(array,index){
     if(array && array.length>0 && index){
@@ -227,35 +179,26 @@ function CoderDepot(props){
   function returnMain(){
     setTreeValue(undefined);
     let branch = branchName || defaultBranch;
-    let checkvalue = turnbar(branch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch}`);
   };
   // 子目录路径返回链接
   function returnUlr(url){
-    let enBranch = turnbar(branchName);
-    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree${branchName?`/${branchName}`:""}/${url}`);
   }
   // 点击跳转到子目录
   function goToSubRoot(path,type,filename){
-    if(type!=="submodule"){
-      let enBranch = branchName || defaultBranch;
-      let checkvalue = turnbar(enBranch);
-      setType(type);
-      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
-    }
+    setType(type);
+    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || defaultBranch}`}${path?`/${path}`:""}`);
   }
 
   function onEdit(readOnly){
     setReadOnly(readOnly);
-    setEditReadme(false);
   }
   function ChangeFile(path, readOnly){
     //点击直接跳转页面 加载一次路由
-    let enBranch = branchName || defaultBranch;
-    let checkvalue = turnbar(enBranch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${branchName || defaultBranch}/${path}`);
     setType("file");
-    setEditReadme(true);
+    setReadOnly(readOnly);
   };
 
   function changeHide(hide){
@@ -271,12 +214,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){
@@ -291,12 +239,10 @@ function CoderDepot(props){
       }
     })
   }
+
   let n = fileInfo && fileInfo.name;
   const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
-
-  const { current_user } = props;
-  const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter";
-  const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
+  
   return(
     <WhiteBack>
       <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
@@ -358,21 +304,15 @@ function CoderDepot(props){
                       </AlignCenter>
                     </AlignCenter>
                     <AlignCenter>
-                      {
-                        baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
-                        <div className="mr20 addOptionBtn">
-                          {
-                            projectDetail.type !== 2 && pullsFlag &&
-                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
-                          }
-                          {
-                            issuesFlag &&
-                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
-                          }
-                        </div>
-                      }
-                      { fileOperate &&
-                        <Dropdown overlay={fileMenu()} className="mr20" trigger={['click']}>
+                      <div className="mr20 addOptionBtn">
+                        {
+                          projectDetail.type !== 2 && 
+                          <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                        }
+                        <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
+                      </div>
+                      { type === "dir" && projectDetail.type !== 2 &&
+                        <Dropdown overlay={fileMenu} className="mr20" trigger={['click']}>
                           <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
                         </Dropdown>
                       }
@@ -389,15 +329,11 @@ function CoderDepot(props){
                         lastCommit &&
                         <div className="listtablehead">
                           <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
-                          <div className={hideBtn && hide ? "ellipsistxt hidetxt" :"ellipsistxt"}>
-                            <pre id="ptxt">{lastCommit && lastCommit.message}</pre>
-                          </div>
+                          <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><pre id="ptxt">{lastCommit && lastCommit.message}</pre></div>
                           { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
 
                           <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>
-                          { commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
-                            <i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交
-                          </Link>:"" }
+                          { commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits`} className="ml12 color-grey-9"><i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交</Link>:"" }
                         </div>
                       }
                       <ul className="listtablebody">
@@ -479,19 +415,12 @@ function CoderDepot(props){
                         </p>
                       }
                     </div>
-                    {
-                      inviteCode && 
-                      <div>
-                        <Divider />
-                        <Invite code={inviteCode} className={"detailsCode"}/>
-                      </div>
-                    }
                     {
                       lesson_url &&
                       <div>
                         <Divider />
                         <p className="font-16 color-grey-6">实践课程</p>
-                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline",wordBreak:"break-all"}}>{lesson_url}</a>
+                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline"}}>{lesson_url}</a>
                       </div>
                     }
                     {/* 发布 */}
@@ -499,14 +428,7 @@ function CoderDepot(props){
                       projectDetail && projectDetail.release_versions &&
                       <React.Fragment>
                         <Divider />
-                        <Releases 
-                          owner={owner} 
-                          projectsId={projectsId} 
-                          releaseVersions={projectDetail.release_versions} 
-                          history={props.history}
-                          baseOperate={baseOperate}
-                          projectType={projectDetail.type}
-                        />
+                        <Releases owner={owner} projectsId={projectsId} releaseVersions={projectDetail.release_versions} history={props.history}/>
                       </React.Fragment>
                     }
                     {/* 贡献者 */}

src/forge/Main/CoderDepotCatalogue.jsx

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

src/forge/Main/CoderDepotReadme.jsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react';
 import RenderHtml from '../../components/render-html';
-import { AlignCenter } from '../Component/layout';
 import { Dropdown , Menu , Spin } from 'antd';
 import { Link } from 'react-router-dom';
 const $ = window.$;
@@ -48,16 +47,11 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
   }
   return(
     <div className="commonBox" id="readme">
-      <div className="commonBox-title boxTitle">
-        <AlignCenter>
-          <Dropdown overlay={menu()}>
-            <span className="catelogue">
-              <i className="iconfont icon-zhangjie1 font-14 mr5"></i>
-              <span>目录</span>
-            </span>
-          </Dropdown>
-          <span className="commonBox-title-read">README.md</span>
-        </AlignCenter>
+      <div className="commonBox-title">
+        <Dropdown overlay={menu()}>
+          <i className="iconfont icon-zhangjie1 font-16 color-grey-3 mr10"></i>
+        </Dropdown>
+        <span className="commonBox-title-read">README.md</span>
         {
           operate ?
             <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>

src/forge/Main/CoderRootBranch.js

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

src/forge/Main/CoderRootCommit.js

@@ -2,19 +2,12 @@ import React , { Component } from 'react';
 import { Spin , Pagination } from 'antd';
 import { getImageUrl } from 'educoder';
 import { truncateCommitId } from '../common/util';
-import { AlignTop } from '../Component/layout';
 import SelectBranch from '../Branch/Select';
 import Nodata from '../Nodata';
 
 import axios from 'axios';
 import {Link} from "react-router-dom";
 
-function returnbar(str){
-  if(str && str.length>0 && str.indexOf("%2F")>-1){
-    return str.replaceAll('%2F','/');
-  }
-  return str;
-}
 class CoderRootCommit extends Component{
   constructor(props){
     super(props)
@@ -63,12 +56,11 @@ class CoderRootCommit extends Component{
     this.setState({
       isSpining:true
     })
-    console.log(returnbar(branch));
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/commits.json`;
     axios.get(url,{
       params:{
-        sha:returnbar(branch),
+        sha:branch,
         page,
         limit
       }
@@ -113,7 +105,7 @@ class CoderRootCommit extends Component{
     const { commitDatas , dataCount , limit , page , isSpining , branchList } = this.state;
     const { projectDetail, commit_class , defaultBranch } = this.props;
     const { projectsId , owner , branchName } = this.props.match.params;
-    let branch = returnbar(branchName || defaultBranch);
+    let branch = branchName || defaultBranch;
     return(
       <React.Fragment>
         <div className={"main"}style={{padding:"0px",border:"none"}}>
@@ -140,10 +132,10 @@ class CoderRootCommit extends Component{
                   commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
                     return(
                       <div key={k}>
-                        <AlignTop>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
-                        </AlignTop>
+                        <p className="f-wrap-alignCenter">
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
+                        </p>
                         <p className="f-wrap-alignCenter mt15">
                           {
                             item.id ?

src/forge/Main/CoderRootFileDetail.js

@@ -285,7 +285,6 @@ class CoderRootFileDetail extends Component {
                 readOnly={readOnly}
                 editorType="update"
                 currentBranch={currentBranch}
-                descName={detail && `Update ${detail.name}`}
               ></Meditor>
             )}
         </div>

src/forge/Main/CoderRootIndex.js

@@ -102,11 +102,6 @@ class CoderRootIndex extends Component{
               (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
-            render={
-              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
-            }
-          ></Route>
           <Route path="/projects/:owner/:projectsId/commits/:sha"
             render={
               (props) => (<Diff {...this.props} {...props} {...this.state}/>)

src/forge/Main/CoderRootTag.js

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

src/forge/Main/Detail.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip , Button } from 'antd';
+import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , AlignTop } from '../Component/layout';
+import { Content } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
 import './list.css';
@@ -176,7 +176,6 @@ class Detail extends Component {
       firstSync:false,
       secondSync:false,
       open_devops:false,
-      forkSpin:false,
       // 默认分支
       defaultBranch:undefined,
 
@@ -359,9 +358,6 @@ class Detail extends Component {
   forkFunc = () => {
     const { platform } = this.state;
     if(!platform)return;
-    this.setState({
-      forkSpin:true
-    })
     const { current_user } = this.props
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/forks.json`;
@@ -370,13 +366,8 @@ class Detail extends Component {
         this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
         this.props.showNotification(result.data.message);
       }
-      this.setState({
-        forkSpin:false
-      })
     }).catch(error => {
-      this.setState({
-        forkSpin:false
-      })
+      console.log(error);
     })
   }
 
@@ -398,23 +389,13 @@ class Detail extends Component {
     })
   }
 
-  textFunc = (forked_from_project_id,fork_info)=>{
-    let type = fork_info && fork_info.fork_project_user_type;
-    return forked_from_project_id && fork_info ?
-      <div className="color-grey-9 df">
-        <span>复刻自</span>
-        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
-        <span> / </span>
-        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{maxWidth:"400px"}} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
-      </div> : ""
-  }
   
 
   render() {
     const { projectDetail, watchers_count, praises_count, 
       forked_count, firstSync , secondSync , 
       isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch , bannerList , forkSpin } = this.state;
+      project , open_devops , platform , defaultBranch , bannerList } = this.state;
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
@@ -425,6 +406,16 @@ class Detail extends Component {
 
     const { state } = this.props.history.location;
     
+    const text = (
+      projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+        <React.Fragment>
+          <span>forked from </span>
+          <Link to={`/users/${projectDetail.fork_info.fork_project_user_login}`} className="show-user-link color-grey-ccc">{projectDetail.fork_info.fork_project_user_name}</Link>
+          <span> / </span>
+          <Link to={`/projects/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}`} className="color-grey-ccc">{projectDetail.fork_info.fork_form_name}</Link>
+        </React.Fragment> : ""
+    );
+    
     const common = {
       getDetail: this.getDetail,
       changeOpenDevops:this.changeOpenDevops,
@@ -434,95 +425,98 @@ class Detail extends Component {
       <div>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <AlignTop style={{padding:"20px 0px 10px",justifyContent:"space-between"}}>
-              <div>
-                <AlignTop>
-                  <div className="projectallName">
-                    {project && project.author &&
-                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
-                    }
-                    <span className="ml5 mr5">/</span>
-                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
-                  </div>
-                  { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
-                </AlignTop>
-                <div className="mt8">
+            <div className="f-wrap-between pb15" style={{ position: "relative" }}>
+              <p className="font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
+                {project && project.author &&
+                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link">
+                    {project.author.name}
+                  </Link>
+                }
+                <span className="ml5 mr5">/</span>
+                <span className="hide-1 flex-1 df">
+                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22">{project && project.name}</Link>
                   {
                     projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                    this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
-                    :""
+                      <Tooltip placement={'right'} title={text}>
+                        <Link to={`/projects/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}`}
+                          className="ml10" >
+                          <i className="iconfont icon-fork font-18 fl mt6" style={{ color: "#8D90E3" }}></i>
+                        </Link>
+                      </Tooltip> : ""
                   }
                   {
                     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.type === 2 ?
+                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
+                      <i className="iconfont icon-banbenku font-18 mt6" style={{ color: "#8D90E3" }}/>
+                    </Tooltip>
+                    :
+                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
+                      <i className="iconfont icon-jingxiang font-18 color-green mt6" />
+                    </Tooltip>
                     :""
                   }
-                </div>
-              </div>
-              <div>
-                {
-                  firstSync ? "":
-                  <span className="df">
+                </span>
+              </p>
+              {
+                firstSync ? "":
+                <span className="df mt25">
+                  {
+                    ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
+                    <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
+                  }
+                  <span className="detail_tag_btn">
+                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
+                      <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
+                      <span>{watched ? '取消关注' : '关注'}</span>
+                    </a>
                     {
-                      ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
-                      <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
+                      watchers_count > 0 ?
+                      platform ?
+                      <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
+                        {watchers_count}
+                      </Link>
+                      :
+                      <span className="detail_tag_btn_count">{watchers_count}</span>
+                      :""
                     }
-                    <Button className="detail_tag_btn">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
-                        <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
-                        <span>{watched ? '取消关注' : '关注'}</span>
-                      </a>
-                      {
-                        watchers_count > 0 ?
-                        platform ?
-                        <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
-                          {watchers_count}
-                        </Link>
-                        :
-                        <span className="detail_tag_btn_count">{watchers_count}</span>
-                        :""
-                      }
-                    </Button>
-                    <Button className="detail_tag_btn">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
-                        <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
-                        <span>{praised ? '取消点赞' : '点赞'}</span>
-                      </a>
-                      {
-                        praises_count > 0 ?
-                        platform ?
-                        <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
-                          {praises_count}
-                        </Link>:
-                        <span className="detail_tag_btn_count">{praises_count}</span>
-                        :""
-                      }
-                    </Button>
-                    <Button className="detail_tag_btn" loading={forkSpin}>
-                      <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
-                        <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                          <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
-                        </a>
-                      </Tooltip>
-                      {
-                        forked_count > 0 ?
-                        platform ?
-                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
-                          {forked_count}
-                        </Link>
-                        :
-                        <span className="detail_tag_btn_count">{forked_count}</span>
-                        :""
-                      }
-                    </Button>
                   </span>
-                }
-              </div>
-            </AlignTop>
+                  <span className="detail_tag_btn">
+                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
+                      <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                      <span>{praised ? '取消点赞' : '点赞'}</span>
+                    </a>
+                    {
+                      praises_count > 0 ?
+                      platform ?
+                      <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
+                        {praises_count}
+                      </Link>:
+                      <span className="detail_tag_btn_count">{praises_count}</span>
+                      :""
+                    }
+                  </span>
+                  <span className="detail_tag_btn">
+                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
+                      <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻 (Fork)
+                    </a>
+                    {
+                      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>
+                      :""
+                    }
+                  </span>
+                </span>
+              }
+            </div>
             {
               firstSync ? "" :
               <DetailBanner 
-                history={this.props.history}
                 list={bannerList}
                 owner={owner}
                 projectsId={projectsId}

src/forge/Main/Diff.jsx

@@ -51,7 +51,7 @@ export default ({ match , history }) => {
     }
   }, [projectsId , owner, sha]);
   return (
-    <div className="main" style={{padding:"0px",border:"none"}}>
+    <div className="main">
       <Spin spinning={isSpin}>
         <Infos>
           <div className="commitinfos">

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 { 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';
@@ -33,8 +30,6 @@ class Index extends Component {
       categoryList: undefined,
       recommendList:undefined,
 
-      recommendOriList:undefined,
-
       languageList:undefined,
       languageId:undefined
     }
@@ -52,8 +47,6 @@ class Index extends Component {
     this.getRecommand();
 
     this.getLanguage();
-
-    // this.getRecommandOri();
   }
 
   // 获取语言列表
@@ -79,17 +72,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 +256,22 @@ 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;
 
     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>
-          :""
-        } */}
         {
           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 +283,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,40 +72,8 @@
       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{
   max-width: 1200px;
@@ -111,10 +83,10 @@
   }
   .addOptionBtn{
     height: 32px;
-    line-height: 30px;
+    line-height: 32px;
     display: flex;
     border:1px solid #d9d9d9;
-    border-radius: 2px;
+    border-radius: 4px;
     a{
       padding:0px 13px;
       color: rgba(0, 0, 0, 0.65);
@@ -123,9 +95,6 @@
     & > a:first-child{
       border-right: 1px solid #d9d9d9;
     }
-    & > a:last-child{
-      border-right: none;
-    }
   }
   .infoCount{
     display: inline-block;
@@ -206,33 +175,27 @@
       border-radius: 4px 4px 0px 0px;
       background-color: #FAFBFC;
       .ellipsistxt{
-        margin-top: 6px;
-        #ptxt{
-          margin-bottom: 0px;
-          word-break: break-all;
-          overflow: unset;
-          white-space:pre-wrap; /* css3.0 */ 
-          white-space:-moz-pre-wrap; /* Firefox */ 
-          white-space:-pre-wrap; /* Opera 4-6 */ 
-          white-space:-o-pre-wrap; /* Opera 7 */ 
-          word-wrap:break-word;
-        }
         margin-left: 13px;
         line-height:18px;
+        margin-top:6px;
         flex:1;
         width: 0;
         color: #666;
-        &.hidetxt{
+        &>p{
+          word-break:break-all;
+        }
+        &.hide{
           height: 18px;
           overflow: hidden;
           position: relative;
           padding-right:8px;
-          &::after{
-            position: absolute;
-            right: 0px;
-            bottom: 0px;
-            content:"...";
-          }
+        }
+        &.hide::after{
+          position: absolute;
+          right: 0px;
+          bottom: 0px;
+          content:"...";
+
         }
       }
       .ellipsis{
@@ -292,34 +255,23 @@
 .drawerBtn{
   position: fixed;
   left: -13px;
-  border:1px solid rgb(207,205,223);
+  border:1px solid #d9d9d9;
   width: 34px;
   border-radius: 0px 12px 12px 0px;
+  text-align: right;
   height: 70px;
+  line-height: 70px;
   top:50%;
   margin-top: -35px;
   cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  justify-content: center;
   &:hover{
     box-shadow: 1px 0px 7px rgba(0,0,0,0.1);
   }
-  span{
-    writing-mode: vertical-lr;
-    color: #202429;
-    width: 25px;
-  }
   i{
-    color: #24292e;
-    height: 18px;
-    line-height: 18px;
-    width: 18px;
+    color: #d9d9d9;
   }
 }
 .downMenu{
-  width: 330px;
   box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
   background-color: #fff;
   .ant-menu-vertical .ant-menu-item:hover{
@@ -345,29 +297,4 @@
   .ant-dropdown-menu-item.active{
     background-color: #e6f7ff;
   }
-}
-.catelogue{
-  border:1px solid rgb(211, 211, 211);
-  font-size: 15px;
-  font-weight: normal;
-  border-radius: 5px;
-  margin-right: 10px;
-  padding:0px 10px;
-  height: 30px;
-  line-height: 30px;
-  color: #666!important;
-  display: flex;
-  align-items: center;
-  span{
-    margin-top: 1px;
-  }
-}
-.submoduleStyle{
-  cursor: default;
-  i{
-    cursor: default;
-  }
-  &:hover{
-    color: #05101a;
-  }
 }

src/forge/Main/IndexItem.js

@@ -18,7 +18,7 @@ class IndexItem extends Component {
   render() {
     const { projects } = this.props;
     return (
-      <div className="project-list minH-670" style={{padding:"0px 20px"}}>
+      <div className="project-list minH-670">
         { projects && projects.length > 0 ? projects.map((item, key) => {
           return (
             <div className="p-r-Item" key={key}>
@@ -35,10 +35,9 @@ class IndexItem extends Component {
               <div className="p-r-Infos">
                 <div className="p-r-name">
                   <AlignCenter>
-                    <Link to={`/projects/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
                       {item.author.name}/{item.name}
                     </Link>
-                    { !item.is_public && <span className="privateTag">私有</span> }
                     {
                       item.forked_from_project_id ?
                         <span className="ml5">
@@ -47,37 +46,27 @@ 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>:""
                     }
                   </AlignCenter>
                   <span className="p-r-tags">
-                    {
-                      item.praises_count && item.praises_count>0 ?
-                      <span className="pariseTag">
-                        <img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}
-                      </span>:""
-                    }
-                    {
-                      item.forked_count && item.forked_count>0 ?
-                      <span>
-                        <i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}
-                      </span>:""
-                    }
+                    <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
+                    <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>
                   </span>
                 </div>
                 <p className="break_word task-hide-2 mt10" style={{ maxHeight: "44px",lineHeight:"22px" }}>{item.description}</p>
 
                 <div className="p-r-about">
                   <span className="p-r-detail">
+                    {/* <span><label>浏览量：</label>{item.visits}</span> */}
+                    {/* {item.category && item.category.id && <span>{item.category.name}</span>} */}
                     {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
                     {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
                   </span>

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

@@ -264,10 +264,7 @@
   border:1px solid #f1f1f1;
   display: flex;
   align-items: center;
-  margin-left: 30px;
-  padding:0px;
-  background-color: transparent;
-  box-shadow: none;
+  margin-left: 30px
 }
 .ant-tooltip {
   max-width: fit-content!important;
@@ -567,10 +564,6 @@
   border-bottom: 1px solid #d9d9d9;
   border-radius: 4px 4px 0px 0px;
 }
-.commonBox .commonBox-title.boxTitle{
-  display: flex;
-  justify-content: space-between;
-}
 .synchronism{
   display: block;
   height: 26px;

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,18 +1,11 @@
 import React, { useEffect, useState } from 'react';
-import { Skeleton , Tooltip} from 'antd';
+import { Skeleton } from 'antd';
 import { Link } from 'react-router-dom';
 
-function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
+function DetailBanner({ list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
   const [ menuName , setMenuName ] = useState(undefined);
   useEffect(()=>{
     if(list){
-      // 没有资源库banner但是通过连接进资源库页面时
-      if(pathname && pathname==="source"){
-        let a = list.filter(item=>item.menu_name === "resources");
-        if(a && a.length === 0){
-          history.push(`/projects/${owner}/${projectsId}`);
-        }
-      }
       setMenuName(list);
     }
   },[list]);
@@ -46,13 +39,11 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "issues" &&
                     <li className={pathname==="issues" ? "active" : ""}>
-                      <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
-                        <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                          <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
-                          <span>易修</span>
-                          {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
-                        </Link>
-                      </Tooltip>
+                      <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>易修 (Issue)</span>
+                        {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
+                      </Link>
                     </li>
                   }
                   {
@@ -75,8 +66,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     </li>
                     :""
                   }
-                  {/* {
-                    item.menu_name === "resources" &&
+                  {
+                    item.menu_name === "source" &&
                     <li className={pathname==="source" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
                           <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
@@ -84,7 +75,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                           {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                       </Link>
                     </li>
-                  } */}
+                  }
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>
@@ -104,19 +95,19 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                       </Link>
                     </li>
                   }
-                  {
-                    item.menu_name === "setting" &&
-                    <li className={pathname === "setting" ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
-                        <span>仓库设置</span>
-                      </Link>
-                    </li>
-                  }
                 </React.Fragment>
               )
             })
           }
+          {
+            isManager && platform ? 
+            <li className={pathname === "setting" ? "active" : ""}>
+              <Link to={`/projects/${owner}/${projectsId}/setting`}>
+                <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                <span>仓库设置</span>
+              </Link>
+            </li>:""
+          }
         </ul>
         :
         <Skeleton paragraph={false} active={true}/>

src/forge/Main/sub/Invite.jsx

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

src/forge/Main/sub/UpdateDescModal.jsx

@@ -2,13 +2,13 @@ import React , { forwardRef, useEffect } from 'react';
 import {Form , Modal , Input } from 'antd';
 import "./sub.scss";
 const { TextArea } = Input;
-function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_url}){
+function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
   const { getFieldDecorator, validateFields , setFieldsValue } = form;
 
   useEffect(()=>{
     if(desc || website){
       setFieldsValue({
-        website,desc,lesson_url
+        website,desc
       })
     }
   },[desc,website])
@@ -17,7 +17,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
     validateFields((err,values)=>{
       if(!err){
         onCancel();
-        onOk(values.desc,values.website,values.lesson_url)
+        onOk(values.desc,values.website)
       }
     })
   }
@@ -49,13 +49,6 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
             <Input placeholder="website链接"/>
           )}
         </Form.Item>
-        <Form.Item label="实践课程">
-          {getFieldDecorator("lesson_url",{
-            rules:[]
-          })(
-            <Input placeholder="实践课程链接" />
-          )}
-        </Form.Item>
       </Form>
     </Modal>
   )

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%;
     }
@@ -22,9 +20,4 @@
     height: 20px;
     line-height: 20px;
   }
-}
-
-.detailsCode{
-  display: flex;
-  justify-content: space-between;
 }

src/forge/Merge/Index.scss

@@ -1,21 +0,0 @@
-.i_open{
-  color: #28BD6C!important;
-}
-.i_merged{
-  color: #4C9ED3!important;
-}
-.i_closed{
-  color: #FA6400!important;
-}
-.pr_tags_open{
-  border:1px solid #28BD6C;
-  color: #28BD6C;
-}
-.pr_tags_merged{
-  border:1px solid #4C9ED3;
-  color: #4C9ED3;
-}
-.pr_tags_closed{
-  border:1px solid #FA6400;
-  color: #FA6400;
-}

src/forge/Merge/MergeItem.js

@@ -5,12 +5,6 @@ import { AlignCenter } from '../Component/layout';
 import { getImageUrl } from "educoder";
 import "./merge.css";
 
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
 class MergeItem extends Component {
   constructor(props) {
     super(props);
@@ -49,18 +43,16 @@ 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 } = this.props;
     const { projectsId , owner } = this.props.match.params;
     const { current_user } = this.props;
     const renderList = () => {
       if (issues && issues.length > 0) {
         return issues.map((item, key) => {
-          let status = item.pull_request_staus;
           return (
             <div className="issueItem">
               <div className="flex-1">
                 <p className="mb15 df" style={{ alignItems: "center" }}>
-                  <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
                   <Link
                     to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                     className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
@@ -68,10 +60,10 @@ class MergeItem extends Component {
                   >
                     {item.name}
                   </Link>
-                  <Tag className={`pr_tags_${status}`}>
-                    {status === "merged"
+                  <Tag className={`pr_tags_${item.pull_request_staus}`}>
+                    {item.pull_request_staus === "merged"
                       ? "已合并"
-                      : status === "closed"
+                      : item.pull_request_staus === "closed"
                       ? "已拒绝"
                       : "开启的"}
                   </Tag>
@@ -105,43 +97,33 @@ class MergeItem extends Component {
                     </span>
                     <span className="color-grey-8">{item.pr_time}</span>
                     <span className="ml15">
-                      {
-                        item.pull_request_head &&
-                        <Tag className="pr-branch-tag">
-                          <Link
-                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
-                            className="maxW200px hide-1 ver-middle"
-                          >
-                            {item.is_original
-                              ? item.fork_project_user
-                              : project_author_name}
-                            :{item.pull_request_head}
-                          </Link>
-                        </Tag>
-                      }
-                      {
-                        item.pull_request_base && 
-                        <span className="mr8 ver-middle">
-                          <i
-                            className={
-                              "iconfont icon-youjiang color-grey-c font-16"
-                            }
-                          ></i>
-                        </span>
-                      }
-                      {
-                        item.pull_request_base && 
-                        <Tag className="pr-branch-tag">
-                          <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
-                            className="maxW200px hide-1 ver-middle"
-                          >
-                            {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
-                            {project_author_name}:{item.pull_request_base}
-                          </Link>
-                        </Tag>
-                      }
-                      
+                      <Tag className="pr-branch-tag">
+                        <Link
+                          to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${item.pull_request_head}`}
+                          className="maxW200px hide-1 ver-middle"
+                        >
+                          {item.is_original
+                            ? item.fork_project_user
+                            : project_author_name}
+                          :{item.pull_request_head}
+                        </Link>
+                      </Tag>
+                      <span className="mr8 ver-middle">
+                        <i
+                          className={
+                            "iconfont icon-youjiang color-grey-c font-16"
+                          }
+                        ></i>
+                      </span>
+                      <Tag className="pr-branch-tag">
+                        <Link
+                          to={`/projects/${owner}/${projectsId}/tree/${item.pull_request_base}`}
+                          className="maxW200px hide-1 ver-middle"
+                        >
+                          {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
+                          {project_author_name}:{item.pull_request_base}
+                        </Link>
+                      </Tag>
                     </span>
                   </AlignCenter>
                 </p>
@@ -183,7 +165,7 @@ class MergeItem extends Component {
                     ) : (
                       ""
                     )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {current_user && current_user.login ? (
                       <div
                         className="milepostleft"
                         style={{

src/forge/Merge/MessageCount.js

@@ -24,12 +24,6 @@ import MergeFooter from "./merge_footer";
 const Option = Select.Option;
 const TextArea = Input.TextArea;
 
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
 class MessageCount extends Component {
   constructor(props) {
     super(props);
@@ -47,7 +41,6 @@ class MessageCount extends Component {
       edit_spin: false,
       pr_status: undefined,
       pull_request:undefined,
-      conflict_files:[],
 
       copyVisible:false,
     };
@@ -82,8 +75,7 @@ class MessageCount extends Component {
             data: result.data,
             SpinFlag: false,
             pr_status: result.data.pull_request && result.data.pull_request.status,
-            pull_request:result.data.pull_request,
-            conflict_files:result.data.conflict_files
+            pull_request:result.data.pull_request
           });
         } else {
           this.setState({ SpinFlag: false });
@@ -110,8 +102,6 @@ class MessageCount extends Component {
             isSpin: false,
             pr_status: 2,
           });
-          const { getDetail } = this.props;
-          getDetail && getDetail();
         } else {
           this.setState({
             isSpin: false,
@@ -148,8 +138,6 @@ class MessageCount extends Component {
             SpinMerge: false,
             pr_status: 1,
           });
-          const { getDetail } = this.props;
-          getDetail && getDetail();
         } else {
           this.setState({ SpinMerge: false });
         }
@@ -253,49 +241,6 @@ class MessageCount extends Component {
     )
   }
 
-  // 点击按钮复制功能
-  jsCopy = () => {
-    const copyEle = document.querySelector('#descContent') // 获取要复制的节点
-    const range = document.createRange(); // 创造range
-    window.getSelection().removeAllRanges(); //清除页面中已有的selection
-    range.selectNode(copyEle); // 选中需要复制的节点
-    window.getSelection().addRange(range); // 执行选中元素
-    document.execCommand("Copy"); // 执行copy操作
-  }
-
-  mergeabledMes=()=>{
-    return(
-      <div className="clearfix">
-        <p className="fl">该分支存在冲突，无法自动合并，你可以尝试通过如下命令手动合并</p>
-        <i className="iconfont icon-fuzhi font-16 fr" onClick={()=>this.jsCopy()}></i>
-      </div>
-    )
-  }
-  mergeabledDesc=(base,head,conflict_files)=>{
-    return(
-      <div>
-        <ul id="descContent">
-          <li>git fetch origin</li>
-          <li>git checkout -b {`${base}`} origin/{`${base}`}</li>
-          <li>git merge {`${head}`}</li>
-        </ul>
-        {
-          conflict_files && conflict_files.length>0 && 
-          <div>
-            <p className="mt10 font-16 pt10" style={{borderTop:"1px solid #f9d7d5"}}>如下文件有代码冲突：</p>
-            <p>
-              {
-                conflict_files.map((i,k)=>{
-                  return <p>{i}</p>
-                })
-              }
-            </p>
-          </div>
-        }
-      </div>
-    )
-  }
-
   render() {
     const { projectsId, mergeId , owner } = this.props.match.params;
     
@@ -307,8 +252,7 @@ class MessageCount extends Component {
       ismesrge,
       SpinFlag,
       copyVisible,
-      pull_request,
-      conflict_files
+      pull_request
     } = this.state;
     const { current_user, projectDetail } = this.props;
     const menu = (
@@ -361,10 +305,10 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
+                            to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${data.pull_request.head}`}
                             className="ver-middle"
                           >
-                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
+                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}
                           </Link>
                         </Tag>
                         <span className="mr8 ver-middle">
@@ -379,6 +323,7 @@ class MessageCount extends Component {
                             to={`/projects/${owner}/${projectsId}/tree/${data.pull_request.base}`}
                             className="ver-middle"
                           >
+                            {/* {data.pull_request.is_fork ? data.pull_request.base : `${data.pull_request.pull_request_user}:${data.pull_request.base}`} */}
                             {data.issue.project_author_name}:{data.pull_request.base}
                           </Link>
                         </Tag>
@@ -443,6 +388,12 @@ class MessageCount extends Component {
                   </div>
                   <div className="ml10">
                     <div className="mt15 text-right" style={{display:"flex",justifyContent:"flex-end"}}>
+                      {/* <span className="composeButton">
+                        <Dropdown overlay={this.copyItem()} visible={copyVisible} onClick={(e)=>this.setCopyVisible(e)}>
+                          <span>复制</span>
+                        </Dropdown>
+                        <span>下载为<i className="iconfont icon-sanjiaoxing-down color-blue"></i></span>
+                      </span> */}
                       {operate && (
                           <Button
                             type="green"
@@ -489,40 +440,35 @@ class MessageCount extends Component {
                     type="success"
                   />
                 )}
-                {operate && (
+                {pr_status === 0 && projectDetail && projectDetail.permission !=="Reporter" && (
                   <Spin spinning={SpinFlag}>
                     <div
                       style={{
                         display:
                           this.state.mergekey === "rebase"
-                            ? this.state.buttonshow === "none" ? "block" : "none"
-                            : !ismesrge ? "block" : "none",
+                            ? this.state.buttonshow === "none"
+                              ? "block"
+                              : "none"
+                            : !ismesrge
+                            ? "block"
+                            : "none",
                       }}
                     >
-                      <Dropdown.Button
-                        overlay={menu}
-                        type="primary"
-                        onClick={this.submitmerge}
-                        className="mb15"
-                        icon={<Icon type="caret-down" />}
-                        disabled={!pull_request || (pull_request && !pull_request.mergeable) }
-                      >
-                        {this.state.mergename}
-                      </Dropdown.Button>
-                      {pull_request && pull_request.mergeable
-                        ?
-                        <Alert
-                          message="该合并请求可以进行自动合并操作"
-                          type="success"
-                          showIcon
-                        />:
-                        <Alert
-                          message={this.mergeabledMes()}
-                          type="error"
-                          description={this.mergeabledDesc(pull_request.base,pull_request.head,conflict_files)}
-                          showIcon
-                        />
-                      }
+                      <p className="mb15">
+                        <Dropdown.Button
+                          overlay={menu}
+                          type="primary"
+                          onClick={this.submitmerge}
+                          icon={<Icon type="caret-down" />}
+                        >
+                          {this.state.mergename}
+                        </Dropdown.Button>
+                      </p>
+                      <Alert
+                        message="该合并请求可以进行自动合并操作"
+                        type="success"
+                        showIcon
+                      />
                     </div>
                     <div>
                       <div

src/forge/Merge/NewMerge.js

@@ -42,10 +42,9 @@ class NewMerge extends Component {
 
   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 +78,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) => {
@@ -107,18 +105,6 @@ class NewMerge extends Component {
       }
       axios.get(url).then(result=>{
         if(result){
-          if (result.data.status === 0) {
-            this.setState({
-              isSpin: false,
-              show_message: false,
-            });
-          } else {
-            this.setState({
-              isSpin: false,
-              show_message: true,
-              default_message: result.data.message,
-            });
-          }
           this.setState({
             comparesData:result.data
           })
@@ -157,7 +143,7 @@ class NewMerge extends Component {
           merge:"master"
         })
       }
-      // this.ischeckmerge();
+      this.ischeckmerge();
     }
   }
 
@@ -183,7 +169,7 @@ class NewMerge extends Component {
   selectBrach = (type, value) => {
     const { projectsId , owner } = this.props.match.params;
     this.state[type] = value;
-    // this.ischeckmerge();
+    this.ischeckmerge();
     let { id ,merge , pull } = this.state;
     if(type==="pull"){
       this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
@@ -213,6 +199,7 @@ class NewMerge extends Component {
   };
 
   //判断2分支是否可以合并
+
   ischeckmerge = () => {
     this.setState({ isSpin: true });
     const { projectsId , owner } = this.props.match.params;

src/forge/Merge/merge.js

@@ -5,7 +5,6 @@ import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
 import OrderItem from "./MergeItem";
-import './Index.scss';
 
 import axios from "axios";
 
@@ -38,7 +37,7 @@ class merge extends Component {
       // page: 1,
       search_count: undefined,
       issue_type: undefined,
-      status_type: "1",
+      status_type: undefined,
       //设置选择高亮
       openselect: 1,
       closeselect: undefined,
@@ -48,7 +47,7 @@ class merge extends Component {
       paix: "排序",
       priority_ids: "优先级",
       select_params: {
-        status_type: "1", //开启中和关闭中，默认为开启中的
+        status_type: undefined, //开启中和关闭中，默认为开启中的
         assigned_to_id: undefined, // 指派人
         fixed_version_id: undefined,
         priority_id: undefined,
@@ -155,14 +154,18 @@ class merge extends Component {
 
   renderMenu = (array, name, id) => {
     return (
-      <Menu className="orderCondition">
+      <Menu>
         <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>
           {name}
         </Menu.Item>
-        {array && array.length > 0 && array.map((item, key) => {
+        {array &&
+          array.length > 0 &&
+          array.map((item, key) => {
             return (
-              ((!item.permission) || (item.permission && item.permission !== "Reporter")) &&
-              <Menu.Item key={item.id} onClick={(e) => this.getOption(e, id, item.name)}>
+              <Menu.Item
+                key={item.id}
+                onClick={(e) => this.getOption(e, id, item.name)}
+              >
                 {item.name}
               </Menu.Item>
             );
@@ -203,16 +206,23 @@ class merge extends Component {
       paix: "排序",
       priority_ids: "优先级",
     });
-    this.state.select_params.status_type = type;
-    this.state.select_params.page=1;
-    this.state.select_params.limit=15;
-    
+    this.state.select_params = {
+      status_type: type,
+      search: undefined,
+      page: 1,
+      limit: 15,
+    };
     this.getIssueList();
   };
 
-  checkOperation() {
+  islogin() {
     const { projectsId,owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
+    if (this.props.checkIfLogin() === false) {
+      this.props.showLoginDialog();
+      return;
+    } else {
+      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
+    }
   }
   render() {
     const { projectsId , owner } = this.props.match.params;
@@ -243,6 +253,24 @@ class merge extends Component {
         </Menu.Item>
       </Menu>
     );
+
+    const Paginations = (
+      <React.Fragment>
+        {search_count > limit ? (
+          <div className="mt30 mb50 edu-txt-center">
+            <Pagination
+              simple
+              defaultCurrent={page}
+              total={search_count}
+              pageSize={limit}
+              onChange={this.ChangePage}
+            ></Pagination>
+          </div>
+        ) : (
+          ""
+        )}
+      </React.Fragment>
+    );
     return (
       <div className="main" style={{padding:"0px"}}>
         <div className="topWrapper" style={{borderBottom:"none",padding:"20px"}}>
@@ -254,12 +282,9 @@ class merge extends Component {
               style={{ width: 300 }}
             />
           </div>
-          {
-            data && data.user_admin_or_member &&
-            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
-              +&nbsp;新建合并请求
-            </a>
-          }
+          <a className="topWrapper_btn ml10" onClick={() => this.islogin()}>
+            +&nbsp;新建合并请求
+          </a>
         </div>
         <div className="f-wrap-between screenWrap">
           <div className="df">
@@ -275,7 +300,6 @@ class merge extends Component {
                 className={status_type === "1" ? "active" : ""}
                 onClick={() => this.openorder("1")}
               >
-                <i className="iconfont icon-hebingqingqiu1 font-14 mr3 i_open"></i>
                 <label>开启的</label>
                 <span>{data && data.open_count}</span>
               </li>
@@ -283,7 +307,6 @@ class merge extends Component {
                 className={status_type === "11" ? "active" : ""}
                 onClick={() => this.openorder("11")}
               >
-                <i className="iconfont icon-hebingqingqiu1 font-14 mr3 i_merged"></i>
                 <label>已合并</label>
                 <span>{data && data.merged_issues_size}</span>
               </li>
@@ -291,7 +314,6 @@ class merge extends Component {
                 className={status_type === "2" ? "active" : ""}
                 onClick={() => this.openorder("2")}
               >
-                <i className="iconfont icon-hebingqingqiu1 font-14 mr3 i_closed"></i>
                 <label>已拒绝</label>
                 <span>{data && data.close_count}</span>
               </li>
@@ -396,23 +418,10 @@ 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>
+                {Paginations}
               </div>
             ):""}
-            {search_count > select_params.limit ? (
-              <div className="mt30 mb50 edu-txt-center">
-                <Pagination
-                  simple
-                  current={select_params.page}
-                  total={search_count}
-                  pageSize={select_params.limit}
-                  onChange={this.ChangePage}
-                ></Pagination>
-              </div>
-            ) : (
-              ""
-            )}
             { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} /> :""}
           </Spin>
         </div>

src/forge/Merge/merge_form.js

@@ -264,7 +264,7 @@ class MergeForm extends Component {
                       },
                     ],
                     initialValue: title,
-                  })(<Input placeholder="标题" maxLength={50} />)}
+                  })(<Input placeholder="标题" />)}
                 </Form.Item>
                 <MDEditor
                   placeholder={"请输入合并请求的描述..."}
@@ -346,21 +346,19 @@ class MergeForm extends Component {
                       </Select>
                     )}
                   </Form.Item>
-                  {/* <Form.Item label="其他">
-                    {getFieldDecorator("checkbox-group")(
-                      <Checkbox.Group>
-                        <div>
-                          <Checkbox value="A">必须审查代码</Checkbox>
-                        </div>
-                        <div>
-                          <Checkbox value="B">合并后删除提交分支</Checkbox>
-                        </div>
-                        <div>
-                          <Checkbox value="C">合并后关闭提到的任务</Checkbox>
-                        </div>
-                      </Checkbox.Group>
-                    )}
-                  </Form.Item> */}
+                  <Form.Item name="checkbox-group" label="其他">
+                    <Checkbox.Group>
+                      <div>
+                        <Checkbox value="A">必须审查代码</Checkbox>
+                      </div>
+                      <div>
+                        <Checkbox value="B">合并后删除提交分支</Checkbox>
+                      </div>
+                      <div>
+                        <Checkbox value="C">合并后关闭提到的任务</Checkbox>
+                      </div>
+                    </Checkbox.Group>
+                  </Form.Item>
                 </div>
               </div>
             </div>

src/forge/New/Index.js

@@ -68,30 +68,24 @@ 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){
         let owner = result.data.owners;
-        this.setState({
-          OwnerList: owner,
-        })
         if(OIdentifier){
           owner = owner.filter(item=>item.name === OIdentifier);
           this.props.form.setFieldsValue({
             user_id:OIdentifier
           })
-        }else if(user_id){
-          owner = owner.filter(item=>item.id === user_id);
-          this.props.form.setFieldsValue({
-            user_id:owner && owner[0].name
+          owner && this.setState({
+            owners_id:owner[0].id,
+            owners_name:owner[0].name
           })
         }
-        owner && this.setState({
-          owners_id:owner[0].id,
-          owners_name:owner[0].name
-        })
         this.setOptionsList(owner, 'owners');
+        this.setState({
+          OwnerList: owner,
+        })
       }
     }).catch(error=>{})
   }
@@ -181,12 +175,14 @@ class Index extends Component {
           ignore_id,
           user_id:owners_id
         }).then((result) => {
-          if (result && result.data.id) {
-            this.setState({
-              isSpin: false
-            })
-            this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
-            this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
+          if (result) {
+            if (result.data.id) {
+              this.setState({
+                isSpin: false
+              })
+              this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
+              this.props.history.push(`/projects/${owners_name}/${result.data.identifier}`);
+            }
           }
         }).catch((error) => {
           this.setState({

src/forge/Newfile/Index.js

@@ -73,7 +73,6 @@ class Index extends Component {
               content={undefined}
               readOnly={false}
               editorType="new"
-              descName={filename && `Add ${filename}`}
             ></Meditor>
           </div>
         </div>

src/forge/Newfile/UserSubmitComponent.js

@@ -6,20 +6,6 @@ import "./index.css";
 
 import axios from "axios";
 const TextArea = Input.TextArea;
-
-
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
-function returnbar(str){
-  if(str && str.length>0 && str.indexOf("%2F")>-1){
-    return str.replaceAll('%2F','/');
-  }
-  return str;
-}
 class UserSubmitComponent extends Component {
   constructor(props) {
     super(props);
@@ -30,24 +16,6 @@ class UserSubmitComponent extends Component {
     };
   }
 
-  componentDidMount=()=>{
-    const { descName } = this.props;
-    if(descName){
-      this.props.form.setFieldsValue({
-        desc:descName
-      })
-    }
-  }
-  
-  componentDidUpdate=(preProps)=>{
-    const { descName } = this.props;
-    if(preProps && descName && preProps.descName !== descName ){
-      this.props.form.setFieldsValue({
-        desc:descName
-      })
-    }
-  }
-
   changeSubmittype = (e) => {
     this.setState({
       submitType: e.target.value,
@@ -73,7 +41,7 @@ class UserSubmitComponent extends Component {
         const url = `/${owner}/${projectsId}/create_file.json`;
         axios.post(url, {
           filepath: filename ? filename : path,
-          branch: returnbar(branch),
+          branch: branch,
           new_branch: submitType === "1" ? values.branchname : undefined,
           content,
           message: values.desc,
@@ -86,7 +54,7 @@ class UserSubmitComponent extends Component {
               const { getTopCount } = this.props;
               getTopCount && getTopCount(values.branchname);
             }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${values.branchname}`: (branch ? `/tree/${branch}` : "")}`;
             this.props.history.push(url);
           }
         })
@@ -107,13 +75,12 @@ class UserSubmitComponent extends Component {
     const { projectsId , owner } = this.props.match.params;
     const { submitType } = this.state;
     const url = `/${owner}/${projectsId}/update_file.json`;
-    let b = currentBranch || branch;
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         axios
           .put(url, {
             filepath: detail.path,
-            branch: submitType === "1" ? undefined : returnbar(b),
+            branch: submitType === "1" ? undefined : (currentBranch || branch),
             new_branch: submitType === "1" ? values.branchname : undefined,
             content: content,
             sha: detail.sha,
@@ -122,8 +89,7 @@ class UserSubmitComponent extends Component {
           .then((result) => {
             this.setState({ isSpin: false });
             if (result.data && result.data.status === 1) {
-              let b = currentBranch || branch;
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
+              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${values.branchname}` : ((currentBranch || branch) ? `/tree/${currentBranch || branch}`:""))}`;
               this.props.history.push(url);
               this.props.showNotification("文件修改成功!");
             }
@@ -146,7 +112,6 @@ class UserSubmitComponent extends Component {
 
     const { current_user, filepath, projectDetail , currentBranch } = this.props;
     const { editor_type } = this.props;
-    let b = currentBranch || branch;
     return (
       <div>
         <span className="df" style={{ alignItems: "center" }}>
@@ -205,7 +170,7 @@ class UserSubmitComponent extends Component {
                 >
                   <Radio value="0" className="mb10">
                     <i className="iconfont icon-banbenku font-16 mr5"></i>
-                    直接提交至<span className="color-orange">{returnbar(b)}</span>分支
+                    直接提交至<span className="color-orange">{currentBranch || branch}</span>分支
                   </Radio>
                   <Radio value="1">
                     <Icon type="pull-request" className="mr5" />

src/forge/Newfile/m_editor.js

@@ -27,7 +27,7 @@ class m_editor extends Component {
 
   render() {
     const { editorValue } = this.state;
-    const { readOnly, editorType, language , currentBranch , descName } = this.props;
+    const { readOnly, editorType, language , currentBranch } = this.props;
     const editor_options = {
       lineNumbers: "on",
       wordWrap: true, //强制换行
@@ -64,7 +64,7 @@ class m_editor extends Component {
             />
           </div>
             {!readOnly && (
-              <div style={{marginTop:"20px",padding:"20px"}}>
+              <div style={{marginTop:"20px"}}>
                 <UserSubmitComponent
                   {...this.props}
                   {...this.state}
@@ -72,7 +72,6 @@ class m_editor extends Component {
                   content={editorValue}
                   editor_type={editorType}
                   currentBranch={currentBranch}
-                  descName={descName}
                 ></UserSubmitComponent>
                 </div>
             )}

src/forge/Newfile/upload_file.js

@@ -60,7 +60,6 @@ class UploadFile extends Component {
               filepath={file_path}
               content={editorValue}
               editor_type={"upload"}
-              descName={`ADD file via upload`}
             ></UserSubmitComponent>
           </div>
         </div>

src/forge/Notice/Apply.jsx

@@ -1,114 +0,0 @@
-import React, { useEffect , useState } from 'react';
-import Axios from 'axios';
-import { Pagination , Spin , Popconfirm }from 'antd';
-import { Link } from 'react-router-dom';
-import { getImageUrl } from 'educoder';
-import Nodata from '../Nodata';
-import { FlexAJ } from '../Component/layout';
-
-const limit = 15;
-function Apply(props) {
-  const username = props.match.params.username;
-  const [ list , setList ] = useState(undefined);
-  const [ page , setPage ] = useState(1);
-  const [ total , setTotal ] = useState(0);
-  const [ isSpin , setIsSpin ] = useState(true);
-
-  useEffect(()=>{
-    if(username){
-      setIsSpin(true);
-      getList();
-    }
-  },[username])
-
-  function getList() {
-    const url =  `/users/${username}/applied_projects.json`;
-    Axios.get(url).then(result=>{
-      if(result){
-        setList(result.data.applied_projects);
-        setTotal(result.data.total_count);
-        setIsSpin(false);
-      }
-    }).catch(error=>{})
-  }
-
-  // 接受
-  function acceptDivert(id){
-    const url =  `/users/${username}/applied_projects/${id}/accept.json`;
-    Axios.post(url).then(result=>{
-      if(result && result.data){
-        getList();
-        props && props.deleteEvent("apply",1);
-      }
-    }).catch(error=>{})
-  }
-
-  // 拒绝
-  function revertDivert(id){
-    const url =  `/users/${username}/applied_projects/${id}/refuse.json`;
-    Axios.post(url).then(result=>{
-      if(result && result.data){
-        getList();
-        props && props.deleteEvent("apply",1);
-      }
-    }).catch(error=>{})
-  }
-  return(
-    <div>
-      <Spin spinning={isSpin}>
-        <div style={{minHeight:"400px"}}>
-          {
-            list && list.length > 0 ? 
-            <ul className="notifyList">
-              {
-                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>
-                      <div className="notifyFlex">
-                        <p className="notifyInfos">
-                          <Link to={`/users/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
-                          <span className="color-grey-9">{i.time_ago}</span>
-                        </p>
-                        <FlexAJ>
-                          <p>申请以【{i.role === "developer" ?"开发者":i.role === "manager" ? "管理者":"报告者"}】身份加入【{i.project && i.project.name}】项目。是否同意？</p>
-                          {
-                            i.status === "common" &&
-                            <span>
-                              <Popconfirm title={`确定同意${i.user && i.user.name}加入【${i.project && i.project.name}】项目？`} okText="确定" cancelText="取消" onConfirm={()=>acceptDivert(i.id)}>
-                                <a className="color-blue">同意</a>
-                              </Popconfirm>
-                              <Popconfirm title={`确定拒绝${i.user && i.user.name}加入【${i.project && i.project.name}】项目？`} okText="确定" cancelText="取消" onConfirm={()=>revertDivert(i.id)}>
-                                <a className="color-red ml20">拒绝</a>
-                              </Popconfirm>
-                            </span>
-                          }
-                          {
-                            i.status === "accepted" && <span className="color-grey-9">已接受</span>
-                          }
-                          {
-                            i.status === "refused" && <span className="color-grey-9">已拒绝</span>
-                          }
-                        </FlexAJ>
-                      </div>
-                    </li>
-                  )
-                })
-              }
-            </ul>
-            :
-            ""
-          }
-          {list && list.length === 0 && <Nodata _html="暂无成员申请" />}
-          {
-            total > limit && 
-            <div className="edu-txt-center pt20 pb20">
-              <Pagination simple pageSize={limit} total={total} current={page} onChange={(p)=>{setPage(p)}}/>
-            </div>
-          }
-        </div>
-      </Spin>
-    </div>
-  )
-}
-export default Apply;

src/forge/Notice/Index.jsx

@@ -6,10 +6,6 @@ import Loadable from "react-loadable";
 import Loading from "../../Loading";
 import { Route, Switch } from "react-router-dom";
 
-const Apply = Loadable({
-  loader: () => import("./Apply"),
-  loading: Loading,
-});
 const Notify = Loadable({
   loader: () => import("./Notify"),
   loading: Loading,
@@ -22,62 +18,38 @@ 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);
-  const [ transferCount , setTransferCount ] = useState(0);
-  const [ applyCount , setApplyCount ] = useState(0);
-
-  const [ flag , setFlag ] = useState(true);
-  const { current_user } = props;
-
-  useEffect(()=>{
-    if((username && current_user && (current_user.login !== username))){
-      props.history.push(`/users/${username}`);
-    }
-  },[current_user,username])
+  const [ messages , setMessages ] = useState(0);
+  const [ transferProjects , setTransferProjects ] = useState(0);
 
   useEffect(()=>{
     if(user){
-      setTransferCount(user.undo_transfer_projects);
-      setApplyCount(user.undo_join_projects);
-      setMessagesCount(user.undo_messages);
+      setTransferProjects(user.undo_transfer_projects);
     }
-  },[user])
+    if(undo_messages){
+      setMessages(undo_messages);
+    }
+  },[user,undo_messages])
 
   useEffect(()=>{
     if(pathname && username){
       if(pathname === `/users/${username}/notice`){
         setMenu("notify");
-        changeNum(user.undo_messages);
       }
       if(pathname === `/users/${username}/notice/undo`){
         setMenu("undo");
       }
-      if(pathname === `/users/${username}/notice/apply`){
-        setMenu("apply");
-      }
     }
-  },[pathname,user])
+  },[pathname])
 
-  function changeNum(){
-    if(flag){
-      messagesCount && props.deleteUndoEvent(messagesCount);
-      setFlag(false);
-    }
+  function fetchUser(){
+    props && props.fetchUser();
   }
 
-  function deleteEvent(type,count) {
-    let c = count;
-    if(type==="apply"){
-      setTransferCount(transferCount-count);
-    }else if(type==="undo"){
-      setApplyCount(applyCount-count);
-    }else{
-      setMessagesCount(0);
-      c = messagesCount;
-    }
-    (c || c===0) && props.deleteUndoEvent(c);
+  function changeNum(){
+    fetchUser();
   }
 
   return (
@@ -86,39 +58,27 @@ function Index(props){
         <li className={menu === "notify" ? "active":""}>
           <Link to={`/users/${username}/notice`} onClick={changeNum}>
             <span>通知</span>
-            {messagesCount ? <span className="unNum">{messagesCount}</span>:""}
+            {messages ? <span className="unNum">{messages}</span>:""}
           </Link>
         </li>
         <li className={menu === "undo" ? "active":""}>
           <Link to={`/users/${username}/notice/undo`}>
             <span>接收仓库</span>
-            {transferCount ? <span className="unNum">{transferCount}</span>:""}
-          </Link>
-        </li>
-        <li className={menu === "apply" ? "active":""}>
-          <Link to={`/users/${username}/notice/apply`}>
-            <span>成员申请</span>
-            {applyCount ? <span className="unNum">{applyCount}</span>:""}
+            {transferProjects ? <span className="unNum">{transferProjects}</span>:""}
           </Link>
         </li>
       </ul>
       <Switch>
-        <Route
-          path="/users/:username/notice/apply"
-          render={(p) => {
-            return <Apply {...props} {...p} deleteEvent={deleteEvent}/>;
-          }}
-        ></Route>
         <Route
           path="/users/:username/notice/undo"
           render={(p) => {
-            return <UndoEvent {...props} {...p} deleteEvent={deleteEvent}/>;
+            return <UndoEvent {...props} {...p} fetchUser={fetchUser}/>;
           }}
         ></Route>
         <Route
           path="/users/:username/notice"
           render={(p) => {
-            return <Notify {...props} {...p} deleteEvent={deleteEvent}/>;
+            return <Notify {...props} {...p} fetchUser={fetchUser}/>;
           }}
         ></Route>
       </Switch>

src/forge/Notice/Index.scss

@@ -26,7 +26,7 @@
       min-width: 23px;
       text-align: center;
       background-color: #ffe4b3;
-      margin-top: 27px;
+      margin-top: 19px;
       margin-left: 10px;
       display: block;
     }

src/forge/Notice/Notify.jsx

@@ -13,10 +13,6 @@ function Notify(props){
   const [ total , setTotal ] = useState(0);
   const [ isSpin , setIsSpin ] = useState(true);
 
-  useEffect(()=>{
-    props && props.deleteEvent("notify",0);
-  },[])
-
   useEffect(()=>{
     if(username){
       setIsSpin(true);
@@ -47,7 +43,7 @@ function Notify(props){
           return <p>取消转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
         case 'common':
           return <p>正在将【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
-        case 'successed':
+          case 'successed':
           return <p>【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
         default:
           return <p>拒绝转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
@@ -57,20 +53,6 @@ function Notify(props){
     }
   }
 
-  function renderApplyStatus(status,applied) {
-    let { project } = applied;
-    if(status){
-      switch(status){
-        case 'successed':
-          return <p>已通过你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
-        default:
-          return <p>已拒绝你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
-      }
-    }else{
-      return ""
-    }
-  }
-
   return(
     <div>
       <Spin spinning={isSpin}>
@@ -88,7 +70,7 @@ function Notify(props){
                           <Link to={`/users/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
                           <span className="color-grey-9">{i.time_ago}</span>
                         </p>
-                        { i.applied_type === "AppliedProject" ? renderApplyStatus(i.status,i.applied):renderStatus(i.status,i.applied)}
+                        {renderStatus(i.status,i.applied)}
                       </div>
                     </li>
                   )

src/forge/Notice/UndoEvent.jsx

@@ -42,7 +42,7 @@ function UndoEvent(props){
     Axios.post(url).then(result=>{
       if(result && result.data){
         getList();
-        props && props.deleteEvent("undo",1);
+        props && props.fetchUser();
       }
     }).catch(error=>{})
   }
@@ -53,7 +53,7 @@ function UndoEvent(props){
     Axios.post(url).then(result=>{
       if(result && result.data){
         getList();
-        props && props.deleteEvent("apply",1);
+        props && props.fetchUser();
       }
     }).catch(error=>{})
   }

src/forge/Order/Detail.js

@@ -249,7 +249,7 @@ class Detail extends Component {
                       添加于 {data && data.created_at}
                     </span>
                     {data && data.user_permission ? (
-                      <span className="pull-right 123123">
+                      <span className="pull-right">
                         <a className="color-blue fr" onClick={this.copydetail}>
                           复制
                         </a>

src/forge/Order/Milepost.js

@@ -89,9 +89,8 @@ class Milepost extends Component {
           closeselect: status === "closed" ? current_user.user_id : undefined,
           openselect: status === "closed" ? undefined : current_user.user_id
         })
-        this.getList(1, status, 'desc');
-        const { getDetail } = this.props;
-        getDetail && getDetail();
+
+        this.getList(1, status, 'desc')
       }
     }).catch(error => {
       console.log(error);
@@ -108,9 +107,7 @@ class Milepost extends Component {
       }
     }).then((result) => {
       if (result) {
-        this.getList(1, this.state.status, 'desc');
-        const { getDetail } = this.props;
-        getDetail && getDetail();
+        this.getList(1, this.state.status, 'desc')
       }
     }).catch((error) => {
       console.log(error);
@@ -153,11 +150,11 @@ class Milepost extends Component {
     const { data, limit, page, openselect, closeselect, spinings } = this.state;
     const { projectsId , owner } = this.props.match.params;
     const menu = (
-      <Menu className="orderCondition" onClick={this.arrayList}>
-        <Menu.Item key={'effective_date'} value="desc">到期日从后到先</Menu.Item>
-        <Menu.Item key={'effective_date'} value="asc">到期日从先到后</Menu.Item>
-        <Menu.Item key={'percent'} value="asc">完成度从低到高</Menu.Item>
-        <Menu.Item key={'percent'} value="desc">完成度从高到低</Menu.Item>
+      <Menu onClick={this.arrayList}>
+        <Menu.Item key={'created_on'} value="desc">到期日从近到远</Menu.Item>
+        <Menu.Item key={'created_on'} value="asc">到期日从远到近</Menu.Item>
+        <Menu.Item key={'percent'} value="desc">完成度从低到高</Menu.Item>
+        <Menu.Item key={'percent'} value="asc">完成度从高到低</Menu.Item>
         <Menu.Item key={'issues_count'} value="desc">任务从多到少</Menu.Item>
         <Menu.Item key={'issues_count'} value="asc">任务从少到多</Menu.Item>
       </Menu>
@@ -231,8 +228,8 @@ class Milepost extends Component {
                                 <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
                               </div>
                               <div className="grid-item ml15 color-grey-9">
-                                <i className={item.status === "closed" ? "iconfont icon-gouxuan font-14 mr5":"iconfont icon-yiguanbi1 font-14 mr5"}></i>
-                                <a onClick={() => this.updatestatusemile(item.status === "closed" ? "open" : "closed", item)} className="color-grey-9">{this.state.status === "closed" ? "开启" : "关闭"}</a>
+                                <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
+                                <a onClick={() => this.updatestatusemile(this.state.status === "closed" ? "open" : "closed", item)} className="color-grey-9">{this.state.status === "closed" ? "开启" : "关闭"}</a>
                               </div>
                               <div className="grid-item ml15 color-grey-9">
                                 <i className="iconfont icon-lajitong font-14 mr5" ></i>

src/forge/Order/MilepostDetail.js

@@ -69,27 +69,6 @@ class MilepostDetail extends Component {
     })
   }
 
-  deletedetail = (id) => {
-    const { projectsId , owner } = this.props.match.params;
-    const url = `/${owner}/${projectsId}/issues/${id}.json`;
-    axios.delete(url, {
-      data: {
-        project_id: projectsId,
-        id: id,
-      },
-    })
-    .then((result) => {
-      if (result) {
-        const { page } = this.state;
-        this.getIssueList(page);
-        const { getDetail } = this.props;
-        getDetail && getDetail();
-      }
-    })
-    .catch((error) => {
-      console.log(error);
-    });
-  };
   // 获取列表数据
   getIssueList = ( page , item , value , update , updateValue , type ) => {
     const { projectsId, meilid , owner } = this.props.match.params;
@@ -162,7 +141,7 @@ class MilepostDetail extends Component {
 
   renderMenu = (array, name, id) => {
     return (
-      <Menu className="orderCondition">
+      <Menu>
         <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>{name}</Menu.Item>
         {
           array && array.length > 0 && array.map((item, key) => {
@@ -296,15 +275,7 @@ class MilepostDetail extends Component {
                 :
                 issues && issues.length>0 && issues.map((item,key)=>{
                   return(
-                    <OrderItem 
-                      key={key} mile 
-                      item={item} 
-                      search_count={search_count} 
-                      page={page} 
-                      limit={limit} 
-                      {...this.props} {...this.state}
-                      deletedetail={this.deletedetail}
-                      ></OrderItem>
+                    <OrderItem key={key} mile item={item} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
                   )
                 })
             }

src/forge/Order/OrderItem.js

@@ -42,9 +42,10 @@ class OrderItem extends Component {
     })
   }
   render() {
-    const { item , checkbox , mile , user_admin_or_member } = this.props;
+    const { item , checkbox , mile } = this.props;
     const { projectsId , owner } = this.props.match.params;
-    const { current_user } = this.props;
+    const { current_user } = this.props
+
     return (
       item &&
       <div className="issueItem">
@@ -90,13 +91,13 @@ class OrderItem extends Component {
             <div className="milepostleft">
               <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
               {
-                user_admin_or_member ?
-                <div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
+                current_user && current_user.login ?
+                <div style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
                   <div className="mr8 ml8 color-grey-9">
                     <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
                   </div>
                   <div className="color-grey-9">
-                    <Popconfirm placement="bottom" overlayClassName="overlayBox" getPopupContainer={()=>document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
+                    <Popconfirm placement="bottom" title={'您确定要删除吗'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
                       <i className="iconfont icon-yiguanbi1 font-14"></i>
                     </Popconfirm>
                   </div>

src/forge/Order/UpdateMilepost.js

@@ -180,8 +180,8 @@ class UpdateMilepost extends Component {
                         <Row type="flex" justify="space-between">
                           <Col>
                             <Group size="small" onChange={e => onTypeChange(e.target.value)} value={type}>
-                              <Button value="month">日期</Button>
-                              <Button value="year">月份</Button>
+                              <Button value="month">月份</Button>
+                              <Button value="year">年份</Button>
                             </Group>
                           </Col>
                           <Col>

src/forge/Order/newMilepost.js

@@ -64,8 +64,6 @@ class NewMilepost extends Component {
           if (result) {
             this.setState({ isSpin: false })
             this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
-            const { getDetail } = this.props;
-            getDetail && getDetail();
           }
         }).catch(error => {
           this.setState({ isSpin: false })
@@ -102,7 +100,7 @@ class NewMilepost extends Component {
                       required: true, message: '请输入标题'
                     }],
                   })(
-                    <Input placeholder="标题" autoComplete="off" maxLength="30" />
+                    <Input placeholder="标题" autoComplete="off"/>
                   )}
                 </Form.Item>
               </div>
@@ -113,7 +111,7 @@ class NewMilepost extends Component {
                     required: true, message: '请输入描述内容'
                   }],
                 })(
-                  <TextArea placeholder="请输入描述内容..." style={{ height: "150px" }} maxLength={500} />
+                  <TextArea placeholder="请输入描述内容..." style={{ height: "150px" }} />
 
                 )}
               </Form.Item>

src/forge/Order/order.css

@@ -17,9 +17,7 @@
   line-height: 18px;
   color: red;
 }
-.overlayBox{
-  width: 230px;
-}
+
 .topmilepost {
   box-sizing: border-box;
   display: flex;
@@ -592,7 +590,7 @@ a.issue-type-button.active:hover {
 }
 
 /* 发布人、指派人数量过多时要出现滚动条 */
-.ant-dropdown-menu.orderCondition {
+.ant-dropdown-menu {
   max-height: 350px;
   overflow-y: auto;
 }

src/forge/Order/order.js

@@ -201,7 +201,7 @@ class order extends Component {
 
   renderMenu = (array, name, id, toGet) => {
     return (
-      <Menu className="orderCondition">
+      <Menu>
         <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name, toGet)}>
           {name}
         </Menu.Item>
@@ -268,8 +268,11 @@ class order extends Component {
       checkedValue:[],
       all:undefined
     });
-    this.state.select_params.page = 1;
-    this.state.select_params.limit = 15;
+    this.state.select_params = {
+      search: undefined,
+      page: 1,
+      limit: 15,
+    };
     this.getIssueList(type);
   };
 
@@ -334,8 +337,6 @@ class order extends Component {
         const { status_type } = this.state;
 
         this.getIssueList(status_type);
-        const { getDetail } = this.props;
-        getDetail && getDetail();
       }
     })
     .catch((error) => {
@@ -347,14 +348,17 @@ class order extends Component {
     this.props.showLoginDialog();
   }
   renderNew =()=>{
-    const { data } = this.state;
-    if(data && data.user_admin_or_member){
-      const { projectsId , owner } = this.props.match.params;
+    const { projectsId , owner } = this.props.match.params;
+    if (this.props.checkIfLogin()) {
       return(
         <Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
           +&nbsp;创建易修
         </Link>
       )
+    }else{
+      return(
+        <a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建易修</a>
+      )
     }
   }
 
@@ -434,8 +438,6 @@ class order extends Component {
       status_id: select_params.update_status_id
     }).then(result => {
       if (result) {
-        const { getDetail } = this.props;
-        (select_params && select_params.update_status_id) && getDetail && getDetail();
         this.props.showNotification("修改成功！");
         this.successFunc();
       }
@@ -449,6 +451,7 @@ class order extends Component {
     const { status_type } = this.state;
     this.getIssueList(status_type);
   }
+
   resetSelectParams = () => {
     let select_params = this.state.select_params;
     select_params.update_author_id = undefined;
@@ -479,8 +482,6 @@ class order extends Component {
           ids: checkedValue
         }).then(result => {
           if (result) {
-            const { getDetail } = this.props;
-            getDetail && getDetail();
             this.props.showNotification("删除成功！");
             this.successFunc();
           }
@@ -552,7 +553,7 @@ class order extends Component {
         <div className="topWrapper" style={{borderBottom:"none"}}>
           <div className="target-detail-search">
             <Search
-              placeholder="输入关键字搜索易修"
+              placeholder="输入issue名称进行搜索"
               enterButton
               onSearch={this.searchFunc}
               style={{ width: 300 }}
@@ -573,7 +574,7 @@ class order extends Component {
           <div className="f-wrap-between screenWrap">
             <div className="df">
               {
-                ((current_user && current_user.login) && (data && data.user_admin_or_member)) ?
+                current_user && current_user.login ?
                   <Checkbox value="0" style={{ lineHeight: "50px", marginRight: "15px" }} checked={all} onChange={this.changeAll}></Checkbox>
                   : ""
               }
@@ -818,14 +819,13 @@ class order extends Component {
                       <OrderItem
                         key={key}
                         item={item}
-                        checkbox={current_user &&(data && data.user_admin_or_member) ? <Checkbox value={item.id} key={item.id} style={{ margin: '4px 15px 0px 0px' }}></Checkbox> : ""}
+                        checkbox={current_user ? <Checkbox value={item.id} key={item.id} style={{ margin: '4px 15px 0px 0px' }}></Checkbox> : ""}
                         search_count={search_count}
                         page={select_params.page}
                         limit={select_params.limit}
                         {...this.props}
                         {...this.state}
                         deletedetail={this.deletedetail}
-                        user_admin_or_member={data && data.user_admin_or_member}
                       ></OrderItem>
                     )
                   })}

src/forge/Order/order_form.js

@@ -92,10 +92,10 @@ class order_form extends Component {
 
     const url = `/${owner}/${projectsId}/issues/new.json`;
     axios.get(url).then((result) => {
-      if (result && result.data) {
+      if (result) {
         this.setState({
           issue_chosen: result.data.issue_chosen,
-          branches: result.data.issue_chosen.branches,
+          branches: result.data.branches,
           isSpin:false
         });
 
@@ -193,14 +193,13 @@ class order_form extends Component {
             if (result) {
               this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`);
               this.props.showNotification("任务更新成功！");
-              const { getDetail } = this.props;
-              getDetail && getDetail();
             }
           })
           .catch((error) => {
             this.setState({
               isSpin: false,
             });
+            console.log(error);
           });
         }
       }