Browse Source

Optimize DAG page opening speed (#6830)

3.0.0/version-upgrade
wangyizhi 3 years ago committed by GitHub
parent
commit
e2d516f279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  2. 26
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
  3. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
  4. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
  5. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
  6. 2
      dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -659,10 +659,10 @@
const processDefinitionId =
this.backfillItem.params.processDefinitionId
const process = this.processListS.find(
(process) => process.processDefinition.id === processDefinitionId
(def) => def.id === processDefinitionId
)
this.$emit('onSubProcess', {
subProcessCode: process.processDefinition.code,
subProcessCode: process.code,
fromThis: this
})
}
@ -949,7 +949,7 @@
* Child workflow entry show/hide
*/
_isGoSubProcess () {
return this.nodeData.taskType === 'SUB_PROCESS' && this.name
return this.nodeData.taskType === 'SUB_PROCESS' && this.name && this.processListS && this.processListS.length > 0
},
taskInstance () {
if (this.taskInstances.length > 0) {

26
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue

@ -42,6 +42,7 @@
import i18n from '@/module/i18n'
import disabledState from '@/module/mixin/disabledState'
import mListBox from './_source/listBox'
import { mapActions, mapState } from 'vuex'
export default {
name: 'sub_process',
@ -57,7 +58,11 @@
props: {
backfillItem: Object
},
computed: {
...mapState('dag', ['processListS'])
},
methods: {
...mapActions('dag', ['getProcessList']),
/**
* Node unified authentication parameters
*/
@ -82,6 +87,15 @@
*/
_handleName (id) {
return _.filter(this.processDefinitionList, v => id === v.id)[0].name
},
/**
* Get all processDefinition list
*/
getAllProcessDefinitions () {
if (!this.processListS || this.processListS.length === 0) {
return this.getProcessList()
}
return Promise.resolve(this.processListS)
}
},
watch: {
@ -92,22 +106,21 @@
}
},
created () {
let processListS = _.cloneDeep(this.store.state.dag.processListS)
let code = null
if (this.router.history.current.name === 'projects-instance-details') {
code = this.router.history.current.query.code || null
} else {
code = this.router.history.current.params.code || null
}
this.processDefinitionList = processListS.map(v => {
this.getAllProcessDefinitions().then((processListS) => {
this.processDefinitionList = processListS.map(def => {
return {
id: v.processDefinition.id,
code: v.processDefinition.code,
name: v.processDefinition.name,
id: def.id,
code: def.code,
name: def.name,
disabled: false
}
}).filter(a => (a.code + '') !== code)
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
@ -118,6 +131,7 @@
this.$emit('on-set-process-name', this._handleName(this.wdiCurr))
}
}
})
},
mounted () {
},

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue

@ -46,7 +46,7 @@
props: {},
methods: {
...mapMutations('dag', ['resetParams', 'setIsDetails']),
...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getProcessDetails', 'getResourcesListJar']),
...mapActions('dag', ['getProjectList', 'getResourcesList', 'getProcessDetails', 'getResourcesListJar']),
...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
/**
* init
@ -59,8 +59,6 @@
Promise.all([
// Node details
this.getProcessDetails(this.$route.params.code),
// get process definition
this.getProcessList(),
// get project
this.getProjectList(),
// get resource

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue

@ -40,7 +40,7 @@
props: {},
methods: {
...mapMutations('dag', ['resetParams']),
...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getResourcesListJar', 'getResourcesListJar']),
...mapActions('dag', ['getProjectList', 'getResourcesList', 'getResourcesListJar', 'getResourcesListJar']),
...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
/**
* init
@ -51,8 +51,6 @@
this.resetParams()
// Promise Get node needs data
Promise.all([
// get process definition
this.getProcessList(),
// get project
this.getProjectList(),
// get jar

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue

@ -43,7 +43,7 @@
props: {},
methods: {
...mapMutations('dag', ['setIsDetails', 'resetParams']),
...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getInstancedetail', 'getResourcesListJar']),
...mapActions('dag', ['getProjectList', 'getResourcesList', 'getInstancedetail', 'getResourcesListJar']),
...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
/**
* init
@ -56,8 +56,6 @@
Promise.all([
// Process instance details
this.getInstancedetail(this.$route.params.id),
// get process definition
this.getProcessList(),
// get project
this.getProjectList(),
// get resources

2
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

@ -352,7 +352,7 @@ export default {
resolve()
return
}
io.get(`projects/${state.projectCode}/process-definition/list`, payload, res => {
io.get(`projects/${state.projectCode}/process-definition/simple-list`, payload, res => {
state.processListS = res.data
resolve(res.data)
}).catch(res => {

Loading…
Cancel
Save