From b912c98b1b5a352eefdbd7c921b468eacc015c4a Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 1 Feb 2021 10:34:09 +0800 Subject: [PATCH] fix --- .../pages/dag/_source/formModel/tasks/sql.vue | 62 +------------------ 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index 169ebf87de..dff7f3f97d 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -30,16 +30,7 @@
{{$t('SQL Type')}}
- - -
-
- - {{$t('TableMode')}} - {{$t('Attachment')}} - +
@@ -175,8 +166,6 @@ sqlType: '0', // Email title title: '', - // Form/attachment - showType: ['TABLE'], // Sql parameter connParams: '', // Pre statements @@ -201,15 +190,6 @@ getSriptBoxValue (val) { editor.setValue(val) }, - /** - * return sqlType - */ - _onSqlType (a) { - this.sqlType = a - if (a === 0) { - this.showType = ['TABLE'] - } - }, /** * return udfs */ @@ -254,10 +234,6 @@ if (!this.$refs.refDs._verifDatasource()) { return false } - if (this.sqlType === '0' && !this.showType.length) { - this.$message.warning(`${i18n.$t('One form or attachment must be selected')}`) - return false - } if (this.sqlType === '0' && !this.title) { this.$message.warning(`${i18n.$t('Mail subject required')}`) return false @@ -297,18 +273,6 @@ sqlType: this.sqlType, title: this.title, groupId: this.groupId, - showType: (() => { - /** - * Special processing return order TABLE,ATTACHMENT - * Handling checkout sequence - */ - let showType = this.showType - if (showType.length === 2 && showType[0] === 'ATTACHMENT') { - return [showType[1], showType[0]].join(',') - } else { - return showType.join(',') - } - })(), localParams: this.localParams, connParams: this.connParams, preStatements: this.preStatements, @@ -358,14 +322,6 @@ sqlType: this.sqlType, title: this.title, groupId: this.groupId, - showType: (() => { - let showType = this.showType - if (showType.length === 2 && showType[0] === 'ATTACHMENT') { - return [showType[1], showType[0]].join(',') - } else { - return showType.join(',') - } - })(), localParams: this.localParams, connParams: this.connParams, preStatements: this.preStatements, @@ -383,9 +339,6 @@ watch: { // Listening to sqlType sqlType (val) { - if (val === 0) { - this.showType = [] - } if (val !== 0) { this.title = '' this.groupId = null @@ -415,11 +368,6 @@ this.sqlType = o.params.sqlType this.connParams = o.params.connParams || '' this.localParams = o.params.localParams || [] - if (o.params.showType === '') { - this.showType = [] - } else { - this.showType = o.params.showType.split(',') || [] - } this.preStatements = o.params.preStatements || [] this.postStatements = o.params.postStatements || [] this.title = o.params.title || '' @@ -450,14 +398,6 @@ sqlType: this.sqlType, title: this.title, groupId: this.groupId, - showType: (() => { - let showType = this.showType - if (showType.length === 2 && showType[0] === 'ATTACHMENT') { - return [showType[1], showType[0]].join(',') - } else { - return showType.join(',') - } - })(), localParams: this.localParams, connParams: this.connParams, preStatements: this.preStatements,