diff --git a/package-lock.json b/package-lock.json
index be5897af5..e7021fff0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,7 +172,7 @@
       "dependencies": {
         "jsesc": {
           "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/jsesc/-/jsesc-2.5.2.tgz",
           "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
         }
       }
@@ -245,7 +245,7 @@
       "dependencies": {
         "chalk": {
           "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/chalk/-/chalk-2.4.2.tgz",
           "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "requires": {
             "ansi-styles": "^3.2.1",
@@ -341,12 +341,12 @@
         },
         "globals": {
           "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/globals/-/globals-11.12.0.tgz",
           "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
         },
         "ms": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
@@ -7011,7 +7011,7 @@
         },
         "promise": {
           "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/promise/-/promise-7.3.1.tgz",
           "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
           "requires": {
             "asap": "~2.0.3"
@@ -8694,6 +8694,14 @@
         }
       }
     },
+    "html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "requires": {
+        "void-elements": "3.1.0"
+      }
+    },
     "html-webpack-plugin": {
       "version": "4.5.2",
       "resolved": "http://173.15.15.82:8081/repository/npm-all/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz",
@@ -9140,6 +9148,29 @@
       "resolved": "http://173.15.15.82:8081/repository/npm-all/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
       "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
     },
+    "i18next": {
+      "version": "23.4.5",
+      "resolved": "https://registry.npmmirror.com/i18next/-/i18next-23.4.5.tgz",
+      "integrity": "sha512-XXALnva7/5H+kg7TjDsmzY3jRypuSJvjR1eUWtt11yUgsOqjZFq/mnaujJ/XpVWhUJU75QhCUhrZqAarlYpOSQ==",
+      "requires": {
+        "@babel/runtime": "^7.22.5"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.22.11",
+          "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.11.tgz",
+          "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
+          "requires": {
+            "regenerator-runtime": "^0.14.0"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+          "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+        }
+      }
+    },
     "iconv-lite": {
       "version": "0.6.3",
       "resolved": "http://173.15.15.82:8081/repository/npm-all/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -9404,7 +9435,7 @@
         },
         "chalk": {
           "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/chalk/-/chalk-2.4.2.tgz",
           "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "requires": {
             "ansi-styles": "^3.2.1",
@@ -14850,6 +14881,30 @@
         }
       }
     },
+    "react-i18next": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmmirror.com/react-i18next/-/react-i18next-13.2.0.tgz",
+      "integrity": "sha512-YD8xMc+I0jkHHLotd8ERMzZ53hMaCBVLCndbcbBveJn3FbppRP4jyYOAkmR8XItN01sTD9ilAjoEjpH1i42IgA==",
+      "requires": {
+        "@babel/runtime": "^7.22.5",
+        "html-parse-stringify": "^3.0.1"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.22.11",
+          "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.11.tgz",
+          "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
+          "requires": {
+            "regenerator-runtime": "^0.14.0"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+          "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+        }
+      }
+    },
     "react-infinite-scroller": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/react-infinite-scroller/-/react-infinite-scroller-1.2.6.tgz",
@@ -15984,7 +16039,7 @@
         },
         "date-fns": {
           "version": "1.30.1",
-          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/date-fns/-/date-fns-1.30.1.tgz",
           "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
         },
         "regenerator-runtime": {
@@ -19166,6 +19221,11 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "dev": true
     },
+    "void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
+    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "http://173.15.15.82:8081/repository/npm-all/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -20197,7 +20257,7 @@
         },
         "camelcase": {
           "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/camelcase/-/camelcase-5.3.1.tgz",
           "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
@@ -20234,7 +20294,7 @@
         },
         "del": {
           "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/del/-/del-4.1.1.tgz",
           "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
           "dev": true,
           "requires": {
@@ -20249,7 +20309,7 @@
         },
         "find-up": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/find-up/-/find-up-3.0.0.tgz",
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
@@ -20297,13 +20357,13 @@
         },
         "is-path-cwd": {
           "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
           "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
           "dev": true
         },
         "is-path-in-cwd": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
           "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
           "dev": true,
           "requires": {
@@ -20312,7 +20372,7 @@
         },
         "is-path-inside": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/is-path-inside/-/is-path-inside-2.1.0.tgz",
           "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
           "dev": true,
           "requires": {
@@ -20321,7 +20381,7 @@
         },
         "locate-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/locate-path/-/locate-path-3.0.0.tgz",
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
@@ -20331,13 +20391,13 @@
         },
         "ms": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "p-limit": {
           "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/p-limit/-/p-limit-2.3.0.tgz",
           "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
@@ -20346,7 +20406,7 @@
         },
         "p-locate": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/p-locate/-/p-locate-3.0.0.tgz",
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
@@ -20355,19 +20415,19 @@
         },
         "p-map": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/p-map/-/p-map-2.1.0.tgz",
           "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
           "dev": true
         },
         "p-try": {
           "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/p-try/-/p-try-2.2.0.tgz",
           "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
           "dev": true
         },
         "pify": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/pify/-/pify-4.0.1.tgz",
           "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
           "dev": true
         },
@@ -20379,7 +20439,7 @@
         },
         "semver": {
           "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
@@ -20407,7 +20467,7 @@
         },
         "supports-color": {
           "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "resolved": "http://173.15.15.82:8081/repository/npm-all/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
diff --git a/package.json b/package.json
index c75f9cb94..c549382c8 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "editor.md": "^1.5.0",
     "flv.js": "^1.5.0",
     "fs-extra": "3.0.1",
+    "i18next": "^23.4.5",
     "immutability-helper": "^2.6.6",
     "install": "^0.12.2",
     "intersection-observer": "^0.12.2",
@@ -77,6 +78,7 @@
     "react-dev-utils": "^9.2.0-next.80",
     "react-dom": "^16.13.1",
     "react-hot-loader": "^4.12.20",
+    "react-i18next": "^13.2.0",
     "react-infinite-scroller": "^1.2.4",
     "react-loadable": "^5.3.1",
     "react-monaco-editor": "0.37",
diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx
index 0b2901008..43aef1d6f 100644
--- a/src/forge/Information/Pages/headerPagebyCCF.jsx
+++ b/src/forge/Information/Pages/headerPagebyCCF.jsx
@@ -105,8 +105,8 @@ function HeaderPageCCF(props) {
 				// 新闻动态
 				data && data.cmsShow === 1 && newsList && newsList.length >= 0 &&
 				<div className="zone_news">
-					<p className="in_title mb10">{data.homepageCmsTitle}</p>
-					<div className="boxmain" style={{ display: "flex" }}>
+					<p className="in_title mb50">{data.homepageCmsTitle}</p>
+					<div className="boxmain mb100" style={{ display: "flex" }}>
 						<div className="zone_new_first">
 							<Slider {...setting}>
 								{
@@ -114,7 +114,9 @@ function HeaderPageCCF(props) {
 										newsList.map((i, k) => {
 											return (
 												<div className="regform" key={k}>
-													<img src={i.headImg || img1} alt="" height="595px" style={{ width: "100%", objectFit: "cover" }}  onClick={()=>{window.location.href=`/zone/${deptId}/newdetail/${i.id}`}} />
+													<div className="newsBannerBox">
+														<img src={i.headImg || img1} alt="" width="785px" style={{objectFit: "cover"}} onClick={()=>{window.location.href=`/zone/${deptId}/newdetail/${i.id}`}} />
+													</div>
 												</div>
 											)
 										})
@@ -123,7 +125,7 @@ function HeaderPageCCF(props) {
 								}
 							</Slider>
 						</div>
-						<ul className={`zone_new_three ${newsList.length < 4 ? "flexStart" : "spaceeTween"}`}>
+						<ul className={`zone_new_three_ccf ${newsList.length < 4 ? "flexStart" : "spaceeTween"}`}>
 							{
 								newsList.map((i, k) => {
 									return (
diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss
index d100e33d5..8a6874cfa 100644
--- a/src/forge/Information/indexZonebyCCF.scss
+++ b/src/forge/Information/indexZonebyCCF.scss
@@ -11,7 +11,6 @@
     width: 0;
 
     .slick-track {
-      margin-top: 20px;
       display: flex;
       height: 100%;
 
@@ -26,14 +25,21 @@
             img {
               position: relative;
               z-index: 1;
-              top: 30px;
             }
           }
+          .newsBannerBox{
+            height: 595px;
+            display: flex;
+            align-items: center;
+            align-content: center;
+          }
         }
       }
     }
 
     .slick-slider {
+      max-height: 595px;
+      overflow: hidden;
       &:hover {
         .slick-arrow {
           display: block !important;
@@ -76,7 +82,7 @@
         text-align: left;
         left: 50%;
         margin-left: -115px;
-        bottom: 5%;
+        bottom: 20%;
         position: absolute;
         display: flex !important;
         z-index: 2;
@@ -123,15 +129,12 @@
     }
   }
 
-  .zone_new_three {
+  .zone_new_three_ccf {
     margin-left: 30px;
     display: flex;
     flex-direction: column;
-    margin-bottom: 100px !important;
-    top: 50px;
     position: relative;
 
-
     .zone_n_value {
       margin-top: 20px;
 
@@ -157,7 +160,7 @@
       width: 385px;
       padding: 20px !important;
       border-radius: 4px;
-      margin-bottom: 21px !important;
+      margin-bottom: 25px !important;
       position: relative;
       overflow: hidden;
       word-break: break-all;
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 73ec3aa1c..ae3117a86 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -45,7 +45,6 @@ function Index(props) {
         const {branches, total_count} = result.data;
         setTotal(total_count)
         setList(branches);
-        setNewFormBranchName(branches[0].name);
       }
       setIsSpin(false);
     }).catch(error=>{setIsSpin(false);})
@@ -56,6 +55,7 @@ function Index(props) {
       const { author, name} = projectDetail;
       document.title = `所有分支-${author.name}/${name}`;
     }
+    setNewFormBranchName(projectDetail && projectDetail.default_branch);
   }, [projectDetail])
 
 
@@ -216,15 +216,15 @@ function Index(props) {
     setNewBranchError(undefined);
     const value = e.target.value;
     if (value) {
-      const str = '^*/';
+      const str = '^*';
       let reg = /\\/g;
       if(reg.test(value)){
-        setNewBranchError('分支名不能包含下列任何字符：^ * \\ /');
+        setNewBranchError('分支名不能包含下列任何字符：^ * \\ ');
       }else{
         for(var i=0;i<str.length;i++){
           let s = str[i];
           if(value.indexOf(s) > -1){
-            setNewBranchError('分支名不能包含下列任何字符：^ * \\ /');
+            setNewBranchError('分支名不能包含下列任何字符：^ * \\ ');
             return;
           }else{
             setNewBranchName(e.target.value);
@@ -387,7 +387,7 @@ function Index(props) {
           <Input placeholder='请输入分支名称' className='createBranchInput' onChange={checkNewBranchName} maxLength={100}/>
           <div className='newBranchError mt5'>{newBranchError}</div>
           <div className='font-15 createBranchLabel mt20'>分支起点</div>
-          <Select showSearch style={{width: '340px'}} className='createBranchInput' placeholder="请选择分支起点" onChange={(value)=>{setNewFormBranchName(value)}} getPopupContainer={triggerNode => triggerNode.parentNode}>
+          <Select showSearch style={{width: '340px'}} className='createBranchInput' placeholder="请选择分支起点" value={newFormBranchName} onChange={(value)=>{setNewFormBranchName(value)}} getPopupContainer={triggerNode => triggerNode.parentNode}>
             {branchList && branchList.map((item, index)=>{
               return <Select.Option value={item.name} key={index}>{item.name}</Select.Option>
             })}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 7ef9f2e8e..d4a0b6fac 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -371,7 +371,8 @@ class MessageCount extends Component {
     const userLogin = current_user && current_user.login;
     const otherPre = data && data.pull_request && projectDetail && (userLogin === data.pull_request.fork_project_user && projectDetail.permission==="");
     const permissionByCodeReview = projectDetail && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner" || projectDetail.permission === "Manager" || projectDetail.permission === "Developer" || otherPre);
-    const operate = userLogin && projectDetail && pr_status === 0 && permission;
+    const operate = userLogin && projectDetail && pr_status === 0 && permission ;
+    const cancelOperate = userLogin && pr_status === 0 && ( permissionByCodeReview || otherPre);
     const open_blockchain = project && project.open_blockchain;
     return (
       <div>
@@ -521,7 +522,7 @@ class MessageCount extends Component {
                       </Button>
                     )}
 
-                      {operate && (
+                      {cancelOperate && (
                         <Button
                           type="danger"
                           ghost
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 01267cf0b..f6ccc4d49 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -3,6 +3,7 @@ import { Link } from 'react-router-dom';
 import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete, Modal } from 'antd';
 import { Base64 } from 'js-base64';
 import { AlignCenter } from '../Component/layout';
+import { withTranslation } from 'react-i18next';
 
 import '../css/index.scss';
 import './new.scss'
@@ -380,6 +381,8 @@ class Index extends Component {
 
   changeName=(e)=>{
     let value = e.target.value;
+    const { t } = this.props;
+    console.log(this.props,t(value,'en'));
     if(value){
       let reg = /[a-zA-Z0-9]/g;
       let strArr  = value.match(reg);
@@ -552,7 +555,7 @@ class Index extends Component {
                         required: true, message: '请填写项目名称'
                       }],
                     })(
-                      <Input placeholder="例如：团队协作方法与研究" maxLength={50} />
+                      <Input placeholder="例如：团队协作方法与研究" maxLength={50}/>// onBlur={this.changeName}
                     )}
                   </Form.Item>
                 </AlignCenter>
@@ -760,6 +763,6 @@ class Index extends Component {
   }
 }
 const WrappedIndexForm = Form.create({ name: 'NewWorkForm' })(Index);
-export default WrappedIndexForm;
+export default withTranslation()(WrappedIndexForm);
 
 
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index b352fd0b3..0a72b60ee 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -169,15 +169,15 @@ class UserSubmitComponent extends Component {
       callback();
     }
     if (value) {
-      const str = '^*/';
+      const str = '^*';
       let reg = /\\/g;
       if(reg.test(value)){
-        callback(<span>分支名不能包含下列任何字符：^*\/</span>);
+        callback(<span>分支名不能包含下列任何字符：^*\</span>);
       }else{
         for(var i=0;i<str.length;i++){
           let s = str[i];
           if(value.indexOf(s) > -1){
-            callback(<span>分支名不能包含下列任何字符：^*\/</span>);
+            callback(<span>分支名不能包含下列任何字符：^*\</span>);
             return;
           }else{
             continue;