本地版头部menu更新

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

package-lock.json

@@ -1,40 +1,35 @@
 {
-  "name": "forge",
-  "version": "3.0.0",
+  "name": "educoder",
+  "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@ant-design/colors": {
       "version": "3.2.2",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz?cache=0&sync_timestamp=1612935637470&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-3.2.2.tgz",
-      "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=",
+      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
+      "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
       "requires": {
         "tinycolor2": "^1.4.1"
       }
     },
     "@ant-design/create-react-context": {
       "version": "0.2.5",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/create-react-context/download/@ant-design/create-react-context-0.2.5.tgz",
-      "integrity": "sha1-9fWpFjtHcgl3EoNzl60w4i55+Fg=",
+      "resolved": "https://registry.npmjs.org/@ant-design/create-react-context/-/create-react-context-0.2.5.tgz",
+      "integrity": "sha512-1rMAa4qgP2lfl/QBH9i78+Gjxtj9FTMpMyDGZsEBW5Kih72EuUo9958mV8PgpRkh4uwPSQ7vVZWXeyNZXVAFDg==",
       "requires": {
         "gud": "^1.0.0",
         "warning": "^4.0.3"
       }
     },
-    "@ant-design/css-animation": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/css-animation/download/@ant-design/css-animation-1.7.3.tgz?cache=0&sync_timestamp=1596106749762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcss-animation%2Fdownload%2F%40ant-design%2Fcss-animation-1.7.3.tgz",
-      "integrity": "sha1-YKHJcAFOhrKPlAUQ1p5QPkKPETY="
-    },
     "@ant-design/icons": {
       "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz",
-      "integrity": "sha1-e5wI3/1PXUHbZn2dvl4BB9C9mko="
+      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
+      "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
     },
     "@ant-design/icons-react": {
       "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-react/download/@ant-design/icons-react-2.0.1.tgz",
-      "integrity": "sha1-F6JRNXGrMXrKKSfljOol3THlNvs=",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons-react/-/icons-react-2.0.1.tgz",
+      "integrity": "sha512-r1QfoltMuruJZqdiKcbPim3d8LNsVPB733U0gZEUSxBLuqilwsW28K2rCTWSMTjmFX7Mfpf+v/wdiFe/XCqThw==",
       "requires": {
         "@ant-design/colors": "^3.1.0",
         "babel-runtime": "^6.26.0"
@@ -451,8 +446,8 @@
     },
     "@types/react-slick": {
       "version": "0.23.4",
-      "resolved": "https://registry.npm.taobao.org/@types/react-slick/download/@types/react-slick-0.23.4.tgz",
-      "integrity": "sha1-yX4qnn49GTPGhZO46CdS+rHozlM=",
+      "resolved": "https://registry.npmjs.org/@types/react-slick/-/react-slick-0.23.4.tgz",
+      "integrity": "sha512-vXoIy4GUfB7/YgqubR4H7RALo+pRdMYCeLgWwV3MPwl5pggTlEkFBTF19R7u+LJc85uMqC7RfsbkqPLMQ4ab+A==",
       "requires": {
         "@types/react": "*"
       }
@@ -868,9 +863,9 @@
       }
     },
     "antd": {
-      "version": "3.26.20",
-      "resolved": "https://registry.nlark.com/antd/download/antd-3.26.20.tgz",
-      "integrity": "sha1-8/Vw76qllQoUSULyHrKqqgiOlAc=",
+      "version": "3.26.16",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-3.26.16.tgz",
+      "integrity": "sha512-EYRwlEf8FCPCVRk5yDcgjSZOC0exu+m75SwlSQU+Mh17f9wGhLeL2/DV7/Sra1r+BZlfiahFdkgrLY7UgMMBEQ==",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "@ant-design/icons": "~2.1.1",
@@ -930,16 +925,16 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
-          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
+          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
           "requires": {
             "performance-now": "^2.1.0"
           }
         },
         "rc-pagination": {
-          "version": "1.20.15",
-          "resolved": "https://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.20.15.tgz",
-          "integrity": "sha1-zLTNDpvU5H9y8p6kMsA1C/ez2Ac=",
+          "version": "1.20.14",
+          "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.20.14.tgz",
+          "integrity": "sha512-sNKwbFrxiqATqcIIShfrFs8BT03n4UUwTAMYae+JhHTmILQmXdvimEnZbVuWcno6G02DAJcLrFpmkn1h2tmEJw==",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -949,8 +944,8 @@
         },
         "rc-rate": {
           "version": "2.5.1",
-          "resolved": "https://registry.npm.taobao.org/rc-rate/download/rc-rate-2.5.1.tgz?cache=0&sync_timestamp=1605573559401&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-rate%2Fdownload%2Frc-rate-2.5.1.tgz",
-          "integrity": "sha1-Vfxf0j6p3MciULmoiYA0efSEKWE=",
+          "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.5.1.tgz",
+          "integrity": "sha512-3iJkNJT8xlHklPCdeZtUZmJmRVUbr6AHRlfSsztfYTXVlHrv2TcPn3XkHsH+12j812WVB7gvilS2j3+ffjUHXg==",
           "requires": {
             "classnames": "^2.2.5",
             "prop-types": "^15.5.8",
@@ -960,8 +955,8 @@
         },
         "rc-select": {
           "version": "9.2.3",
-          "resolved": "https://registry.nlark.com/rc-select/download/rc-select-9.2.3.tgz?cache=0&sync_timestamp=1618886345948&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-select%2Fdownload%2Frc-select-9.2.3.tgz",
-          "integrity": "sha1-ZDQOLW72TovDz8b0aP/ShiVYmsI=",
+          "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-9.2.3.tgz",
+          "integrity": "sha512-WhswxOMWiNnkXRbxyrj0kiIvyCfo/BaRPaYbsDetSIAU2yEDwKHF798blCP5u86KLOBKBvtxWLFCkSsQw1so5w==",
           "requires": {
             "babel-runtime": "^6.23.0",
             "classnames": "2.x",
@@ -979,8 +974,8 @@
         },
         "rc-tree": {
           "version": "2.1.4",
-          "resolved": "https://registry.npm.taobao.org/rc-tree/download/rc-tree-2.1.4.tgz?cache=0&sync_timestamp=1615350038621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tree%2Fdownload%2Frc-tree-2.1.4.tgz",
-          "integrity": "sha1-73WfPnmaIbQ8Hs+ceU6hwU5wtZs=",
+          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz",
+          "integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==",
           "requires": {
             "@ant-design/create-react-context": "^0.2.4",
             "classnames": "2.x",
@@ -990,18 +985,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"
-          }
         }
       }
     },
@@ -1100,8 +1083,8 @@
     },
     "array-tree-filter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz",
