Fix/milestone display

packages/business/src/components/milestone/List.vue

@@ -38,6 +38,7 @@
           <ElProgress
             v-if="typeof item.percentage === 'number'"
             :percentage="item.percentage"
+            :stroke-width=10
             class="milestone-mt-1"
             :show-text="false"
           ></ElProgress>
@@ -137,6 +138,12 @@ export default {
       ]
 
       const dataflowType = this.dataflow.type
+      let iconRunning = 'loading-circle'
+      let iconRunningColor = 'color-success'
+      if (this.dataflow.status != "running") {
+        iconRunning = "time"
+        iconRunningColor = 'color-primary'
+      }
       if (['logCollector'].includes(this.dataflow.syncType)) {
         delete result[2]
       }
@@ -157,10 +164,24 @@ export default {
       const runningOpt = {
         status: 'RUNNING',
         desc: i18n.t('packages_business_milestone_list_status_progressing'),
-        icon: 'loading-circle',
+        icon: iconRunning,
+        progress: 0,
+        color: 'color-primary'
+      }
+      const cdcRunningOpt = {
+        status: 'RUNNING',
+        desc: i18n.t('packages_business_milestone_list_status_cdc_progressing'),
+        icon: iconRunning,
         progress: 0,
         color: 'color-primary'
       }
+      const cdcFinishOpt = {
+        status: 'FINISH',
+        desc: i18n.t('packages_business_milestone_list_status_cdc_finish'),
+        icon: iconRunning,
+        progress: 0,
+        color: iconRunningColor
+      }
       const waitingOpt = {
         status: 'WAITING',
         desc: i18n.t('public_status_waiting'),
@@ -180,7 +201,15 @@ export default {
         color: 'color-danger'
       }
       result.forEach(el => {
-        const item = milestone[el.key]
+        let item = milestone[el.key]
+        if (item == undefined) {
+            item = {
+                "begin": 0,
+                "end": 0,
+                "totals": "-",
+                "progress": "-"
+            }
+        }
         let time =
           item.begin && item.end
             ? calcTimeUnit(item.end - item.begin, 2, {
@@ -195,7 +224,7 @@ export default {
             switch (el.key) {
               case 'TASK':
                 Object.assign(el, {
-                  dataDesc: ` , ${i18n.t('public_milestone_time_scheduling', { val: hostName })} , ${i18n.t(
+                  dataDesc: `, ${i18n.t('public_milestone_time_scheduling', { val: hostName })}, ${i18n.t(
                     'public_milestone_time_consuming'
                   )}${time}, ${begin}~${end}`
                 })
@@ -209,19 +238,20 @@ export default {
                 break
               case 'TABLE_INIT':
                 Object.assign(el, {
-                  dataDesc: `,${i18n.t('public_milestone_time_table_structure', { val: item.totals })}, ${i18n.t(
+                  dataDesc: `, ${i18n.t('public_milestone_time_table_structure', { val: item.totals })}, ${i18n.t(
                     'public_milestone_time_consuming'
                   )} ${time}, ${begin} ~ ${end}`
                 })
                 break
               case 'SNAPSHOT':
                 Object.assign(el, {
-                  dataDesc: `,  ${i18n.t('public_milestone_time_consuming')} ${time}, ${begin} ~ ${end}`
+                  dataDesc: `, ${i18n.t('public_milestone_time_consuming')} ${time}, ${begin} ~ ${end}`
                 })
                 break
               case 'CDC':
+                Object.assign(el, cdcFinishOpt)
                 Object.assign(el, {
-                  dataDesc: `,  ${i18n.t('public_milestone_time_consuming')} ${time}, ${begin} ~ ${end}`
+                  dataDesc: `, ${i18n.t('public_milestone_time_cdc_consuming')} ${time}, ${begin} ~ - `
                 })
                 break
             }
@@ -230,9 +260,17 @@ export default {
             Object.assign(el, errorOpt)
             break
           case 'RUNNING':
-            Object.assign(el, runningOpt, {
-              progress: (item.progress / item.totals) * 100
-            })
+            switch (el.key) {
+                case 'CDC':
+                  Object.assign(el, cdcRunningOpt, {
+                    progress: (item.progress / item.totals) * 100
+                  })
+                  break
+                default:
+                  Object.assign(el, runningOpt, {
+                    progress: (item.progress / item.totals) * 100
+                  })
+            }
             break
           default:
             Object.assign(el, waitingOpt)
@@ -241,19 +279,22 @@ export default {
       })
       const len = result.length
       const finishedLen = result.filter(t => t.status === 'FINISH').length
+      let currentLen = finishedLen + 1
+      if (currentLen > len) {
+          currentLen = currentLen - 1
+      }
+
       const per = (finishedLen / len) * 100
       result.unshift({
         label: i18n.t('packages_business_milestone_list_zhengtijindu'),
         icon: 'device',
         percentage: per,
         desc:
-          per >= 100
-            ? i18n.t('public_status_complete')
-            : i18n.t('packages_business_milestone_list_finis', {
-                val1: finishedLen,
-                val2: len,
-                val3: result.find(t => t.status !== 'FINISH')?.label
-              })
+          i18n.t('packages_business_milestone_list_finish', {
+          val1: finishedLen,
+          val2: len,
+          val3: result[currentLen-1].label + " " + result[currentLen-1].desc,
+        })
       })
       return result
     },
@@ -437,7 +478,7 @@ export default {
   }
 }
 .milestone-mt-1 {
-  margin-top: 10px;
+  margin-top: 15px;
 }
 .step__line {
   left: 50%;
@@ -450,7 +491,7 @@ export default {
   padding-bottom: 23px;
 }
 .loading-circle {
-  animation: rotate 2s linear infinite;
+  animation: rotate 3s linear infinite;
 }
 @keyframes rotate {
   0% {

packages/business/src/locale/lang/en.js

@@ -7,6 +7,8 @@ export default {
   packages_business_milestone_list_status_running: 'Running',
   packages_business_milestone_list_status_paused: 'Paused',
   packages_business_milestone_list_status_progressing: 'In progress',
+  packages_business_milestone_list_status_cdc_progressing: 'Starting...',
+  packages_business_milestone_list_status_cdc_finish: 'Data change syncing',
   packages_business_task_status_running: 'Running',
   packages_business_task_status_not_running: 'Not running',
   packages_business_task_info_w: 'Week',
@@ -645,7 +647,7 @@ export default {
   packages_business_milestone_list_duquzengliangshu: 'Read incremental data',
   packages_business_milestone_list_kaiqizengliang: 'Open incremental',
   packages_business_milestone_list_duququanliangshu: 'Read full data',
-  packages_business_milestone_list_finis: '{val1}/{val2} completed, {val3} in progress',
+  packages_business_milestone_list_finish: '{val1}/{val2} completed, {val3} ...',
   packages_business_milestone_list_zhengtijindu: 'Overall Progress',
   packages_business_milestone_list_jinhangzhongpr: 'In progress, {val1}% completed, estimated remaining time {val2}',
   packages_business_milestone_list_zengliangshujuqian: 'Incremental data migration',

packages/business/src/locale/lang/zh-CN.js

@@ -7,6 +7,8 @@ export default {
   packages_business_milestone_list_status_running: '运行中',
   packages_business_milestone_list_status_paused: '已暂停',
   packages_business_milestone_list_status_progressing: '进行中',
+  packages_business_milestone_list_status_cdc_progressing: '启动中...',
+  packages_business_milestone_list_status_cdc_finish: '正在同步数据变更',
   packages_business_task_status_running: '已运行',
   packages_business_task_status_not_running: '未运行',
   packages_business_task_info_w: '周',
@@ -623,7 +625,7 @@ export default {
   packages_business_milestone_list_duquzengliangshu: '读取增量数据',
   packages_business_milestone_list_kaiqizengliang: '开启增量',
   packages_business_milestone_list_duququanliangshu: '读取全量数据',
-  packages_business_milestone_list_finis: '{val1}/{val2}完成，{val3}进行中',
+  packages_business_milestone_list_finish: '{val1}/{val2} 已经完成，{val3} ...',
   packages_business_milestone_list_zhengtijindu: '整体进度',
   packages_business_milestone_list_jinhangzhongpr: '进行中，{val1}%已完成，预计剩余时间{val2}',
   packages_business_milestone_list_zengliangshujuqian: '增量数据迁移',

packages/business/src/locale/lang/zh-TW.js

@@ -7,6 +7,8 @@ export default {
   packages_business_milestone_list_status_running: '運行中',
   packages_business_milestone_list_status_paused: '已暫停',
   packages_business_milestone_list_status_progressing: '進行中',
+  packages_business_milestone_list_status_cdc_progressing: '啟動中...',
+  packages_business_milestone_list_status_cdc_finish: '增量數據同步中',
   packages_business_task_status_running: '已運行',
   packages_business_task_status_not_running: '未運行',
   packages_business_task_info_w: '周',
@@ -623,7 +625,7 @@ export default {
   packages_business_milestone_list_duquzengliangshu: '讀取增量數據',
   packages_business_milestone_list_kaiqizengliang: '開啟增量',
   packages_business_milestone_list_duququanliangshu: '讀取全量數據',
-  packages_business_milestone_list_finis: '{val1}/{val2}完成，{val3}同步中',
+  packages_business_milestone_list_finish: '{val1}/{val2} 已完成，{val3} ...',
   packages_business_milestone_list_zhengtijindu: '整體進度',
   packages_business_milestone_list_jinhangzhongpr: '進行中，{val1}%已完成，預計剩餘時間{val2}',
   packages_business_milestone_list_zengliangshujuqian: '增量數據遷移',

packages/dag/src/locale/lang/zh-CN.js

@@ -163,7 +163,7 @@ export default {
   packages_dag_migration_settingpanel_dangrenwufuhe:
     '开启数据校验开关后，任务会自动对同步结果的一致性进行全量校验和增量校验，并会在运行监控页面将校验不一致的数据行数展示出来。需要注意，当任务符合以下情况时，即使开启校验开关任务也不会进行校验\n 1. 添加了中间处理节点\n 2. 源连接不支持校验\n 3. 目标连接不支持校验',
   packages_dag_monitor_bottompanel_yunxingjilu: '运行记录',
-  packages_dag_monitor_bottompanel_rizhi: '日志',
+  packages_dag_monitor_bottompanel_rizhi: '任务日志',
   packages_dag_components_eventchart_qita: '其他',
   packages_dag_components_eventchart_suoxuanzhouqilei: '所选周期累计',
   packages_dag_components_eventchart_renwuyunxinglei: '任务运行累计',

packages/i18n/src/locale/lang/en.js

@@ -210,6 +210,7 @@ export default {
   public_event_ddl: 'DDL',
 
   //milestone
+  public_milestone_time_cdcconsuming: 'start time-consuming',
   public_milestone_time_consuming: 'time-consuming',
   public_milestone_time_table_structure: 'A total of migration {val} table structure',
   public_milestone_time_scheduling: 'Task is scheduled to {val}',

packages/i18n/src/locale/lang/zh-CN.js

@@ -212,8 +212,9 @@ export default {
   public_event_ddl: 'DDL',
 
   //里程碑
+  public_milestone_time_cdc_consuming: '启动耗时',
   public_milestone_time_consuming: '耗时',
   public_milestone_time_table_structure: '共迁移 {val} 张表结构',
-  public_milestone_time_scheduling: ' 任务被调度到{val}',
+  public_milestone_time_scheduling: ' 任务被调度到 {val}',
   public_milestone_connection_succeeded: ' 连接成功'
 }

packages/i18n/src/locale/lang/zh-TW.js

@@ -210,6 +210,7 @@ export default {
   public_event_ddl: 'DDL',
 
   //里程碑
+  public_milestone_time_cdc_consuming: '啟動耗時',
   public_milestone_time_consuming: '耗時',
   public_milestone_time_table_structure: '共遷移 {val} 張表結構',
   public_milestone_time_scheduling: ' 任務被調度到{val}',