From 972c6d893b8715a4cd8192308cfa35c39b542971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=81=9A=E9=98=B3?= <yinancx@live.com>
Date: Thu, 3 Dec 2020 23:18:59 +0800
Subject: [PATCH] start from force success

---
 .../instance/pages/list/_source/list.vue      | 47 +++++++++++++++++--
 .../src/js/module/i18n/locale/en_US.js        |  1 +
 .../src/js/module/i18n/locale/zh_CN.js        |  1 +
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index cda59968cb..d1ffb81133 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -55,12 +55,12 @@
           <th scope="col" style="min-width: 135px">
             <span>{{$t('Executor')}}</span>
           </th>
-          <th scope="col" style="min-width: 100px">
-            <div style="width: 100px">
+          <th scope="col" style="min-width: 80px">
+            <div style="width: 80px">
               <span>{{$t('host')}}</span>
             </div>
           </th>
-          <th scope="col" style="min-width: 210px">
+          <th scope="col" style="min-width: 240px">
             <span>{{$t('Operation')}}</span>
           </th>
         </tr>
@@ -99,7 +99,7 @@
             <span v-if="item.host" style="word-break: break-all">{{item.host}}</span>
             <span v-else>-</span>
           </td>
-          <td style="z-index: inherit;">
+          <td style="z-index: inherit; min-width: 240px">
             <div v-show="item.disabled">
               <x-button type="info"
                         shape="circle"
@@ -125,6 +125,14 @@
                         @click="_restore(item,$index)"
                         icon="ans-icon-fail-empty"
                         :disabled="item.state !== 'FAILURE'"></x-button>
+              <x-button type="success"
+                        shape="circle"
+                        size="xsmall"
+                        data-toggle="tooltip"
+                        :title="$t('Start From Force Success')"
+                        @click="_startFromForceSuccess(item,$index)"
+                        icon="ans-icon-notice-empty"
+                        :disabled="item.state !== 'FORCED_SUCCESS'"></x-button>
               <x-button type="error"
                         shape="circle"
                         size="xsmall"
@@ -219,6 +227,24 @@
                       disabled="true">
               </x-button>
 
+              <!--Start from forced success-->
+              <x-button
+                      v-show="buttonType === 'forced'"
+                      type="success"
+                      shape="circle"
+                      size="xsmall"
+                      disabled="true">
+                {{item.count}}
+              </x-button>
+              <x-button
+                      v-show="buttonType !== 'forced'"
+                      type="success"
+                      shape="circle"
+                      size="xsmall"
+                      icon="ans-icon-notice-empty"
+                      disabled="true">
+              </x-button>
+
               <!--Stop-->
               <!--<x-button-->
                       <!--type="error"-->
@@ -422,6 +448,18 @@
           })
         }
       },
+      /**
+       * Start from force success
+       * @param START_FROM_FORCED_SUCCESS
+       */
+      _startFromForceSuccess (item, index) {
+        this._countDownFn({
+          id: item.id,
+          executeType: 'START_FROM_FORCED_SUCCESS',
+          index: index,
+          buttonType: 'forced'
+        })
+      },
       /**
        * pause
        * @param PAUSE
@@ -570,6 +608,7 @@
       }
     },
     created () {
+
     },
     mounted () {
     },
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index a901bf31c3..23348f77f7 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -33,6 +33,7 @@ export default {
   'View history': 'View history',
   'View log': 'View log',
   'Force success': 'Force success',
+  'Start From Force Success': 'Start From Force Success',
   'Enter this child node': 'Enter this child node',
   'Node name': 'Node name',
   'Run flag': 'Run flag',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index bc080d5c0e..6b7da22657 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -33,6 +33,7 @@ export default {
   'View history': '查看历史',
   'View log': '查看日志',
   'Force success': '强制成功',
+  'Start From Force Success': '从强制成功处继续',
   'Enter this child node': '进入该子节点',
   'Node name': '节点名称',
   'Please enter name (required)': '请输入名称(必填)',