Merge branch 'develop'

# Conflicts:
#	public/css/edu-purge.css

package-lock.json

@@ -6,30 +6,35 @@
   "dependencies": {
     "@ant-design/colors": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
-      "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
+      "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=",
       "requires": {
         "tinycolor2": "^1.4.1"
       }
     },
     "@ant-design/create-react-context": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@ant-design/create-react-context/-/create-react-context-0.2.5.tgz",
-      "integrity": "sha512-1rMAa4qgP2lfl/QBH9i78+Gjxtj9FTMpMyDGZsEBW5Kih72EuUo9958mV8PgpRkh4uwPSQ7vVZWXeyNZXVAFDg==",
+      "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=",
       "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.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
-      "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
+      "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz",
+      "integrity": "sha1-e5wI3/1PXUHbZn2dvl4BB9C9mko="
     },
     "@ant-design/icons-react": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons-react/-/icons-react-2.0.1.tgz",
-      "integrity": "sha512-r1QfoltMuruJZqdiKcbPim3d8LNsVPB733U0gZEUSxBLuqilwsW28K2rCTWSMTjmFX7Mfpf+v/wdiFe/XCqThw==",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-react/download/@ant-design/icons-react-2.0.1.tgz",
+      "integrity": "sha1-F6JRNXGrMXrKKSfljOol3THlNvs=",
       "requires": {
         "@ant-design/colors": "^3.1.0",
         "babel-runtime": "^6.26.0"
@@ -446,8 +451,8 @@
     },
     "@types/react-slick": {
       "version": "0.23.4",
-      "resolved": "https://registry.npmjs.org/@types/react-slick/-/react-slick-0.23.4.tgz",
-      "integrity": "sha512-vXoIy4GUfB7/YgqubR4H7RALo+pRdMYCeLgWwV3MPwl5pggTlEkFBTF19R7u+LJc85uMqC7RfsbkqPLMQ4ab+A==",
+      "resolved": "https://registry.npm.taobao.org/@types/react-slick/download/@types/react-slick-0.23.4.tgz",
+      "integrity": "sha1-yX4qnn49GTPGhZO46CdS+rHozlM=",
       "requires": {
         "@types/react": "*"
       }
@@ -863,9 +868,9 @@
       }
     },
     "antd": {
-      "version": "3.26.16",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-3.26.16.tgz",
-      "integrity": "sha512-EYRwlEf8FCPCVRk5yDcgjSZOC0exu+m75SwlSQU+Mh17f9wGhLeL2/DV7/Sra1r+BZlfiahFdkgrLY7UgMMBEQ==",
+      "version": "3.26.20",
+      "resolved": "https://registry.nlark.com/antd/download/antd-3.26.20.tgz",
+      "integrity": "sha1-8/Vw76qllQoUSULyHrKqqgiOlAc=",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "@ant-design/icons": "~2.1.1",
@@ -925,16 +930,16 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
           "requires": {
             "performance-now": "^2.1.0"
           }
         },
         "rc-pagination": {
-          "version": "1.20.14",
-          "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.20.14.tgz",
-          "integrity": "sha512-sNKwbFrxiqATqcIIShfrFs8BT03n4UUwTAMYae+JhHTmILQmXdvimEnZbVuWcno6G02DAJcLrFpmkn1h2tmEJw==",
+          "version": "1.20.15",
+          "resolved": "https://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.20.15.tgz",
+          "integrity": "sha1-zLTNDpvU5H9y8p6kMsA1C/ez2Ac=",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -944,8 +949,8 @@
         },
         "rc-rate": {
           "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.5.1.tgz",
-          "integrity": "sha512-3iJkNJT8xlHklPCdeZtUZmJmRVUbr6AHRlfSsztfYTXVlHrv2TcPn3XkHsH+12j812WVB7gvilS2j3+ffjUHXg==",
+          "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=",
           "requires": {
             "classnames": "^2.2.5",
             "prop-types": "^15.5.8",
@@ -955,8 +960,8 @@
         },
         "rc-select": {
           "version": "9.2.3",
-          "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-9.2.3.tgz",
-          "integrity": "sha512-WhswxOMWiNnkXRbxyrj0kiIvyCfo/BaRPaYbsDetSIAU2yEDwKHF798blCP5u86KLOBKBvtxWLFCkSsQw1so5w==",
+          "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=",
           "requires": {
             "babel-runtime": "^6.23.0",
             "classnames": "2.x",
@@ -974,8 +979,8 @@
         },
         "rc-tree": {
           "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz",
-          "integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==",
+          "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=",
           "requires": {
             "@ant-design/create-react-context": "^0.2.4",
             "classnames": "2.x",
@@ -1083,8 +1088,8 @@
     },
     "array-tree-filter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
-      "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+      "resolved": "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz",
+      "integrity": "sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA="
     },
     "array-union": {
       "version": "1.0.2",
@@ -3760,8 +3765,8 @@
     },
     "copy-to-clipboard": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
-      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
+      "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=",
       "requires": {
         "toggle-selection": "^1.0.6"
       }
@@ -4847,7 +4852,7 @@
     },
     "dom-closest": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
       "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
       "requires": {
         "dom-matches": ">=1.0.1"
@@ -4891,7 +4896,7 @@
     },
     "dom-matches": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
       "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
     },
     "dom-scroll-into-view": {
@@ -5013,8 +5018,8 @@
     },
     "draft-js": {
       "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
-      "integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
+      "resolved": "https://registry.npm.taobao.org/draft-js/download/draft-js-0.10.5.tgz",
+      "integrity": "sha1-v6m+sBj+BTPbsI1mdcNxprCPp0I=",
       "requires": {
         "fbjs": "^0.8.15",
         "immutable": "~3.7.4",
@@ -5144,7 +5149,7 @@
     },
     "enquire.js": {
       "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz",
       "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
     },
     "entities": {
@@ -5663,7 +5668,7 @@
     },
     "eventlistener": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
       "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
     },
     "events": {
@@ -7920,7 +7925,7 @@
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
@@ -8761,7 +8766,7 @@
     },
     "immutable": {
       "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
       "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
     },
     "import-fresh": {
@@ -9175,9 +9180,9 @@
       }
     },
     "is-mobile": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.1.tgz",
-      "integrity": "sha512-6zELsfVFr326eq2CI53yvqq6YBanOxKBybwDT+MbMS2laBnK6Ez8m5XHSuTQQbnKRfpDzCod1CMWW5q3wZYMvA=="
+      "version": "2.2.2",
+      "resolved": "https://registry.nlark.com/is-mobile/download/is-mobile-2.2.2.tgz",
+      "integrity": "sha1-9snF1Q7gElTOBec5vdg18e1OmVQ="
     },
     "is-npm": {
       "version": "1.0.0",
@@ -10349,7 +10354,7 @@
     },
     "lodash.throttle": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.uniq": {
@@ -11404,8 +11409,8 @@
     },
     "omit.js": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
-      "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
+      "resolved": "https://registry.npm.taobao.org/omit.js/download/omit.js-1.0.2.tgz",
+      "integrity": "sha1-kaFPDrqEBm36AVvzDkdMR/MLyFg=",
       "requires": {
         "babel-runtime": "^6.23.0"
       }
@@ -14208,9 +14213,9 @@
       }
     },
     "rc-calendar": {
-      "version": "9.15.10",
-      "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.10.tgz",
-      "integrity": "sha512-xh1A3rYejKskAvkjnd9BcHXFbBnAYsHMGHBdtoAkbwp43B6yEieNL0g0Tzz8s1gApDZV2j5vF1jJ9IIpPYFNLw==",
+      "version": "9.15.11",
+      "resolved": "https://registry.npm.taobao.org/rc-calendar/download/rc-calendar-9.15.11.tgz",
+      "integrity": "sha1-zh5eqOTXdDW+ZqjHfbEvHw+aNF8=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "2.x",
@@ -14223,8 +14228,8 @@
     },
     "rc-cascader": {
       "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-0.17.5.tgz",
-      "integrity": "sha512-WYMVcxU0+Lj+xLr4YYH0+yXODumvNXDcVEs5i7L1mtpWwYkubPV/zbQpn+jGKFCIW/hOhjkU4J1db8/P/UKE7A==",
+      "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=",
       "requires": {
         "array-tree-filter": "^2.1.0",
         "prop-types": "^15.5.8",
@@ -14237,8 +14242,8 @@
     },
     "rc-checkbox": {
       "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.1.8.tgz",
-      "integrity": "sha512-6qOgh0/by0nVNASx6LZnhRTy17Etcgav+IrI7kL9V9kcDZ/g7K14JFlqrtJ3NjDq/Kyn+BPI1st1XvbkhfaJeg==",
+      "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=",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "2.x",
@@ -14248,8 +14253,8 @@
     },
     "rc-collapse": {
       "version": "1.11.8",
-      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.11.8.tgz",
-      "integrity": "sha512-8EhfPyScTYljkbRuIoHniSwZagD5UPpZ3CToYgoNYWC85L2qCbPYF7+OaC713FOrIkp6NbfNqXsITNxmDAmxog==",
+      "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=",
       "requires": {
         "classnames": "2.x",
         "css-animation": "1.x",
@@ -14262,8 +14267,8 @@
     },
     "rc-dialog": {
       "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-7.6.1.tgz",
-      "integrity": "sha512-KUKf+2eZ4YL+lnXMG3hR4ZtIhC9glfH27NtTVz3gcoDIPAf3uUvaXVRNoDCiSi+OGKLyIb/b6EoidFh6nQC5Wg==",
+      "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=",
       "requires": {
         "babel-runtime": "6.x",
         "rc-animate": "2.x",
@@ -14272,8 +14277,8 @@
     },
     "rc-drawer": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-3.1.3.tgz",
-      "integrity": "sha512-2z+RdxmzXyZde/1OhVMfDR1e/GBswFeWSZ7FS3Fdd0qhgVdpV1wSzILzzxRaT481ItB5hOV+e8pZT07vdJE8kg==",
+      "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=",
       "requires": {
         "classnames": "^2.2.6",
         "rc-util": "^4.16.1",
@@ -14282,8 +14287,8 @@
     },
     "rc-dropdown": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-2.4.1.tgz",
-      "integrity": "sha512-p0XYn0wrOpAZ2fUGE6YJ6U8JBNc5ASijznZ6dkojdaEfQJAeZtV9KMEewhxkVlxGSbbdXe10ptjBlTEW9vEwEg==",
+      "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=",
       "requires": {
         "babel-runtime": "^6.26.0",
         "classnames": "^2.2.6",
@@ -14294,8 +14299,8 @@
     },
     "rc-editor-core": {
       "version": "0.8.10",
-      "resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.10.tgz",
-      "integrity": "sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw==",
+      "resolved": "https://registry.npm.taobao.org/rc-editor-core/download/rc-editor-core-0.8.10.tgz",
+      "integrity": "sha1-byFbxd+cM/+p9sWzDKc6favoq3w=",
       "requires": {
         "babel-runtime": "^6.26.0",
         "classnames": "^2.2.5",
@@ -14308,8 +14313,8 @@
     },
     "rc-editor-mention": {
       "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz",
-      "integrity": "sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q==",
+      "resolved": "https://registry.npm.taobao.org/rc-editor-mention/download/rc-editor-mention-1.1.13.tgz",
+      "integrity": "sha1-nxyrEGX4awFSOEAyF5DCqxKsXos=",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "^2.2.5",
@@ -14337,9 +14342,9 @@
       }
     },
     "rc-hammerjs": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/rc-hammerjs/-/rc-hammerjs-0.6.9.tgz",
-      "integrity": "sha512-4llgWO3RgLyVbEqUdGsDfzUDqklRlQW5VEhE3x35IvhV+w//VPRG34SBavK3D2mD/UaLKaohgU41V4agiftC8g==",
+      "version": "0.6.10",
+      "resolved": "https://registry.npm.taobao.org/rc-hammerjs/download/rc-hammerjs-0.6.10.tgz",
+      "integrity": "sha1-GDGjvY8hmXAL/MWtayCjVjCuteA=",
       "requires": {
         "babel-runtime": "6.x",
         "hammerjs": "^2.0.8",
@@ -14347,9 +14352,9 @@
       }
     },
     "rc-input-number": {
-      "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==",
+      "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=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.0",
@@ -14360,8 +14365,8 @@
     },
     "rc-mentions": {
       "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-0.4.2.tgz",
-      "integrity": "sha512-DTZurQzacLXOfVuiHydGzqkq7cFMHXF18l2jZ9PhWUn2cqvOSY3W4osN0Pq29AOMOBpcxdZCzgc7Lb0r/bgkDw==",
+      "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=",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "classnames": "^2.2.6",
@@ -14389,8 +14394,8 @@
     },
     "rc-notification": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-3.3.1.tgz",
-      "integrity": "sha512-U5+f4BmBVfMSf3OHSLyRagsJ74yKwlrQAtbbL5ijoA0F2C60BufwnOcHG18tVprd7iaIjzZt1TKMmQSYSvgrig==",
+      "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=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "2.x",
@@ -14411,9 +14416,9 @@
       }
     },
     "rc-progress": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.5.2.tgz",
-      "integrity": "sha512-ajI+MJkbBz9zYDuE9GQsY5gsyqPF7HFioZEDZ9Fmc+ebNZoiSeSJsTJImPFCg0dW/5WiRGUy2F69SX1aPtSJgA==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npm.taobao.org/rc-progress/download/rc-progress-2.5.3.tgz",
+      "integrity": "sha1-APAblb2+GFbTpfgiQgUZAui3qOc=",
       "requires": {
         "babel-runtime": "6.x",
         "prop-types": "^15.5.8"
@@ -14430,8 +14435,8 @@
     },
     "rc-resize-observer": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-0.1.3.tgz",
-      "integrity": "sha512-uzOQEwx83xdQSFOkOAM7x7GHIQKYnrDV4dWxtCxyG1BS1pkfJ4EvDeMfsvAJHSYkQXVBu+sgRHGbRtLG3qiuUg==",
+      "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=",
       "requires": {
         "classnames": "^2.2.1",
         "rc-util": "^4.13.0",
@@ -14459,8 +14464,8 @@
     },
     "rc-slider": {
       "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-8.7.1.tgz",
-      "integrity": "sha512-WMT5mRFUEcrLWwTxsyS8jYmlaMsTVCZIGENLikHsNv+tE8ThU2lCoPfi/xFNUfJFNFSBFP3MwPez9ZsJmNp13g==",
+      "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=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.5",
@@ -14474,8 +14479,8 @@
     },
     "rc-steps": {
       "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-3.5.0.tgz",
-      "integrity": "sha512-2Vkkrpa7PZbg7qPsqTNzVDov4u78cmxofjjnIHiGB9+9rqKS8oTLPzbW2uiWDr3Lk+yGwh8rbpGO1E6VAgBCOg==",
+      "resolved": "https://registry.npm.taobao.org/rc-steps/download/rc-steps-3.5.0.tgz",
+      "integrity": "sha1-NrKn8fSZB7DZA2OISxhiPK+ftgA=",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "^2.2.3",
@@ -14484,9 +14489,9 @@
       }
     },
     "rc-switch": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-1.9.0.tgz",
