Zgna
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

This commit is contained in:
nigel007 2021-05-11 22:07:25 +08:00
parent fe681a07d9 705bfb07bd
commit c7da648ae8
47 changed files with 1209 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

491
.idea/workspace.xml
View File

@ -2,210 +2,53 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/forge/Component/AddGroup.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Component/AddMember.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Component/Contributors.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Component/DrawerPanel.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Component/EAccount.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Component/EducoderAccount.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Component/LanguagePower.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Component/Releases.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/Choosen.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/Editors.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/Init.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/List.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/PipelineName.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/Stage.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/StageItem.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/Sure.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/head.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/menus.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/menusAdd.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose/menusRename.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Manage/Params.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Manage/ParamsNew.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Manage/manage.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/Mould.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/MouldNew.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/ServiceModal.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/disposePipeline.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/ssh/Index.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/ssh/XmlPanel.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/DevOps/ssh/mediator.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Head/Footer.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Head/Header.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Head/header.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepotCatalogue.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepotPath.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepotReadme.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/sub/Contribute.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/sub/DetailBanner.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/sub/UpdateDescModal.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Main/sub/sub.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Settings/CollaboratorGroup.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Settings/CollaboratorMember.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Source/AddTag.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Source/Index.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Source/Index.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Source/Upload.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Source/UploadSource.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/Component/LeaveTeam.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/Component/Modals.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/Component/UploadImage.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupForm.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/Group/Setting/GroupMemberSetting.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/Group/Setting/GroupProjectSetting.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/Group/Setting/setting.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/ListItem.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/RightBox.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Team/TeamGroupItems.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/users/Service.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/modules/login/educoder.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Divert/DivertModal.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Divert/Index.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/Index.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/Index.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/Notify.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/UndoEvent.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/editormd.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/editormd.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/edu-purge.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/edu-purge.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.eot" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.eot" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.json" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.ttf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.woff" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.woff" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/iconfont.woff2" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/iconfont.woff2" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/App.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/AppConfig.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/AppConfig.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/UrlTool.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/UrlTool.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/components/comment/CommentItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/components/comment/CommentItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/About/Index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/About/Index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/About/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/About/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Branch/Select.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/Select.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Branch/branch.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/branch.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/Cards.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Cards.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/Component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Component.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/Handbook.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Handbook.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/ListCount.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/ListCount.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/MemberCards.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/MemberCards.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/Search.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Search.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/EAccount.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/EAccount.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/Releases.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Releases.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/SearchUser.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/SearchUser.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/User.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/User.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/layout.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/layout.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/About.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/About.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/Dispose.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/Dispose.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/Index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/Index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/Infos.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/Infos.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/OpsDetailRightpanel.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/OpsDetailRightpanel.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/Structure.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/Structure.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/ops.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/ops.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/DevOps/opsDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/DevOps/opsDetail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/GetData/getData.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/GetData/getData.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootBranch.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootBranch.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Head/Header.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Head/Header.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Head/header.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Head/header.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootIndex.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootIndex.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootTag.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootTag.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/Diff.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Diff.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/Index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/IndexItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/IndexItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/Commits.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/Commits.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/Files.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/Files.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/sub/UpdateDescModal.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/sub/UpdateDescModal.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge_footer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge_footer.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge_form.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge_form.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/New/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/New/Index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Newfile/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Newfile/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Newfile/m_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Newfile/m_editor.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Nodata.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Nodata.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Detail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/Milepost.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Milepost.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/MilepostDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/MilepostDetail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/order.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/order.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Settings/BranchRule.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/BranchRule.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Settings/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/order_form.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order_form.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Settings/Setting.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Setting.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Settings/new_tags.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/new_tags.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Settings/setting.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/setting.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Box.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Box.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetailMember.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetailMember.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetailProject.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetailProject.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetailSetting.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetailSetting.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetails.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetails.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupNew.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupNew.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/SettingCommon.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/SettingCommon.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupForm.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupForm.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/List.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/List.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/ListItem.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/ListItem.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/New.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/New.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingCommon.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingCommon.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingGroup.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingGroup.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingIndex.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingIndex.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingMember.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingMember.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Sub/Detail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Sub/Detail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Sub/SubDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Sub/SubDetail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/TeamGroup.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/TeamGroup.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/TeamMember.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/TeamMember.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Upload/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Upload/Index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/UsersList/common_users.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/UsersList/common_users.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/UsersList/focus_button.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/UsersList/focus_button.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/UsersList/fork_users.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/UsersList/fork_users.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/UsersList/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/UsersList/list.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/UsersList/user_list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/UsersList/user_list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/TeamGroupItems.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/TeamGroupItems.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/comments/children_comments.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/comments/children_comments.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/comments/children_journals.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/comments/children_journals.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/comments/comments.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/comments/comments.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/css/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/css/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/CIList.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/CIList.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/CIdispose.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/CIdispose.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Infos.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Infos.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Team-item.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Team-item.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Team.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Team.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/common_lists.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/common_lists.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/new_user.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/new_user.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/watch_users.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/watch_users.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/undo_events.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/indexEduplus2RequestProxy.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/indexEduplus2RequestProxy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/404/Shixunnopage.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/404/Shixunnopage.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/common/CNotificationHOC.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/common/CNotificationHOC.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/competitions/Competitimain/CompetitionsIndex.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/competitions/Competitimain/CompetitionsIndex.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/coursesHome/CoursesHome.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/coursesHome/CoursesHome.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/css/Courses.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/css/Courses.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/shixunHomework/Listofworksstudentone.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/shixunHomework/Listofworksstudentone.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/shixunHomework/ShixunWorkReport.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/shixunHomework/ShixunWorkReport.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/login/LoginDialog.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/LoginDialog.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/message/js/Messagerouting.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/message/js/Messagerouting.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/modals/Bottomsubmit.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/modals/Bottomsubmit.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/question/Paperreview.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/question/Paperreview.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/question/Questionitem_banks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/question/Questionitem_banks.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/testpaper/Intecomponents.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/testpaper/Intecomponents.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/testpaper/Paperlibraryeditid.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/testpaper/Paperlibraryeditid.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/testpaper/Paperlibraryseeid.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/testpaper/Paperlibraryseeid.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/tpm/TPMIndex.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/TPMIndex.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/tpm/TPMIndexHOC.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/TPMIndexHOC.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/search/SearchPage.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/search/SearchPage.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/tpm/TPMBanner.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/TPMBanner.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -229,23 +72,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="94" column="46" selection-start-line="94" selection-start-column="20" selection-end-line="94" selection-end-column="46" />
<folding>
<element signature="e#0#80#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="546" column="12" selection-start-line="546" selection-start-column="12" selection-end-line="546" selection-end-column="12" />
<state relative-caret-position="205">
<caret line="263" column="2" selection-start-line="263" selection-start-column="2" selection-end-line="263" selection-end-column="2" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
@ -256,17 +87,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<state relative-caret-position="8160">
<caret line="501" column="35" selection-start-line="501" selection-start-column="35" selection-end-line="501" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/AppConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="43">
<caret line="30" column="46" selection-start-line="30" selection-start-column="46" selection-end-line="30" selection-end-column="46" />
<state relative-caret-position="120">
<caret line="35" column="31" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="31" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
@ -275,21 +106,35 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExMenu.jsx">
<entry file="file://$PROJECT_DIR$/src/forge/users/Infos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="33" column="7" selection-start-line="33" selection-start-column="7" selection-end-line="33" selection-end-column="7" />
<state relative-caret-position="179">
<caret line="321" column="15" selection-start-line="321" selection-start-column="15" selection-end-line="321" selection-end-column="15" />
<folding>
<element signature="e#0#53#0" expanded="true" />
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3094">
<caret line="182" column="28" selection-start-line="182" selection-start-column="28" selection-end-line="182" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package-lock.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<state relative-caret-position="255">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="30" selection-end-column="6" />
<folding>
<element signature="e#0#53#0" expanded="true" />
@ -301,7 +146,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<state relative-caret-position="5814">
<caret line="352" column="13" selection-start-line="352" selection-start-column="13" selection-end-line="352" selection-end-column="13" />
</state>
</provider>
@ -310,7 +155,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/order_form.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<state relative-caret-position="2839">
<caret line="176" column="27" selection-start-line="176" selection-start-column="27" selection-end-line="176" selection-end-column="27" />
</state>
</provider>
@ -319,24 +164,12 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<state relative-caret-position="6018">
<caret line="363" column="18" selection-start-line="363" selection-start-column="18" selection-end-line="363" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="90" column="57" selection-start-line="90" selection-start-column="57" selection-end-line="91" selection-end-column="24" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -348,10 +181,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>getElementById</find>
<find>number</find>
<find>this.</find>
<find>change_issue_type</find>
<find>changeStatus</find>
<find>adjustTokenNum</find>
<find>id</find>
@ -373,11 +202,15 @@
<find>变基并合并</find>
<find>合并请求</find>
<find>menu</find>
<find>transfer_login</find>
<find>fix_issue_id</find>
<find>合并描述</find>
<find>initOnlineOfflineListener</find>
<find>10.13.102.14</find>
<find>transfer_login</find>
<find>合并描述</find>
<find>localhost:3001</find>
<find>proxy</find>
<find>3007</find>
<find>HEAD</find>
</findStrings>
<replaceStrings>
<replace>任务</replace>
@ -399,7 +232,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css" />
<option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
<option value="$PROJECT_DIR$/src/modules/login/LoginDialog.js" />
<option value="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" />
@ -432,12 +264,10 @@
<option value="$PROJECT_DIR$/src/forge/users/Blockchain.js" />
<option value="$PROJECT_DIR$/src/forge/users/CIList.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/blockchain.jsx" />
<option value="$PROJECT_DIR$/src/forge/New/Index.js" />
<option value="$PROJECT_DIR$/src/forge/Newfile/Index.js" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExchange.jsx" />
<option value="$PROJECT_DIR$/src/forge/BlockchainExchangeNew.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainEx.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/Infos.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExMenu.jsx" />
@ -449,7 +279,10 @@
<option value="$PROJECT_DIR$/src/forge/Order/order_form.js" />
<option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/AppConfig.js" />
<option value="$PROJECT_DIR$/src/forge/users/Infos.js" />
<option value="$PROJECT_DIR$/src/forge/New/Index.js" />
</list>
</option>
</component>
@ -470,6 +303,11 @@
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="react" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
@ -486,7 +324,14 @@
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="forge" type="462c0819:PsiDirectoryNode" />
<item name="Order" type="462c0819:PsiDirectoryNode" />
<item name="New" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="forge" type="462c0819:PsiDirectoryNode" />
<item name="users" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@ -618,12 +463,14 @@
<workItem from="1609305703508" duration="8077000" />
<workItem from="1618303807868" duration="8543000" />
<workItem from="1618381961400" duration="14929000" />
<workItem from="1618715059222" duration="58734000" />
<workItem from="1618715059222" duration="64287000" />
<workItem from="1619410770871" duration="5988000" />
<workItem from="1620741829434" duration="202000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="296618000" />
<option name="totallyTimeSpent" value="308361000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -638,8 +485,8 @@
<frame x="0" y="0" width="1280" height="800" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24702145" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49747476" visible="true" weight="0.22001588" />
<window_info id="Structure" order="1" sideWeight="0.50252527" side_tool="true" weight="0.24702145" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@ -652,7 +499,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" sideWeight="0.49928468" weight="0.5638554" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49928468" visible="true" weight="0.45753425" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49928468" visible="true" weight="0.32876712" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5007153" side_tool="true" weight="0.713253" />
<window_info anchor="bottom" id="TypeScript" order="12" weight="0.32876712" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@ -743,37 +590,31 @@
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx</url>
<line>66</line>
<properties lambdaOrdinal="-1" />
<option name="timeStamp" value="19" />
</line-breakpoint>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx</url>
<line>48</line>
<properties lambdaOrdinal="-1" />
<option name="timeStamp" value="29" />
</line-breakpoint>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx</url>
<line>44</line>
<properties lambdaOrdinal="-1" />
<option name="timeStamp" value="33" />
</line-breakpoint>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx</url>
<line>18</line>
<properties lambdaOrdinal="-1" />
<option name="timeStamp" value="36" />
</line-breakpoint>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/forge/users/BlockchainExMenu.jsx</url>
<line>13</line>
<properties lambdaOrdinal="-1" />
<option name="timeStamp" value="38" />
</line-breakpoint>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/forge/Order/Detail.js</url>
<line>71</line>
<properties lambdaOrdinal="-1" />
<option name="timeStamp" value="54" />
</line-breakpoint>
</breakpoints>
@ -834,7 +675,6 @@
</expressions>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/forge/Blockchain/Trade.js" />
<entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
@ -852,16 +692,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="171" column="23" lean-forward="true" selection-start-line="171" selection-start-column="23" selection-end-line="171" selection-end-column="23" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
<entry file="file://$PROJECT_DIR$/src/forge/users/devOpsCD.jsx">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@ -939,13 +770,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build/static/js/29.23ae291e.chunk.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="1" column="25069" selection-start-line="1" selection-start-column="25069" selection-end-line="1" selection-end-column="25069" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build/static/js/29.23ae291e.chunk.js" />
<entry file="file://$PROJECT_DIR$/src/forge/users/InfosUser.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
@ -973,13 +798,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="70" column="23" selection-start-line="70" selection-start-column="23" selection-end-line="70" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/_axios@0.18.1@axios/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
@ -1015,13 +833,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="34" lean-forward="true" selection-end-line="106" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/Index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="70">
@ -1063,16 +874,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/Infos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/CIList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="77">
@ -1158,57 +959,6 @@
<entry file="http://localhost:3007/Users/Nigel/Documents/Trustie_on_Blockchain/back_work/Trustie/test/forgeplus-react/webpack/bootstrap">
<provider selected="true" editor-type-id="httpFileEditor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="30" selection-end-column="6" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/order_form.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="176" column="27" selection-start-line="176" selection-start-column="27" selection-end-line="176" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="352" column="13" selection-start-line="352" selection-start-column="13" selection-end-line="352" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="94" column="46" selection-start-line="94" selection-start-column="20" selection-end-line="94" selection-end-column="46" />
<folding>
<element signature="e#0#80#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="363" column="18" selection-start-line="363" selection-start-column="18" selection-end-line="363" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="546" column="12" selection-start-line="546" selection-start-column="12" selection-end-line="546" selection-end-column="12" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
@ -1216,22 +966,93 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1496">
<caret line="94" column="46" selection-start-line="94" selection-start-column="20" selection-end-line="94" selection-end-column="46" />
<folding>
<element signature="e#0#80#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<state relative-caret-position="8160">
<caret line="501" column="35" selection-start-line="501" selection-start-column="35" selection-end-line="501" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3094">
<caret line="182" column="28" selection-start-line="182" selection-start-column="28" selection-end-line="182" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package-lock.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="30" selection-end-column="6" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5814">
<caret line="352" column="13" selection-start-line="352" selection-start-column="13" selection-end-line="352" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/order_form.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2839">
<caret line="176" column="27" selection-start-line="176" selection-start-column="27" selection-end-line="176" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6018">
<caret line="363" column="18" selection-start-line="363" selection-start-column="18" selection-end-line="363" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/AppConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="43">
<caret line="30" column="46" selection-start-line="30" selection-start-column="46" selection-end-line="30" selection-end-column="46" />
<state relative-caret-position="120">
<caret line="35" column="31" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="31" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/Infos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="321" column="15" selection-start-line="321" selection-start-column="15" selection-end-line="321" selection-end-column="15" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="263" column="2" selection-start-line="263" selection-start-column="2" selection-end-line="263" selection-end-column="2" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

