Skip to content

C
console
Commit 17bedb13 authored by nano's avatar nano
Browse files
Options

update

parent 1e90e94c
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 169 deletions
.idea/workspace.xml
View file @ 17bedb13
...@@ -2,25 +2,10 @@ ...@@ -2,25 +2,10 @@
<project version="4"> <project version="4">
<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="DELETED" beforePath="$PROJECT_DIR$/src/assets/yay.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/models/example.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/routes/IndexPage.css" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/routes/IndexPage.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/routes/Login.css" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/routes/Login.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/services/example.js" afterPath="" />
<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/config.js" afterPath="$PROJECT_DIR$/src/config.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/App.js" afterPath="$PROJECT_DIR$/src/models/App.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/Apps.js" afterPath="$PROJECT_DIR$/src/models/Apps.js" />
<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/Common.js" afterPath="$PROJECT_DIR$/src/models/Common.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/user.js" afterPath="$PROJECT_DIR$/src/models/user.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/router.js" afterPath="$PROJECT_DIR$/src/router.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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Apps.js" afterPath="$PROJECT_DIR$/src/routes/Apps.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/LoginCallback.js" afterPath="$PROJECT_DIR$/src/routes/LoginCallback.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/services/Apps.js" afterPath="$PROJECT_DIR$/src/services/Apps.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/services/Packages.js" afterPath="$PROJECT_DIR$/src/services/Packages.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -37,34 +22,32 @@ ...@@ -37,34 +22,32 @@
<favorites_list name="moecube-console-web" /> <favorites_list name="moecube-console-web" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Common.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/Common.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="390"> <state relative-caret-position="186">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> <caret line="249" column="2" lean-forward="false" selection-start-line="249" selection-start-column="2" selection-end-line="249" selection-end-column="2" />
<folding> <folding />
<element signature="e#0#38#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<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="307"> <state relative-caret-position="468">
<caret line="143" column="41" lean-forward="true" selection-start-line="143" selection-start-column="41" selection-end-line="143" selection-end-column="41" /> <caret line="43" column="19" lean-forward="true" 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="Common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/services/Packages.js"> <entry file="file://$PROJECT_DIR$/src/models/Common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162"> <state relative-caret-position="216">
<caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> <caret line="14" column="10" lean-forward="false" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -74,7 +57,6 @@ ...@@ -74,7 +57,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>console</find>
<find>pack</find> <find>pack</find>
<find>upload</find> <find>upload</find>
<find>message</find> <find>message</find>
...@@ -104,6 +86,7 @@ ...@@ -104,6 +86,7 @@
<find>\n \}\,</find> <find>\n \}\,</find>
<find>isCreate</find> <find>isCreate</find>
<find>status</find> <find>status</find>
<find>progress</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -121,7 +104,6 @@ ...@@ -121,7 +104,6 @@
<option value="$PROJECT_DIR$/src/index.js" /> <option value="$PROJECT_DIR$/src/index.js" />
<option value="$PROJECT_DIR$/src/routes/Entry.js" /> <option value="$PROJECT_DIR$/src/routes/Entry.js" />
<option value="$PROJECT_DIR$/src/routes/AppDetail.less" /> <option value="$PROJECT_DIR$/src/routes/AppDetail.less" />
<option value="$PROJECT_DIR$/src/models/packages.js" />
<option value="$PROJECT_DIR$/src/services/Packages.js" /> <option value="$PROJECT_DIR$/src/services/Packages.js" />
<option value="$PROJECT_DIR$/src/services/example.js" /> <option value="$PROJECT_DIR$/src/services/example.js" />
<option value="$PROJECT_DIR$/src/router.js" /> <option value="$PROJECT_DIR$/src/router.js" />
...@@ -134,6 +116,7 @@ ...@@ -134,6 +116,7 @@
<option value="$PROJECT_DIR$/src/models/App.js" /> <option value="$PROJECT_DIR$/src/models/App.js" />
<option value="$PROJECT_DIR$/src/services/Apps.js" /> <option value="$PROJECT_DIR$/src/services/Apps.js" />
<option value="$PROJECT_DIR$/src/models/Apps.js" /> <option value="$PROJECT_DIR$/src/models/Apps.js" />
<option value="$PROJECT_DIR$/src/models/packages.js" />
<option value="$PROJECT_DIR$/src/models/Common.js" /> <option value="$PROJECT_DIR$/src/models/Common.js" />
<option value="$PROJECT_DIR$/src/routes/AppDetail.js" /> <option value="$PROJECT_DIR$/src/routes/AppDetail.js" />
</list> </list>
...@@ -151,8 +134,8 @@ ...@@ -151,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="274" /> <option name="x" value="494" />
<option name="y" value="95" /> <option name="y" value="184" />
<option name="width" value="1383" /> <option name="width" value="1383" />
<option name="height" value="968" /> <option name="height" value="968" />
</component> </component>
...@@ -363,17 +346,19 @@ ...@@ -363,17 +346,19 @@
<updated>1492397512644</updated> <updated>1492397512644</updated>
<workItem from="1492397516564" duration="4541000" /> <workItem from="1492397516564" duration="4541000" />
<workItem from="1492407287300" duration="48898000" /> <workItem from="1492407287300" duration="48898000" />
<workItem from="1492655820276" duration="10789000" /> <workItem from="1492655820276" duration="16418000" />
<workItem from="1492741762508" duration="2198000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64228000" /> <option name="totallyTimeSpent" value="72055000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="274" y="95" width="1383" height="968" extended-state="0" /> <frame x="494" y="184" width="1383" height="968" extended-state="0" />
<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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32966226" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32966226" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
...@@ -381,18 +366,17 @@ ...@@ -381,18 +366,17 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32990867" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32990867" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32966226" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32966226" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33333334" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TypeScript" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25697502" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33333334" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25354213" sideWeight="0.5068493" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25354213" sideWeight="0.5068493" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="TypeScript" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24981357" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24981357" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
...@@ -439,7 +423,6 @@ ...@@ -439,7 +423,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="270">
<caret line="15" column="61" lean-forward="true" selection-start-line="15" selection-start-column="61" selection-end-line="15" selection-end-column="61" /> <caret line="15" column="61" lean-forward="true" selection-start-line="15" selection-start-column="61" selection-end-line="15" selection-end-column="61" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -447,7 +430,6 @@ ...@@ -447,7 +430,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54"> <state relative-caret-position="54">
<caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> <caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -455,7 +437,6 @@ ...@@ -455,7 +437,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -463,9 +444,6 @@ ...@@ -463,9 +444,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324"> <state relative-caret-position="324">
<caret line="25" column="1" lean-forward="true" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" /> <caret line="25" column="1" lean-forward="true" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
<folding>
<element signature="e#0#26#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -473,7 +451,6 @@ ...@@ -473,7 +451,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="108">
<caret line="9" column="10" lean-forward="true" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" /> <caret line="9" column="10" lean-forward="true" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -481,7 +458,6 @@ ...@@ -481,7 +458,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="918"> <state relative-caret-position="918">
<caret line="53" column="56" lean-forward="true" selection-start-line="53" selection-start-column="56" selection-end-line="53" selection-end-column="56" /> <caret line="53" column="56" lean-forward="true" selection-start-line="53" selection-start-column="56" selection-end-line="53" selection-end-column="56" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -496,17 +472,10 @@ ...@@ -496,17 +472,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="252">
<caret line="0" column="1627" lean-forward="false" selection-start-line="0" selection-start-column="1627" selection-end-line="0" selection-end-column="1627" /> <caret line="0" column="1627" lean-forward="false" selection-start-line="0" selection-start-column="1627" selection-end-line="0" selection-end-column="1627" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.css" />
<entry file="file://$PROJECT_DIR$/public/index.html"> <entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
...@@ -518,7 +487,6 @@ ...@@ -518,7 +487,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -533,7 +501,6 @@ ...@@ -533,7 +501,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288"> <state relative-caret-position="288">
<caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" /> <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -571,7 +538,6 @@ ...@@ -571,7 +538,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144"> <state relative-caret-position="144">
<caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" /> <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -595,9 +561,6 @@ ...@@ -595,9 +561,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="270">
<caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" /> <caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" />
<folding>
<element signature="e#0#26#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -605,7 +568,6 @@ ...@@ -605,7 +568,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="108">
<caret line="6" column="26" lean-forward="true" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" /> <caret line="6" column="26" lean-forward="true" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -628,7 +590,6 @@ ...@@ -628,7 +590,6 @@
<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="186">
<caret line="7595" column="11" lean-forward="false" selection-start-line="7595" selection-start-column="11" selection-end-line="7595" selection-end-column="11" /> <caret line="7595" column="11" lean-forward="false" selection-start-line="7595" selection-start-column="11" selection-end-line="7595" selection-end-column="11" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -636,55 +597,18 @@ ...@@ -636,55 +597,18 @@
<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="186">
<caret line="1065" column="16" lean-forward="false" selection-start-line="1065" selection-start-column="16" selection-end-line="1065" selection-end-column="16" /> <caret line="1065" column="16" lean-forward="false" selection-start-line="1065" selection-start-column="16" selection-end-line="1065" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/example.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="21" column="6" lean-forward="true" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/example.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="17" column="23" lean-forward="false" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Login.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/example.js" />
<entry file="file://$PROJECT_DIR$/src/services/example.js" />
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.js" />
<entry file="file://$PROJECT_DIR$/src/routes/Login.css" />
<entry file="file://$PROJECT_DIR$/src/routes/Login.js" />
<entry file="file://$PROJECT_DIR$/src/router.js"> <entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36"> <state relative-caret-position="36">
<caret line="2" column="36" lean-forward="true" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" /> <caret line="2" column="36" lean-forward="true" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -692,9 +616,6 @@ ...@@ -692,9 +616,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-169"> <state relative-caret-position="-169">
<caret line="50" column="2" lean-forward="false" selection-start-line="50" selection-start-column="2" selection-end-line="50" selection-end-column="2" /> <caret line="50" column="2" lean-forward="false" selection-start-line="50" selection-start-column="2" selection-end-line="50" selection-end-column="2" />
<folding>
<element signature="e#0#44#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -702,7 +623,6 @@ ...@@ -702,7 +623,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-97"> <state relative-caret-position="-97">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -718,7 +638,6 @@ ...@@ -718,7 +638,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-161"> <state relative-caret-position="-161">
<caret line="14" column="46" lean-forward="false" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" /> <caret line="14" column="46" lean-forward="false" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -726,7 +645,6 @@ ...@@ -726,7 +645,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162"> <state relative-caret-position="162">
<caret line="11" column="15" lean-forward="true" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" /> <caret line="11" column="15" lean-forward="true" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -734,9 +652,6 @@ ...@@ -734,9 +652,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342"> <state relative-caret-position="342">
<caret line="19" column="34" lean-forward="true" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" /> <caret line="19" column="34" lean-forward="true" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -744,7 +659,6 @@ ...@@ -744,7 +659,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="433"> <state relative-caret-position="433">
<caret line="102" column="40" lean-forward="false" selection-start-line="102" selection-start-column="40" selection-end-line="102" selection-end-column="40" /> <caret line="102" column="40" lean-forward="false" selection-start-line="102" selection-start-column="40" selection-end-line="102" selection-end-column="40" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -760,17 +674,6 @@ ...@@ -760,17 +674,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-200"> <state relative-caret-position="-200">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/packages.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-492">
<caret line="1" column="28" lean-forward="false" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
<folding>
<element signature="e#0#70#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -778,7 +681,6 @@ ...@@ -778,7 +681,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="108">
<caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" /> <caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -786,7 +688,6 @@ ...@@ -786,7 +688,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414"> <state relative-caret-position="414">
<caret line="27" column="19" lean-forward="false" selection-start-line="27" selection-start-column="19" selection-end-line="27" selection-end-column="19" /> <caret line="27" column="19" lean-forward="false" selection-start-line="27" selection-start-column="19" selection-end-line="27" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -794,9 +695,13 @@ ...@@ -794,9 +695,13 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234"> <state relative-caret-position="234">
<caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" /> <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<folding> </state>
<element signature="e#0#24#0" expanded="false" /> </provider>
</folding> </entry>
<entry file="file://$PROJECT_DIR$/src/models/Apps.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397">
<caret line="67" column="5" lean-forward="true" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -808,30 +713,26 @@ ...@@ -808,30 +713,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/Apps.js"> <entry file="file://$PROJECT_DIR$/src/models/Common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397"> <state relative-caret-position="216">
<caret line="67" column="5" lean-forward="true" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" /> <caret line="14" column="10" lean-forward="false" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
<folding> <folding />
<element signature="e#0#46#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/Common.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="390"> <state relative-caret-position="468">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> <caret line="43" column="19" lean-forward="true" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
<folding> <folding />
<element signature="e#0#38#0" expanded="true" />
</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="307"> <state relative-caret-position="186">
<caret line="143" column="41" lean-forward="true" selection-start-line="143" selection-start-column="41" selection-end-line="143" selection-end-column="41" /> <caret line="249" column="2" lean-forward="false" selection-start-line="249" selection-start-column="2" selection-end-line="249" selection-end-column="2" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/models/Common.js
View file @ 17bedb13
...@@ -6,9 +6,18 @@ export default { ...@@ -6,9 +6,18 @@ export default {
namespace: 'Common', namespace: 'Common',
state: { state: {
collapsed: false, collapsed: false,
mode: 'inline' mode: 'inline',
isUpload: false,
percent: 0,
uploadStatus: '',
}, },
reducers: { reducers: {
upload(state, action) {
return {
...state,
...action.payload,
}
},
collapsed (state) { collapsed (state) {
const mode = state.collapsed ? 'inline' : 'vertical' const mode = state.collapsed ? 'inline' : 'vertical'
return {...state, collapsed: !state.collapsed, mode} return {...state, collapsed: !state.collapsed, mode}
......
src/models/packages.js
View file @ 17bedb13
...@@ -57,6 +57,7 @@ export default { ...@@ -57,6 +57,7 @@ export default {
try { try {
const {data} = yield call(urlUpload, payload) const {data} = yield call(urlUpload, payload)
yield put({ type: 'success', payload: {packages: data}, appId: payload.appId}) yield put({ type: 'success', payload: {packages: data}, appId: payload.appId})
message.info('上传成功, 打包中...')
} catch (e) { } catch (e) {
message.error(e.message) message.error(e.message)
} }
......
src/routes/AppDetail.js
View file @ 17bedb13
...@@ -19,6 +19,7 @@ import { ...@@ -19,6 +19,7 @@ import {
Table, Table,
Badge, Badge,
Alert, Alert,
Progress,
message, message,
Popconfirm, Popconfirm,
Row, Row,
...@@ -91,18 +92,18 @@ class AppDetail extends React.Component { ...@@ -91,18 +92,18 @@ class AppDetail extends React.Component {
}; };
componentDidMount() { componentDidMount() {
this.props.dispatch({ type: 'packages/fetch', payload: {appId: this.props.params.id}}) this.props.dispatch({type: 'packages/fetch', payload: {appId: this.props.params.id}})
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
const {App: {developers, publishers, news}, packages } = nextProps const {App: {developers, publishers, news}, packages} = nextProps
// this.setState({ // this.setState({
// developers: {...defDevelopers, ...developers}, // developers: {...defDevelopers, ...developers},
// publishers: {...defPublishers, ...publishers}, // publishers: {...defPublishers, ...publishers},
// packages: [...defPackages, ...packages], // packages: [...defPackages, ...packages],
// news: {...defNews, ...news}, // news: {...defNews, ...news},
// }) // })
if(this.state.packages.length !== packages) { if (this.state.packages.length !== packages) {
this.setState({ this.setState({
packages packages
}) })
...@@ -188,7 +189,7 @@ class AppDetail extends React.Component { ...@@ -188,7 +189,7 @@ class AppDetail extends React.Component {
const {version, actions, references, dependencies} = values const {version, actions, references, dependencies} = values
Object.keys(actions).forEach((platform) => { Object.keys(actions).forEach((platform) => {
if(actions[platform]) { if (actions[platform]) {
actions[platform] = JSON.parse(actions[platform]) actions[platform] = JSON.parse(actions[platform])
} }
}) })
...@@ -279,7 +280,6 @@ class AppDetail extends React.Component { ...@@ -279,7 +280,6 @@ class AppDetail extends React.Component {
} }
// onUpdatePackage = (e) => { // onUpdatePackage = (e) => {
// const {form, dispatch, params: {id}} = this.props // const {form, dispatch, params: {id}} = this.props
// //
...@@ -307,7 +307,7 @@ class AppDetail extends React.Component { ...@@ -307,7 +307,7 @@ class AppDetail extends React.Component {
let {upload: {packages}} = values let {upload: {packages}} = values
const _package = packages.find(p => p.id == pack.id) const _package = packages.find(p => p.id == pack.id)
dispatch({type: "packages/delete", payload: {appId:id, ..._package}}) dispatch({type: "packages/delete", payload: {appId: id, ..._package}})
} }
}); });
} }
...@@ -338,7 +338,7 @@ class AppDetail extends React.Component { ...@@ -338,7 +338,7 @@ class AppDetail extends React.Component {
let {packages} = this.state let {packages} = this.state
let _package = packages[targetKey] let _package = packages[targetKey]
if(_package._id) { if (_package._id) {
this.onDeletePackage(_package) this.onDeletePackage(_package)
} }
...@@ -756,7 +756,7 @@ class AppDetail extends React.Component { ...@@ -756,7 +756,7 @@ class AppDetail extends React.Component {
if (pack) { if (pack) {
return ( return (
<TabPane tab={pack.name || "New"} key={i} closable={packages.length > 1}> <TabPane tab={pack.name || "New"} key={i} closable={packages.length > 1}>
<Form onSubmit={e => this.onSubmitUpload(e, pack)}> <Form >
<FormItem {...formItemLayout} help="id"> <FormItem {...formItemLayout} help="id">
{getFieldDecorator(`upload["packages"][${i}]["id"]`, { {getFieldDecorator(`upload["packages"][${i}]["id"]`, {
...@@ -826,16 +826,22 @@ class AppDetail extends React.Component { ...@@ -826,16 +826,22 @@ class AppDetail extends React.Component {
<FormItem {...formItemLayout} > <FormItem {...formItemLayout} >
<div className={styles.wrapSubmit}> <div className={styles.wrapSubmit}>
{ {
pack.status == 'uploaded' && <Button type="primary" onClick={(e) => this.onNewPackageVersion(e, pack)} size="large">发布新版本</Button> pack.status == 'uploaded' &&
<Button type="primary" onClick={(e) => this.onNewPackageVersion(e, pack)} size="large">发布新版本</Button>
} }
{ {
pack.status == 'uploading' && <Button type="primary" size="large" disabled>上传中...</Button> pack.status == 'uploading' &&
<Button type="primary" size="large" disabled>处理中...</Button>
} }
{ {
pack.status == 'init' && <Button type="primary" onClick={(e) => this.onPatchPackage(e, pack)} size="large">保存</Button> pack.status == 'init' &&
<Button type="primary" onClick={(e) => this.onPatchPackage(e, pack)}
size="large">保存</Button>
} }
{ {
pack.status == 'new' && <Button type="primary" onClick={(e) => this.onAddPackage(e, pack)} size="large">提交</Button> pack.status == 'new' &&
<Button type="primary" onClick={(e) => this.onAddPackage(e, pack)}
size="large">提交</Button>
} }
</div> </div>
</FormItem> </FormItem>
...@@ -850,14 +856,17 @@ class AppDetail extends React.Component { ...@@ -850,14 +856,17 @@ class AppDetail extends React.Component {
<p>locales: {pack.locales.map((locale, i) => { <p>locales: {pack.locales.map((locale, i) => {
return <span key={i} style={{padding: "0 2px"}}>{locale}</span> return <span key={i} style={{padding: "0 2px"}}>{locale}</span>
})}</p> })}</p>
<p>platforms: {pack.platforms.map((platform,i) => { <p>platforms: {pack.platforms.map((platform, i) => {
return <span key={i} style={{padding: "0 2px"}}>{platform}</span> return <span key={i} style={{padding: "0 2px"}}>{platform}</span>
})}</p> })}</p>
<p>files: {pack.files.length}</p> <p>files: {pack.files.length}</p>
{
pack.status == 'uploaded' && this.checkUploading && clearInterval(this.checkUploading)
}
</Card> </Card>
} }
{pack.status !== 'uploaded' &&<FormItem {...formItemLayout}> {pack.status !== 'uploaded' && <FormItem {...formItemLayout}>
{getFieldDecorator(`upload["packages"][${i}]["upload"]`, {})( {getFieldDecorator(`upload["packages"][${i}]["upload"]`, {})(
<Tabs defaultActiveKey="1" size="small"> <Tabs defaultActiveKey="1" size="small">
<TabPane tab="url上传" key="1"> <TabPane tab="url上传" key="1">
...@@ -866,7 +875,7 @@ class AppDetail extends React.Component { ...@@ -866,7 +875,7 @@ class AppDetail extends React.Component {
})( })(
<div style={{display: 'flex', flexDirection: 'column', alignItems: 'center'}}> <div style={{display: 'flex', flexDirection: 'column', alignItems: 'center'}}>
{ {
pack.status == 'failed' && <Alert message="上传失败，请重试" type="warning" showIcon /> pack.status == 'failed' && <Alert message="上传失败，请重试" type="warning" showIcon/>
} }
<Input <Input
addonBefore={<Icon type="upload"/>} addonBefore={<Icon type="upload"/>}
...@@ -885,25 +894,30 @@ class AppDetail extends React.Component { ...@@ -885,25 +894,30 @@ class AppDetail extends React.Component {
</TabPane> </TabPane>
<TabPane tab="直接上传" key="2"> <TabPane tab="直接上传" key="2">
{ {
pack.status == 'failed' && <Alert message="上传失败，请重试" type="warning" showIcon /> pack.status == 'failed' && <Alert message="上传失败，请重试" type="warning" showIcon/>
} }
<Dragger <Dragger
{...uploadProps} {...uploadProps}
onChange={(info) => { onChange={(info) => {
const status = info.file.status; const status = info.file.status;
console.log(info)
if (status !== 'uploading') { if (status == 'uploading') {
console.log(info.file, info.fileList); dispatch({type: 'Common/upload', payload: {percent: info.file.percent, uploadStatus: 'active', isUpload: true}})
} }
if (status === 'done') { if (status === 'done') {
message.info('上传成功, 打包中...', 3)
dispatch({type: 'packages/fetch', payload: {appId: this.props.params.id}}) dispatch({type: 'packages/fetch', payload: {appId: this.props.params.id}})
dispatch({type: 'Common/upload', payload: {percent: 0, uploadStatus: '', isUpload: false}})
} else if (status === 'error') { } else if (status === 'error') {
dispatch({type: 'Common/upload', payload: {percent: info.file.percent, uploadStatus: 'exception', isUpload: true}})
message.error(info.file.response.message); message.error(info.file.response.message);
} }
}} }}
disabled={ pack.status !== 'init' && pack.status !== 'failed'} disabled={ pack.status !== 'init' && pack.status !== 'failed'}
action={`${config.apiRoot}/v1/upload/package/${pack["_id"]}`} action={`${config.apiRoot}/v1/upload/package/${pack["_id"]}`}
> >
<p className="ant-upload-drag-icon"> <p className="ant-upload-drag-icon">
<Icon type="inbox"/> <Icon type="inbox"/>
</p> </p>
...@@ -939,6 +953,7 @@ function mapStateToProps(state, props) { ...@@ -939,6 +953,7 @@ function mapStateToProps(state, props) {
const { const {
Apps: {apps}, Apps: {apps},
packages: {packages}, packages: {packages},
Common: {isUpload, percent, uploadStatus},
loading loading
} = state } = state
...@@ -948,6 +963,9 @@ function mapStateToProps(state, props) { ...@@ -948,6 +963,9 @@ function mapStateToProps(state, props) {
return { return {
loading, loading,
isUpload,
percent,
uploadStatus,
packages: _packages, packages: _packages,
App App
}; };
......
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