Gitlink
/
forgeplus-react
32
0
Fork 29
Code Issues Pull Requests 1 Releases 1 Wiki Activity

修改commit的链接地址

This commit is contained in:
sylor_huang@126.com 2020-04-02 17:54:23 +08:00
parent f511e85d38
commit f6dba27d8a
2 changed files with 75 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
.idea/workspace.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="" /> <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -11,24 +14,30 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js"> <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="-3676">
<caret line="594" lean-forward="true" selection-start-line="594" selection-end-line="594" /> <caret line="15" column="26" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
<folding> <folding>
<element signature="e#0#40#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="596">
<caret line="237" column="13" selection-start-line="237" selection-start-column="13" selection-end-line="237" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>.map((item,key)</find>
<find>评论成</find>
<find>没有</find>
<find>创建工单</find> <find>创建工单</find>
<find>可读权限</find> <find>可读权限</find>
<find>sub_entries</find> <find>sub_entries</find>
@ -50,12 +59,15 @@
<find>orderid</find> <find>orderid</find>
<find>deletedetail</find> <find>deletedetail</find>
<find>onMouseMove</find> <find>onMouseMove</find>
<find>commitKey</find>
<find>TextArea</find> <find>TextArea</find>
<find>body</find> <find>body</find>
<find>该合并请求可以进行自动合并操作</find> <find>该合并请求可以进行自动合并操作</find>
<find>title</find> <find>title</find>
<find>changbodypr</find> <find>changbodypr</find>
<find>&lt;Select</find>
<find>commitKey</find>
<find>CoderRootDirectorytext</find>
<find>CoderRootDirectory</find>
</findStrings> </findStrings>
<dirStrings> <dirStrings>
<dir>$PROJECT_DIR$</dir> <dir>$PROJECT_DIR$</dir>
@ -80,7 +92,6 @@
<option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" /> <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" /> <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" /> <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
<option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" /> <option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" /> <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
@ -103,6 +114,8 @@
<option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" /> <option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
<option value="$PROJECT_DIR$/src/forge/Branch/branch.css" /> <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" /> <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js" />
</list> </list>
</option> </option>
</component> </component>
@ -139,7 +152,7 @@
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" /> <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="forge" type="462c0819:PsiDirectoryNode" /> <item name="forge" type="462c0819:PsiDirectoryNode" />
<item name="Merge" type="462c0819:PsiDirectoryNode" /> <item name="Main" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
@ -195,18 +208,18 @@
<workItem from="1585217834609" duration="4000" /> <workItem from="1585217834609" duration="4000" />
<workItem from="1585217980103" duration="3406000" /> <workItem from="1585217980103" duration="3406000" />
<workItem from="1585288258489" duration="17495000" /> <workItem from="1585288258489" duration="17495000" />
<workItem from="1585732642767" duration="10719000" /> <workItem from="1585732642767" duration="11458000" />
<workItem from="1585817691582" duration="1461000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="63255000" /> <option name="totallyTimeSpent" value="65455000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" /> <frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.17095852" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17095852" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -219,7 +232,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <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="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" /> <window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.48433736" /> <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.36506024" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <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" id="Ant Build" order="1" weight="0.25" />
@ -281,16 +294,6 @@
</option> </option>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="87">
<caret line="97" column="23" selection-start-line="97" selection-start-column="23" selection-end-line="97" selection-end-column="23" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/AppConfig.js"> <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281"> <state relative-caret-position="281">
@ -394,20 +397,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="137" column="7" selection-start-line="137" selection-start-column="7" selection-end-line="137" selection-end-column="7" />
<folding>
<element signature="e#1439#2512#0" />
<element signature="e#2533#2593#0" />
<element signature="e#2616#2676#0" />
<element signature="e#2694#2754#0" />
<element signature="e#2875#2951#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.js"> <entry file="file://$PROJECT_DIR$/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="221">
@ -713,25 +702,56 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js"> <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282"> <state relative-caret-position="337">
<caret line="241" column="69" lean-forward="true" selection-start-line="241" selection-start-column="69" selection-end-line="241" selection-end-column="69" /> <caret line="179" column="36" lean-forward="true" selection-start-line="179" selection-start-column="36" selection-end-line="179" selection-end-column="36" />
<folding>
<element signature="e#0#42#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="206">
<caret line="594" lean-forward="true" selection-start-line="594" selection-end-line="594" />
<folding> <folding>
<element signature="e#0#40#0" expanded="true" /> <element signature="e#0#40#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
<caret line="343" column="18" selection-start-line="343" selection-start-column="18" selection-end-line="343" selection-end-column="18" />
<folding>
<element signature="e#0#40#0" expanded="true" />
<element signature="e#1439#2512#0" />
<element signature="e#2533#2593#0" />
<element signature="e#2616#2676#0" />
<element signature="e#2694#2754#0" />
</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="342">
<caret line="601" column="33" lean-forward="true" selection-start-line="601" selection-start-column="33" selection-end-line="601" selection-end-column="33" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="596">
<caret line="237" column="13" selection-start-line="237" selection-start-column="13" selection-end-line="237" selection-end-column="13" />
</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="-3676">
<caret line="15" column="26" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

3
src/forge/Main/CoderRootDirectory.js
View File

@ -237,7 +237,8 @@ class CoderRootDirectory extends Component{
</React.Fragment> </React.Fragment>
:"" :""
} }
<Link to={``} className="commitKey">{truncateCommitId(branchLastCommit.last_commit.id)}</Link> <span className="commitKey">{truncateCommitId(branchLastCommit.last_commit.id)}</span>
{/*<Link to={``} className="commitKey">{truncateCommitId(branchLastCommit.last_commit.id)}</Link>*/}
<span className="color-blue flex-1 hide-1">{branchLastCommit.last_commit.message}</span> <span className="color-blue flex-1 hide-1">{branchLastCommit.last_commit.message}</span>
<span>{branchLastCommit.last_commit.time_from_now}</span> <span>{branchLastCommit.last_commit.time_from_now}</span>
</div> </div>