241
package-lock.json generated
View File

@ -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",

2
public/css/editormd.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
public/css/edu-purge.css
View File

@ -6703,3 +6703,12 @@ 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;
}

2
src/AppConfig.js
View File

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

4
src/forge/About/Index.jsx
View File

@ -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

3
src/forge/Component/Cards.jsx
View File

@ -3,7 +3,7 @@ import { getImageUrl } from 'educoder';
import { Link } from 'react-router-dom';
import './Component.scss';
function Cards({img , title, desc , rightBtn , src}){
function Cards({img , title, desc , rightBtn , src , bottomInfos}){
return(
<div className="cards">
{img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
@ -15,6 +15,7 @@ function Cards({img , title, desc , rightBtn , src}){
<div className="desc">
{desc}
</div>
{bottomInfos}
</div>
</div>
)

4
src/forge/Component/EAccount.scss
View File

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

2
src/forge/Component/Releases.jsx
View File

@ -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>

77
src/forge/Component/SearchUser.jsx
View File

@ -1,24 +1,33 @@
import React , { useState } from 'react';
import React , { useState , useEffect } from 'react';
import { AutoComplete } from 'antd';
import { getImageUrl } from "educoder";
import axios from 'axios';
const Option = AutoComplete.Option;
export default ({ getUser })=>{
export default ({ getUser , placeholder, width ,value })=>{
const [ source , setSource ] = useState(undefined);
const [ searchKey , setSearchKey ] = useState(undefined);
const [ userDataSource , setUserDataSource ] = useState(undefined);
useEffect(()=>{
if(!value){
setSearchKey(undefined);
}
},[value])
useEffect(()=>{
getUserList();
},[searchKey])
function getUserList(e){
const url = `/users/list.json`;
axios.get(url, {
params: {
search: e,
search: searchKey,
},
})
.then((result) => {
}).then((result) => {
if (result) {
setUserDataSource(result.data.users);
sourceOptions(result.data.users);
}
})
.catch((error) => {
@ -26,20 +35,15 @@ export default ({ getUser })=>{
});
};
function changeInputUser(value){
setSearchKey(value);
getUserList(value);
}
function selectInputUser(id, option){
setSearchKey(option.props.value);
getUserList(option.props.value);
getUser && getUser(id);
}
const source =
userDataSource && userDataSource.map((item, key) => {
function sourceOptions(userDataSource){
const s = userDataSource && userDataSource.map((item, key) => {
return (
<Option key={key} value={`${item.login}`}>
<Option
key={key}
value={`${item.user_id}`}
login={`${item.login}`}
name={item.username}
>
<img
className="user_img radius"
width="28"
@ -54,14 +58,31 @@ export default ({ getUser })=>{
</Option>
);
});
setSource(s);
}
function changeInputUser(e){
setSearchKey(e);
};
// 选择用户
function selectInputUser(e, option){
setSearchKey(option.props.name);
getUser(option.props.login);
};
return(
<AutoComplete
dataSource={source}
value={searchKey}
style={{ width: 300 }}
onChange={changeInputUser}
onSelect={selectInputUser}
placeholder="搜索需要添加的用户..."
/>
<div className="addPanel">
<AutoComplete
getPopupContainer={trigger => trigger.parentNode}
dataSource={source}
value={searchKey}
style={{ width: width || 300 }}
onChange={changeInputUser}
onSelect={selectInputUser}
placeholder={placeholder || "搜索需要添加的用户..."}
allowClear
/>
</div>
)
}

174
src/forge/Divert/DivertModal.jsx Normal file
View File

@ -0,0 +1,174 @@
import React ,{ forwardRef, useEffect, useState } from 'react';
import { Modal , Form , Input , Radio , Select } from 'antd';
import SearchUser from '../Component/SearchUser';
import './Index.scss';
import Axios from 'axios';
const { Option } = Select;
function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
const { getFieldDecorator, validateFields , setFieldsValue } = form;
const [ cate , setCate ] = useState(0);
const [ value , setValue ] = useState(undefined);
const [ organizations , setOrganizations ] = useState(undefined);
useEffect(()=>{
setFieldsValue({goal:cate})
},[])
useEffect(()=>{
if(owner && repo && visible===true){
getTeam();
}
if(!visible){
setFieldsValue({
owner_name:undefined,
identifier:undefined
})
setValue(undefined)
}
},[repo,owner,visible])
function getTeam(){
const url = `/${owner}/${repo}/applied_transfer_projects/organizations.json`;
Axios.get(url).then(result=>{
if(result){
setOrganizations(result.data.organizations);
}
}).catch(error=>{})
}
// 确认转移
function onOk(){
validateFields((error,values)=>{
console.log(...values);
if(!error){
const url = `/${owner}/${repo}/applied_transfer_projects.json`;
Axios.post(url,{
...values
}).then(result=>{
if(result){
onSuccess(result.data && result.data.owner);
}
}).catch(error=>{})
}
})
}
function changeType(e){
setCate(e.target.value);
setFieldsValue({
owner_name:undefined
})
}
function checkIdentifier(rule, value, callback){
if(!value){
callback();
}
if (repo && value !== repo) {
callback("请输入当前项目的标识！");
}
callback();
}
const layout = {
labelCol: { span: 5 },
wrapperCol: { span: 18 },
};
function getUser(id){
setValue(id);
setFieldsValue({
owner_name:id
})
}
return(
<Modal
width="620px"
visible={visible}
title="转移仓库"
onCancel={onCancel}
onOk={onOk}
okText="确认转移"
cancelText={"取消"}
centered
>
<div className="diverModal">
{
cate === 0 ?
<ul className="descUl">
<li>转移需对方确认接受，转移成功后你将被移出仓库，其他已有成员权限不变</li>
<li>转移成功后，仓库的地址将变更至目标用户的命名空间下</li>
<li>已有成员如需继续操作仓库，需更新本地仓库的remote，使之指向新的地址</li>
</ul>
:
<ul className="descUl">
<li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
<li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
<li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
</ul>
}
<Form {...layout} colon={false} layout={"horizontal"}>
<Form.Item label="转移给:" style={{marginBottom:"0px"}}>
{getFieldDecorator("goal",{
rules:[]
})(
<Radio.Group onChange={changeType}>
<Radio value={0}>个人</Radio>
<Radio value={1}>组织</Radio>
</Radio.Group>
)}
</Form.Item>
{
cate === 0 &&
<Form.Item label=" ">
{getFieldDecorator("owner_name",{
rules:[{required:true,message:"请输入目标用户名"}]
})(
// <Input placeholder="请输入目标用户" autoComplete={"off"}/>
<SearchUser getUser={getUser} width={"100%"} placeholder="请输入目标用户" value={value}/>
)}
</Form.Item>
}
{
cate === 1 &&
<Form.Item label=" ">
{getFieldDecorator("owner_name",
{rules:[{required:true,message:"请选择目标组织"}]}
)(
<Select placeholder="请选择目标组织" getPopupContainer={trigger => trigger.parentNode}>
{
organizations && organizations.length > 0 ?
organizations.map((i,k)=>{
return(
<Option value={i.name}>{i.nickname}</Option>
)
})
:""
}
</Select>
)}
</Form.Item>
}
<Form.Item label="仓库名称:">
{getFieldDecorator("identifier",
{
rules:[
{required:true,message:"请输入仓库名称"},
{
validator:checkIdentifier
}
]
}
)(
<Input placeholder="请输入仓库名称" autoComplete={"off"}/>
)}
</Form.Item>
</Form>
</div>
</Modal>
)
}
export default Form.create()(forwardRef(DivertModal));

12
src/forge/Divert/Index.scss Normal file
View File

@ -0,0 +1,12 @@
.diverModal{
.descUl{
background-color: #fffae6;
border-radius: 4px;
padding:10px 15px;
color: #efc16b;
border:1px solid #efc16b;
}
.ant-form-item-required::before{
content: "";
}
}

8
src/forge/Head/Header.js
View File

@ -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 这部分脚本从公共脚本中直接调用

8
src/forge/Head/header.scss
View File

@ -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;
}
}

8
src/forge/Main/CoderDepot.jsx
View File

@ -97,6 +97,7 @@ function CoderDepot(props){
setLastCommit(c && c.commit);
setLastCommitAuthor(c && c.committer);
setMainFlag(true);
setReadOnly(true);
}
setTimeout(function(){setIsSpin(false);},500);
}).catch(error=>{setIsSpin(false);})
@ -138,6 +139,7 @@ function CoderDepot(props){
setLastCommit(c && c.commit);
setLastCommitAuthor(c && c.committer);
setMainFlag(false);
setReadOnly(true);
}
setTimeout(function(){setIsSpin(false);},500)
}).catch(error=>{setIsSpin(false);})
@ -303,12 +305,12 @@ function CoderDepot(props){
<a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
</div>
{ type === "dir" && projectDetail.type !== 2 &&
<Dropdown overlay={fileMenu} className="mr20">
<Dropdown overlay={fileMenu} className="mr20" trigger={['click']}>
<Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
</Dropdown>
}
<Dropdown overlay={downloadMenu} placement="bottomRight">
<Dropdown overlay={downloadMenu} placement="bottomRight" trigger={['click']}>
<Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white"></i></Button>
</Dropdown>
</AlignCenter>
@ -320,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>

2
src/forge/Main/CoderRootCommit.js
View File

@ -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}

5
src/forge/Main/Index.scss
View File

@ -223,8 +223,11 @@
.listtablebody{
li.listtablepath{
a{color: #40a9ff;}
p{
margin-bottom: 0px!important;
}
}
li{
& > li{
height: 42px;
display: flex;
justify-content: space-between;

9
src/forge/Main/IndexItem.js
View File

@ -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>

4
src/forge/Main/sub/UpdateDescModal.jsx
View File

@ -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">

2
src/forge/Merge/MergeItem.js
View File

@ -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>

2
src/forge/Merge/NewMerge.js
View File

@ -178,7 +178,7 @@ class NewMerge extends Component {
let arr = projects_names && projects_names.filter(item=>item.id===value);
let identifier = arr && arr[0].project_id;
let login = arr && arr[0].project_user_login;
let is_fork_id = parseInt(value) !== parseInt(id)
let is_fork_id = parseInt(value) !== parseInt(id);
this.setState({
isSpin: true,
merge_head: is_fork_id,

1
src/forge/Merge/merge.css
View File

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

14
src/forge/Merge/merge_form.js
View File

@ -34,17 +34,19 @@ class MergeForm extends Component {
this.set_defatul();
};
componentDidUpdate=(prevPros)=>{
const { projectsId ,owner } = this.props.match.params;
const pId = prevPros.match.params.projectsId;
const oId = prevPros.match.params.owner;
if(pId !== projectsId || oId !== owner ){
// console.log("切换了项目分支···········");
this.get_default_selects();
}
if(prevPros && this.props && !this.props.checkIfLogin()){
this.props.history.push("/403")
return
}
}
// check_is_login =() =>{
// if(!this.props.checkIfLogin()){
// this.props.history.push("/403")
// return
// }
// };
get_default_selects = () => {
const { projectsId ,owner } = this.props.match.params;
this.setState({ isSpin: true });

44
src/forge/New/Index.js
View File

@ -45,7 +45,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 = () => {
@ -261,6 +262,13 @@ class Index extends Component {
console.log("here need the change of display")
}
changeDesc=(e)=>{
let value = e.target.value;
this.setState({
descNum:value ? value.length :0
})
}
render() {
const { getFieldDecorator } = this.props.form;
// 项目类型：deposit-托管项目，mirror-镜像项目
@ -280,7 +288,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"}}>
@ -368,21 +378,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="仓库名称"
>
@ -391,7 +403,7 @@ class Index extends Component {
required: true, message: '请填写仓库名称'
}],
})(
<Input placeholder="仓库名称请使用与项目相关的英文关键字" />
<Input placeholder="仓库名称请使用与项目相关的英文关键字" maxLength={100} />
)}
</Form.Item>
<Form.Item

88
src/forge/Notice/Index.jsx Normal file
View File

@ -0,0 +1,88 @@
import React, { useEffect, useState } from "react";
import { Link } from 'react-router-dom';
import './Index.scss';
import Loadable from "react-loadable";
import Loading from "../../Loading";
import { Route, Switch } from "react-router-dom";
const Notify = Loadable({
loader: () => import("./Notify"),
loading: Loading,
});
const UndoEvent = Loadable({
loader: () => import("./UndoEvent"),
loading: Loading,
});
function Index(props){
const username = props.match.params.username;
const pathname = props.history.location.pathname;
const user = props.user;
const undo_messages = props.undo_messages;
const [ menu , setMenu ] = useState("notify");
const [ messages , setMessages ] = useState(0);
const [ transferProjects , setTransferProjects ] = useState(0);
useEffect(()=>{
if(user){
setTransferProjects(user.undo_transfer_projects);
}
if(undo_messages){
setMessages(undo_messages);
}
},[user,undo_messages])
useEffect(()=>{
if(pathname && username){
if(pathname === `/users/${username}/notice`){
setMenu("notify");
}
if(pathname === `/users/${username}/notice/undo`){
setMenu("undo");
}
}
},[pathname])
function fetchUser(){
props && props.fetchUser();
}
function changeNum(){
fetchUser();
}
return (
<div>
<ul className="noticeMenu">
<li className={menu === "notify" ? "active":""}>
<Link to={`/users/${username}/notice`} onClick={changeNum}>
<span>通知</span>
{messages ? <span className="unNum">{messages}</span>:""}
</Link>
</li>
<li className={menu === "undo" ? "active":""}>
<Link to={`/users/${username}/notice/undo`}>
<span>接收仓库</span>
{transferProjects ? <span className="unNum">{transferProjects}</span>:""}
</Link>
</li>
</ul>
<Switch>
<Route
path="/users/:username/notice/undo"
render={(p) => {
return <UndoEvent {...props} {...p} fetchUser={fetchUser}/>;
}}
></Route>
<Route
path="/users/:username/notice"
render={(p) => {
return <Notify {...props} {...p} fetchUser={fetchUser}/>;
}}
></Route>
</Switch>
</div>
);
}
export default Index;

72
src/forge/Notice/Index.scss Normal file
View File

@ -0,0 +1,72 @@
.noticeMenu{
padding:0px 20px;
display: flex;
border-bottom: 1px solid #eee;
height: 54px;
line-height: 54px;
li{
font-size: 16px;
padding:0px;
margin:0px 30px 0px 20px!important;
height: 54px;
line-height: 54px;
position: relative;
transform: none;
a{
display: flex;
&>span{
position: relative;
}
}
&.active a span:first-child::after{
position: absolute;
bottom: 0px;
height: 2px;
left: 0px;
content: "";
background-color: #1890ff;
width: 100%;
}
.unNum{
color: #d38900;
font-size: 12px;
border-radius: 13px;
height: 16px;
line-height: 16px;
padding:0px 4px;
min-width: 23px;
text-align: center;
background-color: #ffe4b3;
margin-top: 19px;
margin-left: 10px;
display: block;
}
}
}
.notifyList{
padding:0px 20px;
min-height: 400px;
li{
display: flex;
border-bottom: 1px solid #eee;
padding:20px 0px;
.notifyImg{
width: 48px;
height: 48px;
border-radius: 50%;
margin-right: 15px;
}
.notifyFlex{
flex:1;
p{
margin:0px;
}
.notifyInfos{
margin-bottom: 8px;
}
}
&:last-child{
border-bottom: none;
}
}
}

91
src/forge/Notice/Notify.jsx Normal file
View File

@ -0,0 +1,91 @@
import React, { useEffect, useState } from "react";
import Nodata from '../Nodata';
import {Pagination } from 'antd';
import { Link } from 'react-router-dom';
import { getImageUrl } from 'educoder';
import Axios from "axios";
const limit = 15;
function Notify(props){
const username = props.match.params.username;
const [ list , setList ] = useState(undefined);
const [ page , setPage ] = useState(1);
const [ total , setTotal ] = useState(0);
useEffect(()=>{
if(username){
getList();
}
},[username,page])
function getList(){
const url = `/users/${username}/applied_messages.json`;
Axios.get(url,{
params:{
page,per_page:limit
}
}).then(result=>{
if(result){
setList(result.data.applied_messages);
setTotal(result.data.total_count);
}
}).catch(error=>{})
}
function renderStatus(status,applied){
let { project , owner} = applied
if(status){
switch(status){
case 'canceled':
return <p>取消转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
case 'common':
return <p>正在将【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
case 'successed':
return <p>【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
default:
return <p>拒绝转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
}
}else{
return ""
}
}
return(
<div>
{
list && list.length > 0 ?
<div>
<ul className="notifyList">
{
list.map((i,k)=>{
return(
<li>
<Link to={`/users/${i.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg"/></Link>
<div className="notifyFlex">
<p className="notifyInfos">
<Link to={`/users/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
<span className="color-grey-9">{i.time_ago}</span>
</p>
{renderStatus(i.status,i.applied)}
</div>
</li>
)
})
}
</ul>
</div>
:
""
}
{list && list.length === 0 && <Nodata _html="暂无通知" />}
{
total > limit &&
<div className="edu-txt-center pt20 pb20">
<Pagination simple pageSize={limit} total={total} current={page} onChange={(p)=>{setPage(p)}}/>
</div>
}
</div>
)
}
export default Notify;

118
src/forge/Notice/UndoEvent.jsx Normal file
View File

@ -0,0 +1,118 @@
import React, { useEffect, useState } from "react";
import Nodata from '../Nodata';
import { FlexAJ } from '../Component/layout';
import { Pagination , Popconfirm } from 'antd';
import { Link } from 'react-router-dom';
import { getImageUrl } from 'educoder';
import Axios from 'axios';
const limit = 15;
function UndoEvent(props){
const username = props.match.params.username;
const [ list , setList ] = useState(undefined);
const [ page , setPage ] = useState(1);
const [ total , setTotal ] = useState(0);
useEffect(()=>{
if(username){
getList();
}
},[username,page])
function getList(){
const url = `/users/${username}/applied_transfer_projects.json`;
Axios.get(url,{
params:{
page,per_page:limit
}
}).then(result=>{
if(result){
setList(result.data.applied_transfer_projects);
setTotal(result.data.total_count);
}
}).catch(error=>{})
}
// 接受
function acceptDivert(id){
const url = `/users/${username}/applied_transfer_projects/${id}/accept.json`;
Axios.post(url).then(result=>{
if(result && result.data){
getList();
props && props.fetchUser();
}
}).catch(error=>{})
}
// 拒绝
function revertDivert(id){
const url = `/users/${username}/applied_transfer_projects/${id}/refuse.json`;
Axios.post(url).then(result=>{
if(result && result.data){
getList();
props && props.fetchUser();
}
}).catch(error=>{})
}
return(
<div>
{
list && list.length > 0 ?
<div>
<ul className="notifyList">
{
list.map((i,k)=>{
return(
<li>
<Link to={`/users/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
<div className="notifyFlex">
<p className="notifyInfos">
<Link to={`/users/${i.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
<span className="color-grey-9">{i.time_ago}</span>
</p>
<FlexAJ>
<p className="color-grey-6">请求将仓库【<Link to={`/projects/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
转移给【<Link to={`/users/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】,是否接受？</p>
{
i.status === "common" &&
<span>
<Popconfirm title={`确定接受仓库${i.project && i.project.name}？`} okText="确定" cancelText="取消" onConfirm={()=>acceptDivert(i.id)}>
<a className="color-blue">接受</a>
</Popconfirm>
<Popconfirm title={`确定拒绝接受仓库${i.project && i.project.name}？`} okText="确定" cancelText="取消" onConfirm={()=>revertDivert(i.id)}>
<a className="color-red ml20">拒绝</a>
</Popconfirm>
</span>
}
{
i.status === "canceled" && <span className="color-grey-9">对方已取消转移</span>
}
{
i.status === "accepted" && <span className="color-grey-9">已接受</span>
}
{
i.status === "refused" && <span className="color-grey-9">已拒绝</span>
}
</FlexAJ>
</div>
</li>
)
})
}
</ul>
</div>
:
""
}
{list && list.length === 0 && <Nodata _html="暂无接收信息" />}
{
total > limit &&
<div className="edu-txt-center pt20 pb20">
<Pagination simple pageSize={limit} total={total} current={page} onChange={(p)=>{setPage(p)}}/>
</div>
}
</div>
)
}
export default UndoEvent;

2
src/forge/Order/MilepostDetail.js
View File

@ -218,7 +218,7 @@ class MilepostDetail extends Component {
</span>
<div className="milepostdiv">
<Link to={`/projects/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
<Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建任务</Link>
<Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建易修</Link>
</div>
</FlexAJ>
</div>

6
src/forge/Order/order.js
View File

@ -352,12 +352,12 @@ class order extends Component {
if (this.props.checkIfLogin()) {
return(
<Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
+&nbsp;创建任务
+&nbsp;创建易修
</Link>
)
}else{
return(
<a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建任务</a>
<a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建易修</a>
)
}
}
@ -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}

6
src/forge/Order/order_form.js
View File

@ -344,17 +344,17 @@ class order_form extends Component {
<div className="list-right">
<div className="pd20">
<h3 className="mb15">
{form_type === "new" ? "新建" :( form_type === "copy" ? "复制" : "编辑")}任务
{form_type === "new" ? "新建" :( form_type === "copy" ? "复制" : "编辑")}易修
</h3>
<Form.Item>
{getFieldDecorator("subject", {
rules: [
{
required: true,
message: "请填写任务标题",
message: "请填写易修标题",
},
]
})(<Input placeholder="标题" size="large" />)}
})(<Input placeholder="标题" size="large" maxLength={80}/>)}
</Form.Item>
<div className="quillContent">
<MDEditor

117
src/forge/Settings/Setting.js
View File

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

7
src/forge/Team/Group/GroupDetails.jsx
View File

@ -84,11 +84,12 @@ export default ((props) => {
// 移除成员
function removeUser(username) {
const url = `/organizations/${OIdentifier}/teams/${groupId}/team_users/${username}.json`;
if (username) {
const url = `/organizations/${OIdentifier}/teams/${groupId}/team_users/quit.json`;
axios.delete(url).then((result) => {
if (result && result.data) {
props.showNotification(`已成功退出团队！`);
props.history.push(`/organize/${OIdentifier}`);
}
}).catch((error) => { });
}
@ -101,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="确认离开团队吗？"

23
src/forge/Team/Group/GroupForm.jsx
View File

@ -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(
'项目权限：',

1
src/forge/Team/Index.scss
View File

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

2
src/forge/Team/ListItem.jsx
View File

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

30
src/forge/Team/New.jsx
View File

@ -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(
'可见性',

29
src/forge/Team/Setting/TeamSettingCommon.jsx
View File

@ -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])
@ -99,8 +101,8 @@ export default Form.create()(
if(!value){
callback();
}
if(value && !value.match(/^[a-zA-Z][a-zA-Z\d]{3,14}$/)){
callback("只能使用英文字母和数字，以字母开头，长度为4到15个字符");
if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
callback("只能使用以字母开头，包含字母、数字、下划线、横杠等，长度4到20个字符");
}
callback();
}
@ -119,20 +121,27 @@ export default Form.create()(
validator:checkname
}
],
<Input placeholder="请输入组织账号" />,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",

19
src/forge/Team/Sub/Detail.jsx
View File

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

2
src/forge/Team/TeamGroupItems.jsx
View File

@ -105,7 +105,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
}
</div>
}
{ list && list.length > 0 && <Nodata _html="暂无数据"/> }
{ list && list.length === 0 && <Nodata _html="暂无数据"/> }
{
total > limit &&
<div className="mt20 pb20 edu-txt-center">

6
src/forge/Version/version.js
View File

@ -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>
)

7
src/forge/users/Index.scss
View File

@ -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{

80
src/forge/users/Infos.js
View File

@ -49,8 +49,8 @@ const FanUser = Loadable({
loading: Loading,
})
const UndoEvents = Loadable({
loader: () => import("./undo_events"),
const Notice = Loadable({
loader: () => import("../Notice/Index"),
loading: Loading,
})
class Infos extends Component {
@ -60,7 +60,9 @@ class Infos extends Component {
isSpin: false,
user: undefined,
project_type: undefined,
route_type: undefined
route_type: undefined,
undo_events:0,
undo_messages:0
};
}
@ -81,14 +83,22 @@ class Infos extends Component {
});
const { current_user } = this.props;
const { username } = this.props.match.params;
const { pathname } = this.props.location;
const { notice } = this.state;
let url = `/users/${username || (current_user && current_user.login)}.json`;
axios
.get(url)
.then((result) => {
let e = result.data && result.data.undo_events;
let p = result.data && result.data.undo_messages;
let n = notice || pathname === `/users/${username}/notice` ;
this.setState({
user: result.data,
isSpin: false,
undo_events:n ? (e-p) : e,
undo_messages:0,
notice:n
});
})
.catch((error) => {
@ -132,11 +142,15 @@ class Infos extends Component {
}
undo_link = () => {
const {user} = this.state
const {user } = this.state;
this.setState({
route_type: undefined
route_type: undefined,
project_type:"notice",
notice:true
},()=>{
this.props.history.push(`/users/${user && user.login}/notice`);
this.fetchUser();
})
this.props.history.push(`/users/${user && user.login}/undo_events`)
}
route_link = (type) => {
@ -148,7 +162,8 @@ class Infos extends Component {
organize_link = () => {
const {user} = this.state
this.setState({
route_type: undefined
route_type: undefined,
project_type:"organizes"
})
this.props.history.push(`/users/${user && user.login}/organizes`)
}
@ -158,7 +173,7 @@ class Infos extends Component {
const { current_user, mygetHelmetapi } = this.props;
const { username } = this.props.match.params;
const { user, isSpin, project_type, route_type } = this.state;
const { user, isSpin, project_type, route_type , undo_events , undo_messages } = this.state;
return (
<div className="newMain clearfix">
<Spin spinning={isSpin}>
@ -229,21 +244,23 @@ class Infos extends Component {
</div>
</div>
</div>
{/* {current_user && user && current_user.id === user.id && (
{current_user && user && user.login === current_user.login ? (
<div className="bgcF">
<div className="list-l-Menu">
<p className="list-l-p pd20" onClick={() => this.undo_link()}>
<span className="font-16 color-grey-3">
<i className="iconfont icon-dahuizhongzuo3x font-15 mr5"></i>
待办事项
</span>
<span className="text-yellow font-16">
{user.undo_events}
</span>
</p>
<li className={project_type && project_type === "notice" ? "active" : ""}>
<p onClick={() => this.undo_link()}>
<span className="font-16 color-grey-3">
<i className="iconfont icon-dahuizhongzuo3x font-15 mr5"></i>
待办事项
</span>
<span className="text-yellow font-16">
{undo_events}
</span>
</p>
</li>
</div>
</div>
)} */}
):""}
<div className="bgcF">
<ul className="list-l-Menu">
@ -336,18 +353,19 @@ class Infos extends Component {
</div>
}
<div className="bgcF">
<div className="list-l-Menu">
<p className="list-l-p pd20" onClick={() => this.organize_link()} >
<span className="font-16 color-grey-3">
<i className="iconfont icon-itsm-liuchengguanli font-15 mr5"></i>
组织
</span>
<span className="color-blue font-16">
{user && user.user_org_count}
</span>
</p>
<li className={project_type && project_type === "organizes" ? "active" : ""}>
<p onClick={() => this.organize_link()} >
<span className="font-16 color-grey-3">
<i className="iconfont icon-itsm-liuchengguanli font-15 mr5"></i>
组织
</span>
<span className="color-blue font-16">
{user && user.user_org_count}
</span>
</p>
</li>
</div>
</div>
</div>
@ -362,9 +380,9 @@ class Infos extends Component {
}}
></Route>
<Route
path="/users/:username/undo_events"
path="/users/:username/notice"
render={() => {
return <UndoEvents {...this.props} {...this.state} />;
return <Notice {...this.props} {...this.state} fetchUser={this.fetchUser}/>;
}}
></Route>
<Route

2
src/forge/users/Team-item.jsx
View File

@ -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">

16
src/forge/users/undo_events.js
View File

@ -1,16 +0,0 @@
import React, { Component } from "react";
import Nodata from "../Nodata";
class UndoEvents extends Component {
render() {
return (
<div className="pd20">
<div className="grid-item pb20 bbt">
<h3>待办事项</h3>
</div>
<Nodata _html={`暂时没有数据～`} />
</div>
);
}
}
export default UndoEvents;

6
src/index.css
View File

@ -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,

2
src/modules/tpm/TPMBanner.js
View File

@ -1062,7 +1062,7 @@ class TPMBanner extends Component {
</div> :
<div className="task-popup-content">
<p className="task-popup-text-center font-16 mt10 mb10">
尚未创建任务的实训，不能申请发布
尚未创建易修的实训，不能申请发布
</p>
</div>
}