Browse Source

fix

pull/3/MERGE
break60 5 years ago committed by gaojun2048
parent
commit
3888e4894e
  1. 21
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
  2. 58
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue

21
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue

@ -34,9 +34,6 @@
<th>
<span>{{$t('Update Time')}}</span>
</th>
<!-- <th width="70">
<span>{{$t('Operation')}}</span>
</th> -->
</tr>
<tr v-for="(item, $index) in list" :key="$index">
<td>
@ -58,24 +55,6 @@
<span v-if="item.updateTime">{{item.updateTime | formatDate}}</span>
<span v-else>-</span>
</td>
<!-- <td>
<x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-edit" :title="$t('Edit')" @click="_edit(item)">
</x-button>
<x-poptip
:ref="'poptip-delete-' + $index"
placement="bottom-end"
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($index)">{{$t('Cancel')}}</x-button>
<x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
</div>
<template slot="reference">
<x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-trash" :title="$t('delete')">
</x-button>
</template>
</x-poptip>
</td> -->
</tr>
</table>
</div>

58
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue

@ -17,11 +17,7 @@
<template>
<m-list-construction :title="$t('Worker group manage')">
<template slot="conditions">
<m-conditions @on-conditions="_onConditions">
<!-- <template slot="button-group" v-if="isADMIN">
<x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button>
</template> -->
</m-conditions>
<m-conditions @on-conditions="_onConditions"></m-conditions>
</template>
<template slot="content">
<template v-if="workerGroupList.length || total>0">
@ -92,32 +88,32 @@
_onEdit (item) {
this._create(item)
},
// _create (item) {
// let self = this
// let modal = this.$modal.dialog({
// closable: false,
// showMask: true,
// escClose: true,
// className: 'v-modal-custom',
// transitionName: 'opacityp',
// render (h) {
// return h(mCreateWorker, {
// on: {
// onUpdate () {
// self._debounceGET('false')
// modal.remove()
// },
// close () {
// modal.remove()
// }
// },
// props: {
// item: item
// }
// })
// }
// })
// },
_create (item) {
let self = this
let modal = this.$modal.dialog({
closable: false,
showMask: true,
escClose: true,
className: 'v-modal-custom',
transitionName: 'opacityp',
render (h) {
return h(mCreateWorker, {
on: {
onUpdate () {
self._debounceGET('false')
modal.remove()
},
close () {
modal.remove()
}
},
props: {
item: item
}
})
}
})
},
_getList (flag) {
this.isLoading = !flag
this.getWorkerGroups(this.searchParams).then(res => {

Loading…
Cancel
Save