From 0bcf2728b925a7a0fb1b44424286d3950bb58ec5 Mon Sep 17 00:00:00 2001
From: Magnus Wang <mingfengx.wang@intel.com>
Date: Thu, 24 Feb 2022 09:36:12 +0800
Subject: [PATCH 1/2] list 130

---
 web/src/pages/jobManagement/components/bottomLog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/pages/jobManagement/components/bottomLog.vue b/web/src/pages/jobManagement/components/bottomLog.vue
index e1cf63d13..4f54adce6 100644
--- a/web/src/pages/jobManagement/components/bottomLog.vue
+++ b/web/src/pages/jobManagement/components/bottomLog.vue
@@ -214,7 +214,7 @@ export default {
             res.job.runningTasks = res.job.tasks.Running?.length || 0
             res.job.totalTasks = this.tasklist.length
             res.job.successPercent = res.job.successTasks * 100 / res.job.totalTasks
-            res.job.percent = (res.job.successTasks + res.job.runningTasks) * 100 / res.job.totalTasks
+            res.job.percent = res.job.progress * 100 //(res.job.successTasks + res.job.runningTasks) * 100 / res.job.totalTasks
             res.job.title = `${res.job.successTasks}成功,${res.job.runningTasks}正在运行,${res.job.initedTasks}正在准备`
           }
           this.jobProgress = res.job

From 7d7b936d1e10dfa9e958b51051c0c156ec203361 Mon Sep 17 00:00:00 2001
From: Magnus Wang <mingfengx.wang@intel.com>
Date: Thu, 24 Feb 2022 12:00:02 +0800
Subject: [PATCH 2/2] fix bug

---
 .../jobManagement/components/dataSource.vue   |  3 +++
 .../jobManagement/components/dyncRender.vue   | 21 ++++++++++++-------
 .../jobManagement/components/jobDetail.vue    |  5 ++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/web/src/pages/jobManagement/components/dataSource.vue b/web/src/pages/jobManagement/components/dataSource.vue
index f2038636f..559b8636a 100644
--- a/web/src/pages/jobManagement/components/dataSource.vue
+++ b/web/src/pages/jobManagement/components/dataSource.vue
@@ -276,6 +276,9 @@ export default defineComponent({
               source: '/api/rest_j/v1/exchangis/job/partitionInfo',
               type: 'MAP'
             }
+          }
+          if (ui.source) {
+          ui.source = ui.source + '?_=' + Math.random()
           }*/
           if (!ui.value && ui.defaultValue) {
             ui.value = ui.defaultValue;
diff --git a/web/src/pages/jobManagement/components/dyncRender.vue b/web/src/pages/jobManagement/components/dyncRender.vue
index 335fbd1c2..08d08ef4d 100644
--- a/web/src/pages/jobManagement/components/dyncRender.vue
+++ b/web/src/pages/jobManagement/components/dyncRender.vue
@@ -70,13 +70,17 @@ export default defineComponent({
       value.value = val.value
       if (type === 'MAP') {
         value.value = value.value || {}
-        partitionArr.value.forEach(partition => {
-          if (partition.type === 'OPTION') {
-            partition.value = value.value[partition.label] ? [value.value[partition.label]] : []
-          } else {
-            partition.value = value.value[partition.label] ? value.value[partition.label] : partition.defaultValue || ''
-          }
-        })
+        if (val.source === oldVal.source) {
+          partitionArr.value.forEach(partition => {
+            if (partition.type === 'OPTION') {
+              partition.value = value.value[partition.label] ? [value.value[partition.label]] : []
+            } else {
+              partition.value = value.value[partition.label] ? value.value[partition.label] : partition.defaultValue || ''
+            }
+          })
+        } else {
+          _buildMap()
+        }
       }
     });
     let checkOptions = []
@@ -90,6 +94,7 @@ export default defineComponent({
     }
     let partitionArr = ref([])
     const _buildMap = function () {
+      partitionArr.value = []
       let url = source.split('?')[0]
       getPartitionInfo({
         source: url,
@@ -124,7 +129,7 @@ export default defineComponent({
           }
         })
         .catch(err => {
-          message.error("或许分区信息失败");
+          message.error("获取分区信息失败");
         })
     }
     if (type === 'MAP') {
diff --git a/web/src/pages/jobManagement/components/jobDetail.vue b/web/src/pages/jobManagement/components/jobDetail.vue
index d8e9f57c4..0d8e5fc5f 100644
--- a/web/src/pages/jobManagement/components/jobDetail.vue
+++ b/web/src/pages/jobManagement/components/jobDetail.vue
@@ -3,7 +3,7 @@
     <div class="tools-bar">
       <span @click="modalCfg.visible = true"><SettingOutlined />配置</span>
       <div class="divider"></div>
-      <span @click="executeTask" v-if="!spinning" ><CaretRightOutlined />执行</span>
+      <span @click="executeTask" v-if="!spinning"><CaretRightOutlined />执行</span>
       <a-popconfirm
         v-else
         title="是否终止?"
@@ -921,6 +921,9 @@ export default {
     },
     // 执行任务
     executeTask() {
+      if (!this.list.length) {
+        return message.error('没有子任务')
+      }
       this.saveAll(() => {
         const { id } = this.curTab;
         this.tasklist = []