Skip to content

C
console
Commit 06928a08 authored by nano's avatar nano
Browse files
Options

add progress

parent 17bedb13
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 22 deletions
.idea/workspace.xml
View file @ 06928a08
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7dc474d0-9fc0-4b76-8c2f-3c98df702116" name="Default" comment=""> <list default="true" id="7dc474d0-9fc0-4b76-8c2f-3c98df702116" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/Common.js" afterPath="$PROJECT_DIR$/src/models/Common.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/packages.js" afterPath="$PROJECT_DIR$/src/models/packages.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/AppDetail.js" afterPath="$PROJECT_DIR$/src/routes/AppDetail.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/AppDetail.js" afterPath="$PROJECT_DIR$/src/routes/AppDetail.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -23,22 +21,24 @@ ...@@ -23,22 +21,24 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AppDetail.js" pinned="false" current-in-tab="true"> <file leaf-file-name="packages.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js"> <entry file="file://$PROJECT_DIR$/src/models/packages.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="18">
<caret line="249" column="2" lean-forward="false" selection-start-line="249" selection-start-column="2" selection-end-line="249" selection-end-column="2" /> <caret line="43" column="19" lean-forward="false" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="packages.js" pinned="false" current-in-tab="false"> <file leaf-file-name="AppDetail.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/models/packages.js"> <entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468"> <state relative-caret-position="1840">
<caret line="43" column="19" lean-forward="true" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" /> <caret line="927" column="112" lean-forward="true" selection-start-line="927" selection-start-column="112" selection-end-line="927" selection-end-column="112" />
<folding /> <folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>pack</find>
<find>upload</find> <find>upload</find>
<find>message</find> <find>message</find>
<find>success</find> <find>success</find>
...@@ -86,6 +85,7 @@ ...@@ -86,6 +85,7 @@
<find>\n \}\,</find> <find>\n \}\,</find>
<find>isCreate</find> <find>isCreate</find>
<find>status</find> <find>status</find>
<find>this.props.isup</find>
<find>progress</find> <find>progress</find>
</findStrings> </findStrings>
</component> </component>
...@@ -134,8 +134,8 @@ ...@@ -134,8 +134,8 @@
<handled-path value="$PROJECT_DIR$/node_modules" /> <handled-path value="$PROJECT_DIR$/node_modules" />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="494" /> <option name="x" value="660" />
<option name="y" value="184" /> <option name="y" value="83" />
<option name="width" value="1383" /> <option name="width" value="1383" />
<option name="height" value="968" /> <option name="height" value="968" />
</component> </component>
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -236,7 +237,6 @@ ...@@ -236,7 +237,6 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
</panes> </panes>
</component> </component>
...@@ -348,14 +348,15 @@ ...@@ -348,14 +348,15 @@
<workItem from="1492407287300" duration="48898000" /> <workItem from="1492407287300" duration="48898000" />
<workItem from="1492655820276" duration="16418000" /> <workItem from="1492655820276" duration="16418000" />
<workItem from="1492741762508" duration="2198000" /> <workItem from="1492741762508" duration="2198000" />
<workItem from="1492753784584" duration="2539000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="72055000" /> <option name="totallyTimeSpent" value="74594000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="494" y="184" width="1383" height="968" extended-state="0" /> <frame x="660" y="83" width="1383" height="968" extended-state="1" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25624081" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25624081" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" />
...@@ -723,17 +724,19 @@ ...@@ -723,17 +724,19 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/packages.js"> <entry file="file://$PROJECT_DIR$/src/models/packages.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468"> <state relative-caret-position="18">
<caret line="43" column="19" lean-forward="true" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" /> <caret line="43" column="19" lean-forward="false" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js"> <entry file="file://$PROJECT_DIR$/src/routes/AppDetail.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="1840">
<caret line="249" column="2" lean-forward="false" selection-start-line="249" selection-start-column="2" selection-end-line="249" selection-end-column="2" /> <caret line="927" column="112" lean-forward="true" selection-start-line="927" selection-start-column="112" selection-end-line="927" selection-end-column="112" />
<folding /> <folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
src/routes/AppDetail.js
View file @ 06928a08
...@@ -896,6 +896,9 @@ class AppDetail extends React.Component { ...@@ -896,6 +896,9 @@ class AppDetail extends React.Component {
{ {
pack.status == 'failed' && <Alert message="上传失败，请重试" type="warning" showIcon/> pack.status == 'failed' && <Alert message="上传失败，请重试" type="warning" showIcon/>
} }
{
this.props.isUpload && <Progress percent={this.props.percent} status={this.props.status}/>
}
<Dragger <Dragger
{...uploadProps} {...uploadProps}
onChange={(info) => { onChange={(info) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment