seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

convert process definition id to code (#6191)

delete-gitter-link
Wangyizhi1 2021-09-13 18:03:28 +08:00 committed by GitHub
parent ca488fcfa6
commit b79630488d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
View File

@ -31,6 +31,7 @@
@addTaskInfo="addTaskInfo"
@close="closeTaskDrawer"
@onSubProcess="toSubProcess"
:type="type"
></m-form-model>
</el-drawer>
<el-dialog

8
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
View File

@ -21,7 +21,7 @@
<span class="go-subtask">
<!-- Component can't pop up box to do component processing -->
<m-log
v-if="taskInstance"
v-if="type === 'instance' && taskInstance"
:item="backfillItem"
:task-instance-id="taskInstance.id"
>
@ -525,7 +525,11 @@
directives: { clickoutside },
mixins: [disabledState],
props: {
nodeData: Object
nodeData: Object,
type: {
type: String,
default: ''
}
},
inject: ['dagChart'],
methods: {

20
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
View File

@ -85,7 +85,7 @@
// add task list
let projectId = this.projectList[0].value
this._getProcessByProjectId(projectId).then(definitionList => {
this._getProcessByProjectCode().then(definitionList => {
// dependItemList index
let is = (value) => _.some(this.dependItemList, { definitionCode: value })
let noArr = _.filter(definitionList, v => !is(v.value))
@ -124,13 +124,13 @@
resolve()
})
},
_getProcessByProjectId (id) {
_getProcessByProjectCode () {
return new Promise((resolve, reject) => {
this.store.dispatch('dag/getProcessByProjectId', { projectId: id }).then(res => {
this.store.dispatch('dag/getProcessByProjectCode').then(res => {
let definitionList = _.map(_.cloneDeep(res), v => {
return {
value: v.code,
label: v.name
value: v.processDefinition.code,
label: v.processDefinition.name
}
})
resolve(definitionList)
@ -143,11 +143,11 @@
_getDependItemList (codes, is = true) {
return new Promise((resolve, reject) => {
if (is) {
this.store.dispatch('dag/getProcessTasksList', { processDefinitionCode: codes }).then(res => {
this.store.dispatch('dag/getProcessTasksList', { code: codes }).then(res => {
resolve(['ALL'].concat(_.map(res, v => v.name)))
})
} else {
this.store.dispatch('dag/getTaskListDefIdAll', { processDefinitionCodeList: codes }).then(res => {
this.store.dispatch('dag/getTaskListDefIdAll', { codes: codes }).then(res => {
resolve(res)
})
}
@ -157,7 +157,7 @@
* change process get dependItemList
*/
_onChangeProjectId (value, itemIndex) {
this._getProcessByProjectId(value).then(definitionList => {
this._getProcessByProjectCode().then(definitionList => {
/* this.$set(this.dependItemList, itemIndex, this._dlOldParams(value, definitionList, item)) */
let definitionCode = definitionList[0].value
this._getDependItemList(definitionCode).then(depTasksList => {
@ -245,7 +245,7 @@
if (!this.dependItemList.length) {
if (!this.projectList.length) return
let projectId = this.projectList[0].value
this._getProcessByProjectId(projectId).then(definitionList => {
this._getProcessByProjectCode().then(definitionList => {
let value = definitionList[0].value
this._getDependItemList(value).then(depTasksList => {
this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(value, definitionList, depTasksList, projectId)))
@ -257,7 +257,7 @@
// get item list
this._getDependItemList(codes, false).then(res => {
_.map(this.dependItemList, (v, i) => {
this._getProcessByProjectId(v.projectId).then(definitionList => {
this._getProcessByProjectCode().then(definitionList => {
this.$set(this.dependItemList, i, this._rtOldParams(v.definitionCode, definitionList, ['ALL'].concat(_.map(res[v.definitionCode] || [], v => v.name)), v))
})
})

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
View File

@ -107,9 +107,9 @@
resolve()
})
},
_getProcessByProjectId (id) {
_getProcessByProjectCode () {
return new Promise((resolve, reject) => {
this.store.dispatch('dag/getProcessByProjectId', { projectId: id }).then(res => {
this.store.dispatch('dag/getProcessByProjectCode').then(res => {
this.definitionList = _.map(_.cloneDeep(res), v => {
return {
value: v.code,
@ -168,7 +168,7 @@
// get item list
this._getDependItemList(codes, false).then(res => {
_.map(this.dependItemList, (v, i) => {
this._getProcessByProjectId(v.projectId).then(definitionList => {
this._getProcessByProjectCode().then(definitionList => {
this.$set(this.dependItemList, i, this._rtOldParams(v.definitionCode, ['ALL'].concat(_.map(res[v.definitionCode] || [], v => v.name)), v))
})
})

60
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
View File

@ -115,12 +115,12 @@
:title="$t('Delete?')"
@onConfirm="_delete({},-1)"
>
<el-button style="position: absolute; bottom: -48px; left: 19px;" type="primary" size="mini" :disabled="!strSelectIds" slot="reference">{{$t('Delete')}}</el-button>
<el-button style="position: absolute; bottom: -48px; left: 19px;" type="primary" size="mini" :disabled="!strSelectCodes" slot="reference">{{$t('Delete')}}</el-button>
</el-popconfirm>
</el-tooltip>
<el-button type="primary" size="mini" :disabled="!strSelectIds" style="position: absolute; bottom: -48px; left: 80px;" @click="_batchExport(item)" >{{$t('Export')}}</el-button>
<span><el-button type="primary" size="mini" :disabled="!strSelectIds" style="position: absolute; bottom: -48px; left: 140px;" @click="_batchCopy(item)" >{{$t('Batch copy')}}</el-button></span>
<el-button type="primary" size="mini" :disabled="!strSelectIds" style="position: absolute; bottom: -48px; left: 225px;" @click="_batchMove(item)" >{{$t('Batch move')}}</el-button>
<el-button type="primary" size="mini" :disabled="!strSelectCodes" style="position: absolute; bottom: -48px; left: 80px;" @click="_batchExport(item)" >{{$t('Export')}}</el-button>
<span><el-button type="primary" size="mini" :disabled="!strSelectCodes" style="position: absolute; bottom: -48px; left: 140px;" @click="_batchCopy(item)" >{{$t('Batch copy')}}</el-button></span>
<el-button type="primary" size="mini" :disabled="!strSelectCodes" style="position: absolute; bottom: -48px; left: 225px;" @click="_batchMove(item)" >{{$t('Batch move')}}</el-button>
<el-drawer
:visible.sync="drawer"
size=""
@ -162,7 +162,7 @@
data () {
return {
list: [],
strSelectIds: '',
strSelectCodes: '',
checkAll: false,
drawer: false,
versionData: {
@ -243,7 +243,7 @@
* Timing manage
*/
_timingManage (item) {
this.$router.push({ path: `/projects/${this.projectId}/definition/list/timing/${item.code}` })
this.$router.push({ path: `/projects/${this.projectCode}/definition/list/timing/${item.code}` })
},
/**
* delete
@ -293,10 +293,10 @@
*/
_copyProcess (item) {
this.copyProcess({
processDefinitionIds: item.id,
targetProjectId: item.projectId
codes: item.code,
targetProjectCode: item.projectCode
}).then(res => {
this.strSelectIds = ''
this.strSelectCodes = ''
this.$message.success(res.msg)
// $('body').find('.tooltip.fade.top.in').remove()
this._onUpdate()
@ -310,10 +310,10 @@
*/
_moveProcess (item) {
this.moveProcess({
processDefinitionIds: item.id,
targetProjectId: item.projectId
codes: item.code,
targetProjectCode: item.projectCode
}).then(res => {
this.strSelectIds = ''
this.strSelectCodes = ''
this.$message.success(res.msg)
$('body').find('.tooltip.fade.top.in').remove()
this._onUpdate()
@ -324,7 +324,7 @@
_export (item) {
this.exportDefinition({
processDefinitionIds: item.id,
codes: item.code,
fileName: item.name
}).catch(e => {
this.$message.error(e.msg || '')
@ -334,7 +334,7 @@
* switch version in process definition version list
*
* @param version the version user want to change
* @param processDefinitionId the process definition id
* @param processDefinitionCode the process definition code
* @param fromThis fromThis
*/
mVersionSwitchProcessDefinitionVersion ({ version, processDefinitionCode, fromThis }) {
@ -353,7 +353,7 @@
*
* @param pageNo page number
* @param pageSize page size
* @param processDefinitionId the process definition id of page version
* @param processDefinitionCode the process definition Code of page version
* @param fromThis fromThis
*/
mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionCode, fromThis }) {
@ -374,7 +374,7 @@
* delete one version of process definition
*
* @param version the version need to delete
* @param processDefinitionId the process definition id user want to delete
* @param processDefinitionCode the process definition code user want to delete
* @param fromThis fromThis
*/
mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionCode, fromThis }) {
@ -421,14 +421,14 @@
_batchExport () {
this.exportDefinition({
processDefinitionIds: this.strSelectIds,
codes: this.strSelectCodes,
fileName: 'process_' + new Date().getTime()
}).then(res => {
this._onUpdate()
this.checkAll = false
this.strSelectIds = ''
this.strSelectCodes = ''
}).catch(e => {
this.strSelectIds = ''
this.strSelectCodes = ''
this.checkAll = false
this.$message.error(e.msg)
})
@ -440,8 +440,8 @@
this.relatedItemsDialog = true
this.tmp = false
},
onBatchCopy (item) {
this._copyProcess({ id: this.strSelectIds, projectId: item })
onBatchCopy (projectCode) {
this._copyProcess({ code: this.strSelectCodes, projectCode: projectCode })
this.relatedItemsDialog = false
},
closeRelatedItems () {
@ -454,8 +454,8 @@
this.tmp = true
this.relatedItemsDialog = true
},
onBatchMove (item) {
this._moveProcess({ id: this.strSelectIds, projectId: item })
onBatchMove (projectCode) {
this._moveProcess({ code: this.strSelectCodes, projectCode: projectCode })
this.relatedItemsDialog = false
},
/**
@ -478,22 +478,22 @@
*/
_arrDelChange (v) {
let arr = []
arr = _.map(v, 'id')
this.strSelectIds = _.join(arr, ',')
arr = _.map(v, 'code')
this.strSelectCodes = _.join(arr, ',')
},
/**
* batch delete
*/
_batchDelete () {
this.batchDeleteDefinition({
processDefinitionIds: this.strSelectIds
codes: this.strSelectCodes
}).then(res => {
this._onUpdate()
this.checkAll = false
this.strSelectIds = ''
this.strSelectCodes = ''
this.$message.success(res.msg)
}).catch(e => {
this.strSelectIds = ''
this.strSelectCodes = ''
this.checkAll = false
this.$message.error(e.msg || '')
})
@ -512,7 +512,7 @@
deep: true
},
pageNo () {
this.strSelectIds = ''
this.strSelectCodes = ''
}
},
created () {
@ -520,7 +520,7 @@
mounted () {
},
computed: {
...mapState('dag', ['projectId', 'projectCode'])
...mapState('dag', ['projectCode'])
},
components: { mVersions, mStart, mTiming, mRelatedItems }
}

14
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/relatedItems.vue
View File

@ -26,11 +26,11 @@
<m-list-box-f>
<template slot="name"><strong>*</strong>{{$t('Project Name')}}</template>
<template slot="content">
<el-select v-model="itemId" size="small">
<el-select v-model="selected" size="small">
<el-option
v-for="item in itemList"
:key="item.id"
:value="item.id"
:key="item.code"
:value="item.code"
:label="item.name">
</el-option>
</el-select>
@ -52,7 +52,7 @@
return {
store,
itemList: [],
itemId: ''
selected: ''
}
},
props: {
@ -65,14 +65,14 @@
_ok () {
if (this._verification()) {
if (this.tmp) {
this.$emit('onBatchMove', this.itemId)
this.$emit('onBatchMove', this.selected)
} else {
this.$emit('onBatchCopy', this.itemId)
this.$emit('onBatchCopy', this.selected)
}
}
},
_verification () {
if (!this.itemId) {
if (!this.selected) {
this.$message.warning(`${i18n.$t('Project name is required')}`)
return false
}

14
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
View File

@ -176,8 +176,8 @@ export default {
copyProcess ({ state }, payload) {
return new Promise((resolve, reject) => {
io.post(`projects/${state.projectCode}/process-definition/batch-copy`, {
processDefinitionIds: payload.processDefinitionIds,
targetProjectId: payload.targetProjectId
codes: payload.codes,
targetProjectCode: payload.targetProjectCode
}, res => {
resolve(res)
}).catch(e => {
@ -192,8 +192,8 @@ export default {
moveProcess ({ state }, payload) {
return new Promise((resolve, reject) => {
io.post(`projects/${state.projectCode}/process-definition/batch-move`, {
processDefinitionIds: payload.processDefinitionIds,
targetProjectId: payload.targetProjectId
codes: payload.codes,
targetProjectCode: payload.targetProjectCode
}, res => {
resolve(res)
}).catch(e => {
@ -386,7 +386,7 @@ export default {
/**
* Get a list of process definitions by project id
*/
getProcessByProjectId ({ state }, payload) {
getProcessByProjectCode ({ state }, payload) {
return new Promise((resolve, reject) => {
io.get(`projects/${state.projectCode}/process-definition/all`, payload, res => {
resolve(res.data)
@ -674,7 +674,7 @@ export default {
}
}
io.post(`projects/${state.projectCode}/process-definition/batch-export`, { processDefinitionIds: payload.processDefinitionIds }, res => {
io.post(`projects/${state.projectCode}/process-definition/batch-export`, { codes: payload.codes }, res => {
downloadBlob(res, payload.fileName)
}, e => {
@ -793,7 +793,7 @@ export default {
},
getTaskListDefIdAll ({ state }, payload) {
return new Promise((resolve, reject) => {
io.get(`projects/${state.projectCode}/process-definition/tatch-query-tasks`, payload, res => {
io.get(`projects/${state.projectCode}/process-definition/batch-query-tasks`, payload, res => {
resolve(res.data)
}).catch(e => {
reject(e)