Browse Source
* fix api error in dependent task * feat: This is a connecting test * feat: second push test * feat: email test * [Feature]add taskdefinition add new pages named taskDifinition add new router add new action in store/dag * [Feature] add/edit/view task definition * [DS-6600][feat][UI] Add page about task-definition list * Add page about task-definition list * Add create/edit/view/delete task-definition * Add research task-definition This closes #6600 * modify API_BASE Co-authored-by: wangyizhi <wangyizhi1_yewu@cmss.chinamobile.com> Co-authored-by: duchao <duchao@cmss.chinamobile.com>3.0.0/version-upgrade
DuChaoJiaYou
3 years ago
committed by
GitHub
10 changed files with 714 additions and 48 deletions
@ -0,0 +1,197 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
<template> |
||||
<div class="list-model" style="position: relative"> |
||||
<div class="table-box"> |
||||
<el-table |
||||
:data="list" |
||||
size="mini" |
||||
style="width: 100%" |
||||
@selection-change="select" |
||||
> |
||||
<el-table-column |
||||
prop="id" |
||||
:label="$t('#')" |
||||
min-width="50" |
||||
></el-table-column> |
||||
<el-table-column :label="$t('Task Name')" min-width="200"> |
||||
<template v-slot="scope"> |
||||
<el-popover trigger="hover" placement="top"> |
||||
<p>{{ scope.row.name }}</p> |
||||
<div slot="reference" class="name-wrapper"> |
||||
<a |
||||
href="javascript:" |
||||
class="links" |
||||
@click="viewTaskDetail(scope.row)" |
||||
> |
||||
{{ scope.row.name }} |
||||
</a> |
||||
</div> |
||||
</el-popover> |
||||
</template> |
||||
</el-table-column> |
||||
<el-table-column :label="$t('Task Type')" prop="taskType" min-width="135"> |
||||
</el-table-column> |
||||
<el-table-column |
||||
:label="$t('User Name')" |
||||
prop="userName" |
||||
width="135" |
||||
></el-table-column> |
||||
<el-table-column :label="$t('Version Info')" min-width="135"> |
||||
<template v-slot="scope"> |
||||
<span> |
||||
{{ 'V' + scope.row.version }} |
||||
</span> |
||||
</template> |
||||
</el-table-column> |
||||
<el-table-column :label="$t('Create Time')" min-width="135"> |
||||
<template v-slot="scope"> |
||||
<span> |
||||
{{ scope.row.createTime | formatDate }} |
||||
</span> |
||||
</template> |
||||
</el-table-column> |
||||
<el-table-column :label="$t('Update Time')" min-width="135"> |
||||
<template v-slot="scope"> |
||||
<span> |
||||
{{ scope.row.updateTime | formateDate }} |
||||
</span> |
||||
</template> |
||||
</el-table-column> |
||||
<el-table-column :label="$t('Description')" min-width="100"> |
||||
<template v-slot="scope"> |
||||
<span>{{ scope.row.description | filterNull }} </span> |
||||
</template> |
||||
</el-table-column> |
||||
<el-table-column :label="$t('Operation')" width="100" fixed="right"> |
||||
<template v-slot="scope"> |
||||
<el-tooltip |
||||
:content="$t('Edit')" |
||||
placement="top" |
||||
:enterable="false" |
||||
> |
||||
<span> |
||||
<el-button |
||||
type="primary" |
||||
size="mini" |
||||
icon="el-icon-edit-outline" |
||||
circle |
||||
:disabled="scope.row.taskType === 'CONDITIONS' || scope.row.taskType ==='SWITCH' " |
||||
@click="editTask(scope.row)" |
||||
></el-button> |
||||
</span> |
||||
</el-tooltip> |
||||
<el-tooltip |
||||
:content="$t('Delete')" |
||||
placement="top" |
||||
:enterable="false" |
||||
> |
||||
<el-popconfirm |
||||
:confirmButtonText="$t('Confirm')" |
||||
:cancelButtonText="$t('Cancel')" |
||||
icon="el-icon-info" |
||||
iconColor="red" |
||||
:title="$t('Delete?')" |
||||
@onConfirm="deleteTask(scope.row.code, scope.row.projectCode)" |
||||
> |
||||
<el-button |
||||
type="danger" |
||||
size="mini" |
||||
icon="el-icon-delete" |
||||
slot="reference" |
||||
circle |
||||
> |
||||
</el-button> |
||||
</el-popconfirm> |
||||
</el-tooltip> |
||||
</template> |
||||
</el-table-column> |
||||
</el-table> |
||||
</div> |
||||
</div> |
||||
</template> |
||||
|
||||
<script> |
||||
import _ from 'lodash' |
||||
import { mapActions } from 'vuex' |
||||
|
||||
export default { |
||||
name: 'task-list', |
||||
data () { |
||||
return { |
||||
list: [] |
||||
} |
||||
}, |
||||
props: { |
||||
tasksList: Array |
||||
}, |
||||
watch: { |
||||
tasksList: { |
||||
handler (a) { |
||||
this.list = [] |
||||
setTimeout(() => { |
||||
this.list = _.cloneDeep(a) |
||||
}) |
||||
}, |
||||
immediate: true, |
||||
deep: true |
||||
} |
||||
}, |
||||
created () { |
||||
// this.list = this.tasksList |
||||
}, |
||||
methods: { |
||||
...mapActions('dag', ['deleteTaskDefinition']), |
||||
/** |
||||
* onUpdate |
||||
*/ |
||||
_onUpdate () { |
||||
this.$emit('on-update') |
||||
}, |
||||
/** |
||||
* deleteTaskDefinition |
||||
*/ |
||||
deleteTask (code) { |
||||
this.deleteTaskDefinition({ |
||||
code: code |
||||
}) |
||||
.then((res) => { |
||||
this._onUpdate() |
||||
this.$message.success(res.msg) |
||||
}) |
||||
.catch((e) => { |
||||
this.$message.error(e.msg || '') |
||||
}) |
||||
}, |
||||
/** |
||||
* taskdefinition detail |
||||
*/ |
||||
viewTaskDetail (task) { |
||||
this.$emit('viewTaskDetail', task) |
||||
}, |
||||
/** |
||||
* task edit |
||||
*/ |
||||
editTask (task) { |
||||
this.$emit('editTask', task) |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
|
||||
<style> |
||||
</style> |
||||
@ -0,0 +1,307 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
<template> |
||||
<div class="task-definition" v-if="!isLoading"> |
||||
<m-list-construction :title="$t('Task Definition')"> |
||||
<template slot="conditions"> |
||||
<m-conditions @on-conditions="_onConditions" :taskTypeShow="true"> |
||||
<template v-slot:button-group> |
||||
<el-button size="mini" @click="createTask"> |
||||
{{ $t("Create task") }} |
||||
</el-button> |
||||
</template> |
||||
</m-conditions> |
||||
</template> |
||||
<template v-slot:content> |
||||
<template v-if="tasksList.length || total > 0"> |
||||
<m-list |
||||
:tasksList="tasksList" |
||||
@on-update="_onUpdate" |
||||
@editTask="editTask" |
||||
@viewTaskDetail="viewTaskDetail" |
||||
></m-list> |
||||
<div class="page-box"> |
||||
<el-pagination |
||||
background |
||||
@current-change="_page" |
||||
@size-change="_pageSize" |
||||
:page-size="searchParams.pageSize" |
||||
:current-page.sync="searchParams.pageNo" |
||||
:page-sizes="[10, 30, 50]" |
||||
:total="total" |
||||
layout="sizes, prev, pager, next, jumper" |
||||
> |
||||
</el-pagination> |
||||
</div> |
||||
</template> |
||||
<template v-if="!tasksList.length"> |
||||
<m-no-data></m-no-data> |
||||
</template> |
||||
<m-spin :is-spin="isLoading"></m-spin> |
||||
</template> |
||||
</m-list-construction> |
||||
<el-drawer |
||||
:visible.sync="taskDrawer" |
||||
size="" |
||||
:with-header="false" |
||||
@close="closeTaskDrawer" |
||||
> |
||||
<!-- fix the bug that Element-ui(2.13.2) auto focus on the first input --> |
||||
<div style="width: 0px; height: 0px; overflow: hidden"> |
||||
<el-input type="text" /> |
||||
</div> |
||||
<m-form-model |
||||
v-if="taskDrawer" |
||||
:nodeData="nodeData" |
||||
type="task-definition" |
||||
@changeTaskType="changeTaskType" |
||||
@close="closeTaskDrawer" |
||||
@addTaskInfo="saveTask" |
||||
:taskDefinition="editingTask" |
||||
> |
||||
</m-form-model> |
||||
</el-drawer> |
||||
</div> |
||||
</template> |
||||
<script> |
||||
import mListConstruction from '@/module/components/listConstruction/listConstruction' |
||||
import mConditions from '@/module/components/conditions/conditions' |
||||
import mList from './_source/list' |
||||
import mNoData from '@/module/components/noData/noData' |
||||
import mSpin from '@/module/components/spin/spin' |
||||
import { mapActions, mapMutations } from 'vuex' |
||||
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle' |
||||
import mFormModel from '@/conf/home/pages/dag/_source/formModel/formModel.vue' |
||||
/** |
||||
* tasksType |
||||
*/ |
||||
import { tasksType } from '@/conf/home/pages/dag/_source/config.js' |
||||
|
||||
const DEFAULT_NODE_DATA = { |
||||
id: -1, |
||||
taskType: 'SHELL', |
||||
instanceId: -1 |
||||
} |
||||
export default { |
||||
name: 'task-definition-index', |
||||
data () { |
||||
// tasksType |
||||
const tasksTypeList = Object.keys(tasksType) |
||||
return { |
||||
total: null, |
||||
tasksList: [], |
||||
isLoading: true, |
||||
searchParams: { |
||||
pageSize: 10, |
||||
pageNo: 1, |
||||
searchVal: '', |
||||
taskType: '', |
||||
userId: '' |
||||
}, |
||||
// whether the task config drawer is visible |
||||
taskDrawer: false, |
||||
// nodeData |
||||
nodeData: { ...DEFAULT_NODE_DATA }, |
||||
// tasksType |
||||
tasksTypeList, |
||||
// editing task definition |
||||
editingTask: null |
||||
} |
||||
}, |
||||
mixins: [listUrlParamHandle], |
||||
methods: { |
||||
...mapActions('dag', [ |
||||
'getTaskDefinitionsList', |
||||
'genTaskCodeList', |
||||
'saveTaskDefinition', |
||||
'updateTaskDefinition' |
||||
]), |
||||
...mapActions('dag', [ |
||||
'getProcessList', |
||||
'getProjectList', |
||||
'getResourcesList', |
||||
'getResourcesListJar', |
||||
'getResourcesListJar' |
||||
]), |
||||
...mapMutations('dag', ['resetParams', 'setIsDetails']), |
||||
...mapActions('security', [ |
||||
'getTenantList', |
||||
'getWorkerGroupsAll', |
||||
'getAlarmGroupsAll' |
||||
]), |
||||
/** |
||||
* Toggle task drawer |
||||
*/ |
||||
showTaskDrawer () { |
||||
this.taskDrawer = true |
||||
}, |
||||
closeTaskDrawer () { |
||||
this.setIsDetails(false) |
||||
this.taskDrawer = false |
||||
}, |
||||
saveTask ({ item }) { |
||||
const isEditing = !!this.editingTask |
||||
if (isEditing) { |
||||
this.updateTaskDefinition(item) |
||||
.then((res) => { |
||||
this.$message.success(res.msg) |
||||
this._onUpdate() |
||||
this.closeTaskDrawer() |
||||
}) |
||||
.catch((e) => { |
||||
this.$message.error(e.msg || '') |
||||
}) |
||||
} else { |
||||
this.genTaskCodeList({ |
||||
genNum: 1 |
||||
}) |
||||
.then((res) => { |
||||
const [code] = res |
||||
return code |
||||
}) |
||||
.then((code) => { |
||||
return this.saveTaskDefinition({ |
||||
taskDefinitionJson: [ |
||||
{ |
||||
...item, |
||||
code |
||||
} |
||||
] |
||||
}) |
||||
}) |
||||
.then((res) => { |
||||
this.$message.success(res.msg) |
||||
this._onUpdate() |
||||
this.closeTaskDrawer() |
||||
}) |
||||
.catch((e) => { |
||||
this.$message.error(e.msg || '') |
||||
}) |
||||
} |
||||
}, |
||||
createTask () { |
||||
this.editingTask = null |
||||
this.nodeData.taskType = DEFAULT_NODE_DATA.taskType |
||||
this.showTaskDrawer() |
||||
}, |
||||
editTask (task) { |
||||
this.editingTask = task |
||||
this.nodeData.id = task.code |
||||
this.nodeData.taskType = task.taskType |
||||
this.showTaskDrawer() |
||||
}, |
||||
viewTaskDetail (task) { |
||||
this.setIsDetails(true) |
||||
this.editTask(task) |
||||
}, |
||||
/** |
||||
* pageNo |
||||
*/ |
||||
_page (val) { |
||||
this.searchParams.pageNo = val |
||||
}, |
||||
_pageSize (val) { |
||||
this.searchParams.pageSize = val |
||||
}, |
||||
/** |
||||
* conditions |
||||
*/ |
||||
_onConditions (o) { |
||||
this.searchParams.searchVal = o.searchVal |
||||
this.searchParams.taskType = o.taskType |
||||
this.searchParams.pageNo = 1 |
||||
}, |
||||
/** |
||||
* get task definition list |
||||
*/ |
||||
_getList (flag) { |
||||
this.isLoading = !flag |
||||
this.getTaskDefinitionsList(this.searchParams) |
||||
.then((res) => { |
||||
if (this.searchParams.pageNo > 1 && res.totalList.length === 0) { |
||||
this.searchParams.pageNo = this.searchParams.pageNo - 1 |
||||
} else { |
||||
this.tasksList = [] |
||||
this.tasksList = res.totalList |
||||
this.total = res.total |
||||
this.isLoading = false |
||||
} |
||||
}) |
||||
.catch((e) => { |
||||
this.isLoading = false |
||||
}) |
||||
}, |
||||
/** |
||||
* update task dataList |
||||
*/ |
||||
_onUpdate () { |
||||
this._debounceGET('false') |
||||
}, |
||||
/** |
||||
* change form modal task type |
||||
*/ |
||||
changeTaskType (value) { |
||||
this.nodeData.taskType = value |
||||
} |
||||
}, |
||||
created () { |
||||
this.isLoading = true |
||||
// Initialization parameters |
||||
this.resetParams() |
||||
// Promise Get node needs data |
||||
Promise.all([ |
||||
// get process definition |
||||
this.getProcessList(), |
||||
// get project |
||||
this.getProjectList(), |
||||
// get jar |
||||
this.getResourcesListJar(), |
||||
// get resource |
||||
this.getResourcesList(), |
||||
// get jar |
||||
this.getResourcesListJar(), |
||||
// get worker group list |
||||
this.getWorkerGroupsAll(), |
||||
// get alarm group list |
||||
this.getAlarmGroupsAll(), |
||||
this.getTenantList() |
||||
]) |
||||
.then((data) => { |
||||
this.isLoading = false |
||||
}) |
||||
.catch(() => { |
||||
this.isLoading = false |
||||
}) |
||||
}, |
||||
mounted () {}, |
||||
components: { |
||||
mListConstruction, |
||||
mConditions, |
||||
mList, |
||||
mNoData, |
||||
mSpin, |
||||
mFormModel |
||||
} |
||||
} |
||||
</script> |
||||
<style lang="scss" scoped> |
||||
.task-definition { |
||||
.taskGroupBtn { |
||||
width: 300px; |
||||
} |
||||
} |
||||
</style> |
||||
Loading…
Reference in new issue