From ed4bd2394630a2a57ea39cce654d24dd336f1408 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Wed, 25 Mar 2020 15:38:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?FIX=20=E5=8E=BB=E6=8E=89=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6debug=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/login/LoginDialog.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index dda9fed7f..b36b4a158 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -469,7 +469,7 @@ class LoginDialog extends Component { autologin:isGoingValue } ).then((response) => { - debugger; + // debugger; if(response===undefined){ return } @@ -782,4 +782,3 @@ class LoginDialog extends Component { } export default LoginDialog ; - From 55008a1dec69f0f6bb5194607bed0e7b5fc9422f Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Wed, 25 Mar 2020 22:33:24 +0800 Subject: [PATCH 2/7] =?UTF-8?q?FIX=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Settings/Collaborator.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js index 0691645c6..910a9a618 100644 --- a/src/forge/Settings/Collaborator.js +++ b/src/forge/Settings/Collaborator.js @@ -9,10 +9,10 @@ const MENU_LIST = [{ name:'管理员' },{ id:"Developer", - name:'开发人员' + name:'可写权限' },{ id:"Reporter", - name:'报告人员' + name:'可读权限' }]; const LIMIT = 15; class Collaborator extends Component{ @@ -207,7 +207,7 @@ class Collaborator extends Component{ {operation && operation[0].name} } - + { @@ -219,7 +219,7 @@ class Collaborator extends Component{ ) }) } - + @@ -245,4 +245,4 @@ class Collaborator extends Component{ ) } } -export default Collaborator; \ No newline at end of file +export default Collaborator; From 22fbdcf57a60af7c41ed9c50bfbe7834e66060e4 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 26 Mar 2020 14:13:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 99 ++++++++++++++++++++---- src/forge/Newfile/UserSubmitComponent.js | 2 +- src/forge/Settings/Setting.js | 2 +- 3 files changed, 86 insertions(+), 17 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fcfb947b0..582626568 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +3,8 @@ - - + + @@ -14,11 +14,11 @@ - + - - + + @@ -26,10 +26,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -91,6 +127,8 @@ + + @@ -131,7 +169,7 @@ - + @@ -173,18 +211,19 @@ 1584692398144 - + + - + - + @@ -197,7 +236,7 @@ - + @@ -504,9 +543,19 @@ + + + + + + + + + + - + @@ -514,15 +563,35 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index d4ccd2f31..0a23e122d 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -31,7 +31,7 @@ class UserSubmitComponent extends Component{ const url = `/${current_user && current_user.login}/${projectsId}/contents.json`; axios.post(url,{ filepath:path, - branch:submitType==="0" ? branch : undefined, + branch:branch, new_branch:submitType==="1" ? values.branchname:undefined, content, message:values.desc diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index 540e24a99..316f2b58b 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -200,7 +200,7 @@ class Setting extends Component{ 删除本仓库 - 删除仓库是永久性的, 无法撤消 + 删除仓库是永久性的, 无法撤消,且删除后,与仓库关联的项目/工单/合并请求/版本发布等,均会被删除 删除本仓库 From 055c4ae851f9571ce163ea9317500b8c11285cb4 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 26 Mar 2020 14:24:48 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9conflict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 4 - .idea/forgeplus-react.iml | 11 - .idea/inspectionProfiles/Project_Default.xml | 6 - .idea/misc.xml | 7 - .idea/modules.xml | 8 - .idea/vcs.xml | 6 - .idea/workspace.xml | 597 ------------------- 7 files changed, 639 deletions(-) delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/forgeplus-react.iml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 15a15b218..000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/forgeplus-react.iml b/.idea/forgeplus-react.iml deleted file mode 100644 index c3cd732c0..000000000 --- a/.idea/forgeplus-react.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549ea..000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e95b9d032..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 956c9e829..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 582626568..000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,597 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - versions - 缺陷 - contents/file - 新建翻转课堂 - nHeader - 点赞 - fork - .push( - QuillForEditor - setContents - isedit - Educoder - title - textcount - forks - commentCtx - 上传文件 - subFileType - - - $PROJECT_DIR$/src/forge - $PROJECT_DIR$ - $PROJECT_DIR$/src - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1584692398144 - - - 1584692398144 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 79bc855adca06f2ae89ede6c306ff9cf26ae1b13 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 26 Mar 2020 14:39:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9SEttingDE=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 4 + .idea/forgeplus-react.iml | 11 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/misc.xml | 7 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 551 +++++++++++++++++++ 7 files changed, 593 insertions(+) create mode 100644 .idea/encodings.xml create mode 100644 .idea/forgeplus-react.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..15a15b218 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/forgeplus-react.iml b/.idea/forgeplus-react.iml new file mode 100644 index 000000000..c3cd732c0 --- /dev/null +++ b/.idea/forgeplus-react.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 000000000..03d9549ea --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..e95b9d032 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..956c9e829 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..94a25f7f4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..538e2d648 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,551 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + versions + 缺陷 + contents/file + 新建翻转课堂 + nHeader + 点赞 + fork + .push( + QuillForEditor + setContents + isedit + Educoder + title + textcount + forks + commentCtx + 上传文件 + subFileType + + + $PROJECT_DIR$/src/forge + $PROJECT_DIR$ + $PROJECT_DIR$/src + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1584692398144 + + + 1584692398144 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 3b88cb3b67c944a8aa4defeaa3edfa5d9750e781 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 26 Mar 2020 14:40:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9ignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .idea/workspace.xml | 61 +++++++++++++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 80a536ca6..bd47c4ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ typings/ .dynamodb/ .DS_Store +.idea/* diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 538e2d648..d14d22d95 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,9 +1,7 @@ - - - + @@ -15,8 +13,20 @@ - - + + + + + + + + + + + + + + @@ -99,12 +109,20 @@ - + + + + + + + + + @@ -159,13 +177,12 @@ - + - - + @@ -178,7 +195,7 @@ - + @@ -515,16 +532,6 @@ - - - - - - - - - - @@ -540,10 +547,20 @@ + + + + + + + + + + - - + + From f619b949f414ad084ffaa9514b27435b341b621e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 26 Mar 2020 16:28:06 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9setting=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 163 +++++++++++++++++------ src/forge/Newfile/UserSubmitComponent.js | 2 +- 2 files changed, 120 insertions(+), 45 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 538e2d648..05615a169 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,8 @@ - + + @@ -12,11 +13,58 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43,6 +91,8 @@ commentCtx 上传文件 subFileType + .ide + .idea $PROJECT_DIR$/src/forge @@ -75,8 +125,8 @@ - + @@ -89,6 +139,7 @@ + @@ -99,18 +150,32 @@ - + + + + + + + + + + + + + + + + - @@ -155,17 +220,18 @@ + - + - + @@ -177,8 +243,8 @@ - - + + @@ -495,36 +561,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -537,13 +573,52 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 216d55ffc..e286b00e4 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -84,7 +84,7 @@ class UserSubmitComponent extends Component{ {getFieldDecorator('desc', { rules: [], })( - + )}
删除本仓库
删除仓库是永久性的, 无法撤消
删除仓库是永久性的, 无法撤消,且删除后,与仓库关联的项目/工单/合并请求/版本发布等,均会被删除