Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature][UI][V1.0.0-Beta] Adjust the UI presentation of the dependent task. #9649

Merged
merged 1 commit into from
Apr 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ export function renderCustomParameters(
return h(
NFormItemGi,
{
showLabel: false,
showLabel: !!mergedChild.name,
path: `${field}[${i}].${mergedChild.field}`,
label: mergedChild.name,
span: unref(mergedChild.span),
class: mergedChild.class
},
Expand Down
3 changes: 3 additions & 0 deletions dolphinscheduler-ui-next/src/locales/modules/en_US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,9 @@ const project = {
waiting_dependent_start: 'Waiting Dependent start',
check_interval: 'Check interval',
waiting_dependent_complete: 'Waiting Dependent complete',
project_name: 'Project Name',
process_name: 'Wrokflow Name',
cycle_time: 'Cycle Time',
rule_name: 'Rule Name',
null_check: 'NullCheck',
custom_sql: 'CustomSql',
Expand Down
3 changes: 3 additions & 0 deletions dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,9 @@ const project = {
waiting_dependent_start: '等待依赖启动',
check_interval: '检查间隔',
waiting_dependent_complete: '等待依赖完成',
project_name: '项目名称',
process_name: '工作流名称',
cycle_time: '时间周期',
rule_name: '规则名称',
null_check: '空值检测',
custom_sql: '自定义SQL',
Expand Down
1 change: 0 additions & 1 deletion dolphinscheduler-ui-next/src/service/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,4 @@ service.interceptors.response.use((res: AxiosResponse) => {
}
}, err)


export { service as axios }
3 changes: 1 addition & 2 deletions dolphinscheduler-ui-next/src/utils/downloadFile.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Expand Down Expand Up @@ -55,4 +54,4 @@ const downloadFile = (url: string, obj?: any) => {
document.body.removeChild(form)
}

export default downloadFile
export default downloadFile
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
(j = 0) => ({
type: 'select',
field: 'projectCode',
span: 12,
name: t('project.node.project_name'),
span: 24,
props: {
filterable: true,
onUpdateValue: async (projectCode: number) => {
Expand All @@ -256,7 +257,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
(j = 0) => ({
type: 'select',
field: 'definitionCode',
span: 12,
span: 24,
name: t('project.node.process_name'),
props: {
filterable: true,
onUpdateValue: async (processCode: number) => {
Expand All @@ -275,7 +277,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
(j = 0) => ({
type: 'select',
field: 'depTaskCode',
span: 12,
span: 24,
name: t('project.node.task_name'),
props: {
filterable: true
},
Expand All @@ -286,7 +289,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
(j = 0) => ({
type: 'select',
field: 'cycle',
span: 12,
span: 10,
name: t('project.node.cycle_time'),
props: {
onUpdateValue: (value: 'month') => {
model.dependTaskList[i].dependItemList[j].dateOptions =
Expand All @@ -298,7 +302,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
(j = 0) => ({
type: 'select',
field: 'dateValue',
span: 12,
span: 10,
name: ' ',
options:
model.dependTaskList[i]?.dependItemList[j]?.dateOptions || []
})
Expand Down