forked from Gitlink/forgeplus-react-v2
修改forge的问题
This commit is contained in:
commit
e6b8dd6c6b
|
|
@ -2,34 +2,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/Activity/Activity.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Activity/Activity.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/forge/Activity/Activity.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Activity/Activity.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/New/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/New/Index.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Detail.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/Milepost.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Milepost.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/MilepostDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/MilepostDetail.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/New.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/New.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/Tags.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Tags.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/newMilepost.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/newMilepost.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/order.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.css" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Order/order.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Settings/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Index.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Settings/Setting.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Setting.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Version/NewVersion.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/NewVersion.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/forge/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/forge/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/modules/user/usersInfo/video/AliyunUploaderManager.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/usersInfo/video/AliyunUploaderManager.js" afterDir="false" />
|
|
||||||
</list>
|
</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" />
|
||||||
|
|
@ -65,28 +39,11 @@
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="170">
|
|
||||||
<caret line="461" column="41" selection-start-line="461" selection-start-column="41" selection-end-line="461" selection-end-column="41" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#40#0" expanded="true" />
|
|
||||||
<element signature="e#8674#13519#0" />
|
|
||||||
<element signature="e#16700#18374#0" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file pinned="false" current-in-tab="false">
|
<file pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
|
<entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="285">
|
<state relative-caret-position="51">
|
||||||
<caret line="186" column="20" lean-forward="true" selection-start-line="186" selection-start-column="20" selection-end-line="186" selection-end-column="20" />
|
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="39" />
|
||||||
<folding>
|
|
||||||
<element signature="e#0#42#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
|
@ -103,11 +60,35 @@
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file pinned="false" current-in-tab="true">
|
<file pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
|
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="407">
|
<state relative-caret-position="51">
|
||||||
<caret line="280" column="42" lean-forward="true" selection-start-line="280" selection-start-column="42" selection-end-line="280" selection-end-column="42" />
|
<caret line="3" column="21" lean-forward="true" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="3179">
|
||||||
|
<caret line="187" column="15" lean-forward="true" selection-start-line="187" selection-start-column="15" selection-end-line="187" selection-end-column="15" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#42#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="true">
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="70">
|
||||||
|
<caret line="133" column="55" lean-forward="true" selection-start-line="133" selection-start-column="55" selection-end-line="133" selection-end-column="55" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#42#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
|
@ -192,8 +173,8 @@
|
||||||
<find>.topWrapper_select</find>
|
<find>.topWrapper_select</find>
|
||||||
<find>topWrapper_select</find>
|
<find>topWrapper_select</find>
|
||||||
<find>Issue</find>
|
<find>Issue</find>
|
||||||
<find>创建</find>
|
|
||||||
<find>NaV</find>
|
<find>NaV</find>
|
||||||
|
<find>创建</find>
|
||||||
</findStrings>
|
</findStrings>
|
||||||
<replaceStrings>
|
<replaceStrings>
|
||||||
<replace>任务</replace>
|
<replace>任务</replace>
|
||||||
|
|
@ -235,7 +216,6 @@
|
||||||
<option value="$PROJECT_DIR$/src/forge/Activity/Activity.js" />
|
<option value="$PROJECT_DIR$/src/forge/Activity/Activity.js" />
|
||||||
<option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
|
<option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
|
||||||
<option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
|
<option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
|
||||||
<option value="$PROJECT_DIR$/src/forge/Version/version.js" />
|
|
||||||
<option value="$PROJECT_DIR$/src/forge/New/Index.js" />
|
<option value="$PROJECT_DIR$/src/forge/New/Index.js" />
|
||||||
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
|
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
|
||||||
<option value="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" />
|
<option value="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" />
|
||||||
|
|
@ -253,6 +233,7 @@
|
||||||
<option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
|
<option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
|
||||||
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
|
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
|
||||||
<option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
|
<option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
|
||||||
|
<option value="$PROJECT_DIR$/src/forge/Version/version.js" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -371,18 +352,17 @@
|
||||||
<workItem from="1586153685130" duration="10062000" />
|
<workItem from="1586153685130" duration="10062000" />
|
||||||
<workItem from="1586245827209" duration="1692000" />
|
<workItem from="1586245827209" duration="1692000" />
|
||||||
<workItem from="1586330226261" duration="658000" />
|
<workItem from="1586330226261" duration="658000" />
|
||||||
<workItem from="1586400014081" duration="14654000" />
|
<workItem from="1586400014081" duration="15437000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="95434000" />
|
<option name="totallyTimeSpent" value="96217000" />
|
||||||
</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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18025751" />
|
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18025751" />
|
||||||
<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" />
|
||||||
|
|
@ -394,8 +374,8 @@
|
||||||
<window_info anchor="bottom" id="TODO" order="6" />
|
<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="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.20722891" />
|
||||||
<window_info anchor="bottom" id="Terminal" order="10" weight="0.34819278" />
|
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.70843375" />
|
||||||
<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" />
|
||||||
|
|
@ -659,23 +639,6 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="119">
|
|
||||||
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
|
|
||||||
</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="153">
|
|
||||||
<caret line="95" column="35" lean-forward="true" selection-start-line="95" selection-start-column="35" selection-end-line="95" selection-end-column="35" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#42#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
|
<entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="-2583">
|
<state relative-caret-position="-2583">
|
||||||
|
|
@ -832,26 +795,6 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="285">
|
|
||||||
<caret line="186" column="20" lean-forward="true" selection-start-line="186" selection-start-column="20" selection-end-line="186" selection-end-column="20" />
|
|
||||||
<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="364">
|
|
||||||
<caret line="243" selection-start-line="243" selection-end-line="245" selection-end-column="15" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#40#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
|
<entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="251">
|
<state relative-caret-position="251">
|
||||||
|
|
@ -904,8 +847,45 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
|
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="407">
|
<state relative-caret-position="51">
|
||||||
<caret line="280" column="42" lean-forward="true" selection-start-line="280" selection-start-column="42" selection-end-line="280" selection-end-column="42" />
|
<caret line="3" column="21" lean-forward="true" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
|
||||||
|
</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="364">
|
||||||
|
<caret line="243" selection-start-line="243" selection-end-line="245" selection-end-column="15" />
|
||||||
|
<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="51">
|
||||||
|
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="39" />
|
||||||
|
</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="3179">
|
||||||
|
<caret line="187" column="15" lean-forward="true" selection-start-line="187" selection-start-column="15" selection-end-line="187" selection-end-column="15" />
|
||||||
|
<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="70">
|
||||||
|
<caret line="133" column="55" lean-forward="true" selection-start-line="133" selection-start-column="55" selection-end-line="133" selection-end-column="55" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#42#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import React , { Component } from 'react';
|
import React , { Component } from 'react';
|
||||||
import { Dropdown , Menu , Icon , Pagination} from 'antd';
|
import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
|
||||||
import '../css/index.css';
|
import '../css/index.css';
|
||||||
import '../Branch/branch.css';
|
import '../Branch/branch.css';
|
||||||
import './activity.css';
|
import './activity.css';
|
||||||
|
|
@ -39,11 +39,16 @@ class Activity extends Component{
|
||||||
page:1,
|
page:1,
|
||||||
|
|
||||||
data:undefined,
|
data:undefined,
|
||||||
project_trends:undefined
|
project_trends:undefined,
|
||||||
|
|
||||||
|
isSpin:false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
componentDidMount=()=>{
|
componentDidMount=()=>{
|
||||||
const { time,type,status,page } = this.state;
|
const { time,type,status,page } = this.state;
|
||||||
|
this.setState({
|
||||||
|
isSpin:true
|
||||||
|
})
|
||||||
this.getInfo(time,type,status,page);
|
this.getInfo(time,type,status,page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -58,7 +63,8 @@ class Activity extends Component{
|
||||||
if(result){
|
if(result){
|
||||||
this.setState({
|
this.setState({
|
||||||
data:result.data,
|
data:result.data,
|
||||||
project_trends:result.data.project_trends
|
project_trends:result.data.project_trends,
|
||||||
|
isSpin:false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}).catch(error=>{
|
}).catch(error=>{
|
||||||
|
|
@ -69,7 +75,8 @@ class Activity extends Component{
|
||||||
// 切换周期
|
// 切换周期
|
||||||
changeTime=(e)=>{
|
changeTime=(e)=>{
|
||||||
this.setState({
|
this.setState({
|
||||||
time:e.key
|
time:e.key,
|
||||||
|
isSpin:true
|
||||||
})
|
})
|
||||||
const { type,status,page } = this.state;
|
const { type,status,page } = this.state;
|
||||||
this.getInfo(e.key,type,status,page);
|
this.getInfo(e.key,type,status,page);
|
||||||
|
|
@ -91,7 +98,7 @@ class Activity extends Component{
|
||||||
this.getInfo(time,type,status,page);
|
this.getInfo(time,type,status,page);
|
||||||
}
|
}
|
||||||
render(){
|
render(){
|
||||||
const { time , data , page , project_trends } = this.state;
|
const { time , data , page , project_trends , isSpin } = this.state;
|
||||||
|
|
||||||
const menu = (
|
const menu = (
|
||||||
<Menu>
|
<Menu>
|
||||||
|
|
@ -163,21 +170,22 @@ class Activity extends Component{
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{
|
<Spin spinning={isSpin}>
|
||||||
project_trends && project_trends.length > 0 ?
|
{
|
||||||
<div className="activity_list">
|
project_trends && project_trends.length > 0 ?
|
||||||
{
|
<div className="activity_list">
|
||||||
project_trends && project_trends.map((item,key)=>{
|
{
|
||||||
return(
|
project_trends && project_trends.map((item,key)=>{
|
||||||
<ActivityItem item={item} {...this.props} ></ActivityItem>
|
return(
|
||||||
)
|
<ActivityItem item={item} {...this.props} ></ActivityItem>
|
||||||
})
|
)
|
||||||
}
|
})
|
||||||
</div>
|
}
|
||||||
:
|
</div>
|
||||||
<NoneData _html="暂时还没有相关数据哦!" />
|
:
|
||||||
}
|
<NoneData _html="暂时还没有相关数据哦!" />
|
||||||
|
}
|
||||||
|
</Spin>
|
||||||
{
|
{
|
||||||
data && data.project_trends_size > 0 && data.project_trends_size > LIMIT &&
|
data && data.project_trends_size > 0 && data.project_trends_size > LIMIT &&
|
||||||
<div className="pageDIV">
|
<div className="pageDIV">
|
||||||
|
|
|
||||||
|
|
@ -68,87 +68,88 @@ class version extends Component{
|
||||||
if(data && data.releases && data.releases.length>0 ){
|
if(data && data.releases && data.releases.length>0 ){
|
||||||
return(
|
return(
|
||||||
<div>{
|
<div>{
|
||||||
data.releases.map((item,key)=>{
|
data.releases.map((item,key)=>{
|
||||||
return(
|
return(
|
||||||
<div key={key}>
|
<div key={key}>
|
||||||
{
|
{
|
||||||
item && item.id ?
|
item && item.id ?
|
||||||
<div>
|
<div>
|
||||||
<div style={{display:'flex'}}>
|
<div style={{display:'flex'}}>
|
||||||
<div className="versionleft">
|
<div className="versionleft">
|
||||||
<div className="versionrighe"></div><span className={item&&item.draft==="稳定"?"opendversionetail":"closedversionetail"} style={{marginTop:5,margin:'auto',marginRight:15}}>{item.draft} </span>
|
<div className="versionrighe"></div><span className={item&&item.draft==="稳定"?"opendversionetail":"closedversionetail"} style={{marginTop:5,margin:'auto',marginRight:15}}>{item.draft} </span>
|
||||||
</div>
|
</div>
|
||||||
<div className="version_line_one">
|
<div className="version_line_one">
|
||||||
<p className="versionrectangle"> </p>
|
<p className="versionrectangle"> </p>
|
||||||
</div>
|
</div>
|
||||||
<div className="versionrighe">
|
<div className="versionrighe">
|
||||||
<h1 style={{marginLeft:15,marginTop:5}}>{item.name}
|
<h1 style={{marginLeft:15,marginTop:5}}>{item.name}
|
||||||
{
|
{
|
||||||
data && data.user_permission ?
|
data && data.user_permission ?
|
||||||
<Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link>
|
<Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link>
|
||||||
: ''
|
: ''
|
||||||
}
|
}
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div style={{display:'flex'}}>
|
||||||
|
<div className="versionleft">
|
||||||
|
<span style={{marginTop:5,margin:'auto',marginRight:15}}>{item.tag_name} </span>
|
||||||
|
</div>
|
||||||
|
<div className="version_line_one">
|
||||||
|
<p style={{width:4}}> </p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div style={{display:'flex'}}>
|
<div className="versionrighe">
|
||||||
<div className="versionleft">
|
<h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
|
||||||
<span style={{marginTop:5,margin:'auto',marginRight:15}}>{item.tag_name} </span>
|
<div className="ml15">
|
||||||
</div>
|
<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
|
||||||
<div className="version_line_one">
|
<span className="mr10">{item.user_name}</span>
|
||||||
<p style={{width:4}}> </p>
|
<span className="color-grey-9">发布于{item.created_at}</span>
|
||||||
|
|
||||||
</div>
|
|
||||||
<div className="versionrighe">
|
|
||||||
<h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
|
|
||||||
<div className="ml15">
|
|
||||||
<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
|
|
||||||
<span className="mr10">{item.user_name}</span>
|
|
||||||
<span className="color-grey-9">发布于{item.created_at}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style={{display:'flex'}}>
|
|
||||||
<div className="versionleft">
|
|
||||||
<span style={{marginTop:5,marginRight:15}}></span>
|
|
||||||
</div>
|
|
||||||
<div className="version_line_tpw">
|
|
||||||
<p style={{width:4}}> </p>
|
|
||||||
</div>
|
|
||||||
<div className="versionrighe">
|
|
||||||
<h1 style={{marginLeft:15,marginTop:10}}>下载附件
|
|
||||||
</h1>
|
|
||||||
<a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
|
|
||||||
<a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style={{display:'flex'}}>
|
|
||||||
<div className="versionleft">
|
|
||||||
<span style={{marginTop:5,marginRight:15}}></span>
|
|
||||||
</div>
|
|
||||||
<div className="version_line_tpw">
|
|
||||||
<p style={{width:4}}> </p>
|
|
||||||
</div>
|
|
||||||
<div className="versionrighe">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
:
|
<div style={{display:'flex'}}>
|
||||||
""
|
<div className="versionleft">
|
||||||
}
|
<span style={{marginTop:5,marginRight:15}}></span>
|
||||||
|
</div>
|
||||||
|
<div className="version_line_tpw">
|
||||||
|
<p style={{width:4}}> </p>
|
||||||
|
</div>
|
||||||
|
<div className="versionrighe">
|
||||||
|
<h1 style={{marginLeft:15,marginTop:10}}>下载附件
|
||||||
|
</h1>
|
||||||
|
<a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
|
||||||
|
<a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style={{display:'flex'}}>
|
||||||
|
<div className="versionleft">
|
||||||
|
<span style={{marginTop:5,marginRight:15}}></span>
|
||||||
|
</div>
|
||||||
|
<div className="version_line_tpw">
|
||||||
|
<p style={{width:4}}> </p>
|
||||||
|
</div>
|
||||||
|
<div className="versionrighe">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
:
|
||||||
|
""
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}else{
|
}else{
|
||||||
return(
|
return(
|
||||||
<NoneData _html="暂时还没有相关数据哦!" />
|
<NoneData _html="暂时还没有相关数据哦!" />
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return(
|
return(
|
||||||
<div className="main">
|
<div className="main">
|
||||||
|
|
@ -162,10 +163,10 @@ class version extends Component{
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{renderList()}
|
{renderList()}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue