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

修改合并请去的show页面样式

This commit is contained in:
sylor_huang@126.com 2020-04-24 16:38:49 +08:00
parent 85101486e5
commit bbf36127d6
2 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
.idea/workspace.xml
View File

@ -3,6 +3,7 @@
<component name="ChangeListManager">
<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/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -47,11 +48,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="54" column="64" selection-start-line="54" selection-start-column="64" selection-end-line="54" selection-end-column="64" />
<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>
@ -60,19 +61,26 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.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 relative-caret-position="160">
<caret line="281" column="43" selection-start-line="281" selection-start-column="39" selection-end-line="281" selection-end-column="43" />
<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/Main/list.css">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
<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 relative-caret-position="63">
<caret line="801" column="24" selection-start-line="801" selection-start-column="24" selection-end-line="801" selection-end-column="24" />
<folding>
<element signature="e#0#40#0" expanded="true" />
<element signature="e#20990#26927#0" />
</folding>
</state>
</provider>
</entry>
@ -81,7 +89,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>fork f</find>
<find>fork_project_user_name</find>
<find>reposit</find>
<find>linenums</find>
@ -111,6 +118,7 @@
<find>headerMenu-wrapper</find>
<find>对话</find>
<find>issueNo</find>
<find>f-wrap-between</find>
</findStrings>
<replaceStrings>
<replace>任务</replace>
@ -180,9 +188,9 @@
<option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
<option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/Main/list.css" />
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
<option value="$PROJECT_DIR$/src/forge/Order/order.css" />
<option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
</list>
</option>
</component>
@ -229,7 +237,7 @@
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="forge" type="462c0819:PsiDirectoryNode" />
<item name="Order" type="462c0819:PsiDirectoryNode" />
<item name="Merge" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@ -323,7 +331,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="197444000" />
<option name="totallyTimeSpent" value="198738000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
@ -340,9 +348,9 @@
<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" weight="0.5337349" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.713253" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="9" sideWeight="0.49928468" weight="0.5301205" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49928468" visible="true" weight="0.713253" />
<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" />
@ -810,26 +818,6 @@
</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="270">
<caret line="293" column="23" selection-start-line="293" selection-start-column="23" selection-end-line="293" selection-end-column="23" />
<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="261">
<caret line="682" column="16" selection-start-line="682" selection-start-column="16" selection-end-line="682" selection-end-column="16" />
<folding>
<element signature="e#0#40#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="230">
@ -863,13 +851,34 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="54" column="64" selection-start-line="54" selection-start-column="64" selection-end-line="54" selection-end-column="64" />
<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/Merge/MergeDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="281" column="43" selection-start-line="281" selection-start-column="39" selection-end-line="281" selection-end-column="43" />
<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="63">
<caret line="801" column="24" selection-start-line="801" selection-start-column="24" selection-end-line="801" selection-end-column="24" />
<folding>
<element signature="e#0#40#0" expanded="true" />
<element signature="e#20990#26927#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

6
src/forge/Merge/MessageCount.js
View File

@ -687,7 +687,7 @@ class MessageCount extends Component{
{
url.indexOf("Messagecount")>0 ?
<Spin spinning={this.state.SpinFlag}>
<div className="f-wrap-between mt5" style={{alignItems:"flex-start"}}>
<div className="f-wrap-between mt20" style={{alignItems:"flex-start"}}>
<div className="item-list-right" >
{
data && data.issue.user_permission ?
@ -797,12 +797,12 @@ class MessageCount extends Component{
</div>
{
editMerge ?
<div className="list-left DetailRight mt10">
<div className="list-left DetailRight">
{ editMergeForm() }
</div>
:
<div className="list-left DetailRight mt30">
<div className="list-left DetailRight">
<p>
<span className="span_title">标签</span>
<span>{