diff --git a/dolphinscheduler-ui/.env b/dolphinscheduler-ui/.env index e6b00a11d7..e676be6059 100644 --- a/dolphinscheduler-ui/.env +++ b/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 diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index 9f747e6d6b..131641fccc 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/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"> - + { + this.$refs.mUdp.reloadParam() + }) }, /** * Return to the previous child node diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue index f2d9c4f2ac..614f8efbf6 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue +++ b/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