adapt the latest dev branch

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@@ -61,7 +61,7 @@
         <el-table-column prop="recovery" :label="$t('fault-tolerant sign')"></el-table-column>
         <el-table-column prop="executorName" :label="$t('Executor')"></el-table-column>
         <el-table-column prop="host" :label="$t('host')" width="150"></el-table-column>
-        <el-table-column :label="$t('Operation')" width="240" fixed="right">
+        <el-table-column :label="$t('Operation')" width="270" fixed="right">
           <template slot-scope="scope">
             <div v-show="scope.row.disabled">
               <el-tooltip :content="$t('Edit')" placement="top" :enterable="false">
@@ -77,6 +77,11 @@
                   <el-button type="success" size="mini" icon="el-icon-circle-close" :disabled="scope.row.state !== 'FAILURE'" @click="_restore(scope.row,scope.$index)" circle></el-button>
                 </span>
               </el-tooltip>
+              <el-tooltip :content="$t('Resume From Forced Success')" placement="top" :enterable="false">
+                <span>
+                  <el-button type="success" size="mini" icon="el-icon-stopwatch" :disabled="scope.row.state !== 'FORCED_SUCCESS'" @click="_resumeFromForcedSuccess(scope.row,scope.$index)" circle></el-button>
+                </span>
+              </el-tooltip>
               <el-tooltip :content="scope.row.state === 'STOP' ? $t('Recovery Suspend') : $t('Stop')" placement="top" :enterable="false">
                 <span><el-button type="warning" size="mini" :disabled="scope.row.state !== 'RUNNING_EXECUTION' && scope.row.state !== 'STOP'"  :icon="scope.row.state === 'STOP' ? 'el-icon-video-play' : 'el-icon-close'" @click="_stop(scope.row,scope.$index)" circle></el-button></span>
               </el-tooltip>
@@ -150,6 +155,24 @@
                   disabled="true">
               </el-button>
 
+              <!--Resume from forced success-->
+              <el-button
+                  v-show="buttonType === 'forced'"
+                  type="success"
+                  size="mini"
+                  circle
+                  disabled="true">
+                  <span style="padding: 0 3px">{{scope.row.count}}</span>
+              </el-button>
+              <el-button
+                  v-show="buttonType !== 'forced'"
+                  type="success"
+                  size="mini"
+                  circle
+                  icon="el-icon-stopwatch"
+                  disabled="true">
+              </el-button>
+
               <!--Recovery Suspend/Pause-->
               <span>
                 <el-button
@@ -326,6 +349,18 @@
           })
         }
       },
+      /**
+       * Resume from forced success
+       * @param RESUME_FROM_FORCED_SUCCESS
+       */
+      _resumeFromForcedSuccess (item, index) {
+        this._countDownFn({
+          id: item.id,
+          executeType: 'RESUME_FROM_FORCED_SUCCESS',
+          index: index,
+          buttonType: 'forced'
+        })
+      },
       /**
        * pause
        * @param PAUSE

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',
+  'Resume From Forced Success': 'Resume From Forced Success',
   'Enter this child node': 'Enter this child node',
   'Node name': 'Node name',
   'Run flag': 'Run flag',

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -33,6 +33,7 @@ export default {
   'View history': '查看历史',
   'View log': '查看日志',
   'Force success': '强制成功',
+  'Resume From Forced Success': '从强制成功处继续',
   'Enter this child node': '进入该子节点',
   'Node name': '节点名称',
   'Please enter name (required)': '请输入名称(必填)',