Browse Source

start from force success

pull/3/MERGE
曹聚阳 4 years ago
parent
commit
972c6d893b
  1. 47
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  2. 1
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  3. 1
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

47
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"> <th scope="col" style="min-width: 135px">
<span>{{$t('Executor')}}</span> <span>{{$t('Executor')}}</span>
</th> </th>
<th scope="col" style="min-width: 100px"> <th scope="col" style="min-width: 80px">
<div style="width: 100px"> <div style="width: 80px">
<span>{{$t('host')}}</span> <span>{{$t('host')}}</span>
</div> </div>
</th> </th>
<th scope="col" style="min-width: 210px"> <th scope="col" style="min-width: 240px">
<span>{{$t('Operation')}}</span> <span>{{$t('Operation')}}</span>
</th> </th>
</tr> </tr>
@ -99,7 +99,7 @@
<span v-if="item.host" style="word-break: break-all">{{item.host}}</span> <span v-if="item.host" style="word-break: break-all">{{item.host}}</span>
<span v-else>-</span> <span v-else>-</span>
</td> </td>
<td style="z-index: inherit;"> <td style="z-index: inherit; min-width: 240px">
<div v-show="item.disabled"> <div v-show="item.disabled">
<x-button type="info" <x-button type="info"
shape="circle" shape="circle"
@ -125,6 +125,14 @@
@click="_restore(item,$index)" @click="_restore(item,$index)"
icon="ans-icon-fail-empty" icon="ans-icon-fail-empty"
:disabled="item.state !== 'FAILURE'"></x-button> :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" <x-button type="error"
shape="circle" shape="circle"
size="xsmall" size="xsmall"
@ -219,6 +227,24 @@
disabled="true"> disabled="true">
</x-button> </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--> <!--Stop-->
<!--<x-button--> <!--<x-button-->
<!--type="error"--> <!--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 * pause
* @param PAUSE * @param PAUSE
@ -570,6 +608,7 @@
} }
}, },
created () { created () {
}, },
mounted () { mounted () {
}, },

1
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@ -33,6 +33,7 @@ export default {
'View history': 'View history', 'View history': 'View history',
'View log': 'View log', 'View log': 'View log',
'Force success': 'Force success', 'Force success': 'Force success',
'Start From Force Success': 'Start From Force Success',
'Enter this child node': 'Enter this child node', 'Enter this child node': 'Enter this child node',
'Node name': 'Node name', 'Node name': 'Node name',
'Run flag': 'Run flag', 'Run flag': 'Run flag',

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

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

Loading…
Cancel
Save