Browse Source

[Feature-#3805][server-UI] global params of UI (#4736)

* gloabl

* 全局变量取值修改

* remove files

* fixed

* remove basicSetting
pull/3/MERGE
renlu 4 years ago committed by GitHub
parent
commit
d28c856f5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-ui/.env
  2. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  3. 72
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

2
dolphinscheduler-ui/.env

@ -14,7 +14,7 @@
# limitations under the License.
# back end interface address
API_BASE = http://127.0.0.1:12345
API_BASE = http://192.168.xx.xx:12345
# If IP access is required for local development, remove the "#"
#DEV_HOST = 192.168.xx.xx

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

@ -178,7 +178,7 @@
:title="$t('Set the DAG diagram name')"
:visible.sync="dialogVisible"
width="auto">
<m-udp @onUdp="onUdpDialog" @close="closeDialog"></m-udp>
<m-udp ref="mUdp" @onUdp="onUdpDialog" @close="closeDialog"></m-udp>
</el-dialog>
<el-dialog
:title="$t('Please set the parameters before starting')"
@ -559,7 +559,11 @@
this.$message.warning(`${i18n.$t('Failed to create node to save')}`)
return
}
this.dialogVisible = true
this.$nextTick(() => {
this.$refs.mUdp.reloadParam()
})
},
/**
* Return to the previous child node

72
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@ -196,6 +196,46 @@
*/
close () {
this.$emit('close')
},
/**
* reload localParam
*/
reloadParam () {
const dag = _.cloneDeep(this.store.state.dag)
let fixedParam = []
const tasks = this.store.state.dag.tasks
for (const task of tasks) {
const localParam = task.params ? task.params.localParams : []
localParam.forEach(l => {
if (!fixedParam.some(f => { return f.prop === l.prop })) {
fixedParam.push(Object.assign({
ifFixed: true
}, l))
}
})
}
let globalParams = _.cloneDeep(dag.globalParams)
globalParams = globalParams.map(g => {
if (fixedParam.some(f => { return g.prop === f.prop })) {
fixedParam = fixedParam.filter(f => { return g.prop !== f.prop })
return Object.assign(g, {
ifFixed: true
})
} else {
return g
}
})
let udpList = [...fixedParam, ...globalParams].sort(s => {
if (s.ifFixed) {
return -1
} else {
return 1
}
})
this.udpList = udpList
this.udpListCache = udpList
}
},
watch: {
@ -209,38 +249,6 @@
created () {
const dag = _.cloneDeep(this.store.state.dag)
let fixedParam = []
const tasks = this.store.state.dag.tasks
for (const task of tasks) {
const localParam = task.params ? task.params.localParams : []
if (localParam && localParam.length > 0) {
fixedParam = fixedParam.concat(localParam)
}
}
fixedParam = fixedParam.map(f => {
return {
prop: f.prop,
value: f.value,
ifFixed: true
}
})
let globalParams = _.cloneDeep(dag.globalParams)
globalParams = globalParams.map(g => {
if (fixedParam.some(f => { return g.prop === f.prop })) {
fixedParam = fixedParam.filter(f => { return g.prop !== f.prop })
return Object.assign(g, {
ifFixed: true
})
} else {
return g
}
})
this.udpList = [...fixedParam, ...globalParams]
this.udpListCache = [...fixedParam, ...globalParams]
this.name = dag.name
this.originalName = dag.name
this.description = dag.description

Loading…
Cancel
Save