Fix create task config bug

update version to 3.01
lfy1331 · Sep 7, 2018 · f5f60fa · f5f60fa
1 parent b878ea5
commit f5f60fa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/front/src/components/Task/Create.vue b/front/src/components/Task/Create.vue
@@ -68,8 +68,6 @@
 <script>
 import FileChoose from '../FileChoose'
 
-let defaultConfig = {}
-
 export default {
   props: {
     request: {
@@ -102,7 +100,7 @@ export default {
     request() {
       this.form.request = this.request
       this.form.response = this.response
-      this.form.config = { ...defaultConfig }
+      this.setDefaultConfig()
     }
   },
   computed: {
@@ -155,9 +153,7 @@ export default {
       this.form.taskId = undefined
       if (visible) {
         //check same task
-        const { data: serverConfig } = await this.$http.get('http://127.0.0.1:26339/config')
         const { data: downTasks } = await this.$http.get('http://127.0.0.1:26339/tasks?status=1,2,3')
-        this.setDefaultConfig(serverConfig)
         this.sameTasks = downTasks
           ? downTasks.filter(task => task.response.supportRange && task.response.totalSize === this.response.totalSize)
           : []
@@ -195,19 +191,22 @@ export default {
         this.selectOldTask = true
       }
     },
-    setDefaultConfig(serverConfig) {
-      const defaultConfig = {
-        filePath: serverConfig.filePath,
-        connections: serverConfig.connections,
-        timeout: serverConfig.timeout,
-        retryCount: serverConfig.retryCount,
-        autoRename: serverConfig.autoRename,
-        speedLimit: serverConfig.speedLimit
-      }
-      this.form.config = { ...defaultConfig }
+    setDefaultConfig() {
+      this.$http.get('http://127.0.0.1:26339/config').then(result => {
+        const serverConfig = result.data
+        this.form.config = {
+          filePath: serverConfig.filePath,
+          connections: serverConfig.connections,
+          timeout: serverConfig.timeout,
+          retryCount: serverConfig.retryCount,
+          autoRename: serverConfig.autoRename,
+          speedLimit: serverConfig.speedLimit
+        }
+      })
     }
   },
   created() {
+    this.setDefaultConfig()
     this.init(this.visible)
   }
 }

diff --git a/main/src/main/java/org/pdown/gui/DownApplication.java b/main/src/main/java/org/pdown/gui/DownApplication.java
@@ -91,7 +91,7 @@ public void start(Stage primaryStage) throws Exception {
     initTray();
     initWindow();
     initBrowser();
-    loadUri("", true);
+    loadUri(null, true);
   }
 
 
@@ -307,7 +307,7 @@ public void loadUri(String uri, boolean isTray) {
     } else {
       Platform.runLater(() -> {
         show(isTray);
-        if (!browser.isLoad()) {
+        if (uri != null || !browser.isLoad()) {
           browser.load(url);
         }
       });

diff --git a/main/src/main/resources/application.yml b/main/src/main/resources/application.yml
@@ -1,4 +1,4 @@
-version: 3.0
+version: 3.01
 spring:
   profiles:
     active: @environment@