issue

同步镜像调用websockt，成功后刷新页面；
合并请求可选标签，仓库设置类别、语言可选

.idea/workspace.xml

@@ -1,918 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="色值修改">
-      <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/Component.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Component.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Index.css" 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/Main/sub/sub.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/sub/sub.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/Index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/components/Login/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/components/Login/index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/components/ModalFun/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/components/ModalFun/index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/css/index.css" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/App.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="12376">
-              <caret line="760" column="37" selection-start-line="760" selection-start-column="37" selection-end-line="760" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="1989">
-              <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1564">
-              <caret line="98" column="20" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4097">
-              <caret line="248" column="18" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2431">
-              <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="765">
-              <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="14127">
-              <caret line="820" lean-forward="true" selection-start-line="820" selection-end-line="820" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4726">
-              <caret line="286" column="34" selection-start-line="286" selection-start-column="34" selection-end-line="286" selection-end-column="34" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>high</find>
-      <find>markdown</find>
-      <find>markdown-body</find>
-      <find>readme</find>
-      <find>SSH</find>
-      <find>clone</find>
-      <find>edu_pu</find>
-      <find>edu_</find>
-      <find>.str</find>
-      <find>ssh</find>
-      <find>/projects</find>
-      <find>全部项目数</find>
-      <find>未选择标签</find>
-      <find>未选择里程碑</find>
-      <find>.issueItem</find>
-      <find>未选择</find>
-      <find>issueItem</find>
-      <find>detailContent</find>
-      <find>df mt20</find>
-      <find>.detailHeader-wrapper</find>
-      <find>headerMenu-wrapper</find>
-      <find>对话</find>
-      <find>issueNo</find>
-      <find>f-wrap-between</find>
-      <find>user_img</find>
-      <find>getCommitList</find>
-      <find>login</find>
-      <find>点击开启</find>
-      <find>build</find>
-      <find>HEAD</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>任务</replace>
-    </replaceStrings>
-    <dirStrings>
-      <dir>$PROJECT_DIR$/src/forge/Merge</dir>
-      <dir>$PROJECT_DIR$</dir>
-      <dir>$PROJECT_DIR$/public</dir>
-      <dir>$PROJECT_DIR$/src/modules/user/usersInfo</dir>
-      <dir>$PROJECT_DIR$/src/modules/user</dir>
-      <dir>$PROJECT_DIR$/src/forge</dir>
-      <dir>$PROJECT_DIR$/src</dir>
-      <dir>$PROJECT_DIR$/</dir>
-    </dirStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
-        <option value="$PROJECT_DIR$/src/forge/Settings/Index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
-        <option value="$PROJECT_DIR$/src/forge/Settings/new_tags.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/Index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
-        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
-        <option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/version.css" />
-        <option value="$PROJECT_DIR$/src/forge/Index.js" />
-        <option value="$PROJECT_DIR$/src/modules/user/Projects.js" />
-        <option value="$PROJECT_DIR$/src/App.js" />
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js" />
-        <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" />
-        <option value="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" />
-        <option value="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" />
-        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" />
-        <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
-        <option value="$PROJECT_DIR$/src/AppConfig.js" />
-        <option value="$PROJECT_DIR$/src/forge/quillForEditor/index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" />
-        <option value="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
-        <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
-        <option value="$PROJECT_DIR$/public/css/css_min_all.css" />
-        <option value="$PROJECT_DIR$/public/index.html" />
-        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/order.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
-        <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="width" value="1440" />
-    <option name="height" value="900" />
-  </component>
-  <component name="ProjectId" id="1xHteQnKsYu4IEUm8tEsYIEEC5E" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <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="build" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/forge/Main" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="E:\file\forgeplus-react\node_modules\eslint" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\file\forgeplus-react\src\forge\Main" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$" />
-      <recent name="$PROJECT_DIR$/src/modules/user/usersInfo" />
-      <recent name="$PROJECT_DIR$/build" />
-      <recent name="$PROJECT_DIR$/src/forge/Images" />
-    </key>
-  </component>
-  <component name="RubyModuleManagerSettings">
-    <option name="blackListedRootsPaths">
-      <list>
-        <option value="$PROJECT_DIR$" />
-      </list>
-    </option>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="" />
-      <created>1584692398144</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1584692398144</updated>
-      <workItem from="1584692401543" duration="6228000" />
-      <workItem from="1585015135223" duration="21118000" />
-      <workItem from="1585194891947" duration="1630000" />
-      <workItem from="1585210651078" duration="1600000" />
-      <workItem from="1585217705353" duration="104000" />
-      <workItem from="1585217834609" duration="4000" />
-      <workItem from="1585217980103" duration="3406000" />
-      <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="11458000" />
-      <workItem from="1585817691582" duration="2125000" />
-      <workItem from="1585900267463" duration="136000" />
-      <workItem from="1585902299727" duration="2113000" />
-      <workItem from="1586153685130" duration="10062000" />
-      <workItem from="1586245827209" duration="1692000" />
-      <workItem from="1586330226261" duration="658000" />
-      <workItem from="1586400014081" duration="18358000" />
-      <workItem from="1586517058808" duration="1607000" />
-      <workItem from="1586741565210" duration="25216000" />
-      <workItem from="1586946208505" duration="2914000" />
-      <workItem from="1587004932342" duration="7698000" />
-      <workItem from="1587020811560" duration="543000" />
-      <workItem from="1587021467416" duration="8000" />
-      <workItem from="1587022017639" duration="2902000" />
-      <workItem from="1587047814589" duration="8239000" />
-      <workItem from="1587117033332" duration="611000" />
-      <workItem from="1587362728834" duration="185000" />
-      <workItem from="1587374749323" duration="458000" />
-      <workItem from="1587375511570" duration="1067000" />
-      <workItem from="1587376696494" duration="11000" />
-      <workItem from="1587376745950" duration="14824000" />
-      <workItem from="1587452961769" duration="4499000" />
-      <workItem from="1587534020999" duration="19518000" />
-      <workItem from="1587863258736" duration="1097000" />
-      <workItem from="1587864581358" duration="777000" />
-      <workItem from="1587870344748" duration="138000" />
-      <workItem from="1587882941476" duration="4365000" />
-      <workItem from="1587891008299" duration="390000" />
-      <workItem from="1630023942152" duration="459000" />
-      <workItem from="1630024424307" duration="17223000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="206113000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.20243205" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <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 active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49928468" visible="true" weight="0.44457832" />
-      <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" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.History.Properties">
-    <option name="COLUMN_ORDER">
-      <list>
-        <option value="0" />
-        <option value="2" />
-        <option value="3" />
-        <option value="1" />
-      </list>
-    </option>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="RECENT_FILTERS">
-      <map>
-        <entry key="Branch">
-          <value>
-            <list />
-          </value>
-        </entry>
-        <entry key="User">
-          <value>
-            <list />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx</url>
-          <line>409</line>
-          <properties lambdaOrdinal="-1" />
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7973">
-          <caret line="469" column="1" selection-start-line="469" selection-start-column="1" selection-end-line="469" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/publicCreatNew.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="714">
-          <caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/NullData.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="443">
-          <caret line="63" column="23" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="216" column="38" selection-start-line="216" selection-start-column="33" selection-end-line="216" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="311">
-          <caret line="58" column="38" selection-start-line="58" selection-start-column="38" selection-end-line="58" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/login/Trialapplication.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderInteresse.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1190">
-          <caret line="78" column="28" selection-start-line="78" selection-start-column="28" selection-end-line="78" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12104">
-          <caret line="727" column="131" selection-start-line="727" selection-start-column="30" selection-end-line="727" selection-end-column="131" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderLogin.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2584">
-          <caret line="162" selection-start-line="162" selection-end-line="162" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderReg.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="28" column="49" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/css/edu-all.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="12" column="10" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/courses/busyWork/ConnectProject.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="335">
-          <caret line="61" column="24" selection-start-line="61" selection-start-column="24" selection-end-line="61" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/@types/react/index.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="446" column="8" selection-start-line="446" selection-start-column="8" selection-end-line="446" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="1181" column="72" lean-forward="true" selection-start-line="1181" selection-start-column="40" selection-end-line="1181" selection-end-column="72" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-            <element signature="e#433#515#0" expanded="true" />
-            <element signature="e#1358#2042#0" />
-            <element signature="n#!!block;n#componentDidMount#0;n#NewHeader#0" />
-            <element signature="e#2353#2665#0" />
-            <element signature="e#2760#2816#0" />
-            <element signature="e#2954#2960#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="43" column="50" selection-start-line="43" selection-start-column="50" selection-end-line="43" selection-end-column="50" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="65" column="17" selection-start-line="65" selection-start-column="17" selection-end-line="65" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#38#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/quillForEditor/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="45" column="10" lean-forward="true" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#166#188#0" expanded="true" />
-            <element signature="e#373#392#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="680">
-          <caret line="40" column="16" selection-start-line="40" selection-start-column="16" selection-end-line="40" selection-end-column="16" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-            <element signature="e#4148#5191#0" />
-            <element signature="e#5202#6120#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="28" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Activity/ActivityItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="42" column="18" lean-forward="true" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/js/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="2068" column="17" selection-start-line="2068" selection-start-column="17" selection-end-line="2068" selection-end-column="17" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="204" column="12" selection-start-line="204" selection-start-column="12" selection-end-line="206" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#8046#8546#0" />
-            <element signature="e#8575#9036#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-984">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/react.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="927" column="16" lean-forward="true" selection-start-line="927" selection-start-column="16" selection-end-line="927" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="26" lean-forward="true" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1050">
-          <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Branch/CloneAddress.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="130">
-          <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="110" column="75" selection-start-line="110" selection-start-column="75" selection-end-line="110" selection-end-column="75" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/common/TextUtil.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/edu-all.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="3481" column="26" selection-start-line="3481" selection-start-column="26" selection-end-line="3481" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/css_min_all.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="43928">
-          <caret line="1673" column="27300" selection-start-line="1673" selection-start-column="27300" selection-end-line="1673" selection-end-column="27300" />
-        </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="153">
-          <caret line="9" column="50" lean-forward="true" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
-          <folding>
-            <element signature="n#CoderRootDirectory#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="85" column="23" lean-forward="true" selection-start-line="85" selection-start-column="23" selection-end-line="85" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#41#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="-1670">
-          <caret line="60" selection-start-line="60" selection-end-line="60" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="375" column="28" selection-start-line="375" selection-start-column="28" selection-end-line="375" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="59" column="93" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="93" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3400">
-          <caret line="200" column="35" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="337" column="28" lean-forward="true" selection-start-line="337" selection-start-column="28" selection-end-line="337" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#6358#8304#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="86" column="18" lean-forward="true" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12376">
-          <caret line="760" column="37" selection-start-line="760" selection-start-column="37" selection-end-line="760" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1989">
-          <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1564">
-          <caret line="98" column="20" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4097">
-          <caret line="248" column="18" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2431">
-          <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="765">
-          <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4726">
-          <caret line="286" column="34" selection-start-line="286" selection-start-column="34" selection-end-line="286" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#40#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="14127">
-          <caret line="820" lean-forward="true" selection-start-line="820" selection-end-line="820" />
-          <folding>
-            <element signature="e#0#40#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="306">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>

config/webpack.config.prod.js

@@ -19,7 +19,8 @@ const getClientEnvironment = require("./env");
 
 let publicPath = "/react/build/";
 const publicUrl = publicPath.slice(0, -1);
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+const shouldUseSourceMap = process.env.NODE_ENV !== "production";
 const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
@@ -54,7 +55,8 @@ module.exports = {
   },
   bail: true,
   mode: "production",
