{helper(
From d6ac3631c715ab4067283629e40b4c803efbc226 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 30 Aug 2023 10:17:03 +0800
Subject: [PATCH 07/27] =?UTF-8?q?=E5=88=86=E6=94=AF=E5=90=8D=E5=8F=AF?=
=?UTF-8?q?=E5=8C=85=E5=90=AB/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 68 ++++++++++++++++++++++--
package.json | 2 +
src/forge/Main/tree/Index.jsx | 6 +--
src/forge/New/Index.js | 7 ++-
src/forge/Newfile/UserSubmitComponent.js | 6 +--
5 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 096b436e4..46e45a3dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1171,7 +1171,7 @@
},
"raf": {
"version": "3.4.1",
- "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+ "resolved": "http://173.15.15.82:8081/repository/npm-all/raf/-/raf-3.4.1.tgz",
"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
"requires": {
"performance-now": "^2.1.0"
@@ -1190,7 +1190,7 @@
},
"rc-rate": {
"version": "2.5.1",
- "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.5.1.tgz",
+ "resolved": "http://173.15.15.82:8081/repository/npm-all/rc-rate/-/rc-rate-2.5.1.tgz",
"integrity": "sha512-3iJkNJT8xlHklPCdeZtUZmJmRVUbr6AHRlfSsztfYTXVlHrv2TcPn3XkHsH+12j812WVB7gvilS2j3+ffjUHXg==",
"requires": {
"classnames": "^2.2.5",
@@ -1201,7 +1201,7 @@
},
"rc-select": {
"version": "9.2.3",
- "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-9.2.3.tgz",
+ "resolved": "http://173.15.15.82:8081/repository/npm-all/rc-select/-/rc-select-9.2.3.tgz",
"integrity": "sha512-WhswxOMWiNnkXRbxyrj0kiIvyCfo/BaRPaYbsDetSIAU2yEDwKHF798blCP5u86KLOBKBvtxWLFCkSsQw1so5w==",
"requires": {
"babel-runtime": "^6.23.0",
@@ -1220,7 +1220,7 @@
},
"rc-tree": {
"version": "2.1.4",
- "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz",
+ "resolved": "http://173.15.15.82:8081/repository/npm-all/rc-tree/-/rc-tree-2.1.4.tgz",
"integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==",
"requires": {
"@ant-design/create-react-context": "^0.2.4",
@@ -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",
@@ -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",
@@ -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",
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/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 73ec3aa1c..b9897d4a4 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -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
-1){
- setNewBranchError('分支名不能包含下列任何字符：^ * \\ /');
+ setNewBranchError('分支名不能包含下列任何字符：^ * \\ ');
return;
}else{
setNewBranchName(e.target.value);
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: '请填写项目名称'
}],
})(
-
+ // onBlur={this.changeName}
)}
@@ -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(分支名不能包含下列任何字符：^*\/);
+ callback(分支名不能包含下列任何字符：^*\);
}else{
for(var i=0;i -1){
- callback(分支名不能包含下列任何字符：^*\/);
+ callback(分支名不能包含下列任何字符：^*\);
return;
}else{
continue;
From 79bcb52a346ef028c5322fd95453c8dfe035c4b7 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 30 Aug 2023 16:54:56 +0800
Subject: [PATCH 08/27] =?UTF-8?q?=E6=8B=92=E7=BB=9D=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E8=AF=B7=E6=B1=82-=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Merge/MessageCount.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 7ef9f2e8e..25b8b17b7 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -371,7 +371,7 @@ 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 || otherPre);
const open_blockchain = project && project.open_blockchain;
return (
From 50276ce1cb9583215a075350ec939b85a0fa341e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 30 Aug 2023 17:11:23 +0800
Subject: [PATCH 09/27] update
---
src/forge/Merge/MessageCount.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 25b8b17b7..b8316c783 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 || otherPre);
+ const operate = userLogin && projectDetail && pr_status === 0 && permission ;
+ const cancelOperate = userLogin && projectDetail && pr_status === 0 && ( permission || otherPre);
const open_blockchain = project && project.open_blockchain;
return (
@@ -521,7 +522,7 @@ class MessageCount extends Component {
)}
- {operate && (
+ {cancelOperate && (