-      "integrity": "sha512-Isas+egaK6qSk64jaEw4GgPStY4umYDbT7ZY93bZF1Af+b/JEsKsJdNOU2qG3WI0Z6tXo2DDq0kJCv8Yhu0zww==",
+      "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=",
       "requires": {
         "classnames": "^2.2.1",
         "prop-types": "^15.5.6",
@@ -14495,8 +14500,8 @@
     },
     "rc-table": {
       "version": "6.10.15",
-      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-6.10.15.tgz",
-      "integrity": "sha512-LAr0M/gqt+irOjvPNBLApmQ0CUHNOfKsEBhu1uIuB3OlN1ynA9z+sdoTQyNd9+8NSl0MYnQOOfhtLChAY7nU0A==",
+      "resolved": "https://registry.nlark.com/rc-table/download/rc-table-6.10.15.tgz",
+      "integrity": "sha1-GB9McMT9dPZX7o8jGW5+sIoDZco=",
       "requires": {
         "classnames": "^2.2.5",
         "component-classes": "^1.2.6",
@@ -14510,8 +14515,8 @@
     },
     "rc-tabs": {
       "version": "9.7.0",
-      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.7.0.tgz",
-      "integrity": "sha512-kvmgp8/MfLzFZ06hWHignqomFQ5nF7BqKr5O1FfhE4VKsGrep52YSF/1MvS5oe0NPcI9XGNS2p751C5v6cYDpQ==",
+      "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=",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "babel-runtime": "6.x",
@@ -14528,8 +14533,8 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
           "requires": {
             "performance-now": "^2.1.0"
           }
@@ -14538,8 +14543,8 @@
     },
     "rc-time-picker": {
       "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.7.3.tgz",
-      "integrity": "sha512-Lv1Mvzp9fRXhXEnRLO4nW6GLNxUkfAZ3RsiIBsWjGjXXvMNjdr4BX/ayElHAFK0DoJqOhm7c5tjmIYpEOwcUXg==",
+      "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=",
       "requires": {
         "classnames": "2.x",
         "moment": "2.x",
@@ -14551,8 +14556,8 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
           "requires": {
             "performance-now": "^2.1.0"
           }
@@ -14561,8 +14566,8 @@
     },
     "rc-tooltip": {
       "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.7.3.tgz",
-      "integrity": "sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==",
+      "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=",
       "requires": {
         "babel-runtime": "6.x",
         "prop-types": "^15.5.8",
@@ -14610,8 +14615,8 @@
     },
     "rc-tree-select": {
       "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.9.4.tgz",
-      "integrity": "sha512-0HQkXAN4XbfBW20CZYh3G+V+VMrjX42XRtDCpyv6PDUm5vikC0Ob682ZBCVS97Ww2a5Hf6Ajmu0ahWEdIEpwhg==",
+      "resolved": "https://registry.nlark.com/rc-tree-select/download/rc-tree-select-2.9.4.tgz",
+      "integrity": "sha1-aqeU4fDmXGbEBqoKKg50/QpVewk=",
       "requires": {
         "classnames": "^2.2.1",
         "dom-scroll-into-view": "^1.2.1",
@@ -14628,8 +14633,8 @@
       "dependencies": {
         "rc-tree": {
           "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz",
-          "integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==",
+          "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=",
           "requires": {
             "@ant-design/create-react-context": "^0.2.4",
             "classnames": "2.x",
@@ -14642,8 +14647,8 @@
         },
         "rc-trigger": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-3.0.0.tgz",
-          "integrity": "sha512-hQxbbJpo23E2QnYczfq3Ec5J5tVl2mUDhkqxrEsQAqk16HfADQg+iKNWzEYXyERSncdxfnzYuaBgy764mNRzTA==",
+          "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=",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -14655,18 +14660,14 @@
           },
           "dependencies": {
             "rc-animate": {
-              "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==",
+              "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=",
               "requires": {
-                "babel-runtime": "6.x",
-                "classnames": "^2.2.5",
-                "component-classes": "^1.2.6",
-                "fbjs": "^0.8.16",
-                "prop-types": "15.x",
+                "@ant-design/css-animation": "^1.7.2",
+                "classnames": "^2.2.6",
                 "raf": "^3.4.0",
-                "rc-util": "^4.5.0",
-                "react-lifecycles-compat": "^3.0.4"
+                "rc-util": "^4.15.3"
               }
             }
           }
@@ -15105,9 +15106,9 @@
       }
     },
     "react-lazy-load": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.0.13.tgz",
-      "integrity": "sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ=",
+      "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=",
       "requires": {
         "eventlistener": "0.0.1",
         "lodash.debounce": "^4.0.0",
@@ -15245,8 +15246,8 @@
     },
     "react-slick": {
       "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==",
+      "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",
@@ -16090,8 +16091,8 @@
     },
     "rmc-feedback": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/rmc-feedback/-/rmc-feedback-2.0.0.tgz",
-      "integrity": "sha512-5PWOGOW7VXks/l3JzlOU9NIxRpuaSS8d9zA3UULUCuTKnpwBHNvv1jSJzxgbbCQeYzROWUpgKI4za3X4C/mKmQ==",
+      "resolved": "https://registry.npm.taobao.org/rmc-feedback/download/rmc-feedback-2.0.0.tgz",
+      "integrity": "sha1-y8bLOuY8emNe7w4l5PuvWsNm7qo=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.5"
@@ -16674,8 +16675,8 @@
     },
     "shallow-equal": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
-      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+      "resolved": "https://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.2.1.tgz",
+      "integrity": "sha1-TBar+lYEOqINBQMk76aJQLDaedo="
     },
     "shallowequal": {
       "version": "1.1.0",

public/css/edu-purge.css

@@ -6702,4 +6702,13 @@ ul.count_ul li:not(:last-child):after {
 }
 input.ant-input-lg::placeholder{
 font-size: 14px !important;
+}
+p{
+  margin-bottom: 0px!important;
+}
+.toprightNum{
+  position: absolute;
+  right: 0px;
+  top:4px;
+  color: #999;
 }

src/AppConfig.js

@@ -58,7 +58,7 @@ export function initAxiosInterceptors(props) {
     },
     err => {
       return Promise.reject(err);
-    });
+  });
 
   axios.interceptors.response.use(function (response) {
     if (response === undefined) {

src/forge/About/Index.jsx

@@ -69,7 +69,7 @@ function Index(props){
     <div className="aboutPanels">
       <div className="aboutContent">
         <AlignCenterBetween style={{padding:"14px 20px"}}>
-          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目简介</span>
+          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目概览</span>
           { editOpration && !edit && <a onClick={editContent} className="color-blue">编辑</a> }
         </AlignCenterBetween>
         {
@@ -117,7 +117,7 @@ function Index(props){
             {content ? 
               <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
               :
-              <div>暂无简介~</div>
+              <div>暂无概览~</div>
             }
             {attachments && attachments.length > 0 &&
               <Attachments

src/forge/Component/Releases.jsx

@@ -24,7 +24,7 @@ function Releases({owner,projectsId,releaseVersions}){
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
                 <p className="font-16 color-grey-6">
-                  <Link to={`/projects/${owner}/${projectsId}/releases/8/update`}>{item.name}</Link>
+                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
                   <span className="font-12 laterest ml5">最新</span>
                 </p>
                 <p className="color-grey-9 font-13">{item.created_at}</p>

src/forge/Divert/DivertModal.jsx

@@ -152,18 +152,18 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
             </Form.Item>
           }
           
-          <Form.Item label="仓库标识:">
+          <Form.Item label="仓库名称:">
             {getFieldDecorator("identifier",
               {
                 rules:[
-                  {required:true,message:"请输入仓库标识"},
+                  {required:true,message:"请输入仓库名称"},
                   {
                     validator:checkIdentifier
                   }
                 ]
               }
             )(
-              <Input placeholder="请输入仓库标识" autoComplete={"off"}/>
+              <Input placeholder="请输入仓库名称" autoComplete={"off"}/>
             )}
           </Form.Item>
         </Form>

src/forge/Head/Header.js

@@ -2,16 +2,14 @@ import React, { Component } from 'react';
 import AccountProfile from "../../modules/user/AccountProfile";
 import { getImageUrl } from 'educoder'
 import axios from 'axios';
-import { Modal, Input, message, notification , Dropdown , Menu ,Divider } from 'antd';
+import { Modal, Input, message, notification , Dropdown , Menu } from 'antd';
 
 import LoginDialog from '../../modules/login/LoginDialog';
 import GotoQQgroup from '../../modal/GotoQQgroup'
-// import 'antd/lib/modal/style/index.css';
-// import 'antd/lib/checkbox/style/index.css';
-// import 'antd/lib/radio/style/index.css';
-// import 'antd/lib/input/style/index.css';
+
 import '../../modules/tpm/TPMIndex.css';
 import logo from '../../modules/tpm/images/logo.png';
+
 import './header.scss';
 const $ = window.$
 // TODO 这部分脚本从公共脚本中直接调用

src/forge/Head/header.scss

@@ -5,7 +5,13 @@
   background:#fff;
   border-radius: 3px;
   .ant-menu-vertical > .ant-menu-item{
-    border:none
+    border:none;
+    height: 35px;
+    line-height: 35px;
+    margin:0px;
+  }
+  .ant-menu-vertical{
+    border:none;
   }
 }
 

src/forge/Main/CoderDepot.jsx

@@ -322,7 +322,7 @@ function CoderDepot(props){
                         lastCommit &&
                         <div className="listtablehead">
                           <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
-                          <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><p id="ptxt">{lastCommit && lastCommit.message}</p></div>
+                          <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><pre id="ptxt">{lastCommit && lastCommit.message}</pre></div>
                           { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
 
                           <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>

src/forge/Main/CoderRootCommit.js

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

src/forge/Main/Index.scss

@@ -227,7 +227,7 @@
           margin-bottom: 0px!important;
         }
       }
-      li{
+      & > li{
         height: 42px;
         display: flex;
         justify-content: space-between;

src/forge/Main/IndexItem.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { Tooltip } from 'antd';
 import { getImageUrl } from 'educoder';
+import { AlignCenter } from '../Component/layout';
 import { Link } from 'react-router-dom';
 import '../css/index.scss';
 import Nodata from '../Nodata';
@@ -33,8 +34,10 @@ class IndexItem extends Component {
               }
               <div className="p-r-Infos">
                 <div className="p-r-name">
-                  <Link to={`/projects/${item.author.login}/${item.identifier}`} className="hide-1 color-grey-3 font-18 task-hide " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}>
-                    {item.author.name}/{item.name}
+                  <AlignCenter>
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
+                      {item.author.name}/{item.name}
+                    </Link>
                     {
                       item.forked_from_project_id ?
                         <span className="ml5">
@@ -52,7 +55,7 @@ class IndexItem extends Component {
                         <i className="iconfont icon-jingxiang font-18 color-green" />
                       </span>:""
                     }
-                  </Link>
+                  </AlignCenter>
                   <span className="p-r-tags">
                     <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
                     <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>

src/forge/Main/sub/UpdateDescModal.jsx

@@ -35,11 +35,11 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
       className={"descmodal"}
     >
       <Form>
-        <Form.Item label="仓库描述">
+        <Form.Item label="项目简介">
           {getFieldDecorator("desc",{
             rules:[]
           })(
-            <TextArea placeholder="仓库描述" rows={4} maxLength={200}/>
+            <TextArea placeholder="请输入项目简介" rows={4} maxLength={200}/>
           )}
         </Form.Item>
         <Form.Item label="website">

src/forge/Merge/MergeItem.js

@@ -178,7 +178,7 @@ class MergeItem extends Component {
                       >
                         <div className="grid-item mr15 color-grey-9">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/merge/${item.pull_request_id}/updatemerge`}
+                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                             className="color-grey-9"
                           >
                             <i className="iconfont icon-bianji3 font-14 mr5"></i>

src/forge/Merge/merge.css

@@ -168,6 +168,7 @@ form .ant-cascader-picker, form .ant-select {
 }
 .linesContent > p{
   flex:1;
+  word-break: break-all;
 }
 .linesContent .lines{
   display: flex;

src/forge/New/Index.js

@@ -43,7 +43,8 @@ class Index extends Component {
       project_language_name: undefined,
       project_category_name: undefined,
       license_name: undefined,
-      ignore_name: undefined
+      ignore_name: undefined,
+      descNum:0
     }
   }
   componentDidMount = () => {
@@ -254,6 +255,13 @@ class Index extends Component {
     }
   }
 
+  changeDesc=(e)=>{
+    let value = e.target.value;
+    this.setState({
+      descNum:value ? value.length :0
+    })
+  }
+
   render() {
     const { getFieldDecorator } = this.props.form;
     // 项目类型：deposit-托管项目，mirror-镜像项目
@@ -273,7 +281,9 @@ class Index extends Component {
       license_list,
       ignore_list,
 
-      mirrorCheck
+      mirrorCheck,
+
+      descNum
     } = this.state;
     return (
       <div className="main back-white" style={{padding:"0px",border:"none"}}>
@@ -361,21 +371,23 @@ class Index extends Component {
                       required: true, message: '请填写项目名称'
                     }],
                   })(
-                    <Input placeholder="例如：团队协作方法与研究" />
-                  )}
-                </Form.Item>
-
-                <Form.Item
-                  label="项目简介"
-                >
-                  {getFieldDecorator('description', {
-                    rules: [{
-                      required: true, message: '请填写项目简介'
-                    }],
-                  })(
-                    <Input.TextArea placeholder="项目的介绍" autoSize={{ minRows: 2, maxRows: 6 }} />
+                    <Input placeholder="例如：团队协作方法与研究" maxLength={50}/>
                   )}
                 </Form.Item>
+                <div className="pr">
+                  <span className="toprightNum">{descNum}/200</span>
+                  <Form.Item
+                    label="项目简介"
+                  >
+                    {getFieldDecorator('description', {
+                      rules: [{
+                        required: true, message: '请填写项目简介'
+                      }],
+                    })(
+                      <Input.TextArea maxLength={200} placeholder="项目的介绍" autoSize={{ minRows: 2, maxRows: 6 }} onChange={this.changeDesc}/>
+                    )}
+                  </Form.Item>
+                </div>
                 <Form.Item
                   label="仓库名称"
                 >
@@ -384,7 +396,7 @@ class Index extends Component {
                       required: true, message: '请填写仓库名称'
                     }],
                   })(
-                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" />
+                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" maxLength={100} />
                   )}
                 </Form.Item>
                 <Form.Item

src/forge/Order/order.js

@@ -834,7 +834,7 @@ class order extends Component {
             )}
           {
             search_count > select_params.limit ?
-            <div className="mt30 mb10 edu-txt-center">
+            <div className="mt30 mb30 edu-txt-center">
               <Pagination
                 simple
                 defaultCurrent={select_params.page}

src/forge/Order/order_form.js

@@ -320,7 +320,7 @@ class order_form extends Component {
                         message: "请填写易修标题",
                       },
                     ]
-                  })(<Input placeholder="标题" size="large" />)}
+                  })(<Input placeholder="标题" size="large" maxLength={80}/>)}
                 </Form.Item>
                 <div className="quillContent">
                   <MDEditor

src/forge/Settings/Setting.js

@@ -231,7 +231,8 @@ class Setting extends Component {
     const { projectDetail } = this.props;
 
     const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
-    console.log(transfer);
+    let mirror = projectDetail && projectDetail.mirror;
+    let type = projectDetail && projectDetail.type;
     return (
       <div>
         <DivertModal 
@@ -270,12 +271,12 @@ class Setting extends Component {
                   )}
                 </Form.Item>
               </div>
-              <Form.Item label="仓库描述">
+              <Form.Item label="项目简介">
                 {getFieldDecorator("project_description", {
                   rules: [],
                 })(
                   <TextArea
-                    placeholder="请输入仓库描述"
+                    placeholder="请输入项目简介"
                     style={{ height: "80px" }} maxLength={200}
                   />
                 )}
@@ -311,7 +312,7 @@ class Setting extends Component {
                           <Checkbox 
                             key={key} 
                             value={item.index} 
-                            disabled={item.index === "home" || item.index === "activity" || item.index === "code"}
+                            disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && (type && type===2) && item.index === "pulls")}
                           >{item.name}</Checkbox>
                         )
                       })

src/forge/Team/Group/GroupDetails.jsx

@@ -102,7 +102,7 @@ export default ((props) => {
           group ?
             <div>
               <AlignCenterBetween>
-                <span className="color-grey-3">{group.nickname}</span>
+                <span className="color-grey-3 task-hide">{group.nickname}</span>
                 {group.is_member && !group.is_admin ?
                   <Popconfirm
                     title="确认离开团队吗？"

src/forge/Team/Group/GroupForm.jsx

@@ -24,6 +24,7 @@ export default Form.create()(
     const [check_box, setCheckBox] = useState(false);
     const [switch_box, setSwtichBox] = useState([]);
     const [onwers, setOnwers] = useState(false);
+    const [ descNum , setDescNum ] = useState(0);
     const [switch_box_code, setSwtichBoxCode] = useState(false);
     const [switch_box_pull, setSwtichBoxPull] = useState(false);
     const [switch_box_issue, setSwtichBoxIssue] = useState(false);
@@ -39,6 +40,7 @@ export default Form.create()(
         setFieldsValue({
           ...GroupDetail
         })
+        setDescNum(GroupDetail.description ? GroupDetail.description.length : 0);
       }
     }, [GroupDetail])
 
@@ -171,14 +173,19 @@ export default Form.create()(
                 [{ required: true, message: "请输入团队名称" }],
                 <Input placeholder="请输入团队名称"/>, true
               )}
-              {helper(
-                <span className="mb5">团队描述：<span className="color-grey-8">(描述团队的目的或作用)</span></span>,
-                "description",
-                [],
-                <TextArea
-                  placeholder="请输入团队描述"
-                />
-              )}
+              <div className="pr">
+                <span className="toprightNum">{descNum}/200</span>
+                {helper(
+                  <span className="mb5">团队描述：<span className="color-grey-8">(描述团队的目的或作用)</span></span>,
+                  "description",
+                  [],
+                  <TextArea
+                    placeholder="请输入团队描述"
+                    maxLength={200}
+                    onChange={(e)=>{setDescNum(e.target.value ? e.target.value.length :0)}}
+                  />
+                )}
+              </div>
               
               {helper(
                 '项目权限：',

src/forge/Team/Index.scss

@@ -277,6 +277,7 @@
   display: flex;
   align-items: flex-start;
   .g-sub-left{
+    width: 0;
     &>div{
       border:1px solid #eee;
     }

src/forge/Team/New.jsx

@@ -9,6 +9,8 @@ export default Form.create()(
   forwardRef(({ form , showNotification , history })=>{
     const [ image , setImage ] = useState(undefined);
     const [ imageFlag , setImageFlag] = useState(false);
+    const [ descNum ,setDescNum ] = useState(0);
+
     const { getFieldDecorator, validateFields , setFieldsValue } = form;
     const radioStyle = {
       display: 'block',
@@ -86,7 +88,7 @@ export default Form.create()(
                 ],
                 <Input
                   addonBefore={`https://`+ port ? `${hostname}:${port}/organize`:`${hostname}/organize`}
-                  placeholder="组织账号"
+                  placeholder="组织账号" maxLength={100}
                 />
               )}
               {helper(
@@ -94,24 +96,28 @@ export default Form.create()(
                 "nickname",
                 [{ required: true, message: "请输入组织名称" }],
                 <Input
-                  placeholder="请输入组织名称"
+                  placeholder="请输入组织名称" maxLength={100}
                 />
               )}
+              <div className="pr">
+                <span className="toprightNum">{descNum}/200</span>
+                {helper(
+                  '组织描述',
+                  "description",
+                  [{ required: true, message: "请输入组织描述" }],
+                  <Input.TextArea 
+                    autoSize={{ minRows: 3, maxRows: 5 }}
+                    placeholder="请输入组织描述" maxLength={200} 
+                    onChange={(e)=>{setDescNum(e.target.value ? e.target.value.length :0)}}
+                  />
+                )}
+              </div>
               
-              {helper(
-                '组织描述',
-                "description",
-                [{ required: true, message: "请输入组织描述" }],
-                <Input.TextArea 
-                  autoSize={{ minRows: 3, maxRows: 5 }}
-                  placeholder="请输入组织描述"
-                />
-              )}
               {helper(
                 '所在地区',
                 "location",
                 [],
-                <Input placeholder="请输入地址"/>,false
+                <Input placeholder="请输入地址" maxLength={50}/>,false
               )}
               {helper(
                 '可见性',

src/forge/Team/Setting/TeamSettingCommon.jsx

@@ -25,6 +25,7 @@ export default Form.create()(
     const [ password , setPassword ] = useState(undefined);
     const [ passwordFlag , setPasswordFlag ] = useState(false);
     const [ visible , setVisible ] = useState(false);
+    const [ descNum , setDescNum ] = useState(0);
     const { getFieldDecorator , validateFields , setFieldsValue } = form;
 
     useEffect(()=>{
@@ -33,6 +34,7 @@ export default Form.create()(
           ...organizeDetail
         })
         setImage(organizeDetail.avatar_url);
+        setDescNum(organizeDetail.description ? organizeDetail.description.length : 0);
       }
     },[organizeDetail])
 
@@ -119,20 +121,27 @@ export default Form.create()(
                     validator:checkname
                   }
                 ],
-                <Input placeholder="请输入组织账号" disabled/>,true
+                <Input placeholder="请输入组织账号" maxLength={100} disabled/>,true
               )}
               {helper(
                 "组织名称：",
                 "nickname",
                 [{ required: true, message: "请输入组织名称" }],
-                <Input placeholder="请输入组织名称" />,true
-              )}
-              {helper(
-                "组织描述：",
-                "description",
-                [],
-                <TextArea placeholder="请输入组织名称" />
+                <Input placeholder="请输入组织名称" maxLength={100}/>,true
               )}
+              <div className="pr">
+                <span className="toprightNum">{descNum}/200</span>
+                {helper(
+                  "组织描述：",
+                  "description",
+                  [],
+                  <TextArea 
+                    placeholder="请输入组织名称" 
+                    maxLength={200}
+                    onChange={(e)=>{setDescNum(e.target.value ? e.target.value.length :0)}}
+                  />
+                )}
+              </div>
               {helper(
                 "官方网站：",
                 "website",

src/forge/Version/version.js

@@ -103,8 +103,8 @@ class version extends Component {
     const { data , releases , isSpin } = this.state
 
     return (
-      <div className="main" style={{paddingTop:"0px"}}>
-        <div className="topWrapper">
+      <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 ?
@@ -113,7 +113,7 @@ class version extends Component {
           }
         </div>
         <div className="releasesVersion">
-          <Spin spinning={isSpin}><div style={{minHeight:"300px"}}>{this.renderList(releases)}</div></Spin>
+          <Spin spinning={isSpin}><div>{this.renderList(releases)}</div></Spin>
         </div>
       </div>
     )

src/forge/users/Index.scss

@@ -29,7 +29,7 @@ $flex:flex;
   & > div{
     margin-bottom: 20px;
     display: $flex;
-    align-items: flex-start;
+    align-items: center;
     padding:20px 25px;
     background-color:rgba(250,250,250,1);
     .imgBox{
@@ -52,6 +52,11 @@ $flex:flex;
     font-size: 12px;
     color: #888;
     margin-top: 3px;
+    margin-bottom: 0px;
+  }
+  .teamdesc{
+    word-break: break-all;
+    line-height: 20px;
   }
 }
 .infosType{

src/forge/users/Team-item.jsx

@@ -7,7 +7,7 @@ function TeamItem({item,history}){
       <div className="imgBox"><img alt="" src={getImageUrl(`/${item.avatar_url}`)}/></div>
       <div style={{flex:'1'}}>
         <span className="mb5 font-18 color-grey-3 task-hide">{item.name}</span>
-        <div className="task-hide-2">
+        <div className="task-hide-2 teamdesc">
           {item.description}
         </div>
         <p className="item-news">

src/index.css

@@ -47,6 +47,12 @@
 .markdown-body img{
   cursor: pointer;
 }
+.markdown-body pre ol.linenums,.markdown-body pre ul.linenums{
+  padding-left: 0px;
+}
+.markdown-body pre ol>li, .markdown-body pre ol>li{
+  list-style-type: none;
+}
 
 ol,
 ul,