-  devtool: false, //测试版
+  // devtool: false, //测试版
+  devtool: shouldUseSourceMap?'source-map':false,
   entry: [require.resolve("./polyfills"), paths.appIndexJs],
   output: {
     path: paths.appBuild,

package-lock.json

@@ -4885,7 +4885,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"
@@ -4929,7 +4929,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": {
@@ -5187,7 +5187,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": {
@@ -5706,7 +5706,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": {
@@ -8040,7 +8040,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": {
@@ -8881,7 +8881,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": {
@@ -10486,7 +10486,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": {

public/css/edu-purge.css

@@ -1,3 +1,4 @@
+@charset "utf-8";
 /* 头部 */
 .header {
   width: 100%;
@@ -1271,7 +1272,7 @@ html body {
   font-size: 14px;
   line-height: 2.0;
   background: #fafafa;
-  font-family: "微软雅黑", "宋体";
+  font-family: "Microsoft YaHei", "SimSun";
   color: #05101a;
   height: 100%;
   position: relative;
@@ -1307,6 +1308,7 @@ td,
 span {
   margin: 0;
   padding: 0;
+  margin-bottom: 0px!important;
 }
 
 table,
@@ -1363,10 +1365,6 @@ a:visited {
   color: #05101a;
 }
 
-/*a:hover {*/
-/*  color: #2A61FF!important;*/
-/*}*/
-
 ol,
 ul,
 li {
@@ -1609,7 +1607,7 @@ a.decoration {
 }
 
 .mt6 {
-  margin-top: 3px;
+  margin-top: 6px;
 }
 
 .mt7 {
@@ -1929,7 +1927,9 @@ a.decoration {
 }
 
 .mr20 {
-  margin-right: 20px;
+  margin-right: 10px;
+  margin-left: 10px;
+  float: left;
 }
 
 .mr25 {
@@ -1937,7 +1937,7 @@ a.decoration {
 }
 
 .mr30 {
-  margin-right: 30px;
+  margin-right: 10px;
 }
 
 .mr35 {
@@ -2439,6 +2439,10 @@ a.hoverLine:hover{
   color: #333333 !important;
 }
 
+a:hover{
+  color: #466AFF !important;
+}
+
 .color-grey-98 {
   color: #989898 !important;
 }
@@ -2471,18 +2475,17 @@ a.hoverLine:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover,a.color-ooo span:hover{
-  color: #466AFF !important;
+a.color-grey-3:hover,a.color-ooo:hover {
+  color: #2A61FF !important;
 }
 
 /*蓝色*/
-.color-blue, .color-blue-file{
-  color: #4CACFF !important;
-}
-
 .color-blue {
   color: #2A61FF !important;
 }
+.color-blue-file {
+  color: #4598FA!important;
+}
 /* 绿色 */
 /*主*/
 .color-blue_4C {

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1629875571487') format('woff2'),
-       url('iconfont.woff?t=1629875571487') format('woff'),
-       url('iconfont.ttf?t=1629875571487') format('truetype');
+  src: url('iconfont.woff2?t=1632638897939') format('woff2'),
+       url('iconfont.woff?t=1632638897939') format('woff'),
+       url('iconfont.ttf?t=1632638897939') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,142 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-liulanicon2x:before {
+  content: "\e8dd";
+}
+
+.icon-wenjianicon:before {
+  content: "\e8dc";
+}
+
+.icon-a-yuanquan2x:before {
+  content: "\e8db";
+}
+
+.icon-xiangmubiaoqian:before {
+  content: "\e8da";
+}
+
+.icon-icon:before {
+  content: "\e8ce";
+}
+
+.icon-tar:before {
+  content: "\e8cf";
+}
+
+.icon-a-fuzhi2:before {
+  content: "\e8d0";
+}
+
+.icon-fujian1:before {
+  content: "\e8d1";
+}
+
+.icon-a-bianji1:before {
+  content: "\e8d2";
+}
+
+.icon-banbenicon:before {
+  content: "\e8d3";
+}
+
+.icon-shanchuicon2:before {
+  content: "\e8d4";
+}
+
+.icon-a-lajitong_icon3x:before {
+  content: "\e8d5";
+}
+
+.icon-xialaanniu2:before {
+  content: "\e8d6";
+}
+
+.icon-xiazai-icon:before {
+  content: "\e8d7";
+}
+
+.icon-master_icon1:before {
+  content: "\e8d8";
+}
+
+.icon-shangchuanicon:before {
+  content: "\e8d9";
+}
+
+.icon-gerenziliao1:before {
+  content: "\e8c7";
+}
+
+.icon-lichengbeiicon:before {
+  content: "\e885";
+}
+
+.icon-cangkushezhiicon:before {
+  content: "\e889";
+}
+
+.icon-dongtaiicon:before {
+  content: "\e88a";
+}
+
+.icon-gongzuoliuicon:before {
+  content: "\e88b";
+}
+
+.icon-yixiuicon1:before {
+  content: "\e89b";
+}
+
+.icon-a-wikiicon1:before {
+  content: "\e8c6";
+}
+
+.icon-daimakuicon1:before {
+  content: "\e8c5";
+}
+
+.icon-wodetongzhi:before {
+  content: "\e8c8";
+}
+
+.icon-tongzhiguanli:before {
+  content: "\e8c9";
+}
+
+.icon-xuanzhong3:before {
+  content: "\e8ca";
+}
+
+.icon-xitongtongzhiicon:before {
+  content: "\e8cb";
+}
+
+.icon-xiaoxi2:before {
+  content: "\e8cc";
+}
+
+.icon-sshmiyue:before {
+  content: "\e8cd";
+}
+
+.icon-gerenziliao:before {
+  content: "\e8c4";
+}
+
+.icon-xinshouzhiyin:before {
+  content: "\e8e4";
+}
+
+.icon-xinjianxiangmu:before {
+  content: "\e8e6";
+}
+
+.icon-jiaruketang1:before {
+  content: "\e8e9";
+}
+
 .icon-xiangmugonggao:before {
   content: "\e8c2";
 }
@@ -105,10 +241,6 @@
   content: "\e883";
 }
 
-.icon-cangkushezhiicon:before {
-  content: "\e885";
-}
-
 .icon-lianjieicon:before {
   content: "\e887";
 }
@@ -117,18 +249,6 @@
   content: "\e888";
 }
 
-.icon-lichengbeiicon:before {
-  content: "\e889";
-}
-
-.icon-gongzuoliuicon:before {
-  content: "\e88a";
-}
-
-.icon-dongtaiicon:before {
-  content: "\e88b";
-}
-
 .icon-morendianzan_icon:before {
   content: "\e88e";
 }
@@ -233,10 +353,6 @@
   content: "\e898";
 }
 
-.icon-weixuanzhongqingqiuicon:before {
-  content: "\e89b";
-}
-
 .icon-xiezuozheguanliicon:before {
   content: "\e8a1";
 }

public/css/iconfont.json

@@ -5,6 +5,244 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "24600282",
+      "name": "浏览icon@2x",
+      "font_class": "a-liulanicon2x",
+      "unicode": "e8dd",
+      "unicode_decimal": 59613
+    },
+    {
+      "icon_id": "24567893",
+      "name": "文件icon",
+      "font_class": "wenjianicon",
+      "unicode": "e8dc",
+      "unicode_decimal": 59612
+    },
+    {
+      "icon_id": "24527422",
+      "name": "圆圈@2x",
+      "font_class": "a-yuanquan2x",
+      "unicode": "e8db",
+      "unicode_decimal": 59611
+    },
+    {
+      "icon_id": "24378423",
+      "name": "项目标签",
+      "font_class": "xiangmubiaoqian",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
+    {
+      "icon_id": "24368060",
+      "name": "icon",
+      "font_class": "icon",
+      "unicode": "e8ce",
+      "unicode_decimal": 59598
+    },
+    {
+      "icon_id": "24368061",
+      "name": "tar",
+      "font_class": "tar",
+      "unicode": "e8cf",
+      "unicode_decimal": 59599
+    },
+    {
+      "icon_id": "24289113",
+      "name": "复制 (2)",
+      "font_class": "a-fuzhi2",
+      "unicode": "e8d0",
+      "unicode_decimal": 59600
+    },
+    {
+      "icon_id": "24289114",
+      "name": "附件",
+      "font_class": "fujian1",
+      "unicode": "e8d1",
+      "unicode_decimal": 59601
+    },
+    {
+      "icon_id": "24289115",
+      "name": "编 辑",
+      "font_class": "a-bianji1",
+      "unicode": "e8d2",
+      "unicode_decimal": 59602
+    },
+    {
+      "icon_id": "24289116",
+      "name": "版本icon",
+      "font_class": "banbenicon",
+      "unicode": "e8d3",
+      "unicode_decimal": 59603
+    },
+    {
+      "icon_id": "24289117",
+      "name": "删除icon",
+      "font_class": "shanchuicon2",
+      "unicode": "e8d4",
+      "unicode_decimal": 59604
+    },
+    {
+      "icon_id": "24289118",
+      "name": "垃圾桶_icon@3x",
+      "font_class": "a-lajitong_icon3x",
+      "unicode": "e8d5",
+      "unicode_decimal": 59605
+    },
+    {
+      "icon_id": "24289119",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu2",
+      "unicode": "e8d6",
+      "unicode_decimal": 59606
+    },
+    {
+      "icon_id": "24289120",
+      "name": "下载-icon",
+      "font_class": "xiazai-icon",
+      "unicode": "e8d7",
+      "unicode_decimal": 59607
+    },
+    {
+      "icon_id": "24289121",
+      "name": "master_icon",
+      "font_class": "master_icon1",
+      "unicode": "e8d8",
+      "unicode_decimal": 59608
+    },
+    {
+      "icon_id": "24289122",
+      "name": "上传icon",
+      "font_class": "shangchuanicon",
+      "unicode": "e8d9",
+      "unicode_decimal": 59609
+    },
+    {
+      "icon_id": "24059956",
+      "name": "个人资料",
+      "font_class": "gerenziliao1",
+      "unicode": "e8c7",
+      "unicode_decimal": 59591
+    },
+    {
+      "icon_id": "24059409",
+      "name": "里程碑icon",
+      "font_class": "lichengbeiicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "24059410",
+      "name": "仓库设置icon",
+      "font_class": "cangkushezhiicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
+    {
+      "icon_id": "24059411",
+      "name": "动态icon",
+      "font_class": "dongtaiicon",
+      "unicode": "e88a",
+      "unicode_decimal": 59530
+    },
+    {
+      "icon_id": "24059412",
+      "name": "工作流icon",
+      "font_class": "gongzuoliuicon",
+      "unicode": "e88b",
+      "unicode_decimal": 59531
+    },
+    {
+      "icon_id": "24059413",
+      "name": "易修icon",
+      "font_class": "yixiuicon1",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "24059414",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon1",
+      "unicode": "e8c6",
+      "unicode_decimal": 59590
+    },
+    {
+      "icon_id": "24047186",
+      "name": "代码库icon",
+      "font_class": "daimakuicon1",
+      "unicode": "e8c5",
+      "unicode_decimal": 59589
+    },
+    {
+      "icon_id": "24047189",
+      "name": "我的通知",
+      "font_class": "wodetongzhi",
+      "unicode": "e8c8",
+      "unicode_decimal": 59592
+    },
+    {
+      "icon_id": "24047190",
+      "name": "通知管理",
+      "font_class": "tongzhiguanli",
+      "unicode": "e8c9",
+      "unicode_decimal": 59593
+    },
+    {
+      "icon_id": "24047191",
+      "name": "选中",
+      "font_class": "xuanzhong3",
+      "unicode": "e8ca",
+      "unicode_decimal": 59594
+    },
+    {
+      "icon_id": "24047192",
+      "name": "系统通知icon",
+      "font_class": "xitongtongzhiicon",
+      "unicode": "e8cb",
+      "unicode_decimal": 59595
+    },
+    {
+      "icon_id": "24047193",
+      "name": "消息",
+      "font_class": "xiaoxi2",
+      "unicode": "e8cc",
+      "unicode_decimal": 59596
+    },
+    {
+      "icon_id": "24047194",
+      "name": "ssh密钥",
+      "font_class": "sshmiyue",
+      "unicode": "e8cd",
+      "unicode_decimal": 59597
+    },
+    {
+      "icon_id": "24014152",
+      "name": "个人资料",
+      "font_class": "gerenziliao",
+      "unicode": "e8c4",
+      "unicode_decimal": 59588
+    },
+    {
+      "icon_id": "23655968",
+      "name": "新手指引",
+      "font_class": "xinshouzhiyin",
+      "unicode": "e8e4",
+      "unicode_decimal": 59620
+    },
+    {
+      "icon_id": "23655969",
+      "name": "新建项目",
+      "font_class": "xinjianxiangmu",
+      "unicode": "e8e6",
+      "unicode_decimal": 59622
+    },
+    {
+      "icon_id": "23658111",
+      "name": "加入课堂",
+      "font_class": "jiaruketang1",
+      "unicode": "e8e9",
+      "unicode_decimal": 59625
+    },
     {
       "icon_id": "23791639",
       "name": "项目公告",
@@ -166,13 +404,6 @@
       "unicode": "e883",
       "unicode_decimal": 59523
     },
-    {
-      "icon_id": "23472256",
-      "name": "仓库设置icon",
-      "font_class": "cangkushezhiicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
     {
       "icon_id": "23472258",
       "name": "链接icon",
@@ -187,27 +418,6 @@
       "unicode": "e888",
       "unicode_decimal": 59528
     },
-    {
-      "icon_id": "23472260",
-      "name": "里程碑icon",
-      "font_class": "lichengbeiicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
-    {
-      "icon_id": "23472261",
-      "name": "工作流icon",
-      "font_class": "gongzuoliuicon",
-      "unicode": "e88a",
-      "unicode_decimal": 59530
-    },
-    {
-      "icon_id": "23472262",
-      "name": "动态icon",
-      "font_class": "dongtaiicon",
-      "unicode": "e88b",
-      "unicode_decimal": 59531
-    },
     {
       "icon_id": "23472263",
       "name": "默认点赞_icon",
@@ -390,13 +600,6 @@
       "unicode": "e898",
       "unicode_decimal": 59544
     },
-    {
-      "icon_id": "23144155",
-      "name": "未选中请求icon",
-      "font_class": "weixuanzhongqingqiuicon",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
     {
       "icon_id": "23144158",
       "name": "协作者管理icon",

public/js/editormd/editormd.min.js

@@ -3319,9 +3319,9 @@
                     text = text.replace(emailReg, function ($1, $2, $3, $4) {
                         return $1.replace(/@/g, "_#_@_#_");
                     });
-
+                    // " + editormd.urls.atLinkBase + "" + $2 + "
                     text = text.replace(atLinkReg, function ($1, $2) {
-                        return "<a href=\"" + editormd.urls.atLinkBase + "" + $2 + "\" title=\"&#64;" + $2 + "\" class=\"at-link\">" + $1 + "</a>";
+                        return "<span title=\"&#64;" + $2 + "\" class=\"at-link\"> " + $1 + " </span>";
                     }).replace(/_#_&#64;_#_/g, "@");
                 }
 

src/App.js

@@ -3,7 +3,7 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	BrowserRouter as Router,
+	// BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
@@ -19,7 +19,7 @@ import moment from 'moment'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 import SiderBar from './forge/Component/SiderBar'
 
-import { SnackbarHOC } from 'educoder'
+import { SnackbarHOC } from 'educoder';
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@@ -39,6 +39,11 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("./forge/Main/DetailAdaptor"),
+  loading: Loading,
+});
 //forge安全设置
 const Security = Loadable({
 	loader: () => import('./forge/SecuritySetting/Index'),
@@ -91,6 +96,15 @@ const ProjectIndex = Loadable({
 	loader: () => import("./forge/Index"),
 	loading: Loading,
 });
+
+const CreateMerge = Loadable({
+  loader: () => import('./forge/Merge/NewMerge'),
+  loading: Loading,
+})
+
+// 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
+const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
+
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -100,6 +114,51 @@ class App extends Component {
 			mydisplay: false,
 			occupation: 0,
 			mygetHelmetapi: null,
+			pathType: null,
+			pathName: null,
+		}
+	}
+
+	UNSAFE_componentWillMount() {
+		initAxiosInterceptors(this.props);
+		let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
+		pathname && this.getPathnameType(pathname);
+
+		// 添加路由监听，决定组织还是个人
+		this.unlisten = this.props.history.listen((location) => {
+			let newPathname = location.pathname.split('/')[1];
+			if (this.state.pathName !== newPathname) {
+				// this.setState({ pathType: '' });
+				newPathname && this.getPathnameType(newPathname);
+			}
+		});
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		// (!keyWord.includes(this.props.location.pathname.split('/')[1])) &&
+		if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	getPathnameType = (pathname) => {
+		if (!keyWord.includes(pathname)) {
+			let url = `/owners/${pathname}.json`;
+			axios.get(url).then((response) => {
+				if (response && response.status === 200) {
+					this.setState({
+						pathType: response.data.type || '404',
+						pathName: pathname,
+					})
+				}
+			});
+		}else{
+			this.setState({
+				pathType: pathname,
+				pathName: pathname,
+			});
 		}
 	}
 
@@ -119,13 +178,19 @@ class App extends Component {
 
 	componentDidMount() {
 		document.title = "loading...";
-		initAxiosInterceptors(this.props);
+
 		this.getAppdata();
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
+
 	}
+
+	componentWillUnmount() {
+		this.unlisten && this.unlisten(); // 执行解绑
+	}
+
 	//修改登录方法
 	Modifyloginvalue = () => {
 		this.setState({
@@ -196,7 +261,7 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi } = this.state;
+		const { mygetHelmetapi, pathType} = this.state;
 		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
@@ -204,87 +269,131 @@ class App extends Component {
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
 						<SiderBar />
-						<Router>
-							<Switch>
-								{/* wiki预览 */}
-								<Route path="/projects/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+						{/* <Router> */}
+						<Switch>
+							{/* wiki预览 */}
+							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+								(props) => {
+									return (<WikiPreview {...this.props} {...props} {...this.state} />)
+								}
+							} />
+
+							{/* 项目PR */}
+							<Route path="/:owner/:projectsId/pulls/new"
+								render={
+									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
+								}
+							></Route>
+
+							{/*项目*/}
+							<Route
+								path={"/:owner/:projectId/devops/:opsId/detail"}
+								render={
 									(props) => {
-										return (<WikiPreview {...this.props} {...props} {...this.state} />)
+										return (<OpsDetail {...this.props} {...props} {...this.state} />)
 									}
-								} />
-
-								{/*项目*/}
-								<Route
-									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
-									render={
-										(props) => {
-											return (<OpsDetail {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								<Route
-									path={"/settings"}
-									render={
-										(props) => {
-											return (<Security {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*项目*/}
-								<Route
-									path={"/projects"}
-									render={
-										(props) => {
-											return (<Projects {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								<Route
-									path="/register"
-									render={
-										(props) => {
-											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
+								}>
+							</Route>
+							<Route
+								path={"/settings"}
+								render={
+									(props) => {
+										return (<Security {...this.props} {...props} {...this.state} />)
 									}
-								/>
-								{/*403*/}
-								<Route path="/403" component={Shixunauthority} />
+								}>
+							</Route>
 
-								<Route path="/500" component={http500} />
-								<Route path={"/organize"}
-									render={
-										(props) => {
-											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*404*/}
-								<Route path="/nopage" component={Shixunnopage} />
-
-								{/* 查询 */}
-								<Route path="/search" component={Search} />
-
-
-								{/* 个人主页 */}
-								<Route path="/users/:username"
-									render={
-										(props) => {
-											return (<InfosIndex {...this.props} {...this.state} />)
-										}
-									}></Route>
-								<Route exact path="/"
-									render={
-										(props) => (
-											personal && personal.length > 0 ?
-												<InfosIndex {...this.props} {...props} />
-												:
-												<ProjectIndex {...this.props} {...props} />
-										)
+							<Route
+								path="/register"
+								render={
+									(props) => {
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 									}
-								/>
-								<Route component={Shixunnopage} />
-							</Switch>
-						</Router>
+								}
+							/>
+							{/*403*/}
+							<Route path="/403" component={Shixunauthority} />
+
+							<Route path="/500" component={http500} />
+
+							{/*404*/}
+							<Route path="/nopage" component={Shixunnopage} />
+
+							{/* 查询 */}
+							<Route path="/search" component={Search} />
+
+							<Route exact path="/explore"
+								render={
+									(props) => (
+											<ProjectIndex {...this.props} {...props} />
+									)
+								}
+							/>
+
+
+							{/* 组织 */}
+							<Route path={"/organize"}
+								render={
+									(props) => {
+										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+									}
+								}>
+							</Route>
+							
+							{/*新建项目等*/}
+							<Route
+								path={"/projects"}
+								render={
+									(props) => {
+										return (<Projects {...this.props} {...props} {...this.state} />)
+									}
+								}>
+							</Route>
+
+							{/* 判断为用户/组织，并进入对应页面 */}
+							{
+								pathType === 'User' ?
+									<Route exact path="/:username"
+										render={
+											(props) => {
+												return (<InfosIndex {...this.props} {...this.state} />)
+											}
+										}
+									/> : pathType === 'Organization' ? <Route path={"/:OIdentifier"}
+										render={
+											(props) => {
+												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+											}
+										}>
+									</Route> : pathType === '404' ? <Route component={Shixunnopage} />:
+										<Route exact path="/"
+											render={
+												(props) => (
+													personal && personal.length > 0 ?
+														<InfosIndex {...this.props} {...props} />
+														:
+														<ProjectIndex {...this.props} {...props} />
+												)
+											}
+										/>
+								// <Route path="/" component={Loading} />
+								// <Route path="/" component={Shixunnopage} /> 
+							}
+
+
+
+							{/* 个人主页 */}
+							<Route path="/:username"
+								render={
+									(props) => {
+										return (<InfosIndex {...this.props} {...this.state} />)
+									}
+								}></Route>
+
+
+							<Route component={Shixunnopage} />
+						</Switch>
+						{/* </Router> */}
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>

src/AppConfig.js

@@ -85,7 +85,10 @@ export function initAxiosInterceptors(props) {
     }
 
     if (response.data.status === 404) {
-      locationurl('/nopage');
+      let responseURL = response.request ? response.request.responseURL:'';
+      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
+        locationurl('/nopage');
+      }
     }
 
     if (response.data.status === 500) {

src/college/College.js

@@ -195,7 +195,7 @@ class College extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth105",
 					render: (text, record) => (
-						<a href={`/users/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
+						<a href={`/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
 							color:'#007bff',
 
 						}}>	{

src/common/DateUtil.js

@@ -107,7 +107,7 @@ export function timeAgo(backDate) {
   try {
     moment(backDate);
   } catch (e) {
-    return;
+    return '刚刚';
   }
   if(typeof backDate ==='number'){
     backDate=backDate*1000
@@ -134,4 +134,5 @@ export function timeAgo(backDate) {
   if (seconds) {
     return seconds + "秒前";
   }
+  return "刚刚";
 }

src/context/TPIContextProvider.js

@@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
 		image_url: "avatars/User/1"
 		login: "innov"
 		name: "Coder"
-		user_url: "/users/innov"
+		user_url: "/innov"
 		 */
 		let user = resData.user;
 		user.username = resData.user.name;
-		user.user_url = `/users/${resData.user.login}`;
+		user.user_url = `/${resData.user.login}`;
 		// user.image_url = resData.image_url;
 		user.is_teacher = resData.is_teacher;
 		resData.user = user;

src/forge/Activity/ActivityItem.js

@@ -14,25 +14,25 @@ class ActivityItem extends Component {
           {/* 如果是版本发布 */}
           {item.trend_type === "VersionRelease" ?
           <p className="itemLine">
-            <Link to={`/projects/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
             <span className="activity_type">{item.trend_type}</span>
           </p >
           :
           // 如果是任务
           item.trend_type === "Issue" ?
             <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
             :
             // 如果是合并请求
             <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
           }
           <p className="itemLine mt10">
-            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
+            <Link to={`/${item && item.user_login}`} className="show-user-link">
               <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
               <span className="mr20">{item.user_name}</span>
             </Link>

src/forge/Branch/CloneAddress.js

@@ -1,16 +1,10 @@
 import React, { useState } from 'react';
-import { Dropdown, Menu, Tooltip } from 'antd';
+import { Menu } from 'antd';
 import "./branch.scss";
+import CopyTool from '../Component/CopyTool';
 
 function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
   const [ key , setKey ] = useState("HTTP");
-  // 点击按钮复制功能
-  function jsCopy(){
-    var e = document.getElementById("copy_rep_content");
-    e.select();
-    document.execCommand("Copy");
-  }
-
   return (
     <div className="downMenu">
       <div style={{borderBottom:"1px solid #eee"}}>
@@ -20,9 +14,7 @@ function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
         </Menu>
         <div className="gitAddressClone">
           <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
-          <Tooltip title="复制链接">
-            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
-          </Tooltip>
+          <CopyTool inputId="copy_rep_content" className="copytool"/>
         </div>
       </div>
       <Menu className="edu-txt-center">

src/forge/Branch/Select.jsx

@@ -26,9 +26,9 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
       <div className="branch-tagBox">
         {/* {nav === 0 ?"分支":"标签"} */}
         <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
-        <a className="ant-dropdown-link task-hide">
+        <span className="ant-dropdown-link task-hide" style={{fontWeight:"500"}}>
           {showValue}
-        </a>
+        </span>
         <i className="showtag iconfont icon-sanjiaoxing-down font-15 color-grey-9 mr5 ml5 mt1" />
       </div>
     </Dropdown>

src/forge/Branch/branch.css

@@ -1,132 +0,0 @@
-.branchDropdown {
-  border: 1px solid #eee;
-  border-radius: 4px;
-  display: flex;
-  justify-content: center;
-  height: 40px;
-  line-height: 40px;
-  min-width: 220px;
-}
-
-.branchDropdown .ant-dropdown-trigger {
-  width: 100%;
-  padding: 0px 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  cursor: pointer;
-}
-
-.branchOptions {
-  width: 220px;
-  box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
-  border-radius: 3px;
-  background: #fff;
-  max-height: 300px;
-}
-
-.OptionsUl {
-  max-height: 220px;
-  overflow-y: auto;
-}
-
-.OptionsUl li {
-  height: 30px;
-  line-height: 30px;
-  cursor: pointer;
-  padding: 0px 20px;
-  margin: 5px 0px;
-}
-
-.OptionsUl li:hover {
-  background-color: #F0F0F0;
-}
-
-.OptionsUl li a {
-  display: block;
-}
-
-.OptionsInput {
-  height: 32px;
-  padding-left: 4px;
-  line-height: 32px;
-  width: 100%;
-}
-
-.branch-tagBox {
-  border: 1px solid #D0D0D0;
-  border-radius: 3px;
-  height: 36px;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  min-width: 104px;
-}
-
-.branch-tagBox:hover {
-  background-color: #F3F4F6;
-}
-
-.branch-tagBox-list {
-  background: #FFFFFF;
-  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
-  border-radius: 4px;
-}
-.branch-tagBox-list .ant-popover-arrow {
-  display: none;
-}
-.branch-tagBox-list.ant-popover.ant-popover-placement-bottom {
-  padding-top: 0px;
-}
-.branch-tagBox-list .branch-tagBox .ant-dropdown-link {
-  display: block;
-  flex: 1;
-  max-width: 105px;
-}
-.branch-tagBox-list .ant-popover-inner-content {
-  padding: 0px;
-}
-
-.overlayBranch {
-  width: 325px;
-}
-.overlayBranch .navUl {
-  margin-top: 8px;
-  height: 30px;
-  line-height: 30px;
-}
-.overlayBranch .navUl li {
-  height: 30px;
-  line-height: 30px;
-  padding: 0px 5px;
-  margin-left: 20px !important;
-}
-
-.listTips {
-  padding: 20px 0px;
-  text-align: center;
-}
-
-.urlMenu {
-  line-height: 30px;
-  margin-bottom: 10px;
-  padding: 15px 20px 0px 20px;
-  border-bottom: none;
-}
-.urlMenu li.ant-menu-item {
-  height: 30px;
-  line-height: 30px;
-  padding: 0px 5px;
-  margin-right: 20px !important;
-}
-.urlMenu li.ant-menu-item.ant-menu-item-selected, .urlMenu li.ant-menu-item.ant-menu-item-active {
-  color: #333;
-}
-.urlMenu li.ant-menu-item.ant-menu-item-selected {
-  border-color: #1890ff !important;
-}
-.urlMenu li.ant-menu-item.ant-menu-item-active {
-  border-color: transparent;
-}
-
-/*# sourceMappingURL=branch.css.map */

src/forge/Branch/branch.css.map

@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE","file":"branch.css"}

src/forge/Branch/branch.scss

@@ -48,7 +48,7 @@
 .branch-tagBox{
   border:1px solid #D0D0D0;
   border-radius: 3px;
-  height: 36px;
+  height: 32px;
   display: flex;
   align-items: center;
   cursor: pointer;
@@ -115,4 +115,7 @@
       border-color:transparent ;
     }
   }
+}
+.copytool{
+  margin:0px 10px;
 }

src/forge/Component/AddGroup.jsx

@@ -55,6 +55,7 @@ function AddGroup({organizeId,getGroupID}){
 
   function addCollaborator(){
     getGroupID && getGroupID(id);
+    setID(undefined);
   }
 
   return(

src/forge/Component/Component.css

@@ -1,432 +0,0 @@
-@charset "UTF-8";
-ul.ant-menu {
-  border-right: none;
-}
-
-ul.ant-menu li:last-child {
-  border-bottom: none;
-}
-
-li.ant-menu-item {
-  margin: 0px !important;
-  border-bottom: 1px solid #eee;
-}
-
-.flags {
-  border: 1px solid red;
-  border-radius: 5px;
-}
-
-.cards {
-  display: flex;
-  align-items: center;
-  padding: 20px 34px;
-  background-color: #fff;
-  margin-bottom: 18px;
-  min-height: 130px;
-  border: 1px solid #eee;
-}
-.cards .img {
-  margin-right: 20px;
-  width: 190px;
-  height: 90px;
-  border: 1px solid #eeeeee;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-}
-.cards .img img {
-  max-width: 100%;
-  max-height: 100%;
-}
-.cards .content {
-  flex: 1;
-  width: 0;
-}
-.cards .content .titles {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 10px !important;
-  align-items: center;
-  height: 22px;
-  line-height: 22px;
-}
-.cards .content .titles > a {
-  font-size: 18px;
-  color: #333;
-}
-.cards .content .desc {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  line-height: 20px;
-}
-
-.tabsStyle {
-  border: 1px solid #eee;
-}
-.tabsStyle .ant-tabs-bar.ant-tabs-top-bar {
-  padding-left: 35px;
-  margin-bottom: 0px;
-}
-.tabsStyle .ant-tabs-nav .ant-tabs-tab {
-  padding: 19px 0px;
-  margin-right: 40px;
-}
-.tabsStyle .ant-tabs-ink-bar {
-  width: 25px !important;
-  bottom: 10px;
-}
-
-.statusColor {
-  display: inline-block;
-  padding: 0px 10px;
-  height: 20px;
-  line-height: 20px;
-  border-radius: 11px;
-  color: #fff;
-  margin-left: 5px;
-  font-size: 12px;
-}
-.statusColor.running {
-  background: #5091FF;
-  color: #F1F8FF;
-}
-.statusColor.Preparing {
-  background: #ff6e21;
-  color: #fff8f4;
-}
-.statusColor.pass {
-  background: #28BD6C;
-  color: #EEFDF5;
-}
-.statusColor.failed {
-  background: #F73030;
-  color: #FCEEEE;
-}
-.statusColor.killed {
-  background: #eee;
-  color: #999;
-}
-
-.handleBox {
-  position: fixed;
-  top: 45%;
-  right: 240px;
-  z-index: 10000;
-}
-
-.laterest {
-  background-color: #EF3131;
-  color: #fff;
-  font-size: 12px;
-  margin-left: 10px;
-  padding: 0px 5px;
-  border-radius: 2px;
-  height: 18px;
-  line-height: 18px;
-}
-
-@media screen and (max-width: 1800px) {
-  .handleBox {
-    right: 190px;
-  }
-}
-@media screen and (max-width: 1700px) {
-  .handleBox {
-    right: 140px;
-  }
-}
-@media screen and (max-width: 1600px) {
-  .handleBox {
-    right: 90px;
-  }
-}
-@media screen and (max-width: 1450px) {
-  .handleBox {
-    right: 10px;
-  }
-}
-@media screen and (max-width: 1380px) {
-  .handleBox {
-    right: 0px;
-  }
-}
-.ant-drawer {
-  z-index: 10000 !important;
-}
-
-.ant-drawer-body {
-  padding: 0px !important;
-}
-.ant-drawer-body .drawerHead {
-  background-color: #333;
-  color: #fff;
-  padding: 15px 20px;
-}
-.ant-drawer-body .ant-tree {
-  margin: 0px 20px !important;
-}
-
-.menuPanels {
-  width: 295px;
-}
-.menuPanels .leftline {
-  position: relative;
-  color: #666;
-  height: 16px;
-}
-.menuPanels .leftline::before {
-  position: absolute;
-  left: -10px;
-  top: 3px;
-  height: 12px;
-  width: 1px;
-  background-color: #666666;
-  content: "";
-}
-.menuPanels .ant-btn {
-  height: 36px;
-  line-height: 34px;
-  width: 83px;
-  text-align: center;
-  padding: 0px;
-  font-weight: 500;
-  font-size: 14px;
-}
-.menuPanels .ant-btn.currentBtn {
-  cursor: default;
-  color: #333;
-}
-.menuPanels .ant-btn.currentBtn:hover {
-  color: #333;
-  border-color: #d0d0d0;
-}
-.menuPanels .ant-btn-default {
-  color: #333;
-  border-color: #d0d0d0;
-}
-.menuPanels .ant-btn-default:hover {
-  background: #F3F4F6;
-}
-.menuPanels .ant-btn-primary {
-  color: #fff;
-  background-color: #2A61FF;
-}
-.menuPanels .focusPanelHeadInfo {
-  padding: 14px 16px;
-  border-bottom: 1px solid #eee;
-}
-.menuPanels .ant-popover-content, .menuPanels .ant-popover-inner {
-  height: 100%;
-  width: 100%;
-}
-.menuPanels .ant-popover-inner-content {
-  padding: 0px;
-}
-
-.halfs {
-  margin-top: 24px;
-  padding: 24px 0px 0px 0px;
-  border-top: 1px solid #e8e8e8;
-}
-
-.aboutSubTitle {
-  display: flex;
-  align-items: center;
-}
-
-.menuinfos {
-  padding: 10px 20px;
-}
-.menuinfos > a {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  flex: 1;
-}
-.menuinfos > a > span:first-child {
-  font-size: 16px;
-  font-weight: 500;
-  color: #333;
-  line-height: 22px;
-}
-.menuinfos > a > span:last-child {
-  color: #666;
-  font-weight: 400;
-  line-height: 20px;
-  margin-top: 6px;
-}
-
-/*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar {
-  position: fixed;
-  width: 40px;
-  right: 0;
-  bottom: 80px;
-  z-index: 10;
-}
-
-@media screen and (max-width: 1920px) {
-  .-task-sidebar {
-    right: 220px;
-  }
-}
-@media screen and (max-width: 1750px) {
-  .-task-sidebar {
-    right: 160px;
-  }
-}
-@media screen and (max-width: 1650px) {
-  .-task-sidebar {
-    right: 115px;
-  }
-}
-@media screen and (max-width: 1550px) {
-  .-task-sidebar {
-    right: 90px;
-  }
-}
-@media screen and (max-width: 1450px) {
-  .-task-sidebar {
-    right: 45px;
-  }
-}
-@media screen and (max-width: 1200px) {
-  .-task-sidebar {
-    right: 0px;
-    display: none;
-  }
-}
-.-task-sidebar > div {
-  height: 40px;
-  line-height: 40px;
-  box-sizing: border-box;
-  width: 40px;
-  color: #999;
-  font-size: 20px;
-  text-align: center;
-  margin-bottom: 20px;
-  border-radius: 50%;
-  background: #FFFFFF;
-  box-shadow: 0px 0px 10px 1px #F1F1F1;
-}
-
-.-task-sidebar > div i {
-  color: #999;
-}
-
-.-task-sidebar > div:hover i {
-  color: #fff !important;
-}
-
-.-task-sidebar > div:hover {
-  background: #1890FF;
-  box-shadow: 0px 0px 10px 2px #B6D0FC;
-}
-
-.helpBox {
-  width: 260px;
-  z-index: 103;
-}
-.helpBox.shareContent {
-  width: 200px;
-}
-.helpBox .ant-popover-inner-content {
-  padding: 0px;
-}
-.helpBox p.titlecontent {
-  font-size: 18px;
-  color: #333;
-  line-height: 20px;
-  padding: 15px 20px;
-}
-.helpBox .faqUl {
-  padding: 0px 20px 10px;
-  max-height: 230px;
-  overflow-y: auto;
-}
-.helpBox .faqUl li {
-  background: #F5F5F5;
-  border-radius: 20px;
-  padding: 0px 20px;
-  color: #333;
-  height: 34px;
-  line-height: 34px;
-  margin-bottom: 10px;
-}
-.helpBox .faqUl li a {
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.helpBox .faqUl li:hover {
-  background-color: #D1E9FF;
-}
-.helpBox .faqUl li:hover a {
-  color: #333 !important;
-}
-.helpBox .shareUl {
-  padding: 10px 0px;
-  display: flex;
-  align-items: center;
-}
-.helpBox .shareUl .titlecontent {
-  margin-right: 20px;
-}
-.helpBox .shareUl li > i {
-  font-size: 32px !important;
-}
-
-.-task-desc {
-  background: #494949;
-  width: 90px;
-  line-height: 36px;
-  text-align: center;
-  position: absolute;
-  color: #fff;
-  font-size: 13px;
-  z-index: 999999;
-  opacity: 0;
-}
-
-.-task-desc div {
-  position: absolute;
-  top: 10px;
-  right: -7px;
-  height: 13px;
-}
-
-.-task-desc div img {
-  float: left;
-}
-
-.-task-sidebar .scan_ewm {
-  position: absolute !important;
-  right: 45px !important;
-  bottom: 0px !important;
-  background-color: #494949 !important;
-  -webkit-box-sizing: border-box !important;
-  box-sizing: border-box !important;
-  font-size: 14px !important;
-  line-height: 16px !important;
-  display: none;
-  height: 213px !important;
-}
-
-.trangle_right {
-  position: absolute;
-  right: -5px;
-  bottom: 15px;
-  width: 0;
-  height: 0px;
-  border-top: 6px solid transparent;
-  border-left: 5px solid #494949;
-  border-bottom: 6px solid transparent;
-}
-
-/*# sourceMappingURL=Component.css.map */

src/forge/Component/Component.css.map

@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["Component.scss"],"names":[],"mappings":";AAAA;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;;;AAEF;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAIN;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;AAKN;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;IACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;AACA;EACE;;AAKR;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAON;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA","file":"Component.css"}

src/forge/Component/Component.scss

@@ -162,20 +162,29 @@ li.ant-menu-item{
     margin:0px 20px!important;
   }
 }
-
+.hoverA{
+  display:flex;
+  align-items: center;
+  max-width: 78px;
+  &:hover a{
+    color:#2A61FF !important ;
+  }
+}
 .menuPanels{
   width: 295px;
   .leftline{
     position: relative;
     color: #666;
     height: 16px;
+    margin-left: 14px;
+    font-size: 12px;
     &::before{
       position: absolute;
-      left: -10px;
+      left: -7px;
       top:3px;
       height: 12px;
       width: 1px;
-      background-color: #666666;
+      background-color: #999;
       content: "";
     }
   }
@@ -203,9 +212,18 @@ li.ant-menu-item{
       background: #F3F4F6;
     }
   }
+  .ant-btn{
+    width: 102px;
+    height: 32px;
+    line-height: 30px;
+  }
   .ant-btn-primary{
     color: #fff;
-    background-color: #2A61FF;
+    background-color: #466AFF;
+    border:none;
+    &:hover{
+      background-color: rgba(70,106,255,0.85);
+    }
   }
   .focusPanelHeadInfo{
     padding:14px 16px;
@@ -228,8 +246,12 @@ li.ant-menu-item{
   display: flex;
   align-items: center;
 }
+.menuMaininfos{
+  padding:10px 16px 14px;
+  border-bottom: 1px solid #eee;
+}
 .menuinfos{
-  padding:10px 20px;
+  padding:10px 20px 16px;
   &>a{
     display: flex;
     flex-direction: column;

src/forge/Component/Contributors.jsx

@@ -46,45 +46,47 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
     }
   }
 
+  function renderOrganize(list) {
+    let str = "";
+    list.map(i=>{
+      str = str+i.name + "、";
+    })
+    return str && str.substr(0,str.length - 1);
+  }
+
   function setMenusFunc(data){
     if(data){
       let ele = (
         <Spin spinning={isSpin}>
-          <AlignCenter className="focusPanelHeadInfo">
-            <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
-            <div className="flex1 ml10" style={{width:"0"}}>
-              <AlignCenter>
-                <Link to={`/users/${data.login}`} className="font-16">{data.name}</Link>
+          <FlexAJ className="menuMaininfos">
+            <AlignCenter>
+              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+             
+              <div className="ml10">
+                <Link to={`/${data.login}`}>{data.name}</Link>
+                { data.location && <span className="leftline">{data.location}</span> }
                 {
-                  data.location && 
-                  <span className="ml20 font-12 leftline">{data.location}</span>
+                  data.organizations && data.organizations.length>0&&
+                  <p className="task-hide" style={{maxWidth:"215px"}}>
+                    所属组织：{renderOrganize(data.organizations)}
+                  </p>
                 }
-              </AlignCenter>
-              {
-                data.organizations && data.organizations.length > 0 ?
-                <AlignCenter className="font-12 mt5">
-                  <span>所属组织：</span>
-                  <div className="task-hide flex1">
-                    {renderArray(data.organizations)}
-                  </div>
-                </AlignCenter>
-                :""
-              }
-            </div>
-          </AlignCenter>
+              </div>
+            </AlignCenter>
+          </FlexAJ>
           <AlignCenter className="menuinfos">
-            <a href={data.projects_url}>
+            <Link to={`/${data.login}/projects`}>
               <span>{data.projects_count}</span>
               <span>项目数</span>
-            </a>
-            <a href={data.followers_url}>
+            </Link>
+            <Link to={`/${data.login}/followers`}>
               <span>{data.followers_count}</span>
               <span>粉丝数</span>
-            </a>
-            <a href={data.following_url}>
+            </Link>
+            <Link to={`/${data.login}/following`}>
               <span>{data.following_count}</span>
               <span>关注数</span>
-            </a>
+            </Link>
           </AlignCenter>
           <div className={"pb20"} style={{display:"flex",justifyContent:'center'}}>
             {
@@ -147,7 +149,7 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
 
   return(
     <div className="halfs">
-      <Link to={`/projects/${owner}/${projectsId}/contribute`} className="font-16 color-ooo aboutSubTitle">
+      <Link to={`/${owner}/${projectsId}/contribute`} className="font-16 color-ooo hoverA">
         <span>贡献者</span>
         { contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
       </Link>
@@ -157,7 +159,7 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
           list.map((item,key)=>{
             return(
               <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/users/${item.login}`}>
+                <Link key={key} to={`/${item.login}`}>
                   <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
                 </Link>
               </Popover>

src/forge/Component/CopyTool.jsx

@@ -0,0 +1,51 @@
+import React, { useState, useCallback, memo } from 'react';
+import { Tooltip } from 'antd';
+
+CopyTool.defaultProps = {
+  beforeText: '复制链接',     //浮动过去显示的文字
+  afterText: '复制成功',  //点击后显示的文字
+  className: '',         //传给svg的class
+  inputId: 'copyText',    //要复制的文本的ID
+  timeOut:true, //复制后将浮动的文字改为beforeText
+};
+
+
+function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
+  const [title, setTitle] = useState(() => {
+    return beforeText;
+  });
+
+  // 复制链接
+  const copyUrl = useCallback(() => {
+    const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
+    if (!copyEle) {
+      console.error("您的CopyTool未设置正确的inputId");
+      return;
+    }
+    copyEle.select(); // 执行选中元素
+    if (document.execCommand('copy')) {
+      document.execCommand('copy');
+    }
+    document.getSelection().removeAllRanges();
+    
+    setTitle(afterText);
+    if(timeOut){
+      setTimeout(function(){
+        setTitle(beforeText);
+      },1500)
+    }
+  }, []);
+
+  return (
+    <Tooltip
+      placement="top"
+      title={title}
+      onVisibleChange={() => { setTitle(beforeText) }}
+    >
+      <i className={`iconfont icon-fuzhiicon ${className}`} style={{ color: '#466aff' }} onClick={copyUrl}></i>
+    </Tooltip>
+  );
+}
+
+
+export default memo(CopyTool);

src/forge/Component/DeleteModal/Index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { AlignCenter } from '../layout';
-import { Modal , Button } from 'antd';
-import './Index.scss';
+import { Button } from 'antd';
+import Modals from '../PublicModal/Index';
 
 function DeleteBox({ 
   visible , 
@@ -12,24 +12,22 @@ function DeleteBox({
   content
 }) {
   return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={title}
-      width="600px"
-      className="deleteBox"
-      footer={
+    <Modals 
+      title={title} 
+      btn={
         <div>
           <Button size={'large'} onClick={onCancel}>取消</Button>
           <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
         </div>
-      }
+      } 
+      onCancel={onCancel} 
+      visible={visible}
     >
       <div className="desc">
         <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
-        <p>{subTitle}</p>
+      <p>{subTitle}</p>
       </div>
-    </Modal>
+    </Modals>
   )
 }
 export default DeleteBox;

src/forge/Component/DeleteModal/Index.scss

@@ -1,45 +0,0 @@
-.deleteBox{
-  .ant-modal-header{
-    background-color: #f8f8f8;
-    border-bottom: none;
-    .ant-modal-title{
-      text-align: left;
-      font-size: 20px;
-    }
-  }
-  .ant-modal-body{
-    padding:30px 50px;
-    p{
-      font-size: 16px;
-      line-height: 26px;
-      color:#666;
-      word-break: break-all;
-    }
-    .desc{
-      .descMain{
-        align-items: center;
-        justify-content: center;
-        font-size: 20px;
-        margin-bottom: 10px;
-        i{
-          font-size: 38px!important;
-          color:#DF0002
-        }
-      }
-    }
-  }
-  .ant-modal-footer{
-    border-top: none;
-    text-align: center;
-    padding-bottom: 40px;
-    button{
-      width: 120px;
-      margin:0px 20px;
-      &.ant-btn-danger{
-        background-color: #fff;
-        color: #DF0002;
-        border-color: #D0D0D0;
-      }
-    }
-  }
-}

src/forge/Component/DrawerPanel.jsx

@@ -78,7 +78,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
     if(dataref.type==="file"){
       onClose();
       let value = turnbar(branch);
-      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
+      history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
     }
   }
 

src/forge/Component/EAccount.css

@@ -1,9 +0,0 @@
-.ant-modal-mask {
-  z-index: 1001;
-}
-
-.ant-modal-wrap {
-  z-index: 1002;
-}
-
-/*# sourceMappingURL=EAccount.css.map */

src/forge/Component/EAccount.css.map

@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["EAccount.scss"],"names":[],"mappings":"AAAA;EACE;;;AAEF;EACE","file":"EAccount.css"}

src/forge/Component/EAccount.scss

@@ -1,6 +1,6 @@
 .ant-modal-mask{
-  z-index: 1001;
+  z-index: 1031;
 }
 .ant-modal-wrap{
-  z-index: 1002;
+  z-index: 1032;
 }

src/forge/Component/MemberCards.jsx

@@ -45,15 +45,15 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
   return (
     <Div>
-      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
+      <Link to={`/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
       <div className="m-infos">
-        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
+        <Link to={`/${user && user.login}`}><Name>{name}</Name></Link>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
         {
           is_current_user ?
           <Button type="default">当前用户</Button>
           : 
-          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc}/>
+          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc} notReset={true}/>
         }
       </div>
     </Div>

src/forge/Component/ProfileModal/Index.jsx

@@ -0,0 +1,72 @@
+import React , { useEffect , useState } from 'react';
+import Modals from '../PublicModal/Index';
+import { Button } from 'antd';
+import axios from 'axios';
+
+import ProfileImg from './images/profile.png';
+import './Index.scss';
+
+function ProfileModal({visible,onCancel,history}) {
+  const [ modalVis , setModalVis ] = useState(visible);
+  const [ addMemberCheck , setAddMemberCheck ] = useState(false);
+
+  useEffect(()=>{
+    axios.interceptors.response.use((response) => {
+      if (response && (response.data.status === 411 || response.data.status === 412)) {
+        setModalVis(true);
+        if(response.data.status === 412){
+          setAddMemberCheck(true);
+        }
+      }
+      return response;
+      }, (error) => {
+    });
+  },[])
+
+  useEffect(()=>{
+    setModalVis(visible);
+  },[visible])
+  
+  function onOk(){
+    onCancel();
+    setModalVis(false);
+    setTimeout(function(){
+      window.open(`/settings/profile`,"_blank");
+    },200)
+  }
+
+  function onNo() {
+    onCancel();
+    setModalVis(false);
+  }
+
+  return(
+    <Modals 
+      title="完善资料" 
+      onCancel={onNo} 
+      visible={modalVis}
+      btn={
+        addMemberCheck?
+        <div>
+          <Button type={'primary'} size={"large"} onClick={onNo}>好的</Button>
+        </div>
+        :
+        <div>
+          <Button size={"large"} onClick={onNo}>暂不补充</Button>
+          <Button type={'primary'} size={"large"} onClick={onOk}>好的</Button>
+        </div>
+      }  
+    >
+      <div className="contents">
+        <img src={ProfileImg} alt=""/> 
+        {
+          addMemberCheck ?
+          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
+          :
+          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
+        }
+      </div>
+    </Modals>
+  )
+}
+export default ProfileModal;

src/forge/Component/ProfileModal/Index.scss

@@ -0,0 +1,18 @@
+.contents{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin:10px auto 0px;
+  img{
+    margin-right: 13px;
+    width: 44px;
+  }
+  p{
+    line-height: 29px;
+    max-width: 327px;
+    font-size: 16px!important;
+  }
+}
+.font-44{
+  font-size: 44px!important;
+}

src/forge/Component/ProfileModal/Profile.jsx

@@ -0,0 +1,17 @@
+import React from 'react';
+
+function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
+
+  function checkProfile() {
+    if(!completeProfile){
+      showCompeleteDialog && showCompeleteDialog();
+    }else{
+      sureFunc();
+    }
+  }
+
+  return(
+    <a className={className} onClick={checkProfile}>{children}</a>
+  )
+}
+export default Profile;

src/forge/Component/PublicModal/Index.jsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import { Modal } from 'antd';
+import './Index.scss';
+
+function Modals({title,children,btn,onCancel,visible}) {
+  return(
+    <Modal
+      visible={visible}
+      onCancel={onCancel}
+      title={title}
+      width={"520px"}
+      footer={btn}
+      centered={true}
+      wrapClassName={"deleteBox"}
+    >
+      {children}
+    </Modal>
+  )
+}
+export default Modals;

src/forge/Component/PublicModal/Index.scss

@@ -0,0 +1,75 @@
+.deleteBox{
+  z-index: 1033;
+  .ant-modal-close-x{
+    font-size: 17px!important;
+  }
+  .ant-modal-header{
+    background-color: #f8f8f8;
+    padding:10px 30px;
+    .ant-modal-title{
+      text-align: left;
+      font-size: 16px;
+      font-weight: bold;
+    }
+  }
+  .ant-modal-close{
+    top:0px !important;
+    font-size: 24px !important;
+  }
+  .ant-modal-body{
+    padding:30px 50px;
+    p{
+      font-size: 14px;
+      line-height: 26px;
+      color:#666;
+      word-break: break-all;
+    }
+    .desc{
+      .descMain{
+        align-items: center;
+        justify-content: center;
+        font-size: 20px;
+        margin-bottom: 10px;
+        i.red{
+          color:#DF0002;
+        }
+      }
+    }
+  }
+  .ant-modal-footer{
+    border-top: none;
+    text-align: center;
+    padding-bottom: 40px;
+    button,a{
+      width: 96px;
+      height: 32px;
+      margin:0px 20px;
+      font-weight: 400;
+      font-size: 14px;
+      &.ant-btn{
+        border-color: #D0D0D0;
+        color: #666;
+        &:hover,&:active,&:focus{
+          background: #f3f4f6;
+        }
+      }
+      &.ant-btn-danger{
+        background-color: #fff;
+        color: #DF0002;
+        border-color: #D0D0D0;
+        &:hover,&:active,&:focus{
+          border-color: #DF0002;
+          background-color: #fff;
+        }
+      }
+      &.ant-btn.ant-btn-primary{
+        background-color: #466AFF;
+        color: #fff;
+        border-color: #466AFF;
+        &:hover,&:focus,&:active{
+          background-color: rgba(70,106,255,0.85);
+        }
+      }
+    }
+  }
+}

src/forge/Component/Releases.jsx

@@ -1,14 +1,14 @@
 import React from 'react';
-import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
+import { AlignTop } from '../Component/layout';
 import { Link } from 'react-router-dom';
 
 function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
   
   return(
     <div>
-      <Link to={`/projects/${owner}/${projectsId}/releases`} className="font-16 color-ooo aboutSubTitle">
+      <Link to={`/${owner}/${projectsId}/releases`} className="font-16 color-ooo hoverA">
         <span>发行版</span>
-        { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
+      { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
       </Link>
       {
         releaseVersions && releaseVersions.total_count>0 ?
@@ -16,9 +16,9 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
             return(
             key === 0 &&<AlignTop className="mt10">
               <div>
-                <p className="font-16">
-                  <Link to={`/projects/${owner}/${projectsId}/releases`} className="color-grey-3">发布{item.name}版本</Link>
-                  <span className="laterest">最新</span>
+                <p className="font-16 color-grey-6">
+                  <Link to={`/${owner}/${projectsId}/releases`}>{item.name}</Link>
+                  <span className="font-12 laterest ml5">最新</span>
                 </p>
                 <p className="color-grey-3 font-12">{item.created_at}</p>
               </div>
@@ -27,7 +27,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
           })
         :
         <div className="mt8">
-          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/projects/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
+          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
         </div>
       }
       

src/forge/Component/Sort.jsx

@@ -2,9 +2,9 @@ import React from 'react';
 import {Popover} from 'antd';
 import './Component.scss';
 
-export default (({menu , children})=>{
+export default (({menu , children, overlayClassName})=>{
   return(
-    <Popover content={menu} trigger={['click']} placement='bottom'>
+    <Popover content={menu} trigger={['click']} placement='bottom' overlayClassName={overlayClassName}>
       {children}
     </Popover>
   )

src/forge/Component/User.jsx

@@ -20,7 +20,7 @@ export default ({ url , name , column  , id , login })=>{
   `;
   return(
     id?
-    <Link to={`/users/${login}`}>
+    <Link to={`/${login}`}>
       <Img>
         { url && <img src={url} alt=""/> }
         <span>{name}</span>

src/forge/DevOps/About.jsx

@@ -149,7 +149,7 @@ function About(props, ref) {
     axios.post(url).then(result=>{
       setIsSpining(false);
       if(result && result.data.status === 0){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
         // 需要将顶部的open_devops修改
         let { changeOpenDevops } = props;
         changeOpenDevops && changeOpenDevops(true);

src/forge/DevOps/Dispose.jsx

@@ -96,7 +96,7 @@ function Dispose(props){
           setVisible(false);
           if(result && result.data){
             props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
           }else{
             props.showNotification("流水线新增失败，请稍后再试！");
           }
@@ -134,12 +134,12 @@ function Dispose(props){
 
   // 模板管理
   function toModalManage(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
+    props.history.push(`/${owner}/${projectsId}/devops/mould`);
   }
 
   // 参数管理
   function toparameter(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+    props.history.push(`/${owner}/${projectsId}/devops/params`);
   }
 
   const operate = current_user && (permission && permission !== "Reporter");

src/forge/DevOps/Dispose/List.jsx

@@ -73,7 +73,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       render:(value,item)=>{
         let v = turnbar(item.branch);
         return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
         )
       }
     },
@@ -117,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
         return(
           <span>
             { operate ? 
-              <Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
+              <Link to={`/${owner}/${projectsId}/devops/${item.id}`} className="mr10 color-grey-6">
               <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
             }
             { operate ? 
@@ -125,7 +125,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
                 <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
               </Popconfirm>:""
             }
-            <Link to={`/projects/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
+            <Link to={`/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
           </span>
         )
       }

src/forge/DevOps/Index.jsx

@@ -36,39 +36,37 @@ export default ((props)=>{
   return(
     <WhiteBack className="opsPanel">
       <Switch {...props}>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/:disposeId"
-          render={
-            (p) => (<New {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/params"
+        
+        <Route path="/:owner/:projectsId/devops/params"
           render={
             (p) => (<Params {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/mould"
+        <Route path="/:owner/:projectsId/devops/mould"
           render={
             (p) => (<Mould {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/new"
+        <Route path="/:owner/:projectsId/devops/new"
           render={
             (p) => (<New {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose"
-          render={
-            (p) => (<Dispose {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/list/:branch"
+        
+        <Route path="/:owner/:projectsId/devops/list/:branch"
           render={
             (p) => (<Stucture {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops"
+        <Route path="/:owner/:projectsId/devops/:disposeId"
           render={
-            (p) => (<About {...props} {...p}/>)
+            (p) => (<New {...props} {...p}/>)
+          }
+        ></Route>
+        {/* 原本的两种合为一个 */}
+        <Route path="/:owner/:projectsId/devops"
+          render={
+            (p) =>{return( p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
           }
         ></Route>
       </Switch>

src/forge/DevOps/Infos.jsx

@@ -26,7 +26,7 @@ export default ((props)=>{
   return(
     <div className="disposePanel">
       <Banner>
-        { permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
+        { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops`}>工作流配置</Link>}
       </Banner>
       <Div>
         <Dispost {...props}/>

src/forge/DevOps/Manage/Params.jsx

@@ -104,7 +104,7 @@ function Params(props){
       <Banner>
         <FlexAJ>
           <span className="font-18">工作流 - 参数管理</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9 ml20">返回</Link>
         </FlexAJ>
       </Banner>
       <Div className="disposeList">

src/forge/DevOps/Mould.jsx

@@ -126,7 +126,7 @@ function Mould(props){
     <div>
       <New wrappedComponentRef={(f) => childRef.current = f} ref={childRef} visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}></New>
       <Banner>
-        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9">返回</Link></FlexAJ>
+        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9">返回</Link></FlexAJ>
       </Banner>
       <Div className="disposeList">
         <FlexAJ>

src/forge/DevOps/Structure.jsx

@@ -198,7 +198,7 @@ function Structure(props,ref){
   }
 
   function clickRows(event,e){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/${e.number}/detail`);
+    props.history.push(`/${owner}/${projectsId}/devops/${e.number}/detail`);
   }
   const column = [
     {
@@ -290,7 +290,7 @@ function Structure(props,ref){
       <Banner>
         <FlexAJ>
           <span>构建列表</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-15 color-grey-9">返回</Link>
         </FlexAJ>
       </Banner>
       <Div>

src/forge/DevOps/disposePipeline.jsx

@@ -275,7 +275,7 @@ function disposePipeline(props){
       ...params
     }).then(result=>{
       if(result){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
       }
       setLoading(false);
     }).catch(error=>{

src/forge/DevOps/opsDetail.jsx

@@ -48,7 +48,7 @@ export default (props) => {
       axios.post(url).then((result) => {
         if (result && result.data) {
           props.showNotification("工作流正在重新构建！");
-          props.history.push(`/projects/${owner}/${projectId}/devops/${result.data.number}/detail`);
+          props.history.push(`/${owner}/${projectId}/devops/${result.data.number}/detail`);
         }
       })
       .catch((error) => {
@@ -87,7 +87,7 @@ export default (props) => {
           </AlignCenter>
           <Link
             style={{ color: "#ddd" }}
-            to={`/projects/${owner}/${projectId}/devops/dispose`}
+            to={`/${owner}/${projectId}/devops`}
           >
             <i className="iconfont icon-yiguanbi font-15 mr5"></i>退出
           </Link>

src/forge/Divert/DivertModal.jsx

@@ -41,14 +41,15 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
   // 确认转移
   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){
+          if(result && result.data.id){
             onSuccess(result.data && result.data.owner);
+          }else{
+            onSuccess();
           }
         }).catch(error=>{})
       }
@@ -104,7 +105,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
           </ul>
           :
           <ul className="descUl">
-            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>仓库仅可以转移到您具有管理权限的组织中</li>
             <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
             <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
           </ul>

src/forge/Head/AddProjectModal.jsx

@@ -1,6 +1,7 @@
 import React, { useState , forwardRef, useEffect } from 'react';
 import { Form , Modal , Input , Radio } from 'antd';
 import Axios from 'axios';
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 export default Form.create()(
   forwardRef((props)=>{
@@ -77,7 +78,7 @@ export default Form.create()(
             </Form.Item>
           </Form>
         </Modal>
-        <a onClick={()=>setVisible(true)}>加入项目</a>
+        <CheckProfile {...props} sureFunc={()=>setVisible(true)}>加入项目</CheckProfile>
       </React.Fragment>
     )
   })

src/forge/Head/Header.js

@@ -10,6 +10,7 @@ import HeadSearch from '../Component/HeadSearch';
 
 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 import './header.scss';
 const $ = window.$
@@ -222,6 +223,15 @@ class NewHeader extends Component {
       }
     }
   }
+  
+  checkProfile=(url)=>{
+    const { showCompeleteDialog , completeProfile } = this.props;
+    if(!completeProfile){
+      showCompeleteDialog && showCompeleteDialog();
+    }else{
+      window.location.href(url);
+    }
+  }
 
   addMenu=(list)=>{
     return(
@@ -231,11 +241,16 @@ class NewHeader extends Component {
           {
             list.map((item,key)=>{
               return(
-                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && 
+                <Menu.Item key={item.name+key}>
+                  <CheckProfile {...this.props} sureFunc={()=>{window.location.href=item.url}}>{item.name}</CheckProfile>
+                </Menu.Item>
               )
             })
           }
-          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
+          <Menu.Item>
+            <AddProjectModal {...this.props} showNotification={this.props.showNotification}/>
+          </Menu.Item>
         </Menu>
       </div>
     )
@@ -245,7 +260,7 @@ class NewHeader extends Component {
     return(
       <Menu className="currentMenu">
         <Menu.Item>
-          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
+          <span className="currentName" title={current_user && current_user.username}>{current_user && current_user.username}</span>
         </Menu.Item>
           {
             personal && personal.length > 0 && personal.map((item,key)=>{
@@ -254,7 +269,7 @@ class NewHeader extends Component {
               )
             })
           }
-          <li><Link to={`/settings/SSH`}>设置</Link></li>
+          <li><Link to={`/settings/profile`}>设置</Link></li>
         <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
       </Menu>
     )
@@ -347,7 +362,7 @@ class NewHeader extends Component {
       })
     }
 
-    // let search_url = settings && settings.common && settings.common.search;
+    let search_url = settings && settings.common && settings.common.search;
     let notice_url = settings && settings.common && settings.common.notice;
     return (
       <div className="newHeaders" id="nHeader">
@@ -385,16 +400,16 @@ class NewHeader extends Component {
                     if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
                       if (user_login) {
                         if (new_link.indexOf("courses") > -1) {
-                          new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses")
+                          new_link = new_link.replace(/courses/g, user_login + "/courses")
                         } else if (new_link.indexOf("contests") > -1) {
-                          new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
+                          new_link = new_link.replace(/contests/g, user_login + "/contests")
                         }
                       } else {
                         is_hidden = true
                       }
                     }
                     if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
-                      new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
+                      new_link = new_link.replace(/homes/g, user_login + "/user_activities")
                     }
                     
                     var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
@@ -412,7 +427,7 @@ class NewHeader extends Component {
           </div>
           <div className="head-right">
             {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
-            <HeadSearch {...this.props}/>
+            { search_url && <HeadSearch {...this.props}/>}
             {
               current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
               <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
@@ -442,7 +457,7 @@ class NewHeader extends Component {
             </span>
             :
             <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
-              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
+              <a href={`/${this.props.current_user  && this.props.current_user.login}`}>
                 <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
               </a>
             </Dropdown>

src/forge/Head/header.scss

@@ -30,6 +30,13 @@
   width: 120px;
   text-align: center;
   padding:0px;
+  .currentName{
+    padding:0px 8px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
+  }
   li{
     height: 40px;
     line-height: 40px;

src/forge/Index.js

@@ -12,8 +12,9 @@ import Loadable from "react-loadable";
 import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
 
+
 const ProjectNew = Loadable({
-  loader: () => import("./New/Index"), 
+  loader: () => import("./New/Index"),
   loading: Loading,
 });
 const ProjectIndex = Loadable({
@@ -21,21 +22,23 @@ const ProjectIndex = Loadable({
   loading: Loading,
 });
 
-const ProjectDetail = Loadable({
-  loader: () => import("./Main/Detail"),
-  loading: Loading,
-});
+// 项目详情放在用户和组织下作为二级菜单存在
+// const ProjectDetail = Loadable({
+//   loader: () => import("./Main/Detail"),
+//   loading: Loading,
+// });
 
 class Index extends Component {
 
-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
+  componentDidUpdate = () => {
+    this.props.history.listen(() => {
       if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
         window.scrollTo(0, 0)
       }
     })
   }
   render() {
+    
     return (
       <div className="newMain clearfix">
         <Switch {...this.props}>
@@ -52,23 +55,24 @@ class Index extends Component {
             )}
           ></Route>
           <Route
-            path="/projects/new"
+            path="/projects/mirror/new"
             render={(props) => (
               <ProjectNew {...this.props} {...props} />
             )}
           ></Route>
-          <Route
-            path="/projects/:owner/:projectsId"
+          {/* <Route
+            path="/:owner/:projectsId"
             render={(props) => (
               <ProjectDetail {...this.props} {...props} />
             )}
-          ></Route>
+          ></Route> */}
           <Route
-            path="/projects"
+            path="/explore"
             render={(props) => (
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>
+
           <Route
             path="/"
             render={(props) => (
@@ -86,3 +90,10 @@ export default withRouter(
     parentSelector: ".newMain",
   })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
 );
+
+// export default withRouter(
+//   ImageLayerOfCommentHOC({
+//     imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+//     parentSelector: ".newMain",
+//   })(Index)
+// );

src/forge/Main/CoderDepot.jsx

@@ -3,6 +3,7 @@ import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ
 import { Dropdown , Menu , Divider , Spin, Button , Typography } from 'antd';
 import { getImageUrl } from "educoder";
 import { Link } from 'react-router-dom';
+import { truncateCommitId } from "../common/util";
 import CloneAddress from '../Branch/CloneAddress';
 
 import SelectBranch from '../Branch/Select';
@@ -20,6 +21,7 @@ import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
 import Invite from './sub/Invite';
+import CheckProfile from '../Component/ProfileModal/Profile';
 /**
  * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
  */
@@ -112,7 +114,7 @@ function CoderDepot(props){
   useEffect(()=>{
     if (projectsId && owner && defaultBranch){
       let b = turnbar(branchName) ;
-      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+      if(pathname.indexOf(`/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
         let url = pathname.split(`/tree/${b}/`)[1];
         setTreeValue(url);
         getFileInfo(url,branchName);
@@ -174,6 +176,7 @@ function CoderDepot(props){
       }
     }).then((result) => {
       if (result) {
+        console.log(result)
         let en = result.data.entries;
         if(en.type){
           setDirInfo(undefined);
@@ -198,7 +201,7 @@ function CoderDepot(props){
   // 切换分支或者标签
   function changeBranch(value){
     let checkvalue = turnbar(value);
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
     props.history.push(url);
   }
     
@@ -207,9 +210,13 @@ function CoderDepot(props){
     let b = branchName || defaultBranch;
     let checkvalue = turnbar(b);
     return (
-    <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+    <Menu className="fileMenu">
+      <Menu.Item>
+        <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</CheckProfile>
+      </Menu.Item>
+      <Menu.Item>
+        <CheckProfile  {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</CheckProfile>
+      </Menu.Item>
     </Menu>
     )
   }
@@ -228,12 +235,12 @@ function CoderDepot(props){
     setTreeValue(undefined);
     let branch = branchName || defaultBranch;
     let checkvalue = turnbar(branch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}`);
   };
   // 子目录路径返回链接
   function returnUlr(url){
     let enBranch = turnbar(branchName);
-    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
+    props.history.push(`/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
   }
   // 点击跳转到子目录
   function goToSubRoot(path,type,filename){
@@ -241,7 +248,7 @@ function CoderDepot(props){
       let enBranch = branchName || defaultBranch;
       let checkvalue = turnbar(enBranch);
       setType(type);
-      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+      props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
     }
   }
 
@@ -253,7 +260,7 @@ function CoderDepot(props){
     //点击直接跳转页面 加载一次路由
     let enBranch = branchName || defaultBranch;
     let checkvalue = turnbar(enBranch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
     setType("file");
     setEditReadme(true);
   };
@@ -297,6 +304,7 @@ function CoderDepot(props){
   const { current_user } = props;
   const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter";
   const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
+
   return(
     <WhiteBack>
       <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
@@ -341,36 +349,59 @@ function CoderDepot(props){
                             branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
                           ></SelectBranch>
                           :
-                          <span>分支：<span className="color-grey-6">{branchName || defaultBranch}</span></span>
+                          <span>分支：<span className="color-grey-6">{branchName || defaultBranch}</span></span>  
                         }
                       </div>
-                      <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/branchs`} className="depotNum">
-                          <i className="iconfont icon-master_icon font-14 mr3"></i>
-                          <span className="mr3">分支</span>
-                          <span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
-                        </Link>
-                      </AlignCenter>
-                      <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/tag`} className="depotNum">
-                          <i className="iconfont icon-biaoqianicon font-14 mr3"></i>
-                          <span className="mr3">标签</span>
-                          <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
-                        </Link>
-                      </AlignCenter>
+           {
+                        treeValuePath && treeValuePath.length > 0 ?
+                        <Path
+                            identifier={projectDetail && projectDetail.identifier}
+                            treeValuePath={treeValuePath}
+                            returnUlr={returnUlr}
+                            returnMain={returnMain}
+                            getPathUrl={getPathUrl}
+                        />
+                            :
+                            <div>
+                                <AlignCenter className="mr20">
+                                    <Link to={`/${owner}/${projectsId}/branches`} className="iconBtn">
+                                        <i className="iconfont icon-master_icon font-16"></i>
+                                        <span>分支</span>
+                                        <span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
+                                    </Link>
+                                </AlignCenter>
+                                <AlignCenter className="mr20">
+                                    <Link to={`/${owner}/${projectsId}/tags`} className="iconBtn">
+                                        <i className="iconfont icon-biaoqianicon font-16"></i>
+                                        <span>标签</span>
+                                        <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
+                                    </Link>
+                                </AlignCenter>
+                            </div>
+                      }
                     </AlignCenter>
                     <AlignCenter className="depotBtn">
                       {
-                        baseOperate && projectDetail.type !== 2 && pullsFlag &&
-                        <Button type="default" onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} className="mr10"><i className="iconfont icon-xinjian2 font-12 mr3"></i> 合并请求</Button>
-                      }
-                      {
-                        baseOperate && issuesFlag &&
-                        <Button type="default" onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} className="mr10"><i className="iconfont icon-xinjian2 font-12 mr3"></i> 任务</Button>
+                        baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
+                        <div className="addOptionBtn">
+                          {
+                            projectDetail.type !== 2 && pullsFlag &&
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</CheckProfile>
+                          }
+                          {
+                            issuesFlag &&
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 易修</CheckProfile>
+                          }
+                        </div>
                       }
                       { fileOperate &&
-                        <Dropdown overlay={fileMenu()} className="mr10" trigger={['click']}>
-                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-6 mr-5"></i></Button>
+                        <Dropdown 
+                          overlay={fileMenu()} 
+                          className="mr10" 
+                          trigger={['click']}
+                          getPopupContainer={document.parentNode}
+                        >
+                          <a>文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-6 mr-5"></i></a>
                         </Dropdown>
                       }
                       
@@ -380,37 +411,27 @@ function CoderDepot(props){
                     </AlignCenter>
                   </FlexAJ>
                   {
-                    dirInfo || fileInfo ?
+                    (dirInfo && dirInfo.length>0) || fileInfo ?
                     <div className="listtable">
                       {
                         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 hidetxt" :"ellipsistxt"}>
-                            <pre id="ptxt">{lastCommit && lastCommit.message}</pre>
+                          <div onClick={()=>props.history.push(`/${owner}/${projectsId}/commits/${truncateCommitId(lastCommit.sha)}`)} className={hideBtn && hide ? "ellipsistxt hidetxt" :"ellipsistxt"}>
+                            <pre id="ptxt">{lastCommit.message}</pre>
                           </div>
                           { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
-                         
-                          <span className="ml20 color-grey-9 mt1">{lastCommit && lastCommit.time_from_now}</span>
+
+                          <span className="ml20 color-grey-6 font-12 mt3">{lastCommit.time_from_now}</span>
                           { 
                             commitCount ? 
-                            <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml20 color-grey-9" style={{height:"30px",lineHeight:"30px"}}>
-                              <i className="iconfont icon-tijiaoicon mr3 font-16"></i>{commitCount}次提交
+                            <Link to={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml20 color-grey-3"style={{height:"28px",lineHeight:"28px"}}>
+                              <i className="iconfont icon-tijiaoicon mr3 font-16"></i><span style={{fontWeight:"500"}}>{commitCount}次提交</span>
                             </Link>:"" 
                           }
                         </div>
                       }
                       <ul className="listtablebody">
-                        {
-                          treeValuePath && treeValuePath.length > 0 &&
-                          <Path 
-                            identifier={projectDetail && projectDetail.identifier} 
-                            treeValuePath={treeValuePath}
-                            returnUlr={returnUlr}
-                            returnMain={returnMain}
-                            getPathUrl={getPathUrl}
-                          />
-                        }
                         {
                           dirInfo && dirInfo.length > 0 &&
                           dirInfo.map((item,key)=>{
@@ -434,27 +455,28 @@ function CoderDepot(props){
                             onEdit={onEdit}
                             currentBranch={branchName || defaultBranch}
                             type={projectDetail.type}
-                          ></CoderRootFileDetail>[[]]
+                          ></CoderRootFileDetail>
                         }
                       </ul>
                     </div>
                     : ""
                   }
                   {
-                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
+                    (dirInfo && dirInfo.length === 0) && !fileInfo ? <Nodata _html="暂未发现文件"/> :""
                   } 
                   {/* readme文件显示(显示文件详情时不显示readme文件) */}
-                  { dirInfo && (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
+                  { (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
                 </div>
               </LongWidth>
               {
-                !fileInfo && 
+                 (!(treeValuePath && treeValuePath.length > 0) && !fileInfo) &&
                 <ShortWidth>
                   <Gap style={{paddingLeft:"30px"}}>
                     <div className="panelmenu">
-                      <FlexAJ className="font-16 color-ooo mb10" style={{lineHeight:"22px"}}>关于
-                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && 
-                          <a className="color-grey-6" href="javascript:void(0)"><i onClick={()=>setOpenModal(true)} className="iconfont icon-a-shezhi font-15"></i></a>
+                      <FlexAJ className="font-18 color-ooo mb20" style={{lineHeight:"28px"}}>关于
+                        {
+                        projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner" || projectDetail.permission==="Manager") && 
+                          <i onClick={()=>setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15"></i>
                         }
                       </FlexAJ>
                       {desc && <p className="font-14 color-grey-3 mb15 task-hide-2" style={{lineHeight:"24px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
@@ -475,9 +497,9 @@ function CoderDepot(props){
                       </div>
                       {
                         projectDetail && projectDetail.license_name &&
-                        <div>
-                          <i className="iconfont icon-xieyiicon font-16 mr10 color-grey-6"></i>
-                          <span className="color-grey-6">{projectDetail.license_name}</span>
+                        <div className="pinfos">
+                          <i className="iconfont icon-xieyiicon font-16 mr10"></i>
+                          <Link to={`/${owner}/${projectsId}/tree/${branchName || defaultBranch}/LICENSE`} className="color-grey-6">{projectDetail.license_name}</Link>
                         </div>
                       }
                     </div>
@@ -501,7 +523,7 @@ function CoderDepot(props){
                       projectDetail && projectDetail.release_versions &&
                       <React.Fragment>
                         <Divider />
-                        <Releases
+                        <Releases 
                           owner={owner} 
                           projectsId={projectsId} 
                           releaseVersions={projectDetail.release_versions} 
@@ -513,16 +535,11 @@ function CoderDepot(props){
                     }
                     {/* 贡献者 */}
                     {
-                      projectDetail && projectDetail.contributors &&
-                      <Contributors 
-                        contributors={projectDetail && projectDetail.contributors} 
-                        owner={owner} 
-                        projectsId={projectsId} 
-                        currentLogin={current_user && current_user.login}
-                      />
+                      projectDetail && projectDetail.contributors && projectDetail.contributors.total_count >0 && 
+                      <Contributors contributors={projectDetail.contributors} owner={owner} projectsId={projectsId} />
                     }
                     {/* 语言 */}
-                    { projectDetail && projectDetail.languages && 
+                    { projectDetail && projectDetail.languages &&
                       <React.Fragment>
                         <Divider />
                         <LanguagePower languages={projectDetail.languages}/>

src/forge/Main/CoderDepotCatalogue.jsx

@@ -4,8 +4,8 @@ import { truncateCommitId } from '../common/util';
 
 const typeIco = {
   "submodule":"icon-file-submodule font-17",
-  "file":'icon-wenjian6 font-15',
-  "dir":"icon-wenjianjia4 font-15"
+  "file":'icon-wenjian6 font-15 color-blue-file',
+  "dir":"icon-wenjianjia4 font-15 color-blue_4C"
 }
 
 function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
@@ -13,15 +13,15 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
     <li>
       <span>
         <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
-          <i className={`iconfont ${typeIco[`${item.type}`]} color-blue-file mr8`}></i>{item.name}
+          <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}
         </a>
       </span>
       <span title="init project">
-        <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
+        <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
           {item.commit && item.commit.message}
         </Link>
       </span>
-      <span>{item.commit && item.commit.time_from_now}</span>
+      <span title={item.commit && item.commit.created_at}>{item.commit && item.commit.time_from_now}</span>
     </li>
   )
 }

src/forge/Main/CoderDepotPath.jsx

@@ -1,3 +1,4 @@
+import { result } from 'lodash';
 import React from 'react';
 
 
@@ -12,6 +13,7 @@ function CoderDepotPath({treeValuePath , returnUlr , returnMain , getPathUrl , i
           {identifier}
         </a>
         {treeValuePath.map((item, key) => {
+          console.log(result)
           return (
             <React.Fragment>
               {

src/forge/Main/CoderDepotReadme.jsx

@@ -50,7 +50,9 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
                 <span>目录</span>
               </span>
             </Dropdown>
-            <span className="commonBox-title-read">README.md</span>
+            
+              <span className="commonBox-title-read"><a href="#readme ">README.md</a></span>
+            
           </AlignCenter>
           {
             operate ?

src/forge/Main/CoderRootBranch.js

@@ -38,9 +38,9 @@ export default ((props)=>{
               return(
                 <li key={key}>
                   <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                     <p className="f-wrap-alignCenter mt15">
-                      <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
+                      <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                       <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
                       <span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span>
                     </p>
@@ -48,7 +48,7 @@ export default ((props)=>{
                   <span>
                     {
                       (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
-                      <Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
+                      <Link to={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
                     }
                     <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
                       <a className="ant-dropdown-link">

src/forge/Main/CoderRootCommit.js

@@ -101,7 +101,7 @@ class CoderRootCommit extends Component{
   // 切换分支 search:tag为根据标签搜索
   changeBranch=(value)=>{
     const { projectsId , owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/commits/branch/${value}`);
+    this.props.history.push(`/${owner}/${projectsId}/commits/branch/${value}`);
   }
 
   ChangePage=(page)=>{
@@ -141,13 +141,13 @@ class CoderRootCommit extends Component{
                     return(
                       <div key={k}>
                         <AlignTop>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
                         </AlignTop>
                         <p className="f-wrap-alignCenter mt15">
                           {
                             item.id ?
-                            <Link to={`/users/${item.login}`} className="show-user-link">
+                            <Link to={`/${item.login}`} className="show-user-link">
                               {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
                               <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
                             </Link>:

src/forge/Main/CoderRootFileDetail.js

@@ -149,7 +149,7 @@ class CoderRootFileDetail extends Component {
       .then((result) => {
         if (result) {
           this.props.showNotification("删除成功!");
-          this.props.history.push(`/projects/${owner}/${projectsId}`);
+          this.props.history.push(`/${owner}/${projectsId}`);
         }
       })
       .catch((error) => {

src/forge/Main/CoderRootIndex.js

@@ -87,57 +87,57 @@ class CoderRootIndex extends Component{
         <Top {...this.props} {...this.state}/>
         <Switch {...this.props}>
           {/* 新建文件 */}
-          <Route path="/projects/:owner/:projectsId/:branch/newfile/:path"
+          <Route path="/:owner/:projectsId/:branch/newfile/:path"
             render={
               (props) => (<FileNew {...this.props} {...props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/uploadfile"
+          <Route path="/:owner/:projectsId/:branch/uploadfile"
             render={
               (props) => (<UploadFile {...this.props} {...props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/newfile"
+          <Route path="/:owner/:projectsId/:branch/newfile"
             render={
               (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+          <Route path="/:owner/:projectsId/commits/branch/:branchName"
             render={
               () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/:sha"
+          <Route path="/:owner/:projectsId/commits/:sha"
             render={
               (props) => (<Diff {...this.props} {...props} {...this.state}/>)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/commits"
+          <Route path="/:owner/:projectsId/commits"
             render={
               () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/:versionId/update"
+          <Route path="/:owner/:projectsId/releases/:versionId/update"
             render={
               (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/new"
+          <Route path="/:owner/:projectsId/releases/new"
             render={
               () => (<CoderRootVersionNew {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/releases"
+          <Route path="/:owner/:projectsId/releases"
             render={
               () => (<CoderRootVersion {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/tag"
+          <Route path="/:owner/:projectsId/tags"
             render={
               () => (<CoderRootTag {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/branchs"
+          <Route path="/:owner/:projectsId/branches"
             render={
               () => (<CoderRootBranch {...this.props} {...this.state} />)
             }

src/forge/Main/CoderRootTag.js

@@ -34,7 +34,7 @@ export default (( props, { projectDetail }) => {
             <div className="div_table">
               <ul className="ul_thead">
                 <li>
-                  <span className="flex1">标签名</span>
+                  <span className="flex1">标记名</span>
                   <span>提交信息</span>
                   <span className="ul_tbody_forth">下载</span>
                 </li>
@@ -49,7 +49,7 @@ export default (( props, { projectDetail }) => {
                           <span className="font-16">{item.name}</span>
                         </span>
                         <span className="ul_tbody_third">
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
                         </span>
                         <span className="ul_tbody_forth">
                           <a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>

src/forge/Main/Detail.js

@@ -1,12 +1,14 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip, Button } from 'antd';
+import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , AlignTop, AlignCenter } from '../Component/layout';
+import { Content, AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
-import { numFormat } from 'educoder';
 import '../css/index.scss'
 import './list.scss';
 
+import { ImageLayerOfCommentHOC } from "../../modules/page/layers/ImageLayerOfCommentHOC";
+
+
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
 
@@ -104,12 +106,12 @@ const Contribute = Loadable({
 })
 
 const CoderRootCommit = Loadable({
-	loader: () => import('./CoderRootCommit'),
-	loading: Loading,
+  loader: () => import('./CoderRootCommit'),
+  loading: Loading,
 })
 const CoderDepot = Loadable({
-	loader: () => import('./CoderDepot'),
-	loading: Loading,
+  loader: () => import('./CoderDepot'),
+  loading: Loading,
 })
 
 const TrendsIndex = Loadable({
@@ -140,28 +142,28 @@ const WikiEdit = Loadable({
 /**
  * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
  */
-function checkPathname(projectsId,owner,pathname){
+function checkPathname(projectsId, owner, pathname) {
   let name = "";
-  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
-    let url = pathname.split(`/projects/${owner}/${projectsId}`)[1];
-    if(url.indexOf("/about")>-1){
-      name="about"
-    }else if(url.indexOf("/issues")>-1 ||url.indexOf("Milepost") > 0){
+  if (pathname && pathname !== `/${owner}/${projectsId}`) {
+    let url = pathname.split(`/${owner}/${projectsId}`)[1] || "";
+    if (url.indexOf("/about") > -1) {
+      name = "about"
+    } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
       name = "issues";
-    }else if(url.indexOf("/pulls")>-1){
-      name="pulls"
-    }else if(url.indexOf("/milestones")>-1){
-      name="milestones"
-    }else if(url.indexOf("/activity")>-1){
-      name="activity"
-    }else if(url.indexOf("/setting")>-1){
-      name="setting"
-    }else if(url.indexOf(`/devops`)>-1){
-      name="devops"
-    }else if(url.indexOf(`/source`)>-1){
-      name="source"
-    }else if(url.indexOf(`/wiki`)>-1){
-      name="wiki"
+    } else if (url.indexOf("/pulls") > -1) {
+      name = "pulls"
+    } else if (url.indexOf("/milestones") > -1) {
+      name = "milestones"
+    } else if (url.indexOf("/activity") > -1) {
+      name = "activity"
+    } else if (url.indexOf("/settings") > -1) {
+      name = "settings"
+    } else if (url.indexOf(`/devops`) > -1) {
+      name = "devops"
+    } else if (url.indexOf(`/source`) > -1) {
+      name = "source"
+    } else if (url.indexOf(`/wiki`) > -1) {
+      name = "wiki"
     }
   }
   return name;
@@ -184,15 +186,15 @@ class Detail extends Component {
       branchs: undefined,
       branchList: undefined,
       project: null,
-      firstSync:false,
-      secondSync:false,
-      open_devops:false,
-      forkSpin:false,
+      firstSync: false,
+      secondSync: false,
+      open_devops: false,
+      forkSpin: false,
       // 默认分支
-      defaultBranch:undefined,
+      defaultBranch: undefined,
 
       // 非本平台项目
-      platform:false
+      platform: false
     }
   }
 
@@ -209,36 +211,38 @@ class Detail extends Component {
   }
 
   getProject = (num) => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/simple.json`;
     axios.get(url).then((result) => {
       if (result && result.data) {
         this.setState({
           project: result.data,
-          open_devops:result.data.open_devops,
-          platform:result.data.platform && result.data.platform !== 'educoder'
+          open_devops: result.data.open_devops,
+          platform: result.data.platform && result.data.platform !== 'educoder'
         })
 
         if (result.data.type !== 0 && result.data.mirror_status === 1) {
           console.log("--------start channel --------");
           // 是镜像项目，且未完成迁移
           this.canvasChannel();
-          if(num){
+          if (num) {
             this.setState({
-              secondSync:true,
-              firstSync:false
+              secondSync: true,
+              firstSync: false
             })
-          }else{
+          } else {
             this.setState({
-              firstSync:true,
-              secondSync:false
+              firstSync: true,
+              secondSync: false
             })
           }
-        }else{
+        } else if (result.data.mirror_status === 2) {
+          this.deleteProjectBack();
+        } else {
           this.getDetail();
           this.setState({
-            firstSync:false,
-            secondSync:false
+            firstSync: false,
+            secondSync: false
           })
         }
       }
@@ -246,12 +250,16 @@ class Detail extends Component {
   }
 
   // 工作流激活后修改状态
-  changeOpenDevops=(flag)=>{
+  changeOpenDevops = (flag) => {
     this.setState({
-      open_devops:flag
+      open_devops: flag
     })
   }
-  canvasChannel = () => {
+  /**
+   * 
+   * @param {*} deleteFlag ：同步镜像需要提示成功，且未成功的情况下不需要删除项目
+   */
+  canvasChannel = (deleteFlag) => {
     const name = window.location.hostname === "localhost" ? "testforgeplus.trustie.net" : window.location.hostname;
     const actioncable = require("actioncable");
     var project = this.state.project;
@@ -266,11 +274,20 @@ class Detail extends Component {
       disconnected: () => { },
       received: data => {
         console.log(`###### ---received data--- ######`);
+        console.log(data);
         if (data) {
-          this.getDetail();
+          if(deleteFlag){
+            this.props.showNotification("镜像同步成功!");
+            window.location.reload();
+          }else{
+            if (data.project && data.project.mirror_status === 2) {
+              this.deleteProjectBack();
+            }
+            this.getDetail();
+          }
           this.setState({
-            firstSync:false,
-            secondSync:false
+            firstSync: false,
+            secondSync: false
           });
           cable.subscriptions.consumer.disconnect();
         }
@@ -278,8 +295,25 @@ class Detail extends Component {
     })
   }
 
+  deleteProjectBack = () => {
+    const { history } = this.props;
+    const { projectsId, owner } = this.props.match.params;
+    axios.delete(`/${owner}/${projectsId}.json`).then(res => {
+      let hash = '/projects/mirror/new';
+      if (res && res.data) {
+        history.push({
+          pathname: hash,
+          mirror_status: 2
+        });
+      }
+      else {
+        window.location.hash = hash;
+      }
+    });
+  }
+
   getDetail = () => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     this.getBanner();
     const url = `/${owner}/${projectsId}/detail.json`;
     axios.get(url).then((result) => {
@@ -296,29 +330,29 @@ class Detail extends Component {
           watchers_count: result.data.watchers_count,
           praises_count: result.data.praises_count,
           forked_count: result.data.forked_count,
-          defaultBranch:result.data.default_branch
+          defaultBranch: result.data.default_branch
         })
       }
     }).catch((error) => { })
   }
 
   // 获取动态导航栏菜单
-  getBanner(){
-    const { projectsId , owner } = this.props.match.params;
+  getBanner() {
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/menu_list.json`;
-    axios.get(url).then(result=>{
-      if(result){
+    axios.get(url).then(result => {
+      if (result) {
         this.setState({
-          bannerList:result.data
+          bannerList: result.data
         })
       }
-    }).catch(error=>{})
+    }).catch(error => { })
   }
 
   // 关注和取消关注
   focusFunc = (flag) => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
 
     const { project_id } = this.state;
     axios({
@@ -333,15 +367,15 @@ class Detail extends Component {
         this.setWatchersCount(result.data.watchers_count, result.data.watched);
       }
     })
-    .catch(error => {
-      console.log(error);
-    });
+      .catch(error => {
+        console.log(error);
+      });
   }
 
   // 点赞和取消点赞
   pariseFunc = (flag) => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
     const { project_id } = this.state;
     axios({
       method: flag ? 'delete' : 'post',
@@ -351,9 +385,9 @@ class Detail extends Component {
         this.setPraisesCount(result.data.praises_count, result.data.praised)
       }
     })
-    .catch(error => {
-      console.log(error);
-    });
+      .catch(error => {
+        console.log(error);
+      });
   }
 
   setWatchersCount = (count, is_watched) => {
@@ -373,24 +407,24 @@ class Detail extends Component {
   // fork项目
   forkFunc = () => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
     this.setState({
-      forkSpin:true
+      forkSpin: true
     })
     const { current_user } = this.props
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/forks.json`;
     axios.post(url).then(result => {
       if (result && result.data.status === 0) {
-        this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
+        this.props.history.push(`/${current_user && current_user.login}/${result.data.identifier}`);
         this.props.showNotification(result.data.message);
       }
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     }).catch(error => {
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     })
   }
@@ -398,13 +432,15 @@ class Detail extends Component {
   // 同步镜像
   synchronismMirror = () => {
     const { platform } = this.state;
-    if(!platform)return;
-    const { projectsId , owner } = this.props.match.params;
+    if (!platform) return;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/sync_mirror.json`;
     axios.post(url).then(result => {
       if (result && result.data && result.data.status === 0) {
-        this.props.showNotification("镜像同步成功!");
-        this.getProject(2);
+        this.setState({
+          secondSync:true
+        })
+        this.canvasChannel(true);
       } else {
         this.props.showNotification("镜像同步失败!");
       }
@@ -413,349 +449,352 @@ class Detail extends Component {
     })
   }
 
-  textFunc = (forked_from_project_id,fork_info)=>{
+  textFunc = (forked_from_project_id, fork_info) => {
     let type = fork_info && fork_info.fork_project_user_type;
     return forked_from_project_id && fork_info ?
       <div className="color-grey-9 df">
         <span>复刻自</span>
-        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
+        <Link to={`/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
         <span> / </span>
-        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{maxWidth:"400px"}} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
+        <Link to={`/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{ maxWidth: "400px" }} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
       </div> : ""
   }
 
 
   render() {
-    const { projectDetail, watchers_count, praises_count, 
-      forked_count, firstSync , secondSync , 
-      isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch , bannerList , forkSpin } = this.state;
+    const { projectDetail, watchers_count, praises_count,
+      forked_count, firstSync, secondSync,
+      isManager, watched, praised,
+      project, open_devops, platform, defaultBranch, bannerList, forkSpin } = this.state;
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
 
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const { current_user } = this.props;
-    let pathname = checkPathname(projectsId,owner,url);
+    let pathname = checkPathname(projectsId, owner, url);
 
     const { state } = this.props.history.location;
-    
+
     const common = {
       getDetail: this.getDetail,
-      changeOpenDevops:this.changeOpenDevops,
+      changeOpenDevops: this.changeOpenDevops,
       defaultBranch
     }
     return (
       <div>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <AlignCenter style={{paddingTop:"20px",justifyContent:"space-between"}}>
-              
+            <AlignTop style={{ padding: "18px 0px 10px", justifyContent: "space-between" }}>
+              <div>
                 <AlignTop>
                   <div className="projectallName">
                     {project && project.author &&
-                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} title={project.author.name}>{project.author.name}</Link>
+                      <Link to={`/${project.author.login}`}>{project.author.name}</Link>
                     }
                     <span className="ml5 mr5">/</span>
-                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN" title={projectDetail && projectDetail.name}>{projectDetail && projectDetail.name}</Link>
+                    <Link to={`/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
                   </div>
-                  { projectDetail && projectDetail.private && <span className="privateTag">私有</span>}
+                  {projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
                 </AlignTop>
-                
+                <div className="mt8">
+                  {
+                    projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+                      this.textFunc(projectDetail.forked_from_project_id, projectDetail.fork_info)
+                      : ""
+                  }
+                  {
+                    projectDetail && projectDetail.type && projectDetail.type !== 0 ?
+                      <span className="color-grey-9">导入于 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
+                      : ""
+                  }
+                </div>
+              </div>
               <div>
                 {
-                  firstSync ? "":
-                  <span className="df">
-                    {
-                      ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
-                      <a size="middle" className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
-                    }
-                    <span className="detail_tag_btn">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
-                        <i className={watched ? "iconfont icon-quxiaoguanzhu color-blue font-14 mr3":"iconfont icon-morenguanzhu_ICON color-grey-9 font-14 mr3"}></i>
-                        <span>{watched ? '取消关注' : '关注'}</span>
-                      </a>
+                  firstSync ? "" :
+                    <span className="df">
                       {
-                        watchers_count > 0 ?
-                        platform ?
-                        <Link className="detail_tag_btn_count" to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
-                          {numFormat(watchers_count)}
-                        </Link>
-                        :
-                        <span className="detail_tag_btn_count">{watchers_count}</span>
-                        :""
+                        ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
+                          <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
                       }
-                    </span>
-                    <span className="detail_tag_btn">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
-                        <i className={praised ? "iconfont icon-dianzan_icon color-blue font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
-                        <span>{praised ? '取消点赞' : '点赞'}</span>
-                      </a>
-                      {
-                        praises_count > 0 ?
-                        platform ?
-                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
-                          {numFormat(praises_count)}
-                        </Link>:
-                        <span className="detail_tag_btn_count">{praises_count}</span>
-                        :""
-                      }
-                    </span>
-                    <span className="detail_tag_btn" loading={forkSpin}>
-                      <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
-                        <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                          <i className="iconfont icon-fork color-grey-9 mr3 font-16"></i>
-                          <span>复刻</span>
+                      <span className="detail_tag_btn">
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.focusFunc(watched)}>
+                          <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3" : "iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
+                          <span>{watched ? '取消关注' : '关注'}</span>
                         </a>
-                      </Tooltip>
-                      {
-                        forked_count > 0 ?
-                        platform ?
-                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
-                          {numFormat(forked_count)}
-                        </Link>
-                        :
-                        <span className="detail_tag_btn_count">{forked_count}</span>
-                        :""
-                      }
+                        {
+                          watchers_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `#666` }} to={platform ? { pathname: `/${owner}/${projectsId}/following`, state } : ""}>
+                                {watchers_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{watchers_count}</span>
+                            : ""
+                        }
+                      </span>
+                      <span className="detail_tag_btn">
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.pariseFunc(praised)}>
+                          <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3" : "iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                          <span>{praised ? '取消点赞' : '点赞'}</span>
+                        </a>
+                        {
+                          praises_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `#666` }} to={{ pathname: `/${owner}/${projectsId}/stargazers`, state }}>
+                                {praises_count}
+                              </Link> :
+                              <span className="detail_tag_btn_count">{praises_count}</span>
+                            : ""
+                        }
+                      </span>
+                      <span className="detail_tag_btn" loading={forkSpin}>
+                        <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
+                          <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={this.forkFunc}>
+                            <i className="iconfont icon-fork color-grey-9 mr3 font-16"></i><span>复刻</span>
+                          </a>
+                        </Tooltip>
+                        {
+                          forked_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" to={{ pathname: `/${owner}/${projectsId}/members`, state }}>
+                                {forked_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{forked_count}</span>
+                            : ""
+                        }
+                      </span>
                     </span>
-                  </span>
                 }
               </div>
-            </AlignCenter>
-            <div className="mt6" style={{minHeight:"20px"}}>
-              {
-                projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
-                :""
-              }
-              {
-                projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
-                <span className="color-grey-9">镜像自 <a className="color-blue hoverLine" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
-                :""
-              }
-            </div>
+            </AlignTop>
             {
               firstSync ? "" :
-              <DetailBanner 
-                history={this.props.history}
-                list={bannerList}
-                owner={owner}
-                projectsId={projectsId}
-                pathname={pathname}
-                state={state}
-                projectDetail={projectDetail}
-                open_devops={open_devops}
-                platform={platform}
-                urlFlag={urlFlag}
-                isManager={isManager}
-              />
+                <DetailBanner
+                  history={this.props.history}
+                  list={bannerList}
+                  owner={owner}
+                  projectsId={projectsId}
+                  pathname={pathname}
+                  state={state}
+                  projectDetail={projectDetail}
+                  open_devops={open_devops}
+                  platform={platform}
+                  urlFlag={urlFlag}
+                  isManager={isManager}
+                />
             }
           </div>
         </div>
         {
           firstSync ?
-          <Content className="spincontent">
-            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
-          </Content>
-          :
-          <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
-            <Switch {...this.props}>
-              {/* 资源 */}
-              <Route path="/projects/:owner/:projectsId/source"
-                render={
-                  () => (<Source {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 主页 */}
-              <Route path="/projects/:owner/:projectsId/about"
-                render={
-                  () => (<DevAbout {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* wiki新增文件 */}
-              <Route path="/projects/:owner/:projectsId/wiki/add"
-                render={
-                  () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* wiki编辑文件 */}
-              <Route path="/projects/:owner/:projectsId/wiki/edit/:wikiName"
-                render={
-                  () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* wiki */}
-              <Route path="/projects/:owner/:projectsId/wiki"
-                render={
-                  () => (<Wiki {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 工作流 */}
-              <Route path="/projects/:owner/:projectsId/devops"
-                render={
-                  () => (<DevIndex {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 标签列表 */}
-              <Route path="/projects/:owner/:projectsId/issues/tags"
-                render={
-                  (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 仓库设置 */}
-              <Route path="/projects/:owner/:projectsId/setting"
-                render={
-                  (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 任务详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/detail"
-                render={
-                  (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
-                }
-              ></Route>
-              {/*修改里程碑*/}
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid/edit"
-                render={
-                  (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建里程碑 */}
-              <Route path="/projects/:owner/:projectsId/milestones/new"
-                render={
-                  (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/*里程碑详情*/}
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid"
-                render={
-                  (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 里程碑 */}
-              <Route path="/projects/:owner/:projectsId/milestones"
-                render={
-                  (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 里程碑页面新建任务 */}
-              <Route path="/projects/:owner/:projectsId/issues/:milepostId/new"
-                render={
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建任务 */}
-              <Route path="/projects/:owner/:projectsId/issues/new"
-                render={
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 修改详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail"
-                render={
-                  (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 复制详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail"
-                render={
-                  (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 动态 */}
-              <Route path="/projects/:owner/:projectsId/activity"
-                render={
-                  (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 代码Index */}
-              <Route path="/projects/:owner/:projectsId/issues"
-                render={
-                  (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建合并请求 */}
-              <Route path="/projects/:owner/:projectsId/pulls/new/:branch"
-                render={
-                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/new"
-                render={
-                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
-                render={
-                  (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount"
-                render={
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
-                render={
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
+            <Content className="spincontent">
+              <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
+            </Content>
+            :
+            <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
+              <Switch {...this.props}>
+                {/* 资源 */}
+                <Route path="/:owner/:projectsId/source"
+                  render={
+                    () => (<Source {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 主页 */}
+                <Route path="/:owner/:projectsId/about"
+                  render={
+                    () => (<DevAbout {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki新增文件 */}
+                <Route path="/:owner/:projectsId/wiki/add"
+                  render={
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki编辑文件 */}
+                <Route path="/:owner/:projectsId/wiki/edit/:wikiName"
+                  render={
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki */}
+                <Route path="/:owner/:projectsId/wiki"
+                  render={
+                    () => (<Wiki {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 工作流 */}
+                <Route path="/:owner/:projectsId/devops"
+                  render={
+                    () => (<DevIndex {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 标签列表 */}
+                <Route path="/:owner/:projectsId/issues/tags"
+                  render={
+                    (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 仓库设置 */}
+                <Route path="/:owner/:projectsId/settings"
+                  render={
+                    (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+               
+                {/*修改里程碑*/}
+                <Route path="/:owner/:projectsId/milestones/:meilid/edit"
+                  render={
+                    (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建里程碑 */}
+                <Route path="/:owner/:projectsId/milestones/new"
+                  render={
+                    (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/*里程碑详情*/}
+                <Route path="/:owner/:projectsId/milestones/:meilid"
+                  render={
+                    (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 里程碑 */}
+                <Route path="/:owner/:projectsId/milestones"
+                  render={
+                    (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 里程碑页面新建任务 */}
+                <Route path="/:owner/:projectsId/issues/:milepostId/new"
+                  render={
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建任务 */}
+                <Route path="/:owner/:projectsId/issues/new"
+                  render={
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 修改详情 */}
+                <Route path="/:owner/:projectsId/issues/:orderId/updatedetail"
+                  render={
+                    (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 复制详情 */}
+                <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
+                  render={
+                    (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                 {/* 任务详情 */}
+                 <Route path="/:owner/:projectsId/issues/:orderId"
+                  render={
+                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
+                  }
+                ></Route>
+                {/* 动态 */}
+                <Route path="/:owner/:projectsId/activity"
+                  render={
+                    (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 代码Index */}
+                <Route path="/:owner/:projectsId/issues"
+                  render={
+                    (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建合并请求 */}
+                <Route path="/:owner/:projectsId/pulls/new/:branch"
+                  render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/new"
+                  render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
+                  render={
+                    (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/Messagecount"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
 
-              <Route path="/projects/:owner/:projectsId/pulls"
-                render={
-                  (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/watchers"
-                render={
-                  (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/stargazers"
-                render={
-                  (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/fork_users"
-                render={
-                  (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 贡献者列表 */}
-              <Route path="/projects/:owner/:projectsId/contribute"
-                render={
-                  () => (<Contribute {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
+                <Route path="/:owner/:projectsId/pulls"
+                  render={
+                    (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/following"
+                  render={
+                    (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/stargazers"
+                  render={
+                    (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/members"
+                  render={
+                    (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 贡献者列表 */}
+                <Route path="/:owner/:projectsId/contribute"
+                  render={
+                    () => (<Contribute {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
 
-              {/* 代码库----详情页面 */}
-              <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
-                render={
-                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/tree/:branchName"
-                render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/:subIndex"
-                render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId"
-                render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-            </Switch>
-          </Spin>
+                {/* 代码库----详情页面 */}
+                <Route path="/:owner/:projectsId/commits/branch/:branchName"
+                  render={
+                    (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/tree/:branchName"
+                  render={
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/:subIndex"
+                  render={
+                    (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId"
+                  render={
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+              </Switch>
+            </Spin>
         }
       </div>
     )
   }
 }
 
-export default Detail;
+export default ImageLayerOfCommentHOC({
+  imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+  parentSelector: ".newContainer",
+})(Detail);

src/forge/Main/DetailAdaptor.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
+
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("../Main/Detail"),
+  loading: Loading,
+});
+export default withRouter(
+  (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
+    return (
+      <Switch>
+        <Route
+          path="/:owner/:projectsId"
+          render={(p) => (
+            <ProjectDetail  {...props} {...p} />
+          )}
+        ></Route>
+      </Switch>
+    )
+  }))))
+)

src/forge/Main/DetailTop.js

@@ -12,19 +12,19 @@ class DetailTop extends Component {
         {
           platform ?
           <React.Fragment>
-            <Link to={`/projects/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
               <i className="iconfont icon-tijiaojilu font-20 mr3 font-bd"></i>
               <span>{(coderCount && coderCount.commits_count) || 0}</span>个提交
             </Link>
-            <Link to={`/projects/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/branches`} className={pathname.indexOf("/branches") > 0 ? "active" : ""}>
               <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
               <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
             </Link>
-            <Link to={`/projects/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/tags`} className={pathname.indexOf("/tags") > 0 ? "active" : ""}>
               <i className="iconfont icon-biaoqian3 font-18 mr3"></i>
               <span>{(coderCount && coderCount.tags_count) || 0}</span>个标签
             </Link>
-            <Link to={`/projects/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
               <i className="iconfont icon-fahangban font-18 mr3"></i>
               <span>{(coderCount && coderCount.version_releasesed_count) || 0}</span>个发行版
             </Link>

src/forge/Main/Diff.jsx

@@ -59,7 +59,7 @@ export default ({ match , history }) => {
               {commit && commit.message &&
                 <pre className="task-hide" style={{marginBottom:"0px",height:"28px",whiteSpace:"pre-wrap"}}>{commit.message}</pre>
               }
-              <Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
             </div>
           </div>
           <div className="f-wrap-between" style={{ alignItems: "center" }}>

src/forge/Main/Index.css

@@ -1,420 +0,0 @@
-.recommandOri.slick-slider {
-  width: 1300px;
-  margin: 20px auto 40px;
-}
-.recommandOri.slick-slider .slick-track {
-  margin-left: 0px;
-}
-.recommandOri.slick-slider .slick-slide li > a {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-/* recommandProjects */
-.recommandProjects.slick-slider {
-  width: 1230px;
-  margin: 20px auto 40px;
-}
-.recommandProjects.slick-slider .slick-track {
-  margin-left: 0px;
-}
-.recommandProjects.slick-slider .slick-arrow.slick-prev:before, .recommandProjects.slick-slider .slick-arrow.slick-next:before {
-  color: #999;
-}
-.recommandProjects.slick-slider .slick-arrow.slick-prev li.slick-active button:before, .recommandProjects.slick-slider .slick-arrow.slick-next li.slick-active button:before {
-  color: #999;
-}
-.recommandProjects.slick-slider .slick-dots {
-  bottom: -29px;
-}
-.recommandProjects.slick-slider .slick-dots li button:before {
-  color: #909090;
-}
-.recommandProjects.slick-slider .slick-slide {
-  padding: 0px 15px;
-  box-sizing: border-box;
-}
-.recommandProjects.slick-slider .slick-slide > div {
-  background-color: #fff;
-  border-radius: 10px;
-  width: 100%;
-  cursor: pointer;
-  border: 1px solid #eee;
-}
-.recommandProjects.slick-slider .slick-slide > div:hover {
-  box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
-}
-.recommandProjects.slick-slider .baseInfo {
-  padding: 18px 15px;
-  display: flex;
-  font-size: 12px;
-  color: #888;
-}
-.recommandProjects.slick-slider .baseInfo .look {
-  margin-right: 10px;
-}
-.recommandProjects.slick-slider .baseInfo .look i {
-  margin-right: 5px;
-}
-.recommandProjects.slick-slider .baseInfo .type {
-  flex: 1;
-  width: 0;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-align: right;
-}
-.recommandProjects.slick-slider .mainInfo {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-height: 160px;
-  border-bottom: 1px solid #eee;
-  padding: 20px;
-  box-sizing: border-box;
-}
-.recommandProjects.slick-slider .mainInfo img {
-  height: 50px;
-  width: 50px;
-  border-radius: 50%;
-}
-.recommandProjects.slick-slider .mainInfo .name {
-  font-size: 13px;
-  color: #666;
-  height: 18px;
-  line-height: 18px;
-  margin-top: 12px;
-}
-.recommandProjects.slick-slider .mainInfo .school {
-  margin-top: 12px;
-  color: #333;
-  font-size: 16px;
-  height: 22px;
-  line-height: 22px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  max-width: 100%;
-}
-
-.Panels {
-  max-width: 1200px;
-  margin: 0 auto;
-}
-.Panels .panelmenu {
-  padding-top: 30px;
-}
-.Panels .panelmenu .depotBtn .mr-5 {
-  margin-right: -5px;
-}
-.Panels .panelmenu .depotBtn .ant-btn {
-  height: 36px;
-  line-height: 34px;
-  width: 83px;
-  text-align: center;
-  padding: 0px;
-  font-weight: 500;
-  font-size: 14px;
-}
-.Panels .panelmenu .depotBtn .ant-btn-default {
-  color: #333;
-  border-color: #d0d0d0;
-}
-.Panels .panelmenu .depotBtn .ant-btn-default:hover {
-  background: #F3F4F6;
-}
-.Panels .panelmenu .depotBtn .ant-btn-primary {
-  color: #fff;
-  background-color: #466AFF;
-  opacity: 0.8;
-}
-.Panels .addOptionBtn {
-  height: 32px;
-  line-height: 30px;
-  display: flex;
-  border: 1px solid #d9d9d9;
-  border-radius: 2px;
-}
-.Panels .addOptionBtn a {
-  padding: 0px 13px;
-  color: rgba(0, 0, 0, 0.65);
-  cursor: pointer;
-}
-.Panels .addOptionBtn > a:first-child {
-  border-right: 1px solid #d9d9d9;
-}
-.Panels .addOptionBtn > a:last-child {
-  border-right: none;
-}
-.Panels .infoCount {
-  display: inline-block;
-  width: 24px;
-  text-align: center;
-  height: 24px;
-  line-height: 24px;
-  background-color: rgba(153, 153, 153, 0.13);
-  color: #666;
-  border-radius: 12px;
-  margin-left: 6px;
-  font-size: 12px;
-}
-.Panels .attrPerson {
-  padding-top: 12px;
-  display: flex;
-  flex-wrap: wrap;
-  padding-bottom: 2px;
-}
-.Panels .attrPerson a {
-  margin: 0px 17px 0px 0px;
-}
-.Panels .attrPerson a img {
-  border-radius: 50%;
-  width: 40px;
-  height: 40px;
-}
-.Panels .attrPerson a:nth-child(6) {
-  margin-right: 0px;
-}
-.Panels .progress {
-  display: flex;
-  border-radius: 10px;
-  height: 7px;
-  margin-top: 12px;
-}
-.Panels .progress span:first-child {
-  border-radius: 10px 0px 0px 10px;
-}
-.Panels .progress span:last-child {
-  border-radius: 0px 10px 10px 0px;
-}
-.Panels .progresstip {
-  margin-top: 15px;
-  flex-wrap: wrap;
-}
-.Panels .progresstip i.zero {
-  position: absolute;
-  display: block;
-  border-radius: 50%;
-  height: 8px;
-  width: 8px;
-  left: 0px;
-  top: 10px;
-}
-.Panels .progresstip > span {
-  padding-left: 15px;
-  position: relative;
-  min-width: 33.5%;
-  font-size: 12px;
-  font-weight: 400;
-  color: #666;
-}
-.Panels .progresstip > span span:last-child {
-  margin-left: 5px;
-}
-.Panels .listtable {
-  margin-top: 20px;
-}
-.Panels .listtable .listtablehead {
-  height: 55px;
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  border-bottom: 1px solid #d9d9d9;
-  padding: 13px 20px;
-  border-radius: 4px 4px 0px 0px;
-  border: 1px solid rgba(42, 97, 255, 0.23);
-  background-color: #FAFCFF;
-}
-.Panels .listtable .listtablehead .ellipsistxt {
-  margin-top: 6px;
-  margin-left: 13px;
-  line-height: 18px;
-  flex: 1;
-  width: 0;
-  color: #666;
-}
-.Panels .listtable .listtablehead .ellipsistxt #ptxt {
-  margin-bottom: 0px;
-  word-break: break-all;
-  overflow: unset;
-  white-space: pre-wrap;
-  /* css3.0 */
-  white-space: -moz-pre-wrap;
-  /* Firefox */
-  white-space: -pre-wrap;
-  /* Opera 4-6 */
-  white-space: -o-pre-wrap;
-  /* Opera 7 */
-  word-wrap: break-word;
-}
-.Panels .listtable .listtablehead .ellipsistxt.hidetxt {
-  height: 18px;
-  overflow: hidden;
-  position: relative;
-  padding-right: 8px;
-}
-.Panels .listtable .listtablehead .ellipsis {
-  margin-left: 8px;
-  cursor: pointer;
-  border-radius: 2px;
-  height: 16px;
-  background: rgba(153, 153, 153, 0.2);
-  border-radius: 2px;
-  padding: 0px 4px;
-  height: 14px;
-  line-height: 14px;
-  margin-top: 9px;
-}
-.Panels .listtable .listtablehead .ellipsis i {
-  font-size: 15px !important;
-  color: #333;
-  height: 14px;
-  line-height: 14px;
-}
-.Panels .listtable .listtablebody {
-  border-radius: 0px 0px 4px 4px;
-  border: 1px solid #D0D0D0;
-  border-top: none;
-}
-.Panels .listtable .listtablebody li.listtablepath a {
-  color: #40a9ff;
-}
-.Panels .listtable .listtablebody li.listtablepath p {
-  margin-bottom: 0px !important;
-}
-.Panels .listtable .listtablebody > li {
-  height: 38px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1px solid #d9d9d9;
-  padding: 0px 20px 0px 24px;
-}
-.Panels .listtable .listtablebody > li:hover {
-  background-color: #F3F4F6;
-}
-.Panels .listtable .listtablebody > li > span:first-child {
-  width: 30%;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.Panels .listtable .listtablebody > li > span:nth-child(2) {
-  width: 60%;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.Panels .listtable .listtablebody > li > span:nth-child(3) {
-  width: 10%;
-  text-align: right;
-}
-.Panels .listtable .listtablebody > li:last-child {
-  border-bottom: none;
-}
-
-.drawerBtn {
-  position: fixed;
-  left: -13px;
-  width: 33px;
-  background: #FFFFFF;
-  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
-  border: 1px solid #666666;
-  border-radius: 0px 12px 12px 0px;
-  height: 70px;
-  top: 50%;
-  margin-top: -35px;
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding-left: 7px;
-}
-.drawerBtn:hover {
-  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
-}
-.drawerBtn span {
-  writing-mode: vertical-lr;
-  color: #333;
-  width: 25px;
-  font-size: 14px;
-}
-.drawerBtn i {
-  color: #333;
-  height: 14px;
-  line-height: 14px;
-  width: 14px;
-  margin-left: 2px;
-  margin-bottom: 3px;
-}
-
-.downMenu {
-  width: 329px;
-  background-color: #fff;
-  box-shadow: 0px 1px 8px 1px rgba(212, 212, 212, 0.5);
-  padding-bottom: 14px;
-}
-.downMenu .ant-menu-item {
-  height: 50px;
-  line-height: 50px;
-}
-
-.catelogue {
-  cursor: pointer;
-  background: #FAFBFC;
-  border-radius: 4px;
-  border: 1px solid #D0D0D0;
-  font-size: 15px;
-  font-weight: normal;
-  margin-right: 12px;
-  padding: 0px 10px;
-  height: 30px;
-  line-height: 30px;
-  color: #666 !important;
-  display: flex;
-  align-items: center;
-}
-.catelogue:hover {
-  background-color: #F3F4F6;
-}
-.catelogue span {
-  margin-top: 1px;
-}
-
-.submoduleStyle {
-  cursor: default;
-}
-.submoduleStyle i {
-  cursor: default;
-}
-.submoduleStyle:hover {
-  color: #05101a;
-}
-
-.pinfos i, .pinfos a {
-  color: #666;
-}
-.pinfos:hover i, .pinfos:hover a {
-  color: #466AFF;
-}
-
-.graph {
-  flex: 1;
-  margin: 0px 12px;
-}
-.graph .ant-typography {
-  white-space: pre-wrap;
-  margin-bottom: 0px;
-}
-
-.ant-anchor-wrapper {
-  padding-left: 2px;
-}
-.ant-anchor-wrapper .ant-anchor-ink::before {
-  background-color: #fff;
-}
-
-/*# sourceMappingURL=Index.css.map */

src/forge/Main/Index.css.map

@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AACA;EACE;;AAGA;EAEE;EACA;EACA;;;AAIN;AACA;EACE;EACA;;AACA;EACE;;AAGA;EACE;;AAEF;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAIN;EACE;EACA;EACA;EACA;;AACA;EAIE;;AAHA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEE;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAIN;EACE;EACA;EACA;EACA;;AAEE;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;;AAKR;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EAWA;EACA;EACA;EACA;EACA;;AAdA;EACE;EACA;EACA;EACA;AAAsB;EACtB;AAA2B;EAC3B;AAAuB;EACvB;AAAyB;EACzB;;AAOF;EACE;EACA;EACA;EACA;;AASJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;;AAEE;EAAE;;AACF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;;;AAKR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;;AAEF;EACE;;;AAIF;EAAI;;AACJ;EACE;;;AAGJ;EACE;EACA;;AACA;EACE;EACA;;;AAGJ;EACE;;AACA;EACE","file":"Index.css"}

src/forge/Main/Index.js

@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
 import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
 import Slider from "react-slick";
 import { getImageUrl } from 'educoder';
@@ -13,6 +12,8 @@ import axios from 'axios';
 import img_new from '../Images/new.png';
 import img_array from '../Images/array.png';
 import banner from '../Images/banner_list.jpg';
+import CheckProfile from '../Component/ProfileModal/Profile';
+
 const Search = Input.Search;
 
 class Index extends Component {
@@ -228,7 +229,7 @@ class Index extends Component {
   }
 
   getoDetail=(login,identifier)=>{
-    this.props.history.push(`/projects/${login}/${identifier}`);
+    this.props.history.push(`/${login}/${identifier}`);
   }
 
   // 选择语言类别
@@ -254,10 +255,14 @@ class Index extends Component {
 
   newItem = ()=>{
     return(
-      <Menu>
-        <Menu.Item key="created_mirror"><Link to={`/projects/mirror/new`}>新建镜像项目</Link></Menu.Item>
-        <Menu.Item key="created_deposit"><Link to={`/projects/deposit/new`}>新建托管项目</Link></Menu.Item>
-      </Menu>
+      <ul>
+        <li>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile>
+        </li>
+        <li>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile>
+        </li>
+      </ul>
     )
   }
 
@@ -387,7 +392,13 @@ class Index extends Component {
                 <div>
                   {
                     current_user && current_user.login &&
-                    <Popover content={this.newItem()} trigger={["click"]} placement='bottom' className="mr50">
+                    <Popover
+                      overlayClassName="newPopUl" 
+                      content={this.newItem()} 
+                      trigger={["click"]} 
+                      placement='bottom' 
+                      className="mr50"
+                    >
                       <a className="ant-dropdown-link">
                         <span className="color-blue font-16"><img src={img_new} alt="" width="13px" /> 新建</span>
                       </a>

src/forge/Main/Index.scss

@@ -13,6 +13,21 @@
     }
   }
 }
+.iconBtn{
+  i{
+    color: #666;
+  }
+  span{
+    margin-left: 4px;
+    color: #333!important;
+    &:last-child{
+      font-weight: 500;
+    }
+  }
+  &:hover span,&:hover i{
+    color: #466AFF!important;
+  }
+}
 /* recommandProjects */
 .recommandProjects.slick-slider{
   width: 1230px;
@@ -113,8 +128,8 @@
         margin-right: -5px;
       }
       .ant-btn{
-        height: 36px;
-        line-height: 34px;
+        height: 32px;
+        line-height: 32px;
         width: 83px;
         text-align: center;
         padding:0px ;
@@ -131,26 +146,29 @@
       .ant-btn-primary{
         color: #fff;
         background-color: #466AFF;
-        opacity: 0.8;
+        border: none;
+        &:hover{
+          background-color: rgba(70,106,255,0.85);
+        }
       }
     }
   }
-  .addOptionBtn{
-    height: 32px;
-    line-height: 30px;
+  .depotBtn,.addOptionBtn{
     display: flex;
-    border:1px solid #d9d9d9;
-    border-radius: 2px;
     a{
-      padding:0px 13px;
-      color: rgba(0, 0, 0, 0.65);
-      cursor: pointer;
-    }
-    & > a:first-child{
-      border-right: 1px solid #d9d9d9;
-    }
-    & > a:last-child{
-      border-right: none;
+      color: #333!important;
+      font-weight: 500!important;
+      border-radius: 5px;
+      width: 83px;
+      height: 32px;
+      line-height: 30px;
+      background: #fff;
+      border: 1px solid #D0D0D0;
+      margin-right: 10px;
+      text-align: center;
+      &:hover,&:active{
+        background: #F3F4F6;
+      }
     }
   }
   .infoCount{
@@ -184,15 +202,15 @@
   }
   .progress{
     display: flex;
-    border-radius: 10px;
-    height: 7px;
+    border-radius: 2px;
+    height: 11px;
     margin-top: 12px;
     span{
       &:first-child{
-        border-radius: 10px 0px 0px 10px;
+        border-radius: 2px 0px 0px 2px;
       }
       &:last-child{
-        border-radius: 0px 10px 10px 0px;
+        border-radius: 0px 2px 2px 0px;
       }
     }
   }
@@ -225,17 +243,17 @@
   .listtable{
     margin-top: 20px;
     .listtablehead{
-      height: 55px;
       display: flex;
       justify-content: space-between;
       align-items: flex-start;
       border-bottom: 1px solid #d9d9d9;
-      padding:13px 20px;
+      padding:12px 20px 11px;
       border-radius: 4px 4px 0px 0px;
       border: 1px solid rgba(42, 97, 255, 0.23);
       background-color: #FAFCFF;
       .ellipsistxt{
         margin-top: 6px;
+        cursor: pointer;
         #ptxt{
           margin-bottom: 0px;
           word-break: break-all;
@@ -371,6 +389,14 @@
     line-height: 50px;
   }
 }
+.fileMenu{
+  width: 83px;
+  li{
+    padding:6px 0px!important;
+    text-align: center;
+    width: 100%;
+  }
+}
 
 .catelogue{
   cursor: pointer;
@@ -405,7 +431,7 @@
 .pinfos{
   i,a{color: #666;}
   &:hover i,&:hover a{
-    color: #466AFF;
+    color: #2A61FF!important;
   }
 }
 .graph{

src/forge/Main/IndexItem.js

@@ -28,35 +28,35 @@ class IndexItem extends Component {
                   <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                 </a>
                 :
-                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
+                <Link to={`/${item.author && item.author.login}`} className="show-user-link">
                   <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
                 </Link>
               }
               <div className="p-r-Infos">
                 <div className="p-r-name">
                   <AlignCenter>
-                    <Link to={`/projects/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
+                    <Link to={`/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
                       {item.author.name}/{item.name}
                     </Link>
                     { !item.is_public && <span className="privateTag">私有</span> }
                     {
                       item.forked_from_project_id ?
-                        <span className="ml5">
+                        <Tooltip title="该项目是一个fork仓库" className="ml5">
                           <i className="iconfont icon-fork font-18 color-orange" />
-                        </span>
+                        </Tooltip>
                         : ""
                     }
                     {
                       item.type && item.type === 2 ?
-                      <Tooltip title="该项目是一个镜像" className="ml5">
+                      <Tooltip title="该项目是一个同步镜像仓库" className="ml5">
                         <i className="iconfont icon-banbenku font-18 color-green" />
                       </Tooltip>:""
                     }
                     {
                       item.type && item.type === 1 ?
-                      <span className="ml5">
+                      <Tooltip title="该项目是一个导入于其他网站的仓库" className="ml5">
                         <i className="iconfont icon-jingxiang font-18 color-green" />
-                      </span>:""
+                      </Tooltip>:""
                     }
                   </AlignCenter>
                   <span className="p-r-tags">

src/forge/Main/list.css

@@ -1,908 +0,0 @@
-@charset "UTF-8";
-.lineH2 {
-  line-height: 2;
-}
-
-.t_project_banner {
-  /* height: 260px;
-  background: url(../Images/banner_list.jpg) no-repeat center; */
-  background-color: #050d34;
-}
-
-.ProjectListIndex {
-  width: 1200px;
-  margin: 20px auto;
-  display: flex;
-  align-items: flex-start;
-  flex-wrap: wrap;
-}
-
-.list-left {
-  width: 26%;
-  padding-right: 20px;
-  box-sizing: border-box;
-  margin-bottom: 20px;
-}
-
-.list-left > div {
-  border: 1px solid #eee;
-}
-
-.list-left > div.bgcF {
-  border: none;
-}
-
-.list-right {
-  width: 74%;
-  background: #fff;
-  padding: 10px;
-  border: 1px solid #eee;
-}
-
-/* 首页列表的新建和排序的下拉列表 */
-.ant-menu-inline, .ant-menu-vertical, .ant-menu-vertical-left {
-  border-right: none !important;
-}
-
-.ant-menu-vertical > .ant-menu-item {
-  margin: 0px !important;
-  height: 35px;
-  line-height: 35px;
-  border-bottom: 1px solid #eee;
-  font-size: 14px !important;
-}
-
-.ant-menu-vertical > .ant-menu-item:last-child {
-  border-bottom: none;
-}
-
-.list-r-operation {
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  align-items: center;
-  padding: 25px 30px;
-  border-bottom: 1px solid #E0E0E0;
-}
-
-.list-r-Search {
-  width: 400px;
-}
-
-.padding0-25 {
-  padding: 0px 25px;
-}
-
-.list-r-Search .ant-btn-lg {
-  height: 38px;
-}
-
-.list-r-Search .ant-input-group-addon {
-  border: none !important;
-}
-
-.list-r-Search .ant-input-search-button {
-  height: 40px !important;
-}
-
-.createBtn {
-  border-radius: 4px;
-  margin-left: 20px;
-  display: inline-block;
-  padding: 3px 15px;
-  background-color: #4CACFF;
-  color: #fff !important;
-}
-
-/* 列表 */
-.project-list {
-  padding: 0px 30px;
-}
-
-.border-top-grey {
-  border-top: 1px solid #eeeeee;
-}
-
-.p-r-Item:last-child {
-  border-bottom: none !important;
-}
-
-.p-r-Item {
-  display: flex;
-  border-bottom: 1px solid #eeeeee;
-  padding: 22px 0px;
-  justify-content: flex-start;
-}
-
-.boxShandow {
-  box-shadow: 0px 2px 20px 10px rgba(0, 0, 0, 0.03);
-}
-
-.p-r-photo {
-  width: 60px;
-  height: 60px;
-  border-radius: 50%;
-  margin-right: 22px;
-  margin-top: 8px;
-}
-
-.p-r-Infos {
-  flex: 1;
-  width: 0;
-}
-
-.p-r-name {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.p-r-name > p {
-  flex: 1;
-  width: 0;
-}
-
-.p-r-btn {
-  display: flex;
-  align-items: center;
-}
-
-.p-r-btn > span {
-  height: 35px;
-  line-height: 35px;
-  border: 1px solid #f4f4f4;
-  border-radius: 5px;
-  display: block;
-  margin-left: 20px;
-  background-color: #fff;
-  display: flex;
-}
-
-.p-r-btn > span > a {
-  display: flex;
-  align-items: center;
-  padding: 0px 12px;
-  background: #ececec;
-}
-
-.p-r-btn > span > a:active {
-  background: #f4f4f4;
-}
-
-.p-r-btn > span > span {
-  padding: 0px 8px;
-}
-
-.p-r-tags {
-  display: flex;
-  opacity: 1;
-}
-
-.p-r-tags.large > span {
-  height: 30px;
-  line-height: 30px;
-  font-size: 14px;
-}
-
-.p-r-tags > span {
-  margin-left: 15px;
-  padding: 0px 10px;
-  border-radius: 15px;
-  background: #EBF4FE;
-  color: #333;
-  height: 24px;
-  line-height: 24px;
-  display: block;
-  font-size: 12px;
-  display: flex;
-}
-
-.p-r-tags > span.pariseTag {
-  background: #FFF3DC;
-}
-
-.p-r-tags.large > span > label {
-  padding: 0px 12px;
-}
-
-.p-r-tags > span > label {
-  padding: 0px 8px;
-}
-
-.p-r-tags.large > span > span {
-  padding: 0px 6px;
-}
-
-.pariseImg {
-  width: 14px;
-  height: 12px;
-  margin-top: 6px;
-  margin-right: 3px;
-}
-
-.p-r-tags > span > span {
-  display: block;
-  background: #fff;
-  border-left: #efefef;
-  padding: 0px 4px;
-  border-radius: 0px 4px 4px 0px;
-  color: #999;
-}
-
-.p-r-content {
-  margin-top: 10px;
-  color: #666;
-  display: flex;
-}
-
-.p-r-detail > span {
-  margin-right: 22px;
-  color: #888;
-}
-
-.p-r-detail > span > label {
-  color: #999;
-}
-
-.p-r-about {
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: nowrap;
-  margin-top: 8px;
-  color: #666;
-}
-
-.spincontent {
-  height: 400px;
-}
-
-.spinstyle .ant-spin-text {
-  margin-top: 30px;
-  color: #888;
-}
-
-/* -----------详情------------ */
-.detailHeader-wrapper {
-  background-color: #FBFCFF;
-  border-bottom: 1px solid #e2e2e2;
-}
-
-.headerMenu-wrapper {
-  display: flex;
-  flex-direction: row;
-  cursor: pointer;
-}
-.headerMenu-wrapper li {
-  position: relative;
-  text-align: center;
-  padding: 0px;
-}
-.headerMenu-wrapper li > a {
-  font-size: 14px;
-  height: 40px;
-  line-height: 28px;
-  padding: 0px 20px;
-  display: block;
-  color: #666;
-}
-.headerMenu-wrapper li > a > img {
-  margin-right: 8px;
-}
-.headerMenu-wrapper li > a > span.num {
-  line-height: 24px;
-  margin-left: 5px;
-  margin-top: 2px;
-  font-size: 12px;
-  float: right;
-  color: #666 !important;
-  background-color: rgba(153, 153, 153, 0.13);
-  border-radius: 50%;
-  width: 24px;
-  height: 24px;
-}
-.headerMenu-wrapper li.active a, .headerMenu-wrapper li.active a i {
-  color: #466AFF !important;
-}
-.headerMenu-wrapper li.active::after, .headerMenu-wrapper li:hover::after {
-  position: absolute;
-  bottom: 0px;
-  height: 2px;
-  background-color: rgba(153, 153, 153, 0.2);
-  content: "";
-  left: 0px;
-  width: 100%;
-}
-.headerMenu-wrapper li.active::after {
-  background-color: #466AFF;
-}
-
-.detail_tag_btn {
-  height: 34px;
-  line-height: 32px;
-  border-radius: 5px;
-  border: 1px solid #D0D0D0;
-  display: flex;
-  align-items: center;
-  margin-left: 10px;
-  padding: 0px;
-  background-color: #FAFBFC;
-  box-shadow: none;
-}
-.detail_tag_btn:hover {
-  background-color: #F3F4F6;
-}
-.detail_tag_btn .detail_tag_btn_name {
-  padding: 0px 18px;
-  min-width: 82px;
-  text-align: center;
-}
-.detail_tag_btn .detail_tag_btn_name:hover > span {
-  color: #333 !important;
-}
-.detail_tag_btn .detail_tag_btn_name img {
-  margin-right: 10px;
-}
-.detail_tag_btn .detail_tag_btn_count {
-  width: 42px;
-  text-align: center;
-  background: #fff;
-  border-radius: 0px 4px 4px 0px;
-  height: 100%;
-  border-left: 1px solid #D0D0D0;
-}
-
-.ant-tooltip {
-  max-width: fit-content !important;
-}
-
-.files-md {
-  padding: 20px;
-}
-
-/* 详情-代码 */
-.branch-wrapper {
-  border: 1px solid #eee;
-  border-radius: 4px;
-  display: flex;
-  align-items: center;
-  height: 60px;
-  padding: 0px 30px;
-  width: 1200px;
-  margin: 0px auto;
-  background-color: #fff;
-  margin-top: 20px;
-  justify-content: space-between;
-}
-
-.branch-wrapper > a > i {
-  color: #5091FF;
-  margin-right: 5px;
-  cursor: default;
-}
-
-.branch-wrapper a {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  height: 30px;
-  line-height: 30px;
-  cursor: pointer;
-  font-size: 16px;
-  color: #333333;
-}
-
-.branch-wrapper a > span {
-  position: relative;
-  min-height: 20px;
-  display: block;
-}
-
-.branch-wrapper a.active > span::after {
-  position: absolute;
-  content: "";
-  bottom: -5px;
-  width: 30px;
-  height: 3px;
-  left: 0px;
-  background-color: #5091FF;
-}
-
-.gitAddressClone {
-  margin: 0px 20px 14px 20px !important;
-  display: flex;
-  height: 40px;
-  align-items: center;
-  border-radius: 4px;
-  border: 1px solid #eee;
-  background: #fff;
-  margin-left: 20px;
-  position: relative;
-}
-
-.gitAddressClone > span {
-  display: flex;
-  line-height: 40px;
-  height: 40px;
-  padding: 0px 12px;
-  cursor: pointer;
-  align-items: center;
-}
-
-.addressTips {
-  position: absolute;
-  font-size: 12px;
-  color: #FF6E21;
-  top: -34px;
-  left: 30px;
-  background-color: #fff;
-  border: 1px solid #FE881D;
-  padding: 0px 5px;
-  height: 28px;
-  line-height: 28px;
-}
-
-.addressTips > span {
-  position: relative;
-  display: block;
-}
-
-.addressTips > span::before {
-  box-sizing: content-box;
-  width: 0px;
-  height: 0px;
-  position: absolute;
-  top: 25px;
-  left: 50%;
-  margin-left: -4px;
-  padding: 0;
-  border-top: 8px solid #FFFFFF;
-  border-bottom: 8px solid transparent;
-  border-left: 8px solid transparent;
-  border-right: 8px solid transparent;
-  display: block;
-  content: "";
-  z-index: 12;
-}
-
-.addressTips > span::after {
-  box-sizing: content-box;
-  width: 0px;
-  height: 0px;
-  position: absolute;
-  top: 26px;
-  left: 50%;
-  margin-left: -4px;
-  padding: 0;
-  border-top: 8px solid #FE881D;
-  border-bottom: 8px solid transparent;
-  border-left: 8px solid transparent;
-  border-right: 8px solid transparent;
-  display: block;
-  content: "";
-  z-index: 11;
-}
-
-.gitAddressClone > span.addressType {
-  color: #4CACFF;
-}
-
-.gitAddressClone > span:last-child {
-  border-right: none;
-}
-
-.gitAddressClone > input {
-  border: none;
-  outline: none;
-  padding: 0px 8px;
-  height: 40px;
-  line-height: 40px;
-  border-radius: 0px;
-  border: 1px solid #eee;
-  flex: 1;
-}
-
-.wrap-commit-table .ant-table-small > .ant-table-content > .ant-table-body {
-  margin: 0px;
-}
-
-.wrap-commit-table .ant-table-title {
-  background-color: #f1f8ff;
-  padding: 13px 16px !important;
-}
-
-.commitKey {
-  cursor: pointer;
-  border: 1px solid #FD7700;
-  background-color: #FFF3DC;
-  color: #FD7700 !important;
-  padding: 0px 12px;
-  height: 20px;
-  line-height: 20px;
-  margin-left: 15px;
-  border-radius: 18px;
-  max-width: 100%;
-}
-
-/* 分支 */
-.branchTitle {
-  padding: 8px 10px;
-  color: #333;
-  font-size: 16px;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.branchUl li {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: flex-end;
-  justify-content: space-between;
-  padding: 20px 0px;
-  border-bottom: 1px solid #eee;
-}
-
-.branchUl li:last-child {
-  border-bottom: none;
-}
-
-.operationBtn {
-  border: 1px solid #f4f4f4;
-  border-radius: 3px;
-  padding: 0px 6px;
-  background-color: #fff;
-  color: #666 !important;
-  display: inline-block;
-}
-
-.messages {
-  max-width: 700px;
-}
-
-.leftPoint {
-  margin-left: 20px;
-  position: relative;
-}
-
-.leftPoint::before {
-  position: absolute;
-  left: -10px;
-  top: 8px;
-  border-radius: 50%;
-  width: 4px;
-  height: 4px;
-  background-color: #dadada;
-  content: "";
-}
-
-/* 文件目录、文件内容 */
-.subFileName {
-  position: relative;
-  margin-left: 15px;
-  height: 22px;
-}
-
-.subFileName::before {
-  position: absolute;
-  content: "/";
-  left: -10px;
-  top: 0px;
-  color: #999;
-  height: 22px;
-  line-height: 22px;
-}
-
-.addFile {
-  display: flex;
-}
-
-.addFile a {
-  display: block;
-  background-color: rgba(76, 172, 255, 0.8);
-  color: #fff;
-  cursor: pointer;
-  height: 32px;
-  line-height: 32px;
-  padding: 0px 10px;
-}
-
-.addFile a:first-child {
-  border-radius: 4px;
-}
-
-.addFile a:last-child {
-  /* border-radius: 0px 4px 4px 0px; */
-  border-left: 1px solid rgba(247, 247, 247, 0.3);
-}
-
-.addFile a:active {
-  background-color: #4cacff;
-}
-
-@media screen and (max-width: 750px) {
-  .list-r-Search {
-    flex: 1;
-  }
-
-  .list-left, .list-right {
-    width: 100%;
-    padding: 0px;
-  }
-}
-@media screen and (max-width: 400px) {
-  .list-r-Search {
-    width: 100%;
-  }
-
-  .headerMenu-wrapper {
-    flex-direction: column;
-    width: 100%;
-  }
-
-  .headerMenu-wrapper li {
-    width: 100%;
-  }
-
-  .gitAddressClone {
-    width: 100%;
-    margin-left: 0px;
-  }
-
-  .gitAddressClone > span {
-    padding: 0px;
-  }
-
-  .messages {
-    max-width: 100%;
-  }
-}
-.commonBox {
-  border: 1px solid #ddd;
-  margin-top: 30px;
-  border-radius: 4px;
-}
-
-.commonBox .commonBox-title {
-  padding: 0px 20px;
-  box-sizing: border-box;
-  font-size: 16px;
-  background: #FAFBFC;
-  /* F1F8FF */
-  font-weight: bold;
-  height: 45px;
-  line-height: 45px;
-  border-bottom: 1px solid #d9d9d9;
-  border-radius: 4px 4px 0px 0px;
-}
-
-.readBox {
-  border: none;
-}
-.readBox.commonBox .commonBox-info {
-  border: 1px solid #D0D0D0;
-  border-top: none;
-  border-radius: 0px 0px 4px 4px;
-  padding: 20px 38px;
-}
-
-.commonBox .commonBox-title.boxTitle {
-  display: flex;
-  justify-content: space-between;
-  height: 55px;
-  line-height: 55px;
-  background: #FAFCFF;
-  border-radius: 4px 4px 0px 0px;
-  border: 1px solid rgba(42, 97, 255, 0.23);
-}
-
-.synchronism {
-  display: block;
-  height: 34px;
-  line-height: 34px;
-  padding: 0px 15px;
-  color: #fff !important;
-  background-color: #28BD6C;
-  border-radius: 4px;
-}
-
-.files_info {
-  cursor: pointer;
-}
-
-.commonBox .commonBox-info {
-  padding: 20px 15px;
-}
-
-.commonBox-title-read {
-  vertical-align: middle;
-  color: #000;
-  font-size: 14px;
-}
-
-@media screen and (max-width: 370px) {
-  .p-r-tags, .p-r-btn {
-    opacity: 0;
-    display: none;
-  }
-
-  .p-r-about {
-    flex-wrap: wrap;
-  }
-
-  .commitKey {
-    margin-right: 0px;
-  }
-
-  .list-r-Search {
-    width: 100%;
-  }
-}
-.null_data_box {
-  width: 100%;
-  border: 1px solid #d4d4d5;
-  border-radius: 3px;
-}
-
-.title {
-  font-weight: bold;
-  background: #f4f4f4;
-  padding: 10px 15px;
-  box-sizing: border-box;
-  border-bottom: 1px solid #d4d4d5;
-}
-
-.item_title {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 15px;
-}
-
-.item {
-  padding: 15px;
-  border-bottom: 1px solid #dededf;
-}
-
-.item:last-child {
-  border-bottom: none;
-}
-
-.item_title small {
-  font-weight: 400;
-  margin-left: 10px;
-}
-
-.item_title small a {
-  color: #4183c6;
-}
-
-.Markdown {
-  background: #f7f7f7;
-  padding: 10px 20px;
-}
-
-.item .gitAddressClone input:focus {
-  border: 1px solid #2185d0;
-}
-
-.content-file {
-  margin-top: 8px;
-}
-
-.content-file .CodeMirror {
-  background-color: #f7f7f7;
-  border: 1px solid #e4e4e4;
-  border-radius: 4px;
-  height: auto;
-}
-
-.content-file.edit .CodeMirror {
-  background-color: #fff;
-}
-
-.content-file .CodeMirror .CodeMirror-scroll {
-  min-height: 450px;
-}
-
-.text-center {
-  text-align: center;
-}
-
-.fork-css {
-  position: absolute;
-  left: 0;
-  top: 50px;
-  width: 100%;
-}
-
-.color-grey-ccc {
-  color: #ccc !important;
-}
-
-a.color-grey-ccc:hover {
-  color: #4cacff !important;
-}
-
-.pull-right {
-  float: right;
-}
-
-.commitList {
-  padding: 0px 30px;
-  min-height: 400px;
-}
-
-.commitList > div {
-  border-bottom: 1px solid #EEEEEE;
-  padding: 16px 0px;
-}
-
-.commitList > div:last-child {
-  border-bottom: none;
-}
-
-/* 标签列表 */
-.div_table {
-  border: 1px solid #eee;
-  border-radius: 2px;
-}
-
-.ul_thead {
-  padding: 0px 30px;
-  box-sizing: border-box;
-  background: #FAFAFA;
-  border-bottom: 1px solid #eee;
-  height: 50px;
-  line-height: 50px;
-}
-
-.ul_tbody {
-  padding: 0px 30px;
-}
-
-.ul_thead li, .ul_tbody li {
-  display: flex;
-  align-items: center;
-  text-align: left;
-}
-
-.ul_tbody li {
-  padding: 18px 0px;
-  border-bottom: 1px solid #eee;
-}
-
-.ul_tbody li:last-child {
-  border-bottom: none;
-}
-
-.ul_thead li > span, .ul_tbody li > span {
-  width: 20%;
-  padding-right: 20px;
-}
-
-.ul_thead li > span:nth-child(2), .ul_tbody li > span:nth-child(2) {
-  flex: 1;
-}
-
-.ul_tbody_third {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: left;
-}
-
-.ul_tbody_forth {
-  text-align: center;
-  display: flex;
-  justify-content: center;
-}
-
-.depotNum {
-  color: #666 !important;
-}
-.depotNum span:last-child {
-  color: #333;
-}
-.depotNum:hover span:last-child {
-  color: #2A61FF;
-}
-
-/*# sourceMappingURL=list.css.map */

src/forge/Main/list.css.map

@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["list.scss"],"names":[],"mappings":";AACA;EAAQ;;;AACR;AACE;AAAA;EAEA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAsC;;;AACtC;EAAwC;;;AACxC;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;AACA;EACE;EACA;;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;;;AAEF;EACE;;;AAEF;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EAAkB;EAAmB;;;AACrC;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;AACA;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;AACE;EACA;;;AAEF;EACE;;;AAKF;EACE;IACE;;;EAEF;IACE;IACA;;;AAIJ;EACE;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;AAAoB;EACpB;EACA;EACA;EACA;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAGA;EACE;;;AAGJ;EACE;EACA;EACA;;;AAGF;EACE;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACA;;;AAEA;EAAc;;;AAEd;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAa;;;AACb;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAY;;;AAEZ;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAIF;AACA;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;AACA;EACE;;AAEF;EACE","file":"list.css"}

src/forge/Main/list.scss

@@ -226,23 +226,20 @@
   flex-direction: row;
   cursor: pointer;
   li{
-    position: relative;
     text-align: center;
     padding:0px;
+    margin-right: 40px;
+    display: flex;
     & > a{
+      position: relative;
       font-size: 14px;
-      height: 40px;
-      line-height: 28px;
-      padding:0px 20px;
+      height: 36px;
+      line-height: 24px;
       display: block;
-      color: #666; 
-      &> img{
-        margin-right: 8px;
-      }
+      color: #000!important; 
       &> span.num{
         line-height: 24px;
         margin-left: 5px;
-        margin-top: 2px;
         font-size: 12px;
         float: right;
         color: #666!important;
@@ -252,10 +249,8 @@
         height: 24px;
       }
     }
-    &.active a,&.active a i{
-      color: #466AFF!important;
-    }
-    &.active::after,&:hover::after{
+   
+    &.active a::after,&:hover a::after{
       position: absolute;
       bottom:0px;
       height:2px;
@@ -264,13 +259,16 @@
       left: 0px;
       width:100%;
     }
-    &.active::after{
+    &.active span{
+      font-weight: 500;
+    }
+    &.active a::after{
       background-color: #466AFF;
     }
   }
 }
 .detail_tag_btn{
-  height:34px;
+  height:32px;
   line-height: 32px;
   border-radius:5px;
   border:1px solid #D0D0D0;
@@ -280,18 +278,18 @@
   padding:0px;
   background-color:#FAFBFC;
   box-shadow: none;
-  &:hover{
-    background-color: #F3F4F6;
-  }
   .detail_tag_btn_name{
-    padding:0px 18px;
-    min-width: 82px;
+    padding:0px 10px;
     text-align: center;
-    &:hover>span{
-      color: #333!important;
+    height: 30px;
+    line-height: 30px;
+    border-radius:5px 0px 0px 5px;
+    &:hover
+    {
+      background-color: #F3F4F6;
     }
-    img{
-      margin-right: 10px;
+    span{
+      color: #333!important;
     }
   }
   .detail_tag_btn_count{
@@ -356,7 +354,7 @@
 
 
 .gitAddressClone{
-  margin:0px 20px 14px 20px!important;
+  margin:14px 20px!important;
   display: flex;
   height: 40px;
   align-items: center;
@@ -574,7 +572,7 @@
 }
 .commonBox{
   border:1px solid #ddd;
-  margin-top: 30px;
+  margin-top: 18px;
   border-radius: 4px;
 }
 .commonBox .commonBox-title{
@@ -627,6 +625,9 @@
   vertical-align: middle;
   color: #000;
   font-size: 14px;
+  &:hover {
+    color: #466AFF;
+  }
 }
 
 @media screen and (max-width: 370px){

src/forge/Main/sub/Contribute.jsx

@@ -52,7 +52,7 @@ function Contribute(props){
                     <AlignCenter>
                       <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
                       <div>
-                        <Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
+                        <Link to={`/${item.login}`} className="font-16">{item.name}</Link>
                         <p className="font-12 color-grey-9">提交{item.contributions}次</p>
                       </div>
                     </AlignCenter>

src/forge/Main/sub/DetailBanner.jsx

@@ -11,7 +11,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
       if(pathname && pathname==="source"){
         let a = list.filter(item=>item.menu_name === "resources");
         if(a && a.length === 0){
-          history.push(`/projects/${owner}/${projectsId}`);
+          history.push(`/${owner}/${projectsId}`);
         }
       }
       setMenuName(list);
@@ -29,38 +29,38 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "home" &&
                     <li className={pathname==="about" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
-                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuyeicon color-grey-3 mr5 font-14":"iconfont icon-zhuyeicon color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/about`, state }}>
+                        <i className={"iconfont icon-zhuye-fill color-grey-3 mr5 font-14"}></i>
                         <span>主页</span>
-                        </Link>
+                      </Link>
                     </li>
                   }
                   {
                     item.menu_name === "code" &&
                     <li className={(pathname==="" || urlFlag) ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
-                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimakuicon color-grey-3 mr5 font-14":"iconfont icon-daimakuicon color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}`, state }}>
+                        <i className={"iconfont icon-daimakuicon1 color-grey-3 mr5 font-14"}></i>
                         <span>代码库</span>
-                        </Link>
+                      </Link>
                     </li>
                   }
                   {
                     item.menu_name === "issues" &&
                     <li className={pathname==="issues" ? "active" : ""}>
-                      <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
-                        <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                          <i className={pathname==="issues" ? "iconfont icon-yixiuicon color-grey-3 mr5 font-14":"iconfont icon-yixiuicon color-grey-6 font-14 mr5"}></i>
-                          <span>易修</span>
+                        <Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
+                          <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
+                              <i className={"iconfont icon-yixiuicon1 color-grey-3 mr5 font-14"}></i>
+                              <span>易修</span>
+                          </Tooltip>
                           {projectDetail && projectDetail.issues_count ? <span className="num">{numFormat(projectDetail.issues_count)}</span> : ""}
                         </Link>
-                      </Tooltip>
                     </li>
                   }
                   {
                     item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ?
                     <li className={pathname==="pulls" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
-                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiuicon color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiuicon color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/pulls`, state }}>
+                        <i className={"iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14"}></i>
                         <span>合并请求</span>
                         {projectDetail && projectDetail.pull_requests_count ? <span className="num">{numFormat(projectDetail.pull_requests_count)}</span> : ""}
                       </Link>
@@ -69,8 +69,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "wiki" &&
                     <li className={pathname === "wiki" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/wiki`, state }}>
-                        <i className={pathname==="wiki" ? "iconfont icon-wiki_icon color-grey-3 mr5 font-14":"iconfont icon-wiki_icon color-grey-6 font-14 mr5"}></i>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/wiki`, state }}>
+                        <i className={"iconfont icon-a-wikiicon1 color-grey-3 mr5 font-14"}></i>
                         <span>Wiki</span>
                       </Link>
                     </li>
@@ -78,47 +78,48 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "devops" && platform ? 
                     <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
-                        <i className="iconfont icon-gongzuoliuicon font-13 mr8"></i>工作流(beta版)
-                        {projectDetail && projectDetail.ops_count ? <span>{numFormat(projectDetail.ops_count)}</span> : ""} 
+                      {/* <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> */}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/devops`, state:{...state,open_devops} }}>
+                        <i className="iconfont icon-gongzuoliuicon font-13 mr5 color-grey-3"></i>工作流(beta版)
+                        {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
                     </li>
                     :""
                   }
-                  {/* {
+                  {
                     item.menu_name === "resources" &&
                     <li className={pathname==="source" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
-                          <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
-                          <span>资源库</span>
-                          {projectDetail && projectDetail.source_count ? <span className="num">{numFormat(projectDetail.source_count)}</span> :""}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/source`, state }}>
+                        <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
+                        <span>资源库</span>
+                        {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                       </Link>
                     </li>
-                  } */}
+                  }
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
-                          <i className={pathname==="milestones" ? "iconfont icon-lichengbeiicon color-grey-3 mr5 font-14":"iconfont icon-lichengbeiicon color-grey-6 font-14 mr5"}></i>
-                          <span>里程碑</span>
-                          {projectDetail && projectDetail.versions_count ? <span className="num">{numFormat(projectDetail.versions_count)}</span> :""}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/milestones`, state }}>
+                        <i className={pathname==="milestones" ? "iconfont icon-lichengbeiicon color-grey-3 mr5 font-14":"iconfont icon-lichengbeiicon color-grey-6 font-14 mr5"}></i>
+                        <span>里程碑</span>
+                        {projectDetail && projectDetail.versions_count ? <span className="num">{numFormat(projectDetail.versions_count)}</span> :""}
                       </Link>
                     </li>
                   }
                   {
                     item.menu_name === "activity" &&
                      <li className={pathname==="activity" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/activity`, state }}>
                         <i className={pathname==="activity" ? "iconfont icon-dongtaiicon color-grey-3 mr5 font-14":"iconfont icon-dongtaiicon color-grey-6 font-14 mr5"}></i>
                         <span>动态</span>
                       </Link>
                     </li>
                   }
                   {
-                    item.menu_name === "setting" &&
-                    <li className={pathname === "setting" ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangkushezhiicon color-grey-3 mr5 font-14":"iconfont icon-cangkushezhiicon color-grey-6 font-14 mr5"}></i>
+                    item.menu_name === "settings" &&
+                    <li className={pathname === "settings" ? "active" : ""}>
+                      <Link to={`/${owner}/${projectsId}/settings`}>
+                        <i className={url && url.indexOf("/settings") > 0 ? "iconfont icon-cangkushezhiicon color-grey-3 mr5 font-14":"iconfont icon-cangkushezhiicon color-grey-6 font-14 mr5"}></i>
                         <span>仓库设置</span>
                       </Link>
                     </li>

src/forge/Main/sub/Invite.jsx

@@ -1,26 +1,15 @@
 import React from 'react';
-import { Tooltip , message } from 'antd';
 import './sub.scss';
+import CopyTool from '../../Component/CopyTool';
 
 function Invite({code,className}) {
 
-  function jsCopy(id) {
-    const copyEle = document.querySelector(id); // 获取要复制的节点
-    const range = document.createRange(); // 创造range
-    window.getSelection().removeAllRanges(); //清除页面中已有的selection
-    range.selectNode(copyEle); // 选中需要复制的节点
-    window.getSelection().addRange(range); // 执行选中元素
-    document.execCommand("Copy"); // 执行copy操作
-    message.success('复制成功');
-  }
   return(
     <div className={className}>
       <span className="font-16 color-ooo">邀请码</span>
       <div>
-        <span id="devitecode">{code}</span>
-        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
-          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
-        </Tooltip>
+        <input value={code} id="devitecode" style={{width:"62px",border:"none",cursor:"default"}} readOnly/>
+        <CopyTool timeOut={true} beforeText={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>} className="ml8 font-16" inputId="devitecode"/>
       </div>
     </div>
   )

src/forge/Main/sub/sub.css

@@ -1,68 +0,0 @@
-.boxPanel {
-  width: 1200px;
-  margin: 20px auto;
-  border-radius: 4px;
-  border: 1px solid #eee;
-  min-height: 500px;
-}
-.boxPanel .contrbuteList {
-  display: flex;
-  flex-wrap: wrap;
-  padding: 20px;
-  align-items: flex-start;
-}
-.boxPanel .contrbuteList > div {
-  width: 20%;
-}
-
-.descmodal .ant-row.ant-form-item {
-  margin-bottom: 10px;
-}
-.descmodal .ant-col.ant-form-item-label {
-  height: 20px;
-  line-height: 20px;
-}
-
-.menuslist {
-  z-index: 100;
-  width: 297px;
-  background: #FFFFFF;
-  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
-  border-radius: 4px;
-}
-.menuslist .searchBox {
-  padding: 15px;
-  border-bottom: 1px solid #eee;
-}
-.menuslist .ant-anchor-wrapper {
-  margin-left: 0px;
-  padding: 5px 15px;
-  max-height: 255px !important;
-}
-.menuslist .ant-anchor-wrapper .items {
-  border-radius: 4px;
-  margin-bottom: 5px;
-  cursor: pointer;
-}
-.menuslist .ant-anchor-wrapper .items .ant-anchor-link-title {
-  color: #333333 !important;
-}
-.menuslist .ant-anchor-wrapper .items:hover {
-  background-color: #F3F4F6;
-}
-.menuslist .ant-anchor-wrapper .items.active {
-  background-color: #2A61FF;
-}
-.menuslist .ant-anchor-wrapper .items.active .ant-anchor-link-title {
-  color: #fff !important;
-}
-.menuslist .ant-anchor-wrapper .ant-anchor-link {
-  padding: 0px;
-  height: 30px;
-  line-height: 30px;
-}
-.menuslist .ant-anchor-wrapper .ant-anchor-ink::before {
-  background-color: #fff;
-}
-
-/*# sourceMappingURL=sub.css.map */

src/forge/Main/sub/sub.css.map

@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["sub.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EAIA;;AAHA;EACE;;;AAMJ;EACE;;AAEF;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AACA;EACE;;AAIN;EACE;EACA;EACA;;AAEF;EACE","file":"sub.css"}

src/forge/Merge/Commits.jsx

@@ -16,10 +16,10 @@ function Commits({ commits , projectsId , owner }){
               <div className="prInfo">
                 <FlexAJ>
                   <AlignCenter>
-                    <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                    <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
                     <p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p>
                   </AlignCenter>
-                  <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
+                  <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                 </FlexAJ>
                 <AlignCenter className="mt15">
                   <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>

src/forge/Merge/Files.jsx

@@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
                       <span>{item.name}</span>
                     </AlignCenter>
                     <span>
-                      <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
+                      <Button className="mr20" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
                       <span className="color-green">+{item.addition}</span>
                       <span className="color-red ml20">-{item.deletion}</span>
                     </span>

src/forge/Merge/MergeDetail.js

@@ -228,7 +228,7 @@ class MergeDetail extends Component {
               <div>
                 {
                   data && data.issue.user_permission ?
-                    <Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
+                    <Link to={`/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
                     : ''
                 }
               </div>
@@ -248,8 +248,8 @@ class MergeDetail extends Component {
           <div className="detailHeader-wrapper">
             <div className="normal f-wrap-between">
               <ul className="headerMenu-wrapper">
-                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
-                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
+                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
+                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
               </ul>
             </div>
           </div>

src/forge/Merge/MergeItem.js

@@ -49,7 +49,7 @@ class MergeItem extends Component {
   };
 
   render() {
-    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
     const { projectsId , owner } = this.props.match.params;
     const { current_user } = this.props;
     const renderList = () => {
@@ -62,7 +62,7 @@ class MergeItem extends Component {
                 <p className="mb15 df" style={{ alignItems: "center" }}>
                   <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
                   <Link
-                    to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                    to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                     className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
                     style={{ maxWidth: "300px" }}
                   >
@@ -78,7 +78,7 @@ class MergeItem extends Component {
                 </p>
                 <p className="grid-item font-13">
                   <Link
-                    to={`/users/${item && item.author_login}`}
+                    to={`/${item && item.author_login}`}
                     className="show-user-link"
                   >
                     <img
@@ -91,7 +91,7 @@ class MergeItem extends Component {
                   </Link>
                   <AlignCenter>
                     <Link
-                      to={`/users/${item && item.author_login}`}
+                      to={`/${item && item.author_login}`}
                       className="show-user-link color-grey-8 ml5"
                     >
                       {item && item.author_name}
@@ -109,7 +109,7 @@ class MergeItem extends Component {
                         item.pull_request_head &&
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
+                            to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {item.is_original
@@ -133,7 +133,7 @@ class MergeItem extends Component {
                         item.pull_request_base && 
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
+                            to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
@@ -156,7 +156,7 @@ class MergeItem extends Component {
                 <li>
                   {item.assign_user_name ? (
                     <Link
-                      to={`/users/${item.assign_user_login}`}
+                      to={`/${item.assign_user_login}`}
                       className="show-user-link"
                     >
                       {item.assign_user_name}
@@ -175,7 +175,7 @@ class MergeItem extends Component {
                     {item.journals_count ? (
                       <Link
                         className="mr5 color-grey-8"
-                        to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                        to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                       >
                         <i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i>
                         {item.journals_count}
@@ -183,7 +183,7 @@ class MergeItem extends Component {
                     ) : (
                       ""
                     )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {user_admin_or_developer && item.pull_request_status === 0 ? (
                       <div
                         className="milepostleft"
                         style={{
@@ -196,7 +196,7 @@ class MergeItem extends Component {
                       >
                         <div className="grid-item mr15 color-grey-9">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
+                            to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                             className="color-grey-9"
                           >
                             <i className="iconfont icon-bianji3 font-14 mr5"></i>

src/forge/Merge/MergeSubmit.js

@@ -100,7 +100,7 @@ class MergeSubmit extends Component{
         width:"10%",
         render: (text,item) => (
           <span className="f-wrap-alignCenter">
-            <Link to={`/users/${item.login}`} className="show-user-link">
+            <Link to={`/${item.login}`} className="show-user-link">
                 <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
           <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
           </Link>
@@ -110,7 +110,7 @@ class MergeSubmit extends Component{
         title:"SHA",
         dataIndex: 'sha',
         render: (text) => (
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
+          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
         )
       },{
         title:"备注",

src/forge/Merge/MessageCount.js

@@ -361,7 +361,7 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
+                            to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
                             className="ver-middle"
                           >
                             {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
@@ -376,7 +376,7 @@ class MessageCount extends Component {
                         </span>
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${data.pull_request.base}`}
+                            to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
                             className="ver-middle"
                           >
                             {data.issue.project_author_name}:{data.pull_request.base}
@@ -386,14 +386,14 @@ class MessageCount extends Component {
                     }
 
                     <div className="mt15">
-                      <Link to={`/users/${data.issue.author_login}`} className="show-user-link">
+                      <Link to={`/${data.issue.author_login}`} className="show-user-link">
                         <img className="mr5" src={getImageUrl(`/${data.issue.author_picture}`)}
                           alt="" width="24" height="24" style={{borderRadius:"50%"}}
                         />
                       </Link>
                       <span className="ver-middle">
                         <span className="color-grey-8 mr5">由</span>
-                        <Link to={`/users/${data.issue.author_login}`} className="show-user-link color-blue">
+                        <Link to={`/${data.issue.author_login}`} className="show-user-link color-blue">
                           {data.issue.author_name}
                         </Link>
                         <span className="ml5 color-grey-8">
@@ -408,7 +408,7 @@ class MessageCount extends Component {
                           <span className="color-grey-8">审查人员：</span>
                           {data.issue.assign_user_name ? (
                             <Link
-                              to={`/users/${data.issue.assign_user_login}`}
+                              to={`/${data.issue.assign_user_login}`}
                               className="show-user-link color-blue"
                             >
                               {data.issue.assign_user_name}
@@ -424,7 +424,7 @@ class MessageCount extends Component {
                           </span>
                         </span>
                         <span className="ml25">
-                          <span className="color-grey-8">标签：</span>
+                          <span className="color-grey-8">标记：</span>
                           <span className="color-grey-3">
                             {data.issue.issue_tags &&
                             data.issue.issue_tags.length > 0
@@ -448,7 +448,7 @@ class MessageCount extends Component {
                             type="green"
                             ghost
                             className="ml20"
-                            onClick={()=>{this.props.history.push(`/projects/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
+                            onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
                           >
                             编辑
                           </Button>

src/forge/Merge/NewMerge.js

@@ -48,8 +48,10 @@ class NewMerge extends Component {
       this.compareProject(this.state.id,pull,"master");
     }
   }
+
   // 页面销毁取消监听 
   componentWillUnmount () {
+    console.log('----------destoyed---------');
     window.removeEventListener('popstate', this.handleBack, false);
   };
 
@@ -60,8 +62,11 @@ class NewMerge extends Component {
 
   //获取新建分支数据
   getmergelist = (projectsId) => {
-    this.setState({isSpin: true})
-    const { owner } = this.props.match.params;
+    this.setState({isSpin: true});
+    // const { owner } = this.props.match.params;
+    let owner =this.props.history.location.pathname.split('/')[1];
+    console.log('owner:'+owner);
+    console.log(this.props);
     const url = `/${owner}/${projectsId}/pulls/new.json`;
     axios
       .get(url)
@@ -186,7 +191,7 @@ class NewMerge extends Component {
     // this.ischeckmerge();
     let { id ,merge , pull } = this.state;
     if(type==="pull"){
-      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
+      this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
       this.compareProject(id,value,merge);
     }else{
       this.compareProject(id,pull,value);
@@ -208,7 +213,7 @@ class NewMerge extends Component {
         merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
       }
     })
-    this.props.history.push(`/projects/${login}/${identifier}/pulls/new`);
+    this.props.history.push(`/${login}/${identifier}/pulls/new`);
     this.newMergelist(login,identifier);
   };
 
@@ -264,7 +269,9 @@ class NewMerge extends Component {
       show_message,
       default_message,
       merge_head,
-      projects_names,id,comparesData
+      projects_names,
+      id,
+      comparesData
     } = this.state;
     
     const renderBrances = (list, type) => {
@@ -298,6 +305,7 @@ class NewMerge extends Component {
       return <div dangerouslySetInnerHTML={{ __html: html }}></div>;
     };
     let { project } = this.props;
+
     return (
       <div>
         <div className="main">

src/forge/Merge/merge.js

@@ -4,10 +4,11 @@ import "./merge.css";
 import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
-import OrderItem from "./MergeItem";
+import MergeItem from "./MergeItem";
 import './Index.scss';
 
 import axios from "axios";
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 const Search = Input.Search;
 /**
@@ -42,7 +43,7 @@ class merge extends Component {
       //设置选择高亮
       openselect: 1,
       closeselect: undefined,
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       fixed_version_ids: "里程碑",
       assigned_to_ids: "审查人员",
       paix: "排序",
@@ -197,7 +198,7 @@ class merge extends Component {
     });
     this.setState({
       status_type: type,
-      issue_tag_ids: "标签",
+      issue_tag_ids: "标记",
       fixed_version_ids: "里程碑",
       assigned_to_ids: "审查人员",
       paix: "排序",
@@ -212,7 +213,7 @@ class merge extends Component {
 
   checkOperation() {
     const { projectsId,owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
+    this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
   }
   render() {
     const { projectsId , owner } = this.props.match.params;
@@ -255,10 +256,10 @@ class merge extends Component {
             />
           </div>
           {
-            data && data.user_admin_or_member &&
-            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
+            data && data.user_admin_or_developer &&
+            <CheckProfile {...this.props} className="topWrapper_btn ml10" sureFunc={() => this.checkOperation()}>
               +&nbsp;新建合并请求
-            </a>
+            </CheckProfile>
           }
         </div>
         <div className="f-wrap-between screenWrap">
@@ -320,7 +321,7 @@ class merge extends Component {
                 className="topWrapperSelect"
                 overlay={this.renderMenu(
                   issue_chosen && issue_chosen.issue_tag,
-                  "标签",
+                  "标记",
                   "issue_tag_id"
                 )}
                 trigger={["click"]}
@@ -387,7 +388,7 @@ class merge extends Component {
           <Spin spinning={isSpin}>
             {data && data.search_count && data.search_count > 0 ? (
               <div>
-                <OrderItem
+                <MergeItem
                   issues={issues}
                   search_count={search_count}
                   page={select_params.page}
@@ -396,8 +397,8 @@ class merge extends Component {
                   project_author_name={data.project_author_name}
                   {...this.props}
                   {...this.state}
-                  user_admin_or_member={data && data.user_admin_or_member}
-                ></OrderItem>
+                  user_admin_or_developer={data && data.user_admin_or_developer}
+                ></MergeItem>
               </div>
             ):""}
             {search_count > select_params.limit ? (

src/forge/Merge/merge_form.js

@@ -165,7 +165,7 @@ class MergeForm extends Component {
               this.setState({
                 isSpin: false,
               });
-              this.props.history.push(`/projects/${owner}/${projectsId}/pulls`);
+              this.props.history.push(`/${owner}/${projectsId}/pulls`);
               const { getDetail } = this.props;
               getDetail && getDetail();
             } else {
@@ -195,7 +195,7 @@ class MergeForm extends Component {
                 isSpin: false,
               });
               this.props.history.push(
-                `/projects/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
+                `/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
               );
             } else {
               this.setState({
@@ -287,7 +287,7 @@ class MergeForm extends Component {
                     type="default"
                     className="ml30"
                     onClick={()=>{
-                      this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`)
+                      this.props.history.push(merge_type === "new" ? `/${owner}/${projectsId}/pulls` : `/${owner}/${projectsId}/pulls/${mergeId}/detail`)
                     }}
                   >
                     <span className="plr10">取消</span>
@@ -300,7 +300,8 @@ class MergeForm extends Component {
                     {getFieldDecorator("assigned_to_id", {
                       initialValue: assigned_to_id,
                     })(
-                      <Select placeholder="审查人员" showSearch>
+                      <Select placeholder="未选择审查人员" showSearch>
+                        <Option key={0} value={""}>未选择审查人员</Option>
                         {this.renderSelect(members)}
                       </Select>
                     )}
@@ -311,12 +312,11 @@ class MergeForm extends Component {
                     })(
                       <Select
                         placeholder={
-                          issue_versions && issue_versions.length > 0
-                            ? "未选择里程碑"
-                            : "请添加里程碑"
+                          issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"
                         }
                         showSearch
                       >
+                        <Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option>
                         {this.renderSelect(issue_versions)}
                       </Select>
                     )}
@@ -327,12 +327,11 @@ class MergeForm extends Component {
                     })(
                       <Select
                         placeholder={
-                          issue_tags && issue_tags.length > 0
-                            ? "未选择标签"
-                            : "请在仓库设置里添加标签"
+                          issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"
                         }
                         showSearch
                       >
+                        <Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option>
                         {this.renderSelect(issue_tags)}
                       </Select>
                     )}

src/forge/Merge/no_data.js

@@ -12,7 +12,7 @@ class Nodata extends Component{
           <h3>欢迎使用合并请求！</h3>
         
           <div className="color-grey-8">
-          合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/projects/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
+          合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
           </div>
         </div>
       </div>

src/forge/New/Index.js

@@ -1,10 +1,11 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete } from 'antd';
+import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete, Modal } from 'antd';
 import { Base64 } from 'js-base64';
+import { AlignCenter } from '../Component/layout';
 
 import '../css/index.scss';
-import './new.css'
+import './new.scss'
 
 import axios from 'axios';
 const Option = Select.Option;
@@ -44,7 +45,12 @@ class Index extends Component {
       project_category_name: undefined,
       license_name: undefined,
       ignore_name: undefined,
-      descNum:0
+      descNum:0,
+
+      categoreFlag:false,
+      languageFlag:false,
+      ignoreFlag:false,
+      licenseFlag:false,
     }
   }
   componentDidMount = () => {
@@ -58,6 +64,8 @@ class Index extends Component {
     this.getGitignore();
     // 获取开源许可证
     this.getLicenses();
+    //判断是否为删除新建项目失败后返回，并执行对应逻辑
+    this.isDeleteProjectBack();
   }
   componentDidUpdate=(prevPros)=>{
     if(prevPros && this.props && !this.props.checkIfLogin()){
@@ -69,6 +77,7 @@ class Index extends Component {
   getOwner=()=>{
     const { OIdentifier } = this.props.match.params;
     const { user_id } = this.props && this.props.current_user;
+    
     const url = `/owners.json`;
     axios.get(url).then(result=>{
       if(result && result.data){
@@ -77,16 +86,13 @@ class Index extends Component {
           OwnerList: owner,
         })
         if(OIdentifier){
-          owner = owner.filter(item=>item.name === OIdentifier);
-          this.props.form.setFieldsValue({
-            user_id:OIdentifier
-          })
+          owner = owner.filter(item=>item.login === OIdentifier);
         }else if(user_id){
           owner = owner.filter(item=>item.id === user_id);
-          this.props.form.setFieldsValue({
-            user_id:owner && owner[0].name
-          })
         }
+        this.props.form.setFieldsValue({
+          user_id:owner && owner[0].name
+        })
         owner && this.setState({
           owners_id:owner[0].id,
           owners_name:owner[0].name
@@ -144,6 +150,31 @@ class Index extends Component {
     }).catch((error) => { })
   }
 
+  isDeleteProjectBack = () => {
+    let mirror_status = this.props.history.location.mirror_status;
+    if (mirror_status === 2 && sessionStorage.newProjectValue) {
+      Modal.warning({
+        title: '警告',
+        content: '项目导入失败！请按操作规范重新导入项目！',
+      });
+      let newProjectValue = JSON.parse(sessionStorage.newProjectValue);
+      if (newProjectValue) {
+        this.setState({
+          project_language_id: newProjectValue.project_language_id,
+          project_category_id: newProjectValue.project_category_id,
+          license_id: newProjectValue.license_id,
+          ignore_id: newProjectValue.ignore_id
+        });
+        delete newProjectValue.project_language_id;
+        delete newProjectValue.project_category_id;
+        delete newProjectValue.license_id;
+        delete newProjectValue.ignore_id;
+        this.props.form.setFieldsValue(newProjectValue);
+      }
+
+    }
+  }
+
   // 设置option
   setOptionsList = (data, _head, name) => {
     if (data && data.length > 0) {
@@ -164,35 +195,40 @@ class Index extends Component {
 
   subMitFrom = () => {
     this.props.form.validateFieldsAndScroll((err, values) => {
+      console.log(values);
       if (!err) {
         this.setState({
           isSpin: true
         })
         const { projectsType } = this.props.match.params;
-        const { project_language_id, project_category_id, license_id, ignore_id , owners_id , owners_name } = this.state;
+        const { 
+          project_language_id, project_category_id, license_id, ignore_id , owners_id , 
+          ignoreFlag,licenseFlag,categoreFlag,languageFlag
+        } = this.state;
         const decoderPass = Base64.encode(values.password);
         const url = (projectsType && projectsType === "mirror") ? "/projects/migrate.json" : "/projects.json";
+        // 新建项目的时候，暂存数据，如果失败，返回的时候可以重新赋值
+        sessionStorage.newProjectValue=JSON.stringify({...values,project_language_id,project_category_id,license_id,ignore_id});
         axios.post(url, {
           ...values,
           auth_password:decoderPass,
-          project_language_id,
-          project_category_id,
-          license_id,
-          ignore_id,
+          project_language_id:languageFlag ? project_language_id : undefined,
+          project_category_id:categoreFlag ? project_category_id : undefined,
+          license_id:licenseFlag ? license_id : undefined,
+          ignore_id:ignoreFlag ? ignore_id : undefined,
           user_id:owners_id
         }).then((result) => {
           if (result && result.data.id) {
-            this.setState({
-              isSpin: false
-            })
-            this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
-            this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
+            projectsType && projectsType !== "mirror" && this.props.showNotification(`项目创建成功!`);
+            this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
           }
+          this.setState({
+            isSpin: false
+          })
         }).catch((error) => {
           this.setState({
             isSpin: false
           })
-          console.log(error);
         })
       } else {
         this.setState({
@@ -287,48 +323,35 @@ class Index extends Component {
 
       mirrorCheck,
 
-      descNum
+      descNum,
+
+      ignoreFlag,
+      licenseFlag,
+      languageFlag,
+      categoreFlag
     } = this.state;
     return (
       <div className="main back-white" style={{padding:"0px",border:"none"}}>
         <div className="newPanel">
-          <div className="newPanel_title">创建{projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目</div>
+          <div className="newPanel_title">{projectsType && projectsType === "mirror" ? "导入" : "新建"}项目</div>
           <Spin spinning={isSpin}>
             <Form>
               <div className="newPanel_content">
-                <Form.Item
-                  label="拥有者"
-                >
-                  {getFieldDecorator('user_id', {
-                    rules: [{
-                      required: true, message: '请选择拥有者'
-                    },{
-                      validator:(rule, value, callback) => this.checkId(rule, value, callback, OwnerList, '拥有者')
-                    }],
-                  })(
-                    <AutoComplete 
-                      placeholder="请选择拥有者"
-                      onChange={(value, e) => this.ChangePlatform(value, e, 'owners', OwnerList)}
-                      className="plateAutoComplete"
-                      onBlur={(value) => this.blurCategory(value, OwnerList, "owners")}
-                      >
-                      {owners_list}
-                    </AutoComplete>
-                  )}
-                </Form.Item>
-                {
+
+              {
                   projectsType && projectsType === "mirror" &&
                   <React.Fragment>
                     <Form.Item
-                      label="镜像版本库地址"
+                      label="导入仓库URL"
                       style={{ marginBottom: "0px" }}
+                      colon={false}
                     >
                       {getFieldDecorator('clone_addr', {
                         rules: [{
                           required: true, message: '请填写镜像版本库地址'
                         }],
                       })(
-                        <Input placeholder="输入需要同步到本项目的镜像版本库地址" onChange={this.ChangeAddr} />
+                        <Input placeholder="请输入需要导入到本项目的仓库地址" onChange={this.ChangeAddr} />
                       )}
                     </Form.Item>
                     <p className="formTip color-orange">示例：https://github.com/facebook/reack.git</p>
@@ -336,12 +359,16 @@ class Index extends Component {
                 }
                 {
                   projectsType && projectsType === "mirror" &&
-                  <React.Fragment>
-                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>需要授权验证<i className={mirrorCheck?"iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i></p>
+                  <div className="pb10">
+                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>
+                      需要授权验证<i className={mirrorCheck ? "iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i>
+                      <span className="ml20 font-12 color-red">如果导入项目为私有仓库，则必须填写相应平台正确的用户名和密码</span>
+                    </p>
                     {
                       mirrorCheck &&
-                      <div className="df mb20" style={{alignItems:'center'}}>
+                      <div className="df mb10" style={{alignItems:'center'}}>
                         <span className="mr10">用户名</span>
+                        <input type="password" style={{display:"none"}} />
                         <Form.Item
                           style={{ marginBottom: "0px" }}
                           label=""
@@ -355,153 +382,153 @@ class Index extends Component {
                         <span className="mr10">密码</span>
                         <Form.Item
                           style={{ marginBottom: "0px" }}
-                          label=""
                         >
                           {getFieldDecorator('password', {
                             rules: [],
                           })(
-                            <Input placeholder="请输入对应平台的登录密码" type="password" style={{width:"240px"}}/>
+                            <Input.Password placeholder="请输入对应平台的登录密码" autocomplete='new-password' style={{width:"240px"}}/>
                           )}
                         </Form.Item>
                       </div>
                     }
-                  </React.Fragment>
+                  </div>
                 }
+                <AlignCenter>
+                  <Form.Item
+                    label="拥有者"
+                    style={{width:"260px"}}
+                    colon={false}
+                    className="explainPos"
+                  >
+                    {getFieldDecorator('user_id', {
+                      rules: [{
+                        required: true, message: '请选择拥有者'
+                      },{
+                        validator:(rule, value, callback) => this.checkId(rule, value, callback, OwnerList, '拥有者')
+                      }],
+                    })(
+                      <AutoComplete 
+                        style={{width:"260px",height:"35px"}}
+                        placeholder="请选择拥有者"
+                        onChange={(value, e) => this.ChangePlatform(value, e, 'owners', OwnerList)}
+                        className="plateAutoComplete"
+                        onBlur={(value) => this.blurCategory(value, OwnerList, "owners")}
+                        >
+                        {owners_list}
+                      </AutoComplete>
+                    )}
+                  </Form.Item>
+                  <span className="ml10 mr10 mt10 font-18">/</span>
+                  <Form.Item
+                    label="项目名称"
+                    className="flex1 explainPos"
+                    colon={false}
+                  >
+                    {getFieldDecorator('name', {
+                      rules: [{
+                        required: true, message: '请填写项目名称'
+                      }],
+                    })(
+                      <Input placeholder="例如：团队协作方法与研究" maxLength={50}/>
+                    )}
+                  </Form.Item>
+                </AlignCenter>
                 <Form.Item
-                  label="项目名称"
+                  label={<span>项目标识 <span className="color-grey-9">(项目url标识部分)</span></span>}
+                  colon={false}
                 >
-                  {getFieldDecorator('name', {
+                  {getFieldDecorator('repository_name', {
                     rules: [{
-                      required: true, message: '请填写项目名称'
+                      required: true, message: '请填写项目标识'
                     }],
                   })(
-                    <Input placeholder="例如：团队协作方法与研究" maxLength={50}/>
+                    <Input placeholder="项目标识请使用与项目相关的英文关键字" maxLength={100} />
                   )}
                 </Form.Item>
                 <div className="pr">
                   <span className="toprightNum">{descNum}/200</span>
                   <Form.Item
                     label="项目简介"
+                    colon={false}
+                    style={{marginBottom:"0px"}}
                   >
                     {getFieldDecorator('description', {
-                      rules: [{
-                        required: true, message: '请填写项目简介'
-                      }],
+                      rules: [],
                     })(
                       <Input.TextArea maxLength={200} placeholder="项目的介绍" autoSize={{ minRows: 2, maxRows: 6 }} onChange={this.changeDesc}/>
                     )}
                   </Form.Item>
                 </div>
-                <Form.Item
-                  label="仓库名称"
-                >
-                  {getFieldDecorator('repository_name', {
-                    rules: [{
-                      required: true, message: '请填写仓库名称'
-                    }],
-                  })(
-                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" maxLength={100} />
-                  )}
-                </Form.Item>
-                <Form.Item
-                  label="项目类别"
-                >
-                  {getFieldDecorator('project_category', {
-                    rules: [{
-                      required: true, message: '请选择大类别',
-                    }, {
-                      validator: (rule, value, callback) => this.checkId(rule, value, callback, CategoryList, '项目类别')
-                    }],
-                  })(
-                    <AutoComplete
-                      placeholder="请选择项目类别"
-                      onChange={(value, e) => this.ChangePlatform(value, e, 'project_category', CategoryList)}
-                      className="plateAutoComplete"
-                      onBlur={(value) => this.blurCategory(value, CategoryList, "project_category")}
-                    >
-                      {project_category_list}
-                    </AutoComplete>
-                  )}
-                </Form.Item>
-                <Form.Item
-                  label="项目语言"
-                >
-                  {getFieldDecorator('project_language', {
-                    rules: [{
-                      required: true, message: '请选择项目语言'
-                    }, {
-                      validator: (rule, value, callback) => this.checkId(rule, value, callback, LanguageList, '项目语言')
-                    }],
-                  })(
-                    <AutoComplete
-                      placeholder="请选择项目语言"
-                      onChange={(value, e) => this.ChangePlatform(value, e, 'project_language', LanguageList)}
-                      className="plateAutoComplete"
-                      onBlur={(value) => this.blurCategory(value, LanguageList, "project_language")}
-                    >
-                      {project_language_list}
-                    </AutoComplete>
-                  )}
-                </Form.Item>
+                
                 {
                   (projectsType === "deposit" || !projectsType) &&
                   <React.Fragment>
                     <Form.Item
-                      label=".gitignore"
+                      className="privatePart"
                     >
-                      {getFieldDecorator('ignore', {
-                        rules: [{
-                          required: true, message: '请选择gitignore'
-                        }, {
-                          validator: (rule, value, callback) => this.checkId(rule, value, callback, GitignoreList, 'gitignore')
-                        }],
-                      })(
-                        <AutoComplete
-                          placeholder="请选择gitignore，用来定义哪些文件不需要添加到版本管理中"
-                          onChange={(value, e) => this.ChangePlatform(value, e, 'ignore', GitignoreList)}
-                          className="plateAutoComplete"
-                          onBlur={(value) => this.blurCategory(value, GitignoreList, "ignore")}
-                        >
-                          {ignore_list}
-                        </AutoComplete>
+                      {getFieldDecorator('ignoreFlag')(
+                        <Checkbox checked={ignoreFlag} onChange={(e)=>this.setState({ignoreFlag:e.target.checked})}>.gitignore</Checkbox>
                       )}
                     </Form.Item>
+                    { ignoreFlag &&
+                      <Form.Item>
+                        {getFieldDecorator('ignore', {
+                          rules: [{
+                            required: ignoreFlag, message: '请选择gitignore'
+                          }, {
+                            validator: (rule, value, callback) => this.checkId(rule, value, callback, GitignoreList, 'gitignore')
+                          }],
+                        })(
+                          <AutoComplete
+                            placeholder="请选择gitignore，用来定义哪些文件不需要添加到版本管理中"
+                            onChange={(value, e) => this.ChangePlatform(value, e, 'ignore', GitignoreList)}
+                            className="plateAutoComplete"
+                            onBlur={(value) => this.blurCategory(value, GitignoreList, "ignore")}
+                          >
+                            {ignore_list}
+                          </AutoComplete>
+                        )}
+                      </Form.Item>
+                    }
                     <Form.Item
-                      label="开源许可证"
+                      className="privatePart"
                     >
-                      {getFieldDecorator('license', {
-                        rules: [{
-                          required: true, message: '请选择开源许可证'
-                        }, {
-                          validator: (rule, value, callback) => this.checkId(rule, value, callback, LicensesList, '开源许可证')
-                        }],
-                      })(
-                        <AutoComplete
-                          placeholder="请选择开源许可证"
-                          onChange={(value, e) => this.ChangePlatform(value, e, 'license', LicensesList)}
-                          className="plateAutoComplete"
-                          onBlur={(value) => this.blurCategory(value, LicensesList, "license")}
-                        >
-                          {license_list}
-                        </AutoComplete>
+                      {getFieldDecorator('licenseFlag')(
+                        <Checkbox checked={licenseFlag} onChange={(e)=>this.setState({licenseFlag:e.target.checked})}>开源许可证</Checkbox>
                       )}
                     </Form.Item>
+                    { licenseFlag &&
+                      <Form.Item>
+                        {getFieldDecorator('license', {
+                          rules: [{
+                            required: licenseFlag, message: '请选择开源许可证'
+                          }, {
+                            validator: (rule, value, callback) => this.checkId(rule, value, callback, LicensesList, '开源许可证')
+                          }],
+                        })(
+                          <AutoComplete
+                            placeholder="请选择开源许可证"
+                            onChange={(value, e) => this.ChangePlatform(value, e, 'license', LicensesList)}
+                            className="plateAutoComplete"
+                            onBlur={(value) => this.blurCategory(value, LicensesList, "license")}
+                          >
+                            {license_list}
+                          </AutoComplete>
+                        )}
+                      </Form.Item>
+                    }
                   </React.Fragment>
                 }
                 <Form.Item
-                  label="可见性"
-                  style={{ margin: "0px" }}
                   className="privatePart"
                 >
                   {getFieldDecorator('private')(
-                    <Checkbox value="limit">将项目设为私有<span className="ml15 font-13 color-grey-9">(只有项目所有人或拥有权限的项目成员才能看到)</span></Checkbox>
+                    <Checkbox value="limit">将项目设为私有<span className="font-13 color-grey-9">(只有项目所有人或拥有权限的项目成员才能看到)</span></Checkbox>
                   )}
                 </Form.Item >
                 {
                   projectsType && projectsType === "mirror" &&
                   <Form.Item
-                    label="迁移类型："
-                    style={{ margin: "0px" }}
                     className="privatePart"
                   >
                     {getFieldDecorator('is_mirror')(
@@ -509,12 +536,69 @@ class Index extends Component {
                     )}
                   </Form.Item >
                 }
-                <div>
+                <Form.Item
+                  style={{ margin: "0px" }}
+                  className="privatePart"
+                >
+                  {getFieldDecorator('categoreFlag')(
+                    <Checkbox checked={categoreFlag} onChange={(e)=>this.setState({categoreFlag:e.target.checked})}>项目类别</Checkbox>
+                  )}
+                </Form.Item>
+                {categoreFlag &&
+                    <Form.Item
+                    className="privatePart"
+                    >
+                      {getFieldDecorator('project_category', {
+                        rules: [{
+                          required: categoreFlag, message: '请选择项目类别',
+                        }, {
+                          validator: (rule, value, callback) => this.checkId(rule, value, callback, CategoryList, '项目类别')
+                        }],
+                      })(
+                        <AutoComplete
+                          placeholder="请选择项目类别"
+                          onChange={(value, e) => this.ChangePlatform(value, e, 'project_category', CategoryList)}
+                          className="plateAutoComplete"
+                          onBlur={(value) => this.blurCategory(value, CategoryList, "project_category")}
+                        >
+                          {project_category_list}
+                        </AutoComplete>
+                      )}
+                  </Form.Item>
+                }
+                <Form.Item
+                  className="privatePart"
+                >
+                  {getFieldDecorator('languageFlag')(
+                    <Checkbox checked={languageFlag} onChange={(e)=>this.setState({languageFlag:e.target.checked})}>项目语言</Checkbox>
+                  )}
+                </Form.Item>
+                {languageFlag && 
+                  <Form.Item>
+                    {getFieldDecorator('project_language', {
+                      rules: [{
+                        required: languageFlag, message: '请选择项目语言'
+                      }, {
+                        validator: (rule, value, callback) => this.checkId(rule, value, callback, LanguageList, '项目语言')
+                      }],
+                    })(
+                      <AutoComplete
+                        placeholder="请选择项目语言"
+                        onChange={(value, e) => this.ChangePlatform(value, e, 'project_language', LanguageList)}
+                        className="plateAutoComplete"
+                        onBlur={(value) => this.blurCategory(value, LanguageList, "project_language")}
+                      >
+                        {project_language_list}
+                      </AutoComplete>
+                    )}
+                  </Form.Item>
+                }
+                <div className="mt20">
                   注：<span className="ant-form-item-required"></span> 为必填项，否则为选填
                 </div>
                 <Form.Item className="formTip mt20">
-                  <Button type="primary" onClick={this.subMitFrom} className="mr20">创建项目</Button>
-                  <Link to={'/projects'} className="btn_32">取消</Link>
+                  <Button type="primary" onClick={this.subMitFrom} className="mr20">{projectsType && projectsType === "mirror" ? "导入" : "创建"}项目</Button>
+                  <Link to={'/explore'} className="btn_32">取消</Link>
                 </Form.Item>
               </div>
             </Form>

src/forge/New/new.scss

@@ -12,7 +12,13 @@
   border-bottom: 1px solid #f0f0f0
 }
 .newPanel_content{
-  padding:1rem 2rem;
+  padding:2rem;
+}
+.newPanel_content form .ant-row.ant-form-item{
+  margin-bottom: 25px;
+}
+.newPanel_content .ant-form-item-label label{
+  font-size: 16px;
 }
 .newPanel_content .ant-form-item-control-wrapper{
   flex: 1;
@@ -25,24 +31,35 @@
   height: 35px;
   line-height: 35px;
 }
-
 .newContent_inline{
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
   align-items:flex-end
 }
+.explainPos{
+  .ant-form-explain{
+    position: absolute;
+  }
+}
 
 .newContent_inline > .ant-form-item:nth-child(2){
   margin-left: 20px;
 }
-.newPanel_content .privatePart .ant-form-item-label{
-  margin-left: 0px;
+.privatePart{
+  margin-bottom: 0px!important;
+  .ant-form-item-label{
+    margin-left: 0px;
+  }
 }
 .newPanel_content .ant-form-item-label{
   line-height: 25px;
   height: 25px;
-  margin-left: -0.8rem;
+}
+.plateAutoComplete{
+  .ant-input{
+    height: 34px!important;
+  }
 }
 @media screen and (max-width: 750px){
   .newPanel_content{

src/forge/Newfile/UserSubmitComponent.js

@@ -86,7 +86,7 @@ class UserSubmitComponent extends Component {
               const { getTopCount } = this.props;
               getTopCount && getTopCount(values.branchname);
             }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+            let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
             this.props.history.push(url);
           }
         })
@@ -123,7 +123,7 @@ class UserSubmitComponent extends Component {
             this.setState({ isSpin: false });
             if (result.data && result.data.status === 1) {
               let b = currentBranch || branch;
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
+              let url = `/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
               this.props.history.push(url);
               this.props.showNotification("文件修改成功!");
             }
@@ -150,7 +150,7 @@ class UserSubmitComponent extends Component {
     return (
       <div>
         <span className="df" style={{ alignItems: "center" }}>
-          <Link to={`/users/${current_user && current_user.login}`} className="show-user-link" >
+          <Link to={`/${current_user && current_user.login}`} className="show-user-link" >
             <img
               src={getImageUrl(`/${current_user && current_user.image_url}`)}
               alt=""
@@ -248,7 +248,7 @@ class UserSubmitComponent extends Component {
             <Button
               type="primary grey"
               onClick={() => {
-                this.props.history.push(`/projects/${owner}/${projectsId}`);
+                this.props.history.push(`/${owner}/${projectsId}`);
               }}
               className="mr20"
             >

src/forge/Newfile/m_editor.js

@@ -4,12 +4,14 @@ import UserSubmitComponent from "./UserSubmitComponent";
 
 import "./index.css";
 import "./editor.css";
+import { edit } from "marked/src/helpers";
 
 class m_editor extends Component {
   constructor(props) {
     super(props);
     this.state = {
       editorValue: this.props.content,
+      prevHeight:0
     };
   }
   componentDidUpdate=(prevProps)=>{
@@ -41,19 +43,57 @@ class m_editor extends Component {
       folding: true,
       foldingStrategy: "indentation", // 代码可分小段折叠
       automaticLayout: true, // 自适应布局
-      // overviewRulerBorder: false, // 不要滚动条的边框
-      // scrollBeyondLastLine: false, // 取消代码后面一大段空白
+      overviewRulerBorder: false, // 不要滚动条的边框
+      scrollBeyondLastLine: false, // 取消代码后面一大段空白
       minimap: {
         // 不要小地图
         enabled: false,
       },
     };
+
+    const handleEditorMount = (editor, monaco) => {
+      editor.onDidChangeModelDecorations(() => {
+        updateEditorHeight(); // typing
+        requestAnimationFrame(updateEditorHeight); //folding
+      });
+
+      const updateEditorHeight = () => {
+        const editorElement = editor.getDomNode();
+
+        if (!editorElement) {
+          return;
+        }
+
+        const padding = 40;
+
+        const lineHeight = editor.getOption(
+          monaco.editor.EditorOption.lineHeight
+        );
+        const lineCount = editor.getModel().getLineCount() || 1;
+        const height = 
+            editor.getTopForLineNumber(lineCount + 1) +
+            lineHeight +
+            padding;
+            
+            if (this.state.prevHeight !== height) {
+              this.serState({
+                prevHeight:height
+              })
+              // setPrevHeight(height);
+              editorElement.style.height = `${height}px`;
+              editor.layout();
+            }
+      };
+    };
+
     return (
+
+
       <React.Fragment>
         <div>
-          <div className="branchTable" style={{border:"1px solid #eee"}}>
+          <div className="">
             <Editor
-              height="400px"
+              // height={this.state.x}
               language={language ? language : "plaintext"}
               theme={"vs-grey"}
               placeholder="请输入内容"
@@ -61,6 +101,7 @@ class m_editor extends Component {
               options={editor_options}
               onChange={this.changeEditor}
               editorWillMount={this.editorWillMount}
+              editorDidMount={handleEditorMount}
             />
           </div>
             {!readOnly && (

src/forge/Notice/Apply.jsx

@@ -63,11 +63,11 @@ function Apply(props) {
               {
                 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>
+                    <li key={k}>
+                      <Link to={`/${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.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                          <Link to={`/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
                           <span className="color-grey-9">{i.time_ago}</span>
                         </p>
                         <FlexAJ>