diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue index c8a600b699..c001a20176 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue @@ -59,7 +59,7 @@ - + - + - + @@ -112,10 +112,6 @@ hide: { type: Boolean, default: true - }, - isStartProcess: { - type: Boolean, - default: false } }, methods: { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue index e9f615d340..d6aeaf9cd9 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue @@ -120,8 +120,7 @@ ref="refLocalParams" @on-local-params="_onLocalParams" :udp-list="udpList" - :hide="false" - :isStartProcess="true"> + :hide="false"> diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue index 1ff5550f9b..882a54c230 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue @@ -239,7 +239,9 @@ } }) this.$nextTick(() => { - this.tenantId = this.tenantList[0].id + if (this.tenantList.length) { + this.tenantId = this.tenantList[0].id + } }) resolve() }) @@ -291,9 +293,14 @@ this.email = this.item.email this.phone = this.item.phone this.userState = this.item.state + '' || '1' - this.tenantId = this.item.tenantId + if (this.item.tenantName) { + this.tenantId = this.item.tenantId + } this.$nextTick(() => { - this.queueName = _.find(this.queueList, ['code', this.item.queue]).id || '' + let queue = _.find(this.queueList, ['code', this.item.queue]) + if (queue) { + this.queueName = queue.id || '' + } }) } }) @@ -304,9 +311,14 @@ this.email = this.item.email this.phone = this.item.phone this.userState = this.state + '' || '1' - this.tenantId = this.item.tenantId + if (this.item.tenantName) { + this.tenantId = this.item.tenantId + } if (this.queueList.length > 0) { - this.queueName = _.find(this.queueList, ['code', this.item.queue]).id + let queue = _.find(this.queueList, ['code', this.item.queue]) + if (queue) { + this.queueName = queue.id || '' + } } else { this.queueName = '' }