This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 1ba802c Repair process definition bulk delete function
new ee02e55 Merge pull request #2823 from break60/dev-1.3.0
1ba802c is described below
commit 1ba802cfff3418fcbb65524e2feec6ab87ca1e43
Author: break60 <[email protected]>
AuthorDate: Tue May 26 18:36:28 2020 +0800
Repair process definition bulk delete function
---
.../projects/pages/definition/pages/list/_source/list.vue | 15 ++++++++++++++-
.../projects/pages/instance/pages/list/_source/list.vue | 14 ++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index d0f9983..577bb4f 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -122,7 +122,20 @@
</tr>
</table>
</div>
-
+ <x-poptip
+ v-show="strSelectIds !== ''"
+ ref="poptipDeleteAll"
+ placement="bottom-start"
+ width="90">
+ <p>{{$t('Delete?')}}</p>
+ <div style="text-align: right; margin: 0;padding-top: 4px;">
+ <x-button type="text" size="xsmall" shape="circle"
@click="_closeDelete(-1)">{{$t('Cancel')}}</x-button>
+ <x-button type="primary" size="xsmall" shape="circle"
@click="_delete({},-1)">{{$t('Confirm')}}</x-button>
+ </div>
+ <template slot="reference">
+ <x-button size="xsmall" style="position: absolute; bottom: -48px;
left: 22px;" >{{$t('Delete')}}</x-button>
+ </template>
+ </x-poptip>
<template v-if="strSelectIds !== ''">
<x-button size="xsmall" style="position: absolute; bottom: -48px; left:
80px;" @click="_batchExport(item)" >{{$t('Export')}}</x-button>
</template>
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 f796238..612c1ce 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
@@ -287,6 +287,20 @@
</tr>
</table>
</div>
+ <x-poptip
+ v-show="strDelete !== ''"
+ ref="poptipDeleteAll"
+ placement="bottom-start"
+ width="90">
+ <p>{{$t('Delete?')}}</p>
+ <div style="text-align: right; margin: 0;padding-top: 4px;">
+ <x-button type="text" size="xsmall" shape="circle"
@click="_closeDelete(-1)">{{$t('Cancel')}}</x-button>
+ <x-button type="primary" size="xsmall" shape="circle"
@click="_delete({},-1)">{{$t('Confirm')}}</x-button>
+ </div>
+ <template slot="reference">
+ <x-button size="xsmall" style="position: absolute; bottom: -48px;
left: 22px;" >{{$t('Delete')}}</x-button>
+ </template>
+ </x-poptip>
</div>
</template>
<script>