-      "integrity": "sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA="
+      "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
+      "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
     },
     "array-union": {
       "version": "1.0.2",
@@ -2079,6 +2062,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 +2072,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 +2362,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",
@@ -3781,8 +3760,8 @@
     },
     "copy-to-clipboard": {
       "version": "3.3.1",
-      "resolved": "https://registry.npm.taobao.org/copy-to-clipboard/download/copy-to-clipboard-3.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcopy-to-clipboard%2Fdownload%2Fcopy-to-clipboard-3.3.1.tgz",
-      "integrity": "sha1-EVqhqZmP+rYZb5MHatbaO5E2Yq4=",
+      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
+      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
       "requires": {
         "toggle-selection": "^1.0.6"
       }
@@ -3875,23 +3854,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 +3888,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",
@@ -4885,7 +4852,7 @@
     },
     "dom-closest": {
       "version": "0.2.0",
-      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
       "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
       "requires": {
         "dom-matches": ">=1.0.1"
@@ -4929,7 +4896,7 @@
     },
     "dom-matches": {
       "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
       "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
     },
     "dom-scroll-into-view": {
@@ -5051,8 +5018,8 @@
     },
     "draft-js": {
       "version": "0.10.5",
-      "resolved": "https://registry.npm.taobao.org/draft-js/download/draft-js-0.10.5.tgz",
-      "integrity": "sha1-v6m+sBj+BTPbsI1mdcNxprCPp0I=",
+      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
+      "integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
       "requires": {
         "fbjs": "^0.8.15",
         "immutable": "~3.7.4",
@@ -5187,7 +5154,7 @@
     },
     "enquire.js": {
       "version": "2.1.6",
-      "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
       "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
     },
     "entities": {
@@ -5706,7 +5673,7 @@
     },
     "eventlistener": {
       "version": "0.0.1",
-      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
       "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
     },
     "events": {
@@ -6237,41 +6204,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 +6233,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 +6677,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",
@@ -8040,7 +7930,7 @@
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
@@ -8881,7 +8771,7 @@
     },
     "immutable": {
       "version": "3.7.6",
-      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
       "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
     },
     "import-fresh": {
@@ -9295,9 +9185,9 @@
       }
     },
     "is-mobile": {
-      "version": "2.2.2",
-      "resolved": "https://registry.nlark.com/is-mobile/download/is-mobile-2.2.2.tgz",
-      "integrity": "sha1-9snF1Q7gElTOBec5vdg18e1OmVQ="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.1.tgz",
+      "integrity": "sha512-6zELsfVFr326eq2CI53yvqq6YBanOxKBybwDT+MbMS2laBnK6Ez8m5XHSuTQQbnKRfpDzCod1CMWW5q3wZYMvA=="
     },
     "is-npm": {
       "version": "1.0.0",
@@ -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",
@@ -10486,7 +10364,7 @@
     },
     "lodash.throttle": {
       "version": "4.1.1",
-      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.uniq": {
@@ -11541,8 +11419,8 @@
     },
     "omit.js": {
       "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/omit.js/download/omit.js-1.0.2.tgz",
-      "integrity": "sha1-kaFPDrqEBm36AVvzDkdMR/MLyFg=",
+      "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
+      "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
       "requires": {
         "babel-runtime": "^6.23.0"
       }
@@ -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",
@@ -14351,9 +14223,9 @@
       }
     },
     "rc-calendar": {
-      "version": "9.15.11",
-      "resolved": "https://registry.npm.taobao.org/rc-calendar/download/rc-calendar-9.15.11.tgz",
-      "integrity": "sha1-zh5eqOTXdDW+ZqjHfbEvHw+aNF8=",
+      "version": "9.15.10",
+      "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.10.tgz",
+      "integrity": "sha512-xh1A3rYejKskAvkjnd9BcHXFbBnAYsHMGHBdtoAkbwp43B6yEieNL0g0Tzz8s1gApDZV2j5vF1jJ9IIpPYFNLw==",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "2.x",
@@ -14366,8 +14238,8 @@
     },
     "rc-cascader": {
       "version": "0.17.5",
-      "resolved": "https://registry.npm.taobao.org/rc-cascader/download/rc-cascader-0.17.5.tgz?cache=0&sync_timestamp=1610107054432&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-cascader%2Fdownload%2Frc-cascader-0.17.5.tgz",
-      "integrity": "sha1-T96R0jt2CMQgJjw47unAaH+A99w=",
+      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-0.17.5.tgz",
+      "integrity": "sha512-WYMVcxU0+Lj+xLr4YYH0+yXODumvNXDcVEs5i7L1mtpWwYkubPV/zbQpn+jGKFCIW/hOhjkU4J1db8/P/UKE7A==",
       "requires": {
         "array-tree-filter": "^2.1.0",
         "prop-types": "^15.5.8",
@@ -14380,8 +14252,8 @@
     },
     "rc-checkbox": {
       "version": "2.1.8",
-      "resolved": "https://registry.npm.taobao.org/rc-checkbox/download/rc-checkbox-2.1.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-checkbox%2Fdownload%2Frc-checkbox-2.1.8.tgz",
-      "integrity": "sha1-7t2e+cLzr1s7jlzeUlSqia0aiAo=",
+      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.1.8.tgz",
+      "integrity": "sha512-6qOgh0/by0nVNASx6LZnhRTy17Etcgav+IrI7kL9V9kcDZ/g7K14JFlqrtJ3NjDq/Kyn+BPI1st1XvbkhfaJeg==",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "2.x",
@@ -14391,8 +14263,8 @@
     },
     "rc-collapse": {
       "version": "1.11.8",
-      "resolved": "https://registry.npm.taobao.org/rc-collapse/download/rc-collapse-1.11.8.tgz?cache=0&sync_timestamp=1606217065785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-collapse%2Fdownload%2Frc-collapse-1.11.8.tgz",
-      "integrity": "sha1-ZqQAidRpUZ6UJACasckn4hQEHYA=",
+      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.11.8.tgz",
+      "integrity": "sha512-8EhfPyScTYljkbRuIoHniSwZagD5UPpZ3CToYgoNYWC85L2qCbPYF7+OaC713FOrIkp6NbfNqXsITNxmDAmxog==",
       "requires": {
         "classnames": "2.x",
         "css-animation": "1.x",
@@ -14405,8 +14277,8 @@
     },
     "rc-dialog": {
       "version": "7.6.1",
-      "resolved": "https://registry.npm.taobao.org/rc-dialog/download/rc-dialog-7.6.1.tgz?cache=0&sync_timestamp=1614949683544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-dialog%2Fdownload%2Frc-dialog-7.6.1.tgz",
-      "integrity": "sha1-EVRczAuUWTT6dgeXJuDYU+UtcF8=",
+      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-7.6.1.tgz",
+      "integrity": "sha512-KUKf+2eZ4YL+lnXMG3hR4ZtIhC9glfH27NtTVz3gcoDIPAf3uUvaXVRNoDCiSi+OGKLyIb/b6EoidFh6nQC5Wg==",
       "requires": {
         "babel-runtime": "6.x",
         "rc-animate": "2.x",
@@ -14415,8 +14287,8 @@
     },
     "rc-drawer": {
       "version": "3.1.3",
-      "resolved": "https://registry.npm.taobao.org/rc-drawer/download/rc-drawer-3.1.3.tgz?cache=0&sync_timestamp=1614159639291&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-drawer%2Fdownload%2Frc-drawer-3.1.3.tgz",
-      "integrity": "sha1-y8sE1MB/C2by7OEdhH9KG9gOoLc=",
+      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-3.1.3.tgz",
+      "integrity": "sha512-2z+RdxmzXyZde/1OhVMfDR1e/GBswFeWSZ7FS3Fdd0qhgVdpV1wSzILzzxRaT481ItB5hOV+e8pZT07vdJE8kg==",
       "requires": {
         "classnames": "^2.2.6",
         "rc-util": "^4.16.1",
@@ -14425,8 +14297,8 @@
     },
     "rc-dropdown": {
       "version": "2.4.1",
-      "resolved": "https://registry.npm.taobao.org/rc-dropdown/download/rc-dropdown-2.4.1.tgz?cache=0&sync_timestamp=1600332782526&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-dropdown%2Fdownload%2Frc-dropdown-2.4.1.tgz",
-      "integrity": "sha1-qu9us6UVLN2ZgolcKnjZtfBGzew=",
+      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-2.4.1.tgz",
+      "integrity": "sha512-p0XYn0wrOpAZ2fUGE6YJ6U8JBNc5ASijznZ6dkojdaEfQJAeZtV9KMEewhxkVlxGSbbdXe10ptjBlTEW9vEwEg==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "classnames": "^2.2.6",
@@ -14437,8 +14309,8 @@
     },
     "rc-editor-core": {
       "version": "0.8.10",
-      "resolved": "https://registry.npm.taobao.org/rc-editor-core/download/rc-editor-core-0.8.10.tgz",
-      "integrity": "sha1-byFbxd+cM/+p9sWzDKc6favoq3w=",
+      "resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.10.tgz",
+      "integrity": "sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "classnames": "^2.2.5",
@@ -14451,8 +14323,8 @@
     },
     "rc-editor-mention": {
       "version": "1.1.13",
-      "resolved": "https://registry.npm.taobao.org/rc-editor-mention/download/rc-editor-mention-1.1.13.tgz",
-      "integrity": "sha1-nxyrEGX4awFSOEAyF5DCqxKsXos=",
+      "resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz",
+      "integrity": "sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q==",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "^2.2.5",
@@ -14480,9 +14352,9 @@
       }
     },
     "rc-hammerjs": {
-      "version": "0.6.10",
-      "resolved": "https://registry.npm.taobao.org/rc-hammerjs/download/rc-hammerjs-0.6.10.tgz",
-      "integrity": "sha1-GDGjvY8hmXAL/MWtayCjVjCuteA=",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/rc-hammerjs/-/rc-hammerjs-0.6.9.tgz",
+      "integrity": "sha512-4llgWO3RgLyVbEqUdGsDfzUDqklRlQW5VEhE3x35IvhV+w//VPRG34SBavK3D2mD/UaLKaohgU41V4agiftC8g==",
       "requires": {
         "babel-runtime": "6.x",
         "hammerjs": "^2.0.8",
@@ -14490,9 +14362,9 @@
       }
     },
     "rc-input-number": {
-      "version": "4.5.9",
-      "resolved": "https://registry.nlark.com/rc-input-number/download/rc-input-number-4.5.9.tgz?cache=0&sync_timestamp=1619578110950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-input-number%2Fdownload%2Frc-input-number-4.5.9.tgz",
-      "integrity": "sha1-HL9zXiT+I8TrmkMBAxcguV8qPj0=",
+      "version": "4.5.6",
+      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-4.5.6.tgz",
+      "integrity": "sha512-AXbL4gtQ1mSQnu6v/JtMv3UbGRCzLvQznmf0a7U/SAtZ8+dCEAqD4JpJhkjv73Wog53eRYhw4l7ApdXflc9ymg==",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.0",
@@ -14503,8 +14375,8 @@
     },
     "rc-mentions": {
       "version": "0.4.2",
-      "resolved": "https://registry.npm.taobao.org/rc-mentions/download/rc-mentions-0.4.2.tgz?cache=0&sync_timestamp=1610510822768&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-mentions%2Fdownload%2Frc-mentions-0.4.2.tgz",
-      "integrity": "sha1-wYq3Ae+55LdbOFGgwNLdaYZA4kY=",
+      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-0.4.2.tgz",
+      "integrity": "sha512-DTZurQzacLXOfVuiHydGzqkq7cFMHXF18l2jZ9PhWUn2cqvOSY3W4osN0Pq29AOMOBpcxdZCzgc7Lb0r/bgkDw==",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "classnames": "^2.2.6",
@@ -14532,8 +14404,8 @@
     },
     "rc-notification": {
       "version": "3.3.1",
-      "resolved": "https://registry.npm.taobao.org/rc-notification/download/rc-notification-3.3.1.tgz?cache=0&sync_timestamp=1614675471156&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-notification%2Fdownload%2Frc-notification-3.3.1.tgz",
-      "integrity": "sha1-C6o+cPjUCrAVzo+njCYMSQ/HvrQ=",
+      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-3.3.1.tgz",
+      "integrity": "sha512-U5+f4BmBVfMSf3OHSLyRagsJ74yKwlrQAtbbL5ijoA0F2C60BufwnOcHG18tVprd7iaIjzZt1TKMmQSYSvgrig==",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "2.x",
@@ -14554,9 +14426,9 @@
       }
     },
     "rc-progress": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npm.taobao.org/rc-progress/download/rc-progress-2.5.3.tgz",
-      "integrity": "sha1-APAblb2+GFbTpfgiQgUZAui3qOc=",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.5.2.tgz",
+      "integrity": "sha512-ajI+MJkbBz9zYDuE9GQsY5gsyqPF7HFioZEDZ9Fmc+ebNZoiSeSJsTJImPFCg0dW/5WiRGUy2F69SX1aPtSJgA==",
       "requires": {
         "babel-runtime": "6.x",
         "prop-types": "^15.5.8"
@@ -14573,8 +14445,8 @@
     },
     "rc-resize-observer": {
       "version": "0.1.3",
-      "resolved": "https://registry.npm.taobao.org/rc-resize-observer/download/rc-resize-observer-0.1.3.tgz?cache=0&sync_timestamp=1608864858155&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-resize-observer%2Fdownload%2Frc-resize-observer-0.1.3.tgz",
-      "integrity": "sha1-CXGR+cOrGG7ZB7VTum71Zd8Rwkk=",
+      "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-0.1.3.tgz",
+      "integrity": "sha512-uzOQEwx83xdQSFOkOAM7x7GHIQKYnrDV4dWxtCxyG1BS1pkfJ4EvDeMfsvAJHSYkQXVBu+sgRHGbRtLG3qiuUg==",
       "requires": {
         "classnames": "^2.2.1",
         "rc-util": "^4.13.0",
@@ -14602,8 +14474,8 @@
     },
     "rc-slider": {
       "version": "8.7.1",
-      "resolved": "https://registry.npm.taobao.org/rc-slider/download/rc-slider-8.7.1.tgz?cache=0&sync_timestamp=1616675519253&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-slider%2Fdownload%2Frc-slider-8.7.1.tgz",
-      "integrity": "sha1-ntBzYtyTSJo45lSyG4EirXD9PEI=",
+      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-8.7.1.tgz",
+      "integrity": "sha512-WMT5mRFUEcrLWwTxsyS8jYmlaMsTVCZIGENLikHsNv+tE8ThU2lCoPfi/xFNUfJFNFSBFP3MwPez9ZsJmNp13g==",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.5",
@@ -14617,8 +14489,8 @@
     },
     "rc-steps": {
       "version": "3.5.0",
-      "resolved": "https://registry.npm.taobao.org/rc-steps/download/rc-steps-3.5.0.tgz",
-      "integrity": "sha1-NrKn8fSZB7DZA2OISxhiPK+ftgA=",
+      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-3.5.0.tgz",
+      "integrity": "sha512-2Vkkrpa7PZbg7qPsqTNzVDov4u78cmxofjjnIHiGB9+9rqKS8oTLPzbW2uiWDr3Lk+yGwh8rbpGO1E6VAgBCOg==",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "^2.2.3",
@@ -14627,9 +14499,9 @@
       }
     },
     "rc-switch": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npm.taobao.org/rc-switch/download/rc-switch-1.9.2.tgz?cache=0&sync_timestamp=1603791200779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-switch%2Fdownload%2Frc-switch-1.9.2.tgz",
-      "integrity": "sha1-eSHHZkEf6aZCZRDDQpAi1rpN/eI=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-1.9.0.tgz",
+      "integrity": "sha512-Isas+egaK6qSk64jaEw4GgPStY4umYDbT7ZY93bZF1Af+b/JEsKsJdNOU2qG3WI0Z6tXo2DDq0kJCv8Yhu0zww==",
       "requires": {
         "classnames": "^2.2.1",
         "prop-types": "^15.5.6",
@@ -14638,8 +14510,8 @@
     },
     "rc-table": {
       "version": "6.10.15",
-      "resolved": "https://registry.nlark.com/rc-table/download/rc-table-6.10.15.tgz",
-      "integrity": "sha1-GB9McMT9dPZX7o8jGW5+sIoDZco=",
+      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-6.10.15.tgz",
+      "integrity": "sha512-LAr0M/gqt+irOjvPNBLApmQ0CUHNOfKsEBhu1uIuB3OlN1ynA9z+sdoTQyNd9+8NSl0MYnQOOfhtLChAY7nU0A==",
       "requires": {
         "classnames": "^2.2.5",
         "component-classes": "^1.2.6",
@@ -14653,8 +14525,8 @@
     },
     "rc-tabs": {
       "version": "9.7.0",
-      "resolved": "https://registry.npm.taobao.org/rc-tabs/download/rc-tabs-9.7.0.tgz?cache=0&sync_timestamp=1608866453009&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tabs%2Fdownload%2Frc-tabs-9.7.0.tgz",
-      "integrity": "sha1-rglpW+9ZY9bmTnvBBSHHbf3YRIs=",
+      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.7.0.tgz",
+      "integrity": "sha512-kvmgp8/MfLzFZ06hWHignqomFQ5nF7BqKr5O1FfhE4VKsGrep52YSF/1MvS5oe0NPcI9XGNS2p751C5v6cYDpQ==",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "babel-runtime": "6.x",
@@ -14671,8 +14543,8 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
-          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
+          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
           "requires": {
             "performance-now": "^2.1.0"
           }
@@ -14681,8 +14553,8 @@
     },
     "rc-time-picker": {
       "version": "3.7.3",
-      "resolved": "https://registry.npm.taobao.org/rc-time-picker/download/rc-time-picker-3.7.3.tgz?cache=0&sync_timestamp=1576572941972&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-time-picker%2Fdownload%2Frc-time-picker-3.7.3.tgz",
-      "integrity": "sha1-ZajekECTJQrpyCsCpJBeD5leI+I=",
+      "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.7.3.tgz",
+      "integrity": "sha512-Lv1Mvzp9fRXhXEnRLO4nW6GLNxUkfAZ3RsiIBsWjGjXXvMNjdr4BX/ayElHAFK0DoJqOhm7c5tjmIYpEOwcUXg==",
       "requires": {
         "classnames": "2.x",
         "moment": "2.x",
@@ -14694,8 +14566,8 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
-          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
+          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
           "requires": {
             "performance-now": "^2.1.0"
           }
@@ -14704,8 +14576,8 @@
     },
     "rc-tooltip": {
       "version": "3.7.3",
-      "resolved": "https://registry.npm.taobao.org/rc-tooltip/download/rc-tooltip-3.7.3.tgz?cache=0&sync_timestamp=1614588684791&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tooltip%2Fdownload%2Frc-tooltip-3.7.3.tgz",
-      "integrity": "sha1-KArsavyqROjf8EgPuv+eh/wArsw=",
+      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.7.3.tgz",
+      "integrity": "sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==",
       "requires": {
         "babel-runtime": "6.x",
         "prop-types": "^15.5.8",
@@ -14753,8 +14625,8 @@
     },
     "rc-tree-select": {
       "version": "2.9.4",
-      "resolved": "https://registry.nlark.com/rc-tree-select/download/rc-tree-select-2.9.4.tgz",
-      "integrity": "sha1-aqeU4fDmXGbEBqoKKg50/QpVewk=",
+      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.9.4.tgz",
+      "integrity": "sha512-0HQkXAN4XbfBW20CZYh3G+V+VMrjX42XRtDCpyv6PDUm5vikC0Ob682ZBCVS97Ww2a5Hf6Ajmu0ahWEdIEpwhg==",
       "requires": {
         "classnames": "^2.2.1",
         "dom-scroll-into-view": "^1.2.1",
@@ -14771,8 +14643,8 @@
       "dependencies": {
         "rc-tree": {
           "version": "2.1.4",
-          "resolved": "https://registry.npm.taobao.org/rc-tree/download/rc-tree-2.1.4.tgz?cache=0&sync_timestamp=1615350038621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tree%2Fdownload%2Frc-tree-2.1.4.tgz",
-          "integrity": "sha1-73WfPnmaIbQ8Hs+ceU6hwU5wtZs=",
+          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz",
+          "integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==",
           "requires": {
             "@ant-design/create-react-context": "^0.2.4",
             "classnames": "2.x",
@@ -14785,8 +14657,8 @@
         },
         "rc-trigger": {
           "version": "3.0.0",
-          "resolved": "https://registry.nlark.com/rc-trigger/download/rc-trigger-3.0.0.tgz?cache=0&sync_timestamp=1619590696046&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-trigger%2Fdownload%2Frc-trigger-3.0.0.tgz",
-          "integrity": "sha1-9tmx2oomsrLR2RKgaHbBpIb1mA8=",
+          "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-3.0.0.tgz",
+          "integrity": "sha512-hQxbbJpo23E2QnYczfq3Ec5J5tVl2mUDhkqxrEsQAqk16HfADQg+iKNWzEYXyERSncdxfnzYuaBgy764mNRzTA==",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -14798,14 +14670,18 @@
           },
           "dependencies": {
             "rc-animate": {
-              "version": "3.1.1",
-              "resolved": "https://registry.npm.taobao.org/rc-animate/download/rc-animate-3.1.1.tgz?cache=0&sync_timestamp=1601018005635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-animate%2Fdownload%2Frc-animate-3.1.1.tgz",
-              "integrity": "sha1-3v3YY/VoFsIiU05Nxo/t3s0IE4Y=",
+              "version": "3.0.0-rc.6",
+              "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0-rc.6.tgz",
+              "integrity": "sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==",
               "requires": {
-                "@ant-design/css-animation": "^1.7.2",
-                "classnames": "^2.2.6",
+                "babel-runtime": "6.x",
+                "classnames": "^2.2.5",
+                "component-classes": "^1.2.6",
+                "fbjs": "^0.8.16",
+                "prop-types": "15.x",
                 "raf": "^3.4.0",
-                "rc-util": "^4.15.3"
+                "rc-util": "^4.5.0",
+                "react-lifecycles-compat": "^3.0.4"
               }
             }
           }
@@ -14859,18 +14735,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 +15100,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",
@@ -15268,9 +15120,9 @@
       }
     },
     "react-lazy-load": {
-      "version": "3.1.13",
-      "resolved": "https://registry.npm.taobao.org/react-lazy-load/download/react-lazy-load-3.1.13.tgz?cache=0&sync_timestamp=1593654792284&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-lazy-load%2Fdownload%2Freact-lazy-load-3.1.13.tgz",
-      "integrity": "sha1-I2lD92twhMyEWHFtljKhyYU+pc0=",
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.0.13.tgz",
+      "integrity": "sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ=",
       "requires": {
         "eventlistener": "0.0.1",
         "lodash.debounce": "^4.0.0",
@@ -15407,9 +15259,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.npmjs.org/react-slick/-/react-slick-0.25.2.tgz",
+      "integrity": "sha512-8MNH/NFX/R7zF6W/w+FS5VXNyDusF+XDW1OU0SzODEU7wqYB+ZTGAiNJ++zVNAVqCAHdyCybScaUB+FCZOmBBw==",
       "requires": {
         "classnames": "^2.2.5",
         "enquire.js": "^2.1.6",
@@ -15436,34 +15288,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",
@@ -16281,8 +16105,8 @@
     },
     "rmc-feedback": {
       "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/rmc-feedback/download/rmc-feedback-2.0.0.tgz",
-      "integrity": "sha1-y8bLOuY8emNe7w4l5PuvWsNm7qo=",
+      "resolved": "https://registry.npmjs.org/rmc-feedback/-/rmc-feedback-2.0.0.tgz",
+      "integrity": "sha512-5PWOGOW7VXks/l3JzlOU9NIxRpuaSS8d9zA3UULUCuTKnpwBHNvv1jSJzxgbbCQeYzROWUpgKI4za3X4C/mKmQ==",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.5"
@@ -16865,8 +16689,8 @@
     },
     "shallow-equal": {
       "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.2.1.tgz",
-      "integrity": "sha1-TBar+lYEOqINBQMk76aJQLDaedo="
+      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
+      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
     },
     "shallowequal": {
       "version": "1.1.0",
@@ -17220,11 +17044,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 +18378,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 +18887,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 +20490,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",

package.json

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

public/css/edu-common.css

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

public/css/edu-purge.css

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

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1627870211301') format('woff2'),
-       url('iconfont.woff?t=1627870211301') format('woff'),
-       url('iconfont.ttf?t=1627870211301') format('truetype');
+  src: url('iconfont.woff2?t=1625800786751') format('woff2'),
+       url('iconfont.woff?t=1625800786751') format('woff'),
+       url('iconfont.ttf?t=1625800786751') format('truetype');
 }
 
 .iconfont {
@@ -13,198 +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";
 }

public/css/iconfont.json

@@ -5,342 +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",

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

@@ -39,11 +39,6 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
-//forge安全设置
-const Security = Loadable({
-	loader: () => import('./forge/SecuritySetting/Index'),
-	loading: Loading,
-})
 //forge项目-devOps详情
 const OpsDetail = Loadable({
 	loader: () => import('./forge/DevOps/opsDetail'),
@@ -78,13 +73,9 @@ 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"),
+  loader: () => import("./forge/Main/Index"),
   loading: Loading,
 });
 class App extends Component {
@@ -98,7 +89,7 @@ class App extends Component {
 			mygetHelmetapi: null,
 		}
 	}
-
+	
 	HideAddcoursestypess = (i) => {
 		this.setState({
 			Addcoursestype: false,
@@ -117,7 +108,6 @@ class App extends Component {
 		document.title = "loading...";
 		initAxiosInterceptors(this.props);
 		this.getAppdata();
-
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
@@ -193,7 +183,6 @@ class App extends Component {
 
 	render() {
 		const { mygetHelmetapi } = this.state;
-		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
@@ -211,23 +200,7 @@ class App extends Component {
 										}
 									}>
 								</Route>
-								<Route
-									path={"/settings"}
-									render={
-										(props) => {
-											return (<Security {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
 								{/*项目*/}
-								<Route
-									path={"/projects"}
-									render={
-										(props) => {
-											return (<Projects {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
 								<Route
 									path="/register"
 									render={
@@ -249,10 +222,6 @@ class App extends Component {
 								</Route>
 								{/*404*/}
 								<Route path="/nopage" component={Shixunnopage} />
-
-								{/* 查询 */}
-								<Route path="/search" component={Search} />
-
 								{/* 个人主页 */}
 								<Route path="/users/:username"
 									render={
@@ -260,13 +229,18 @@ class App extends Component {
 											return (<InfosIndex {...this.props} {...this.state} />)
 										}
 								}></Route>
+								<Route
+									path={"/projects"}
+									render={
+										(props) => {
+											return (<Projects {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
 								<Route exact path="/"
 									render={
 										(props) => (
-											personal && personal.length > 0 ?
-											<InfosIndex {...this.props} {...props} />
-											:
-											<ProjectIndex {...this.props} {...props} />
+											<Projects {...this.props} {...props} {...this.state} />
 										)
 									}
 								/>

src/AppConfig.js

@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  var proxy = "https://testforgeplus.trustie.net";
+  var proxy = "http://106.75.178.228:81";
   //响应前的设置
   axios.interceptors.request.use(
     config => {
@@ -45,11 +45,11 @@ export function initAxiosInterceptors(props) {
       if (`${config[0]}` !== `true`) {
         if (window.location.port === "3007") {
           config.url = `${proxy}${url}`;
-          if (config.url.indexOf('?') === -1) {
-            config.url = `${config.url}?debug=${debugType}`;
-          } else {
-            config.url = `${config.url}&debug=${debugType}`;
-          }
+          // if (config.url.indexOf('?') === -1) {
+          //   config.url = `${config.url}?debug=${debugType}`;
+          // } else {
+          //   config.url = `${config.url}&debug=${debugType}`;
+          // }
         } else {
           config.url = url;
         }

src/common/UrlTool.js

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

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

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

src/forge/Component/DeleteModal/Index.scss

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

src/forge/Component/EAccount.scss

@@ -1,6 +1,9 @@
 .ant-modal-mask{
-  z-index: 1001;
+  z-index: 10000;
 }
 .ant-modal-wrap{
-  z-index: 1002;
+  z-index: 10001;
+  .ant-form-explain{
+    position: absolute;
+  }
 }

src/forge/Component/EducoderAccount.jsx

@@ -35,21 +35,26 @@ function EducoderAccount({form , visible , onOk , email}){
     >
       <div>
         <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
-        为确保您能正常使用平台功能，请确认以下信息:
+          { 
+          email ? 
+          `平台已检测到您已绑定邮箱${email},请您确认如下操作`
+          :
+          "平台已检测到您未绑定邮箱，为不影响使用协同开发功能，请先绑定邮箱"
+          }
         </p>
         <Form {...layout}>
           <Form.Item label="邮箱">
             {getFieldDecorator("email",{
               rules:[{required:true,message:"请输入邮箱账号"}]
             })(
-              <Input placeholder="请输入您的邮箱账号" width="220px"/>
+              <Input placeholder="请输入您的邮箱账号" width="220px" disabled={email}/>
             )}
           </Form.Item>
           <Form.Item label="密码">
             {getFieldDecorator("password",{
-              rules:[{required:true,message:"请输入邮箱密码"}]
+              rules:[{required:true,message:"请输入您的平台密码"}]
             })(
-              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
+              <Input.Password placeholder="请输入您的平台密码" width="220px"/>
             )}
           </Form.Item>
         </Form>

src/forge/Component/HeadSearch.jsx

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

src/forge/Component/Monaco.jsx

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

src/forge/Component/Releases.jsx

@@ -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,17 +10,17 @@ 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>
       {
         releaseVersions && releaseVersions.total_count>0 ?
           releaseVersions.list.map((item,key)=>{
             return(
-            key === 0 &&<AlignTop className="mt10">
+            <AlignTop className="mt10">
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
                 <p className="font-16 color-grey-6">

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

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

src/forge/Component/User.jsx

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

src/forge/DevOps/About.jsx

@@ -36,6 +36,7 @@ function About(props, ref) {
   const [ disabled, setDisabled ] = useState(false);
   const [ typeFlag, setTypeFlag] = useState(false);
 
+
   const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
   const CurrentLogin = props.current_user && props.current_user.login;
   useEffect(()=>{
@@ -55,6 +56,11 @@ function About(props, ref) {
       setIsSpining(false);
       if(result && result.data ){
         setStep(result.data.step);
+        // setStep(0);
+        // setFieldsValue({...result.data.cloud_account});
+        // if(result.data.cloud_account){
+        //   setDisabled(true);
+        // }
       }
     }).catch(error=>{
       setIsSpining(false);
@@ -170,12 +176,12 @@ function About(props, ref) {
           CurrentLogin !== AuthorLogin ?
           <div className="noOperation">DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。</div>:""
         }
-        <a href={"https://forum.trustie.net/forums/3110/detail"} target="_blank" style={{ color: "#5091FF"}}>
+        {/* <a href={"https://forum.trustie.net/forums/3110/detail"} target="_blank" style={{ color: "#5091FF"}}>
           了解什么是DevOps？
         </a>
         <a href={"https://forum.trustie.net/forums/3080/detail"} target="_blank" style={{ color: "#5091FF"}}>
           如何使用DevOps？
-        </a>
+        </a> */}
         {
           AuthorLogin === CurrentLogin ?
           <React.Fragment>
@@ -227,7 +233,7 @@ function About(props, ref) {
               step === 1 ?
               <div>
                 <AlignCenter style={{justifyContent:"center",marginTop:"20px"}}>
-                  <span style={{marginBottom:"42px"}}>密码：</span>
+                  <span className="mb40">密码：</span>
                   <div>
                     <Input.Password value={authorityVal} className={authorityValFlag===true && "flags"} onChange={(e)=>setAuthorityVal(e.target.value)} style={{width:"220px"}}></Input.Password>
                     <p className="color-grey-9" style={{textAlign:"left",lineHeight:'21px'}}>您已保存相关服务器信息，请输入密码，<br/>确认授权DevOps应用</p>

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

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

@@ -0,0 +1,107 @@
+import React, { useEffect } from 'react';
+import * as echarts from 'echarts';
+import './index.scss';
+
+function Index(props) {
+  useEffect(()=>{
+    Init();
+  },[])
+
+  function Init() {
+    var myCharts = document.getElementById('main');
+    var myEcharts = echarts.init(myCharts);
+    var option = {
+      title: {
+        text: '项目实施进度表',
+        left: 10
+      },
+      legend: {
+        y: 'bottom',
+        data: ['计划时间', '实际时间']  //修改的地方1
+      },
+      grid: {
+        containLabel: true,
+        left: 20
+      },
+      xAxis: {
+        type: 'time'
+      },
+      yAxis: {
+        data: ['任务一', '任务二', '任务三', '任务四', '任务五', '任务六', '任务七']
+      },
+      tooltip: {
+        trigger: 'axis',
+        formatter: function(params) {
+          var res = params[0].name + "</br>"
+          var date0 = params[0].data;
+          var date1 = params[1].data;
+          var date2 = params[2].data;
+          var date3 = params[3].data;
+          date0 = date0.getFullYear() + "-" + (date0.getMonth() + 1) + "-" + date0.getDate();
+          date1 = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate();
+          date2 = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + date2.getDate();
+          date3 = date3.getFullYear() + "-" + (date3.getMonth() + 1) + "-" + date3.getDate();
+          res += params[0].seriesName + "~" + params[1].seriesName + ":</br>" + date0 + "~" + date1 + "</br>"
+          res += params[2].seriesName + "~" + params[3].seriesName + ":</br>" + date2 + "~" + date3 + "</br>"
+          console.log(params[0]);
+          return res;
+        }
+      },
+      series: [
+        {
+          name: '计划开始时间',
+          type: 'bar',
+          stack: 'test1',
+          itemStyle: {
+            normal: {
+              color: 'rgba(0,0,0,0)'
+            }
+          },
+          data: []
+        },
+        {
+          name: '计划时间',
+          type: 'bar',
+          stack: 'test1',
+          //修改地方2
+          itemStyle: {
+            normal: {
+              color: '#F98563'
+            }
+          },
+          data: []
+        },
+        {
+          name: '实际开始时间',
+          type: 'bar',
+          stack: 'test2',
+          itemStyle: {
+            normal: {
+              color: 'rgba(0,0,0,0)'
+            }
+          },
+          data: []
+        },
+        {
+          name: '实际时间',
+          type: 'bar',
+          stack: 'test2',
+          //修改地方3
+          itemStyle: {
+              normal: {
+                  color: '#A2E068'
+              }
+          },
+          data: []
+        }
+      ]
+    };
+    myEcharts.setOption(option);
+  }
+  return(
+    <div className="ganttBox">
+      <div id="main" style={{height:"500px"}}></div>
+    </div>
+  )
+}
+export default Index;

src/forge/Gantt/index.scss

@@ -0,0 +1,5 @@
+.ganttBox{
+  width: 1200px;
+  margin:0px auto;
+  padding:22px 0px;
+}

src/forge/Head/Footer.jsx

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

src/forge/Head/Header.js

@@ -3,11 +3,7 @@ import AccountProfile from "../../modules/user/AccountProfile";
 import { getImageUrl } from 'educoder'
 import axios from 'axios';
 import { Input , notification , Dropdown , Menu } from 'antd';
-import { Link } from 'react-router-dom';
-
 import LoginDialog from '../../modules/login/LoginDialog';
-import HeadSearch from '../Component/HeadSearch';
-
 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
 
@@ -79,6 +75,37 @@ class NewHeader extends Component {
     } catch (e) {}
   }
 
+  SearchInput = (open,item)=>{
+    if(open){
+      return(
+        <div
+          onBlur={() => {
+            setTimeout(() => {
+              this.setState({
+                openSearch:false
+              })
+            }, 300)
+          }}
+        >
+          <Search placeholder="请输入搜索关键字"
+            className={`search-input mr20`}
+            onSearch={(value)=>this.onGlobalSearch(value,item)}
+            autoFocus={true}
+            style={{width:"260px"}}
+          />
+        </div>
+      )
+    }else{
+      return <i className="iconfont icon-sousuo font-18 color-white ml30" onClick={() => {
+        this.setState({openSearch:true})
+      }} />
+    }
+  }
+
+  onGlobalSearch=(value,item)=>{
+    window.location.href=`${item}?value=` + value;
+  }
+
   openNotification = (messge) => {
     notification.open({
       message: "提示",
@@ -87,6 +114,8 @@ class NewHeader extends Component {
     });
   };
 
+
+
   componentWillReceiveProps(newProps, oldProps) {
     this.setState({
       user: newProps.user
@@ -96,6 +125,7 @@ class NewHeader extends Component {
     }
   }
 
+
   educoderlogin = () => {
     //登录账号
     this.setState({
@@ -133,11 +163,13 @@ class NewHeader extends Component {
     })
   };
 
+
   // 关闭
   cancelModulationModels = () => {
     this.setState({ isRenders: false })
   }
 
+
   setevaluatinghides = () => {
     this.setState({
       setevaluatinghides: true
@@ -226,12 +258,12 @@ class NewHeader extends Component {
   addMenu=(list)=>{
     return(
       list && list.length >0 && 
-      <div className="dropdownFlex">
+      <div className="dropdownFlex double">
         <Menu> 
           {
             list.map((item,key)=>{
               return(
-                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item><a href={item.url}>{item.name}</a></Menu.Item>
               )
             })
           }
@@ -254,22 +286,58 @@ class NewHeader extends Component {
               )
             })
           }
-          <li><Link to={`/settings/SSH`}>设置</Link></li>
         <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
       </Menu>
     )
   }
 
+  classMenu=(http)=>{
+    return(
+      <Menu className="headmenus">
+        <Menu.Item><a href={`${http}/classrooms`}>课堂实践管理</a></Menu.Item>
+        <Menu.Item><a href={`${http}/classrooms/9468/shixun_homework`}>作业管理</a></Menu.Item>
+        <Menu.Item><a href={`${http}/paperlibrary`}>考试与题库管理</a></Menu.Item>
+        <Menu.Item><a href={`${http}/paths`}>教学资源库</a></Menu.Item>
+      </Menu>
+    )
+  }
+
+  platMenu=(http)=>{
+    return(
+      <Menu className="headmenus">
+        <Menu.Item><a href={`${http}/shixuns`}>实训项目运行平台</a></Menu.Item>
+        <Menu.Item><a href={`${http}/shixuns/new`}>开发运行工具集</a></Menu.Item>
+        <Menu.Item><a href={`${http}/admins/mirror_repositories`}>镜像管理</a></Menu.Item>
+        <Menu.Item><a href={`${http}/shixuns/2pvunkqe/challenges`}>实训项目自动评测系统</a></Menu.Item>
+        <Menu.Item><a href={`${http}/shixuns/2pvunkqe/edit/107884/editcheckpoint`}>实训项目开发平台</a></Menu.Item>
+      </Menu>
+    )
+  }
+  moopMenu=(http,forgeHttp)=>{
+    return(
+      <Menu className="headmenus">
+        <Menu.Item><a href={`${http}/moop_cases`}>案列管理</a></Menu.Item>
+        <Menu.Item><a href={`${http}/competitions`}>竞赛管理</a></Menu.Item>
+        <Menu.Item><a href={forgeHttp}>协同开发</a></Menu.Item>
+        <Menu.Item><a href={`${http}/paths?discipline_id=21`}>综合案例定制</a></Menu.Item>
+      </Menu>
+    )
+  }
+
   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 +415,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">
@@ -374,57 +442,69 @@ class NewHeader extends Component {
               ""
             }
           <div className="head-nav pr" id={"head-navpre1"}>
-            {
-              settings && settings.navbar && settings.navbar.length > 0 ?
-              <ul id="header-nav">
-                {
-                  settings.navbar && settings.navbar.map((item, key) => {
-                    var new_link = item.link;
-                    var user_login = this.props.user && this.props.user.login;
-                    var is_hidden = item.hidden
-                    if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
-                      if (user_login) {
-                        if (new_link.indexOf("courses") > -1) {
-                          new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses")
-                        } else if (new_link.indexOf("contests") > -1) {
-                          new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
-                        }
-                      } else {
-                        is_hidden = true
+            <ul id="header-nav">
+              <li>
+                <Dropdown overlay={this.classMenu(settings && settings.new_course.default_url)} placement={"bottomCenter"}>
+                  <a href={`${settings && settings.new_course.default_url}/classrooms`}>大数据实验教学资源软件平台</a>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown overlay={this.platMenu(settings && settings.new_course.default_url,settings && settings.new_course.forge_url)} placement={"bottomCenter"}>
+                  <a href={`${settings && settings.new_course.default_url}/shixuns`}>数据科学支撑工具集和实训平台</a>
+                </Dropdown>
+              </li>
+              <li>
+                <Dropdown overlay={this.moopMenu(settings && settings.new_course.default_url,settings && settings.new_course.forge_url)} placement={"bottomCenter"}>
+                  <a href={`${settings && settings.new_course.default_url}/moop_cases`}>大数据工程教研支撑平台</a>
+                </Dropdown>
+              </li>
+              <li>
+                  <a href={`${settings && settings.new_course.default_url}/forums`}>交流问答</a>
+              </li>
+              {/* {
+                settings.navbar && settings.navbar.map((item, key) => {
+                  var new_link = item.link;
+                  var user_login = this.props.user && this.props.user.login;
+                  var is_hidden = item.hidden
+                  if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
+                    if (user_login) {
+                      if (new_link.indexOf("courses") > -1) {
+                        new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses")
+                      } else if (new_link.indexOf("contests") > -1) {
+                        new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
                       }
+                    } else {
+                      is_hidden = true
                     }
-                    if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
-                      new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
-                    }
-                    
-                    var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
-                    var wl = waiLian && waiLian.length>0;
-                    return (
-                      <li key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
-                        <a href={new_link} target={wl ? "_self":"_blank"}>{item.name}</a>
-                      </li>
-                    )
-                  })
-                }
-              </ul>
-            : ""
-            }
+                  }
+                  if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
+                    new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
+                  }
+                  
+                  var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
+                  var wl = waiLian && waiLian.length>0;
+                  return (
+                    <li key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
+                      <a href={new_link} target={wl ? "_self":"_blank"}><div dangerouslySetInnerHTML={{ __html: item.name }}></div></a>
+                    </li>
+                  )
+                })
+              } */}
+            </ul>
           </div>
           <div className="head-right">
-            {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
-            <HeadSearch {...this.props}/>
+            {search_url ? this.SearchInput(openSearch,search_url):""}
             {
               current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
               <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
-                <i className="iconfont icon-tianjiafangda color-grey-6 ml30"></i>
+                <i className="iconfont icon-tianjiafangda color-white ml30"></i>
               </Dropdown>:""
             }
-            
             {this.props.user && this.props.user.login && notice_url ?
               <div className="ml30 edu-menu-panel">
                 {user && user.login &&
                   <a href={`${notice_url}`} style={{ position: 'relative' }}>
-                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
+                    <i className="iconfont icon-xiaoxilingdang color-white"></i>
                     <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                     </span>
                   </a>
@@ -434,10 +514,10 @@ class NewHeader extends Component {
           </div>
           {!user || (user && !user.login)  ?
             <span className="font-15 ml30">
-              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
               {
                 settings && settings.common && settings.common.register &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="ml5 color-white" href={`${settings.common.register}`} target="_blank">注册</a></span>
               }
             </span>
             :

src/forge/Head/header.scss

@@ -1,17 +1,50 @@
-
+.dropdownFlex.double{
+  width: 232px;
+  .ant-menu{
+    height: 145px;
+    .ant-menu-item:nth-child(-n+4){
+      border-right: 1px solid #eee;
+    }
+    .ant-menu-item{
+      padding:0px 5px;
+    }
+    .ant-menu-item:hover a{
+      color: #fff!important;
+      background-color: #1890ff;
+    }
+  }
+}
+.headmenus{
+  .ant-dropdown-menu-item:hover{
+    background-color: #f5f5f5;
+  }
+}
 .dropdownFlex{
   display:flex;
   background:#fff;
   border-radius: 3px;
-  .ant-menu-vertical > .ant-menu-item{
+  padding:5px 0px;
+  box-sizing: border-box;
+  .ant-menu{
+    display: flex;
+    flex-direction: column;
+    line-height: 45px;
+    flex-wrap: wrap;
+  }
+  .ant-menu > .ant-menu-item{
     border:none;
     height: 35px;
     line-height: 35px;
     margin:0px;
+    width: 116px;
     &.ant-menu-item-selected{
       background-color: #fff;
       a{color: rgba(0, 0, 0, 0.65)!important;}
     }
+    a{
+      width: 100%;
+      text-align: center;
+    }
     &.ant-menu-item-active{
       a{color: #4cacff!important;}
     }

src/forge/Index.js

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

src/forge/Main/CoderDepot.jsx

@@ -63,8 +63,6 @@ function CoderDepot(props){
   const [ readme , setReadme ] = useState(undefined);
   const [ defaultBranch , setDefaultBranch ] = useState(undefined);
   const [ editReadme , setEditReadme ] = useState(false);
-  const [ pullsFlag , setPullsFlag ] = useState(true);
-  const [ issuesFlag , setIssuesFlag ] = useState(true);
 
   const owner = props.match.params.owner;
   const projectsId = props.match.params.projectsId;
@@ -72,22 +70,6 @@ function CoderDepot(props){
   branchName = returnbar(branchName);
   const details = props.projectDetail;
   let pathname = props.history.location.pathname;
-  
-  const { bannerList } = props;
-
-  useEffect(()=>{
-    if(bannerList && bannerList.length>0){
-      let a = bannerList.filter(i=>i.menu_name === "pulls");
-      let i = bannerList.filter(i=>i.menu_name === "issues");
-      if(a && a.length === 0){
-        setPullsFlag(false);
-      }
-      if(i && i.length === 0){
-        setIssuesFlag(false);
-      }
-    }
-  },[bannerList])
-
 
   useEffect(()=>{
     if(details){
@@ -271,12 +253,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){
@@ -295,7 +282,6 @@ function CoderDepot(props){
   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>
@@ -358,19 +344,13 @@ 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>
-                      }
+                      <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>
                       { fileOperate &&
                         <Dropdown overlay={fileMenu()} className="mr20" trigger={['click']}>
                           <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
@@ -395,9 +375,7 @@ function CoderDepot(props){
                           { 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">
@@ -460,7 +438,7 @@ function CoderDepot(props){
                         website &&
                         <p className="color-grey-6 df">
                           <i className="iconfont icon-lianjie2 font-15 mr10 color-grey-9"></i>
-                          <a href={website} className="color-grey-6" target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
+                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
                         </p>
                       }
                       <p>
@@ -468,13 +446,13 @@ function CoderDepot(props){
                         <a href="#readme" className="color-grey-6">README.md</a>
                       </p>
                       <p className="color-grey-6">
-                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-6"></i>
+                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-9"></i>
                         <span>{projectDetail && projectDetail.size}</span>
                       </p>
                       {
                         projectDetail && projectDetail.license_name &&
                         <p className="color-grey-6">
-                          <i className="iconfont icon-tianping font-16 mr10 color-grey-3"></i>
+                          <i className="iconfont icon-tianping font-16 mr10 color-grey-9"></i>
                           <span>{projectDetail.license_name}</span>
                         </p>
                       }
@@ -491,7 +469,7 @@ function CoderDepot(props){
                       <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 +477,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/CoderRootBranch.js

@@ -17,7 +17,7 @@ export default ((props)=>{
   const [ isSpin , setIsSpin ] =useState(true);
 
   const { projectsId , owner } = props.match.params;
-  const { isManager , isDeveloper , projectDetail } = props;
+
   useEffect(()=>{
     getBranchs(projectsId, owner);
   },[projectsId])
@@ -46,10 +46,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 +70,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

@@ -9,12 +9,6 @@ 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 +57,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,10 +106,10 @@ class CoderRootCommit extends Component{
     const { commitDatas , dataCount , limit , page , isSpining , branchList } = this.state;
     const { projectDetail, commit_class , defaultBranch } = this.props;
     const { projectsId , owner , branchName } = this.props.match.params;
-    let branch = returnbar(branchName || defaultBranch);
+    let branch = branchName || defaultBranch;
     return(
       <React.Fragment>
-        <div className={"main"}style={{padding:"0px",border:"none"}}>
+        <div className={"main"}>
           <div className="f-wrap-between">
             <SelectBranch 
               repo_id={projectDetail && projectDetail.repo_id} 

src/forge/Main/CoderRootFileDetail.js

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

src/forge/Main/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/Detail.js

@@ -101,6 +101,14 @@ const Contribute = Loadable({
   loader: () => import('./sub/Contribute'),
   loading: Loading,
 })
+const Gantt = Loadable({
+  loader: () => import('../Gantt/Index'),
+  loading: Loading,
+})
+const Sonar = Loadable({
+  loader: () => import('../Sonar/Index'),
+  loading: Loading,
+})
 
 const CoderRootCommit = Loadable({
 	loader: () => import('./CoderRootCommit'),
@@ -151,6 +159,10 @@ function checkPathname(projectsId,owner,pathname){
       name="devops"
     }else if(url.indexOf(`/source`)>-1){
       name="source"
+    }else if(url.indexOf(`/gantt`)>-1){
+      name="gantt"
+    }else if(url.indexOf(`/sonar`)>-1){
+      name="sonar"
     }
   }
   return name;
@@ -442,7 +454,7 @@ class Detail extends Component {
                       <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>
+                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{project && project.name}</Link>
                   </div>
                   { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
                 </AlignTop>
@@ -673,6 +685,20 @@ class Detail extends Component {
                   (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
                 }
               ></Route>
+
+              {/* 甘特图 */}
+              <Route path="/projects/:owner/:projectsId/gantt"
+                render={
+                  (props) => (<Gantt {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 甘特图 */}
+              <Route path="/projects/:owner/:projectsId/sonar"
+                render={
+                  (props) => (<Sonar {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+
               <Route path="/projects/:owner/:projectsId/watchers"
                 render={
                   (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)

src/forge/Main/Index.js

@@ -1,10 +1,7 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
-import Slider from "react-slick";
+import { Menu, Input , Spin, Pagination , Popover , Select , Button } from 'antd';
 import { getImageUrl } from 'educoder';
-import "slick-carousel/slick/slick.css";
-import "slick-carousel/slick/slick-theme.css";
 import '../css/index.scss'
 import './list.css';
 import './Index.scss';
@@ -12,7 +9,8 @@ import ListItem from './IndexItem'
 import axios from 'axios';
 import img_new from '../Images/new.png';
 import img_array from '../Images/array.png';
-import banner from '../Images/banner_list.jpg';
+import banner from '../Images/banner.png';
+import AddProjectModal from '../Head/AddProjectModal';
 const Search = Input.Search;
 
 class Index extends Component {
@@ -33,8 +31,6 @@ class Index extends Component {
       categoryList: undefined,
       recommendList:undefined,
 
-      recommendOriList:undefined,
-
       languageList:undefined,
       languageId:undefined
     }
@@ -52,8 +48,6 @@ class Index extends Component {
     this.getRecommand();
 
     this.getLanguage();
-
-    // this.getRecommandOri();
   }
 
   // 获取语言列表
@@ -79,17 +73,6 @@ class Index extends Component {
     }).catch(error=>{})
   }
 
-  getRecommandOri=()=>{
-    const url = `/organizations/recommend.json`;
-    axios.get(url).then(result=>{
-      if(result){
-        this.setState({
-          recommendOriList:result.data.organizations
-        })
-      }
-    }).catch(error=>{})
-  }
-
   // 获取列表
   getListData = (page, limit, search, sort, project_type, category_id,languageId) => {
     const { current_user } = this.props;
@@ -274,56 +257,37 @@ 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>
-          :""
-        } */}
+        <div className="subjectBanner">
+          <img src={banner} alt=""/>
+          <div className="bannerBox">
+            <div class="subjectleft">
+              <span>开源社区</span>
+              <span>面向高校的教学开源</span>
+            </div>
+            <Button type={"primary"} size={"large"}>
+              <Link to={`/projects/deposit/new`}>新建项目</Link>
+            </Button>
+            <Button type={"primary"} size={"large"}>
+              <AddProjectModal showNotification={this.props.showNotification}/>
+            </Button>
+            {/* <Button type={"primary"} size={"large"} style={{backgroundColor:"rgb(47, 163, 79)",borderColor:"rgb(47, 163, 79)"}}>
+              <a href={`https://data.educoder.net/api/attachments/1955244?disposition=inline`} target="_blank">新手指引</a>
+            </Button> */}
+          </div>
+        </div>
         {
           recommendList && recommendList.length>0 &&
-          <Slider {...setting} className={recommendList.length>5 ? "recommandProjects":"recommandProjects mb20"}>
+          <div className="recommandProjects">
             {
               recommendList.map((item,key)=>{
                 return(
-                  <div className="items" onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
+                  <div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
                     <div className="mainInfo">
-                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} width="50px" height="50px"alt=""/>
+                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} alt=""/>
                       <p className="school">{item.name}</p>
                       <p className="name">{item.author && item.author.name}</p>
                     </div>
@@ -335,8 +299,9 @@ class Index extends Component {
                 )
               })
             }
-          </Slider>
+          </div>
         }
+        
         <div className="ProjectListIndex">
           <div className="list-left">
             <ul className="list-l-Menu">

src/forge/Main/Index.scss

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

src/forge/Main/IndexItem.js

@@ -47,13 +47,11 @@ class IndexItem extends Component {
                         : ""
                     }
                     {
-                      item.type && item.type === 2 ?
+                      item.type && item.type !== 0 ? 
+                      item.type === 2 ?
                       <Tooltip title="该项目是一个镜像" className="ml5">
                         <i className="iconfont icon-banbenku font-18 color-green" />
-                      </Tooltip>:""
-                    }
-                    {
-                      item.type && item.type === 1 ?
+                      </Tooltip>:
                       <span className="ml5">
                         <i className="iconfont icon-jingxiang font-18 color-green" />
                       </span>:""
@@ -78,6 +76,8 @@ class IndexItem extends Component {
 
                 <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

@@ -1,10 +1,51 @@
 
 .lineH2{line-height:2}
-.t_project_banner {
-  /* height: 260px;
-  background: url(../Images/banner_list.jpg) no-repeat center; */
+.subjectBanner {
+  height: 160px;
+  position: relative;
+  overflow: hidden;
   background-color: #050d34;
 }
+.subjectleft{
+  margin-top: 40px;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: center;
+  align-items: center;
+}
+.bannerBox{
+  width: 1200px;
+  position: absolute;
+  z-index: 2;
+  left: 50%;
+  top: 0;
+  transform: translateX(-50%);
+}
+.subjectleft span:first-child{
+  width: 140px;
+  height: 30px;
+  font-size: 30px;
+  font-weight: 600;
+  color: #fff;
+  line-height: 30px;
+  letter-spacing: 4px;
+}
+.subjectleft span:last-child{
+  height: 16px;
+  font-size: 16px;
+  color: #fff;
+  line-height: 16px;
+  letter-spacing: 4px;
+  margin-left: 16px;
+}
+.bannerBox .ant-btn{
+  margin-top: 30px;
+  height: 40px;
+  font-size: 16px;
+  width: 120px;
+  border-radius: 4px;
+  margin-right: 40px;
+}
 .ProjectListIndex{
   width: 1200px;
   margin:20px auto;

src/forge/Main/sub/Contribute.jsx

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

src/forge/Main/sub/DetailBanner.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Skeleton , Tooltip} from 'antd';
+import { Skeleton , Tooltip } from 'antd';
 import { Link } from 'react-router-dom';
 
 function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
@@ -19,7 +19,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
   return(
     <div className="f-wrap-between mt15">
       {
-        menuName && projectDetail ? 
+        menuName && menuName.length> 0 && projectDetail ? 
         <ul className="headerMenu-wrapper">
           {
             menuName.map((item,key)=>{
@@ -39,7 +39,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     <li className={(pathname==="" || urlFlag) ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
                         <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i>
-                        <span>代码库</span>
+                        <span>代码</span>
                         </Link>
                     </li>
                   }
@@ -69,7 +69,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     item.menu_name === "devops" && platform ? 
                     <li className={pathname==="devops" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
-                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
+                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流
                         {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
                     </li>
@@ -109,10 +109,28 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     <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>
+                        <span>设置</span>
                       </Link>
                     </li>
                   }
+                  {
+                  item.menu_name === "gantt" &&
+                  <li className={pathname === "gantt" ? "active" : ""}>
+                    <Link to={`/projects/${owner}/${projectsId}/gantt`}>
+                      <i className={url && url.indexOf("/gantt") > 0 ? "iconfont icon-zuzhi color-grey-3 mr5 font-14":"iconfont icon-zuzhi color-grey-6 font-14 mr5"}></i>
+                      <span>甘特图</span>
+                    </Link>
+                  </li>
+                  }
+                  {
+                  item.menu_name === "sonar" &&
+                  <li className={pathname === "sonar" ? "active" : ""}>
+                    <Link to={`/projects/${owner}/${projectsId}/sonar`}>
+                      <i className={url && url.indexOf("/sonar") > 0 ? "iconfont icon-tijiao color-grey-3 mr5 font-18":"iconfont icon-tijiao color-grey-6 font-18 mr5"}></i>
+                      <span>质量分析/检测</span>
+                    </Link>
+                  </li>
+                  }
                 </React.Fragment>
               )
             })

src/forge/Main/sub/UpdateDescModal.jsx

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

src/forge/Main/sub/sub.scss

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

src/forge/Merge/MergeItem.js

@@ -183,7 +183,7 @@ class MergeItem extends Component {
                     ) : (
                       ""
                     )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {user_admin_or_member ? (
                       <div
                         className="milepostleft"
                         style={{

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

src/forge/Merge/merge.js

@@ -159,10 +159,14 @@ class merge extends Component {
         <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>
             );

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

@@ -181,12 +181,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/${result.data.login}/${result.data.identifier}`);
+            }
           }
         }).catch((error) => {
           this.setState({

src/forge/Notice/Index.jsx

@@ -70,9 +70,9 @@ function Index(props){
   function deleteEvent(type,count) {
     let c = count;
     if(type==="apply"){
-      setTransferCount(transferCount-count);
-    }else if(type==="undo"){
       setApplyCount(applyCount-count);
+    }else if(type==="undo"){
+      setTransferCount(applyCount-count);
     }else{
       setMessagesCount(0);
       c = messagesCount;

src/forge/Notice/UndoEvent.jsx

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

src/forge/Order/Milepost.js

@@ -154,10 +154,10 @@ class Milepost extends Component {
     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.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>

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

@@ -102,7 +102,7 @@ class NewMilepost extends Component {
                       required: true, message: '请输入标题'
                     }],
                   })(
-                    <Input placeholder="标题" autoComplete="off" maxLength="30" />
+                    <Input placeholder="标题" autoComplete="off"/>
                   )}
                 </Form.Item>
               </div>
@@ -113,7 +113,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_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
         });
 

src/forge/SecuritySetting/Index.jsx

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

src/forge/SecuritySetting/Index.scss

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

src/forge/SecuritySetting/sub/DeleteBox.jsx

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

src/forge/SecuritySetting/sub/New.jsx

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

src/forge/SecuritySetting/sub/SSH.jsx

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

src/forge/SecuritySetting/sub/SSHDetail.jsx

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

src/forge/Settings/Branch.js

@@ -23,7 +23,6 @@ export default ((props)=>{
   const [ page , setPage ] = useState(1);
   let defaultBranch = props.defaultBranch;
 
-
   useEffect(()=>{
     if(defaultBranch){
       setBranch(defaultBranch);
@@ -77,8 +76,6 @@ export default ((props)=>{
     .then((result) => {
       if (result) {
         props.showNotification(`分支设置成功！`);
-        const { getDetail } = props;
-        getDetail && getDetail();
       }
     })
     .catch((error) => {
@@ -98,7 +95,7 @@ export default ((props)=>{
 
   return(
     <WhiteBack>
-      <Title><span className="font-18">分支设置</span></Title>
+      <Title>分支设置</Title>
       <Div>
         <div className="pb20" style={{borderBottom:"1px dashed #eee"}}>
           <p className="color-grey-3 mb10 font-18">默认分支</p>

src/forge/Settings/CollaboratorMember.jsx

@@ -58,12 +58,8 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
     })
     .then((result) => {
       if (result) {
-        if(page > 1 && ( listData && listData.length === 1)){
-          setPage(page-1);
-        }else{
-          setListData(result.data.members);
-          setTotal(result.data.total_count);
-        }
+        setListData(result.data.members);
+        setTotal(result.data.total_count);
         setIsSpin(false);
       }
     })

src/forge/Settings/Index.js

@@ -20,14 +20,6 @@ const Setting = Loadable({
   loader: () => import("./Setting"),
   loading: Loading,
 });
-const WebhookNew = Loadable({
-  loader: () => import("./Webhooks/New"),
-  loading: Loading,
-});
-const Webhook = Loadable({
-  loader: () => import("./Webhooks/Index"),
-  loading: Loading,
-});
 const Collaborator = Loadable({
   loader: () => import("./Collaborator"),
   loading: Loading,
@@ -73,18 +65,6 @@ class Index extends Component {
                 </Link>
               </p>
             </li>
-            <li
-              className={
-                pathname.indexOf("setting/webhooks") > -1 ? "active" : ""
-              }
-            >
-              <p>
-                <Link to={`/projects/${owner}/${projectsId}/setting/webhooks`} className="w-100">
-                  <i className="iconfont icon-a-xuanzhongwebhookicon font-18 mr10 color-grey-9"></i>
-                  Webhooks
-                </Link>
-              </p>
-            </li>
             <li
               className={
                 pathname.indexOf("setting/branch") > -1 ? "active" : ""
@@ -123,27 +103,8 @@ class Index extends Component {
           </ul>
         </Short>
         <Long>
-          <Gap>
+          <Gap className="list-r-Info">
             <Switch {...this.props}>
-              {/* webhooks */}
-              <Route
-                path="/projects/:owner/:projectsId/setting/webhooks/new"
-                render={(props) => (
-                  <WebhookNew {...this.props} {...props} {...this.state} />
-                )}
-              ></Route>
-              <Route
-                path="/projects/:owner/:projectsId/setting/webhooks/:id"
-                render={(props) => (
-                  <WebhookNew {...this.props} {...props} {...this.state} />
-                )}
-              ></Route>
-              <Route
-                path="/projects/:owner/:projectsId/setting/webhooks"
-                render={(props) => (
-                  <Webhook {...this.props} {...props} {...this.state} />
-                )}
-              ></Route>
               {/* 协作者 */}
               <Route
                 path="/projects/:owner/:projectsId/setting/collaborator"

src/forge/Settings/Setting.js

@@ -2,8 +2,6 @@ import React, { Component } from "react";
 import { Form, Input, Checkbox, Select , Spin } from "antd";
 import Title from '../Component/Title';
 import {WhiteBack} from '../Component/layout';
-import DivertModal from '../Divert/DivertModal';
-import { Link } from 'react-router-dom';
 import axios from "axios";
 import "./setting.scss";
 const { TextArea } = Input;
@@ -80,9 +78,7 @@ class Setting extends Component {
             projectName:result.data.project_name,
             private_check: result.data.private,
             loading:false,
-            project_units:units,
-            transfer:result.data.transfer,
-            is_transfering:result.data.is_transfering,
+            project_units:units
           });
         }
       })
@@ -196,57 +192,16 @@ class Setting extends Component {
     });
   };
 
-  // 转移仓库
-  DivertProject=()=>{
-    this.setState({
-      divertVisible:true
-    })
-  }
-   // 取消仓库转移
-  CancelDivertProject=()=>{
-    this.props.confirm({
-      content: "是否确认取消将此项目转移给他人？",
-      onOk: () => {
-        const { projectsId , owner } = this.props.match.params;
-        const url =  `/${owner}/${projectsId}/applied_transfer_projects/cancel.json`;
-        axios.post(url).then(result=>{
-          if(result && result.data){
-            this.setState({
-              is_transfering:false
-            })
-          }
-        }).catch(error=>{})
-      },
-    });
-    
-  }
-  // 确定转移仓库
-  onSuccess=(owner)=>{
-    this.setState({
-      is_transfering:true,
-      divertVisible:false,
-      transfer:owner
-    })
-  }
-
   render() {
     const { getFieldDecorator } = this.props.form;
-    const { projectsId , owner } = this.props.match.params;
     const { projectDetail } = this.props;
 
-    const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
+    const { CategoryList, LanguageList, private_check ,loading } = this.state;
     let mirror = projectDetail && projectDetail.mirror;
     let type = projectDetail && projectDetail.type;
     const forked_from_project_id = this.props && this.props.projectDetail && this.props.projectDetail.forked_from_project_id;
     return (
       <div>
-        <DivertModal 
-          owner={owner}
-          repo={projectsId}
-          visible={divertVisible} 
-          onSuccess={this.onSuccess} 
-          onCancel={()=>{this.setState({divertVisible:false})}}
-        />
         <Spin spinning={loading}>
           <WhiteBack>
             <Title>基本设置</Title>
@@ -338,48 +293,23 @@ class Setting extends Component {
             {/* 镜像设置部分，暂无接口，先不显示 */}
             {/* <Mirror /> */}
           </WhiteBack>
-          {
-            projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner")?
-            <WhiteBack className="dangerousBox mb20">
+          <WhiteBack className="dangerousBox mb20">
+          <div>
+            <div className="dangerousTitle">危险操作区</div>
+            <div className="flex-a-center padding15-10">
               <div>
-                <div className="dangerousTitle">危险操作区</div>
-                <div className="flex-a-center padding15-10" style={{borderBottom:"1px solid #f9edbe"}}>
-                  <div>
-                    <p className="font-bd font-16">转移仓库</p>
-                    <p className="mt10">
-                      {
-                        is_transfering ?
-                        <span>此仓库正在转移给【
-                          {transfer && <Link to={transfer.type="User"?`/users/${transfer.login}`:`/organize/${transfer.login}`}>{transfer.name}</Link>}
-                          】，请联系对方接收此仓库。</span>
-                        :
-                        `将此仓库转移给其他用户或组织`
-                      }
-                    </p>
-                  </div>
-                  {
-                    is_transfering ? 
-                    <a onClick={this.CancelDivertProject} className="red_deleteBtn">取消转移</a>
-                    :
-                    <a onClick={this.DivertProject} className="red_deleteBtn">转移</a>
-                  }
-                </div>
-                <div className="flex-a-center padding15-10">
-                  <div>
-                    <p className="font-bd font-16">删除本仓库</p>
-                    <p className="mt10">
-                      删除仓库是永久性的,
-                      无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除
-                    </p>
-                  </div>
-                  <a onClick={this.deleteProject} className="red_deleteBtn">
-                    删除本仓库
-                  </a>
-                </div>
+                <p className="font-bd font-16">删除本仓库</p>
+                <p className="mt10">
+                  删除仓库是永久性的,
+                  无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除
+                </p>
               </div>
-            </WhiteBack>
-            :""
-          }
+              <a onClick={this.deleteProject} className="red_deleteBtn">
+                删除本仓库
+              </a>
+            </div>
+          </div>
+        </WhiteBack>
         </Spin>
       </div>
     );

src/forge/Settings/Webhooks/Index.jsx

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

src/forge/Settings/Webhooks/Index.scss

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

src/forge/Settings/Webhooks/New.jsx

@@ -1,337 +0,0 @@
-import React , { forwardRef, useEffect, useState } from 'react';
-import { Form , Input , Button , Select , Radio , Checkbox } from 'antd';
-import { Banner } from '../../Component/layout';
-import { Link } from 'react-router-dom';
-import axios from 'axios';
-import PushHistory from './sub/PushHistory';
-import DeleteBox from '../../Component/DeleteModal/Index';
-import './Index.scss';
-
-// ,"issue_assign","issue_label","issue_milestone","issue_comment","issue_only","fork",
-//"pull_request_milestone","pull_request_sync","pull_request_comment","repository","pull_request_label"
-const eventArray = [
-  "create","delete","push","pull_request_assign","pull_request_review","pull_request_only"
-]
-function New({ form , match , showNotification , history }) {
-  const [ httpValue , setHttpValue ] = useState("POST");
-  const [ posthttpValue , setPostHttpValue ] = useState("json");
-  const [ condition , setCondition ] = useState("push");
-  const [ event , setEvent ] = useState(["push"]);
-  const [ visible , setVisible ] = useState(false);
-  const [ data , setData ] = useState(undefined);
-  const [ eventFlag , setEventFlag ] = useState(false);
-
-  const { getFieldDecorator, validateFields , setFieldsValue } = form;
-  const { id , owner , projectsId } = match.params;
-
-  function compareArray(params) {
-    if(params && params.length > 0){
-      if(params.length === 1 && params[0] === "push"){
-        setEvent(['push']);
-        return "push";
-      }else if(params.length === eventArray.length){
-        setEvent(eventArray);
-        return "all";
-      }else{
-        setEvent([]);
-        return "forevent";
-      }
-    }
-  }
-
-  useEffect(()=>{
-    if(id){
-      Init();
-    }else{
-      let e = compareArray(event);
-      setCondition(e);
-      setFieldsValue({
-        url:"",
-        secret:"",
-        http_method:httpValue,
-        content_type:posthttpValue,
-        eventCondition:condition,
-        event:event,
-        branch_filter:"*",
-        active:true
-      })
-    }
-  },[id])
-
-  function Init() {
-    const url = `/${owner}/${projectsId}/webhooks/${id}/edit.json`;
-    axios.get(url).then(result=>{
-      if(result){
-        let e = compareArray(result.data.events);
-        setFieldsValue({
-          ...result.data,
-          eventCondition:e,
-          active:result.data.is_active
-        })
-        setData(result.data);
-        setHttpValue(result.data.http_method);
-        setCondition(e);
-        setEvent(result.data.events);
-      }
-    }).catch(error=>{})
-  }
-
-  function changeHTTP(value) {
-    setHttpValue(value);
-  }
-
-  function changeCondition(e) {
-    setCondition(e.target.value);
-    if(e.target.value === "push"){
-      setEvent(["push"])
-    }else if(e.target.value === "all"){
-      setEvent(eventArray)
-    }else{
-      setEvent([])
-    }
-  }
-
-  function submit() {
-    validateFields((error,values)=>{
-      if(!error){
-        if(values.eventCondition === "forevent" && event.length === 0){
-          setEventFlag(true);
-          return;
-        }
-        let e = values.eventCondition === "push" ? ['push'] : values.eventCondition === "all" ? eventArray : event;
-        
-        if(id){
-          // 编辑
-          const url = `/${owner}/${projectsId}/webhooks/${id}.json`;
-          axios.patch(url,{
-            webhook:{
-              ...values,
-              events:e
-            }
-          }).then(result=>{
-            if(result){
-              showNotification("webhook更新成功！");
-              history.push(`/projects/${owner}/${projectsId}/setting/webhooks`);
-            }
-          }).catch(error=>{})
-        }else{
-          // 保存
-          const url = `/${owner}/${projectsId}/webhooks.json`;
-          axios.post(url,{
-            webhook:{
-              ...values,
-              events:e
-            }
-          }).then(result=>{
-            if(result && result.data && result.data.id){
-              showNotification("webhook新建成功！");
-              history.push(`/projects/${owner}/${projectsId}/setting/webhooks`);
-            }
-          }).catch(error=>{})
-        }
-
-      }
-    })
-  }
-
-  function checkAddr(rule, value, callback) {
-    let reg = /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
-    if(!value){
-      callback();
-    }
-    if (!reg.test(value)){
-      callback("请输入有效的URL");
-    }
-    callback();
-  }
-
-  function deleteFunc() {
-    if(id){
-      setVisible(true);
-    }
-  }
-
-  function onSuccess() {
-    if(id){
-      const url = `/${owner}/${projectsId}/webhooks/${id}.json`;
-      axios.delete(url).then(result=>{
-        if(result){
-          showNotification("webhook删除成功！");
-          history.push(`/projects/${owner}/${projectsId}/setting/webhooks`);
-        }
-      }).catch(error=>{})
-    }
-  }
-
-  const radioStyle = {
-    display: 'block',
-    height: '30px',
-    lineHeight: '30px',
-  };
-
-  return(
-    <div className="newPanel">
-      <DeleteBox 
-        visible={visible} 
-        onCancel={()=>setVisible(false)}
-        onSuccess={onSuccess}
-        title="删除Webhook"
-        content="您确定要删除此Webhook吗？"
-        subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`}
-      />
-      <Banner>
-        <Link to={`/projects/${owner}/${projectsId}/setting/webhooks`} className="color-blue">Webhooks</Link>
-        <i className="iconfont icon-youjiantou ml5 mr5 font-12"></i>
-        <span>{id ? "更新" : "添加"}Webhook</span>
-      </Banner>
-      <div>
-        <p className="deschead mg"><span>当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a>。</span></p>
-        <Form>
-          <input type="password" style={{display:"none"}} />
-          <Form.Item label="目标URL" colon={false}>
-            {getFieldDecorator("url",{
-              rules:[
-                {required:true,message:"请输入目标URL"},
-                {
-                  validator:checkAddr
-                }
-              ]
-            })(
-              <Input placeholder="请输入目标URL" size="large" autocomplete='off'/>
-            )}
-          </Form.Item>
-          <Form.Item label="Webhook密钥" colon={false}>
-            {getFieldDecorator("secret",{
-              rules:[]
-            })(
-              <Input.Password placeholder="请输入Webhook密钥" autocomplete='new-password' size="large" maxLength={"50"}/>
-            )}
-          </Form.Item>
-          <Form.Item label="Http请求方法" colon={false}>
-            {getFieldDecorator("http_method",{
-              rules:[]
-            })(
-              <Select onSelect={changeHTTP} size="large">
-                <Select.Option value="GET">GET</Select.Option>
-                <Select.Option value="POST">POST</Select.Option>
-              </Select>
-            )}
-          </Form.Item>
-          <Form.Item 
-            label="POST请求类型" 
-            colon={false} 
-            style={{display:httpValue === "POST" ?"block":"none"}}
-          >
-            {getFieldDecorator("content_type",{
-              rules:[]
-            })(
-              <Select size="large">
-                <Select.Option value="json">application/json</Select.Option>
-                <Select.Option value="form">application/x-www-form-urlencoded</Select.Option>
-              </Select>
-            )}
-          </Form.Item>
-          <Form.Item label="您希望哪些事件触发此webhook？" colon={false} className="topLine">
-            {getFieldDecorator("eventCondition",{
-              rules:[]
-            })(
-              <Radio.Group onChange={changeCondition}>
-                <Radio style={radioStyle} value="push">只是push事件</Radio>
-                <Radio style={radioStyle} value="all">所有事件</Radio>
-                <Radio style={radioStyle} value="forevent">自定义事件</Radio>
-              </Radio.Group>
-            )}
-          </Form.Item>
-          <div className="eventCb" 
-            style={{display:condition === "forevent" ?"block":"none"}}
-          >
-            <Checkbox.Group value={event} onChange={(e)=>{setEvent(e)}}>
-              <p className="color-grey-3 mb10">代码库事件</p>
-              <div className="colSpan">
-                <span>
-                  <Checkbox value="push">推送</Checkbox>
-                  <span>git推送到存储库</span>
-                </span>
-                {/* <span>
-                  <Checkbox value="repository">代码库</Checkbox>
-                  <span>创建或删除代码库</span>
-                </span> */}
-                <span>
-                  <Checkbox value="create">创建</Checkbox>
-                  <span>创建分支或标签</span>
-                </span>
-                <span>
-                  <Checkbox value="delete">删除</Checkbox>
-                  <span>删除分支或标签</span>
-                </span>
-              </div>
-              <p className="color-grey-3 mt10 mb10">合并请求事件</p>
-              <div className="colSpan">
-                <span>
-                  <Checkbox value="pull_request_only">合并请求</Checkbox>
-                  <span>合并请求被打开、被关闭、被重新打开或被编辑</span>
-                </span>
-                <span>
-                  <Checkbox value="pull_request_assign">合并请求分配</Checkbox>
-                  <span>合并请求被分配或取消分配</span>
-                </span>
-                {/* <span>
-                  <Checkbox value="pull_request_milestone">合并请求收入里程碑</Checkbox>
-                  <span>合并请求被记录或取消记录于里程碑中</span>
-                </span> */}
-                {/* <span>
-                  <Checkbox value="pull_request_comment">合并请求被评论</Checkbox>
-                  <span>合并请求评论被创建、编辑或删除</span>
-                </span> */}
-                {/* <span>
-                  <Checkbox value="pull_request_label">合并请求标签</Checkbox>
-                  <span>合并请求的标签被更新或清除</span>
-                </span> */}
-                <span>
-                  <Checkbox value="pull_request_review">合并请求审查</Checkbox>
-                  <span>合并请求被批准、拒绝或提出审查意见，审查人员的修改，审查线程已解决或未解决</span>
-                </span>
-                {/* <span>
-                  <Checkbox value="pull_request_sync">合并请求被同步</Checkbox>
-                  <span>合并请求被同步</span>
-                </span> */}
-              </div>
-            </Checkbox.Group>
-            { eventFlag && <span style={{color:"#DF0002"}}>请选择自定义事件！</span>}
-          </div>
-          <Form.Item 
-            label="分支过滤" 
-            className="topLine" 
-            help={<span>推送、创建，删除分支事件的分支白名单，使用 glob 模式匹配指定。若为空或 *，则将报告所有分支的事件。语法文档见<a href="github.com/gobwas/glob" target="_blank" className="hoverLine color-blue">github.com/gobwas/glob</a>。示例：master,{'{'}master,release*{'}'}。</span>}
-            colon={false}
-            style={{marginTop:'15px'}}
-          >
-            {getFieldDecorator("branch_filter",{
-              rules:[]
-            })(
-              <Input size="large"/>
-            )}
-          </Form.Item>
-          <Form.Item 
-            className="topLine bottomLine" 
-            colon={false}
-            style={{height:"110px",paddingBottom:"0px"}}
-          >
-            {getFieldDecorator("active",{
-              valuePropName:"checked"
-            })(
-              <Checkbox>激活<span className="subCbDesc">激活后触发事件的信息将发送到此Webhook地址</span></Checkbox>
-            )}
-          </Form.Item>
-          
-          <Button type="primary" onClick={submit} className="ml20" style={{width:id?"":"100px"}}>{id ? "更新Webhook":"添加"}</Button>
-          {
-            id && <Button type="danger" className="ml20" onClick={deleteFunc}>删除</Button>
-          }
-        </Form>
-      </div>
-      { id && <PushHistory id={id} owner={owner} projectsId={projectsId} showNotification={showNotification}/> }
-    </div>
-  )
-}
-export default Form.create()(forwardRef(New));

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

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

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

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

src/forge/Settings/new_tags.js

@@ -445,7 +445,7 @@ class NewTags extends Component {
                         message: "请填写标签名字",
                       },
                     ],
-                  })(<Input placeholder="名称，10字以内" maxLength="10" />)}
+                  })(<Input placeholder="标签名字" maxLength="20" />)}
                 </Form.Item>
 
                 <Form.Item className="inputcount">
@@ -507,8 +507,8 @@ class NewTags extends Component {
         >
           <div className="dialogdiv">
             <Input
-              placeholder="名称,10字以内"
-              maxLength="10"
+              placeholder="标签名字"
+              maxLength="20"
               className="inptwidth"
               value={this.state.name}
               onChange={this.changmodelname}

src/forge/Sonar/Index.jsx

@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from 'react';
+import sonar from '../Images/sonar.png';
+import { FlexAJ } from '../Component/layout';
+import { Button } from 'antd';
+import './index.scss';
+import axios from 'axios';
+
+function Index(props) {
+  const [ spining , setSpining ] = useState(false);
+  const [ data , setData ] = useState(null);
+
+  const permission = props.projectDetail && props.projectDetail.permission;
+  const { owner , projectsId } = props.match.params;
+
+  useEffect(()=>{
+    if(permission && permission!=="Reporter"){
+      run();
+    }
+  },[permission])
+
+  function startCheck() {
+    setSpining(true);
+    run();
+  }
+
+  function run() {
+    const url = `/${owner}/${projectsId}/sonarqube.json`;
+    axios.get(url).then(result=>{
+      if(result){
+        setSpining(false);
+        setData(result.data);
+      }
+    }).catch(error=>{setSpining(false);})
+  }
+
+  return(
+    <div className="sonarBox">
+      <FlexAJ>
+        <img src={sonar} alt=""/>
+        <Button type={"primary"} loading={spining} onClick={startCheck} disabled={permission !== "Admin" && permission !== "Owner" && permission !== "Manager"}>{spining ? "分析中":"质量分析"}</Button>
+      </FlexAJ>
+      <div className="sonarDesc">
+        <p>1. 基于 Sonar 的代码质量分析，支持对项目进行文件数、重复率统计、代码逻辑缺陷扫描等功能，并给出对应解决报告;</p>
+        <p>2. 目前支持 Java、JavaScript、C++、Go、Python、PHP、Ruby、Groovy、Lua、TypeScript、Web、XML；</p>
+        <p>3. 默认支持代码文本格式全为 UTF-8，其他编码可能会产生乱码；</p>
+        <p>4. 仅保存最近一次分析结果;</p>
+      </div>
+      {
+        data && data.length>0 && data.map((i,k)=>{
+          return(
+            <div className="sonarData">
+              <p className="color-grey-9 font-16">分支：<span className="color-grey-6">{i.branch_name}</span></p>
+              <div>
+                <span className="color-grey-9 mr30">开始时间：<span className="color-grey-6">{i.created_at}</span></span>
+                <span className="color-grey-9">结束时间：<span className="color-grey-6">{i.updated_at}</span></span>
+              </div>
+              <ul className="sonarList">
+                <li>
+                  <span>{i.bug_num || "0"}</span>
+                  <span>bugs</span>
+                </li>
+                <li>
+                  <span>{i.loopholes || "0"}</span>
+                  <span>漏洞</span>
+                </li>
+                <li>
+                  <span>{i.repetition_rate || "--"}</span>
+                  <span>重复</span>
+                </li>
+                <li>
+                  <span>{i.file_num || "0"}</span>
+                  <span>文件数</span>
+                </li>
+              </ul>
+            </div>
+          )
+        })
+      }
+    </div>
+  )
+}
+export default Index;

src/forge/Sonar/index.scss

@@ -0,0 +1,55 @@
+.sonarBox{
+  width: 1200px;
+  margin:0px auto;
+  padding:25px 0px;
+  .sonarDesc{
+    margin-top: 25px;
+    font-size: 15px;
+    color: #333;
+    p{
+      line-height: 22px;
+      margin-bottom: 10px!important;
+    }
+  }
+  .sonarData{
+    border:1px solid #eee;
+    border-radius: 4px;
+    padding:10px 20px;
+    margin-top: 20px;
+  }
+  .sonarList{
+    display: flex;
+    margin-top: 10px;
+    li{
+      min-width: 150px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+      margin-right: 10px;
+      border-radius: 4px;
+      &:last-child{
+        margin-right: 0px;
+        flex:1;
+        align-items: flex-end;
+      }
+      &:last-child::after{
+        height: 0px;
+      }
+      &::after{
+        position: absolute;
+        right: 0px;
+        height: 30px;
+        width: 1px;
+        content: "";
+        background-color: #eee;
+        top:50%;
+        margin-top: -15px;
+      }
+      span{
+        color: #666;
+      }
+    }
+  }
+}

src/forge/Source/Index.scss

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

src/forge/Team/Group/GroupDetailMember.jsx

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

src/forge/Team/ListItem.jsx

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

src/forge/Team/Sub/Detail.jsx

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

src/forge/Version/version.js

@@ -58,9 +58,6 @@ class version extends Component {
 
   renderList = (releases) => {
     const { projectsId , owner } = this.props.match.params;
-    const { isManager , isDeveloper } = this.props;
-    const type = this.props.projectDetail && this.props.projectDetail.type;
-
     if (releases && releases.length > 0) {
       return (
         releases.map((item, key) => {
@@ -77,10 +74,7 @@ class version extends Component {
               <div className="versionInfo_right">
                 <span className="versionName">
                   <span className="task-hide">{item.name}</span>
-                  {
-                    (isManager || isDeveloper) && type !==2 &&
-                    <Link to={`/projects/${owner}/${projectsId}/releases/${item.version_id}/update`} className="color-blue ml3 font-12">（编辑）</Link>
-                  }
+                  <Link to={`/projects/${owner}/${projectsId}/releases/${item.version_id}/update`} className="color-blue ml3 font-12">（编辑）</Link>
                 </span>
                 <span className="color-grey-3">
                   <i className={`${item.bodyshow ? "iconfont icon-sanjiaoxing-down color-grey-8 mr3 font-14":"iconfont icon-triangle color-grey-8 mr3 font-14"}`} onClick={()=>this.showBody(key,item.bodyshow)}></i>
@@ -106,14 +100,14 @@ class version extends Component {
 
   render() {
     const { projectsId ,owner } = this.props.match.params;
-    const { data , releases , isSpin } = this.state;
-    const type = this.props.projectDetail && this.props.projectDetail.type;
+    const { data , releases , isSpin } = this.state
+
     return (
       <div className="main" style={{padding:"0px"}}>
         <div className="topWrapper" style={{padding:"15px 20px"}}>
           <span className="font-18 color-grey-3">版本发布</span>
           {
-            data && data.user_permission && type !== 2 ?
+            data && data.user_permission ?
               <Link to={`/projects/${owner}/${projectsId}/releases/new`} className="topWrapper_btn_new">+ 发布新版</Link>
               : ''
           }