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

Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 

# Conflicts:
#	src/forge/Main/Detail.js
This commit is contained in:
caicai8 2020-04-07 15:58:45 +08:00
parent 1090f473ea b9d7d4d6d6
commit 1549072286
10 changed files with 406 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

475
.idea/workspace.xml
View File

@ -2,8 +2,7 @@
<project version="4">
<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/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -13,11 +12,23 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.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" />
<state relative-caret-position="180">
<caret line="391" column="26" selection-start-line="391" selection-start-column="26" selection-end-line="391" selection-end-column="26" />
<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/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2161">
<caret line="191" column="38" selection-start-line="191" selection-start-column="38" selection-end-line="191" selection-end-column="38" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
@ -26,10 +37,91 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js">
<entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.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 relative-caret-position="-76">
<caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
<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$/src/forge/Order/OrderItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<caret line="86" column="60" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="60" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#3295#3542#0" />
</folding>
</state>
</provider>
</entry>
</file>
<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="139">
<caret line="60" column="26" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#2764#3198#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="239" selection-start-line="239" selection-end-line="239" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="321" column="17" selection-start-line="321" selection-start-column="17" selection-end-line="321" selection-end-column="17" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#7722#8184#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
<caret line="575" column="16" selection-start-line="575" selection-start-column="16" selection-end-line="575" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2320">
<caret line="455" column="11" selection-start-line="455" selection-start-column="11" selection-end-line="455" selection-end-column="11" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -38,19 +130,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>创建工单</find>
<find>可读权限</find>
<find>sub_entries</find>
<find>isRe</find>
<find>icon-bianji</find>
<find>可读</find>
<find>journals_count &gt;</find>
<find>readOnly</find>
<find>Fork</find>
<find>forked</find>
<find>.OptionsUl</find>
<find>tyle=</find>
<find>overflo</find>
<find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find>
<find>&lt;span className=&quot;span_title&quot;&gt;里程碑</find>
<find>分支合并到</find>
@ -68,6 +147,19 @@
<find>commitKey</find>
<find>CoderRootDirectorytext</find>
<find>CoderRootDirectory</find>
<find>创建工单</find>
<find>p-r-photo</find>
<find>没有评论</find>
<find>topWrapper</find>
<find>topWrapper_btn</find>
<find>renderJournalList</find>
<find>img_fork</find>
<find>fork</find>
<find>.color-white</find>
<find>color-white</find>
<find>posi</find>
<find>pository</find>
<find>projectDe</find>
</findStrings>
<dirStrings>
<dir>$PROJECT_DIR$</dir>
@ -101,21 +193,24 @@
<option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
<option value="$PROJECT_DIR$/src/forge/New/Index.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
<option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
<option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
<option value="$PROJECT_DIR$/src/forge/Order/order.css" />
<option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
<option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.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/Merge/MessageCount.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
<option value="$PROJECT_DIR$/src/forge/Version/version.css" />
<option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
<option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/Main/list.css" />
</list>
</option>
</component>
@ -152,7 +247,7 @@
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="forge" type="462c0819:PsiDirectoryNode" />
<item name="Main" type="462c0819:PsiDirectoryNode" />
<item name="Merge" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@ -209,17 +304,20 @@
<workItem from="1585217980103" duration="3406000" />
<workItem from="1585288258489" duration="17495000" />
<workItem from="1585732642767" duration="11458000" />
<workItem from="1585817691582" duration="1461000" />
<workItem from="1585817691582" duration="2125000" />
<workItem from="1585900267463" duration="136000" />
<workItem from="1585902299727" duration="2113000" />
<workItem from="1586153685130" duration="9198000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="65455000" />
<option name="totallyTimeSpent" value="77566000" />
</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" visible="true" weight="0.17095852" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17596567" />
<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" />
@ -232,7 +330,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.36506024" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.613253" />
<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="Ant Build" order="1" weight="0.25" />
@ -294,51 +392,6 @@
</option>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/AppConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="142" column="20" selection-start-line="142" selection-start-column="20" selection-end-line="142" selection-end-column="20" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootIndex.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/home/shixunsHome.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5268">
<folding>
<element signature="e#0#41#0" expanded="true" />
</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="209">
<caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
@ -526,16 +579,6 @@
</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="235">
<caret line="102" column="27" selection-start-line="102" selection-start-column="27" selection-end-line="102" selection-end-column="27" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
@ -546,16 +589,6 @@
</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="267">
<caret line="188" column="19" selection-start-line="188" selection-start-column="19" selection-end-line="188" selection-end-column="19" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109">
@ -567,23 +600,6 @@
</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="225">
<caret line="245" column="39" lean-forward="true" selection-start-line="245" selection-start-column="39" selection-end-line="245" selection-end-column="39" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="295" column="142" selection-start-line="295" selection-start-column="142" selection-end-line="295" selection-end-column="142" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Settings/setting.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
@ -591,13 +607,6 @@
</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="150">
<caret line="166" column="16" selection-start-line="166" selection-start-column="16" selection-end-line="166" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
@ -608,16 +617,6 @@
</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="354">
<caret line="145" column="6" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
@ -628,46 +627,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="182">
<caret line="257" column="23" selection-start-line="257" selection-start-column="23" selection-end-line="257" selection-end-column="23" />
<folding>
<element signature="e#0#40#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="144">
<caret line="427" column="36" selection-start-line="427" selection-start-column="36" selection-end-line="427" selection-end-column="36" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</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="-40">
<caret line="63" column="21" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</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="308">
<caret line="80" column="26" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
@ -712,46 +671,174 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
<entry file="file://$PROJECT_DIR$/build/asset-manifest.json">
<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 relative-caret-position="187">
<caret line="11" column="75" lean-forward="true" selection-start-line="11" selection-start-column="75" selection-end-line="11" selection-end-column="75" />
</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">
<state relative-caret-position="505">
<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" />
<state relative-caret-position="505">
<caret line="249" column="5" selection-start-line="249" selection-start-column="5" selection-end-line="249" selection-end-column="5" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</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="171">
<caret line="130" selection-start-line="130" selection-end-line="138" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="26" column="29" lean-forward="true" selection-start-line="26" selection-start-column="29" selection-end-line="26" selection-end-column="29" />
</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="68">
<caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
</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="289">
<caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
<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="307">
<caret line="466" column="11" selection-start-line="466" selection-start-column="11" selection-end-line="466" selection-end-column="11" />
<folding>
<element signature="e#0#40#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="180">
<caret line="391" column="26" selection-start-line="391" selection-start-column="26" selection-end-line="391" selection-end-column="26" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</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="2161">
<caret line="191" column="38" selection-start-line="191" selection-start-column="38" selection-end-line="191" 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/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2320">
<caret line="455" column="11" selection-start-line="455" selection-start-column="11" selection-end-line="455" selection-end-column="11" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</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="-76">
<caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
<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="182">
<caret line="257" column="23" selection-start-line="257" selection-start-column="23" selection-end-line="257" 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/merge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="239" selection-start-line="239" selection-end-line="239" />
</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="139">
<caret line="60" column="26" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#2764#3198#0" />
</folding>
</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="166">
<caret line="86" column="60" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="60" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#3295#3542#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
</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="158">
<caret line="321" column="17" selection-start-line="321" selection-start-column="17" selection-end-line="321" selection-end-column="17" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#7722#8184#0" />
</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="167">
<caret line="575" column="16" selection-start-line="575" selection-start-column="16" selection-end-line="575" selection-end-column="16" />
</state>
</provider>
</entry>
</component>
</project>

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

