Merge pull request #2354 from break60/dev (949b8ef1) · Commits · SUMMER2020 / students / proj-2002251

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

+33 −3

Original line number	Diff line number	Diff line
		@@ -218,6 +218,19 @@
		},
		mixins: [disabledState],
		methods: {
		/**
		* getResourceId
		*/
		marjarId(name) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+name
		}).then(res => {
		this.mainJar = res.id
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		},
		/**
		* return localParams
		*/
		@@ -366,7 +379,13 @@
		// Non-null objects represent backfill
		if (!_.isEmpty(o)) {
		this.mainClass = o.params.mainClass \|\| ''
		this.mainJar = o.params.mainJar && o.params.mainJar.id ? o.params.mainJar.id : ''
		if(o.params.mainJar.res) {
		this.marjarId(o.params.mainJar.res)
		} else if(o.params.mainJar.res=='') {
		this.mainJar = ''
		} else {
		this.mainJar = o.params.mainJar.id \|\| ''
		}
		this.deployMode = o.params.deployMode \|\| ''
		this.slot = o.params.slot \|\| 1
		this.taskManager = o.params.taskManager \|\| '2'
		@@ -380,8 +399,19 @@
		// backfill resourceList
		let resourceList = o.params.resourceList \|\| []
		if (resourceList.length) {
		this.resourceList = _.map(resourceList, v => {
		return v.id
		_.map(resourceList, v => {
		if(v.res) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+v.res
		}).then(res => {
		this.resourceList.push(res.id)
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		} else {
		this.resourceList.push(v.id)
		}
		})
		this.cacheResourceList = resourceList
		}

+33 −3

Original line number	Diff line number	Diff line
		@@ -142,6 +142,19 @@
		},
		mixins: [disabledState],
		methods: {
		/**
		* getResourceId
		*/
		marjarId(name) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+name
		}).then(res => {
		this.mainJar = res.id
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		},
		/**
		* return localParams
		*/
		@@ -245,7 +258,13 @@
		// Non-null objects represent backfill
		if (!_.isEmpty(o)) {
		this.mainClass = o.params.mainClass \|\| ''
		if(o.params.mainJar.res) {
		this.marjarId(o.params.mainJar.res)
		} else if(o.params.mainJar.res=='') {
		this.mainJar = ''
		} else {
		this.mainJar = o.params.mainJar.id \|\| ''
		}
		this.mainArgs = o.params.mainArgs \|\| ''
		this.others = o.params.others
		this.programType = o.params.programType \|\| 'JAVA'
		@@ -253,8 +272,19 @@
		// backfill resourceList
		let resourceList = o.params.resourceList \|\| []
		if (resourceList.length) {
		this.resourceList = _.map(resourceList, v => {
		return v.id
		_.map(resourceList, v => {
		if(v.res) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+v.res
		}).then(res => {
		this.resourceList.push(res.id)
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		} else {
		this.resourceList.push(v.id)
		}
		})
		this.cacheResourceList = resourceList
		}

+13 −2

Original line number	Diff line number	Diff line
		@@ -176,8 +176,19 @@
		// backfill resourceList
		let resourceList = o.params.resourceList \|\| []
		if (resourceList.length) {
		this.resourceList = _.map(resourceList, v => {
		return v.id
		_.map(resourceList, v => {
		if(v.res) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+v.res
		}).then(res => {
		this.resourceList.push(res.id)
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		} else {
		this.resourceList.push(v.id)
		}
		})
		this.cacheResourceList = resourceList
		}

+14 −4

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@
		return {
		label: node.name
		}
		},
		}
		}
		},
		mixins: [disabledState],
		@@ -238,12 +238,22 @@
		// backfill resourceList
		let resourceList = o.params.resourceList \|\| []
		if (resourceList.length) {
		this.resourceList = _.map(resourceList, v => {
		return v.id
		_.map(resourceList, v => {
		if(v.res) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+v.res
		}).then(res => {
		this.resourceList.push(res.id)
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		} else {
		this.resourceList.push(v.id)
		}
		})
		this.cacheResourceList = resourceList
		}

		// backfill localParams
		let localParams = o.params.localParams \|\| []
		if (localParams.length) {

+34 −4

Original line number	Diff line number	Diff line
		@@ -261,6 +261,19 @@
		},
		mixins: [disabledState],
		methods: {
		/**
		* getResourceId
		*/
		marjarId(name) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+name
		}).then(res => {
		this.mainJar = res.id
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		},
		/**
		* return localParams
		*/
		@@ -414,7 +427,13 @@
		// Non-null objects represent backfill
		if (!_.isEmpty(o)) {
		this.mainClass = o.params.mainClass \|\| ''
		this.mainJar = o.params.mainJar && o.params.mainJar.id ? o.params.mainJar.id : ''
		if(o.params.mainJar.res) {
		this.marjarId(o.params.mainJar.res)
		} else if(o.params.mainJar.res=='') {
		this.mainJar = ''
		} else {
		this.mainJar = o.params.mainJar.id \|\| ''
		}
		this.deployMode = o.params.deployMode \|\| ''
		this.driverCores = o.params.driverCores \|\| 1
		this.driverMemory = o.params.driverMemory \|\| '512M'
		@@ -429,8 +448,19 @@
		// backfill resourceList
		let resourceList = o.params.resourceList \|\| []
		if (resourceList.length) {
		this.resourceList = _.map(resourceList, v => {
		return v.id
		_.map(resourceList, v => {
		if(v.res) {
		this.store.dispatch('dag/getResourceId',{
		type: 'FILE',
		fullName: '/'+v.res
		}).then(res => {
		this.resourceList.push(res.id)
		}).catch(e => {
		this.$message.error(e.msg \|\| '')
		})
		} else {
		this.resourceList.push(v.id)
		}
		})
		this.cacheResourceList = resourceList
		}