[dolphinscheduler] branch dev updated: [Fix][UI Next][V1.0.0-Alpha] Fix the title and alarm group not hidden when the sql type is non query in SQL. (#9157)

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

songjian pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 8ebd24a  [Fix][UI Next][V1.0.0-Alpha] Fix the title and alarm group not hidden when the sql type is non query in SQL. (#9157)
8ebd24a is described below

commit 8ebd24a420a48aca105c8d967411b3769f8aaca7
Author: Amy0104 <97...@users.noreply.github.com>
AuthorDate: Thu Mar 24 17:31:06 2022 +0800

    [Fix][UI Next][V1.0.0-Alpha] Fix the title and alarm group not hidden when the sql type is non query in SQL. (#9157)
---
 .../src/views/projects/task/components/node/fields/use-sql-type.ts    | 4 +++-
 .../src/views/projects/task/components/node/format-data.ts            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts
index 225f644..1e93c9e 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts
@@ -24,7 +24,9 @@ import type { IJsonItem } from '../types'
 export function useSqlType(model: { [field: string]: any }): IJsonItem[] {
   const { t } = useI18n()
   const querySpan = computed(() => (model.sqlType === '0' ? 6 : 0))
-  const emailSpan = computed(() => (model.sendEmail ? 24 : 0))
+  const emailSpan = computed(() =>
+    model.sqlType === '0' && model.sendEmail ? 24 : 0
+  )
   const groups = ref([])
   const groupsLoading = ref(false)
   const SQL_TYPES = [
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
index 0a0888e..5eaa113 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
@@ -181,7 +181,7 @@ export function formatParams(data: INodeData): {
     taskParams.postStatements = data.postStatements
     taskParams.sendEmail = data.sendEmail
     taskParams.displayRows = data.displayRows
-    if (data.sendEmail) {
+    if (data.sqlType === '0' && data.sendEmail) {
       taskParams.title = data.title
       taskParams.groupId = data.groupId
     }