@ -90,6 +90,7 @@ class CoderRootDirectory extends Component{
ChangeFile=(arr,index)=>{
this.renderUrl(arr.name,arr.path,arr.type);
//点击直接跳转页面 加载一次路由
this.getFileDetail(arr);
this.setState({
subFileType:arr.type

42
src/forge/Main/Detail.js
View File

@ -244,23 +244,12 @@ class Detail extends Component{
axios.post(url).then(result=>{
if (result && result.data.status === 0) {
// if (result.data.status === 0) {
this.props.history.push(`/projects/${result.data.id}/coders`);
this.props.showNotification(result.data.message);
// }
this.setState({
this.props.history.push(`/projects/${result.data.id}/coders`);
this.props.showNotification(result.data.message);
this.setState({
isSpin:false
})
}
// else {
// if(result.data.status !== 401){
// this.props.showNotification(result.data.message);
// }else{
// this.setState({
// isSpin:false
// })
// this.props.showNotification(`服务器开小差了`);
// }
// }
}).catch(error=>{
this.setState({
isSpin:false
@ -304,14 +293,37 @@ class Detail extends Component{
<Spin spinning={isSpin}>
<div className="detailHeader-wrapper">
<div className="normal">
<div className="f-wrap-between mb20">
<div className="f-wrap-between mb25" style={{position:"relative"}}>
<p className="font-18 color-white df flex-1 lineH2 mt15" style={{alignItems:"center"}}>
{
projectDetail && projectDetail.forked_from_project_id ?
<span className="mr10">
<img src={img_fork} alt="" width="16px"/>
</span>
: ""
}
{projectDetail && projectDetail.author && projectDetail.author.name}
<span className="ml5 mr5">/</span>
<span className="hide-1 flex-1">
<Link to={`/projects/${projectsId}/coders`} className="color-white">{ projectDetail && projectDetail.name }</Link>
</span>
</p>
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
<div className="fork-css font-14 color-grey-ccc df flex-1 lineH2" style={{alignItems:"center"}}>
<span className="mr10">Forked From</span>
{projectDetail.fork_info.fork_project_user_name}
<span className="ml5 mr5">/</span>
<span className="hide-1 flex-1">
<Link to={`/projects/${projectDetail.forked_from_project_id}/coders`} className="color-grey-ccc">{ projectDetail.fork_info.fork_form_name }</Link>
</span>
</div>
:
""
}
</div>
<div className="f-wrap-between">
<ul className="headerMenu-wrapper">

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

@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
import '../css/index.css'
import './list.css';
import img_parise from '../Images/parise.png';
import img_fork from '../Images/fork.png';
class IndexItem extends Component{
// constructor(props){
// super(props);
@ -25,7 +26,21 @@ class IndexItem extends Component{
<img className="p-r-photo" alt="" src={getImageUrl(`images/${item.author && item.author.image_url}`)} ></img>
<div className="p-r-Infos">
<div className="p-r-name">
<Link to={`/projects/${item.id}/coders`} className="hide-1 font-16 color-grey-3" style={{whiteSpace:"wrap",display:'flex'}}>{item.author.name}/<p className="task-hide font-18" style={{width:200,marginTop:5}}>{item.name}</p></Link>
<Link to={`/projects/${item.id}/${item.author && item.author.login}/coder`} className="hide-1 color-grey-3 font-18 task-hide " style={{whiteSpace:"wrap",display:'flex',width:400}}>
{item.author.name}/{item.name}
{
item.forked_from_project_id ?
<span className="ml5">
<img src={img_fork} alt="" width="14px"/>
</span>
: ""
}
</Link>
{
item.is_public ? "" :
<span className="p-r-tags"><span>私有</span></span>
}
</div>
<div className="p-r-content">
<p className="break_word task-hide flex1" style={{maxHeight:"40px",width:"0"}}>{item.description}</p>

12
src/forge/Main/list.css
View File

@ -567,3 +567,15 @@ border: 1px solid #2185d0;
height: auto;
}
.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;
}

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

@ -42,6 +42,7 @@ class MergeItem extends Component{
render(){
const { issues , search_count , page , limit } = this.props;
const { projectsId } = this.props.match.params;
const { current_user } = this.props;
const renderList =()=>{
if(issues && issues.length > 0){
return(
@ -73,11 +74,16 @@ class MergeItem extends Component{
<p>
{ item.journals_count ? <Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/Messagecount`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link> : "" }
</p>
<div className="milepostleft" style={{display:this.state.orderid===item.id&&this.state.isdisplay?'flex':'none'}}>
<div className="grid-item mr15 color-grey-9">
<Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/updatemerge`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
</div>
</div>
{
current_user && current_user.login ?
<div className="milepostleft" style={{display:this.state.orderid===item.id&&this.state.isdisplay?'flex':'none'}}>
<div className="grid-item mr15 color-grey-9">
<Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/updatemerge`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
</div>
</div>
:""
}
</div>
</li>
</ul>

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

@ -215,6 +215,7 @@ class merge extends Component{
})
}
}
this.setState({
order_name:e.key,
@ -223,6 +224,15 @@ class merge extends Component{
this.getIssueList(1,limit,search,author_id,assigned_to_id,status_type,undefined,undefined, e.item.props.value,e.key);
}
islogin(){
const { projectsId } = this.props.match.params;
if (this.props.checkIfLogin() === false) {
this.props.showLoginDialog()
return
}else{
this.props.history.push(`/projects/${projectsId}/merge/new`);
}
}
render(){
const { issue_chosen , issues , limit , page , search_count , data , isSpin,openselect,closeselect } = this.state;
@ -252,9 +262,7 @@ class merge extends Component{
<div className="topWrapper">
<Nav {...this.props} {...this.state}/>
{
data && data.user_admin_or_member ?
<Link to={`/projects/${projectsId}/merge/new`} className="topWrapper_btn">创建合并请求</Link>
: ''
<a className="topWrapper_btn" onClick={()=>this.islogin()}>创建合并请求</a>
}
</div>
<div className="topWrapper" style={{borderBottom:"none"}}>

25
src/forge/Order/OrderItem.js
View File

@ -47,6 +47,7 @@ class OrderItem extends Component{
render(){
const { issues , search_count , page , limit } = this.props;
const { projectsId } = this.props.match.params;
const {current_user} = this.props
const renderList =()=>{
if(issues && issues.length > 0){
@ -82,16 +83,20 @@ class OrderItem extends Component{
<p>
{ item.journals_count ? <Link to={`/projects/${projectsId}/orders/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link> : "" }
</p>
<div className="milepostleft" style={{display:this.state.orderid===item.id&&this.state.isdisplay?'flex':'none'}}>
<div className="grid-item mr15 color-grey-9">
<Link to={`/projects/${projectsId}/orders/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
</div>
<div className="grid-item color-grey-9">
<Popconfirm placement="bottom" title={'您确定要删除吗'} okText="是" cancelText="否" onConfirm={()=>this.deletedetail(item.id)}>
<i className="iconfont icon-yiguanbi1 font-14"></i>
</Popconfirm>
</div>
</div>
{
current_user && current_user.login ?
<div className="milepostleft" style={{display:this.state.orderid===item.id&&this.state.isdisplay?'flex':'none'}}>
<div className="grid-item mr15 color-grey-9">
<Link to={`/projects/${projectsId}/orders/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
</div>
<div className="grid-item color-grey-9">
<Popconfirm placement="bottom" title={'您确定要删除吗'} okText="是" cancelText="否" onConfirm={()=>this.deletedetail(item.id)}>
<i className="iconfont icon-yiguanbi1 font-14"></i>
</Popconfirm>
</div>
</div>
: ""
}
</div>
</li>

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

@ -1,13 +1,12 @@
import React , { Component } from "react";
import {Link} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin, Button } from 'antd';
import './order.css';
import NoneData from '../Nodata';
import Nav from './Nav';
import OrderItem from './OrderItem';
import axios from 'axios';
const Search = Input.Search;
@ -336,6 +335,16 @@ class order extends Component{
console.log(id)
}
islogin(){
const { projectsId } = this.props.match.params;
if (this.props.checkIfLogin() === false) {
this.props.showLoginDialog()
return
}else{
this.props.history.push(`/projects/${projectsId}/orders/new`);
}
}
render(){
const { current_user } = this.props;
@ -366,9 +375,7 @@ class order extends Component{
<div className="topWrapper">
<Nav {...this.props} {...this.state}/>
{
data && data.user_admin_or_member ?
<Link to={`/projects/${projectsId}/orders/new`} className="topWrapper_btn">创建工单</Link>
: ''
<a className="topWrapper_btn" onClick={()=>this.islogin()} >创建工单</a>
}
</div>
@ -448,6 +455,7 @@ class order extends Component{
<OrderItem issues={issues} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state} deletedetail={this.deletedetail}></OrderItem>
}
{ Paginations }
</Spin>
</div>

19
src/forge/Version/version.css
View File

@ -1,3 +1,22 @@
.topWrapper {
padding: 20px 0;
box-sizing: border-box;
display: flex;
justify-content: space-between;
border-bottom: 1px solid #EEEEEE;
flex-wrap: wrap;
}
.topWrapper_btn {
background: #21ba45;
color: #FFFFFF!important;
padding:0px 12px;
text-align: center;
height: 32px;
line-height: 32px;
border-radius: 4px;
}
.versionmilepostleft{
padding: 15px;
margin-right: 50px;