From 8ebd24a420a48aca105c8d967411b3769f8aaca7 Mon Sep 17 00:00:00 2001 From: Amy0104 <97265214+Amy0104@users.noreply.github.com> Date: Thu, 24 Mar 2022 17:31:06 +0800 Subject: [PATCH] [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) --- .../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 225f6449b..1e93c9e20 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 0a0888eb5..5eaa11355 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 } -- GitLab